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

Consistent heating status and status reset

Browse Source 
Fix #10699
This commit is contained in:
Scott Lahteine 2018-05-13 17:23:26 -05:00
parent b7706ca8d0
commit 29080cefd9
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Marlin/Marlin_main.cpp
View File

@ -7868,18 +7868,9 @@ inline void gcode_M104() {
*/
if (parser.value_celsius() <= (EXTRUDE_MINTEMP) / 2) {
print_job_timer.stop();
LCD_MESSAGEPGM(WELCOME_MSG);
lcd_reset_status();
}
#endif
#if ENABLED(ULTRA_LCD)
if (parser.value_celsius() > thermalManager.degHotend(target_extruder))
#if HOTENDS > 1
lcd_status_printf_P(0, PSTR("E%i " MSG_HEATING), target_extruder + 1);
#else
LCD_MESSAGEPGM("E " MSG_HEATING);
#endif
#endif
}
#if ENABLED(AUTOTEMP)
@ -8030,7 +8021,7 @@ inline void gcode_M109() {
*/
if (parser.value_celsius() <= (EXTRUDE_MINTEMP) / 2) {
print_job_timer.stop();
LCD_MESSAGEPGM(WELCOME_MSG);
lcd_reset_status();
}
else
print_job_timer.start();
@ -8474,7 +8465,7 @@ inline void gcode_M111() {
#endif
#if ENABLED(ULTIPANEL)
LCD_MESSAGEPGM(WELCOME_MSG);
lcd_reset_status();
#endif
}
@ -14388,7 +14379,7 @@ void setup() {
#endif
lcd_init();
LCD_MESSAGEPGM(WELCOME_MSG);
lcd_reset_status();
#if ENABLED(SHOW_BOOTSCREEN)
lcd_bootscreen();