From 4ca190d3934d665e1bbc2b729e233530e689f034 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Tue, 12 Nov 2019 13:55:50 -0500 Subject: stepper: Move MCU_stepper from mcu.py to stepper.py Signed-off-by: Kevin O'Connor --- klippy/extras/stepper_enable.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'klippy/extras/stepper_enable.py') diff --git a/klippy/extras/stepper_enable.py b/klippy/extras/stepper_enable.py index 8f028055..52910387 100644 --- a/klippy/extras/stepper_enable.py +++ b/klippy/extras/stepper_enable.py @@ -54,19 +54,21 @@ def lookup_enable_pin(ppins, pin_list): class EnableTracking: def __init__(self, printer, stepper, pin): self.stepper = stepper - self.is_motor_enabled = False + self.is_enabled = False self.stepper.add_active_callback(self.motor_enable) self.enable = lookup_enable_pin(printer.lookup_object('pins'), pin) def motor_enable(self, print_time): - if not self.is_motor_enabled: + if not self.is_enabled: self.enable.set_enable(print_time) - self.is_motor_enabled = True + self.is_enabled = True def motor_disable(self, print_time): - if self.is_motor_enabled: + if self.is_enabled: # Enable stepper on future stepper movement self.enable.set_disable(print_time) - self.is_motor_enabled = False + self.is_enabled = False self.stepper.add_active_callback(self.motor_enable) + def is_motor_enabled(self): + return self.is_enabled class PrinterStepperEnable: def __init__(self, config): @@ -95,12 +97,8 @@ class PrinterStepperEnable: def cmd_M18(self, params): # Turn off motors self.motor_off() - def is_motor_enabled(self, name): - return self.enable_lines[name].is_motor_enabled - def motor_enable(self, name, print_time): - self.enable_lines[name].motor_enable(print_time) - def motor_disable(self, name, print_time): - self.enable_lines[name].motor_disable(print_time) + def lookup_enable(self, name): + return self.enable_lines[name] def load_config(config): return PrinterStepperEnable(config) -- cgit v1.2.3-70-g09d2