Merge PR #2118
This commit is contained in:
commit
cf5d64d940
@ -94,6 +94,11 @@
|
|||||||
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
|
// 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
|
||||||
|
|
||||||
|
// This defines the minimal speed for the main fan, run in PWM mode
|
||||||
|
// to enable uncomment and set minimal PWM speed for reliable running (1-255)
|
||||||
|
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM
|
||||||
|
//#define FAN_MIN_PWM 50
|
||||||
|
|
||||||
// @section extruder
|
// @section extruder
|
||||||
|
|
||||||
// Extruder cooling fans
|
// Extruder cooling fans
|
||||||
|
@ -102,6 +102,11 @@
|
|||||||
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
|
// 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
|
||||||
|
|
||||||
|
// This defines the minimal speed for the main fan, run in PWM mode
|
||||||
|
// to enable uncomment and set minimal PWM speed for reliable running (1-255)
|
||||||
|
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM
|
||||||
|
//#define FAN_MIN_PWM 50
|
||||||
|
|
||||||
// @section extruder
|
// @section extruder
|
||||||
|
|
||||||
// Extruder cooling fans
|
// Extruder cooling fans
|
||||||
|
@ -102,6 +102,11 @@
|
|||||||
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
|
// 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
|
||||||
|
|
||||||
|
// This defines the minimal speed for the main fan, run in PWM mode
|
||||||
|
// to enable uncomment and set minimal PWM speed for reliable running (1-255)
|
||||||
|
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM
|
||||||
|
//#define FAN_MIN_PWM 50
|
||||||
|
|
||||||
// @section extruder
|
// @section extruder
|
||||||
|
|
||||||
// Extruder cooling fans
|
// Extruder cooling fans
|
||||||
|
@ -102,6 +102,11 @@
|
|||||||
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
|
// 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
|
||||||
|
|
||||||
|
// This defines the minimal speed for the main fan, run in PWM mode
|
||||||
|
// to enable uncomment and set minimal PWM speed for reliable running (1-255)
|
||||||
|
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM
|
||||||
|
#define FAN_MIN_PWM 50 // K8200: fan stops running at about 35 to 40 (of 255)
|
||||||
|
|
||||||
// @section extruder
|
// @section extruder
|
||||||
|
|
||||||
// Extruder cooling fans
|
// Extruder cooling fans
|
||||||
|
@ -102,6 +102,11 @@
|
|||||||
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
|
// 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
|
||||||
|
|
||||||
|
// This defines the minimal speed for the main fan, run in PWM mode
|
||||||
|
// to enable uncomment and set minimal PWM speed for reliable running (1-255)
|
||||||
|
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM
|
||||||
|
//#define FAN_MIN_PWM 50
|
||||||
|
|
||||||
// @section extruder
|
// @section extruder
|
||||||
|
|
||||||
// Extruder cooling fans
|
// Extruder cooling fans
|
||||||
|
@ -102,6 +102,11 @@
|
|||||||
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
|
// 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
|
||||||
|
|
||||||
|
// This defines the minimal speed for the main fan, run in PWM mode
|
||||||
|
// to enable uncomment and set minimal PWM speed for reliable running (1-255)
|
||||||
|
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM
|
||||||
|
//#define FAN_MIN_PWM 50
|
||||||
|
|
||||||
// @section extruder
|
// @section extruder
|
||||||
|
|
||||||
// Extruder cooling fans
|
// Extruder cooling fans
|
||||||
|
@ -102,6 +102,11 @@
|
|||||||
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
|
// 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
|
||||||
|
|
||||||
|
// This defines the minimal speed for the main fan, run in PWM mode
|
||||||
|
// to enable uncomment and set minimal PWM speed for reliable running (1-255)
|
||||||
|
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM
|
||||||
|
//#define FAN_MIN_PWM 50
|
||||||
|
|
||||||
// @section extruder
|
// @section extruder
|
||||||
|
|
||||||
// Extruder cooling fans
|
// Extruder cooling fans
|
||||||
|
@ -102,6 +102,11 @@
|
|||||||
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
|
// 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
|
||||||
|
|
||||||
|
// This defines the minimal speed for the main fan, run in PWM mode
|
||||||
|
// to enable uncomment and set minimal PWM speed for reliable running (1-255)
|
||||||
|
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM
|
||||||
|
//#define FAN_MIN_PWM 50
|
||||||
|
|
||||||
// @section extruder
|
// @section extruder
|
||||||
|
|
||||||
// Extruder cooling fans
|
// Extruder cooling fans
|
||||||
|
@ -102,6 +102,11 @@
|
|||||||
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
|
// 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
|
||||||
|
|
||||||
|
// This defines the minimal speed for the main fan, run in PWM mode
|
||||||
|
// to enable uncomment and set minimal PWM speed for reliable running (1-255)
|
||||||
|
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM
|
||||||
|
//#define FAN_MIN_PWM 50
|
||||||
|
|
||||||
// @section extruder
|
// @section extruder
|
||||||
|
|
||||||
// Extruder cooling fans
|
// Extruder cooling fans
|
||||||
|
@ -102,6 +102,11 @@
|
|||||||
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
|
// 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
|
||||||
|
|
||||||
|
// This defines the minimal speed for the main fan, run in PWM mode
|
||||||
|
// to enable uncomment and set minimal PWM speed for reliable running (1-255)
|
||||||
|
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM
|
||||||
|
//#define FAN_MIN_PWM 50
|
||||||
|
|
||||||
// @section extruder
|
// @section extruder
|
||||||
|
|
||||||
// Extruder cooling fans
|
// Extruder cooling fans
|
||||||
|
@ -102,6 +102,11 @@
|
|||||||
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
|
// 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
|
||||||
|
|
||||||
|
// This defines the minimal speed for the main fan, run in PWM mode
|
||||||
|
// to enable uncomment and set minimal PWM speed for reliable running (1-255)
|
||||||
|
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM
|
||||||
|
//#define FAN_MIN_PWM 50
|
||||||
|
|
||||||
// @section extruder
|
// @section extruder
|
||||||
|
|
||||||
// Extruder cooling fans
|
// Extruder cooling fans
|
||||||
|
@ -440,12 +440,17 @@ void check_axes_activity() {
|
|||||||
} else {
|
} else {
|
||||||
fan_kick_end = 0;
|
fan_kick_end = 0;
|
||||||
}
|
}
|
||||||
#endif//FAN_KICKSTART_TIME
|
#endif //FAN_KICKSTART_TIME
|
||||||
#ifdef FAN_SOFT_PWM
|
#ifdef FAN_MIN_PWM
|
||||||
fanSpeedSoftPwm = tail_fan_speed;
|
#define CALC_FAN_SPEED (tail_fan_speed ? ( FAN_MIN_PWM + (tail_fan_speed * (255 - FAN_MIN_PWM)) / 255 ) : 0)
|
||||||
#else
|
#else
|
||||||
analogWrite(FAN_PIN, tail_fan_speed);
|
#define CALC_FAN_SPEED tail_fan_speed
|
||||||
#endif //!FAN_SOFT_PWM
|
#endif // FAN_MIN_PWM
|
||||||
|
#ifdef FAN_SOFT_PWM
|
||||||
|
fanSpeedSoftPwm = CALC_FAN_SPEED;
|
||||||
|
#else
|
||||||
|
analogWrite(FAN_PIN, CALC_FAN_SPEED);
|
||||||
|
#endif // FAN_SOFT_PWM
|
||||||
#endif // HAS_FAN
|
#endif // HAS_FAN
|
||||||
|
|
||||||
#ifdef AUTOTEMP
|
#ifdef AUTOTEMP
|
||||||
|
Loading…
Reference in New Issue
Block a user