3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2018-10-08 21:59:25 -04:00
parent 36ae433b57
commit f7a7223b30
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/example.cfg
View File

@ -49,14 +49,13 @@ position_max: 200
#homing_speed: 5.0 #homing_speed: 5.0
# Maximum velocity (in mm/s) of the stepper when homing. The default # Maximum velocity (in mm/s) of the stepper when homing. The default
# is 5mm/s. # 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 #homing_retract_dist: 5.0
# Distance to backoff (in mm) before homing a second time during # 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: #homing_positive_dir:
# If true, homing will cause the stepper to move in a positive # If true, homing will cause the stepper to move in a positive
# direction (away from zero); if false, home towards zero. The # direction (away from zero); if false, home towards zero. The

2
klippy/kinematics/cartesian.py
View File

@ -79,7 +79,7 @@ class CartKinematics:
homing_state.home(coord, homepos, rail.get_endstops(), homing_speed) homing_state.home(coord, homepos, rail.get_endstops(), homing_speed)
# Retract # Retract
coord[axis] = rpos coord[axis] = rpos
homing_state.retract(coord, second_homing_speed) homing_state.retract(coord, homing_speed)
# Home again # Home again
coord[axis] = r2pos coord[axis] = r2pos
homing_state.home(coord, homepos, rail.get_endstops(), homing_state.home(coord, homepos, rail.get_endstops(),

2
klippy/kinematics/corexy.py
View File

@ -75,7 +75,7 @@ class CoreXYKinematics:
homing_state.home(coord, homepos, rail.get_endstops(), homing_speed) homing_state.home(coord, homepos, rail.get_endstops(), homing_speed)
# Retract # Retract
coord[axis] = rpos coord[axis] = rpos
homing_state.retract(coord, second_homing_speed) homing_state.retract(coord, homing_speed)
# Home again # Home again
coord[axis] = r2pos coord[axis] = r2pos
homing_state.home(coord, homepos, rail.get_endstops(), homing_state.home(coord, homepos, rail.get_endstops(),

2
klippy/kinematics/delta.py
View File

@ -108,7 +108,7 @@ class DeltaKinematics:
homing_state.home(coord, homepos, endstops, homing_speed) homing_state.home(coord, homepos, endstops, homing_speed)
# Retract # Retract
coord[2] = homepos[2] - hi.retract_dist coord[2] = homepos[2] - hi.retract_dist
homing_state.retract(coord, second_homing_speed) homing_state.retract(coord, homing_speed)
# Home again # Home again
coord[2] -= hi.retract_dist coord[2] -= hi.retract_dist
homing_state.home(coord, homepos, endstops, homing_state.home(coord, homepos, endstops,