diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2021-07-19 13:22:40 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2021-07-29 16:35:30 -0400 |
| commit | f0dbeb0493e6866c913c099e002cf9bd50103135 (patch) | |
| tree | 27fe16f1053ec587a14c068702f4cfdf56e62fcd | |
| parent | c632b377ca73a54463650f7a6c45d963cac2fed6 (diff) | |
| download | kutter-f0dbeb0493e6866c913c099e002cf9bd50103135.tar.gz kutter-f0dbeb0493e6866c913c099e002cf9bd50103135.tar.xz kutter-f0dbeb0493e6866c913c099e002cf9bd50103135.zip | |
stepper: Simplify helper module registration of stepper motors
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
| -rw-r--r-- | klippy/extras/force_move.py | 5 | ||||
| -rw-r--r-- | klippy/extras/stepper_enable.py | 8 | ||||
| -rw-r--r-- | klippy/stepper.py | 10 |
3 files changed, 10 insertions, 13 deletions
diff --git a/klippy/extras/force_move.py b/klippy/extras/force_move.py index ec13f6ed..d57e60b1 100644 --- a/klippy/extras/force_move.py +++ b/klippy/extras/force_move.py @@ -49,9 +49,8 @@ class ForceMove: gcode.register_command('SET_KINEMATIC_POSITION', self.cmd_SET_KINEMATIC_POSITION, desc=self.cmd_SET_KINEMATIC_POSITION_help) - def register_stepper(self, stepper): - name = stepper.get_name() - self.steppers[name] = stepper + def register_stepper(self, config, mcu_stepper): + self.steppers[mcu_stepper.get_name()] = mcu_stepper def lookup_stepper(self, name): if name not in self.steppers: raise self.printer.config_error("Unknown stepper %s" % (name,)) diff --git a/klippy/extras/stepper_enable.py b/klippy/extras/stepper_enable.py index cd1d34c6..e8b41c0a 100644 --- a/klippy/extras/stepper_enable.py +++ b/klippy/extras/stepper_enable.py @@ -84,10 +84,10 @@ class PrinterStepperEnable: gcode.register_command("SET_STEPPER_ENABLE", self.cmd_SET_STEPPER_ENABLE, desc=self.cmd_SET_STEPPER_ENABLE_help) - def register_stepper(self, stepper, pin): - name = stepper.get_name() - enable = setup_enable_pin(self.printer, pin) - self.enable_lines[name] = EnableTracking(stepper, enable) + def register_stepper(self, config, mcu_stepper): + name = mcu_stepper.get_name() + enable = setup_enable_pin(self.printer, config.get('enable_pin', None)) + self.enable_lines[name] = EnableTracking(mcu_stepper, enable) def motor_off(self): toolhead = self.printer.lookup_object('toolhead') toolhead.dwell(DISABLE_STALL_TIME) diff --git a/klippy/stepper.py b/klippy/stepper.py index 6609fca2..0263a1a2 100644 --- a/klippy/stepper.py +++ b/klippy/stepper.py @@ -197,12 +197,10 @@ def PrinterStepper(config, units_in_radians=False): step_dist = parse_step_distance(config, units_in_radians, True) mcu_stepper = MCU_stepper(name, step_pin_params, dir_pin_params, step_dist, units_in_radians) - # Support for stepper enable pin handling - stepper_enable = printer.load_object(config, 'stepper_enable') - stepper_enable.register_stepper(mcu_stepper, config.get('enable_pin', None)) - # Register STEPPER_BUZZ command - force_move = printer.load_object(config, 'force_move') - force_move.register_stepper(mcu_stepper) + # Register with helper modules + for mname in ['stepper_enable', 'force_move']: + m = printer.load_object(config, mname) + m.register_stepper(config, mcu_stepper) return mcu_stepper # Parse stepper gear_ratio config parameter |