shinys000114/klipper
1
0
Fork 0
mirror of git://soft.sys114.com/klipper synced 2026-02-10 14:58:07 +09:00
Code Issues Packages Projects Releases Wiki Activity

klippy: Add access methods and avoid peeking into the printer classes

Browse Source 
Add get_reactor(), lookup_object(), lookup_module_objects(), and
set_rollover_info() to the main Printer class so that callers do not
need to peek into the class' members.  Similarly, add get_printer()
and get_name() methods to the ConfigWrapper class.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor
2018-01-19 22:22:17 -05:00
parent f0a754e496
commit 81013ba5c8
10 changed files with 103 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
klippy/stepper.py
View File

@@ -36,7 +36,7 @@ def lookup_enable_pin(printer, pin):
# Code storing the definitions for a stepper motor
class PrinterStepper:
def __init__(self, printer, config):
self.name = config.section
self.name = config.get_name()
if self.name.startswith('stepper_'):
self.name = self.name[8:]
self.need_motor_enable = True
@@ -101,7 +101,7 @@ class PrinterHomingStepper(PrinterStepper):
else:
raise config.error(
"Unable to infer homing_positive_dir in section '%s'" % (
config.section,))
config.get_name(),))
# Endstop stepper phase position tracking
self.homing_stepper_phases = config.getint(
'homing_stepper_phases', None, minval=0)
@@ -169,9 +169,9 @@ class PrinterMultiStepper(PrinterHomingStepper):
self.extras = []
self.all_step_const = [self.step_const]
for i in range(1, 99):
if not config.has_section(config.section + str(i)):
if not config.has_section(config.get_name() + str(i)):
break
extraconfig = config.getsection(config.section + str(i))
extraconfig = config.getsection(config.get_name() + str(i))
extra = PrinterStepper(printer, extraconfig)
self.extras.append(extra)
self.all_step_const.append(extra.step_const)
@@ -202,6 +202,6 @@ class PrinterMultiStepper(PrinterHomingStepper):
return self.endstops
def LookupMultiHomingStepper(printer, config):
if not config.has_section(config.section + '1'):
if not config.has_section(config.get_name() + '1'):
return PrinterHomingStepper(printer, config)
return PrinterMultiStepper(printer, config)