bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

[2.0.x] Reset LCD status to fallbacks (#10470)

Browse Source 
* Remove obsolete strings
* Tweak some static consts
* Reset LCD status to fallbacks
This commit is contained in:
Scott Lahteine
2018-04-22 00:16:30 -05:00
committed by GitHub
parent d58450c82a
commit 3396671011
36 changed files with 67 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/src/gcode/lcd/M0_M1.cpp
View File

@ -87,12 +87,8 @@ void GcodeSuite::M0_M1() {
ms += millis(); // wait until this time for a click
while (PENDING(millis(), ms) && wait_for_user) idle();
}
else {
#if ENABLED(ULTIPANEL)
if (lcd_detected())
#endif
while (wait_for_user) idle();
}
else
while (wait_for_user) idle();
#if ENABLED(PRINTER_EVENT_LEDS) && ENABLED(SDSUPPORT)
if (lights_off_after_print) {
@ -101,11 +97,7 @@ void GcodeSuite::M0_M1() {
}
#endif
#if ENABLED(ULTIPANEL)
if (lcd_detected()) {
IS_SD_PRINTING ? LCD_MESSAGEPGM(MSG_RESUMING) : LCD_MESSAGEPGM(WELCOME_MSG);
}
#endif
lcd_reset_status();
wait_for_user = false;
KEEPALIVE_STATE(IN_HANDLER);