diff options
author | Kevin O'Connor <kevin@koconnor.net> | 2020-07-03 23:23:24 -0400 |
---|---|---|
committer | Kevin O'Connor <kevin@koconnor.net> | 2020-07-05 21:04:04 -0400 |
commit | 3a57608642f87de7c2d53b1642d21d057767c4a3 (patch) | |
tree | bba2370e1a081a228963ee520d3f551d1fe1fca4 /klippy/extras/controller_fan.py | |
parent | 4bdc11a8b3843b73079a2c8dfc8d8c0928c29662 (diff) | |
download | kutter-3a57608642f87de7c2d53b1642d21d057767c4a3.tar.gz kutter-3a57608642f87de7c2d53b1642d21d057767c4a3.tar.xz kutter-3a57608642f87de7c2d53b1642d21d057767c4a3.zip |
fan: Separate out the part cooling fan code from the generic fan code
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras/controller_fan.py')
-rw-r--r-- | klippy/extras/controller_fan.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/klippy/extras/controller_fan.py b/klippy/extras/controller_fan.py index 562ad2bc..63ed3e5f 100644 --- a/klippy/extras/controller_fan.py +++ b/klippy/extras/controller_fan.py @@ -15,10 +15,9 @@ class ControllerFan: self.stepper_enable = self.printer.load_object(config, 'stepper_enable') self.printer.load_object(config, 'heaters') self.heaters = [] - self.fan = fan.PrinterFan(config) - self.mcu = self.fan.mcu_fan.get_mcu() - self.fan_speed = config.getfloat( - 'fan_speed', default=1., minval=0., maxval=1.) + self.fan = fan.Fan(config) + self.fan_speed = config.getfloat('fan_speed', default=1., + minval=0., maxval=1.) self.idle_speed = config.getfloat( 'idle_speed', default=self.fan_speed, minval=0., maxval=1.) self.idle_timeout = config.getint("idle_timeout", default=30, minval=0) @@ -47,8 +46,8 @@ class ControllerFan: elif self.last_on < self.idle_timeout: power = self.idle_speed self.last_on += 1 - print_time = self.mcu.estimated_print_time(eventtime) + PIN_MIN_TIME - self.fan.set_speed(print_time, power) + print_time = self.fan.get_mcu().estimated_print_time(eventtime) + self.fan.set_speed(print_time + PIN_MIN_TIME, power) return eventtime + 1. def load_config_prefix(config): |