sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Fix fan index for Singlenozzle, chamber fan

Browse Source 
Fixes #22512
Followup to #19152, #19519
This commit is contained in:
Scott Lahteine
2021-08-05 23:24:20 -05:00
parent ff3db550ee
commit 526b6cdf5b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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
#endif #endif
#if REDUNDANT_TEMP_MATCH(SOURCE, E0) && HAS_HOTEND #if REDUNDANT_TEMP_MATCH(SOURCE, E0) && HAS_HOTEND
#error "TEMP_SENSOR_REDUNDANT_SOURCE can't be 0 if a hotend is used. E0 always uses TEMP_SENSOR_0." #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be E0 if a hotend is used. E0 always uses TEMP_SENSOR_0."
#elif REDUNDANT_TEMP_MATCH(SOURCE, COOLER) && HAS_TEMP_COOLER #elif REDUNDANT_TEMP_MATCH(SOURCE, COOLER) && HAS_TEMP_COOLER
#error "TEMP_SENSOR_REDUNDANT_SOURCE can't be COOLER. TEMP_SENSOR_COOLER is in use." #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be COOLER. TEMP_SENSOR_COOLER is in use."
#elif REDUNDANT_TEMP_MATCH(SOURCE, PROBE) && HAS_TEMP_PROBE #elif REDUNDANT_TEMP_MATCH(SOURCE, PROBE) && HAS_TEMP_PROBE

6
Marlin/src/module/temperature.cpp
View File

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