josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

consume click

This commit is contained in:
PavelSindler 2018-12-11 15:59:44 +01:00
parent 6d6de67c3f
commit 8af127870d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Firmware/ultralcd.cpp
View File

@ -3558,6 +3558,7 @@ static void menu_show_end_stops() {
void lcd_diag_show_end_stops() void lcd_diag_show_end_stops()
{ {
lcd_clear(); lcd_clear();
lcd_consume_click();
for (;;) { for (;;) {
manage_heater(); manage_heater();
manage_inactivity(true); manage_inactivity(true);
@ -4316,6 +4317,7 @@ void lcd_v2_calibration()
} }
else { else {
lcd_display_message_fullscreen_P(_i("Please load PLA filament first."));////MSG_PLEASE_LOAD_PLA c=20 r=4 lcd_display_message_fullscreen_P(_i("Please load PLA filament first."));////MSG_PLEASE_LOAD_PLA c=20 r=4
lcd_consume_click();
for (int i = 0; i < 20; i++) { //wait max. 2s for (int i = 0; i < 20; i++) { //wait max. 2s
delay_keep_alive(100); delay_keep_alive(100);
if (lcd_clicked()) { if (lcd_clicked()) {
@ -4982,7 +4984,7 @@ void bowden_menu() {
} }
enc_dif = lcd_encoder_diff; enc_dif = lcd_encoder_diff;
lcd_consume_click();
while (1) { while (1) {
manage_heater(); manage_heater();
@ -5089,6 +5091,7 @@ static char snmm_stop_print_menu() { //menu for choosing which filaments will be
char cursor_pos = 1; char cursor_pos = 1;
int enc_dif = 0; int enc_dif = 0;
KEEPALIVE_STATE(PAUSED_FOR_USER); KEEPALIVE_STATE(PAUSED_FOR_USER);
lcd_consume_click();
while (1) { while (1) {
manage_heater(); manage_heater();
manage_inactivity(true); manage_inactivity(true);
@ -5244,7 +5247,7 @@ char reset_menu() {
lcd_clear(); lcd_clear();
lcd_set_cursor(0, 0); lcd_set_cursor(0, 0);
lcd_print(">"); lcd_print(">");
lcd_consume_click();
while (1) { while (1) {
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
@ -5520,7 +5523,7 @@ unsigned char lcd_choose_color() {
lcd_print(">"); lcd_print(">");
active_rows = items_no < 3 ? items_no : 3; active_rows = items_no < 3 ? items_no : 3;
lcd_consume_click();
while (1) { while (1) {
lcd_puts_at_P(0, 0, PSTR("Choose color:")); lcd_puts_at_P(0, 0, PSTR("Choose color:"));
for (int i = 0; i < active_rows; i++) { for (int i = 0; i < active_rows; i++) {