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

Consistent heating status and status reset

Browse Source 
Fix #10699
This commit is contained in:
Scott Lahteine
2018-05-13 17:18:19 -05:00
parent 37b15fe4cf
commit 35258dd50b
3 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/Marlin.cpp
View File

@@ -837,7 +837,7 @@ void setup() {
#endif #endif
lcd_init(); lcd_init();
LCD_MESSAGEPGM(WELCOME_MSG); lcd_reset_status();
#if ENABLED(SHOW_BOOTSCREEN) #if ENABLED(SHOW_BOOTSCREEN)
lcd_bootscreen(); lcd_bootscreen();

2
Marlin/src/gcode/control/M80_M81.cpp
View File

@@ -82,7 +82,7 @@
#endif #endif
#if ENABLED(ULTIPANEL) #if ENABLED(ULTIPANEL)
LCD_MESSAGEPGM(WELCOME_MSG); lcd_reset_status();
#endif #endif
} }

15
Marlin/src/gcode/temperature/M104_M109.cpp
View File

@@ -64,20 +64,11 @@ void GcodeSuite::M104() {
* standby mode, for instance in a dual extruder setup, without affecting * standby mode, for instance in a dual extruder setup, without affecting
* the running print timer. * the running print timer.
*/ */
if (parser.value_celsius() <= (EXTRUDE_MINTEMP) / 2) { if (temp <= (EXTRUDE_MINTEMP) / 2) {
print_job_timer.stop(); print_job_timer.stop();
LCD_MESSAGEPGM(WELCOME_MSG); lcd_reset_status();
} }
#endif #endif
#if ENABLED(ULTRA_LCD)
if (parser.value_celsius() > thermalManager.degHotend(e))
#if HOTENDS > 1
lcd_status_printf_P(0, PSTR("E%i " MSG_HEATING), e + 1);
#else
LCD_MESSAGEPGM("E " MSG_HEATING);
#endif
#endif
} }
#if ENABLED(AUTOTEMP) #if ENABLED(AUTOTEMP)
@@ -124,7 +115,7 @@ void GcodeSuite::M109() {
*/ */
if (parser.value_celsius() <= (EXTRUDE_MINTEMP) / 2) { if (parser.value_celsius() <= (EXTRUDE_MINTEMP) / 2) {
print_job_timer.stop(); print_job_timer.stop();
LCD_MESSAGEPGM(WELCOME_MSG); lcd_reset_status();
} }
else else
print_job_timer.start(); print_job_timer.start();