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

Allow knob-long-press only in listed menus

Browse Source
This commit is contained in:
DRracer 2019-10-01 10:51:02 +02:00
parent aa50479da5
commit 72aed3c544
1 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Firmware/ultralcd.cpp
View File

@ -8606,7 +8606,6 @@ uint8_t get_message_level()
return lcd_status_message_level; return lcd_status_message_level;
} }
void menu_lcd_longpress_func(void) void menu_lcd_longpress_func(void)
{ {
if (homing_flag || mesh_bed_leveling_flag || menu_menu == lcd_babystep_z || menu_menu == lcd_move_z) if (homing_flag || mesh_bed_leveling_flag || menu_menu == lcd_babystep_z || menu_menu == lcd_move_z)
@ -8616,15 +8615,41 @@ void menu_lcd_longpress_func(void)
return; return;
} }
// 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 (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU && (moves_planned() || IS_SD_PRINTING || is_usb_printing )) if (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU && (moves_planned() || IS_SD_PRINTING || is_usb_printing ))
{ { // long press as live-adj-z
lcd_clear(); if(menu_menu == lcd_status_screen
menu_submenu(lcd_babystep_z); || menu_menu == lcd_tune_menu
} || menu_menu == lcd_support_menu
else ){
{ lcd_clear();
move_menu_scale = 1.0; menu_submenu(lcd_babystep_z);
menu_submenu(lcd_move_z); } else {
// otherwise consume the long press as normal click
// consume the loreturns to sheet menu
menu_back();
}
} else { // long press as move-z
if(menu_menu == lcd_status_screen
|| menu_menu == lcd_main_menu
|| menu_menu == lcd_preheat_menu
|| menu_menu == lcd_sdcard_menu
|| menu_menu == lcd_settings_menu
|| menu_menu == lcd_control_temperature_menu
#if (LANG_MODE != 0)
|| menu_menu == lcd_language
#endif
|| menu_menu == lcd_support_menu
){
move_menu_scale = 1.0;
menu_submenu(lcd_move_z);
} else {
// otherwise consume the long press as normal click
// consume the loreturns to sheet menu
menu_back();
}
} }
} }