From f7a7223b30dafacf458d2568c0758dc5fd6ce578 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Mon, 8 Oct 2018 21:59:25 -0400 Subject: [PATCH] cartesian: Use homing_speed for homing retract speed Commit b0d859f2 introduced a second_homing_speed parameter, and it also changed the retract speed. Revert the retract speed change (use homing_speed when the head retracts). Signed-off-by: Kevin O'Connor --- config/example.cfg | 11 +++++------ klippy/kinematics/cartesian.py | 2 +- klippy/kinematics/corexy.py | 2 +- klippy/kinematics/delta.py | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/config/example.cfg b/config/example.cfg index 57dfb043..344c525d 100644 --- a/config/example.cfg +++ b/config/example.cfg @@ -49,14 +49,13 @@ position_max: 200 #homing_speed: 5.0 # Maximum velocity (in mm/s) of the stepper when homing. The default # is 5mm/s. -#second_homing_speed: 5.0 -# Maximum velocity (in mm/s) of the stepper when performing the second -# stage of homing (the move off the endstop and then back towards for the -# second trigger). This parameter is optional, and defaults to -# homing_speed/2.0 #homing_retract_dist: 5.0 # Distance to backoff (in mm) before homing a second time during -# homing. The default is 5mm. +# homing. Set this to zero to disable the second home. The default +# is 5mm. +#second_homing_speed: +# Velocity (in mm/s) of the stepper when performing the second home. +# The default is homing_speed/2. #homing_positive_dir: # If true, homing will cause the stepper to move in a positive # direction (away from zero); if false, home towards zero. The diff --git a/klippy/kinematics/cartesian.py b/klippy/kinematics/cartesian.py index 13b8c4e8..e6882061 100644 --- a/klippy/kinematics/cartesian.py +++ b/klippy/kinematics/cartesian.py @@ -79,7 +79,7 @@ class CartKinematics: homing_state.home(coord, homepos, rail.get_endstops(), homing_speed) # Retract coord[axis] = rpos - homing_state.retract(coord, second_homing_speed) + homing_state.retract(coord, homing_speed) # Home again coord[axis] = r2pos homing_state.home(coord, homepos, rail.get_endstops(), diff --git a/klippy/kinematics/corexy.py b/klippy/kinematics/corexy.py index 84d61d2c..4121c4b6 100644 --- a/klippy/kinematics/corexy.py +++ b/klippy/kinematics/corexy.py @@ -75,7 +75,7 @@ class CoreXYKinematics: homing_state.home(coord, homepos, rail.get_endstops(), homing_speed) # Retract coord[axis] = rpos - homing_state.retract(coord, second_homing_speed) + homing_state.retract(coord, homing_speed) # Home again coord[axis] = r2pos homing_state.home(coord, homepos, rail.get_endstops(), diff --git a/klippy/kinematics/delta.py b/klippy/kinematics/delta.py index 9a357049..94430932 100644 --- a/klippy/kinematics/delta.py +++ b/klippy/kinematics/delta.py @@ -108,7 +108,7 @@ class DeltaKinematics: homing_state.home(coord, homepos, endstops, homing_speed) # Retract coord[2] = homepos[2] - hi.retract_dist - homing_state.retract(coord, second_homing_speed) + homing_state.retract(coord, homing_speed) # Home again coord[2] -= hi.retract_dist homing_state.home(coord, homepos, endstops,