diff options
author | Kevin O'Connor <kevin@koconnor.net> | 2018-06-21 17:58:18 -0400 |
---|---|---|
committer | Kevin O'Connor <kevin@koconnor.net> | 2018-06-22 14:09:01 -0400 |
commit | 9a97a348ae8ba765f8e6877b41eeb76805911863 (patch) | |
tree | 067aa165fb73858d87476338a9ccae02ad7b6a5c /klippy | |
parent | 28b7a286517058e782fc7e20da8b6332a7c7661d (diff) | |
download | kutter-9a97a348ae8ba765f8e6877b41eeb76805911863.tar.gz kutter-9a97a348ae8ba765f8e6877b41eeb76805911863.tar.xz kutter-9a97a348ae8ba765f8e6877b41eeb76805911863.zip |
stepper: Add a is_stepper_enabled() method to PrinterStepper
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy')
-rw-r--r-- | klippy/cartesian.py | 2 | ||||
-rw-r--r-- | klippy/corexy.py | 2 | ||||
-rw-r--r-- | klippy/extras/stepper_buzz.py | 2 | ||||
-rw-r--r-- | klippy/stepper.py | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/klippy/cartesian.py b/klippy/cartesian.py index 096d0fd2..8bf2f609 100644 --- a/klippy/cartesian.py +++ b/klippy/cartesian.py @@ -117,7 +117,7 @@ class CartKinematics: for i in StepList: if move.axes_d[i]: self.steppers[i].motor_enable(print_time, 1) - need_motor_enable |= self.steppers[i].need_motor_enable + need_motor_enable |= not self.steppers[i].is_motor_enabled() self.need_motor_enable = need_motor_enable def _check_endstops(self, move): end_pos = move.end_pos diff --git a/klippy/corexy.py b/klippy/corexy.py index 7f336358..daa6e160 100644 --- a/klippy/corexy.py +++ b/klippy/corexy.py @@ -101,7 +101,7 @@ class CoreXYKinematics: self.steppers[2].motor_enable(print_time, 1) need_motor_enable = False for i in StepList: - need_motor_enable |= self.steppers[i].need_motor_enable + need_motor_enable |= not self.steppers[i].is_motor_enabled() self.need_motor_enable = need_motor_enable def _check_endstops(self, move): end_pos = move.end_pos diff --git a/klippy/extras/stepper_buzz.py b/klippy/extras/stepper_buzz.py index a9cc5b80..1e106b2a 100644 --- a/klippy/extras/stepper_buzz.py +++ b/klippy/extras/stepper_buzz.py @@ -35,7 +35,7 @@ class StepperBuzz: name = self.gcode.get_str('STEPPER', params) logging.info("Stepper buzz %s", name) stepper = self.steppers[name] - need_motor_enable = stepper.need_motor_enable + need_motor_enable = not stepper.is_motor_enabled() # Move stepper toolhead = self.printer.lookup_object('toolhead') toolhead.wait_moves() diff --git a/klippy/stepper.py b/klippy/stepper.py index d2020a34..0fb29b25 100644 --- a/klippy/stepper.py +++ b/klippy/stepper.py @@ -76,6 +76,8 @@ class PrinterStepper: if self.need_motor_enable != (not enable): self.enable.set_enable(print_time, enable) self.need_motor_enable = not enable + def is_motor_enabled(self): + return not self.need_motor_enable # Support for stepper controlled linear axis with an endstop class PrinterHomingStepper(PrinterStepper): |