Revert probe changes

Marlin-DE200 · Mar 3, 2024 · 8ef3474 · 8ef3474
1 parent 81f5a03
commit 8ef3474
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -1809,19 +1809,17 @@
  *     |    [-]    |
  *     O-- FRONT --+
  */
-#define NOZZLE_TO_PROBE_OFFSET_X 0
 #if ENABLED(DE200_HEAD_STD)
-  #define NOZZLE_TO_PROBE_OFFSET_Y  21
+  #define NOZZLE_TO_PROBE_OFFSET { 0, 21, 0 }
 #elif ENABLED(DE200_HEAD_STD_BLTOUCH)
-  #define NOZZLE_TO_PROBE_OFFSET_Y -21
+  #define NOZZLE_TO_PROBE_OFFSET { 0, -21, 0 }
 #elif ENABLED(DE200_HEAD_Z122)
-  #define NOZZLE_TO_PROBE_OFFSET_Y -57
+  #define NOZZLE_TO_PROBE_OFFSET { 0, -57, 0 }
 #elif ENABLED(DE200_HEAD_Z122_BLTOUCH)
-  #define NOZZLE_TO_PROBE_OFFSET_Y -57
+  #define NOZZLE_TO_PROBE_OFFSET { 0, -57, 0 }
 #else
   #error "DE200_HEAD unknown"
 #endif
-#define NOZZLE_TO_PROBE_OFFSET { NOZZLE_TO_PROBE_OFFSET_X, NOZZLE_TO_PROBE_OFFSET_Y, 0 }
 
 // Most probes should stay away from the edges of the bed, but
 // with NOZZLE_AS_PROBE this can be negative for a wider probing area.
@@ -1898,20 +1896,16 @@
  * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
  *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
  */
-#if ENABLED(DE200_HEAD_BLTOUCH_ANY)
-  #define Z_CLEARANCE_DEPLOY_PROBE 10 // (mm) Z Clearance for Deploy/Stow
-#else
-  #define Z_CLEARANCE_DEPLOY_PROBE  5 // (mm) Z Clearance for Deploy/Stow
-#endif
+#define Z_CLEARANCE_DEPLOY_PROBE   10 // (mm) Z Clearance for Deploy/Stow
 #define Z_CLEARANCE_BETWEEN_PROBES  5 // (mm) Z Clearance between probe points
 #define Z_CLEARANCE_MULTI_PROBE     1 // (mm) Z Clearance between multiple probes
 //#define Z_AFTER_PROBING           5 // (mm) Z position after probing is done
 
 #define Z_PROBE_LOW_POINT          -2 // (mm) Farthest distance below the trigger-point to go before stopping
 
 // For M851 give a range for adjusting the Z probe offset
-#define Z_PROBE_OFFSET_RANGE_MIN -10
-#define Z_PROBE_OFFSET_RANGE_MAX   0
+#define Z_PROBE_OFFSET_RANGE_MIN -20
+#define Z_PROBE_OFFSET_RANGE_MAX  20
 
 // Enable the M48 repeatability test to test probe accuracy
 #define Z_MIN_PROBE_REPEATABILITY_TEST

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
@@ -1396,7 +1396,7 @@
     //#define PROBE_OFFSET_WIZARD_START_Z -4.0
 
     // Set a convenient position to do the calibration (probing point and nozzle/bed-distance)
-    #define PROBE_OFFSET_WIZARD_XY_POS { (X_CENTER - NOZZLE_TO_PROBE_OFFSET_X), (Y_CENTER - NOZZLE_TO_PROBE_OFFSET_Y) }
+    //#define PROBE_OFFSET_WIZARD_XY_POS { X_CENTER, Y_CENTER }
   #endif
 #endif