@@ -558,19 +558,18 @@ void countFanSpeed()
558
558
559
559
void checkFanSpeed ()
560
560
{
561
- uint8_t max_print_fan_errors = 0 ;
562
- uint8_t max_extruder_fan_errors = 0 ;
561
+ uint8_t max_fan_errors[2 ];
563
562
#ifdef FAN_SOFT_PWM
564
- max_print_fan_errors = 3 ; // 15 seconds
565
- max_extruder_fan_errors = 2 ; // 10seconds
563
+ max_fan_errors[ 1 ] = 3 ; // 15 seconds (Print fan)
564
+ max_fan_errors[ 0 ] = 2 ; // 10 seconds (Extruder fan)
566
565
#else // FAN_SOFT_PWM
567
- max_print_fan_errors = 15 ; // 15 seconds
568
- max_extruder_fan_errors = 5 ; // 5 seconds
566
+ max_fan_errors[ 1 ] = 15 ; // 15 seconds (Print fan)
567
+ max_fan_errors[ 0 ] = 5 ; // 5 seconds (Extruder fan)
569
568
#endif // FAN_SOFT_PWM
570
-
571
- if (fans_check_enabled != false )
572
- fans_check_enabled = (eeprom_read_byte ((uint8_t *)EEPROM_FAN_CHECK_ENABLED) > 0 );
573
- static unsigned char fan_speed_errors[2 ] = { 0 ,0 };
569
+
570
+ if (fans_check_enabled)
571
+ fans_check_enabled = (eeprom_read_byte ((uint8_t *)EEPROM_FAN_CHECK_ENABLED) > 0 );
572
+ static uint8_t fan_speed_errors[2 ] = { 0 ,0 };
574
573
#if (defined(FANCHECK) && defined(TACH_0) && (TACH_0 >-1))
575
574
if ((fan_speed[0 ] < 20 ) && (current_temperature[0 ] > EXTRUDER_AUTO_FAN_TEMPERATURE)){ fan_speed_errors[0 ]++;}
576
575
else fan_speed_errors[0 ] = 0 ;
@@ -589,13 +588,16 @@ void checkFanSpeed()
589
588
fan_check_error = EFCE_OK; // if the issue is fixed while the printer is doing nothing, reenable processing immediately.
590
589
lcd_reset_alert_level (); // for another fan speed error
591
590
}
592
- if ((fan_speed_errors[0 ] > max_extruder_fan_errors) && fans_check_enabled && (fan_check_error == EFCE_OK)) {
593
- fan_speed_errors[0 ] = 0 ;
594
- fanSpeedError (0 ); // extruder fan
595
- }
596
- if ((fan_speed_errors[1 ] > max_print_fan_errors) && fans_check_enabled && (fan_check_error == EFCE_OK)) {
597
- fan_speed_errors[1 ] = 0 ;
598
- fanSpeedError (1 ); // print fan
591
+ if (fans_check_enabled && (fan_check_error == EFCE_OK))
592
+ {
593
+ for (uint8_t fan = 0 ; fan < 2 ; fan++)
594
+ {
595
+ if (fan_speed_errors[fan] > max_fan_errors[fan])
596
+ {
597
+ fan_speed_errors[fan] = 0 ;
598
+ fanSpeedError (fan);
599
+ }
600
+ }
599
601
}
600
602
}
601
603
0 commit comments