CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No homing bump if bump distance is 0 (or less)

Browse Source
This commit is contained in:
Scott Lahteine 2016-09-22 06:23:46 -05:00
parent 2b4da57ea7
commit a9a21db39f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Marlin/Marlin_main.cpp
View File

@ -2273,6 +2273,9 @@ static void homeaxis(AxisEnum axis) {
if (axis == Z_AXIS) stepper.set_homing_flag(true); if (axis == Z_AXIS) stepper.set_homing_flag(true);
#endif #endif
// Fast move towards endstop until triggered
do_homing_move(axis, 1.5 * max_length(axis) * axis_home_dir);
// When homing Z with probe respect probe clearance // When homing Z with probe respect probe clearance
const float bump = axis_home_dir * ( const float bump = axis_home_dir * (
#if HOMING_Z_WITH_PROBE #if HOMING_Z_WITH_PROBE
@ -2281,12 +2284,13 @@ static void homeaxis(AxisEnum axis) {
home_bump_mm(axis) home_bump_mm(axis)
); );
// 1. Fast move towards endstop until triggered // If a second homing move is configured...
// 2. Move away from the endstop by the axis HOME_BUMP_MM if (bump) {
// 3. Slow move towards endstop until triggered // Move away from the endstop by the axis HOME_BUMP_MM
do_homing_move(axis, 1.5 * max_length(axis) * axis_home_dir); do_homing_move(axis, -bump);
do_homing_move(axis, -bump); // Slow move towards endstop until triggered
do_homing_move(axis, 2 * bump, get_homing_bump_feedrate(axis)); do_homing_move(axis, 2 * bump, get_homing_bump_feedrate(axis));
}
#if ENABLED(Z_DUAL_ENDSTOPS) #if ENABLED(Z_DUAL_ENDSTOPS)
if (axis == Z_AXIS) { if (axis == Z_AXIS) {