diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2018-04-20 13:58:27 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2018-04-20 14:00:41 -0400 |
| commit | 68864333f3771b9440e532de2206fb52ebeb9643 (patch) | |
| tree | bb9e60539dc8133929421c2aee818c00ee987c55 /klippy | |
| parent | eff1c8604d42294f095d5cb25de4d65fae693240 (diff) | |
| download | kutter-68864333f3771b9440e532de2206fb52ebeb9643.tar.gz kutter-68864333f3771b9440e532de2206fb52ebeb9643.tar.xz kutter-68864333f3771b9440e532de2206fb52ebeb9643.zip | |
probe: Limit Z lift speed to be the same as the probing speed
When using an automatic probe, limit the Z lift speed to be no greater
than the Z probing speed. This can reduce Z jerks during probing.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy')
| -rw-r--r-- | klippy/extras/probe.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/klippy/extras/probe.py b/klippy/extras/probe.py index 3691266f..3bb054ea 100644 --- a/klippy/extras/probe.py +++ b/klippy/extras/probe.py @@ -137,7 +137,7 @@ class ProbePointsHelper: self.printer = printer self.probe_points = probe_points self.horizontal_move_z = horizontal_move_z - self.speed = speed + self.speed = self.lift_speed = speed self.manual_probe = manual_probe self.callback = callback self.toolhead = self.printer.lookup_object('toolhead') @@ -149,6 +149,9 @@ class ProbePointsHelper: # Begin probing self.move_next() if not manual_probe: + probe = self.printer.lookup_object('probe', None) + if probe is not None: + self.lift_speed = min(self.lift_speed, probe.speed) while self.busy: self.gcode.run_script("PROBE") self.cmd_NEXT({}) @@ -165,10 +168,11 @@ class ProbePointsHelper: # Record current position self.toolhead.wait_moves() self.results.append(self.callback.get_position()) - # Move to next position + # Lift toolhead curpos = self.toolhead.get_position() curpos[2] = self.horizontal_move_z - self.toolhead.move(curpos, self.speed) + self.toolhead.move(curpos, self.lift_speed) + # Move to next position if len(self.results) == len(self.probe_points): self.toolhead.get_last_move_time() self.finalize(True) |