MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Tweaks for lcd_external_control

Browse Source
This commit is contained in:
Scott Lahteine 2017-11-24 15:46:45 -06:00
parent 1ef1052ae1
commit b49acce035
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View File

@ -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();

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

@ -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