From dfd5d2fe75d61360c03c42cd56764ceb9a3ffc8a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 9 Mar 2018 03:37:30 -0600
Subject: [PATCH] Have position_is_reachable_by_probe use the whole bed
(#10020)
Previously `position_is_reachable_by_probe` was limited to the area specified for `G29` mesh leveling (even if leveling was disabled). This change will properly consider the entire bed area so that `G30` and other non-leveling probing may take place.
---
Marlin/src/module/motion.h | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index a2e0748893..a7a3711348 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -263,15 +263,16 @@ void homeaxis(const AxisEnum axis);
#else // CARTESIAN
inline bool position_is_reachable(const float &rx, const float &ry) {
- // Add 0.001 margin to deal with float imprecision
- return WITHIN(rx, X_MIN_POS - 0.001, X_MAX_POS + 0.001)
- && WITHIN(ry, Y_MIN_POS - 0.001, Y_MAX_POS + 0.001);
+ // Add 0.001 margin to deal with float imprecision
+ return WITHIN(rx, X_MIN_POS - 0.001, X_MAX_POS + 0.001)
+ && WITHIN(ry, Y_MIN_POS - 0.001, Y_MAX_POS + 0.001);
}
inline bool position_is_reachable_by_probe(const float &rx, const float &ry) {
- // Add 0.001 margin to deal with float imprecision
- return WITHIN(rx, MIN_PROBE_X - 0.001, MAX_PROBE_X + 0.001)
- && WITHIN(ry, MIN_PROBE_Y - 0.001, MAX_PROBE_Y + 0.001);
+ const float nx = rx - (X_PROBE_OFFSET_FROM_EXTRUDER), ny = ry - (Y_PROBE_OFFSET_FROM_EXTRUDER);
+ return position_is_reachable(rx, ry)
+ && WITHIN(nx, X_MIN_BED - 0.001, X_MAX_BED + 0.001)
+ && WITHIN(ny, Y_MIN_BED - 0.001, Y_MAX_BED + 0.001);
}
#endif // CARTESIAN
--
GitLab