From f7567a0db954eabe4c6b8da3f73ce68693698646 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Sat, 21 Oct 2023 15:45:47 -0400 Subject: Revert "toolhead: Use dict for step generation flush times. (#6303)" This reverts commit 6749985302fe002a9cb5672dab9badb11e4e3c36. A defect was found in the above commit (the input shaper code calls note_step_generateion_scan_time() for many steppers, so the input_shaper class can't be used as the index). Signed-off-by: Kevin O'Connor --- klippy/kinematics/extruder.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'klippy/kinematics/extruder.py') diff --git a/klippy/kinematics/extruder.py b/klippy/kinematics/extruder.py index 9c913bf1..ea422b6e 100644 --- a/klippy/kinematics/extruder.py +++ b/klippy/kinematics/extruder.py @@ -70,11 +70,15 @@ class ExtruderStepper: self.stepper.set_trapq(extruder.get_trapq()) self.motion_queue = extruder_name def _set_pressure_advance(self, pressure_advance, smooth_time): + old_smooth_time = self.pressure_advance_smooth_time + if not self.pressure_advance: + old_smooth_time = 0. new_smooth_time = smooth_time if not pressure_advance: new_smooth_time = 0. toolhead = self.printer.lookup_object("toolhead") - toolhead.note_step_generation_scan_time(self, new_smooth_time * .5) + toolhead.note_step_generation_scan_time(new_smooth_time * .5, + old_delay=old_smooth_time * .5) ffi_main, ffi_lib = chelper.get_ffi() espa = ffi_lib.extruder_set_pressure_advance espa(self.sk_extruder, pressure_advance, new_smooth_time) -- cgit v1.2.3-70-g09d2