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/tmc2208.py | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'klippy/extras/tmc2208.py') diff --git a/klippy/extras/tmc2208.py b/klippy/extras/tmc2208.py index 1c8d95ba..8f36265d 100644 --- a/klippy/extras/tmc2208.py +++ b/klippy/extras/tmc2208.py @@ -307,13 +307,9 @@ class MCU_TMC_uart: class TMC2208: 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_TMC_uart(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) @@ -322,10 +318,10 @@ class TMC2208: self.fields.set_field("mstep_reg_select", True) self.fields.set_field("multistep_filt", True) tmc2130.TMCCurrentHelper(config, self.mcu_tmc) - mres, en, thresh = tmc2130.get_config_stealthchop(config, TMC_FREQUENCY) - self.fields.set_field("MRES", mres) - self.fields.set_field("en_spreadCycle", not en) - self.fields.set_field("TPWMTHRS", thresh) + mh = tmc2130.TMCMicrostepHelper(config, self.mcu_tmc) + self.get_microsteps = mh.get_microsteps + self.get_phase = mh.get_phase + tmc2130.TMCStealthchopHelper(config, self.mcu_tmc, TMC_FREQUENCY) # Allow other registers to be set from the config set_config_field = self.fields.set_config_field set_config_field(config, "toff", 3) @@ -345,7 +341,7 @@ class TMC2208: def query_registers(self, print_time=0.): out = [] for reg_name in ReadRegisters: - val = self.get_register(reg_name) + val = self.mcu_tmc.get_register(reg_name) # IOIN has different mappings depending on the driver type # (SEL_A field of IOIN reg) if reg_name == "IOIN": @@ -353,11 +349,6 @@ class TMC2208: reg_name = "IOIN@TMC220x" if drv_type else "IOIN@TMC222x" out.append((reg_name, val)) return out - def get_microsteps(self): - return 256 >> self.fields.get_field("MRES") - def get_phase(self): - mscnt = self.fields.get_field("MSCNT", self.get_register("MSCNT")) - return mscnt >> self.fields.get_field("MRES") def load_config_prefix(config): return TMC2208(config) -- cgit v1.2.3-70-g09d2