Parcourir la source

Fix - Conditionals_post.h - allow overriding of [min,max] probe points as expected

Jonathan Barchi il y a 7 ans
Parent
révision
7c6d33b0d2
1 fichiers modifiés avec 12 ajouts et 12 suppressions
  1. 12
    12
      Marlin/Conditionals_post.h

+ 12
- 12
Marlin/Conditionals_post.h Voir le fichier

960
     // Probing points may be verified at compile time within the radius
960
     // Probing points may be verified at compile time within the radius
961
     // using static_assert(HYPOT2(X2-X1,Y2-Y1)<=sq(DELTA_PRINTABLE_RADIUS),"bad probe point!")
961
     // using static_assert(HYPOT2(X2-X1,Y2-Y1)<=sq(DELTA_PRINTABLE_RADIUS),"bad probe point!")
962
     // so that may be added to SanityCheck.h in the future.
962
     // so that may be added to SanityCheck.h in the future.
963
-    #define MIN_PROBE_X (X_CENTER - DELTA_PRINTABLE_RADIUS)
964
-    #define MIN_PROBE_Y (Y_CENTER - DELTA_PRINTABLE_RADIUS)
965
-    #define MAX_PROBE_X (X_CENTER + DELTA_PRINTABLE_RADIUS)
966
-    #define MAX_PROBE_Y (Y_CENTER + DELTA_PRINTABLE_RADIUS)
963
+    #define _MIN_PROBE_X (X_CENTER - DELTA_PRINTABLE_RADIUS)
964
+    #define _MIN_PROBE_Y (Y_CENTER - DELTA_PRINTABLE_RADIUS)
965
+    #define _MAX_PROBE_X (X_CENTER + DELTA_PRINTABLE_RADIUS)
966
+    #define _MAX_PROBE_Y (Y_CENTER + DELTA_PRINTABLE_RADIUS)
967
   #elif IS_SCARA
967
   #elif IS_SCARA
968
     #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
968
     #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
969
-    #define MIN_PROBE_X (X_CENTER - (SCARA_PRINTABLE_RADIUS))
970
-    #define MIN_PROBE_Y (Y_CENTER - (SCARA_PRINTABLE_RADIUS))
971
-    #define MAX_PROBE_X (X_CENTER +  SCARA_PRINTABLE_RADIUS)
972
-    #define MAX_PROBE_Y (Y_CENTER +  SCARA_PRINTABLE_RADIUS)
969
+    #define _MIN_PROBE_X (X_CENTER - (SCARA_PRINTABLE_RADIUS))
970
+    #define _MIN_PROBE_Y (Y_CENTER - (SCARA_PRINTABLE_RADIUS))
971
+    #define _MAX_PROBE_X (X_CENTER +  SCARA_PRINTABLE_RADIUS)
972
+    #define _MAX_PROBE_Y (Y_CENTER +  SCARA_PRINTABLE_RADIUS)
973
   #else
973
   #else
974
     // Boundaries for Cartesian probing based on bed limits
974
     // Boundaries for Cartesian probing based on bed limits
975
-    #define MIN_PROBE_X (max(X_MIN_BED, X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
976
-    #define MIN_PROBE_Y (max(Y_MIN_BED, Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
977
-    #define MAX_PROBE_X (min(X_MAX_BED, X_MAX_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
978
-    #define MAX_PROBE_Y (min(Y_MAX_BED, Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
975
+    #define _MIN_PROBE_X (max(X_MIN_BED, X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
976
+    #define _MIN_PROBE_Y (max(Y_MIN_BED, Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
977
+    #define _MAX_PROBE_X (min(X_MAX_BED, X_MAX_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
978
+    #define _MAX_PROBE_Y (min(Y_MAX_BED, Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
979
   #endif
979
   #endif
980
 
980
 
981
   // Allow configuration to override these for special purposes
981
   // Allow configuration to override these for special purposes

Chargement…
Annuler
Enregistrer