|
@@ -433,23 +433,20 @@ void check_axes_activity() {
|
433
|
433
|
|
434
|
434
|
#if HAS_FAN
|
435
|
435
|
#ifdef FAN_KICKSTART_TIME
|
436
|
|
- static millis_t fan_kick_end;
|
|
436
|
+ static millis_t fan_kick_end = 0;
|
437
|
437
|
if (tail_fan_speed) {
|
438
|
438
|
millis_t ms = millis();
|
439
|
439
|
if (fan_kick_end == 0) {
|
440
|
|
- // Just starting up fan - run at full power.
|
441
|
440
|
fan_kick_end = ms + FAN_KICKSTART_TIME;
|
442
|
|
- tail_fan_speed = 255;
|
|
441
|
+ tail_fan_speed = 255; // Starting up.
|
443
|
442
|
}
|
444
|
|
- else if (fan_kick_end > ms)
|
445
|
|
- // Fan still spinning up.
|
446
|
|
- tail_fan_speed = 255;
|
447
|
|
- }
|
448
|
|
- else {
|
|
443
|
+ else if (ms < fan_kick_end)
|
|
444
|
+ tail_fan_speed = 255; // Still spinning up.
|
|
445
|
+ else
|
449
|
446
|
fan_kick_end = 0;
|
450
|
|
- }
|
|
447
|
+ }
|
451
|
448
|
#endif //FAN_KICKSTART_TIME
|
452
|
|
- #if ENABLED(FAN_MIN_PWM)
|
|
449
|
+ #if defined(FAN_MIN_PWM)
|
453
|
450
|
#define CALC_FAN_SPEED (tail_fan_speed ? ( FAN_MIN_PWM + (tail_fan_speed * (255 - FAN_MIN_PWM)) / 255 ) : 0)
|
454
|
451
|
#else
|
455
|
452
|
#define CALC_FAN_SPEED tail_fan_speed
|