SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add FAN_MAX_PWM for M106-controlled fans

Browse source
This commit is contained in:
Jiri Jaburek 2018-05-15 19:56:48 +02:00 committed by Scott Lahteine
parent 0ea60d506a
commit 43ddb29f9e
4 changed files with 45 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Marlin/Configuration_adv.h
View file

@ -208,10 +208,20 @@
// 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) * PWM Fan Scaling
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM *
* Define the min/max speeds for PWM fans (as set with M106).
*
* With these options the M106 0-255 value range is scaled to a subset
* to ensure that the fan has enough power to spin, or to run lower
* current fans with higher current. (e.g., 5V/12V fans with 12V/24V)
* Value 0 always turns off the fan.
*
* Define one or both of these to override the default 0-255 range.
*/
//#define FAN_MIN_PWM 50 //#define FAN_MIN_PWM 50
//#define FAN_MAX_PWM 128
// @section extruder // @section extruder

16
Marlin/src/config/default/Configuration_adv.h
View file

@ -208,10 +208,20 @@
// 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) * PWM Fan Scaling
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM *
* Define the min/max speeds for PWM fans (as set with M106).
*
* With these options the M106 0-255 value range is scaled to a subset
* to ensure that the fan has enough power to spin, or to run lower
* current fans with higher current. (e.g., 5V/12V fans with 12V/24V)
* Value 0 always turns off the fan.
*
* Define one or both of these to override the default 0-255 range.
*/
//#define FAN_MIN_PWM 50 //#define FAN_MIN_PWM 50
//#define FAN_MAX_PWM 128
// @section extruder // @section extruder

17
Marlin/src/inc/Conditionals_post.h
View file

@ -979,6 +979,23 @@
*/ */
#define HAS_FANMUX PIN_EXISTS(FANMUX0) #define HAS_FANMUX PIN_EXISTS(FANMUX0)
/**
* MIN/MAX fan PWM scaling
*/
#ifndef FAN_MIN_PWM
#define FAN_MIN_PWM 0
#endif
#ifndef FAN_MAX_PWM
#define FAN_MAX_PWM 255
#endif
#if FAN_MIN_PWM < 0 || FAN_MIN_PWM > 255
#error "FAN_MIN_PWM must be a value from 0 to 255."
#elif FAN_MAX_PWM < 0 || FAN_MAX_PWM > 255
#error "FAN_MAX_PWM must be a value from 0 to 255."
#elif FAN_MIN_PWM > FAN_MAX_PWM
#error "FAN_MIN_PWM must be less than or equal to FAN_MAX_PWM."
#endif
/** /**
* Bed Probe dependencies * Bed Probe dependencies
*/ */

4
Marlin/src/module/planner.cpp
View file

@ -1108,8 +1108,8 @@ void Planner::check_axes_activity() {
#endif // FAN_KICKSTART_TIME > 0 #endif // FAN_KICKSTART_TIME > 0
#ifdef FAN_MIN_PWM #if FAN_MIN_PWM != 0 || FAN_MAX_PWM != 255
#define CALC_FAN_SPEED(f) (tail_fan_speed[f] ? ( FAN_MIN_PWM + (tail_fan_speed[f] * (255 - FAN_MIN_PWM)) / 255 ) : 0) #define CALC_FAN_SPEED(f) (tail_fan_speed[f] ? map(tail_fan_speed[f], 1, 255, FAN_MIN_PWM, FAN_MAX_PWM) : 0)
#else #else
#define CALC_FAN_SPEED(f) tail_fan_speed[f] #define CALC_FAN_SPEED(f) tail_fan_speed[f]
#endif #endif