From 0e30b862c7e94a9e259f213dd25ec1671ca560c9 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Tue, 12 Nov 2019 12:49:21 -0500 Subject: stepper_enable: Move enable tracking from stepper.py to stepper_enable.py Move the enable line tracking out of the main stepper.py code. This simplifies the main kinematic code. Signed-off-by: Kevin O'Connor --- klippy/extras/controller_fan.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'klippy/extras/controller_fan.py') diff --git a/klippy/extras/controller_fan.py b/klippy/extras/controller_fan.py index 9837b212..31c1e6a7 100644 --- a/klippy/extras/controller_fan.py +++ b/klippy/extras/controller_fan.py @@ -11,7 +11,9 @@ class ControllerFan: def __init__(self, config): self.printer = config.get_printer() self.printer.register_event_handler("klippy:ready", self.handle_ready) - self.steppers = [] + self.stepper_names = [] + self.stepper_enable = self.printer.try_load_module(config, + 'stepper_enable') self.heaters = [] self.fan = fan.PrinterFan(config) self.mcu = self.fan.mcu_fan.get_mcu() @@ -29,14 +31,14 @@ class ControllerFan: self.heaters = [pheater.lookup_heater(n.strip()) for n in self.heater_name.split(',')] kin = self.printer.lookup_object('toolhead').get_kinematics() - self.steppers = kin.get_steppers() + self.stepper_names = [s.get_name() for s in kin.get_steppers()] reactor = self.printer.get_reactor() reactor.register_timer(self.callback, reactor.NOW) def callback(self, eventtime): power = 0. active = False - for stepper in self.steppers: - active |= stepper.is_motor_enabled() + for name in self.stepper_names: + active |= self.stepper_enable.is_motor_enabled(name) for heater in self.heaters: _, target_temp = heater.get_temp(eventtime) if target_temp: -- cgit v1.2.3-70-g09d2