diff options
Diffstat (limited to 'klippy/extras/tmc2208.py')
| -rw-r--r-- | klippy/extras/tmc2208.py | 48 |
1 files changed, 2 insertions, 46 deletions
diff --git a/klippy/extras/tmc2208.py b/klippy/extras/tmc2208.py index b7cc13ae..1c8d95ba 100644 --- a/klippy/extras/tmc2208.py +++ b/klippy/extras/tmc2208.py @@ -310,28 +310,18 @@ class TMC2208: self.printer = config.get_printer() self.name = config.get_name().split()[-1] # Setup mcu communication - self.regs = collections.OrderedDict() - self.fields = tmc2130.FieldHelper(Fields, SignedFields, FieldFormatters, - self.regs) + 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) - gcode = self.printer.lookup_object("gcode") - gcode.register_mux_command( - "SET_TMC_CURRENT", "STEPPER", self.name, - self.cmd_SET_TMC_CURRENT, desc=self.cmd_SET_TMC_CURRENT_help) # Setup basic register values self.fields.set_field("pdn_disable", True) self.fields.set_field("mstep_reg_select", True) self.fields.set_field("multistep_filt", True) - vsense, irun, ihold, self.sense_resistor = \ - tmc2130.get_config_current(config) - self.fields.set_field("vsense", vsense) - self.fields.set_field("IHOLD", ihold) - self.fields.set_field("IRUN", irun) + 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) @@ -368,40 +358,6 @@ class TMC2208: def get_phase(self): mscnt = self.fields.get_field("MSCNT", self.get_register("MSCNT")) return mscnt >> self.fields.get_field("MRES") - cmd_SET_TMC_CURRENT_help = "Set the current of a TMC2208 driver" - def cmd_SET_TMC_CURRENT(self, params): - gcode = self.printer.lookup_object('gcode') - vsense = bool(self.fields.get_field("vsense")) - if 'HOLDCURRENT' in params: - hold_current = gcode.get_float( - 'HOLDCURRENT', params, above=0., maxval=2.) - else: - hold_current = tmc2130.bits_to_current( - self.fields.get_field("IHOLD"), - self.sense_resistor, - vsense) - if 'CURRENT' in params: - run_current = gcode.get_float( - 'CURRENT', params, minval=hold_current, maxval=2.) - else: - run_current = tmc2130.bits_to_current( - self.fields.get_field("IRUN"), - self.sense_resistor, - vsense) - if 'HOLDCURRENT' in params or 'CURRENT' in params: - vsense_calc, irun, ihold = tmc2130.calc_current_config(run_current, - hold_current, self.sense_resistor) - self.printer.lookup_object('toolhead').wait_moves() - if (vsense_calc != vsense): - self.fields.set_field("vsense", vsense_calc) - self.set_register("CHOPCONF", self.regs["CHOPCONF"]) - self.fields.set_field("IHOLD", ihold) - self.fields.set_field("IRUN", irun) - self.set_register("IHOLD_IRUN", self.regs["IHOLD_IRUN"]) - else: - gcode.respond_info( - "Run Current: %0.2fA Hold Current: %0.2fA" - % (run_current, hold_current)) def load_config_prefix(config): return TMC2208(config) |