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

Improve heating/cooling LCD messages (#10293)

Browse Source
This commit is contained in:
Marcio Teixeira
2018-04-04 17:29:27 -06:00
committed by Scott Lahteine
parent 21a47b50f4
commit 8bc93c6f2b
4 changed files with 53 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,7 +72,11 @@ void GcodeSuite::M104() {
#if ENABLED(ULTRA_LCD)
if (parser.value_celsius() > thermalManager.degHotend(e))
lcd_status_printf_P(0, PSTR("E%i %s"), e + 1, MSG_HEATING);
#if HOTENDS > 1
lcd_status_printf_P(0, PSTR("E%i " MSG_HEATING), e + 1);
#else
LCD_MESSAGEPGM("E " MSG_HEATING);
#endif
#endif
}
@ -127,8 +131,13 @@ void GcodeSuite::M109() {
#endif
#if ENABLED(ULTRA_LCD)
if (thermalManager.isHeatingHotend(target_extruder))
lcd_status_printf_P(0, PSTR("E%i %s"), target_extruder + 1, MSG_HEATING);
const bool heating = thermalManager.isHeatingHotend(target_extruder);
if (heating || !no_wait_for_cooling)
#if HOTENDS > 1
lcd_status_printf_P(0, heating ? PSTR("E%i " MSG_HEATING) : PSTR("E%i " MSG_COOLING), target_extruder + 1);
#else
lcd_setstatusPGM(heating ? PSTR("E " MSG_HEATING) : PSTR("E " MSG_COOLING));
#endif
#endif
}
else return;
@ -234,7 +243,7 @@ void GcodeSuite::M109() {
} while (wait_for_heatup && TEMP_CONDITIONS);
if (wait_for_heatup) {
LCD_MESSAGEPGM(MSG_HEATING_COMPLETE);
lcd_setstatusPGM(wants_to_cool ? PSTR(MSG_COOLING_COMPLETE) : PSTR(MSG_HEATING_COMPLETE));
#if ENABLED(PRINTER_EVENT_LEDS)
leds.set_white();
#endif

3
Marlin/src/gcode/temperature/M140_M190.cpp
View File

@ -61,7 +61,6 @@ void GcodeSuite::M140() {
void GcodeSuite::M190() {
if (DEBUGGING(DRYRUN)) return;
LCD_MESSAGEPGM(MSG_BED_HEATING);
const bool no_wait_for_cooling = parser.seenval('S');
if (no_wait_for_cooling || parser.seenval('R')) {
thermalManager.setTargetBed(parser.value_celsius());
@ -72,6 +71,8 @@ void GcodeSuite::M190() {
}
else return;
lcd_setstatusPGM(thermalManager.isHeatingBed() ? PSTR(MSG_BED_HEATING) : PSTR(MSG_BED_COOLING));
#if TEMP_BED_RESIDENCY_TIME > 0
millis_t residency_start_ms = 0;
// Loop until the temperature has stabilized