From f3c3526aa5cdf49df526e2a2660d2ee43535112c Mon Sep 17 00:00:00 2001 From: DRracer Date: Tue, 1 Oct 2019 17:13:36 +0200 Subject: [PATCH] fix the knob long-press causing hang in modal dialogs --- Firmware/lcd.cpp | 3 +-- Firmware/ultralcd.cpp | 9 ++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index 71948789..3e39312c 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -761,8 +761,7 @@ void lcd_buttons_update(void) //else if (menu_menu == lcd_move_z) lcd_quick_feedback(); //lcd_button_pressed is set back to false via lcd_quick_feedback function } - else - lcd_long_press_active = 0; + lcd_long_press_active = 0; } lcd_buttons = newbutton; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a966c81f..ac0067d0 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -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 // 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(( 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... @@ -8630,8 +8629,8 @@ void menu_lcd_longpress_func(void) menu_submenu(lcd_babystep_z); } else { // otherwise consume the long press as normal click - // consume the loreturns to sheet menu - menu_back(); + if( menu_menu != lcd_status_screen ) + menu_back(); } } else { // long press as move-z if(menu_menu == lcd_status_screen @@ -8649,8 +8648,8 @@ void menu_lcd_longpress_func(void) menu_submenu(lcd_move_z); } else { // otherwise consume the long press as normal click - // consume the loreturns to sheet menu - menu_back(); + if( menu_menu != lcd_status_screen ) + menu_back(); } } }