From 10c0da9a6c1e601e862f5b330d78f738ac49d5da Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Thu, 6 Jun 2019 11:20:09 -0400 Subject: tmc2130: Rework remaining config helpers to use mcu_tmc interface Introduce TMCMicrostepHelper and TMCStealthchopHelper helper code that uses the mcu_tmc interface. Update the callers to use these new helpers. Signed-off-by: Kevin O'Connor --- klippy/extras/tmc2660.py | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'klippy/extras/tmc2660.py') diff --git a/klippy/extras/tmc2660.py b/klippy/extras/tmc2660.py index ae03efe1..540de91c 100644 --- a/klippy/extras/tmc2660.py +++ b/klippy/extras/tmc2660.py @@ -230,20 +230,17 @@ class MCU_TMC2660_SPI: class TMC2660: def __init__(self, config): - self.printer = config.get_printer() - self.name = config.get_name().split()[1] # Setup mcu communication self.fields = tmc2130.FieldHelper(Fields, SignedFields, FieldFormatters) self.mcu_tmc = MCU_TMC2660_SPI(config, Registers, self.fields) - self.get_register = self.mcu_tmc.get_register - self.set_register = self.mcu_tmc.set_register # Register commands cmdhelper = tmc2130.TMCCommandHelper(config, self.mcu_tmc) cmdhelper.setup_register_dump(self.query_registers) # DRVCTRL - mres = tmc2130.get_config_microsteps(config) - self.fields.set_field("MRES", mres) + mh = tmc2130.TMCMicrostepHelper(config, self.mcu_tmc) + self.get_microsteps = mh.get_microsteps + self.get_phase = mh.get_phase set_config_field = self.fields.set_config_field set_config_field(config, "DEDGE", 0) set_config_field(config, "INTPOL", True, 'interpolate') @@ -280,16 +277,8 @@ class TMC2660: self.fields.set_field("SDOFF", 0) # only step/dir mode supported def query_registers(self, print_time=0.): - return [(reg_name, self.get_register(reg_name)) + return [(reg_name, self.mcu_tmc.get_register(reg_name)) for reg_name in ReadRegisters] - def get_microsteps(self): - return 256 >> self.fields.get_field("MRES") - - def get_phase(self): - reg = self.get_register("READRSP@RDSEL0") - mscnt = self.fields.get_field("MSTEP", reg) - return mscnt >> self.fields.get_field("MRES") - def load_config_prefix(config): return TMC2660(config) -- cgit v1.2.3-70-g09d2