diff options
author | Kevin O'Connor <kevin@koconnor.net> | 2019-10-29 12:06:46 -0400 |
---|---|---|
committer | Kevin O'Connor <kevin@koconnor.net> | 2019-11-06 15:51:51 -0500 |
commit | bd3c8920f617e0159e7d73b97efb9fd36fc8508b (patch) | |
tree | f735c627f5dec703331ba42320a9f765528a1951 /klippy/mcu.py | |
parent | befd263260a42221a5ef0eba3a461c1e63421326 (diff) | |
download | kutter-bd3c8920f617e0159e7d73b97efb9fd36fc8508b.tar.gz kutter-bd3c8920f617e0159e7d73b97efb9fd36fc8508b.tar.xz kutter-bd3c8920f617e0159e7d73b97efb9fd36fc8508b.zip |
mcu: Remove set_ignore_move()
Update callers of set_ignore_move() to use the trapq system to set a
stepper to ignore moves.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/mcu.py')
-rw-r--r-- | klippy/mcu.py | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/klippy/mcu.py b/klippy/mcu.py index ec490e65..e81e7eb4 100644 --- a/klippy/mcu.py +++ b/klippy/mcu.py @@ -26,10 +26,11 @@ class MCU_stepper: self._stepqueue = ffi_main.gc(self._ffi_lib.stepcompress_alloc(oid), self._ffi_lib.stepcompress_free) self._mcu.register_stepqueue(self._stepqueue) - self._stepper_kinematics = self._itersolve_gen_steps = None - self._itersolve_generate_steps = self._itersolve_check_active = None + self._stepper_kinematics = None + self._itersolve_gen_steps = self._ffi_lib.itersolve_gen_steps + self._itersolve_generate_steps = self._ffi_lib.itersolve_generate_steps + self._itersolve_check_active = self._ffi_lib.itersolve_check_active self._trapq = ffi_main.NULL - self.set_ignore_move(False) def get_mcu(self): return self._mcu def setup_dir_pin(self, pin_params): @@ -97,18 +98,6 @@ class MCU_stepper: self._ffi_lib.itersolve_set_stepcompress( sk, self._stepqueue, self._step_dist) return old_sk - def set_ignore_move(self, ignore_move): - fl = self._ffi_lib - was_ignore = self._itersolve_gen_steps is not fl.itersolve_gen_steps - if ignore_move: - self._itersolve_gen_steps = (lambda *args: 0) - self._itersolve_generate_steps = (lambda *args: 0) - self._itersolve_check_active = (lambda *args: 0.) - else: - self._itersolve_gen_steps = fl.itersolve_gen_steps - self._itersolve_generate_steps = fl.itersolve_generate_steps - self._itersolve_check_active = fl.itersolve_check_active - return was_ignore def note_homing_end(self, did_trigger=False): ret = self._ffi_lib.stepcompress_reset(self._stepqueue, 0) if ret: |