Skip to content

Commit d1502f7

Browse files
committed
🎨 Null heating message method
1 parent 83f9413 commit d1502f7

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

Marlin/src/gcode/temp/M104_M109.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,8 @@ void GcodeSuite::M104_M109(const bool isM109) {
125125
thermalManager.auto_job_check_timer(isM109, true);
126126
#endif
127127

128-
#if HAS_STATUS_MESSAGE
129-
if (thermalManager.isHeatingHotend(target_extruder) || !no_wait_for_cooling)
130-
thermalManager.set_heating_message(target_extruder);
131-
#endif
128+
if (thermalManager.isHeatingHotend(target_extruder) || !no_wait_for_cooling)
129+
thermalManager.set_heating_message(target_extruder);
132130
}
133131

134132
TERN_(AUTOTEMP, planner.autotemp_M104_M109());

Marlin/src/module/temperature.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2526,7 +2526,7 @@ void Temperature::disable_all_heaters() {
25262526
if (singlenozzle_temp[new_tool] && singlenozzle_temp[new_tool] != singlenozzle_temp[old_tool]) {
25272527
setTargetHotend(singlenozzle_temp[new_tool], 0);
25282528
TERN_(AUTOTEMP, planner.autotemp_update());
2529-
TERN_(HAS_STATUS_MESSAGE, set_heating_message(0));
2529+
set_heating_message(0);
25302530
(void)wait_for_hotend(0, false); // Wait for heating or cooling
25312531
}
25322532
#endif

Marlin/src/module/temperature.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -869,8 +869,10 @@ class Temperature {
869869
#endif
870870
#endif
871871

872-
#if HAS_STATUS_MESSAGE
872+
#if HAS_HOTEND && HAS_STATUS_MESSAGE
873873
static void set_heating_message(const uint8_t e);
874+
#else
875+
static inline void set_heating_message(const uint8_t) {}
874876
#endif
875877

876878
#if HAS_LCD_MENU && HAS_TEMPERATURE

Marlin/src/module/tool_change.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1382,7 +1382,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
13821382
#if HAS_MULTI_HOTEND
13831383
thermalManager.setTargetHotend(thermalManager.degTargetHotend(active_extruder), migration_extruder);
13841384
TERN_(AUTOTEMP, planner.autotemp_update());
1385-
TERN_(HAS_STATUS_MESSAGE, thermalManager.set_heating_message(0));
1385+
thermalManager.set_heating_message(0);
13861386
thermalManager.wait_for_hotend(active_extruder);
13871387
#endif
13881388

0 commit comments

Comments
 (0)