Browse Source

Neater position_is_reachable call

pull/1/head
Scott Lahteine 7 years ago
parent
commit
0938c62b48
  1. 9
      Marlin/Marlin_main.cpp

9
Marlin/Marlin_main.cpp

@ -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); const float nx = lx - (X_PROBE_OFFSET_FROM_EXTRUDER), ny = ly - (Y_PROBE_OFFSET_FROM_EXTRUDER);
if (printable) { if (printable
if (!position_is_reachable_by_probe_xy(lx, ly)) return NAN; ? !position_is_reachable_xy(nx, ny)
} : !position_is_reachable_by_probe_xy(lx, ly)
else if (!position_is_reachable_xy(nx, ny)) return NAN; ) return NAN;
const float old_feedrate_mm_s = feedrate_mm_s; const float old_feedrate_mm_s = feedrate_mm_s;

Loading…
Cancel
Save