|
@@ -217,6 +217,8 @@ public:
|
217
|
217
|
* There's no extra effect if you have a fixed Z probe.
|
218
|
218
|
*/
|
219
|
219
|
G29_TYPE GcodeSuite::G29() {
|
|
220
|
+ DEBUG_SECTION(log_G29, "G29", DEBUGGING(LEVELING));
|
|
221
|
+
|
220
|
222
|
TERN_(PROBE_MANUALLY, static) G29_State abl;
|
221
|
223
|
|
222
|
224
|
TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_PROBE));
|
|
@@ -227,11 +229,7 @@ G29_TYPE GcodeSuite::G29() {
|
227
|
229
|
|
228
|
230
|
// G29 Q is also available if debugging
|
229
|
231
|
#if ENABLED(DEBUG_LEVELING_FEATURE)
|
230
|
|
- const uint8_t old_debug_flags = marlin_debug_flags;
|
231
|
|
- if (seenQ) marlin_debug_flags |= MARLIN_DEBUG_LEVELING;
|
232
|
|
- DEBUG_SECTION(log_G29, "G29", DEBUGGING(LEVELING));
|
233
|
|
- if (DEBUGGING(LEVELING)) log_machine_info();
|
234
|
|
- marlin_debug_flags = old_debug_flags;
|
|
232
|
+ if (seenQ || DEBUGGING(LEVELING)) log_machine_info();
|
235
|
233
|
if (DISABLED(PROBE_MANUALLY) && seenQ) G29_RETURN(false);
|
236
|
234
|
#endif
|
237
|
235
|
|
|
@@ -472,10 +470,8 @@ G29_TYPE GcodeSuite::G29() {
|
472
|
470
|
// Query G29 status
|
473
|
471
|
if (abl.verbose_level || seenQ) {
|
474
|
472
|
SERIAL_ECHOPGM("Manual G29 ");
|
475
|
|
- if (g29_in_progress) {
|
476
|
|
- SERIAL_ECHOPAIR("point ", _MIN(abl.abl_probe_index + 1, abl.abl_points));
|
477
|
|
- SERIAL_ECHOLNPAIR(" of ", abl.abl_points);
|
478
|
|
- }
|
|
473
|
+ if (g29_in_progress)
|
|
474
|
+ SERIAL_ECHOLNPAIR("point ", _MIN(abl.abl_probe_index + 1, abl.abl_points), " of ", abl.abl_points);
|
479
|
475
|
else
|
480
|
476
|
SERIAL_ECHOLNPGM("idle");
|
481
|
477
|
}
|