Explorar el Código

Simplify Cartesian probing bounds

Followup to #8011
Scott Lahteine hace 6 años
padre
commit
2338632270
Se han modificado 1 ficheros con 4 adiciones y 11 borrados
  1. 4
    11
      Marlin/Conditionals_post.h

+ 4
- 11
Marlin/Conditionals_post.h Ver fichero

@@ -856,17 +856,10 @@
856 856
     #define MAX_PROBE_Y (Y_CENTER +  SCARA_PRINTABLE_RADIUS)
857 857
   #else
858 858
     // Boundaries for Cartesian probing based on set limits
859
-    #if ENABLED(BED_CENTER_AT_0_0)
860
-      #define MIN_PROBE_X (max(X_PROBE_OFFSET_FROM_EXTRUDER, 0) - (X_BED_SIZE) / 2)
861
-      #define MIN_PROBE_Y (max(Y_PROBE_OFFSET_FROM_EXTRUDER, 0) - (Y_BED_SIZE) / 2)
862
-      #define MAX_PROBE_X (min(X_BED_SIZE + X_PROBE_OFFSET_FROM_EXTRUDER, X_BED_SIZE) - (X_BED_SIZE) / 2)
863
-      #define MAX_PROBE_Y (min(Y_BED_SIZE + Y_PROBE_OFFSET_FROM_EXTRUDER, Y_BED_SIZE) - (Y_BED_SIZE) / 2)
864
-    #else
865
-      #define MIN_PROBE_X (max(X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER, 0))
866
-      #define MIN_PROBE_Y (max(Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER, 0))
867
-      #define MAX_PROBE_X (min(X_MAX_POS + X_PROBE_OFFSET_FROM_EXTRUDER, X_BED_SIZE))
868
-      #define MAX_PROBE_Y (min(Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER, Y_BED_SIZE))
869
-    #endif
859
+    #define MIN_PROBE_X (max(X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER, X_MIN_BED))
860
+    #define MIN_PROBE_Y (max(Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER, Y_MIN_BED))
861
+    #define MAX_PROBE_X (min(X_MAX_POS + X_PROBE_OFFSET_FROM_EXTRUDER, X_MAX_BED))
862
+    #define MAX_PROBE_Y (min(Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER, Y_MAX_BED))
870 863
   #endif
871 864
 
872 865
   // Stepper pulse duration, in cycles

Loading…
Cancelar
Guardar