From 65a6a86d19aca35563cc25d193f20fc6fa04c3c8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 20 Apr 2018 01:14:50 -0500
Subject: [PATCH] Don't report point 0 in MBL G29

---
 Marlin/src/gcode/bedlevel/mbl/G29.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index 04eb68550e..24249cc39c 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -69,7 +69,7 @@ void GcodeSuite::G29() {
     static bool enable_soft_endstops;
   #endif
 
-  const MeshLevelingState state = (MeshLevelingState)parser.byteval('S', (int8_t)MeshReport);
+  MeshLevelingState state = (MeshLevelingState)parser.byteval('S', (int8_t)MeshReport);
   if (!WITHIN(state, 0, 5)) {
     SERIAL_PROTOCOLLNPGM("S out of range (0-5).");
     return;
@@ -90,8 +90,11 @@ void GcodeSuite::G29() {
     case MeshStart:
       mbl.reset();
       mbl_probe_index = 0;
-      enqueue_and_echo_commands_P(lcd_wait_for_move ? PSTR("G29 S2") : PSTR("G28\nG29 S2"));
-      break;
+      if (!lcd_wait_for_move) {
+        enqueue_and_echo_commands_P(PSTR("G28\nG29 S2"));
+        return;
+      }
+      state = MeshNext;
 
     case MeshNext:
       if (mbl_probe_index < 0) {
@@ -108,7 +111,7 @@ void GcodeSuite::G29() {
         do_blocking_move_to_z(0);
       }
       else {
-        // For G29 S2 after adjusting Z.
+        // Save Z for the previous mesh position
         mbl.set_zigzag_z(mbl_probe_index - 1, current_position[Z_AXIS]);
         #if HAS_SOFTWARE_ENDSTOPS
           soft_endstops_enabled = enable_soft_endstops;
@@ -201,7 +204,7 @@ void GcodeSuite::G29() {
 
   } // switch(state)
 
-  if (state == MeshStart || state == MeshNext) {
+  if (state == MeshNext) {
     SERIAL_PROTOCOLPAIR("MBL G29 point ", min(mbl_probe_index, GRID_MAX_POINTS));
     SERIAL_PROTOCOLLNPAIR(" of ", int(GRID_MAX_POINTS));
   }