Browse Source

🎨 Null heating message method

Scott Lahteine 3 years ago
parent
commit
d8c4be375c

+ 2
- 4
Marlin/src/gcode/temp/M104_M109.cpp View File

@@ -125,10 +125,8 @@ void GcodeSuite::M104_M109(const bool isM109) {
125 125
       thermalManager.auto_job_check_timer(isM109, true);
126 126
     #endif
127 127
 
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);
132 130
   }
133 131
 
134 132
   TERN_(AUTOTEMP, planner.autotemp_M104_M109());

+ 1
- 1
Marlin/src/module/temperature.cpp View File

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

+ 3
- 1
Marlin/src/module/temperature.h View File

@@ -869,8 +869,10 @@ class Temperature {
869 869
       #endif
870 870
     #endif
871 871
 
872
-    #if HAS_STATUS_MESSAGE
872
+    #if HAS_HOTEND && HAS_STATUS_MESSAGE
873 873
       static void set_heating_message(const uint8_t e);
874
+    #else
875
+      static inline void set_heating_message(const uint8_t) {}
874 876
     #endif
875 877
 
876 878
     #if HAS_LCD_MENU && HAS_TEMPERATURE

+ 1
- 1
Marlin/src/module/tool_change.cpp View File

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

Loading…
Cancel
Save