CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🎨 Null heating message method

Browse Source
This commit is contained in:
Scott Lahteine 2021-05-22 17:56:31 -05:00 committed by Scott Lahteine
parent 83f9413196
commit d1502f74ea
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/gcode/temp/M104_M109.cpp
View File

@ -125,10 +125,8 @@ void GcodeSuite::M104_M109(const bool isM109) {
thermalManager.auto_job_check_timer(isM109, true); thermalManager.auto_job_check_timer(isM109, true);
#endif #endif
#if HAS_STATUS_MESSAGE if (thermalManager.isHeatingHotend(target_extruder) || !no_wait_for_cooling)
if (thermalManager.isHeatingHotend(target_extruder) || !no_wait_for_cooling) thermalManager.set_heating_message(target_extruder);
thermalManager.set_heating_message(target_extruder);
#endif
} }
TERN_(AUTOTEMP, planner.autotemp_M104_M109()); TERN_(AUTOTEMP, planner.autotemp_M104_M109());

2
Marlin/src/module/temperature.cpp
View File

@ -2526,7 +2526,7 @@ void Temperature::disable_all_heaters() {
if (singlenozzle_temp[new_tool] && singlenozzle_temp[new_tool] != singlenozzle_temp[old_tool]) { if (singlenozzle_temp[new_tool] && singlenozzle_temp[new_tool] != singlenozzle_temp[old_tool]) {
setTargetHotend(singlenozzle_temp[new_tool], 0); setTargetHotend(singlenozzle_temp[new_tool], 0);
TERN_(AUTOTEMP, planner.autotemp_update()); TERN_(AUTOTEMP, planner.autotemp_update());
TERN_(HAS_STATUS_MESSAGE, set_heating_message(0)); set_heating_message(0);
(void)wait_for_hotend(0, false); // Wait for heating or cooling (void)wait_for_hotend(0, false); // Wait for heating or cooling
} }
#endif #endif

4
Marlin/src/module/temperature.h
View File

@ -869,8 +869,10 @@ class Temperature {
#endif #endif
#endif #endif
#if HAS_STATUS_MESSAGE #if HAS_HOTEND && HAS_STATUS_MESSAGE
static void set_heating_message(const uint8_t e); static void set_heating_message(const uint8_t e);
#else
static inline void set_heating_message(const uint8_t) {}
#endif #endif
#if HAS_LCD_MENU && HAS_TEMPERATURE #if HAS_LCD_MENU && HAS_TEMPERATURE

2
Marlin/src/module/tool_change.cpp
View File

@ -1382,7 +1382,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
#if HAS_MULTI_HOTEND #if HAS_MULTI_HOTEND
thermalManager.setTargetHotend(thermalManager.degTargetHotend(active_extruder), migration_extruder); thermalManager.setTargetHotend(thermalManager.degTargetHotend(active_extruder), migration_extruder);
TERN_(AUTOTEMP, planner.autotemp_update()); TERN_(AUTOTEMP, planner.autotemp_update());
TERN_(HAS_STATUS_MESSAGE, thermalManager.set_heating_message(0)); thermalManager.set_heating_message(0);
thermalManager.wait_for_hotend(active_extruder); thermalManager.wait_for_hotend(active_extruder);
#endif #endif