3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stepper_enable: Move pin handling out of EnableTracking class 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2021-07-03 21:25:27 -04:00
parent 57bd1c6b9f
commit df43c9e9bf
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
klippy/extras/stepper_enable.py
View File

@ -1,6 +1,6 @@
# Support for enable pins on stepper motor drivers # Support for enable pins on stepper motor drivers
# #
# Copyright (C) 2019 Kevin O'Connor <kevin@koconnor.net> # Copyright (C) 2019-2021 Kevin O'Connor <kevin@koconnor.net>
# #
# This file may be distributed under the terms of the GNU GPLv3 license. # This file may be distributed under the terms of the GNU GPLv3 license.
import logging import logging
@ -22,29 +22,33 @@ class StepperEnablePin:
if not self.enable_count: if not self.enable_count:
self.mcu_enable.set_digital(print_time, 0) self.mcu_enable.set_digital(print_time, 0)
# Enable line tracking for each stepper motor def setup_enable_pin(printer, pin):
class EnableTracking:
def __init__(self, printer, stepper, pin):
self.stepper = stepper
self.callbacks = []
self.is_enabled = False
self.stepper.add_active_callback(self.motor_enable)
if pin is None: if pin is None:
# No enable line (stepper always enabled) # No enable line (stepper always enabled)
self.enable = StepperEnablePin(None, 9999) enable = StepperEnablePin(None, 9999)
self.enable.is_dedicated = False enable.is_dedicated = False
return return enable
ppins = printer.lookup_object('pins') ppins = printer.lookup_object('pins')
pin_params = ppins.lookup_pin(pin, can_invert=True, pin_params = ppins.lookup_pin(pin, can_invert=True,
share_type='stepper_enable') share_type='stepper_enable')
self.enable = pin_params.get('class') enable = pin_params.get('class')
if self.enable is not None: if enable is not None:
# Shared enable line # Shared enable line
self.enable.is_dedicated = False enable.is_dedicated = False
return return enable
mcu_enable = pin_params['chip'].setup_pin('digital_out', pin_params) mcu_enable = pin_params['chip'].setup_pin('digital_out', pin_params)
mcu_enable.setup_max_duration(0.) mcu_enable.setup_max_duration(0.)
self.enable = pin_params['class'] = StepperEnablePin(mcu_enable, 0) enable = pin_params['class'] = StepperEnablePin(mcu_enable, 0)
return enable
# Enable line tracking for each stepper motor
class EnableTracking:
def __init__(self, stepper, enable):
self.stepper = stepper
self.enable = enable
self.callbacks = []
self.is_enabled = False
self.stepper.add_active_callback(self.motor_enable)
def register_state_callback(self, callback): def register_state_callback(self, callback):
self.callbacks.append(callback) self.callbacks.append(callback)
def motor_enable(self, print_time): def motor_enable(self, print_time):
@ -82,7 +86,8 @@ class PrinterStepperEnable:
desc=self.cmd_SET_STEPPER_ENABLE_help) desc=self.cmd_SET_STEPPER_ENABLE_help)
def register_stepper(self, stepper, pin): def register_stepper(self, stepper, pin):
name = stepper.get_name() name = stepper.get_name()
self.enable_lines[name] = EnableTracking(self.printer, stepper, pin) enable = setup_enable_pin(self.printer, pin)
self.enable_lines[name] = EnableTracking(stepper, enable)
def motor_off(self): def motor_off(self):
toolhead = self.printer.lookup_object('toolhead') toolhead = self.printer.lookup_object('toolhead')
toolhead.dwell(DISABLE_STALL_TIME) toolhead.dwell(DISABLE_STALL_TIME)