0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #3757 from thinkyhead/rc_fix_auto_fans

Browse source 
Don't try to enable unused auto fans
This commit is contained in:
Scott Lahteine 2016-05-14 15:09:24 -07:00
parent a713043acd 4d6bb52b26
commit e01e52969e
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Marlin/temperature.cpp
View file

@ -332,7 +332,7 @@ int Temperature::getHeaterPower(int heater) {
#if HAS_AUTO_FAN
void Temperature::checkExtruderAutoFans() {
const uint8_t fanPin[] = { EXTRUDER_0_AUTO_FAN_PIN, EXTRUDER_1_AUTO_FAN_PIN, EXTRUDER_2_AUTO_FAN_PIN, EXTRUDER_3_AUTO_FAN_PIN };
const int8_t fanPin[] = { EXTRUDER_0_AUTO_FAN_PIN, EXTRUDER_1_AUTO_FAN_PIN, EXTRUDER_2_AUTO_FAN_PIN, EXTRUDER_3_AUTO_FAN_PIN };
const int fanBit[] = { 0,
EXTRUDER_1_AUTO_FAN_PIN == EXTRUDER_0_AUTO_FAN_PIN ? 0 : 1,
EXTRUDER_2_AUTO_FAN_PIN == EXTRUDER_0_AUTO_FAN_PIN ? 0 :
@ -347,10 +347,13 @@ int Temperature::getHeaterPower(int heater) {
SBI(fanState, fanBit[f]);
}
for (int f = 0; f <= 3; f++) {
int8_t pin = fanPin[f];
if (pin >= 0) {
unsigned char newFanSpeed = TEST(fanState, f) ? EXTRUDER_AUTO_FAN_SPEED : 0;
// this idiom allows both digital and PWM fan outputs (see M42 handling).
digitalWrite(fanPin[f], newFanSpeed);
analogWrite(fanPin[f], newFanSpeed);
digitalWrite(pin, newFanSpeed);
analogWrite(pin, newFanSpeed);
}
}
}