From 17123889f698e2339049bd18e7ece01b9c53e892 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Sat, 25 Apr 2020 13:27:41 -0400 Subject: heaters: Make heater.py an "extras" module The heater logic is an independent module that does not need to be treated as part of the "core" klipper code. Signed-off-by: Kevin O'Connor --- klippy/extras/heater_fan.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'klippy/extras/heater_fan.py') diff --git a/klippy/extras/heater_fan.py b/klippy/extras/heater_fan.py index 337dcc09..4a3ace84 100644 --- a/klippy/extras/heater_fan.py +++ b/klippy/extras/heater_fan.py @@ -10,6 +10,7 @@ PIN_MIN_TIME = 0.100 class PrinterHeaterFan: def __init__(self, config): self.printer = config.get_printer() + self.printer.try_load_module(config, 'heaters') self.printer.register_event_handler("klippy:ready", self.handle_ready) self.heater_name = config.get("heater", "extruder") self.heater_temp = config.getfloat("heater_temp", 50.0) @@ -18,8 +19,8 @@ class PrinterHeaterFan: self.mcu = self.fan.mcu_fan.get_mcu() self.fan_speed = config.getfloat("fan_speed", 1., minval=0., maxval=1.) def handle_ready(self): - pheater = self.printer.lookup_object('heater') - self.heaters = [pheater.lookup_heater(n.strip()) + pheaters = self.printer.lookup_object('heaters') + self.heaters = [pheaters.lookup_heater(n.strip()) for n in self.heater_name.split(',')] reactor = self.printer.get_reactor() reactor.register_timer(self.callback, reactor.NOW) -- cgit v1.2.3-70-g09d2