From b2671783700fa1891454d5841985cb3c3b5c6db3 Mon Sep 17 00:00:00 2001 From: Adrian Keet Date: Sun, 17 May 2020 13:26:51 -0700 Subject: 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 --- klippy/extras/controller_fan.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'klippy/extras/controller_fan.py') diff --git a/klippy/extras/controller_fan.py b/klippy/extras/controller_fan.py index 89e365a9..1828a200 100644 --- a/klippy/extras/controller_fan.py +++ b/klippy/extras/controller_fan.py @@ -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 -- cgit v1.2.3-70-g09d2