Browse Source

🐛 Fix fan index for Singlenozzle, chamber fan

Fixes #22512
Followup to #19152, #19519
Scott Lahteine 4 years ago
parent
commit
526b6cdf5b
2 changed files with 4 additions and 4 deletions
  1. 1
    1
      Marlin/src/inc/SanityCheck.h
  2. 3
    3
      Marlin/src/module/temperature.cpp

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

@@ -2002,7 +2002,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
2002 2002
   #endif
2003 2003
 
2004 2004
   #if REDUNDANT_TEMP_MATCH(SOURCE, E0) && HAS_HOTEND
2005
-    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be 0 if a hotend is used. E0 always uses TEMP_SENSOR_0."
2005
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be E0 if a hotend is used. E0 always uses TEMP_SENSOR_0."
2006 2006
   #elif REDUNDANT_TEMP_MATCH(SOURCE, COOLER) && HAS_TEMP_COOLER
2007 2007
     #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be COOLER. TEMP_SENSOR_COOLER is in use."
2008 2008
   #elif REDUNDANT_TEMP_MATCH(SOURCE, PROBE) && HAS_TEMP_PROBE

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

@@ -369,7 +369,7 @@ const char str_t_thermal_runaway[] PROGMEM = STR_T_THERMAL_RUNAWAY,
369 369
       }
370 370
     #endif
371 371
 
372
-    TERN_(SINGLENOZZLE, fan = 0); // Always use fan index 0 with SINGLENOZZLE
372
+    TERN_(SINGLENOZZLE, if (fan < EXTRUDERS) fan = 0); // Always fan 0 for SINGLENOZZLE E fan
373 373
 
374 374
     if (fan >= FAN_COUNT) return;
375 375
 
@@ -1481,7 +1481,7 @@ void Temperature::manage_heater() {
1481 1481
             fan_chamber_pwm = CHAMBER_FAN_BASE + _MAX((CHAMBER_FAN_FACTOR) * (temp_chamber.celsius - temp_chamber.target), 0);
1482 1482
           #endif
1483 1483
           NOMORE(fan_chamber_pwm, 225);
1484
-          set_fan_speed(2, fan_chamber_pwm); // TODO: instead of fan 2, set to chamber fan
1484
+          set_fan_speed(CHAMBER_FAN_INDEX, fan_chamber_pwm); // TODO: instead of fan 2, set to chamber fan
1485 1485
         #endif
1486 1486
 
1487 1487
         #if ENABLED(CHAMBER_VENT)
@@ -1512,7 +1512,7 @@ void Temperature::manage_heater() {
1512 1512
       else if (!flag_chamber_off) {
1513 1513
         #if ENABLED(CHAMBER_FAN)
1514 1514
           flag_chamber_off = true;
1515
-          set_fan_speed(2, 0);
1515
+          set_fan_speed(CHAMBER_FAN_INDEX, 0);
1516 1516
         #endif
1517 1517
         #if ENABLED(CHAMBER_VENT)
1518 1518
           flag_chamber_excess_heat = false;

Loading…
Cancel
Save