Fix right hand side of mesh.

MarlinFirmware · Mar 31, 2021 · 75a6bb5 · 75a6bb5
1 parent b53d4c6
commit 75a6bb5
Showing 1 changed file with 49 additions and 43 deletions.
diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -288,54 +288,60 @@ typedef struct {
 
       if (TERN0(HAS_LCD_MENU, user_canceled())) return true;
 
-      if (i < (GRID_MAX_POINTS_X - 1)) {  // Can't connect to anything farther to the right than GRID_MAX_POINTS_X.
-                                      // Already a half circle at the edge of the bed.
-
-        if (circle_flags.marked(i, j) && circle_flags.marked(i + 1, j)) {   // Test whether a leftward line can be done
-          if (!horizontal_mesh_line_flags.marked(i, j)) {
-            // Two circles need a horizontal line to connect them
-            s.x = _GET_MESH_X(  i  ) + (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // right edge
-            e.x = _GET_MESH_X(i + 1) - (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // left edge
-
-            #if HAS_ENDSTOPS
-              LIMIT(s.x, X_MIN_POS + 1, X_MAX_POS - 1);
-              s.y = e.y = constrain(_GET_MESH_Y(j), Y_MIN_POS + 1, Y_MAX_POS - 1);
-              LIMIT(e.x, X_MIN_POS + 1, X_MAX_POS - 1);
-            #else
-              s.y = e.y = _GET_MESH_Y(j);
-            #endif
-
-            if (position_is_reachable(s.x, s.y) && position_is_reachable(e.x, e.y))
-              print_line_from_here_to_there(s, e);
-
-            horizontal_mesh_line_flags.mark(i, j); // Mark done, even if skipped
-          }
-        }
+      if (
+        // Can't connect to anything farther to the right than GRID_MAX_POINTS_X
+        // Already a half circle at the edge of the bed.
+        i < (GRID_MAX_POINTS_X - 1) &&
+
+        // Test whether a leftward line can be done
+        circle_flags.marked(i, j) && circle_flags.marked(i + 1, j) &&
+
+        // Two circles need a horizontal line to connect them        
+        !horizontal_mesh_line_flags.marked(i, j)
+      ) {
+        s.x = _GET_MESH_X(  i  ) + (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // right edge
+        e.x = _GET_MESH_X(i + 1) - (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // left edge
+
+        #if HAS_ENDSTOPS
+          LIMIT(s.x, X_MIN_POS + 1, X_MAX_POS - 1);
+          s.y = e.y = constrain(_GET_MESH_Y(j), Y_MIN_POS + 1, Y_MAX_POS - 1);
+          LIMIT(e.x, X_MIN_POS + 1, X_MAX_POS - 1);
+        #else
+          s.y = e.y = _GET_MESH_Y(j);
+        #endif
 
-        if (j < (GRID_MAX_POINTS_Y - 1)) {  // Can't connect to anything further back than GRID_MAX_POINTS_Y.
-                                        // Already a half circle at the edge of the bed.
+        if (position_is_reachable(s.x, s.y) && position_is_reachable(e.x, e.y))
+          print_line_from_here_to_there(s, e);
 
-          if (circle_flags.marked(i, j) && circle_flags.marked(i, j + 1)) {   // Test whether a downward line can be done
-            if (!vertical_mesh_line_flags.marked(i, j)) {
-              // Two circles that need a vertical line to connect them
-              s.y = _GET_MESH_Y(  j  ) + (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // top edge
-              e.y = _GET_MESH_Y(j + 1) - (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // bottom edge
+        horizontal_mesh_line_flags.mark(i, j); // Mark done, even if skipped
+      }
 
-              #if HAS_ENDSTOPS
-                s.x = e.x = constrain(_GET_MESH_X(i), X_MIN_POS + 1, X_MAX_POS - 1);
-                LIMIT(s.y, Y_MIN_POS + 1, Y_MAX_POS - 1);
-                LIMIT(e.y, Y_MIN_POS + 1, Y_MAX_POS - 1);
-              #else
-                s.x = e.x = _GET_MESH_X(i);
-              #endif
+      if (
+        // Can't connect to anything further back than GRID_MAX_POINTS_Y
+        // Already a half circle at the edge of the bed.
+        j < (GRID_MAX_POINTS_Y - 1) && 
+
+        // Test whether a downward line can be done
+        circle_flags.marked(i, j) && circle_flags.marked(i, j + 1) &&
+
+        // Two circles that need a vertical line to connect them        
+        !vertical_mesh_line_flags.marked(i, j)
+      ) {
+        s.y = _GET_MESH_Y(  j  ) + (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // top edge
+        e.y = _GET_MESH_Y(j + 1) - (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // bottom edge
+
+        #if HAS_ENDSTOPS
+          s.x = e.x = constrain(_GET_MESH_X(i), X_MIN_POS + 1, X_MAX_POS - 1);
+          LIMIT(s.y, Y_MIN_POS + 1, Y_MAX_POS - 1);
+          LIMIT(e.y, Y_MIN_POS + 1, Y_MAX_POS - 1);
+        #else
+          s.x = e.x = _GET_MESH_X(i);
+        #endif
 
-              if (position_is_reachable(s.x, s.y) && position_is_reachable(e.x, e.y))
-                print_line_from_here_to_there(s, e);
+        if (position_is_reachable(s.x, s.y) && position_is_reachable(e.x, e.y))
+          print_line_from_here_to_there(s, e);
 
-              vertical_mesh_line_flags.mark(i, j); // Mark done, even if skipped
-            }
-          }
-        }
+        vertical_mesh_line_flags.mark(i, j); // Mark done, even if skipped
       }
     }
     return false;