diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2022-01-29 14:13:26 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2022-02-10 13:24:21 -0500 |
| commit | 189188e3ca3e40d8272fb4ad48316e329f8ec453 (patch) | |
| tree | 6cb261ae94676f18a0170d4442f81ac94f3e5831 /klippy/extras | |
| parent | 6d7c03365ad13c4661675aaccd0a3dc5be544493 (diff) | |
| download | kutter-189188e3ca3e40d8272fb4ad48316e329f8ec453.tar.gz kutter-189188e3ca3e40d8272fb4ad48316e329f8ec453.tar.xz kutter-189188e3ca3e40d8272fb4ad48316e329f8ec453.zip | |
extruder: Add a SET_EXTRUDER_ROTATION_DISTANCE command
Support altering the extruder distance using the higher-level
rotation_distance. This is in preparation for removal of the
SET_EXTRUDER_STEP_DISTANCE command.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras')
| -rw-r--r-- | klippy/extras/endstop_phase.py | 3 | ||||
| -rw-r--r-- | klippy/extras/tmc.py | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/klippy/extras/endstop_phase.py b/klippy/extras/endstop_phase.py index 254184db..bd34ddbe 100644 --- a/klippy/extras/endstop_phase.py +++ b/klippy/extras/endstop_phase.py @@ -54,7 +54,8 @@ class EndstopPhase: self.name = config.get_name().split()[1] # Obtain step_distance and microsteps from stepper config section sconfig = config.getsection(self.name) - self.step_dist = stepper.parse_step_distance(sconfig) + rotation_dist, steps_per_rotation = stepper.parse_step_distance(sconfig) + self.step_dist = rotation_dist / steps_per_rotation self.phases = sconfig.getint("microsteps", note_valid=False) * 4 self.phase_calc = PhaseCalc(self.printer, self.name, self.phases) # Register event handlers diff --git a/klippy/extras/tmc.py b/klippy/extras/tmc.py index 0c5036f9..767ada39 100644 --- a/klippy/extras/tmc.py +++ b/klippy/extras/tmc.py @@ -520,8 +520,9 @@ def TMCStealthchopHelper(config, mcu_tmc, tmc_freq): velocity = config.getfloat('stealthchop_threshold', 0., minval=0.) if velocity: stepper_name = " ".join(config.get_name().split()[1:]) - stepper_config = config.getsection(stepper_name) - step_dist = stepper.parse_step_distance(stepper_config) + sconfig = config.getsection(stepper_name) + rotation_dist, steps_per_rotation = stepper.parse_step_distance(sconfig) + step_dist = rotation_dist / steps_per_rotation step_dist_256 = step_dist / (1 << fields.get_field("mres")) threshold = int(tmc_freq * step_dist_256 / velocity + .5) fields.set_field("tpwmthrs", max(0, min(0xfffff, threshold))) |