Skip to content

[1.1.x] fix bltouch homing #11380

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 3 commits into from
Jul 27, 2018
Merged

[1.1.x] fix bltouch homing #11380

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
827962f
Fix BLTouch homing
GMagician Jul 26, 2018
a173486
Revert some BLTouch code. Please test.
thinkyhead Jul 27, 2018
0109dc6
[1.1.x] fix bltouch homing
GMagician Jul 27, 2018
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
28 changes: 20 additions & 8 deletions Marlin/Marlin_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3056,7 +3056,12 @@ static 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 && DEPLOY_PROBE()) return;
if (axis == Z_AXIS) {
if (DEPLOY_PROBE()) return;
#if ENABLED(BLTOUCH)
if (set_bltouch_deployed(true)) return;
#endif
}
#endif

// Set flags for X, Y, Z motor locking
Expand All @@ -3081,8 +3086,9 @@ static void homeaxis(const AxisEnum axis) {
if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("Home 1 Fast:");
#endif
do_homing_move(axis, 1.5f * max_length(axis) * axis_home_dir);

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

Expand Down Expand Up @@ -3112,17 +3118,13 @@ static void homeaxis(const AxisEnum axis) {
#endif

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

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

// Put away the Z probe
#if HOMING_Z_WITH_PROBE
if (axis == Z_AXIS && STOW_PROBE()) return;
#endif

/**
* Home axes that have dual endstops... differently
*/
Expand Down Expand Up @@ -3198,6 +3200,16 @@ static void homeaxis(const AxisEnum axis) {

#endif

// 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;
}
#endif

// Clear retracted status if homing the Z axis
#if ENABLED(FWRETRACT)
if (axis == Z_AXIS) fwretract.hop_amount = 0.0;
Expand Down