aboutsummaryrefslogtreecommitdiffstats
path: root/klippy/extras
diff options
context:
space:
mode:
Diffstat (limited to 'klippy/extras')
-rw-r--r--klippy/extras/tmc.py51
-rw-r--r--klippy/extras/tmc2130.py5
-rw-r--r--klippy/extras/tmc2208.py5
-rw-r--r--klippy/extras/tmc2209.py5
-rw-r--r--klippy/extras/tmc2660.py6
-rw-r--r--klippy/extras/tmc5160.py5
6 files changed, 36 insertions, 41 deletions
diff --git a/klippy/extras/tmc.py b/klippy/extras/tmc.py
index 6fa8af4e..5bc9d74b 100644
--- a/klippy/extras/tmc.py
+++ b/klippy/extras/tmc.py
@@ -193,6 +193,8 @@ class TMCCommandHelper:
self.toff = None
self.printer.register_event_handler("klippy:connect",
self._handle_connect)
+ # Set microstep config options
+ TMCMicrostepHelper(config, mcu_tmc)
# Register commands
gcode = self.printer.lookup_object("gcode")
gcode.register_mux_command("SET_TMC_FIELD", "STEPPER", self.name,
@@ -246,6 +248,17 @@ class TMCCommandHelper:
else:
gcmd.respond_info("Run Current: %0.2fA Hold Current: %0.2fA"
% (prev_run_current, prev_hold_current))
+ # Stepper phase tracking
+ def get_microsteps(self):
+ return 256 >> self.fields.get_field("mres")
+ def get_phase(self):
+ field_name = "mscnt"
+ if self.fields.lookup_register(field_name, None) is None:
+ # TMC2660 uses MSTEP
+ field_name = "mstep"
+ reg = self.mcu_tmc.get_register(self.fields.lookup_register(field_name))
+ mscnt = self.fields.get_field(field_name, reg)
+ return 1023 - mscnt, 1024
# Stepper enable/disable tracking
def _do_enable(self, print_time):
try:
@@ -397,31 +410,19 @@ class TMCVirtualPinHelper:
######################################################################
# Helper to configure and query the microstep settings
-class TMCMicrostepHelper:
- def __init__(self, config, mcu_tmc):
- self.mcu_tmc = mcu_tmc
- self.fields = mcu_tmc.get_fields()
- stepper_name = " ".join(config.get_name().split()[1:])
- stepper_config = ms_config = config.getsection(stepper_name)
- if (stepper_config.get('microsteps', None, note_valid=False) is None
- and config.get('microsteps', None, note_valid=False) is not None):
- # Older config format with microsteps in tmc config section
- ms_config = config
- steps = {'256': 0, '128': 1, '64': 2, '32': 3, '16': 4,
- '8': 5, '4': 6, '2': 7, '1': 8}
- mres = ms_config.getchoice('microsteps', steps)
- self.fields.set_field("mres", mres)
- self.fields.set_field("intpol", config.getboolean("interpolate", True))
- def get_microsteps(self):
- return 256 >> self.fields.get_field("mres")
- def get_phase(self):
- field_name = "mscnt"
- if self.fields.lookup_register(field_name, None) is None:
- # TMC2660 uses MSTEP
- field_name = "mstep"
- reg = self.mcu_tmc.get_register(self.fields.lookup_register(field_name))
- mscnt = self.fields.get_field(field_name, reg)
- return 1023 - mscnt, 1024
+def TMCMicrostepHelper(config, mcu_tmc):
+ fields = mcu_tmc.get_fields()
+ stepper_name = " ".join(config.get_name().split()[1:])
+ stepper_config = ms_config = config.getsection(stepper_name)
+ if (stepper_config.get('microsteps', None, note_valid=False) is None
+ and config.get('microsteps', None, note_valid=False) is not None):
+ # Older config format with microsteps in tmc config section
+ ms_config = config
+ steps = {'256': 0, '128': 1, '64': 2, '32': 3, '16': 4,
+ '8': 5, '4': 6, '2': 7, '1': 8}
+ mres = ms_config.getchoice('microsteps', steps)
+ fields.set_field("mres", mres)
+ fields.set_field("intpol", config.getboolean("interpolate", True))
# Helper to configure "stealthchop" mode
def TMCStealthchopHelper(config, mcu_tmc, tmc_freq):
diff --git a/klippy/extras/tmc2130.py b/klippy/extras/tmc2130.py
index f28c37a5..7d9e554f 100644
--- a/klippy/extras/tmc2130.py
+++ b/klippy/extras/tmc2130.py
@@ -260,10 +260,9 @@ class TMC2130:
current_helper = TMCCurrentHelper(config, self.mcu_tmc)
cmdhelper = tmc.TMCCommandHelper(config, self.mcu_tmc, current_helper)
cmdhelper.setup_register_dump(ReadRegisters)
+ self.get_microsteps = cmdhelper.get_microsteps
+ self.get_phase = cmdhelper.get_phase
# Setup basic register values
- mh = tmc.TMCMicrostepHelper(config, self.mcu_tmc)
- self.get_microsteps = mh.get_microsteps
- self.get_phase = mh.get_phase
tmc.TMCStealthchopHelper(config, self.mcu_tmc, TMC_FREQUENCY)
# Allow other registers to be set from the config
set_config_field = self.fields.set_config_field
diff --git a/klippy/extras/tmc2208.py b/klippy/extras/tmc2208.py
index e4c3f2f0..8287712c 100644
--- a/klippy/extras/tmc2208.py
+++ b/klippy/extras/tmc2208.py
@@ -192,12 +192,11 @@ class TMC2208:
current_helper = tmc2130.TMCCurrentHelper(config, self.mcu_tmc)
cmdhelper = tmc.TMCCommandHelper(config, self.mcu_tmc, current_helper)
cmdhelper.setup_register_dump(ReadRegisters, self.read_translate)
+ self.get_microsteps = cmdhelper.get_microsteps
+ self.get_phase = cmdhelper.get_phase
# Setup basic register values
self.fields.set_field("mstep_reg_select", True)
self.fields.set_field("multistep_filt", True)
- mh = tmc.TMCMicrostepHelper(config, self.mcu_tmc)
- self.get_microsteps = mh.get_microsteps
- self.get_phase = mh.get_phase
tmc.TMCStealthchopHelper(config, self.mcu_tmc, TMC_FREQUENCY)
# Allow other registers to be set from the config
set_config_field = self.fields.set_config_field
diff --git a/klippy/extras/tmc2209.py b/klippy/extras/tmc2209.py
index 7856334b..97a70293 100644
--- a/klippy/extras/tmc2209.py
+++ b/klippy/extras/tmc2209.py
@@ -68,13 +68,12 @@ class TMC2209:
current_helper = tmc2130.TMCCurrentHelper(config, self.mcu_tmc)
cmdhelper = tmc.TMCCommandHelper(config, self.mcu_tmc, current_helper)
cmdhelper.setup_register_dump(ReadRegisters)
+ self.get_microsteps = cmdhelper.get_microsteps
+ self.get_phase = cmdhelper.get_phase
# 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)
- mh = tmc.TMCMicrostepHelper(config, self.mcu_tmc)
- self.get_microsteps = mh.get_microsteps
- self.get_phase = mh.get_phase
tmc.TMCStealthchopHelper(config, self.mcu_tmc, TMC_FREQUENCY)
# Allow other registers to be set from the config
set_config_field = self.fields.set_config_field
diff --git a/klippy/extras/tmc2660.py b/klippy/extras/tmc2660.py
index 3376f724..125d7160 100644
--- a/klippy/extras/tmc2660.py
+++ b/klippy/extras/tmc2660.py
@@ -229,11 +229,9 @@ class TMC2660:
current_helper = TMC2660CurrentHelper(config, self.mcu_tmc)
cmdhelper = tmc.TMCCommandHelper(config, self.mcu_tmc, current_helper)
cmdhelper.setup_register_dump(ReadRegisters)
+ self.get_microsteps = cmdhelper.get_microsteps
+ self.get_phase = cmdhelper.get_phase
- # DRVCTRL
- mh = tmc.TMCMicrostepHelper(config, self.mcu_tmc)
- self.get_microsteps = mh.get_microsteps
- self.get_phase = mh.get_phase
# CHOPCONF
set_config_field = self.fields.set_config_field
set_config_field(config, "tbl", 2)
diff --git a/klippy/extras/tmc5160.py b/klippy/extras/tmc5160.py
index fa6f9e43..dfd059ee 100644
--- a/klippy/extras/tmc5160.py
+++ b/klippy/extras/tmc5160.py
@@ -294,10 +294,9 @@ class TMC5160:
current_helper = TMC5160CurrentHelper(config, self.mcu_tmc)
cmdhelper = tmc.TMCCommandHelper(config, self.mcu_tmc, current_helper)
cmdhelper.setup_register_dump(ReadRegisters)
+ self.get_microsteps = cmdhelper.get_microsteps
+ self.get_phase = cmdhelper.get_phase
# Setup basic register values
- mh = tmc.TMCMicrostepHelper(config, self.mcu_tmc)
- self.get_microsteps = mh.get_microsteps
- self.get_phase = mh.get_phase
tmc.TMCStealthchopHelper(config, self.mcu_tmc, TMC_FREQUENCY)
# CHOPCONF
set_config_field = self.fields.set_config_field
generated by cgit v1.2.3-70-g09d2 (git 2.50.1) at 2025-09-01 21:44:45 +0000