Browse Source

One fewer function call in probe_pt

pull/1/head
Scott Lahteine 7 years ago
parent
commit
80ada58818
  1. 19
      Marlin/src/module/probe.cpp

19
Marlin/src/module/probe.cpp

@ -594,17 +594,20 @@ float probe_pt(const float &rx, const float &ry, const bool stow, const uint8_t
: !position_is_reachable_by_probe(rx, ry) : !position_is_reachable_by_probe(rx, ry)
) return NAN; ) return NAN;
const float old_feedrate_mm_s = feedrate_mm_s; const float nz =
#if ENABLED(DELTA)
#if ENABLED(DELTA) // Move below clip height or xy move will be aborted by do_blocking_move_to
if (current_position[Z_AXIS] > delta_clip_start_height) min(current_position[Z_AXIS], delta_clip_start_height)
do_blocking_move_to_z(delta_clip_start_height); #else
#endif current_position[Z_AXIS]
#endif
;
const float old_feedrate_mm_s = feedrate_mm_s;
feedrate_mm_s = XY_PROBE_FEEDRATE_MM_S; feedrate_mm_s = XY_PROBE_FEEDRATE_MM_S;
// Move the probe to the given XY // Move the probe to the starting XYZ
do_blocking_move_to_xy(nx, ny); do_blocking_move_to(nx, ny, nz);
float measured_z = NAN; float measured_z = NAN;
if (!DEPLOY_PROBE()) { if (!DEPLOY_PROBE()) {

Loading…
Cancel
Save