diff options
| author | Alex Voinea <voinea.dragos.alexandru@gmail.com> | 2024-05-13 22:31:39 +0200 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2024-05-14 13:26:58 -0400 |
| commit | f01c8853ca5c4f7d89ea1ae9a33779fe9c0446b1 (patch) | |
| tree | 7ea0bc1c209d2800576c65405b6959117b0cfa55 | |
| parent | 472d8e5b669de075d6d94b461b5f08d5901d3bda (diff) | |
| download | kutter-f01c8853ca5c4f7d89ea1ae9a33779fe9c0446b1.tar.gz kutter-f01c8853ca5c4f7d89ea1ae9a33779fe9c0446b1.tar.xz kutter-f01c8853ca5c4f7d89ea1ae9a33779fe9c0446b1.zip | |
tmc: Do not pass the frequency directly to the helpers
Use the new get_tmc_frequency() instead.
Signed-off-by: Alex Voinea <voinea.dragos.alexandru@gmail.com>
| -rw-r--r-- | klippy/extras/tmc.py | 5 | ||||
| -rw-r--r-- | klippy/extras/tmc2130.py | 2 | ||||
| -rw-r--r-- | klippy/extras/tmc2208.py | 2 | ||||
| -rw-r--r-- | klippy/extras/tmc2209.py | 2 | ||||
| -rw-r--r-- | klippy/extras/tmc2240.py | 2 | ||||
| -rw-r--r-- | klippy/extras/tmc5160.py | 2 |
6 files changed, 8 insertions, 7 deletions
diff --git a/klippy/extras/tmc.py b/klippy/extras/tmc.py index 8143882a..4ce9466a 100644 --- a/klippy/extras/tmc.py +++ b/klippy/extras/tmc.py @@ -592,7 +592,7 @@ def TMCtstepHelper(step_dist, mres, tmc_freq, velocity): return 0xfffff # Helper to configure stealthChop-spreadCycle transition velocity -def TMCStealthchopHelper(config, mcu_tmc, tmc_freq): +def TMCStealthchopHelper(config, mcu_tmc): fields = mcu_tmc.get_fields() en_pwm_mode = False velocity = config.getfloat('stealthchop_threshold', None, minval=0.) @@ -606,7 +606,8 @@ def TMCStealthchopHelper(config, mcu_tmc, tmc_freq): rotation_dist, steps_per_rotation = stepper.parse_step_distance(sconfig) step_dist = rotation_dist / steps_per_rotation mres = fields.get_field("mres") - tpwmthrs = TMCtstepHelper(step_dist, mres, tmc_freq, velocity) + tpwmthrs = TMCtstepHelper(step_dist, mres, mcu_tmc.get_tmc_frequency(), + velocity) fields.set_field("tpwmthrs", tpwmthrs) reg = fields.lookup_register("en_pwm_mode", None) diff --git a/klippy/extras/tmc2130.py b/klippy/extras/tmc2130.py index 62a9abbf..3da346b4 100644 --- a/klippy/extras/tmc2130.py +++ b/klippy/extras/tmc2130.py @@ -296,7 +296,7 @@ class TMC2130: self.get_status = cmdhelper.get_status # Setup basic register values tmc.TMCWaveTableHelper(config, self.mcu_tmc) - tmc.TMCStealthchopHelper(config, self.mcu_tmc, TMC_FREQUENCY) + tmc.TMCStealthchopHelper(config, self.mcu_tmc) # Allow other registers to be set from the config set_config_field = self.fields.set_config_field # CHOPCONF diff --git a/klippy/extras/tmc2208.py b/klippy/extras/tmc2208.py index 421c5378..86476acc 100644 --- a/klippy/extras/tmc2208.py +++ b/klippy/extras/tmc2208.py @@ -197,7 +197,7 @@ class TMC2208: self.get_status = cmdhelper.get_status # Setup basic register values self.fields.set_field("mstep_reg_select", True) - tmc.TMCStealthchopHelper(config, self.mcu_tmc, TMC_FREQUENCY) + tmc.TMCStealthchopHelper(config, self.mcu_tmc) # Allow other registers to be set from the config set_config_field = self.fields.set_config_field # GCONF diff --git a/klippy/extras/tmc2209.py b/klippy/extras/tmc2209.py index c248c2d6..1149cdc2 100644 --- a/klippy/extras/tmc2209.py +++ b/klippy/extras/tmc2209.py @@ -73,7 +73,7 @@ class TMC2209: self.get_status = cmdhelper.get_status # Setup basic register values self.fields.set_field("mstep_reg_select", True) - tmc.TMCStealthchopHelper(config, self.mcu_tmc, TMC_FREQUENCY) + tmc.TMCStealthchopHelper(config, self.mcu_tmc) # Allow other registers to be set from the config set_config_field = self.fields.set_config_field # GCONF diff --git a/klippy/extras/tmc2240.py b/klippy/extras/tmc2240.py index 14d5dd91..f4c75aa9 100644 --- a/klippy/extras/tmc2240.py +++ b/klippy/extras/tmc2240.py @@ -364,7 +364,7 @@ class TMC2240: # Setup basic register values tmc.TMCWaveTableHelper(config, self.mcu_tmc) self.fields.set_config_field(config, "offset_sin90", 0) - tmc.TMCStealthchopHelper(config, self.mcu_tmc, TMC_FREQUENCY) + tmc.TMCStealthchopHelper(config, self.mcu_tmc) set_config_field = self.fields.set_config_field # GCONF set_config_field(config, "multistep_filt", True) diff --git a/klippy/extras/tmc5160.py b/klippy/extras/tmc5160.py index 7ff47abf..e37435e6 100644 --- a/klippy/extras/tmc5160.py +++ b/klippy/extras/tmc5160.py @@ -335,7 +335,7 @@ class TMC5160: self.get_status = cmdhelper.get_status # Setup basic register values tmc.TMCWaveTableHelper(config, self.mcu_tmc) - tmc.TMCStealthchopHelper(config, self.mcu_tmc, TMC_FREQUENCY) + tmc.TMCStealthchopHelper(config, self.mcu_tmc) set_config_field = self.fields.set_config_field # GCONF set_config_field(config, "multistep_filt", True) |