CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify G26 user_canceled

Browse Source
This commit is contained in:
Scott Lahteine 2017-12-06 22:02:54 -06:00
parent cdfabbc507
commit 90cf6a06be
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Marlin/src/gcode/bedlevel/G26.cpp
View File

@ -159,24 +159,15 @@ int8_t g26_prime_flag;
#if ENABLED(NEWPANEL) #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() { bool user_canceled() {
if (!is_lcd_clicked()) return false; // Return if the button isn't pressed 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(); lcd_quick_feedback();
#endif #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(); wait_for_release();
lcd_reset_status();
return true; return true;
} }