diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2017-08-29 17:56:19 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2017-08-29 17:59:15 -0400 |
| commit | c7c551369f38eb3de73516ec9239a1014377a397 (patch) | |
| tree | 895a0b2b55f644b7a78a4842107e4e285c4442c2 | |
| parent | 0c2919b53403ff9bce7773550b7625a021cd663a (diff) | |
| download | kutter-c7c551369f38eb3de73516ec9239a1014377a397.tar.gz kutter-c7c551369f38eb3de73516ec9239a1014377a397.tar.xz kutter-c7c551369f38eb3de73516ec9239a1014377a397.zip | |
mcu: Fix bug causing corexy to not work (introduced in 9d75c3b0)
Commit 9d75c3b0 changed the order of allocation for mcu oid integer
ids. However, the stepper oids must always be allocated before
endstop oids so that corexy can register multiple steppers on a single
endstop.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
| -rw-r--r-- | klippy/mcu.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/klippy/mcu.py b/klippy/mcu.py index b653379a..6628b462 100644 --- a/klippy/mcu.py +++ b/klippy/mcu.py @@ -14,6 +14,7 @@ STEPCOMPRESS_ERROR_RET = -989898989 class MCU_stepper: def __init__(self, mcu, pin_params): self._mcu = mcu + self._oid = self._mcu.create_oid() self._step_pin = pin_params['pin'] self._invert_step = pin_params['invert'] self._dir_pin = self._invert_dir = None @@ -22,7 +23,7 @@ class MCU_stepper: self._velocity_factor = self._accel_factor = 0. self._mcu_position_offset = 0 self._mcu_freq = self._min_stop_interval = 0. - self._oid = self._reset_cmd = self._get_position_cmd = None + self._reset_cmd = self._get_position_cmd = None self._ffi_lib = self._stepqueue = None self.print_to_mcu_time = mcu.print_to_mcu_time self.system_to_mcu_time = mcu.system_to_mcu_time @@ -38,7 +39,6 @@ class MCU_stepper: self._inv_step_dist = 1. / step_dist def build_config(self): self._mcu_freq = self._mcu.get_mcu_freq() - self._oid = self._mcu.create_oid() self._velocity_factor = 1. / (self._mcu_freq * self._step_dist) self._accel_factor = 1. / (self._mcu_freq**2 * self._step_dist) max_error = self._mcu.get_max_stepper_error() |