Browse Source

Simplify Cartesian probing boundaries

Followup to #8012
Scott Lahteine 7 years ago
parent
commit
348e5e3109
1 changed files with 5 additions and 12 deletions
  1. 5
    12
      Marlin/src/inc/Conditionals_post.h

+ 5
- 12
Marlin/src/inc/Conditionals_post.h View File

@@ -921,18 +921,11 @@
921 921
     #define MAX_PROBE_X (X_CENTER +  SCARA_PRINTABLE_RADIUS)
922 922
     #define MAX_PROBE_Y (Y_CENTER +  SCARA_PRINTABLE_RADIUS)
923 923
   #else
924
-    // Boundaries for Cartesian probing based on set limits
925
-    #if ENABLED(BED_CENTER_AT_0_0)
926
-      #define MIN_PROBE_X (max(X_PROBE_OFFSET_FROM_EXTRUDER, 0) - (X_BED_SIZE) / 2)
927
-      #define MIN_PROBE_Y (max(Y_PROBE_OFFSET_FROM_EXTRUDER, 0) - (Y_BED_SIZE) / 2)
928
-      #define MAX_PROBE_X (min(X_BED_SIZE + X_PROBE_OFFSET_FROM_EXTRUDER, X_BED_SIZE) - (X_BED_SIZE) / 2)
929
-      #define MAX_PROBE_Y (min(Y_BED_SIZE + Y_PROBE_OFFSET_FROM_EXTRUDER, Y_BED_SIZE) - (Y_BED_SIZE) / 2)
930
-    #else
931
-      #define MIN_PROBE_X (max(X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER, 0))
932
-      #define MIN_PROBE_Y (max(Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER, 0))
933
-      #define MAX_PROBE_X (min(X_MAX_POS + X_PROBE_OFFSET_FROM_EXTRUDER, X_BED_SIZE))
934
-      #define MAX_PROBE_Y (min(Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER, Y_BED_SIZE))
935
-    #endif
924
+    // Boundaries for Cartesian probing based on bed limits
925
+    #define MIN_PROBE_X (max(X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER, X_MIN_BED))
926
+    #define MIN_PROBE_Y (max(Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER, Y_MIN_BED))
927
+    #define MAX_PROBE_X (min(X_MAX_POS + X_PROBE_OFFSET_FROM_EXTRUDER, X_MAX_BED))
928
+    #define MAX_PROBE_Y (min(Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER, Y_MAX_BED))
936 929
   #endif
937 930
 
938 931
   // Stepper pulse duration, in cycles

Loading…
Cancel
Save