Browse Source

Fix ABL grid bounds test for Delta/SCARA

Addressing #10538
Scott Lahteine 6 years ago
parent
commit
a51ba6e3f6
1 changed files with 11 additions and 2 deletions
  1. 11
    2
      Marlin/src/gcode/bedlevel/abl/G29.cpp

+ 11
- 2
Marlin/src/gcode/bedlevel/abl/G29.cpp View File

@@ -360,8 +360,17 @@ void GcodeSuite::G29() {
360 360
       front_probe_bed_position = parser.seenval('F') ? (int)RAW_Y_POSITION(parser.value_linear_units()) : FRONT_PROBE_BED_POSITION;
361 361
       back_probe_bed_position  = parser.seenval('B') ? (int)RAW_Y_POSITION(parser.value_linear_units()) : BACK_PROBE_BED_POSITION;
362 362
 
363
-      if ( !position_is_reachable_by_probe(left_probe_bed_position, front_probe_bed_position)
364
-        || !position_is_reachable_by_probe(right_probe_bed_position, back_probe_bed_position)) {
363
+      if (
364
+        #if IS_SCARA || ENABLED(DELTA)
365
+             !position_is_reachable_by_probe(left_probe_bed_position, 0)
366
+          || !position_is_reachable_by_probe(right_probe_bed_position, 0)
367
+          || !position_is_reachable_by_probe(0, front_probe_bed_position)
368
+          || !position_is_reachable_by_probe(0, back_probe_bed_position)
369
+        #else
370
+             !position_is_reachable_by_probe(left_probe_bed_position, front_probe_bed_position)
371
+          || !position_is_reachable_by_probe(right_probe_bed_position, back_probe_bed_position)
372
+        #endif
373
+      ) {
365 374
         SERIAL_PROTOCOLLNPGM("? (L,R,F,B) out of bounds.");
366 375
         return;
367 376
       }

Loading…
Cancel
Save