Fix G28 with non-BLTouch probes (#14381)
This commit is contained in:
parent
aa0383a83b
commit
5986194c36
@ -43,10 +43,6 @@
|
|||||||
#include "../../module/probe.h"
|
#include "../../module/probe.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(BLTOUCH)
|
|
||||||
#include "../../feature/bltouch.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "../../lcd/ultralcd.h"
|
#include "../../lcd/ultralcd.h"
|
||||||
|
|
||||||
#if HAS_DRIVER(L6470) // set L6470 absolute position registers to counts
|
#if HAS_DRIVER(L6470) // set L6470 absolute position registers to counts
|
||||||
@ -266,6 +262,10 @@ void GcodeSuite::G28(const bool always_home_all) {
|
|||||||
|
|
||||||
set_destination_from_current();
|
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 Z_HOME_DIR > 0 // If homing away from BED do Z first
|
||||||
|
|
||||||
if (doZ) homeaxis(Z_AXIS);
|
if (doZ) homeaxis(Z_AXIS);
|
||||||
@ -345,9 +345,6 @@ void GcodeSuite::G28(const bool always_home_all) {
|
|||||||
// Home Z last if homing towards the bed
|
// Home Z last if homing towards the bed
|
||||||
#if Z_HOME_DIR < 0
|
#if Z_HOME_DIR < 0
|
||||||
if (doZ) {
|
if (doZ) {
|
||||||
#if ENABLED(BLTOUCH)
|
|
||||||
bltouch.init();
|
|
||||||
#endif
|
|
||||||
#if ENABLED(Z_SAFE_HOMING)
|
#if ENABLED(Z_SAFE_HOMING)
|
||||||
home_z_safely();
|
home_z_safely();
|
||||||
#else
|
#else
|
||||||
|
Loading…
Reference in New Issue
Block a user