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

Neater position_is_reachable call

Browse source
This commit is contained in:
Scott Lahteine 2017-08-09 12:31:00 -05:00
parent 9d95b1b4df
commit 0938c62b48
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Marlin/Marlin_main.cpp
View file

@ -2359,10 +2359,11 @@ static void clean_up_after_endstop_or_probe_move() {
const float nx = lx - (X_PROBE_OFFSET_FROM_EXTRUDER), ny = ly - (Y_PROBE_OFFSET_FROM_EXTRUDER);
if (printable) {
if (!position_is_reachable_by_probe_xy(lx, ly)) return NAN;
}
else if (!position_is_reachable_xy(nx, ny)) return NAN;
if (printable
? !position_is_reachable_xy(nx, ny)
: !position_is_reachable_by_probe_xy(lx, ly)
) return NAN;
const float old_feedrate_mm_s = feedrate_mm_s;