3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simplify altfan override initialization

Browse source
This commit is contained in:
Yuri D'Elia 2022-12-23 20:16:23 +01:00 • committed by DRracer
parent 612e9d9303
commit 6285951eac
2 changed files with 13 additions and 14 deletions

13
Firmware/Marlin_main.cpp
View file

@ -1266,11 +1266,14 @@ void setup()
temp_mgr_init(); temp_mgr_init();
#ifdef EXTRUDER_ALTFAN_DETECT #ifdef EXTRUDER_ALTFAN_DETECT
SERIAL_ECHORPGM(_n("Hotend fan type: ")); if (eeprom_read_byte((uint8_t*)EEPROM_ALTFAN_OVERRIDE) == EEPROM_EMPTY_VALUE) {
if (extruder_altfan_detect()) eeprom_update_byte((uint8_t*)EEPROM_ALTFAN_OVERRIDE, 0);
SERIAL_ECHOLNRPGM(PSTR("ALTFAN")); SERIAL_ECHORPGM(_n("Hotend fan type: "));
else if (extruder_altfan_detect())
SERIAL_ECHOLNRPGM(PSTR("NOCTUA")); SERIAL_ECHOLNRPGM(PSTR("ALTFAN"));
else
SERIAL_ECHOLNRPGM(PSTR("NOCTUA"));
}
#endif //EXTRUDER_ALTFAN_DETECT #endif //EXTRUDER_ALTFAN_DETECT
plan_init(); // Initialize planner; plan_init(); // Initialize planner;

14
Firmware/fancheck.cpp
View file

@ -162,18 +162,11 @@ ISR(INT6_vect) {
bool extruder_altfan_detect() bool extruder_altfan_detect()
{ {
// override isAltFan setting for detection
altfanStatus.isAltfan = 0;
setExtruderAutoFanState(3); setExtruderAutoFanState(3);
SET_INPUT(TACH_0); SET_INPUT(TACH_0);
uint8_t overrideVal = eeprom_read_byte((uint8_t *)EEPROM_ALTFAN_OVERRIDE);
if (overrideVal == EEPROM_EMPTY_VALUE)
{
overrideVal = (calibration_status() == CALIBRATION_STATUS_CALIBRATED) ? 1 : 0;
eeprom_update_byte((uint8_t *)EEPROM_ALTFAN_OVERRIDE, overrideVal);
}
altfanStatus.altfanOverride = overrideVal;
CRITICAL_SECTION_START; CRITICAL_SECTION_START;
EICRB &= ~(1 << ISC61); EICRB &= ~(1 << ISC61);
EICRB |= (1 << ISC60); EICRB |= (1 << ISC60);
@ -187,8 +180,11 @@ bool extruder_altfan_detect()
EIMSK &= ~(1 << INT6); EIMSK &= ~(1 << INT6);
countFanSpeed(); countFanSpeed();
// restore fan state
altfanStatus.isAltfan = fan_speed[0] > 100; altfanStatus.isAltfan = fan_speed[0] > 100;
setExtruderAutoFanState(1); setExtruderAutoFanState(1);
return altfanStatus.isAltfan; return altfanStatus.isAltfan;
} }