3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tmc: Revert incorrect changes to TPWMTHRS setting 

It's not valid to set the TPWMTHRS in a "klippy:connect" event handler
because the TMCVirtualPinHelper and TMCCommandHelper classes were
expecting that field to be set during the config reading phase.

Revert "tmc: Fix typo preventing stealthchop threshold from being set"
This reverts commit 7d76067ff9.

Revert "tmc: Query the stepper step_distance from the stepper object"
This reverts commit 67b2852249.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-02-20 11:32:38 -05:00
parent 15f21be5ec
commit e03f75e758
1 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
klippy/extras/tmc.py
View File

@ -273,18 +273,17 @@ class TMCMicrostepHelper:
return (1023 - mscnt) >> self.fields.get_field("MRES")
# Helper to configure "stealthchop" mode
class TMCStealthchopHelper:
def __init__(self, config, mcu_tmc, tmc_freq):
self.name = config.get_name()
self.fields = fields = mcu_tmc.get_fields()
self.tmc_freq = tmc_freq
printer = config.get_printer()
self.force_move = printer.try_load_module(config, "force_move")
def TMCStealthchopHelper(config, mcu_tmc, tmc_freq):
fields = mcu_tmc.get_fields()
en_pwm_mode = False
self.velocity = config.getfloat('stealthchop_threshold', 0., minval=0.)
if self.velocity:
printer.register_event_handler("klippy:connect",
self.handle_connect)
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_config.getfloat('step_distance')
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)))
en_pwm_mode = True
reg = fields.lookup_register("en_pwm_mode", None)
if reg is not None:
@ -292,10 +291,3 @@ class TMCStealthchopHelper:
else:
# TMC2208 uses en_spreadCycle
fields.set_field("en_spreadCycle", not en_pwm_mode)
def handle_connect(self):
stepper_name = " ".join(self.name.split()[1:])
stepper = self.force_move.lookup_stepper(stepper_name)
step_dist = stepper.get_step_dist()
step_dist_256 = step_dist / (1 << self.fields.get_field("MRES"))
threshold = int(self.tmc_freq * step_dist_256 / self.velocity + .5)
self.fields.set_field("TPWMTHRS", max(0, min(0xfffff, threshold)))