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

Fixes after first feature tests

This commit is contained in:
DRracer 2019-10-01 15:31:01 +02:00
parent 72aed3c544
commit 9ae75612b5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Firmware/ultralcd.cpp
View File

@ -8618,11 +8618,13 @@ 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 // @@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 ( (moves_planned() || IS_SD_PRINTING || is_usb_printing )){ // long press as live-adj-z
{ // 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(menu_menu == lcd_status_screen && ( menu_menu == lcd_status_screen // and in listed menus...
|| menu_menu == lcd_tune_menu || menu_menu == lcd_main_menu
|| menu_menu == lcd_support_menu || menu_menu == lcd_tune_menu
|| menu_menu == lcd_support_menu
)
){ ){
lcd_clear(); lcd_clear();
menu_submenu(lcd_babystep_z); menu_submenu(lcd_babystep_z);