Skip to content

[2.0.x] bltouch home refinements #11397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 1 commit into from
Jul 29, 2018
Merged

[2.0.x] bltouch home refinements #11397

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions Marlin/src/module/motion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1297,12 +1297,7 @@ void homeaxis(const AxisEnum axis) {

// Homing Z towards the bed? Deploy the Z probe or endstop.
#if HOMING_Z_WITH_PROBE
if (axis == Z_AXIS) {
if (DEPLOY_PROBE()) return;
#if ENABLED(BLTOUCH)
if (set_bltouch_deployed(true)) return;
#endif
}
if (axis == Z_AXIS && DEPLOY_PROBE()) return;
#endif

// Set flags for X, Y, Z motor locking
Expand All @@ -1326,6 +1321,12 @@ void homeaxis(const AxisEnum axis) {
#if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("Home 1 Fast:");
#endif

#if HOMING_Z_WITH_PROBE && ENABLED(BLTOUCH)
// BLTOUCH needs to be deployed every time
if (axis == Z_AXIS && set_bltouch_deployed(true)) return;
#endif

do_homing_move(axis, 1.5f * max_length(axis) * axis_home_dir);

#if HOMING_Z_WITH_PROBE && ENABLED(BLTOUCH)
Expand Down Expand Up @@ -1364,6 +1365,11 @@ void homeaxis(const AxisEnum axis) {
#endif

do_homing_move(axis, 2 * bump, get_homing_bump_feedrate(axis));

#if HOMING_Z_WITH_PROBE && ENABLED(BLTOUCH)
// BLTOUCH needs to be stowed after trigger to rearm itself
if (axis == Z_AXIS) set_bltouch_deployed(false);
#endif
}

#if ENABLED(X_DUAL_ENDSTOPS) || ENABLED(Y_DUAL_ENDSTOPS) || ENABLED(Z_DUAL_ENDSTOPS)
Expand Down Expand Up @@ -1440,12 +1446,7 @@ void homeaxis(const AxisEnum axis) {

// Put away the Z probe
#if HOMING_Z_WITH_PROBE
if (axis == Z_AXIS) {
#if ENABLED(BLTOUCH)
if (set_bltouch_deployed(false)) return;
#endif
if (STOW_PROBE()) return;
}
if (axis == Z_AXIS && STOW_PROBE()) return;
#endif

// Clear retracted status if homing the Z axis
Expand Down