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/kinematics/extruder.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'klippy/kinematics/extruder.py') diff --git a/klippy/kinematics/extruder.py b/klippy/kinematics/extruder.py index c7884932..2921ef0a 100644 --- a/klippy/kinematics/extruder.py +++ b/klippy/kinematics/extruder.py @@ -11,12 +11,12 @@ class PrinterExtruder: self.printer = config.get_printer() self.name = config.get_name() shared_heater = config.get('shared_heater', None) - pheater = self.printer.lookup_object('heater') + pheaters = self.printer.try_load_module(config, 'heaters') gcode_id = 'T%d' % (extruder_num,) if shared_heater is None: - self.heater = pheater.setup_heater(config, gcode_id) + self.heater = pheaters.setup_heater(config, gcode_id) else: - self.heater = pheater.lookup_heater(shared_heater) + self.heater = pheaters.lookup_heater(shared_heater) self.stepper = stepper.PrinterStepper(config) self.nozzle_diameter = config.getfloat('nozzle_diameter', above=0.) filament_diameter = config.getfloat( @@ -167,7 +167,7 @@ class PrinterExtruder: heater = extruder.get_heater() heater.set_temp(temp) if wait and temp: - self.printer.lookup_object('heater').wait_for_temperature(heater) + self.printer.lookup_object('heaters').wait_for_temperature(heater) def cmd_M109(self, params): # Set Extruder Temperature and Wait self.cmd_M104(params, wait=True) -- cgit v1.2.3-70-g09d2