From c8ac908db22ac941da51e25ce7d9533c488618e2 Mon Sep 17 00:00:00 2001 From: Tanguy Pruvot Date: Tue, 21 Jan 2020 08:05:55 +0100 Subject: [PATCH] Release UI on G26 priming timeout (#16449) --- Marlin/src/gcode/bedlevel/G26.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp index 709960ee78..611538a909 100644 --- a/Marlin/src/gcode/bedlevel/G26.cpp +++ b/Marlin/src/gcode/bedlevel/G26.cpp @@ -418,15 +418,13 @@ inline bool turn_on_heaters() { inline bool prime_nozzle() { const feedRate_t fr_slow_e = planner.settings.max_feedrate_mm_s[E_AXIS] / 15.0f; - #if HAS_LCD_MENU + #if HAS_LCD_MENU && DISABLED(TOUCH_BUTTONS) // ui.button_pressed issue with touchscreen #if ENABLED(PREVENT_LENGTHY_EXTRUDE) float Total_Prime = 0.0; #endif if (g26_prime_flag == -1) { // The user wants to control how much filament gets purged - #if HAS_LCD_MENU - ui.capture(); - #endif + ui.capture(); ui.set_status_P(GET_TEXT(MSG_G26_MANUAL_PRIME), 99); ui.chirp(); @@ -439,7 +437,10 @@ inline bool prime_nozzle() { destination.e += 0.25; #if ENABLED(PREVENT_LENGTHY_EXTRUDE) Total_Prime += 0.25; - if (Total_Prime >= EXTRUDE_MAXLENGTH) return G26_ERR; + if (Total_Prime >= EXTRUDE_MAXLENGTH) { + ui.release(); + return G26_ERR; + } #endif prepare_internal_move_to_destination(fr_slow_e); destination = current_position;