Daniel Callander
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
1 additions and
1 deletions
-
Marlin/src/lcd/menu/menu.cpp
|
|
@ -224,7 +224,7 @@ void MarlinUI::goto_screen(screenFunc_t screen, const uint16_t encoder/*=0*/, co |
|
|
if (on_status_screen()) |
|
|
if (on_status_screen()) |
|
|
doubleclick_expire_ms = millis() + DOUBLECLICK_MAX_INTERVAL; |
|
|
doubleclick_expire_ms = millis() + DOUBLECLICK_MAX_INTERVAL; |
|
|
} |
|
|
} |
|
|
else if (on_status_screen() && currentScreen == menu_main && PENDING(millis(), doubleclick_expire_ms)) { |
|
|
else if (screen == status_screen && currentScreen == menu_main && PENDING(millis(), doubleclick_expire_ms)) { |
|
|
if ( (ENABLED(BABYSTEP_WITHOUT_HOMING) || all_axes_known()) |
|
|
if ( (ENABLED(BABYSTEP_WITHOUT_HOMING) || all_axes_known()) |
|
|
&& (ENABLED(BABYSTEP_ALWAYS_AVAILABLE) || printer_busy()) ) |
|
|
&& (ENABLED(BABYSTEP_ALWAYS_AVAILABLE) || printer_busy()) ) |
|
|
screen = TERN(BABYSTEP_ZPROBE_OFFSET, lcd_babystep_zoffset, lcd_babystep_z); |
|
|
screen = TERN(BABYSTEP_ZPROBE_OFFSET, lcd_babystep_zoffset, lcd_babystep_z); |
|
|
|
