Browse Source

Apply HAS_MULTI_HOTEND

Scott Lahteine 4 years ago
parent
commit
c4d57462dc

+ 1
- 1
Marlin/src/inc/Conditionals_LCD.h View File

@@ -475,7 +475,7 @@
475 475
   #ifndef HOTEND_OVERSHOOT
476 476
     #define HOTEND_OVERSHOOT 15
477 477
   #endif
478
-  #if HOTENDS_ > 1
478
+  #if HOTENDS > 1
479 479
     #define HAS_MULTI_HOTEND 1
480 480
     #define HAS_HOTEND_OFFSET 1
481 481
   #endif

+ 3
- 3
Marlin/src/inc/Conditionals_post.h View File

@@ -1753,7 +1753,7 @@
1753 1753
 #if HAS_HOTEND && PIN_EXISTS(E0_AUTO_FAN)
1754 1754
   #define HAS_AUTO_FAN_0 1
1755 1755
 #endif
1756
-#if HOTENDS > 1 && PIN_EXISTS(E1_AUTO_FAN)
1756
+#if HAS_MULTI_HOTEND && PIN_EXISTS(E1_AUTO_FAN)
1757 1757
   #define HAS_AUTO_FAN_1 1
1758 1758
 #endif
1759 1759
 #if HOTENDS > 2 && PIN_EXISTS(E2_AUTO_FAN)
@@ -1997,7 +1997,7 @@
1997 1997
  */
1998 1998
 
1999 1999
 #define WRITE_HEATER_0P(v) WRITE(HEATER_0_PIN, (v) ^ HEATER_0_INVERTING)
2000
-#if HOTENDS > 1 || ENABLED(HEATERS_PARALLEL)
2000
+#if EITHER(HAS_MULTI_HOTEND, HEATERS_PARALLEL)
2001 2001
   #define WRITE_HEATER_1(v) WRITE(HEATER_1_PIN, (v) ^ HEATER_1_INVERTING)
2002 2002
   #if HOTENDS > 2
2003 2003
     #define WRITE_HEATER_2(v) WRITE(HEATER_2_PIN, (v) ^ HEATER_2_INVERTING)
@@ -2017,7 +2017,7 @@
2017 2017
       #endif // HOTENDS > 4
2018 2018
     #endif // HOTENDS > 3
2019 2019
   #endif // HOTENDS > 2
2020
-#endif // HOTENDS > 1
2020
+#endif // HAS_MULTI_HOTEND || HEATERS_PARALLEL
2021 2021
 #if ENABLED(HEATERS_PARALLEL)
2022 2022
   #define WRITE_HEATER_0(v) { WRITE_HEATER_0P(v); WRITE_HEATER_1(v); }
2023 2023
 #else

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

@@ -1244,7 +1244,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
1244 1244
     #endif
1245 1245
 
1246 1246
     // Migrate the temperature to the new hotend
1247
-    #if HOTENDS > 1
1247
+    #if HAS_MULTI_HOTEND
1248 1248
       thermalManager.setTargetHotend(thermalManager.degTargetHotend(active_extruder), migration_extruder);
1249 1249
       #if HAS_DISPLAY
1250 1250
         thermalManager.set_heating_message(0);

Loading…
Cancel
Save