3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix the knob long-press causing hang in modal dialogs

Browse source
This commit is contained in:
DRracer 2019-10-01 17:13:36 +02:00
parent 9ae75612b5
commit f3c3526aa5
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Firmware/lcd.cpp
View file

@ -761,7 +761,6 @@ void lcd_buttons_update(void)
//else if (menu_menu == lcd_move_z) lcd_quick_feedback(); //else if (menu_menu == lcd_move_z) lcd_quick_feedback();
//lcd_button_pressed is set back to false via lcd_quick_feedback function //lcd_button_pressed is set back to false via lcd_quick_feedback function
} }
else
lcd_long_press_active = 0; lcd_long_press_active = 0;
} }

5
Firmware/ultralcd.cpp
View file

@ -8617,7 +8617,6 @@ void menu_lcd_longpress_func(void)
// explicitely listed menus which are allowed to rise the move-z or live-adj-z functions // explicitely listed menus which are allowed to rise the move-z or live-adj-z functions
// The lists are not the same for both functions, so first decide which function is to be performed // The lists are not the same for both functions, so first decide which function is to be performed
// @@TODO - handle full-screen modal dialogs safely - i.e. they should not hang the printer while doing long press
if ( (moves_planned() || IS_SD_PRINTING || is_usb_printing )){ // long press as live-adj-z if ( (moves_planned() || IS_SD_PRINTING || is_usb_printing )){ // long press as live-adj-z
if(( current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU ) // only allow live-adj-z up to 2mm of print height if(( current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU ) // only allow live-adj-z up to 2mm of print height
&& ( menu_menu == lcd_status_screen // and in listed menus... && ( menu_menu == lcd_status_screen // and in listed menus...
@ -8630,7 +8629,7 @@ void menu_lcd_longpress_func(void)
menu_submenu(lcd_babystep_z); menu_submenu(lcd_babystep_z);
} else { } else {
// otherwise consume the long press as normal click // otherwise consume the long press as normal click
// consume the loreturns to sheet menu if( menu_menu != lcd_status_screen )
menu_back(); menu_back();
} }
} else { // long press as move-z } else { // long press as move-z
@ -8649,7 +8648,7 @@ void menu_lcd_longpress_func(void)
menu_submenu(lcd_move_z); menu_submenu(lcd_move_z);
} else { } else {
// otherwise consume the long press as normal click // otherwise consume the long press as normal click
// consume the loreturns to sheet menu if( menu_menu != lcd_status_screen )
menu_back(); menu_back();
} }
} }