aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2018-10-08 10:52:46 -0400
committerKevin O'Connor <kevin@koconnor.net>2018-10-08 10:52:46 -0400
commit36ae433b57e0783f7c98ec6d0b47a69896568e18 (patch)
treee35146497ccc405fbb0687a3b2a62911109487e9
parent8eb1110aa82f7b7977c309c4a536a502cbd8a6c2 (diff)
downloadkutter-36ae433b57e0783f7c98ec6d0b47a69896568e18.tar.gz
kutter-36ae433b57e0783f7c98ec6d0b47a69896568e18.tar.xz
kutter-36ae433b57e0783f7c98ec6d0b47a69896568e18.zip
cartesian: Make sure to constrain second_homing_speed to max_z_velocity
Commit b0d859f2 introduced a second_homing_speed parameter; that parameter needs to also be constrained to the max_z_velocity. Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
-rw-r--r--klippy/kinematics/cartesian.py1
-rw-r--r--klippy/kinematics/corexy.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/klippy/kinematics/cartesian.py b/klippy/kinematics/cartesian.py
index ecf00320..13b8c4e8 100644
--- a/klippy/kinematics/cartesian.py
+++ b/klippy/kinematics/cartesian.py
@@ -71,6 +71,7 @@ class CartKinematics:
second_homing_speed = hi.second_homing_speed
if axis == 2:
homing_speed = min(homing_speed, self.max_z_velocity)
+ second_homing_speed = min(second_homing_speed, self.max_z_velocity)
homepos = [None, None, None, None]
homepos[axis] = hi.position_endstop
coord = [None, None, None, None]
diff --git a/klippy/kinematics/corexy.py b/klippy/kinematics/corexy.py
index a3399d89..84d61d2c 100644
--- a/klippy/kinematics/corexy.py
+++ b/klippy/kinematics/corexy.py
@@ -66,6 +66,8 @@ class CoreXYKinematics:
second_homing_speed = hi.second_homing_speed
if axis == 2:
homing_speed = min(homing_speed, self.max_z_velocity)
+ second_homing_speed = min(second_homing_speed,
+ self.max_z_velocity)
homepos = [None, None, None, None]
homepos[axis] = hi.position_endstop
coord = [None, None, None, None]