From cf4e2e507f8f13b0b49584b4a751eb6e5e6a2ba8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 19 Mar 2018 00:33:55 -0500
Subject: [PATCH] Consolidate 3-point leveling point options
---
Marlin/Conditionals_post.h | 86 ++++++++++++++++---
Marlin/Configuration.h | 39 ++++-----
Marlin/Marlin_main.cpp | 6 +-
Marlin/SanityCheck.h | 31 +++----
.../AlephObjects/TAZ4/Configuration.h | 39 ++++-----
.../AliExpress/CL-260/Configuration.h | 39 ++++-----
.../Anet/A6/Configuration.h | 39 ++++-----
.../Anet/A8/Configuration.h | 40 +++++----
.../BIBO/TouchX/Cyclops/Configuration.h | 41 ++++-----
.../BIBO/TouchX/default/Configuration.h | 39 ++++-----
.../BQ/Hephestos/Configuration.h | 39 ++++-----
.../BQ/Hephestos_2/Configuration.h | 40 +++++----
.../BQ/WITBOX/Configuration.h | 39 ++++-----
.../Cartesio/Configuration.h | 39 ++++-----
.../Creality/CR-10/Configuration.h | 39 ++++-----
.../Creality/CR-10S/Configuration.h | 39 ++++-----
.../Creality/CR-10mini/Configuration.h | 39 ++++-----
.../Creality/Ender-2/Configuration.h | 39 ++++-----
.../Creality/Ender-4/Configuration.h | 39 ++++-----
.../Felix/Configuration.h | 39 ++++-----
.../Felix/DUAL/Configuration.h | 39 ++++-----
.../FolgerTech/i3-2020/Configuration.h | 45 ++++++----
.../Geeetech/GT2560/Configuration.h | 39 ++++-----
.../Geeetech/I3_Pro_X-GT2560/Configuration.h | 39 ++++-----
.../Prusa i3 Pro B/bltouch/Configuration.h | 39 ++++-----
.../Prusa i3 Pro B/noprobe/Configuration.h | 39 ++++-----
.../Infitary/i3-M508/Configuration.h | 39 ++++-----
.../JGAurora/A5/Configuration.h | 39 ++++-----
.../Malyan/M150/Configuration.h | 40 +++++----
.../Micromake/C1/basic/Configuration.h | 39 ++++-----
.../Micromake/C1/enhanced/Configuration.h | 39 ++++-----
.../RepRapWorld/Megatronics/Configuration.h | 39 ++++-----
.../RigidBot/Configuration.h | 39 ++++-----
.../SCARA/Configuration.h | 39 ++++-----
.../Sanguinololu/Configuration.h | 39 ++++-----
.../TinyBoy2/Configuration.h | 39 ++++-----
.../Tronxy/X1/Configuration.h | 39 ++++-----
.../Tronxy/X5S/Configuration.h | 39 ++++-----
.../Tronxy/XY100/Configuration.h | 39 ++++-----
.../Velleman/K8200/Configuration.h | 39 ++++-----
.../Velleman/K8400/Configuration.h | 39 ++++-----
.../Velleman/K8400/Dual-head/Configuration.h | 39 ++++-----
.../Wanhao/Duplicator 6/Configuration.h | 39 ++++-----
.../adafruit/ST7565/Configuration.h | 39 ++++-----
.../FLSUN/auto_calibrate/Configuration.h | 48 +++++++----
.../delta/FLSUN/kossel/Configuration.h | 42 ++++-----
.../delta/FLSUN/kossel_mini/Configuration.h | 42 ++++-----
.../delta/Hatchbox_Alpha/Configuration.h | 42 +++++----
.../delta/generic/Configuration.h | 41 ++++-----
.../delta/kossel_mini/Configuration.h | 41 ++++-----
.../delta/kossel_pro/Configuration.h | 41 ++++-----
.../delta/kossel_xl/Configuration.h | 41 ++++-----
.../gCreate/gMax1.5+/Configuration.h | 44 +++++-----
.../makibox/Configuration.h | 39 ++++-----
.../tvrrug/Round2/Configuration.h | 39 ++++-----
.../wt150/Configuration.h | 39 ++++-----
Marlin/ubl_G29.cpp | 36 ++++----
57 files changed, 1065 insertions(+), 1203 deletions(-)
diff --git a/Marlin/Conditionals_post.h b/Marlin/Conditionals_post.h
index 2566adf6898..2d83f8c737f 100644
--- a/Marlin/Conditionals_post.h
+++ b/Marlin/Conditionals_post.h
@@ -939,8 +939,14 @@
* Delta radius/rod trimmers/angle trimmers
*/
#if ENABLED(DELTA)
+ #define _DELTA_PROBE_RADIUS (DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
+
#ifndef DELTA_CALIBRATION_RADIUS
- #define DELTA_CALIBRATION_RADIUS DELTA_PRINTABLE_RADIUS - 10
+ #ifdef X_PROBE_OFFSET_FROM_EXTRUDER
+ #define DELTA_CALIBRATION_RADIUS (DELTA_PRINTABLE_RADIUS - MAX3(abs(X_PROBE_OFFSET_FROM_EXTRUDER), abs(Y_PROBE_OFFSET_FROM_EXTRUDER), abs(MIN_PROBE_EDGE)))
+ #else
+ #define DELTA_CALIBRATION_RADIUS _DELTA_PROBE_RADIUS
+ #endif
#endif
#ifndef DELTA_ENDSTOP_ADJ
#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
@@ -969,10 +975,6 @@
#define HAS_MESH (ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(MESH_BED_LEVELING))
#define PLANNER_LEVELING (OLDSCHOOL_ABL || ENABLED(MESH_BED_LEVELING) || UBL_SEGMENTED || ENABLED(SKEW_CORRECTION))
#define HAS_PROBING_PROCEDURE (HAS_ABL || ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST))
- #if HAS_PROBING_PROCEDURE
- #define PROBE_BED_WIDTH abs(RIGHT_PROBE_BED_POSITION - (LEFT_PROBE_BED_POSITION))
- #define PROBE_BED_HEIGHT abs(BACK_PROBE_BED_POSITION - (FRONT_PROBE_BED_POSITION))
- #endif
#if ENABLED(SEGMENT_LEVELED_MOVES) && !defined(LEVELED_SEGMENT_LENGTH)
#define LEVELED_SEGMENT_LENGTH 5
@@ -988,13 +990,14 @@
#endif
#if ENABLED(DELTA)
+
// Probing points may be verified at compile time within the radius
// using static_assert(HYPOT2(X2-X1,Y2-Y1)<=sq(DELTA_PRINTABLE_RADIUS),"bad probe point!")
// so that may be added to SanityCheck.h in the future.
- #define _MIN_PROBE_X (X_CENTER - (DELTA_PRINTABLE_RADIUS) + MIN_PROBE_EDGE)
- #define _MIN_PROBE_Y (Y_CENTER - (DELTA_PRINTABLE_RADIUS) + MIN_PROBE_EDGE)
- #define _MAX_PROBE_X (X_CENTER + DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
- #define _MAX_PROBE_Y (Y_CENTER + DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
+ #define _MIN_PROBE_X (X_CENTER - (_DELTA_PROBE_RADIUS))
+ #define _MIN_PROBE_Y (Y_CENTER - (_DELTA_PROBE_RADIUS))
+ #define _MAX_PROBE_X (X_CENTER + _DELTA_PROBE_RADIUS)
+ #define _MAX_PROBE_Y (Y_CENTER + _DELTA_PROBE_RADIUS)
#elif IS_SCARA
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
#define _MIN_PROBE_X (X_CENTER - (SCARA_PRINTABLE_RADIUS) + MIN_PROBE_EDGE)
@@ -1048,10 +1051,8 @@
#define _MESH_MAX_X (min(X_MAX_BED - (MESH_INSET), X_MAX_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
#define _MESH_MAX_Y (min(Y_MAX_BED - (MESH_INSET), Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
#endif
-
#endif
-
// These may be overridden in Configuration.h if a smaller area is desired
#ifndef MESH_MIN_X
#define MESH_MIN_X _MESH_MIN_X
@@ -1068,6 +1069,69 @@
#endif // MESH_BED_LEVELING || AUTO_BED_LEVELING_UBL
+ #if ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(AUTO_BED_LEVELING_3POINT)
+ #if IS_KINEMATIC
+ #define SIN0 0.0
+ #define SIN120 0.866025
+ #define SIN240 -0.866025
+ #define COS0 1.0
+ #define COS120 -0.5
+ #define COS240 -0.5
+ #ifndef PROBE_PT_1_X
+ #define PROBE_PT_1_X (X_CENTER + (_PROBE_RADIUS) * COS0)
+ #endif
+ #ifndef PROBE_PT_1_Y
+ #define PROBE_PT_1_Y (Y_CENTER + (_PROBE_RADIUS) * SIN0)
+ #endif
+ #ifndef PROBE_PT_2_X
+ #define PROBE_PT_2_X (X_CENTER + (_PROBE_RADIUS) * COS120)
+ #endif
+ #ifndef PROBE_PT_2_Y
+ #define PROBE_PT_2_Y (Y_CENTER + (_PROBE_RADIUS) * SIN120)
+ #endif
+ #ifndef PROBE_PT_3_X
+ #define PROBE_PT_3_X (X_CENTER + (_PROBE_RADIUS) * COS240)
+ #endif
+ #ifndef PROBE_PT_3_Y
+ #define PROBE_PT_3_Y (Y_CENTER + (_PROBE_RADIUS) * SIN240)
+ #endif
+ #else
+ #ifndef PROBE_PT_1_X
+ #define PROBE_PT_1_X MIN_PROBE_X
+ #endif
+ #ifndef PROBE_PT_1_Y
+ #define PROBE_PT_1_Y MIN_PROBE_Y
+ #endif
+ #ifndef PROBE_PT_2_X
+ #define PROBE_PT_2_X MAX_PROBE_X
+ #endif
+ #ifndef PROBE_PT_2_Y
+ #define PROBE_PT_2_Y MIN_PROBE_Y
+ #endif
+ #ifndef PROBE_PT_3_X
+ #define PROBE_PT_3_X X_CENTER
+ #endif
+ #ifndef PROBE_PT_3_Y
+ #define PROBE_PT_3_Y MAX_PROBE_Y
+ #endif
+ #endif
+ #endif
+
+ #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
+ #ifndef LEFT_PROBE_BED_POSITION
+ #define LEFT_PROBE_BED_POSITION MIN_PROBE_X
+ #endif
+ #ifndef RIGHT_PROBE_BED_POSITION
+ #define RIGHT_PROBE_BED_POSITION MAX_PROBE_X
+ #endif
+ #ifndef FRONT_PROBE_BED_POSITION
+ #define FRONT_PROBE_BED_POSITION MIN_PROBE_Y
+ #endif
+ #ifndef BACK_PROBE_BED_POSITION
+ #define BACK_PROBE_BED_POSITION MAX_PROBE_Y
+ #endif
+ #endif
+
/**
* Buzzer/Speaker
*/
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index da852ee5bcf..1fefadc0314 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -941,10 +941,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -967,17 +967,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -990,13 +979,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1017,6 +999,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 520a41481f5..e662fde49a9 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -4533,9 +4533,9 @@ void home_all_axes() { gcode_G28(true); }
// Probe at 3 arbitrary points
ABL_VAR vector_3 points[3] = {
- vector_3(ABL_PROBE_PT_1_X, ABL_PROBE_PT_1_Y, 0),
- vector_3(ABL_PROBE_PT_2_X, ABL_PROBE_PT_2_Y, 0),
- vector_3(ABL_PROBE_PT_3_X, ABL_PROBE_PT_3_Y, 0)
+ vector_3(PROBE_PT_1_X, PROBE_PT_1_Y, 0),
+ vector_3(PROBE_PT_2_X, PROBE_PT_2_Y, 0),
+ vector_3(PROBE_PT_3_X, PROBE_PT_3_Y, 0)
};
#endif // AUTO_BED_LEVELING_3POINT
diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h
index 8bf789d8bc1..f07775aae04 100644
--- a/Marlin/SanityCheck.h
+++ b/Marlin/SanityCheck.h
@@ -231,6 +231,10 @@
#error "UBL_MESH_INSET is now just MESH_INSET. Please update your configuration."
#elif defined(UBL_MESH_MIN_X) || defined(UBL_MESH_MIN_Y) || defined(UBL_MESH_MAX_X) || defined(UBL_MESH_MAX_Y)
#error "UBL_MESH_(MIN|MAX)_[XY] is now just MESH_(MIN|MAX)_[XY]. Please update your configuration."
+#elif defined(ABL_PROBE_PT_1_X) || defined(ABL_PROBE_PT_1_Y) || defined(ABL_PROBE_PT_2_X) || defined(ABL_PROBE_PT_2_Y) || defined(ABL_PROBE_PT_3_X) || defined(ABL_PROBE_PT_3_Y)
+ #error "ABL_PROBE_PT_[123]_[XY] is now PROBE_PT_[123]_[XY]. Please update your configuration."
+#elif defined(UBL_PROBE_PT_1_X) || defined(UBL_PROBE_PT_1_Y) || defined(UBL_PROBE_PT_2_X) || defined(UBL_PROBE_PT_2_Y) || defined(UBL_PROBE_PT_3_X) || defined(UBL_PROBE_PT_3_Y)
+ #error "UBL_PROBE_PT_[123]_[XY] is now PROBE_PT_[123]_[XY]. Please update your configuration."
#elif defined(ENABLE_MESH_EDIT_GFX_OVERLAY)
#error "ENABLE_MESH_EDIT_GFX_OVERLAY is now MESH_EDIT_GFX_OVERLAY. Please update your configuration."
#elif defined(BABYSTEP_ZPROBE_GFX_REVERSE)
@@ -774,6 +778,15 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
* Bed Leveling Requirements
*/
+#if ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(AUTO_BED_LEVELING_3POINT)
+ static_assert(WITHIN(PROBE_PT_1_X, MIN_PROBE_X, MAX_PROBE_X), "PROBE_PT_1_X is outside the probe region.");
+ static_assert(WITHIN(PROBE_PT_2_X, MIN_PROBE_X, MAX_PROBE_X), "PROBE_PT_2_X is outside the probe region.");
+ static_assert(WITHIN(PROBE_PT_3_X, MIN_PROBE_X, MAX_PROBE_X), "PROBE_PT_3_X is outside the probe region.");
+ static_assert(WITHIN(PROBE_PT_1_Y, MIN_PROBE_Y, MAX_PROBE_Y), "PROBE_PT_1_Y is outside the probe region.");
+ static_assert(WITHIN(PROBE_PT_2_Y, MIN_PROBE_Y, MAX_PROBE_Y), "PROBE_PT_2_Y is outside the probe region.");
+ static_assert(WITHIN(PROBE_PT_3_Y, MIN_PROBE_Y, MAX_PROBE_Y), "PROBE_PT_3_Y is outside the probe region.");
+#endif
+
#if ENABLED(AUTO_BED_LEVELING_UBL)
/**
@@ -791,13 +804,6 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
#error "GRID_MAX_POINTS_[XY] must be a whole number between 3 and 15."
#elif DISABLED(RESTORE_LEVELING_AFTER_G28)
#error "AUTO_BED_LEVELING_UBL (<=1.1.8) always has RESTORE_LEVELING_AFTER_G28 enabled. To keep this behavior, #define RESTORE_LEVELING_AFTER_G28. To keep it disabled comment out this line in SanityCheck.h."
- #else
- static_assert(WITHIN(UBL_PROBE_PT_1_X, MIN_PROBE_X, MAX_PROBE_X), "UBL_PROBE_PT_1_X is outside the probe region.");
- static_assert(WITHIN(UBL_PROBE_PT_2_X, MIN_PROBE_X, MAX_PROBE_X), "UBL_PROBE_PT_2_X is outside the probe region.");
- static_assert(WITHIN(UBL_PROBE_PT_3_X, MIN_PROBE_X, MAX_PROBE_X), "UBL_PROBE_PT_3_X is outside the probe region.");
- static_assert(WITHIN(UBL_PROBE_PT_1_Y, MIN_PROBE_Y, MAX_PROBE_Y), "UBL_PROBE_PT_1_Y is outside the probe region.");
- static_assert(WITHIN(UBL_PROBE_PT_2_Y, MIN_PROBE_Y, MAX_PROBE_Y), "UBL_PROBE_PT_2_Y is outside the probe region.");
- static_assert(WITHIN(UBL_PROBE_PT_3_Y, MIN_PROBE_Y, MAX_PROBE_Y), "UBL_PROBE_PT_3_Y is outside the probe region.");
#endif
#elif OLDSCHOOL_ABL
@@ -810,7 +816,7 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
* Delta and SCARA have limited bed leveling options
*/
#if IS_SCARA && DISABLED(AUTO_BED_LEVELING_BILINEAR)
- #error "Only AUTO_BED_LEVELING_BILINEAR currently supports SCARA bed leveling."
+ #error "SCARA machines can only use the AUTO_BED_LEVELING_BILINEAR leveling option."
#endif
/**
@@ -825,15 +831,6 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
static_assert(FRONT_PROBE_BED_POSITION >= MIN_PROBE_Y, "FRONT_PROBE_BED_POSITION is outside the probe region.");
static_assert(BACK_PROBE_BED_POSITION <= MAX_PROBE_Y, "BACK_PROBE_BED_POSITION is outside the probe region.");
- #else // AUTO_BED_LEVELING_3POINT
-
- static_assert(WITHIN(ABL_PROBE_PT_1_X, MIN_PROBE_X, MAX_PROBE_X), "ABL_PROBE_PT_1_X is outside the probe region.");
- static_assert(WITHIN(ABL_PROBE_PT_2_X, MIN_PROBE_X, MAX_PROBE_X), "ABL_PROBE_PT_2_X is outside the probe region.");
- static_assert(WITHIN(ABL_PROBE_PT_3_X, MIN_PROBE_X, MAX_PROBE_X), "ABL_PROBE_PT_3_X is outside the probe region.");
- static_assert(WITHIN(ABL_PROBE_PT_1_Y, MIN_PROBE_Y, MAX_PROBE_Y), "ABL_PROBE_PT_1_Y is outside the probe region.");
- static_assert(WITHIN(ABL_PROBE_PT_2_Y, MIN_PROBE_Y, MAX_PROBE_Y), "ABL_PROBE_PT_2_Y is outside the probe region.");
- static_assert(WITHIN(ABL_PROBE_PT_3_Y, MIN_PROBE_Y, MAX_PROBE_Y), "ABL_PROBE_PT_3_Y is outside the probe region.");
-
#endif // AUTO_BED_LEVELING_3POINT
#elif ENABLED(MESH_BED_LEVELING)
diff --git a/Marlin/example_configurations/AlephObjects/TAZ4/Configuration.h b/Marlin/example_configurations/AlephObjects/TAZ4/Configuration.h
index d044d7e6e30..c7602275e23 100644
--- a/Marlin/example_configurations/AlephObjects/TAZ4/Configuration.h
+++ b/Marlin/example_configurations/AlephObjects/TAZ4/Configuration.h
@@ -961,10 +961,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -987,17 +987,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -1010,13 +999,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1037,6 +1019,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/AliExpress/CL-260/Configuration.h b/Marlin/example_configurations/AliExpress/CL-260/Configuration.h
index 7f6fe273ace..f926171e683 100644
--- a/Marlin/example_configurations/AliExpress/CL-260/Configuration.h
+++ b/Marlin/example_configurations/AliExpress/CL-260/Configuration.h
@@ -941,10 +941,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -967,17 +967,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -990,13 +979,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1017,6 +999,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Anet/A6/Configuration.h b/Marlin/example_configurations/Anet/A6/Configuration.h
index 7835a547c38..3f177f43983 100644
--- a/Marlin/example_configurations/Anet/A6/Configuration.h
+++ b/Marlin/example_configurations/Anet/A6/Configuration.h
@@ -1064,10 +1064,10 @@
//#define BACK_PROBE_BED_POSITION 190
// ANET A6 BLTOUCH right (39mm) to the nozzle
- #define LEFT_PROBE_BED_POSITION 36
- #define RIGHT_PROBE_BED_POSITION 190
- #define FRONT_PROBE_BED_POSITION 20
- #define BACK_PROBE_BED_POSITION 190
+ //#define LEFT_PROBE_BED_POSITION 36
+ //#define RIGHT_PROBE_BED_POSITION 190
+ //#define FRONT_PROBE_BED_POSITION 20
+ //#define BACK_PROBE_BED_POSITION 190
// ANET A6 with new X-Axis and modded Y-Axis
//#define LEFT_PROBE_BED_POSITION 20
@@ -1102,17 +1102,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -1125,13 +1114,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1152,6 +1134,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Anet/A8/Configuration.h b/Marlin/example_configurations/Anet/A8/Configuration.h
index 5adfa47de4c..9d70afe6901 100644
--- a/Marlin/example_configurations/Anet/A8/Configuration.h
+++ b/Marlin/example_configurations/Anet/A8/Configuration.h
@@ -948,10 +948,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION 190
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION 170
+ //#define LEFT_PROBE_BED_POSITION 15
+ //#define RIGHT_PROBE_BED_POSITION 190
+ //#define FRONT_PROBE_BED_POSITION 15
+ //#define BACK_PROBE_BED_POSITION 170
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -978,12 +978,12 @@
// 3 arbitrary points to probe.
// A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 20
- #define ABL_PROBE_PT_1_Y 160
- #define ABL_PROBE_PT_2_X 20
- #define ABL_PROBE_PT_2_Y 10
- #define ABL_PROBE_PT_3_X 180
- #define ABL_PROBE_PT_3_Y 10
+ #define PROBE_PT_1_X 20
+ #define PROBE_PT_1_Y 160
+ #define PROBE_PT_2_X 20
+ #define PROBE_PT_2_Y 10
+ #define PROBE_PT_3_X 180
+ #define PROBE_PT_3_Y 10
#elif ENABLED(AUTO_BED_LEVELING_UBL)
@@ -997,13 +997,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1024,6 +1017,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/BIBO/TouchX/Cyclops/Configuration.h b/Marlin/example_configurations/BIBO/TouchX/Cyclops/Configuration.h
index 2ace0cfcf05..89a73a221f4 100644
--- a/Marlin/example_configurations/BIBO/TouchX/Cyclops/Configuration.h
+++ b/Marlin/example_configurations/BIBO/TouchX/Cyclops/Configuration.h
@@ -543,7 +543,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
* Override with M92
* X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
*/
-#define DEFAULT_AXIS_STEPS_PER_UNIT { 100, 100, 400, 400}
+#define DEFAULT_AXIS_STEPS_PER_UNIT { 100, 100, 400, 400 }
/**
* Default Max Feed Rate (mm/s)
@@ -941,10 +941,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION 170
- #define FRONT_PROBE_BED_POSITION 20
- #define BACK_PROBE_BED_POSITION 170
+ //#define LEFT_PROBE_BED_POSITION 15
+ //#define RIGHT_PROBE_BED_POSITION 170
+ //#define FRONT_PROBE_BED_POSITION 20
+ //#define BACK_PROBE_BED_POSITION 170
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -967,17 +967,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -990,13 +979,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1017,6 +999,19 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/BIBO/TouchX/default/Configuration.h b/Marlin/example_configurations/BIBO/TouchX/default/Configuration.h
index 55cdb964345..ee6c31c3cfd 100644
--- a/Marlin/example_configurations/BIBO/TouchX/default/Configuration.h
+++ b/Marlin/example_configurations/BIBO/TouchX/default/Configuration.h
@@ -941,10 +941,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION 170
- #define FRONT_PROBE_BED_POSITION 20
- #define BACK_PROBE_BED_POSITION 170
+ //#define LEFT_PROBE_BED_POSITION 15
+ //#define RIGHT_PROBE_BED_POSITION 170
+ //#define FRONT_PROBE_BED_POSITION 20
+ //#define BACK_PROBE_BED_POSITION 170
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -967,17 +967,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -990,13 +979,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1017,6 +999,19 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/BQ/Hephestos/Configuration.h b/Marlin/example_configurations/BQ/Hephestos/Configuration.h
index 0b3f2102c63..4979a9929b2 100644
--- a/Marlin/example_configurations/BQ/Hephestos/Configuration.h
+++ b/Marlin/example_configurations/BQ/Hephestos/Configuration.h
@@ -929,10 +929,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -955,17 +955,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -978,13 +967,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1005,6 +987,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/BQ/Hephestos_2/Configuration.h b/Marlin/example_configurations/BQ/Hephestos_2/Configuration.h
index a19c0c6b25a..fb7514dc07d 100644
--- a/Marlin/example_configurations/BQ/Hephestos_2/Configuration.h
+++ b/Marlin/example_configurations/BQ/Hephestos_2/Configuration.h
@@ -942,10 +942,10 @@
#define GRID_MAX_POINTS_Y 4
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION X_MIN_POS + (X_PROBE_OFFSET_FROM_EXTRUDER)
- #define RIGHT_PROBE_BED_POSITION X_MAX_POS - (X_PROBE_OFFSET_FROM_EXTRUDER)
- #define FRONT_PROBE_BED_POSITION Y_MIN_POS + (Y_PROBE_OFFSET_FROM_EXTRUDER)
- #define BACK_PROBE_BED_POSITION Y_MAX_POS - (Y_PROBE_OFFSET_FROM_EXTRUDER)
+ //#define LEFT_PROBE_BED_POSITION X_MIN_POS + (X_PROBE_OFFSET_FROM_EXTRUDER)
+ //#define RIGHT_PROBE_BED_POSITION X_MAX_POS - (X_PROBE_OFFSET_FROM_EXTRUDER)
+ //#define FRONT_PROBE_BED_POSITION Y_MIN_POS + (Y_PROBE_OFFSET_FROM_EXTRUDER)
+ //#define BACK_PROBE_BED_POSITION Y_MAX_POS - (Y_PROBE_OFFSET_FROM_EXTRUDER)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -972,12 +972,12 @@
// 3 arbitrary points to probe.
// A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER
- #define ABL_PROBE_PT_1_Y Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER
- #define ABL_PROBE_PT_2_X X_MAX_POS - (X_PROBE_OFFSET_FROM_EXTRUDER)
- #define ABL_PROBE_PT_2_Y Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER
- #define ABL_PROBE_PT_3_X ((X_MIN_POS + X_MAX_POS) / 2)
- #define ABL_PROBE_PT_3_Y Y_MAX_POS - (Y_PROBE_OFFSET_FROM_EXTRUDER)
+ #define PROBE_PT_1_X X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER
+ #define PROBE_PT_1_Y Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER
+ #define PROBE_PT_2_X X_MAX_POS - (X_PROBE_OFFSET_FROM_EXTRUDER)
+ #define PROBE_PT_2_Y Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER
+ #define PROBE_PT_3_X ((X_MIN_POS + X_MAX_POS) / 2)
+ #define PROBE_PT_3_Y Y_MAX_POS - (Y_PROBE_OFFSET_FROM_EXTRUDER)
#elif ENABLED(AUTO_BED_LEVELING_UBL)
@@ -991,13 +991,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1018,6 +1011,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/BQ/WITBOX/Configuration.h b/Marlin/example_configurations/BQ/WITBOX/Configuration.h
index cbe780f54f6..560d9a83bcd 100644
--- a/Marlin/example_configurations/BQ/WITBOX/Configuration.h
+++ b/Marlin/example_configurations/BQ/WITBOX/Configuration.h
@@ -929,10 +929,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -955,17 +955,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -978,13 +967,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1005,6 +987,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h
index 732242517e2..cf885bc5e2d 100644
--- a/Marlin/example_configurations/Cartesio/Configuration.h
+++ b/Marlin/example_configurations/Cartesio/Configuration.h
@@ -940,10 +940,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -966,17 +966,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -989,13 +978,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1016,6 +998,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Creality/CR-10/Configuration.h b/Marlin/example_configurations/Creality/CR-10/Configuration.h
index e2ddd04d14b..833fd6ade44 100755
--- a/Marlin/example_configurations/Creality/CR-10/Configuration.h
+++ b/Marlin/example_configurations/Creality/CR-10/Configuration.h
@@ -951,10 +951,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -977,17 +977,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -1000,13 +989,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1027,6 +1009,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Creality/CR-10S/Configuration.h b/Marlin/example_configurations/Creality/CR-10S/Configuration.h
index aa7de30e16e..8536ad84180 100644
--- a/Marlin/example_configurations/Creality/CR-10S/Configuration.h
+++ b/Marlin/example_configurations/Creality/CR-10S/Configuration.h
@@ -942,10 +942,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -968,17 +968,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -991,13 +980,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1018,6 +1000,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Creality/CR-10mini/Configuration.h b/Marlin/example_configurations/Creality/CR-10mini/Configuration.h
index 34aa0130ab0..10d4aa21a28 100644
--- a/Marlin/example_configurations/Creality/CR-10mini/Configuration.h
+++ b/Marlin/example_configurations/Creality/CR-10mini/Configuration.h
@@ -960,10 +960,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -986,17 +986,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -1009,13 +998,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1036,6 +1018,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Creality/Ender-2/Configuration.h b/Marlin/example_configurations/Creality/Ender-2/Configuration.h
index 32fa6ea5768..0dd8b2b4fd5 100644
--- a/Marlin/example_configurations/Creality/Ender-2/Configuration.h
+++ b/Marlin/example_configurations/Creality/Ender-2/Configuration.h
@@ -945,10 +945,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -971,17 +971,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -994,13 +983,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1021,6 +1003,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Creality/Ender-4/Configuration.h b/Marlin/example_configurations/Creality/Ender-4/Configuration.h
index 37dac7f7247..fcd93ef6b60 100644
--- a/Marlin/example_configurations/Creality/Ender-4/Configuration.h
+++ b/Marlin/example_configurations/Creality/Ender-4/Configuration.h
@@ -951,10 +951,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -977,17 +977,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -1000,13 +989,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1027,6 +1009,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h
index 2f5c19a2b73..b8c84633323 100644
--- a/Marlin/example_configurations/Felix/Configuration.h
+++ b/Marlin/example_configurations/Felix/Configuration.h
@@ -923,10 +923,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -949,17 +949,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -972,13 +961,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -999,6 +981,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h
index eddbb1a69f9..4070678d2fd 100644
--- a/Marlin/example_configurations/Felix/DUAL/Configuration.h
+++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h
@@ -923,10 +923,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -949,17 +949,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -972,13 +961,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -999,6 +981,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/FolgerTech/i3-2020/Configuration.h b/Marlin/example_configurations/FolgerTech/i3-2020/Configuration.h
index f18eae36880..390cff69cde 100644
--- a/Marlin/example_configurations/FolgerTech/i3-2020/Configuration.h
+++ b/Marlin/example_configurations/FolgerTech/i3-2020/Configuration.h
@@ -947,10 +947,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 39
- #define RIGHT_PROBE_BED_POSITION 170
- #define FRONT_PROBE_BED_POSITION 10
- #define BACK_PROBE_BED_POSITION 170
+ //#define LEFT_PROBE_BED_POSITION (X_MIN_POS + 33)
+ //#define RIGHT_PROBE_BED_POSITION (X_MAX_POS - 37)
+ //#define FRONT_PROBE_BED_POSITION (Y_MIN_POS + 7)
+ //#define BACK_PROBE_BED_POSITION (Y_MAX_POS - 12)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -977,12 +977,12 @@
// 3 arbitrary points to probe.
// A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 39
- #define ABL_PROBE_PT_1_Y 170
- #define ABL_PROBE_PT_2_X 39
- #define ABL_PROBE_PT_2_Y 10
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 10
+ #define PROBE_PT_1_X 39
+ #define PROBE_PT_1_Y 170
+ #define PROBE_PT_2_X 39
+ #define PROBE_PT_2_Y 10
+ #define PROBE_PT_3_X 170
+ #define PROBE_PT_3_Y 10
#elif ENABLED(AUTO_BED_LEVELING_UBL)
@@ -996,12 +996,12 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y 10
- #define UBL_PROBE_PT_1_X 45 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 170
- #define UBL_PROBE_PT_2_X 45
- #define UBL_PROBE_PT_2_Y 25
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 25
+ #define PROBE_PT_1_X 45 // Probing points for 3-Point leveling of the mesh
+ #define PROBE_PT_1_Y 170
+ #define PROBE_PT_2_X 45
+ #define PROBE_PT_2_Y 25
+ #define PROBE_PT_3_X 180
+ #define PROBE_PT_3_Y 25
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1023,6 +1023,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Geeetech/GT2560/Configuration.h b/Marlin/example_configurations/Geeetech/GT2560/Configuration.h
index b83876dd4a6..e5e3f10f829 100644
--- a/Marlin/example_configurations/Geeetech/GT2560/Configuration.h
+++ b/Marlin/example_configurations/Geeetech/GT2560/Configuration.h
@@ -956,10 +956,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -982,17 +982,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -1005,13 +994,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1032,6 +1014,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Geeetech/I3_Pro_X-GT2560/Configuration.h b/Marlin/example_configurations/Geeetech/I3_Pro_X-GT2560/Configuration.h
index c7ddcea432f..b4d0349ae6d 100644
--- a/Marlin/example_configurations/Geeetech/I3_Pro_X-GT2560/Configuration.h
+++ b/Marlin/example_configurations/Geeetech/I3_Pro_X-GT2560/Configuration.h
@@ -941,10 +941,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -967,17 +967,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -990,13 +979,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1017,6 +999,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h b/Marlin/example_configurations/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
index f192ff22f28..c5cc66cfea3 100644
--- a/Marlin/example_configurations/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
+++ b/Marlin/example_configurations/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
@@ -957,10 +957,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 10
- #define RIGHT_PROBE_BED_POSITION (X_MAX_POS - X_PROBE_OFFSET_FROM_EXTRUDER - 14)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER - 25)
+ //#define LEFT_PROBE_BED_POSITION 10
+ //#define RIGHT_PROBE_BED_POSITION (X_MAX_POS - X_PROBE_OFFSET_FROM_EXTRUDER - 14)
+ //#define FRONT_PROBE_BED_POSITION 15
+ //#define BACK_PROBE_BED_POSITION (Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER - 25)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -983,17 +983,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -1006,13 +995,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1033,6 +1015,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h b/Marlin/example_configurations/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
index bd298f3bfdd..8c8bde70047 100644
--- a/Marlin/example_configurations/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
+++ b/Marlin/example_configurations/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
@@ -956,10 +956,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 10
- #define RIGHT_PROBE_BED_POSITION (X_MAX_POS - X_PROBE_OFFSET_FROM_EXTRUDER - 14)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER - 25)
+ //#define LEFT_PROBE_BED_POSITION 10
+ //#define RIGHT_PROBE_BED_POSITION (X_MAX_POS - X_PROBE_OFFSET_FROM_EXTRUDER - 14)
+ //#define FRONT_PROBE_BED_POSITION 15
+ //#define BACK_PROBE_BED_POSITION (Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER - 25)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -982,17 +982,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -1005,13 +994,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1032,6 +1014,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Infitary/i3-M508/Configuration.h b/Marlin/example_configurations/Infitary/i3-M508/Configuration.h
index cfa933f243e..fb5ae0b5137 100644
--- a/Marlin/example_configurations/Infitary/i3-M508/Configuration.h
+++ b/Marlin/example_configurations/Infitary/i3-M508/Configuration.h
@@ -945,10 +945,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -971,17 +971,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -994,13 +983,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1021,6 +1003,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/JGAurora/A5/Configuration.h b/Marlin/example_configurations/JGAurora/A5/Configuration.h
index a7e4a301fa8..44ff1c9c051 100644
--- a/Marlin/example_configurations/JGAurora/A5/Configuration.h
+++ b/Marlin/example_configurations/JGAurora/A5/Configuration.h
@@ -953,10 +953,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION 170
- #define FRONT_PROBE_BED_POSITION 20
- #define BACK_PROBE_BED_POSITION 170
+ //#define LEFT_PROBE_BED_POSITION 15
+ //#define RIGHT_PROBE_BED_POSITION 170
+ //#define FRONT_PROBE_BED_POSITION 20
+ //#define BACK_PROBE_BED_POSITION 170
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -979,17 +979,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -1002,13 +991,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1028,6 +1010,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Malyan/M150/Configuration.h b/Marlin/example_configurations/Malyan/M150/Configuration.h
index 587c3f66bf6..28c02ebad39 100644
--- a/Marlin/example_configurations/Malyan/M150/Configuration.h
+++ b/Marlin/example_configurations/Malyan/M150/Configuration.h
@@ -969,10 +969,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 50
- #define RIGHT_PROBE_BED_POSITION 150
- #define FRONT_PROBE_BED_POSITION 50
- #define BACK_PROBE_BED_POSITION 150
+ //#define LEFT_PROBE_BED_POSITION 50
+ //#define RIGHT_PROBE_BED_POSITION 150
+ //#define FRONT_PROBE_BED_POSITION 50
+ //#define BACK_PROBE_BED_POSITION 150
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -999,12 +999,12 @@
// 3 arbitrary points to probe.
// A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 50
- #define ABL_PROBE_PT_1_Y 150
- #define ABL_PROBE_PT_2_X 50
- #define ABL_PROBE_PT_2_Y 50
- #define ABL_PROBE_PT_3_X 150
- #define ABL_PROBE_PT_3_Y 50
+ #define PROBE_PT_1_X 50
+ #define PROBE_PT_1_Y 150
+ #define PROBE_PT_2_X 50
+ #define PROBE_PT_2_Y 50
+ #define PROBE_PT_3_X 150
+ #define PROBE_PT_3_Y 50
#elif ENABLED(AUTO_BED_LEVELING_UBL)
@@ -1018,13 +1018,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1045,6 +1038,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Micromake/C1/basic/Configuration.h b/Marlin/example_configurations/Micromake/C1/basic/Configuration.h
index 5d02e0fbd79..2f9b0c8f9b8 100644
--- a/Marlin/example_configurations/Micromake/C1/basic/Configuration.h
+++ b/Marlin/example_configurations/Micromake/C1/basic/Configuration.h
@@ -945,10 +945,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -971,17 +971,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -994,13 +983,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1021,6 +1003,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Micromake/C1/enhanced/Configuration.h b/Marlin/example_configurations/Micromake/C1/enhanced/Configuration.h
index b3250d6c70d..4999bd98dc2 100644
--- a/Marlin/example_configurations/Micromake/C1/enhanced/Configuration.h
+++ b/Marlin/example_configurations/Micromake/C1/enhanced/Configuration.h
@@ -945,10 +945,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -971,17 +971,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -994,13 +983,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1021,6 +1003,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
index 3d6327a786a..009e33674c0 100644
--- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
+++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
@@ -941,10 +941,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -967,17 +967,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -990,13 +979,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1017,6 +999,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h
index 565cd577ec5..0f92bcea74d 100644
--- a/Marlin/example_configurations/RigidBot/Configuration.h
+++ b/Marlin/example_configurations/RigidBot/Configuration.h
@@ -939,10 +939,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -965,17 +965,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -988,13 +977,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1015,6 +997,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h
index 0228164fd3c..cbd6f59949f 100644
--- a/Marlin/example_configurations/SCARA/Configuration.h
+++ b/Marlin/example_configurations/SCARA/Configuration.h
@@ -952,10 +952,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -978,17 +978,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -1001,13 +990,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1028,6 +1010,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Sanguinololu/Configuration.h b/Marlin/example_configurations/Sanguinololu/Configuration.h
index 5c96a16a67b..3764dc489ed 100644
--- a/Marlin/example_configurations/Sanguinololu/Configuration.h
+++ b/Marlin/example_configurations/Sanguinololu/Configuration.h
@@ -972,10 +972,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -998,17 +998,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -1021,13 +1010,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1048,6 +1030,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/TinyBoy2/Configuration.h b/Marlin/example_configurations/TinyBoy2/Configuration.h
index c1d8324d463..4ef284c05e8 100644
--- a/Marlin/example_configurations/TinyBoy2/Configuration.h
+++ b/Marlin/example_configurations/TinyBoy2/Configuration.h
@@ -997,10 +997,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -1023,17 +1023,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -1046,13 +1035,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1073,6 +1055,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Tronxy/X1/Configuration.h b/Marlin/example_configurations/Tronxy/X1/Configuration.h
index 659fbc6a42d..8a6f77acb94 100644
--- a/Marlin/example_configurations/Tronxy/X1/Configuration.h
+++ b/Marlin/example_configurations/Tronxy/X1/Configuration.h
@@ -941,10 +941,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -967,17 +967,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -990,13 +979,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1017,6 +999,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Tronxy/X5S/Configuration.h b/Marlin/example_configurations/Tronxy/X5S/Configuration.h
index 6d69d8447c3..e0bed9102f8 100644
--- a/Marlin/example_configurations/Tronxy/X5S/Configuration.h
+++ b/Marlin/example_configurations/Tronxy/X5S/Configuration.h
@@ -941,10 +941,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION 270
- #define FRONT_PROBE_BED_POSITION 20
- #define BACK_PROBE_BED_POSITION 260
+ //#define LEFT_PROBE_BED_POSITION 15
+ //#define RIGHT_PROBE_BED_POSITION 270
+ //#define FRONT_PROBE_BED_POSITION 20
+ //#define BACK_PROBE_BED_POSITION 260
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -967,17 +967,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -990,13 +979,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1017,6 +999,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Tronxy/XY100/Configuration.h b/Marlin/example_configurations/Tronxy/XY100/Configuration.h
index d092d66eef5..0ee5d0f00f2 100644
--- a/Marlin/example_configurations/Tronxy/XY100/Configuration.h
+++ b/Marlin/example_configurations/Tronxy/XY100/Configuration.h
@@ -952,10 +952,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -978,17 +978,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -1001,13 +990,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1028,6 +1010,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Velleman/K8200/Configuration.h b/Marlin/example_configurations/Velleman/K8200/Configuration.h
index 35ea87001f9..39b209b5227 100644
--- a/Marlin/example_configurations/Velleman/K8200/Configuration.h
+++ b/Marlin/example_configurations/Velleman/K8200/Configuration.h
@@ -971,10 +971,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -997,17 +997,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -1020,13 +1009,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1047,6 +1029,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Velleman/K8400/Configuration.h b/Marlin/example_configurations/Velleman/K8400/Configuration.h
index 44c210c4911..c0833987299 100644
--- a/Marlin/example_configurations/Velleman/K8400/Configuration.h
+++ b/Marlin/example_configurations/Velleman/K8400/Configuration.h
@@ -941,10 +941,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -967,17 +967,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -990,13 +979,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1017,6 +999,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Velleman/K8400/Dual-head/Configuration.h b/Marlin/example_configurations/Velleman/K8400/Dual-head/Configuration.h
index 99877d2af10..d1715fbfc85 100644
--- a/Marlin/example_configurations/Velleman/K8400/Dual-head/Configuration.h
+++ b/Marlin/example_configurations/Velleman/K8400/Dual-head/Configuration.h
@@ -941,10 +941,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -967,17 +967,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -990,13 +979,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1017,6 +999,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/Wanhao/Duplicator 6/Configuration.h b/Marlin/example_configurations/Wanhao/Duplicator 6/Configuration.h
index 85ed2573e0a..ca85ed6a3e4 100644
--- a/Marlin/example_configurations/Wanhao/Duplicator 6/Configuration.h
+++ b/Marlin/example_configurations/Wanhao/Duplicator 6/Configuration.h
@@ -951,10 +951,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -977,17 +977,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -1000,13 +989,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1024,6 +1006,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h
index c58aebf02ba..171cb7cccef 100644
--- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h
+++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h
@@ -941,10 +941,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -967,17 +967,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -990,13 +979,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1017,6 +999,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
index 48324dc596c..29ca9a3680a 100644
--- a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
+++ b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
@@ -1072,11 +1072,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 15)
- #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
- #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
- #define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
- #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
+ //#define LEFT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
+ //#define RIGHT_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
+ //#define BACK_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -1103,12 +1102,12 @@
// 3 arbitrary points to probe.
// A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
#elif ENABLED(AUTO_BED_LEVELING_UBL)
@@ -1122,14 +1121,12 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define _PX(R,A) (R) * cos(RADIANS(A))
- #define _PY(R,A) (R) * sin(RADIANS(A))
- #define UBL_PROBE_PT_1_X _PX(DELTA_PROBEABLE_RADIUS, 0) // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y _PY(DELTA_PROBEABLE_RADIUS, 0)
- #define UBL_PROBE_PT_2_X _PX(DELTA_PROBEABLE_RADIUS, 120)
- #define UBL_PROBE_PT_2_Y _PY(DELTA_PROBEABLE_RADIUS, 120)
- #define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
- #define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1151,6 +1148,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/delta/FLSUN/kossel/Configuration.h b/Marlin/example_configurations/delta/FLSUN/kossel/Configuration.h
index 7dd3ae0288b..8cfa071932d 100644
--- a/Marlin/example_configurations/delta/FLSUN/kossel/Configuration.h
+++ b/Marlin/example_configurations/delta/FLSUN/kossel/Configuration.h
@@ -1072,11 +1072,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 15)
- #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
- #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
- #define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
- #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
+ //#define LEFT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
+ //#define RIGHT_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
+ //#define BACK_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -1099,17 +1098,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -1122,15 +1110,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define _PX(R,A) (R) * cos(RADIANS(A))
- #define _PY(R,A) (R) * sin(RADIANS(A))
- #define UBL_PROBE_PT_1_X _PX(DELTA_PROBEABLE_RADIUS, 0) // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y _PY(DELTA_PROBEABLE_RADIUS, 0)
- #define UBL_PROBE_PT_2_X _PX(DELTA_PROBEABLE_RADIUS, 120)
- #define UBL_PROBE_PT_2_Y _PY(DELTA_PROBEABLE_RADIUS, 120)
- #define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
- #define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1151,6 +1130,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h
index b89357abb73..13f93cc75ac 100644
--- a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h
+++ b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h
@@ -1071,11 +1071,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 15)
- #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
- #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
- #define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
- #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
+ //#define LEFT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
+ //#define RIGHT_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
+ //#define BACK_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -1098,17 +1097,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -1121,15 +1109,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define _PX(R,A) (R) * cos(RADIANS(A))
- #define _PY(R,A) (R) * sin(RADIANS(A))
- #define UBL_PROBE_PT_1_X _PX(DELTA_PROBEABLE_RADIUS, 0) // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y _PY(DELTA_PROBEABLE_RADIUS, 0)
- #define UBL_PROBE_PT_2_X _PX(DELTA_PROBEABLE_RADIUS, 120)
- #define UBL_PROBE_PT_2_Y _PY(DELTA_PROBEABLE_RADIUS, 120)
- #define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
- #define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1150,6 +1129,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/delta/Hatchbox_Alpha/Configuration.h b/Marlin/example_configurations/delta/Hatchbox_Alpha/Configuration.h
index 40dca155cd9..9eae209ca10 100644
--- a/Marlin/example_configurations/delta/Hatchbox_Alpha/Configuration.h
+++ b/Marlin/example_configurations/delta/Hatchbox_Alpha/Configuration.h
@@ -1077,10 +1077,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
- #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
- #define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
- #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
+ //#define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
+ //#define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
+ //#define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
+ //#define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -1107,12 +1107,12 @@
// 3 arbitrary points to probe.
// A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X -116
- #define ABL_PROBE_PT_1_Y -67.5
- #define ABL_PROBE_PT_2_X 116
- #define ABL_PROBE_PT_2_Y -67.5
- #define ABL_PROBE_PT_3_X 0
- #define ABL_PROBE_PT_3_Y 135
+ #define PROBE_PT_1_X -116
+ #define PROBE_PT_1_Y -67.5
+ #define PROBE_PT_2_X 116
+ #define PROBE_PT_2_Y -67.5
+ #define PROBE_PT_3_X 0
+ #define PROBE_PT_3_Y 135
#elif ENABLED(AUTO_BED_LEVELING_UBL)
@@ -1126,15 +1126,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define _PX(R,A) (R) * cos(RADIANS(A))
- #define _PY(R,A) (R) * sin(RADIANS(A))
- #define UBL_PROBE_PT_1_X _PX(DELTA_PROBEABLE_RADIUS, 0) // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y _PY(DELTA_PROBEABLE_RADIUS, 0)
- #define UBL_PROBE_PT_2_X _PX(DELTA_PROBEABLE_RADIUS, 120)
- #define UBL_PROBE_PT_2_Y _PY(DELTA_PROBEABLE_RADIUS, 120)
- #define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
- #define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1155,6 +1146,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h
index b166e8cfbd8..5ef29b01a68 100644
--- a/Marlin/example_configurations/delta/generic/Configuration.h
+++ b/Marlin/example_configurations/delta/generic/Configuration.h
@@ -1062,10 +1062,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
- #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
- #define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
- #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
+ //#define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
+ //#define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
+ //#define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
+ //#define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -1088,17 +1088,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -1111,15 +1100,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define _PX(R,A) (R) * cos(RADIANS(A))
- #define _PY(R,A) (R) * sin(RADIANS(A))
- #define UBL_PROBE_PT_1_X _PX(DELTA_PROBEABLE_RADIUS, 0) // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y _PY(DELTA_PROBEABLE_RADIUS, 0)
- #define UBL_PROBE_PT_2_X _PX(DELTA_PROBEABLE_RADIUS, 120)
- #define UBL_PROBE_PT_2_Y _PY(DELTA_PROBEABLE_RADIUS, 120)
- #define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
- #define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1140,6 +1120,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
index 3075ab3a2bc..47531631d1a 100644
--- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
@@ -1065,10 +1065,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
- #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
- #define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
- #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
+ //#define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
+ //#define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
+ //#define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
+ //#define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -1091,17 +1091,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -1114,15 +1103,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define _PX(R,A) (R) * cos(RADIANS(A))
- #define _PY(R,A) (R) * sin(RADIANS(A))
- #define UBL_PROBE_PT_1_X _PX(DELTA_PROBEABLE_RADIUS, 0) // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y _PY(DELTA_PROBEABLE_RADIUS, 0)
- #define UBL_PROBE_PT_2_X _PX(DELTA_PROBEABLE_RADIUS, 120)
- #define UBL_PROBE_PT_2_Y _PY(DELTA_PROBEABLE_RADIUS, 120)
- #define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
- #define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1143,6 +1123,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h
index 7beec86c19e..e0f8a9d6ce3 100644
--- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h
@@ -1065,10 +1065,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
- #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
- #define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
- #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
+ //#define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
+ //#define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
+ //#define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
+ //#define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -1091,17 +1091,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -1114,15 +1103,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define _PX(R,A) (R) * cos(RADIANS(A))
- #define _PY(R,A) (R) * sin(RADIANS(A))
- #define UBL_PROBE_PT_1_X _PX(DELTA_PROBEABLE_RADIUS, 0) // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y _PY(DELTA_PROBEABLE_RADIUS, 0)
- #define UBL_PROBE_PT_2_X _PX(DELTA_PROBEABLE_RADIUS, 120)
- #define UBL_PROBE_PT_2_Y _PY(DELTA_PROBEABLE_RADIUS, 120)
- #define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
- #define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1143,6 +1123,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h
index f17d96982da..2fec9e7e2ba 100644
--- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h
@@ -1074,10 +1074,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
- #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
- #define FRONT_PROBE_BED_POSITION - (DELTA_PROBEABLE_RADIUS - 20)
- #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS - 40
+ //#define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
+ //#define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
+ //#define FRONT_PROBE_BED_POSITION - (DELTA_PROBEABLE_RADIUS - 20)
+ //#define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS - 40
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -1100,17 +1100,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -1123,15 +1112,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define _PX(R,A) (R) * cos(RADIANS(A))
- #define _PY(R,A) (R) * sin(RADIANS(A))
- #define UBL_PROBE_PT_1_X _PX(DELTA_PROBEABLE_RADIUS, 0) // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y _PY(DELTA_PROBEABLE_RADIUS, 0)
- #define UBL_PROBE_PT_2_X _PX(DELTA_PROBEABLE_RADIUS, 120)
- #define UBL_PROBE_PT_2_Y _PY(DELTA_PROBEABLE_RADIUS, 120)
- #define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
- #define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1152,6 +1132,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/gCreate/gMax1.5+/Configuration.h b/Marlin/example_configurations/gCreate/gMax1.5+/Configuration.h
index fcb0fb18975..9ec1ae78230 100644
--- a/Marlin/example_configurations/gCreate/gMax1.5+/Configuration.h
+++ b/Marlin/example_configurations/gCreate/gMax1.5+/Configuration.h
@@ -955,10 +955,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -981,17 +981,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -1004,12 +993,12 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 53 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 323
- #define UBL_PROBE_PT_2_X 53
- #define UBL_PROBE_PT_2_Y 63
- #define UBL_PROBE_PT_3_X 348
- #define UBL_PROBE_PT_3_Y 211
+ #define PROBE_PT_1_X 53 // Probing points for 3-Point leveling of the mesh
+ #define PROBE_PT_1_Y 323
+ #define PROBE_PT_2_X 53
+ #define PROBE_PT_2_Y 63
+ #define PROBE_PT_3_X 348
+ #define PROBE_PT_3_Y 211
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1031,6 +1020,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h
index b8a78a10b51..fd9f2553f17 100644
--- a/Marlin/example_configurations/makibox/Configuration.h
+++ b/Marlin/example_configurations/makibox/Configuration.h
@@ -944,10 +944,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -970,17 +970,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -993,13 +982,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1020,6 +1002,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
index 39ae9a1991d..9de2a8d4c6d 100644
--- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h
+++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
@@ -936,10 +936,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -962,17 +962,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -985,13 +974,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1012,6 +994,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/example_configurations/wt150/Configuration.h b/Marlin/example_configurations/wt150/Configuration.h
index af5c04f256c..a2cf25432f0 100644
--- a/Marlin/example_configurations/wt150/Configuration.h
+++ b/Marlin/example_configurations/wt150/Configuration.h
@@ -946,10 +946,10 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
- #define LEFT_PROBE_BED_POSITION 15
- #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
- #define FRONT_PROBE_BED_POSITION 15
- #define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -972,17 +972,6 @@
#endif
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
-
- // 3 arbitrary points to probe.
- // A simple cross-product is used to estimate the plane of the bed.
- #define ABL_PROBE_PT_1_X 15
- #define ABL_PROBE_PT_1_Y 180
- #define ABL_PROBE_PT_2_X 15
- #define ABL_PROBE_PT_2_Y 20
- #define ABL_PROBE_PT_3_X 170
- #define ABL_PROBE_PT_3_Y 20
-
#elif ENABLED(AUTO_BED_LEVELING_UBL)
//===========================================================================
@@ -995,13 +984,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
- #define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
- #define UBL_PROBE_PT_1_Y 180
- #define UBL_PROBE_PT_2_X 39
- #define UBL_PROBE_PT_2_Y 20
- #define UBL_PROBE_PT_3_X 180
- #define UBL_PROBE_PT_3_Y 20
-
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@@ -1022,6 +1004,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Use the LCD controller for bed leveling
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
diff --git a/Marlin/ubl_G29.cpp b/Marlin/ubl_G29.cpp
index e323cb8b5b6..3ea8632a64b 100644
--- a/Marlin/ubl_G29.cpp
+++ b/Marlin/ubl_G29.cpp
@@ -142,10 +142,8 @@
* a subsequent G or T leveling operation for backward compatibility.
*
* P1 Phase 1 Invalidate entire Mesh and continue with automatic generation of the Mesh data using
- * the Z-Probe. Usually the probe can't reach all areas that the nozzle can reach. On
- * Cartesian printers, points within the X_PROBE_OFFSET_FROM_EXTRUDER and Y_PROBE_OFFSET_FROM_EXTRUDER
- * area cannot be automatically probed. For Delta printers the area in which DELTA_PROBEABLE_RADIUS
- * and DELTA_PRINTABLE_RADIUS do not overlap will not be automatically probed.
+ * the Z-Probe. Usually the probe can't reach all areas that the nozzle can reach. For delta
+ * printers only the areas where the probe and nozzle can both reach will be automatically probed.
*
* Unreachable points will be handled in Phase 2 and Phase 3.
*
@@ -1517,46 +1515,46 @@
incremental_LSF_reset(&lsf_results);
if (do_3_pt_leveling) {
- measured_z = probe_pt(UBL_PROBE_PT_1_X, UBL_PROBE_PT_1_Y, false, g29_verbose_level);
+ measured_z = probe_pt(PROBE_PT_1_X, PROBE_PT_1_Y, false, g29_verbose_level);
if (isnan(measured_z))
abort_flag = true;
else {
- measured_z -= get_z_correction(UBL_PROBE_PT_1_X, UBL_PROBE_PT_1_Y);
+ measured_z -= get_z_correction(PROBE_PT_1_X, PROBE_PT_1_Y);
//z1 = measured_z;
if (g29_verbose_level > 3) {
serial_spaces(16);
SERIAL_ECHOLNPAIR("Corrected_Z=", measured_z);
}
- incremental_LSF(&lsf_results, UBL_PROBE_PT_1_X, UBL_PROBE_PT_1_Y, measured_z);
+ incremental_LSF(&lsf_results, PROBE_PT_1_X, PROBE_PT_1_Y, measured_z);
}
if (!abort_flag) {
- measured_z = probe_pt(UBL_PROBE_PT_2_X, UBL_PROBE_PT_2_Y, false, g29_verbose_level);
+ measured_z = probe_pt(PROBE_PT_2_X, PROBE_PT_2_Y, false, g29_verbose_level);
//z2 = measured_z;
if (isnan(measured_z))
abort_flag = true;
else {
- measured_z -= get_z_correction(UBL_PROBE_PT_2_X, UBL_PROBE_PT_2_Y);
+ measured_z -= get_z_correction(PROBE_PT_2_X, PROBE_PT_2_Y);
if (g29_verbose_level > 3) {
serial_spaces(16);
SERIAL_ECHOLNPAIR("Corrected_Z=", measured_z);
}
- incremental_LSF(&lsf_results, UBL_PROBE_PT_2_X, UBL_PROBE_PT_2_Y, measured_z);
+ incremental_LSF(&lsf_results, PROBE_PT_2_X, PROBE_PT_2_Y, measured_z);
}
}
if (!abort_flag) {
- measured_z = probe_pt(UBL_PROBE_PT_3_X, UBL_PROBE_PT_3_Y, true, g29_verbose_level);
+ measured_z = probe_pt(PROBE_PT_3_X, PROBE_PT_3_Y, true, g29_verbose_level);
//z3 = measured_z;
if (isnan(measured_z))
abort_flag = true;
else {
- measured_z -= get_z_correction(UBL_PROBE_PT_3_X, UBL_PROBE_PT_3_Y);
+ measured_z -= get_z_correction(PROBE_PT_3_X, PROBE_PT_3_Y);
if (g29_verbose_level > 3) {
serial_spaces(16);
SERIAL_ECHOLNPAIR("Corrected_Z=", measured_z);
}
- incremental_LSF(&lsf_results, UBL_PROBE_PT_3_X, UBL_PROBE_PT_3_Y, measured_z);
+ incremental_LSF(&lsf_results, PROBE_PT_3_X, PROBE_PT_3_Y, measured_z);
}
}
@@ -1703,29 +1701,29 @@
*/
#if 0
float t, t1, d;
- t = normal.x * (UBL_PROBE_PT_1_X) + normal.y * (UBL_PROBE_PT_1_Y);
+ t = normal.x * (PROBE_PT_1_X) + normal.y * (PROBE_PT_1_Y);
d = t + normal.z * z1;
SERIAL_ECHOPGM("D from 1st point: ");
SERIAL_ECHO_F(d, 6);
SERIAL_ECHOPGM(" Z error: ");
- SERIAL_ECHO_F(normal.z*z1-get_z_correction(UBL_PROBE_PT_1_X, UBL_PROBE_PT_1_Y), 6);
+ SERIAL_ECHO_F(normal.z*z1-get_z_correction(PROBE_PT_1_X, PROBE_PT_1_Y), 6);
SERIAL_EOL();
- t = normal.x * (UBL_PROBE_PT_2_X) + normal.y * (UBL_PROBE_PT_2_Y);
+ t = normal.x * (PROBE_PT_2_X) + normal.y * (PROBE_PT_2_Y);
d = t + normal.z * z2;
SERIAL_EOL();
SERIAL_ECHOPGM("D from 2nd point: ");
SERIAL_ECHO_F(d, 6);
SERIAL_ECHOPGM(" Z error: ");
- SERIAL_ECHO_F(normal.z*z2-get_z_correction(UBL_PROBE_PT_2_X, UBL_PROBE_PT_2_Y), 6);
+ SERIAL_ECHO_F(normal.z*z2-get_z_correction(PROBE_PT_2_X, PROBE_PT_2_Y), 6);
SERIAL_EOL();
- t = normal.x * (UBL_PROBE_PT_3_X) + normal.y * (UBL_PROBE_PT_3_Y);
+ t = normal.x * (PROBE_PT_3_X) + normal.y * (PROBE_PT_3_Y);
d = t + normal.z * z3;
SERIAL_ECHOPGM("D from 3rd point: ");
SERIAL_ECHO_F(d, 6);
SERIAL_ECHOPGM(" Z error: ");
- SERIAL_ECHO_F(normal.z*z3-get_z_correction(UBL_PROBE_PT_3_X, UBL_PROBE_PT_3_Y), 6);
+ SERIAL_ECHO_F(normal.z*z3-get_z_correction(PROBE_PT_3_X, PROBE_PT_3_Y), 6);
SERIAL_EOL();
t = normal.x * (Z_SAFE_HOMING_X_POINT) + normal.y * (Z_SAFE_HOMING_Y_POINT);