zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Minor cleanup of the new FAN_KICKSTART code. #334

Browse source
This commit is contained in:
daid303 2013-01-10 11:08:45 +01:00
parent 6ec56fa923
commit 0f3f5d083d
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/Configuration_adv.h
View file

@ -68,8 +68,8 @@
// When first starting the main fan, run it at full speed for the // When first starting the main fan, run it at full speed for the
// given number of milliseconds. This gets the fan spinning reliably // given number of milliseconds. This gets the fan spinning reliably
// before setting a PWM value. Set to zero to disable. // before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
#define FAN_KICKSTART_TIME 100 //#define FAN_KICKSTART_TIME 100
//=========================================================================== //===========================================================================
//=============================Mechanical Settings=========================== //=============================Mechanical Settings===========================

34
Marlin/planner.cpp
View file

@ -466,23 +466,23 @@ void check_axes_activity()
} }
#if FAN_PIN > -1 #if FAN_PIN > -1
#ifndef FAN_SOFT_PWM #ifndef FAN_SOFT_PWM
if (FAN_KICKSTART_TIME) { #ifdef FAN_KICKSTART_TIME
static unsigned long FanKickEnd; static unsigned long fan_kick_end;
if (tail_fan_speed) { if (tail_fan_speed) {
if (FanKickEnd == 0) { if (fan_kick_end == 0) {
// Just starting up fan - run at full power. // Just starting up fan - run at full power.
FanKickEnd = millis() + FAN_KICKSTART_TIME; fan_kick_end = millis() + FAN_KICKSTART_TIME;
tail_fan_speed = 255; tail_fan_speed = 255;
} else if (FanKickEnd > millis()) } else if (fan_kick_end > millis())
// Fan still spinning up. // Fan still spinning up.
tail_fan_speed = 255; tail_fan_speed = 255;
} else { } else {
FanKickEnd = 0; fan_kick_end = 0;
} }
} #endif//FAN_KICKSTART_TIME
analogWrite(FAN_PIN,tail_fan_speed); analogWrite(FAN_PIN,tail_fan_speed);
#endif #endif//!FAN_SOFT_PWM
#endif #endif//FAN_PIN > -1
#ifdef AUTOTEMP #ifdef AUTOTEMP
getHighESpeed(); getHighESpeed();
#endif #endif