Skip to content

Commit fefde2a

Browse files
committed
🐛 Fix fan index for Singlenozzle, chamber fan
Fixes #22512 Followup to #19152, #19519
1 parent a668a9d commit fefde2a

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Marlin/src/inc/SanityCheck.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2047,10 +2047,10 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
20472047
#error "TEMP_SENSOR_REDUNDANT_TARGET can't be Cooler (-5): requires TEMP_COOLER_PIN"
20482048
#endif
20492049

2050-
#if TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 0 && !PIN_EXISTS(TEMP_0_CS)
2051-
#error "TEMP_SENSOR_REDUNDANT MAX Thermocouple with TEMP_SENSOR_REDUNDANT_SOURCE 0 requires TEMP_0_CS_PIN."
2052-
#elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 1 && !PIN_EXISTS(TEMP_1_CS)
2053-
#error "TEMP_SENSOR_REDUNDANT MAX Thermocouple with TEMP_SENSOR_REDUNDANT_SOURCE 1 requires TEMP_1_CS_PIN."
2050+
#if TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E0) && !PIN_EXISTS(TEMP_0_CS)
2051+
#error "TEMP_SENSOR_REDUNDANT MAX Thermocouple with TEMP_SENSOR_REDUNDANT_SOURCE E0 requires TEMP_0_CS_PIN."
2052+
#elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E1) && !PIN_EXISTS(TEMP_1_CS)
2053+
#error "TEMP_SENSOR_REDUNDANT MAX Thermocouple with TEMP_SENSOR_REDUNDANT_SOURCE E1 requires TEMP_1_CS_PIN."
20542054
#endif
20552055
#endif
20562056

Marlin/src/module/temperature.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ const char str_t_thermal_runaway[] PROGMEM = STR_T_THERMAL_RUNAWAY,
369369
}
370370
#endif
371371

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
373373

374374
if (fan >= FAN_COUNT) return;
375375

@@ -1461,7 +1461,7 @@ void Temperature::manage_heater() {
14611461
fan_chamber_pwm = CHAMBER_FAN_BASE + _MAX((CHAMBER_FAN_FACTOR) * (temp_chamber.celsius - temp_chamber.target), 0);
14621462
#endif
14631463
NOMORE(fan_chamber_pwm, 225);
1464-
set_fan_speed(2, fan_chamber_pwm); // TODO: instead of fan 2, set to chamber fan
1464+
set_fan_speed(CHAMBER_FAN_INDEX, fan_chamber_pwm); // TODO: instead of fan 2, set to chamber fan
14651465
#endif
14661466

14671467
#if ENABLED(CHAMBER_VENT)
@@ -1492,7 +1492,7 @@ void Temperature::manage_heater() {
14921492
else if (!flag_chamber_off) {
14931493
#if ENABLED(CHAMBER_FAN)
14941494
flag_chamber_off = true;
1495-
set_fan_speed(2, 0);
1495+
set_fan_speed(CHAMBER_FAN_INDEX, 0);
14961496
#endif
14971497
#if ENABLED(CHAMBER_VENT)
14981498
flag_chamber_excess_heat = false;

0 commit comments

Comments
 (0)