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

stepper: Move MCU_stepper from mcu.py to stepper.py

Browse Source 
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor
2019-11-12 13:55:50 -05:00
parent 0204de46a6
commit 4ca190d393
7 changed files with 160 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
klippy/extras/controller_fan.py
View File

@@ -38,7 +38,7 @@ class ControllerFan:
power = 0.
active = False
for name in self.stepper_names:
active |= self.stepper_enable.is_motor_enabled(name)
active |= self.stepper_enable.lookup_enable(name).is_motor_enabled()
for heater in self.heaters:
_, target_temp = heater.get_temp(eventtime)
if target_temp:

8
klippy/extras/force_move.py
View File

@@ -54,9 +54,10 @@ class ForceMove:
toolhead = self.printer.lookup_object('toolhead')
print_time = toolhead.get_last_move_time()
stepper_enable = self.printer.lookup_object('stepper_enable')
was_enable = stepper_enable.is_motor_enabled(stepper.get_name())
enable = stepper_enable.lookup_enable(stepper.get_name())
was_enable = enable.is_motor_enabled()
if not was_enable:
stepper_enable.motor_enable(stepper.get_name(), print_time)
enable.motor_enable(print_time)
toolhead.dwell(STALL_TIME)
return was_enable
def restore_enable(self, stepper, was_enable):
@@ -65,7 +66,8 @@ class ForceMove:
toolhead.dwell(STALL_TIME)
print_time = toolhead.get_last_move_time()
stepper_enable = self.printer.lookup_object('stepper_enable')
stepper_enable.motor_disable(stepper.get_name(), print_time)
enable = stepper_enable.lookup_enable(stepper.get_name())
enable.motor_disable(print_time)
toolhead.dwell(STALL_TIME)
def manual_move(self, stepper, dist, speed, accel=0.):
toolhead = self.printer.lookup_object('toolhead')

6
klippy/extras/manual_stepper.py
View File

@@ -49,10 +49,12 @@ class ManualStepper:
stepper_enable = self.printer.lookup_object('stepper_enable')
if enable:
for s in self.steppers:
stepper_enable.motor_enable(s.get_name(), self.next_cmd_time)
se = stepper_enable.lookup_enable(s.get_name())
se.motor_enable(self.next_cmd_time)
else:
for s in self.steppers:
stepper_enable.motor_disable(s.get_name(), self.next_cmd_time)
se = stepper_enable.lookup_enable(s.get_name())
se.motor_disable(self.next_cmd_time)
self.sync_print_time()
def do_set_position(self, setpos):
self.rail.set_position([setpos, 0., 0.])

20
klippy/extras/stepper_enable.py
View File

@@ -54,19 +54,21 @@ def lookup_enable_pin(ppins, pin_list):
class EnableTracking:
def __init__(self, printer, stepper, pin):
self.stepper = stepper
self.is_motor_enabled = False
self.is_enabled = False
self.stepper.add_active_callback(self.motor_enable)
self.enable = lookup_enable_pin(printer.lookup_object('pins'), pin)
def motor_enable(self, print_time):
if not self.is_motor_enabled:
if not self.is_enabled:
self.enable.set_enable(print_time)
self.is_motor_enabled = True
self.is_enabled = True
def motor_disable(self, print_time):
if self.is_motor_enabled:
if self.is_enabled:
# Enable stepper on future stepper movement
self.enable.set_disable(print_time)
self.is_motor_enabled = False
self.is_enabled = False
self.stepper.add_active_callback(self.motor_enable)
def is_motor_enabled(self):
return self.is_enabled
class PrinterStepperEnable:
def __init__(self, config):
@@ -95,12 +97,8 @@ class PrinterStepperEnable:
def cmd_M18(self, params):
# Turn off motors
self.motor_off()
def is_motor_enabled(self, name):
return self.enable_lines[name].is_motor_enabled
def motor_enable(self, name, print_time):
self.enable_lines[name].motor_enable(print_time)
def motor_disable(self, name, print_time):
self.enable_lines[name].motor_disable(print_time)
def lookup_enable(self, name):
return self.enable_lines[name]
def load_config(config):
return PrinterStepperEnable(config)