Skip to content

Commit 4f65c63

Browse files
mriscocmriscoc
committed
Increase compatibility with some extruder/probe combinations
Use the new PROBE_OFFSET_ limits
1 parent 78c615a commit 4f65c63

File tree

7 files changed

+25
-25
lines changed

7 files changed

+25
-25
lines changed

‎Marlin/Configuration.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1667,10 +1667,10 @@
16671667
#define Z_PROBE_LOW_POINT -2 // (mm) Farthest distance below the trigger-point to go before stopping
16681668

16691669
// For M851 provide ranges for adjusting the X, Y, and Z probe offsets
1670-
//#define PROBE_OFFSET_XMIN -50 // (mm)
1671-
//#define PROBE_OFFSET_XMAX 50 // (mm)
1672-
//#define PROBE_OFFSET_YMIN -50 // (mm)
1673-
//#define PROBE_OFFSET_YMAX 50 // (mm)
1670+
#define PROBE_OFFSET_XMIN -100 // (mm) // MRiscoC increase compatibility with some extruder/probe combinations
1671+
#define PROBE_OFFSET_XMAX 100 // (mm) // MRiscoC increase compatibility with some extruder/probe combinations
1672+
#define PROBE_OFFSET_YMIN -100 // (mm) // MRiscoC increase compatibility with some extruder/probe combinations
1673+
#define PROBE_OFFSET_YMAX 100 // (mm) // MRiscoC increase compatibility with some extruder/probe combinations
16741674
//#define PROBE_OFFSET_ZMIN -20 // (mm)
16751675
//#define PROBE_OFFSET_ZMAX 20 // (mm)
16761676

‎Marlin/src/lcd/e3v2/proui/dwin.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2287,9 +2287,9 @@ void applyMove() {
22872287
#endif
22882288

22892289
#if HAS_BED_PROBE
2290-
void setProbeOffsetX() { setPFloatOnClick(-60, 60, UNITFDIGITS, TERN(PROUI_EX, proUIEx.applyPhySet, nullptr)); }
2291-
void setProbeOffsetY() { setPFloatOnClick(-60, 60, UNITFDIGITS, TERN(PROUI_EX, proUIEx.applyPhySet, nullptr)); }
2292-
void setProbeOffsetZ() { setPFloatOnClick(-10, 10, 2); }
2290+
void setProbeOffsetX() { setPFloatOnClick(PROBE_OFFSET_XMIN, PROBE_OFFSET_XMAX, UNITFDIGITS, TERN(PROUI_EX, proUIEx.applyPhySet, nullptr)); }
2291+
void setProbeOffsetY() { setPFloatOnClick(PROBE_OFFSET_YMIN, PROBE_OFFSET_YMAX, UNITFDIGITS, TERN(PROUI_EX, proUIEx.applyPhySet, nullptr)); }
2292+
void setProbeOffsetZ() { setPFloatOnClick(PROBE_OFFSET_ZMIN, PROBE_OFFSET_ZMAX, 2); }
22932293

22942294
#if PROUI_EX
22952295
void setProbeZSpeed() { setPIntOnClick(60, Z_PROBE_FEEDRATE_FAST); }

‎configurations/Ender3S1-F1/Configuration.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1667,10 +1667,10 @@
16671667
#define Z_PROBE_LOW_POINT -3 // (mm) Farthest distance below the trigger-point to go before stopping // MRiscoC allows reach lower points
16681668

16691669
// For M851 provide ranges for adjusting the X, Y, and Z probe offsets
1670-
//#define PROBE_OFFSET_XMIN -50 // (mm)
1671-
//#define PROBE_OFFSET_XMAX 50 // (mm)
1672-
//#define PROBE_OFFSET_YMIN -50 // (mm)
1673-
//#define PROBE_OFFSET_YMAX 50 // (mm)
1670+
#define PROBE_OFFSET_XMIN -100 // (mm) // MRiscoC increase compatibility with some extruder/probe combinations
1671+
#define PROBE_OFFSET_XMAX 100 // (mm) // MRiscoC increase compatibility with some extruder/probe combinations
1672+
#define PROBE_OFFSET_YMIN -100 // (mm) // MRiscoC increase compatibility with some extruder/probe combinations
1673+
#define PROBE_OFFSET_YMAX 100 // (mm) // MRiscoC increase compatibility with some extruder/probe combinations
16741674
//#define PROBE_OFFSET_ZMIN -20 // (mm)
16751675
//#define PROBE_OFFSET_ZMAX 20 // (mm)
16761676

‎configurations/Ender3S1-F4/Configuration.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1667,10 +1667,10 @@
16671667
#define Z_PROBE_LOW_POINT -3 // (mm) Farthest distance below the trigger-point to go before stopping // MRiscoC allows reach lower points
16681668

16691669
// For M851 provide ranges for adjusting the X, Y, and Z probe offsets
1670-
//#define PROBE_OFFSET_XMIN -50 // (mm)
1671-
//#define PROBE_OFFSET_XMAX 50 // (mm)
1672-
//#define PROBE_OFFSET_YMIN -50 // (mm)
1673-
//#define PROBE_OFFSET_YMAX 50 // (mm)
1670+
#define PROBE_OFFSET_XMIN -100 // (mm) // MRiscoC increase compatibility with some extruder/probe combinations
1671+
#define PROBE_OFFSET_XMAX 100 // (mm) // MRiscoC increase compatibility with some extruder/probe combinations
1672+
#define PROBE_OFFSET_YMIN -100 // (mm) // MRiscoC increase compatibility with some extruder/probe combinations
1673+
#define PROBE_OFFSET_YMAX 100 // (mm) // MRiscoC increase compatibility with some extruder/probe combinations
16741674
//#define PROBE_OFFSET_ZMIN -20 // (mm)
16751675
//#define PROBE_OFFSET_ZMAX 20 // (mm)
16761676

‎configurations/Ender3S1-F4/Configuration_adv.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1701,7 +1701,7 @@
17011701
*
17021702
* :['SPI_HALF_SPEED', 'SPI_QUARTER_SPEED', 'SPI_EIGHTH_SPEED']
17031703
*/
1704-
//#define SD_SPI_SPEED SPI_HALF_SPEED
1704+
#define SD_SPI_SPEED SPI_HALF_SPEED
17051705

17061706
// The standard SD detect circuit reads LOW when media is inserted and HIGH when empty.
17071707
// Enable this option and set to HIGH if your SD cards are incorrectly detected.

‎configurations/Ender3V2-422-BLT/Configuration.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1667,10 +1667,10 @@
16671667
#define Z_PROBE_LOW_POINT -3 // (mm) Farthest distance below the trigger-point to go before stopping // MRiscoC allows reach lower points
16681668

16691669
// For M851 provide ranges for adjusting the X, Y, and Z probe offsets
1670-
//#define PROBE_OFFSET_XMIN -50 // (mm)
1671-
//#define PROBE_OFFSET_XMAX 50 // (mm)
1672-
//#define PROBE_OFFSET_YMIN -50 // (mm)
1673-
//#define PROBE_OFFSET_YMAX 50 // (mm)
1670+
#define PROBE_OFFSET_XMIN -100 // (mm) // MRiscoC increase compatibility with some extruder/probe combinations
1671+
#define PROBE_OFFSET_XMAX 100 // (mm) // MRiscoC increase compatibility with some extruder/probe combinations
1672+
#define PROBE_OFFSET_YMIN -100 // (mm) // MRiscoC increase compatibility with some extruder/probe combinations
1673+
#define PROBE_OFFSET_YMAX 100 // (mm) // MRiscoC increase compatibility with some extruder/probe combinations
16741674
//#define PROBE_OFFSET_ZMIN -20 // (mm)
16751675
//#define PROBE_OFFSET_ZMAX 20 // (mm)
16761676

‎configurations/Ender3V2-422-MM/Configuration.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1351,7 +1351,7 @@
13511351
* The probe replaces the Z-MIN endstop and is used for Z homing.
13521352
* (Automatically enables USE_PROBE_FOR_Z_HOMING.)
13531353
*/
1354-
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
1354+
//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN // Manual mesh not have a probe
13551355

13561356
// Force the use of the probe for Z-axis homing
13571357
//#define USE_PROBE_FOR_Z_HOMING // Manual mesh not have a probe
@@ -1667,10 +1667,10 @@
16671667
#define Z_PROBE_LOW_POINT -2 // (mm) Farthest distance below the trigger-point to go before stopping
16681668

16691669
// For M851 provide ranges for adjusting the X, Y, and Z probe offsets
1670-
//#define PROBE_OFFSET_XMIN -50 // (mm)
1671-
//#define PROBE_OFFSET_XMAX 50 // (mm)
1672-
//#define PROBE_OFFSET_YMIN -50 // (mm)
1673-
//#define PROBE_OFFSET_YMAX 50 // (mm)
1670+
#define PROBE_OFFSET_XMIN -100 // (mm) // MRiscoC increase compatibility with some extruder/probe combinations
1671+
#define PROBE_OFFSET_XMAX 100 // (mm) // MRiscoC increase compatibility with some extruder/probe combinations
1672+
#define PROBE_OFFSET_YMIN -100 // (mm) // MRiscoC increase compatibility with some extruder/probe combinations
1673+
#define PROBE_OFFSET_YMAX 100 // (mm) // MRiscoC increase compatibility with some extruder/probe combinations
16741674
//#define PROBE_OFFSET_ZMIN -20 // (mm)
16751675
//#define PROBE_OFFSET_ZMAX 20 // (mm)
16761676

0 commit comments

Comments
 (0)