Commit 9667bff1 authored by Simone Primarosa's avatar Simone Primarosa

Update 4.1.5 dev

parent 94a02a0e
...@@ -273,9 +273,6 @@ extern int fanSpeed; ...@@ -273,9 +273,6 @@ extern int fanSpeed;
#if ENABLED(FAN_SOFT_PWM) #if ENABLED(FAN_SOFT_PWM)
extern unsigned char fanSpeedSoftPwm; extern unsigned char fanSpeedSoftPwm;
#if HAS_AUTO_FAN_0 || HAS_AUTO_FAN_1 || HAS_AUTO_FAN_2 || HAS_AUTO_FAN_3
extern unsigned char fanSpeedSoftPwm_auto;
#endif
#if HAS_CONTROLLERFAN #if HAS_CONTROLLERFAN
extern unsigned char fanSpeedSoftPwm_controller; extern unsigned char fanSpeedSoftPwm_controller;
#endif #endif
......
...@@ -62,7 +62,7 @@ float current_temperature_bed = 0.0; ...@@ -62,7 +62,7 @@ float current_temperature_bed = 0.0;
#if ENABLED(FAN_SOFT_PWM) #if ENABLED(FAN_SOFT_PWM)
unsigned char fanSpeedSoftPwm = 0; unsigned char fanSpeedSoftPwm = 0;
#if HAS_AUTO_FAN #if HAS_AUTO_FAN
unsigned char fanSpeedSoftPwm_Auto = EXTRUDER_AUTO_FAN_MIN_SPEED; unsigned char fanSpeedSoftPwm_auto = EXTRUDER_AUTO_FAN_MIN_SPEED;
#endif #endif
#if HAS_CONTROLLERFAN #if HAS_CONTROLLERFAN
unsigned char fanSpeedSoftPwm_controller = CONTROLLERFAN_MIN_SPEED; unsigned char fanSpeedSoftPwm_controller = CONTROLLERFAN_MIN_SPEED;
...@@ -907,12 +907,6 @@ void tp_init() { ...@@ -907,12 +907,6 @@ void tp_init() {
#endif #endif
#if ENABLED(FAN_SOFT_PWM) #if ENABLED(FAN_SOFT_PWM)
soft_pwm_fan = fanSpeedSoftPwm / 2; soft_pwm_fan = fanSpeedSoftPwm / 2;
#if HAS_CONTROLLERFAN
soft_pwm_fan_controller = fanSpeedSoftPwm_controller / 2;
#endif
#if HAS_AUTO_FAN
soft_pwm_fan_auto = fanSpeedSoftPwm_auto / 2;
#endif
#endif #endif
#endif #endif
...@@ -961,7 +955,7 @@ void tp_init() { ...@@ -961,7 +955,7 @@ void tp_init() {
#if HAS_FILAMENT_SENSOR #if HAS_FILAMENT_SENSOR
ANALOG_SELECT(FILWIDTH_PIN); ANALOG_SELECT(FILWIDTH_PIN);
#endif #endif
#if HAS_AUTO_FAN_0 #if HAS_AUTO_FAN_0
SET_OUTPUT(EXTRUDER_0_AUTO_FAN_PIN); SET_OUTPUT(EXTRUDER_0_AUTO_FAN_PIN);
#endif #endif
...@@ -978,6 +972,15 @@ void tp_init() { ...@@ -978,6 +972,15 @@ void tp_init() {
#if HAS_CONTROLLERFAN #if HAS_CONTROLLERFAN
SET_OUTPUT(CONTROLLERFAN_PIN); //Set pin used for driver cooling fan SET_OUTPUT(CONTROLLERFAN_PIN); //Set pin used for driver cooling fan
#endif #endif
#if ENABLED(FAN_SOFT_PWM)
#if HAS_CONTROLLERFAN
soft_pwm_fan_controller = fanSpeedSoftPwm_controller / 2;
#endif
#if HAS_AUTO_FAN
soft_pwm_fan_auto = fanSpeedSoftPwm_auto / 2;
#endif
#endif
#if HAS_POWER_CONSUMPTION_SENSOR #if HAS_POWER_CONSUMPTION_SENSOR
ANALOG_SELECT(POWER_CONSUMPTION_PIN); ANALOG_SELECT(POWER_CONSUMPTION_PIN);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment