Skip to content

Commit

Permalink
🎨 Null heating message method
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed May 29, 2021
1 parent 83f9413 commit d1502f7
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 2 additions & 4 deletions Marlin/src/gcode/temp/M104_M109.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,8 @@ void GcodeSuite::M104_M109(const bool isM109) {
thermalManager.auto_job_check_timer(isM109, true);
#endif

#if HAS_STATUS_MESSAGE
if (thermalManager.isHeatingHotend(target_extruder) || !no_wait_for_cooling)
thermalManager.set_heating_message(target_extruder);
#endif
if (thermalManager.isHeatingHotend(target_extruder) || !no_wait_for_cooling)
thermalManager.set_heating_message(target_extruder);
}

TERN_(AUTOTEMP, planner.autotemp_M104_M109());
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/module/temperature.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2526,7 +2526,7 @@ void Temperature::disable_all_heaters() {
if (singlenozzle_temp[new_tool] && singlenozzle_temp[new_tool] != singlenozzle_temp[old_tool]) {
setTargetHotend(singlenozzle_temp[new_tool], 0);
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
}
#endif
Expand Down
4 changes: 3 additions & 1 deletion Marlin/src/module/temperature.h
Original file line number Diff line number Diff line change
Expand Up @@ -869,8 +869,10 @@ class Temperature {
#endif
#endif

#if HAS_STATUS_MESSAGE
#if HAS_HOTEND && HAS_STATUS_MESSAGE
static void set_heating_message(const uint8_t e);
#else
static inline void set_heating_message(const uint8_t) {}
#endif

#if HAS_LCD_MENU && HAS_TEMPERATURE
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/module/tool_change.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1382,7 +1382,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
#if HAS_MULTI_HOTEND
thermalManager.setTargetHotend(thermalManager.degTargetHotend(active_extruder), migration_extruder);
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);
#endif

Expand Down

0 comments on commit d1502f7

Please sign in to comment.