From b6f720ca1ae1fb3a9998db168cbb4e87e14df9e8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 30 Jul 2021 22:43:58 -0500
Subject: [PATCH] =?UTF-8?q?=E2=9C=85=20Custom=20logging=20for=20MBL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/src/gcode/bedlevel/abl/G29.cpp | 14 +++++---------
Marlin/src/gcode/bedlevel/mbl/G29.cpp | 13 +++++++++++++
2 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 0c0fb077601..a88e0894792 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -217,6 +217,8 @@ public:
* There's no extra effect if you have a fixed Z probe.
*/
G29_TYPE GcodeSuite::G29() {
+ DEBUG_SECTION(log_G29, "G29", DEBUGGING(LEVELING));
+
TERN_(PROBE_MANUALLY, static) G29_State abl;
TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_PROBE));
@@ -227,11 +229,7 @@ G29_TYPE GcodeSuite::G29() {
// G29 Q is also available if debugging
#if ENABLED(DEBUG_LEVELING_FEATURE)
- const uint8_t old_debug_flags = marlin_debug_flags;
- if (seenQ) marlin_debug_flags |= MARLIN_DEBUG_LEVELING;
- DEBUG_SECTION(log_G29, "G29", DEBUGGING(LEVELING));
- if (DEBUGGING(LEVELING)) log_machine_info();
- marlin_debug_flags = old_debug_flags;
+ if (seenQ || DEBUGGING(LEVELING)) log_machine_info();
if (DISABLED(PROBE_MANUALLY) && seenQ) G29_RETURN(false);
#endif
@@ -472,10 +470,8 @@ G29_TYPE GcodeSuite::G29() {
// Query G29 status
if (abl.verbose_level || seenQ) {
SERIAL_ECHOPGM("Manual G29 ");
- if (g29_in_progress) {
- SERIAL_ECHOPAIR("point ", _MIN(abl.abl_probe_index + 1, abl.abl_points));
- SERIAL_ECHOLNPAIR(" of ", abl.abl_points);
- }
+ if (g29_in_progress)
+ SERIAL_ECHOLNPAIR("point ", _MIN(abl.abl_probe_index + 1, abl.abl_points), " of ", abl.abl_points);
else
SERIAL_ECHOLNPGM("idle");
}
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index 03f2c58e81c..984e008d278 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -42,6 +42,9 @@
#include "../../../lcd/extui/ui_api.h"
#endif
+#define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
+#include "../../../core/debug_out.h"
+
// Save 130 bytes with non-duplication of PSTR
inline void echo_not_entered(const char c) { SERIAL_CHAR(c); SERIAL_ECHOLNPGM(" not entered."); }
@@ -59,6 +62,16 @@ inline void echo_not_entered(const char c) { SERIAL_CHAR(c); SERIAL_ECHOLNPGM("
* S5 Reset and disable mesh
*/
void GcodeSuite::G29() {
+ DEBUG_SECTION(log_G29, "G29", true);
+
+ // G29 Q is also available if debugging
+ #if ENABLED(DEBUG_LEVELING_FEATURE)
+ const bool seenQ = parser.seen_test('Q');
+ if (seenQ || DEBUGGING(LEVELING)) {
+ log_machine_info();
+ if (seenQ) return;
+ }
+ #endif
TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_PROBE));