Skip to content

Fix G28 with non-BLTouch probes #14381

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 2 commits into from Jun 24, 2019
Merged

Fix G28 with non-BLTouch probes #14381

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe86817
G28.cpp - FIX for #14328
bigironguru Jun 23, 2019
1fec018
Update G28.cpp
bigironguru Jun 23, 2019
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
11 changes: 4 additions & 7 deletions Marlin/src/gcode/calibrate/G28.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@
#include "../../module/probe.h"
#endif

#if ENABLED(BLTOUCH)
#include "../../feature/bltouch.h"
#endif

#include "../../lcd/ultralcd.h"

#if HAS_DRIVER(L6470) // set L6470 absolute position registers to counts
Expand Down Expand Up @@ -266,6 +262,10 @@ void GcodeSuite::G28(const bool always_home_all) {

set_destination_from_current();

#if HAS_BED_PROBE
STOW_PROBE();
#endif

#if Z_HOME_DIR > 0 // If homing away from BED do Z first

if (doZ) homeaxis(Z_AXIS);
Expand Down Expand Up @@ -345,9 +345,6 @@ void GcodeSuite::G28(const bool always_home_all) {
// Home Z last if homing towards the bed
#if Z_HOME_DIR < 0
if (doZ) {
#if ENABLED(BLTOUCH)
bltouch.init();
#endif
#if ENABLED(Z_SAFE_HOMING)
home_z_safely();
#else
Expand Down