|
@@ -667,8 +667,8 @@ float Probe::probe_at_point(const float &rx, const float &ry, const ProbePtRaise
|
667
|
667
|
if (bltouch.triggered()) bltouch._reset();
|
668
|
668
|
#endif
|
669
|
669
|
|
670
|
|
- // TODO: Adapt for SCARA, where the offset rotates
|
671
|
|
- xyz_pos_t npos = { rx, ry };
|
|
670
|
+ // On delta keep Z below clip height or do_blocking_move_to will abort
|
|
671
|
+ xyz_pos_t npos = { rx, ry, _MIN(TERN(DELTA, delta_clip_start_height, current_position.z), current_position.z) };
|
672
|
672
|
if (probe_relative) { // The given position is in terms of the probe
|
673
|
673
|
if (!can_reach(npos)) {
|
674
|
674
|
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Position Not Reachable");
|
|
@@ -678,15 +678,6 @@ float Probe::probe_at_point(const float &rx, const float &ry, const ProbePtRaise
|
678
|
678
|
}
|
679
|
679
|
else if (!position_is_reachable(npos)) return NAN; // The given position is in terms of the nozzle
|
680
|
680
|
|
681
|
|
- npos.z =
|
682
|
|
- #if ENABLED(DELTA)
|
683
|
|
- // Move below clip height or xy move will be aborted by do_blocking_move_to
|
684
|
|
- _MIN(current_position.z, delta_clip_start_height)
|
685
|
|
- #else
|
686
|
|
- current_position.z
|
687
|
|
- #endif
|
688
|
|
- ;
|
689
|
|
-
|
690
|
681
|
const float old_feedrate_mm_s = feedrate_mm_s;
|
691
|
682
|
feedrate_mm_s = XY_PROBE_FEEDRATE_MM_S;
|
692
|
683
|
|