diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2020-04-24 22:53:48 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2020-05-05 11:08:11 -0400 |
| commit | 33c666788165b715bc49eb993e2ce10818f775c5 (patch) | |
| tree | 58aa3a8970a2f87698c69384ae034e5a766873fd /klippy | |
| parent | a79096efdf5d4eef82bc415682855d2a546c7595 (diff) | |
| download | kutter-33c666788165b715bc49eb993e2ce10818f775c5.tar.gz kutter-33c666788165b715bc49eb993e2ce10818f775c5.tar.xz kutter-33c666788165b715bc49eb993e2ce10818f775c5.zip | |
stepper_enable: Use new GCodeCommand wrappers
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy')
| -rw-r--r-- | klippy/extras/stepper_enable.py | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/klippy/extras/stepper_enable.py b/klippy/extras/stepper_enable.py index cad7b58c..7baeca71 100644 --- a/klippy/extras/stepper_enable.py +++ b/klippy/extras/stepper_enable.py @@ -74,12 +74,12 @@ class PrinterStepperEnable: self.printer.register_event_handler("gcode:request_restart", self._handle_request_restart) # Register M18/M84 commands - self.gcode = self.printer.lookup_object('gcode') - self.gcode.register_command("M18", self.cmd_M18) - self.gcode.register_command("M84", self.cmd_M18) - self.gcode.register_command("SET_STEPPER_ENABLE", - self.cmd_SET_STEPPER_ENABLE, - desc = self.cmd_SET_STEPPER_ENABLE_help) + gcode = self.printer.lookup_object('gcode') + gcode.register_command("M18", self.cmd_M18) + gcode.register_command("M84", self.cmd_M18) + 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() self.enable_lines[name] = EnableTracking(self.printer, stepper, pin) @@ -92,32 +92,32 @@ class PrinterStepperEnable: self.printer.send_event("stepper_enable:motor_off", print_time) toolhead.dwell(DISABLE_STALL_TIME) logging.debug('; Max time of %f', print_time) - def motor_debug_enable(self, stepper=None, enable=1): + def motor_debug_enable(self, stepper, enable): toolhead = self.printer.lookup_object('toolhead') toolhead.dwell(DISABLE_STALL_TIME) print_time = toolhead.get_last_move_time() - if stepper in self.enable_lines: - el = self.enable_lines.get(stepper, "") - if enable: - el.motor_enable(print_time) - logging.info("%s has been manually enabled", stepper) - else: - el.motor_disable(print_time) - logging.info("%s has been manually disabled", stepper) + el = self.enable_lines[stepper] + if enable: + el.motor_enable(print_time) + logging.info("%s has been manually enabled", stepper) else: - self.gcode.respond_info('SET_STEPPER_ENABLE: Invalid stepper "%s"' - % (stepper)) + el.motor_disable(print_time) + logging.info("%s has been manually disabled", stepper) toolhead.dwell(DISABLE_STALL_TIME) logging.debug('; Max time of %f', print_time) def _handle_request_restart(self, print_time): self.motor_off() - def cmd_M18(self, params): + def cmd_M18(self, gcmd): # Turn off motors self.motor_off() cmd_SET_STEPPER_ENABLE_help = "Enable/disable individual stepper by name" - def cmd_SET_STEPPER_ENABLE(self, params): - stepper_name = self.gcode.get_str('STEPPER', params, None) - stepper_enable = self.gcode.get_int('ENABLE', params, 1) + def cmd_SET_STEPPER_ENABLE(self, gcmd): + stepper_name = gcmd.get('STEPPER', None) + if stepper_name not in self.enable_lines: + gcmd.respond_info('SET_STEPPER_ENABLE: Invalid stepper "%s"' + % (stepper_name,)) + return + stepper_enable = gcmd.get_int('ENABLE', 1) self.motor_debug_enable(stepper_name, stepper_enable) def lookup_enable(self, name): if name not in self.enable_lines: |