diff options
author | Kevin O'Connor <kevin@koconnor.net> | 2019-11-12 14:21:15 -0500 |
---|---|---|
committer | Kevin O'Connor <kevin@koconnor.net> | 2019-11-12 17:32:18 -0500 |
commit | a4995c61c986d947af03b6f90c945cfcf8577811 (patch) | |
tree | f9de675363b65d6bd763be53796fcdadcaccfce3 | |
parent | 78153ca4c3cb93df7bf651113c166f1866623b1a (diff) | |
download | kutter-a4995c61c986d947af03b6f90c945cfcf8577811.tar.gz kutter-a4995c61c986d947af03b6f90c945cfcf8577811.tar.xz kutter-a4995c61c986d947af03b6f90c945cfcf8577811.zip |
stepper: Remove add_to_endstop() method
Now that the PrinterStepper and MCU_stepper classes have been merged,
there is no need for the add_to_endstop() method.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
-rw-r--r-- | klippy/extras/bltouch.py | 2 | ||||
-rw-r--r-- | klippy/extras/probe.py | 2 | ||||
-rw-r--r-- | klippy/kinematics/corexy.py | 6 | ||||
-rw-r--r-- | klippy/stepper.py | 9 |
4 files changed, 8 insertions, 11 deletions
diff --git a/klippy/extras/bltouch.py b/klippy/extras/bltouch.py index 52c6586d..79cd1735 100644 --- a/klippy/extras/bltouch.py +++ b/klippy/extras/bltouch.py @@ -63,7 +63,7 @@ class BLTouchEndstopWrapper: def _build_config(self): kin = self.printer.lookup_object('toolhead').get_kinematics() for stepper in kin.get_steppers('Z'): - stepper.add_to_endstop(self) + self.add_stepper(stepper) def handle_connect(self): try: self.raise_probe() diff --git a/klippy/extras/probe.py b/klippy/extras/probe.py index 69437f23..2de2c3d8 100644 --- a/klippy/extras/probe.py +++ b/klippy/extras/probe.py @@ -242,7 +242,7 @@ class ProbeEndstopWrapper: def _build_config(self): kin = self.printer.lookup_object('toolhead').get_kinematics() for stepper in kin.get_steppers('Z'): - stepper.add_to_endstop(self) + self.add_stepper(stepper) def home_prepare(self): toolhead = self.printer.lookup_object('toolhead') start_pos = toolhead.get_position() diff --git a/klippy/kinematics/corexy.py b/klippy/kinematics/corexy.py index 2c041a79..21901720 100644 --- a/klippy/kinematics/corexy.py +++ b/klippy/kinematics/corexy.py @@ -12,8 +12,10 @@ class CoreXYKinematics: self.rails = [ stepper.PrinterRail(config.getsection('stepper_x')), stepper.PrinterRail(config.getsection('stepper_y')), stepper.LookupMultiRail(config.getsection('stepper_z')) ] - self.rails[0].add_to_endstop(self.rails[1].get_endstops()[0][0]) - self.rails[1].add_to_endstop(self.rails[0].get_endstops()[0][0]) + self.rails[0].get_endstops()[0][0].add_stepper( + self.rails[1].get_steppers()[0]) + self.rails[1].get_endstops()[0][0].add_stepper( + self.rails[0].get_steppers()[0]) self.rails[0].setup_itersolve('corexy_stepper_alloc', '+') self.rails[1].setup_itersolve('corexy_stepper_alloc', '-') self.rails[2].setup_itersolve('cartesian_stepper_alloc', 'z') diff --git a/klippy/stepper.py b/klippy/stepper.py index 806fc2ab..97a1283e 100644 --- a/klippy/stepper.py +++ b/klippy/stepper.py @@ -47,8 +47,6 @@ class MCU_stepper: if short and self._name.startswith('stepper_'): return self._name[8:] return self._name - def add_to_endstop(self, mcu_endstop): - mcu_endstop.add_stepper(self) def _dist_to_time(self, dist, start_velocity, accel): # Calculate the time it takes to travel a distance with constant accel time_offset = start_velocity / accel @@ -254,19 +252,16 @@ class PrinterRail: self.steppers.append(stepper) if self.endstops and config.get('endstop_pin', None) is None: # No endstop defined - use primary endstop - stepper.add_to_endstop(self.endstops[0][0]) + self.endstops[0][0].add_stepper(stepper) return printer = config.get_printer() ppins = printer.lookup_object('pins') mcu_endstop = ppins.setup_pin('endstop', config.get('endstop_pin')) - stepper.add_to_endstop(mcu_endstop) + mcu_endstop.add_stepper(stepper) name = stepper.get_name(short=True) self.endstops.append((mcu_endstop, name)) query_endstops = printer.try_load_module(config, 'query_endstops') query_endstops.register_endstop(mcu_endstop, name) - def add_to_endstop(self, mcu_endstop): - for stepper in self.steppers: - stepper.add_to_endstop(mcu_endstop) def setup_itersolve(self, alloc_func, *params): for stepper in self.steppers: stepper.setup_itersolve(alloc_func, *params) |