diff options
author | Kevin O'Connor <kevin@koconnor.net> | 2017-12-20 14:11:38 -0500 |
---|---|---|
committer | Kevin O'Connor <kevin@koconnor.net> | 2017-12-20 14:41:20 -0500 |
commit | 1d21bf66c605d114055e50d715e2dcbe2ddfd86a (patch) | |
tree | 6ef44bf18778d30ffeedec86f6e36cd01d737588 /klippy/cartesian.py | |
parent | 1b0750597312625c23e3389226e418dda1373df2 (diff) | |
download | kutter-1d21bf66c605d114055e50d715e2dcbe2ddfd86a.tar.gz kutter-1d21bf66c605d114055e50d715e2dcbe2ddfd86a.tar.xz kutter-1d21bf66c605d114055e50d715e2dcbe2ddfd86a.zip |
homing: Handle speed rounding when homing speed greater than max_velocity
Commit 002dc0df added rounding to the homing speed, but it did not
work if the configured homing speed was less than the printer's
maximum velocity. Move the speed rounding from stepper.py to
homing.py and make sure the rounded speed is less than the maximum
speed.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/cartesian.py')
-rw-r--r-- | klippy/cartesian.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/klippy/cartesian.py b/klippy/cartesian.py index c22b24c5..5e73297e 100644 --- a/klippy/cartesian.py +++ b/klippy/cartesian.py @@ -48,7 +48,9 @@ class CartKinematics: rpos = s.position_endstop + s.homing_retract_dist r2pos = rpos + s.homing_retract_dist # Initial homing - homing_speed = s.get_homing_speed() + homing_speed = s.homing_speed + if axis == 2: + homing_speed = min(homing_speed, self.max_z_velocity) homepos = [None, None, None, None] homepos[axis] = s.position_endstop coord = [None, None, None, None] |