From 90cf6a06bede65cd6b7620715f426c2c351ff32e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 6 Dec 2017 22:02:54 -0600
Subject: [PATCH] Simplify G26 user_canceled
---
Marlin/src/gcode/bedlevel/G26.cpp | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index 0e09f2243f..207fe8c5e2 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -159,24 +159,15 @@ int8_t g26_prime_flag;
#if ENABLED(NEWPANEL)
/**
- * Detect is_lcd_clicked, debounce it, and return true for cancel
+ * If the LCD is clicked, cancel, wait for release, return true
*/
bool user_canceled() {
if (!is_lcd_clicked()) return false; // Return if the button isn't pressed
-
- #if ENABLED(ULTRA_LCD)
- lcd_setstatusPGM(PSTR("Mesh Validation Stopped."), 99);
+ lcd_setstatusPGM(PSTR("Mesh Validation Stopped."), 99);
+ #if ENABLED(ULTIPANEL)
lcd_quick_feedback();
#endif
-
- safe_delay(10); // Wait for click to settle
- while (!is_lcd_clicked()) idle(); // Wait for button press again?
-
- // If the button is suddenly pressed again,
- // ask the user to resolve the issue
- lcd_setstatusPGM(PSTR("Release button"), 99); // will never appear...
wait_for_release();
- lcd_reset_status();
return true;
}