controller_fan: Add fan_speed parameter.

This gives it parity with heater_fan.  Also change the default speed from
max_power to 1.0, since it is already scaled by max_power in set_speed.

Signed-off-by: Adrian Keet <arkeet@gmail.com>
This commit is contained in:
Adrian Keet 2020-05-17 13:26:51 -07:00 committed by KevinOConnor
parent 9530373ccb
commit b267178370
2 changed files with 9 additions and 8 deletions

View file

@ -17,12 +17,10 @@ class ControllerFan:
self.heaters = []
self.fan = fan.PrinterFan(config)
self.mcu = self.fan.mcu_fan.get_mcu()
self.max_power = config.getfloat(
'max_power', default=1.,
minval=0., maxval=1.)
self.fan_speed = config.getfloat(
'fan_speed', default=1., minval=0., maxval=1.)
self.idle_speed = config.getfloat(
'idle_speed', default=self.max_power,
minval=0., maxval=self.max_power)
'idle_speed', default=self.fan_speed, minval=0., maxval=1.)
self.idle_timeout = config.getint("idle_timeout", default=30, minval=0)
self.heater_name = config.get("heater", "extruder")
self.last_on = self.idle_timeout
@ -45,7 +43,7 @@ class ControllerFan:
active = True
if active:
self.last_on = 0
power = self.max_power
power = self.fan_speed
elif self.last_on < self.idle_timeout:
power = self.idle_speed
self.last_on += 1