From b49acce0352c7fda835f0b6b1db042ee20747579 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 24 Nov 2017 15:46:45 -0600 Subject: [PATCH] Tweaks for lcd_external_control --- Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp | 8 +++----- Marlin/src/gcode/bedlevel/G26.cpp | 12 +++++------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp index 4b1ce5936a..14e04bcf73 100644 --- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp +++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp @@ -1009,11 +1009,9 @@ SERIAL_PROTOCOLLNPGM("\nMesh only partially populated."); do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE); - #if ENABLED(NEWPANEL) - lcd_quick_feedback(); - while (is_lcd_clicked()) idle(); - lcd_external_control = false; - #endif + lcd_quick_feedback(); + while (is_lcd_clicked()) idle(); + lcd_external_control = false; KEEPALIVE_STATE(IN_HANDLER); restore_ubl_active_state_and_leave(); diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp index 82fe88e5c2..5e78a6e4e3 100644 --- a/Marlin/src/gcode/bedlevel/G26.cpp +++ b/Marlin/src/gcode/bedlevel/G26.cpp @@ -517,13 +517,11 @@ bool prime_nozzle() { while (is_lcd_clicked()) idle(); // Debounce Encoder Wheel - #if ENABLED(ULTRA_LCD) - strcpy_P(lcd_status_message, PSTR("Done Priming")); // We can't do lcd_setstatusPGM() without having it continue; - // So... We cheat to get a message up. - lcd_setstatusPGM(PSTR("Done Priming"), 99); - lcd_quick_feedback(); - lcd_external_control = false; - #endif + strcpy_P(lcd_status_message, PSTR("Done Priming")); // We can't do lcd_setstatusPGM() without having it continue; + // So... We cheat to get a message up. + lcd_setstatusPGM(PSTR("Done Priming"), 99); + lcd_quick_feedback(); + lcd_external_control = false; } else #endif