From a11717eed6f6f4cb51ffad15e7de7c3f418fd87e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 29 May 2018 17:56:46 -0500
Subject: [PATCH] Improve probe logging
---
Marlin/Marlin_main.cpp | 36 +++++++++++++++++++++++++++---------
1 file changed, 27 insertions(+), 9 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 8d521a54bfd..6de76e1dca4 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -2277,7 +2277,15 @@ void clean_up_after_endstop_or_probe_move() {
#if MULTIPLE_PROBING == 2
// Do a first probe at the fast speed
- if (do_probe_move(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_FAST))) return NAN;
+ if (do_probe_move(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_FAST))) {
+ #if ENABLED(DEBUG_LEVELING_FEATURE)
+ if (DEBUGGING(LEVELING)) {
+ SERIAL_ECHOLNPGM("FAST Probe fail!");
+ DEBUG_POS("<<< run_z_probe", current_position);
+ }
+ #endif
+ return NAN;
+ }
float first_probe_z = current_position[Z_AXIS];
@@ -2308,7 +2316,15 @@ void clean_up_after_endstop_or_probe_move() {
#endif
// move down slowly to find bed
- if (do_probe_move(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_SLOW))) return NAN;
+ if (do_probe_move(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_SLOW))) {
+ #if ENABLED(DEBUG_LEVELING_FEATURE)
+ if (DEBUGGING(LEVELING)) {
+ SERIAL_ECHOLNPGM("SLOW Probe fail!");
+ DEBUG_POS("<<< run_z_probe", current_position);
+ }
+ #endif
+ return NAN;
+ }
#if MULTIPLE_PROBING > 2
probes_total += current_position[Z_AXIS];
@@ -2319,7 +2335,7 @@ void clean_up_after_endstop_or_probe_move() {
#if MULTIPLE_PROBING > 2
// Return the average value of all probes
- return probes_total * (1.0 / (MULTIPLE_PROBING));
+ const float measured_z = probes_total * (1.0 / (MULTIPLE_PROBING));
#elif MULTIPLE_PROBING == 2
@@ -2333,18 +2349,20 @@ void clean_up_after_endstop_or_probe_move() {
#endif
// Return a weighted average of the fast and slow probes
- return (z2 * 3.0 + first_probe_z * 2.0) * 0.2;
+ const float measured_z = (z2 * 3.0 + first_probe_z * 2.0) * 0.2;
#else
// Return the single probe result
- return current_position[Z_AXIS];
+ const float measured_z = current_position[Z_AXIS];
#endif
#if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) DEBUG_POS("<<< run_z_probe", current_position);
#endif
+
+ return measured_z;
}
/**
@@ -2414,10 +2432,6 @@ void clean_up_after_endstop_or_probe_move() {
SERIAL_EOL();
}
- #if ENABLED(DEBUG_LEVELING_FEATURE)
- if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("<<< probe_pt");
- #endif
-
feedrate_mm_s = old_feedrate_mm_s;
if (isnan(measured_z)) {
@@ -2426,6 +2440,10 @@ void clean_up_after_endstop_or_probe_move() {
SERIAL_ERRORLNPGM(MSG_ERR_PROBING_FAILED);
}
+ #if ENABLED(DEBUG_LEVELING_FEATURE)
+ if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("<<< probe_pt");
+ #endif
+
return measured_z;
}