SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix ABL grid bounds test for Delta/SCARA

Browse source 
Addressing #10538
This commit is contained in:
Scott Lahteine 2018-04-27 00:33:58 -05:00
parent df6bc812b5
commit a51ba6e3f6
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Marlin/src/gcode/bedlevel/abl/G29.cpp
View file

@ -360,8 +360,17 @@ void GcodeSuite::G29() {
front_probe_bed_position = parser.seenval('F') ? (int)RAW_Y_POSITION(parser.value_linear_units()) : FRONT_PROBE_BED_POSITION; front_probe_bed_position = parser.seenval('F') ? (int)RAW_Y_POSITION(parser.value_linear_units()) : FRONT_PROBE_BED_POSITION;
back_probe_bed_position = parser.seenval('B') ? (int)RAW_Y_POSITION(parser.value_linear_units()) : BACK_PROBE_BED_POSITION; back_probe_bed_position = parser.seenval('B') ? (int)RAW_Y_POSITION(parser.value_linear_units()) : BACK_PROBE_BED_POSITION;
if ( !position_is_reachable_by_probe(left_probe_bed_position, front_probe_bed_position) if (
|| !position_is_reachable_by_probe(right_probe_bed_position, back_probe_bed_position)) { #if IS_SCARA || ENABLED(DELTA)
!position_is_reachable_by_probe(left_probe_bed_position, 0)
|| !position_is_reachable_by_probe(right_probe_bed_position, 0)
|| !position_is_reachable_by_probe(0, front_probe_bed_position)
|| !position_is_reachable_by_probe(0, back_probe_bed_position)
#else
!position_is_reachable_by_probe(left_probe_bed_position, front_probe_bed_position)
|| !position_is_reachable_by_probe(right_probe_bed_position, back_probe_bed_position)
#endif
) {
SERIAL_PROTOCOLLNPGM("? (L,R,F,B) out of bounds."); SERIAL_PROTOCOLLNPGM("? (L,R,F,B) out of bounds.");
return; return;
} }