Increase compatibility with some extruder/probe combinations

Use the new PROBE_OFFSET_ limits
mriscoc · Oct 27, 2024 · 4f65c63 · 4f65c63
1 parent 78c615a
commit 4f65c63
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 25 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -1667,10 +1667,10 @@
 #define Z_PROBE_LOW_POINT          -2 // (mm) Farthest distance below the trigger-point to go before stopping
 
 // For M851 provide ranges for adjusting the X, Y, and Z probe offsets
-//#define PROBE_OFFSET_XMIN -50   // (mm)
-//#define PROBE_OFFSET_XMAX  50   // (mm)
-//#define PROBE_OFFSET_YMIN -50   // (mm)
-//#define PROBE_OFFSET_YMAX  50   // (mm)
+#define PROBE_OFFSET_XMIN -100   // (mm)  // MRiscoC increase compatibility with some extruder/probe combinations
+#define PROBE_OFFSET_XMAX  100   // (mm)  // MRiscoC increase compatibility with some extruder/probe combinations
+#define PROBE_OFFSET_YMIN -100   // (mm)  // MRiscoC increase compatibility with some extruder/probe combinations
+#define PROBE_OFFSET_YMAX  100   // (mm)  // MRiscoC increase compatibility with some extruder/probe combinations
 //#define PROBE_OFFSET_ZMIN -20   // (mm)
 //#define PROBE_OFFSET_ZMAX  20   // (mm)
 

diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -2287,9 +2287,9 @@ void applyMove() {
 #endif
 
 #if HAS_BED_PROBE
-  void setProbeOffsetX() { setPFloatOnClick(-60, 60, UNITFDIGITS, TERN(PROUI_EX, proUIEx.applyPhySet, nullptr)); }
-  void setProbeOffsetY() { setPFloatOnClick(-60, 60, UNITFDIGITS, TERN(PROUI_EX, proUIEx.applyPhySet, nullptr)); }
-  void setProbeOffsetZ() { setPFloatOnClick(-10, 10, 2); }
+  void setProbeOffsetX() { setPFloatOnClick(PROBE_OFFSET_XMIN, PROBE_OFFSET_XMAX, UNITFDIGITS, TERN(PROUI_EX, proUIEx.applyPhySet, nullptr)); }
+  void setProbeOffsetY() { setPFloatOnClick(PROBE_OFFSET_YMIN, PROBE_OFFSET_YMAX, UNITFDIGITS, TERN(PROUI_EX, proUIEx.applyPhySet, nullptr)); }
+  void setProbeOffsetZ() { setPFloatOnClick(PROBE_OFFSET_ZMIN, PROBE_OFFSET_ZMAX, 2); }
 
   #if PROUI_EX
     void setProbeZSpeed()  { setPIntOnClick(60, Z_PROBE_FEEDRATE_FAST); }

diff --git a/configurations/Ender3S1-F1/Configuration.h b/configurations/Ender3S1-F1/Configuration.h
@@ -1667,10 +1667,10 @@
 #define Z_PROBE_LOW_POINT          -3 // (mm) Farthest distance below the trigger-point to go before stopping  // MRiscoC allows reach lower points
 
 // For M851 provide ranges for adjusting the X, Y, and Z probe offsets
-//#define PROBE_OFFSET_XMIN -50   // (mm)
-//#define PROBE_OFFSET_XMAX  50   // (mm)
-//#define PROBE_OFFSET_YMIN -50   // (mm)
-//#define PROBE_OFFSET_YMAX  50   // (mm)
+#define PROBE_OFFSET_XMIN -100   // (mm)  // MRiscoC increase compatibility with some extruder/probe combinations
+#define PROBE_OFFSET_XMAX  100   // (mm)  // MRiscoC increase compatibility with some extruder/probe combinations
+#define PROBE_OFFSET_YMIN -100   // (mm)  // MRiscoC increase compatibility with some extruder/probe combinations
+#define PROBE_OFFSET_YMAX  100   // (mm)  // MRiscoC increase compatibility with some extruder/probe combinations
 //#define PROBE_OFFSET_ZMIN -20   // (mm)
 //#define PROBE_OFFSET_ZMAX  20   // (mm)
 

diff --git a/configurations/Ender3S1-F4/Configuration.h b/configurations/Ender3S1-F4/Configuration.h
@@ -1667,10 +1667,10 @@
 #define Z_PROBE_LOW_POINT          -3 // (mm) Farthest distance below the trigger-point to go before stopping  // MRiscoC allows reach lower points
 
 // For M851 provide ranges for adjusting the X, Y, and Z probe offsets
-//#define PROBE_OFFSET_XMIN -50   // (mm)
-//#define PROBE_OFFSET_XMAX  50   // (mm)
-//#define PROBE_OFFSET_YMIN -50   // (mm)
-//#define PROBE_OFFSET_YMAX  50   // (mm)
+#define PROBE_OFFSET_XMIN -100   // (mm)  // MRiscoC increase compatibility with some extruder/probe combinations
+#define PROBE_OFFSET_XMAX  100   // (mm)  // MRiscoC increase compatibility with some extruder/probe combinations
+#define PROBE_OFFSET_YMIN -100   // (mm)  // MRiscoC increase compatibility with some extruder/probe combinations
+#define PROBE_OFFSET_YMAX  100   // (mm)  // MRiscoC increase compatibility with some extruder/probe combinations
 //#define PROBE_OFFSET_ZMIN -20   // (mm)
 //#define PROBE_OFFSET_ZMAX  20   // (mm)
 

diff --git a/configurations/Ender3S1-F4/Configuration_adv.h b/configurations/Ender3S1-F4/Configuration_adv.h
@@ -1701,7 +1701,7 @@
    *
    * :['SPI_HALF_SPEED', 'SPI_QUARTER_SPEED', 'SPI_EIGHTH_SPEED']
    */
-  //#define SD_SPI_SPEED SPI_HALF_SPEED
+  #define SD_SPI_SPEED SPI_HALF_SPEED
 
   // The standard SD detect circuit reads LOW when media is inserted and HIGH when empty.
   // Enable this option and set to HIGH if your SD cards are incorrectly detected.

diff --git a/configurations/Ender3V2-422-BLT/Configuration.h b/configurations/Ender3V2-422-BLT/Configuration.h
@@ -1667,10 +1667,10 @@
 #define Z_PROBE_LOW_POINT          -3 // (mm) Farthest distance below the trigger-point to go before stopping  // MRiscoC allows reach lower points
 
 // For M851 provide ranges for adjusting the X, Y, and Z probe offsets
-//#define PROBE_OFFSET_XMIN -50   // (mm)
-//#define PROBE_OFFSET_XMAX  50   // (mm)
-//#define PROBE_OFFSET_YMIN -50   // (mm)
-//#define PROBE_OFFSET_YMAX  50   // (mm)
+#define PROBE_OFFSET_XMIN -100   // (mm)  // MRiscoC increase compatibility with some extruder/probe combinations
+#define PROBE_OFFSET_XMAX  100   // (mm)  // MRiscoC increase compatibility with some extruder/probe combinations
+#define PROBE_OFFSET_YMIN -100   // (mm)  // MRiscoC increase compatibility with some extruder/probe combinations
+#define PROBE_OFFSET_YMAX  100   // (mm)  // MRiscoC increase compatibility with some extruder/probe combinations
 //#define PROBE_OFFSET_ZMIN -20   // (mm)
 //#define PROBE_OFFSET_ZMAX  20   // (mm)
 

diff --git a/configurations/Ender3V2-422-MM/Configuration.h b/configurations/Ender3V2-422-MM/Configuration.h
@@ -1351,7 +1351,7 @@
  * The probe replaces the Z-MIN endstop and is used for Z homing.
  * (Automatically enables USE_PROBE_FOR_Z_HOMING.)
  */
-#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
+//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN  // Manual mesh not have a probe
 
 // Force the use of the probe for Z-axis homing
 //#define USE_PROBE_FOR_Z_HOMING  // Manual mesh not have a probe
@@ -1667,10 +1667,10 @@
 #define Z_PROBE_LOW_POINT          -2 // (mm) Farthest distance below the trigger-point to go before stopping
 
 // For M851 provide ranges for adjusting the X, Y, and Z probe offsets
-//#define PROBE_OFFSET_XMIN -50   // (mm)
-//#define PROBE_OFFSET_XMAX  50   // (mm)
-//#define PROBE_OFFSET_YMIN -50   // (mm)
-//#define PROBE_OFFSET_YMAX  50   // (mm)
+#define PROBE_OFFSET_XMIN -100   // (mm)  // MRiscoC increase compatibility with some extruder/probe combinations
+#define PROBE_OFFSET_XMAX  100   // (mm)  // MRiscoC increase compatibility with some extruder/probe combinations
+#define PROBE_OFFSET_YMIN -100   // (mm)  // MRiscoC increase compatibility with some extruder/probe combinations
+#define PROBE_OFFSET_YMAX  100   // (mm)  // MRiscoC increase compatibility with some extruder/probe combinations
 //#define PROBE_OFFSET_ZMIN -20   // (mm)
 //#define PROBE_OFFSET_ZMAX  20   // (mm)