From 12d21e642febb0d0e070e57ba4af17187c41f317 Mon Sep 17 00:00:00 2001
From: BigIronGuru <51454533+BigIronGuru@users.noreply.github.com>
Date: Mon, 24 Jun 2019 03:55:43 +0200
Subject: [PATCH] Update G34 for non-BLTouch probes (#14380)
---
Marlin/src/gcode/calibrate/G34_M422.cpp | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index e7f9dbdadd..c4b6193c5c 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -38,10 +38,6 @@
#include "../../module/probe.h"
#endif
-#if ENABLED(BLTOUCH)
- #include "../../feature/bltouch.h"
-#endif
-
#if HAS_LEVELING
#include "../../feature/bedlevel/bedlevel.h"
#endif
@@ -279,11 +275,9 @@ void GcodeSuite::G34() {
// After this operation the z position needs correction
set_axis_is_not_at_home(Z_AXIS);
- #if BOTH(BLTOUCH, BLTOUCH_HS_MODE)
- // In BLTOUCH HS mode, the pin is still deployed at this point.
- // The upcoming G28 means travel, so it is better to stow the pin.
- bltouch._stow();
- #endif
+ // Stow the probe, as the last call to probe_pt(...) left
+ // the probe deployed if it was successful.
+ STOW_PROBE();
// Home Z after the alignment procedure
process_subcommands_now_P(PSTR("G28 Z"));
--
GitLab