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

Merge pull request #3014 from Panayiotis-git/MK3_ButtonLongPress_Fix 

Ignore button long-press event, if not allowed
This commit is contained in:
Alex Voinea 2022-07-04 09:46:08 +02:00 committed by GitHub
parent 29159a5bf3 87e45056c3
commit d5fc2a28f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Firmware/ultralcd.cpp
View File

@ -8051,7 +8051,7 @@ 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
if ( (moves_planned() || IS_SD_PRINTING || usb_timer.running() )){ // long press as live-adj-z if ( (moves_planned() || IS_SD_PRINTING || usb_timer.running() )){ // 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...
|| menu_menu == lcd_main_menu || menu_menu == lcd_main_menu
|| menu_menu == lcd_tune_menu || menu_menu == lcd_tune_menu
@ -8061,12 +8061,10 @@ void menu_lcd_longpress_func(void)
lcd_clear(); lcd_clear();
menu_submenu(lcd_babystep_z); menu_submenu(lcd_babystep_z);
} else { } else {
// otherwise consume the long press as normal click lcd_quick_feedback();
if( menu_menu != lcd_status_screen )
menu_back();
} }
} else { // long press as move-z } else { // long press as move-z
if(menu_menu == lcd_status_screen if (menu_menu == lcd_status_screen
|| menu_menu == lcd_main_menu || menu_menu == lcd_main_menu
|| menu_menu == lcd_preheat_menu || menu_menu == lcd_preheat_menu
|| menu_menu == lcd_sdcard_menu || menu_menu == lcd_sdcard_menu
@ -8079,9 +8077,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 lcd_quick_feedback();
if( menu_menu != lcd_status_screen )
menu_back();
} }
} }
} }