diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 31aaa77a9fd63b91d13ce019789aaa31c53d5da1..7a938ea4e7732d1bc45845a521a85ef78a8dc2e2 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -768,7 +768,8 @@
// Set the number of grid points per dimension.
// You probably don't need more than 3 (squared=9).
- #define AUTO_BED_LEVELING_GRID_POINTS 3
+ #define ABL_GRID_POINTS_X 3
+ #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
#else // !AUTO_BED_LEVELING_GRID
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 8c1daf11b4f4c98a2e2b9185059e81b2b12eb900..4e461f9faf4d48be1eef35d1810887814523b67e 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -494,7 +494,7 @@ static uint8_t target_extruder;
#if ENABLED(AUTO_BED_LEVELING_NONLINEAR)
int nonlinear_grid_spacing[2] = { 0 };
- float bed_level_grid[AUTO_BED_LEVELING_GRID_POINTS][AUTO_BED_LEVELING_GRID_POINTS];
+ float bed_level_grid[ABL_GRID_POINTS_X][ABL_GRID_POINTS_Y];
#endif
#if IS_SCARA
@@ -2122,14 +2122,15 @@ static void clean_up_after_endstop_or_probe_move() {
* using linear extrapolation, away from the center.
*/
static void extrapolate_unprobed_bed_level() {
- uint8_t half = (AUTO_BED_LEVELING_GRID_POINTS - 1) / 2;
- for (uint8_t y = 0; y <= half; y++) {
- for (uint8_t x = 0; x <= half; x++) {
+ int half_x = (ABL_GRID_POINTS_X - 1) / 2,
+ half_y = (ABL_GRID_POINTS_Y - 1) / 2;
+ for (uint8_t y = 0; y <= half_y; y++) {
+ for (uint8_t x = 0; x <= half_x; x++) {
if (x + y < 3) continue;
- extrapolate_one_point(half - x, half - y, x > 1 ? +1 : 0, y > 1 ? +1 : 0);
- extrapolate_one_point(half + x, half - y, x > 1 ? -1 : 0, y > 1 ? +1 : 0);
- extrapolate_one_point(half - x, half + y, x > 1 ? +1 : 0, y > 1 ? -1 : 0);
- extrapolate_one_point(half + x, half + y, x > 1 ? -1 : 0, y > 1 ? -1 : 0);
+ extrapolate_one_point(half_x - x, half_y - y, x > 1 ? +1 : 0, y > 1 ? +1 : 0);
+ extrapolate_one_point(half_x + x, half_y - y, x > 1 ? -1 : 0, y > 1 ? +1 : 0);
+ extrapolate_one_point(half_x - x, half_y + y, x > 1 ? +1 : 0, y > 1 ? -1 : 0);
+ extrapolate_one_point(half_x + x, half_y + y, x > 1 ? -1 : 0, y > 1 ? -1 : 0);
}
}
}
@@ -2138,8 +2139,8 @@ static void clean_up_after_endstop_or_probe_move() {
* Print calibration results for plotting or manual frame adjustment.
*/
static void print_bed_level() {
- for (uint8_t y = 0; y < AUTO_BED_LEVELING_GRID_POINTS; y++) {
- for (uint8_t x = 0; x < AUTO_BED_LEVELING_GRID_POINTS; x++) {
+ for (uint8_t y = 0; y < ABL_GRID_POINTS_Y; y++) {
+ for (uint8_t x = 0; x < ABL_GRID_POINTS_X; x++) {
SERIAL_PROTOCOL_F(bed_level_grid[x][y], 2);
SERIAL_PROTOCOLCHAR(' ');
}
@@ -3308,11 +3309,12 @@ inline void gcode_G28() {
if (dryrun) SERIAL_PROTOCOLLNPGM("Running in DRY-RUN mode");
}
- int auto_bed_leveling_grid_points = AUTO_BED_LEVELING_GRID_POINTS;
+ int abl_grid_points_x = ABL_GRID_POINTS_X,
+ abl_grid_points_y = ABL_GRID_POINTS_Y;
#if ENABLED(AUTO_BED_LEVELING_LINEAR)
- if (code_seen('P')) auto_bed_leveling_grid_points = code_value_int();
- if (auto_bed_leveling_grid_points < 2) {
+ if (code_seen('P')) abl_grid_points_x = abl_grid_points_y = code_value_int();
+ if (abl_grid_points_x < 2) {
SERIAL_PROTOCOLLNPGM("?Number of probed (P)oints is implausible (2 minimum).");
return;
}
@@ -3400,8 +3402,8 @@ inline void gcode_G28() {
#if ENABLED(AUTO_BED_LEVELING_GRID)
// probe at the points of a lattice grid
- const float xGridSpacing = (right_probe_bed_position - left_probe_bed_position) / (auto_bed_leveling_grid_points - 1),
- yGridSpacing = (back_probe_bed_position - front_probe_bed_position) / (auto_bed_leveling_grid_points - 1);
+ const float xGridSpacing = (right_probe_bed_position - left_probe_bed_position) / (abl_grid_points_x - 1),
+ yGridSpacing = (back_probe_bed_position - front_probe_bed_position) / (abl_grid_points_y - 1);
#if ENABLED(AUTO_BED_LEVELING_NONLINEAR)
@@ -3421,30 +3423,31 @@ inline void gcode_G28() {
* so Vx = -a Vy = -b Vz = 1 (we want the vector facing towards positive Z
*/
- int abl2 = sq(auto_bed_leveling_grid_points);
+ int abl2 = abl_grid_points_x * abl_grid_points_y;
double eqnAMatrix[abl2 * 3], // "A" matrix of the linear system of equations
eqnBVector[abl2], // "B" vector of Z points
mean = 0.0;
- int8_t indexIntoAB[auto_bed_leveling_grid_points][auto_bed_leveling_grid_points];
+ int indexIntoAB[abl_grid_points_x][abl_grid_points_y];
#endif // AUTO_BED_LEVELING_LINEAR
int probePointCounter = 0;
- bool zig = auto_bed_leveling_grid_points & 1; //always end at [RIGHT_PROBE_BED_POSITION, BACK_PROBE_BED_POSITION]
+ bool zig = abl_grid_points_y & 1; //always end at [RIGHT_PROBE_BED_POSITION, BACK_PROBE_BED_POSITION]
- for (uint8_t yCount = 0; yCount < auto_bed_leveling_grid_points; yCount++) {
+ for (uint8_t yCount = 0; yCount < abl_grid_points_y; yCount++) {
float yBase = front_probe_bed_position + yGridSpacing * yCount;
yProbe = floor(yBase + (yBase < 0 ? 0 : 0.5));
+
int8_t xStart, xStop, xInc;
if (zig) {
xStart = 0;
- xStop = auto_bed_leveling_grid_points;
+ xStop = abl_grid_points_x;
xInc = 1;
}
else {
- xStart = auto_bed_leveling_grid_points - 1;
+ xStart = abl_grid_points_x - 1;
xStop = -1;
xInc = -1;
}
@@ -3579,8 +3582,8 @@ inline void gcode_G28() {
float min_diff = 999;
- for (int8_t yy = auto_bed_leveling_grid_points - 1; yy >= 0; yy--) {
- for (uint8_t xx = 0; xx < auto_bed_leveling_grid_points; xx++) {
+ for (int8_t yy = abl_grid_points_y - 1; yy >= 0; yy--) {
+ for (uint8_t xx = 0; xx < abl_grid_points_x; xx++) {
int ind = indexIntoAB[xx][yy];
float diff = eqnBVector[ind] - mean,
x_tmp = eqnAMatrix[ind + 0 * abl2],
@@ -3604,8 +3607,8 @@ inline void gcode_G28() {
if (verbose_level > 3) {
SERIAL_PROTOCOLLNPGM("\nCorrected Bed Height vs. Bed Topology:");
- for (int yy = auto_bed_leveling_grid_points - 1; yy >= 0; yy--) {
- for (int xx = 0; xx < auto_bed_leveling_grid_points; xx++) {
+ for (int8_t yy = abl_grid_points_y - 1; yy >= 0; yy--) {
+ for (uint8_t xx = 0; xx < abl_grid_points_x; xx++) {
int ind = indexIntoAB[xx][yy];
float x_tmp = eqnAMatrix[ind + 0 * abl2],
y_tmp = eqnAMatrix[ind + 1 * abl2],
@@ -7796,16 +7799,18 @@ void ok_to_send() {
void adjust_delta(float cartesian[XYZ]) {
if (nonlinear_grid_spacing[X_AXIS] == 0 || nonlinear_grid_spacing[Y_AXIS] == 0) return; // G29 not done!
- int half = (AUTO_BED_LEVELING_GRID_POINTS - 1) / 2;
- float h1 = 0.001 - half, h2 = half - 0.001,
- grid_x = max(h1, min(h2, RAW_X_POSITION(cartesian[X_AXIS]) / nonlinear_grid_spacing[X_AXIS])),
- grid_y = max(h1, min(h2, RAW_Y_POSITION(cartesian[Y_AXIS]) / nonlinear_grid_spacing[Y_AXIS]));
- int floor_x = floor(grid_x), floor_y = floor(grid_y);
+ int half_x = (ABL_GRID_POINTS_X - 1) / 2,
+ half_y = (ABL_GRID_POINTS_Y - 1) / 2;
+ float hx2 = half_x - 0.001, hx1 = -hx2,
+ hy2 = half_y - 0.001, hy1 = -hy2,
+ grid_x = max(hx1, min(hx2, RAW_X_POSITION(cartesian[X_AXIS]) / nonlinear_grid_spacing[X_AXIS])),
+ grid_y = max(hy1, min(hy2, RAW_Y_POSITION(cartesian[Y_AXIS]) / nonlinear_grid_spacing[Y_AXIS]));
+ int floor_x = floor(grid_x), floor_y = floor(grid_y);
float ratio_x = grid_x - floor_x, ratio_y = grid_y - floor_y,
- z1 = bed_level_grid[floor_x + half][floor_y + half],
- z2 = bed_level_grid[floor_x + half][floor_y + half + 1],
- z3 = bed_level_grid[floor_x + half + 1][floor_y + half],
- z4 = bed_level_grid[floor_x + half + 1][floor_y + half + 1],
+ z1 = bed_level_grid[floor_x + half_x][floor_y + half_y],
+ z2 = bed_level_grid[floor_x + half_x][floor_y + half_y + 1],
+ z3 = bed_level_grid[floor_x + half_x + 1][floor_y + half_y],
+ z4 = bed_level_grid[floor_x + half_x + 1][floor_y + half_y + 1],
left = (1 - ratio_y) * z1 + ratio_y * z2,
right = (1 - ratio_y) * z3 + ratio_y * z4,
offset = (1 - ratio_x) * left + ratio_x * right;
diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h
index 6a3433e387944f2974b2aafe079f8b399d1fa2ee..41e5f063b1711266ecbf0a31ed7e80b679710de7 100644
--- a/Marlin/SanityCheck.h
+++ b/Marlin/SanityCheck.h
@@ -139,6 +139,8 @@
#error "PREVENT_DANGEROUS_EXTRUDE is now PREVENT_COLD_EXTRUSION. Please update your configuration."
#elif defined(SCARA)
#error "SCARA is now MORGAN_SCARA. Please update your configuration."
+#elif defined(AUTO_BED_LEVELING_GRID_POINTS)
+ #error "AUTO_BED_LEVELING_GRID_POINTS is now ABL_GRID_POINTS_X and ABL_GRID_POINTS_Y. Please update your configuration."
#endif
/**
@@ -196,10 +198,10 @@
#error "You probably want to use Max Endstops for DELTA!"
#endif
#if ENABLED(AUTO_BED_LEVELING_GRID)
- #if (AUTO_BED_LEVELING_GRID_POINTS & 1) == 0
- #error "DELTA requires an odd value for AUTO_BED_LEVELING_GRID_POINTS."
- #elif AUTO_BED_LEVELING_GRID_POINTS < 3
- #error "DELTA requires at least 3 AUTO_BED_LEVELING_GRID_POINTS."
+ #if (ABL_GRID_POINTS_X & 1) == 0 || (ABL_GRID_POINTS_Y & 1) == 0
+ #error "DELTA requires ABL_GRID_POINTS_X and ABL_GRID_POINTS_Y to be odd numbers."
+ #elif ABL_GRID_POINTS_X < 3
+ #error "DELTA requires ABL_GRID_POINTS_X and ABL_GRID_POINTS_Y to be 3 or higher."
#endif
#endif
#endif
diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h
index 9d8e7edec485493a92d9873ceff5d3c65a7abb68..9d0f8ae9e911f746eb5a1d5e1758272d8c9a3781 100644
--- a/Marlin/example_configurations/Cartesio/Configuration.h
+++ b/Marlin/example_configurations/Cartesio/Configuration.h
@@ -751,7 +751,8 @@
// Set the number of grid points per dimension.
// You probably don't need more than 3 (squared=9).
- #define AUTO_BED_LEVELING_GRID_POINTS 3
+ #define ABL_GRID_POINTS_X 3
+ #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
#else // !AUTO_BED_LEVELING_GRID
diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h
index 9b1ccf62d6439198642bc39ecc1ac57172268d93..f5f8ae289d47f8f3562c6a51ca8df979a8bac47e 100644
--- a/Marlin/example_configurations/Felix/Configuration.h
+++ b/Marlin/example_configurations/Felix/Configuration.h
@@ -734,7 +734,8 @@
// Set the number of grid points per dimension.
// You probably don't need more than 3 (squared=9).
- #define AUTO_BED_LEVELING_GRID_POINTS 3
+ #define ABL_GRID_POINTS_X 3
+ #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
#else // !AUTO_BED_LEVELING_GRID
diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h
index 476b58dbb577ccf9c37e02438e2759cf7570c115..3e680f668f156a93f7ffa1971c6b92a6af3575b1 100644
--- a/Marlin/example_configurations/Felix/DUAL/Configuration.h
+++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h
@@ -732,7 +732,8 @@
// Set the number of grid points per dimension.
// You probably don't need more than 3 (squared=9).
- #define AUTO_BED_LEVELING_GRID_POINTS 3
+ #define ABL_GRID_POINTS_X 3
+ #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
#else // !AUTO_BED_LEVELING_GRID
diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h
index 644649857aae3663a53d7efb546afc4bd0380f8d..8e1c8ca820f67a7e7867485e856090f7dda02aa2 100644
--- a/Marlin/example_configurations/Hephestos/Configuration.h
+++ b/Marlin/example_configurations/Hephestos/Configuration.h
@@ -743,7 +743,8 @@
// Set the number of grid points per dimension.
// You probably don't need more than 3 (squared=9).
- #define AUTO_BED_LEVELING_GRID_POINTS 3
+ #define ABL_GRID_POINTS_X 3
+ #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
#else // !AUTO_BED_LEVELING_GRID
diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h
index a451dd80e06b9f87e18de636a5db9e720e75507e..2ec53a4207997d2138f574b8f3e281367f7f2f7a 100644
--- a/Marlin/example_configurations/Hephestos_2/Configuration.h
+++ b/Marlin/example_configurations/Hephestos_2/Configuration.h
@@ -745,7 +745,8 @@
// Set the number of grid points per dimension.
// You probably don't need more than 3 (squared=9).
- #define AUTO_BED_LEVELING_GRID_POINTS 3
+ #define ABL_GRID_POINTS_X 3
+ #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
#else // !AUTO_BED_LEVELING_GRID
diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h
index f10f65570f8080c0df3a3b6a7814f1aef85ee93e..206540d3fb01e95eaa7a679245b67a2810dc8545 100644
--- a/Marlin/example_configurations/K8200/Configuration.h
+++ b/Marlin/example_configurations/K8200/Configuration.h
@@ -768,7 +768,8 @@
// Set the number of grid points per dimension.
// You probably don't need more than 3 (squared=9).
- #define AUTO_BED_LEVELING_GRID_POINTS 3
+ #define ABL_GRID_POINTS_X 3
+ #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
#else // !AUTO_BED_LEVELING_GRID
diff --git a/Marlin/example_configurations/K8400/Configuration.h b/Marlin/example_configurations/K8400/Configuration.h
index 0c7dd0a111c200bb1377e61a94006a5d3a3e1d4e..d718d1a16ad8df3ab57e66c3838b2788746b4bd4 100644
--- a/Marlin/example_configurations/K8400/Configuration.h
+++ b/Marlin/example_configurations/K8400/Configuration.h
@@ -751,7 +751,8 @@
// Set the number of grid points per dimension.
// You probably don't need more than 3 (squared=9).
- #define AUTO_BED_LEVELING_GRID_POINTS 3
+ #define ABL_GRID_POINTS_X 3
+ #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
#else // !AUTO_BED_LEVELING_GRID
diff --git a/Marlin/example_configurations/K8400/Dual-head/Configuration.h b/Marlin/example_configurations/K8400/Dual-head/Configuration.h
index 837ee9815d6fb49e539ba55eee670177d34400e5..3bad2fd375171e475eba943d03d1f21b6391b0d2 100644
--- a/Marlin/example_configurations/K8400/Dual-head/Configuration.h
+++ b/Marlin/example_configurations/K8400/Dual-head/Configuration.h
@@ -751,7 +751,8 @@
// Set the number of grid points per dimension.
// You probably don't need more than 3 (squared=9).
- #define AUTO_BED_LEVELING_GRID_POINTS 3
+ #define ABL_GRID_POINTS_X 3
+ #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
#else // !AUTO_BED_LEVELING_GRID
diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
index b61e44705f0dde9321414e46eca359e18d40944c..db8119e7169d0cec3f2ac0e8a0db0c296cbc6376 100644
--- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
+++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
@@ -751,7 +751,8 @@
// Set the number of grid points per dimension.
// You probably don't need more than 3 (squared=9).
- #define AUTO_BED_LEVELING_GRID_POINTS 3
+ #define ABL_GRID_POINTS_X 3
+ #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
#else // !AUTO_BED_LEVELING_GRID
diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h
index d41b210cfa2f961d6bd43f20132c978f8bd28e16..25d918cd2bf36973a532fd6ef396107d490f6e42 100644
--- a/Marlin/example_configurations/RigidBot/Configuration.h
+++ b/Marlin/example_configurations/RigidBot/Configuration.h
@@ -749,7 +749,8 @@
// Set the number of grid points per dimension.
// You probably don't need more than 3 (squared=9).
- #define AUTO_BED_LEVELING_GRID_POINTS 3
+ #define ABL_GRID_POINTS_X 3
+ #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
#else // !AUTO_BED_LEVELING_GRID
diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h
index e50306c44f8d37116dce0d830911f22fe090e0ad..808490fc12deb0428e0d9985dbdd2530c9d878e7 100644
--- a/Marlin/example_configurations/SCARA/Configuration.h
+++ b/Marlin/example_configurations/SCARA/Configuration.h
@@ -761,7 +761,8 @@
// Set the number of grid points per dimension.
// You probably don't need more than 3 (squared=9).
- #define AUTO_BED_LEVELING_GRID_POINTS 3
+ #define ABL_GRID_POINTS_X 3
+ #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
#else // !AUTO_BED_LEVELING_GRID
diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h
index fc78d56989d0722c8fc7e047d19c8bd2d13a78bc..0d9185b40cd5a8de9091532d3b8be3bc80483200 100644
--- a/Marlin/example_configurations/TAZ4/Configuration.h
+++ b/Marlin/example_configurations/TAZ4/Configuration.h
@@ -772,7 +772,8 @@
// Set the number of grid points per dimension.
// You probably don't need more than 3 (squared=9).
- #define AUTO_BED_LEVELING_GRID_POINTS 3
+ #define ABL_GRID_POINTS_X 3
+ #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
#else // !AUTO_BED_LEVELING_GRID
diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h
index 7647e7eaf0a996f03beb701db4cd189cc03e517a..28d374b37185d6209bde8eeef01b0d6d20b891bb 100644
--- a/Marlin/example_configurations/WITBOX/Configuration.h
+++ b/Marlin/example_configurations/WITBOX/Configuration.h
@@ -743,7 +743,8 @@
// Set the number of grid points per dimension.
// You probably don't need more than 3 (squared=9).
- #define AUTO_BED_LEVELING_GRID_POINTS 3
+ #define ABL_GRID_POINTS_X 3
+ #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
#else // !AUTO_BED_LEVELING_GRID
diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h
index 0fe8218ab855fea4c3e3df578b41fbb710593b95..c2ec1bf8035cfc88f07525d0c7ec4a405e665c46 100644
--- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h
+++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h
@@ -751,7 +751,8 @@
// Set the number of grid points per dimension.
// You probably don't need more than 3 (squared=9).
- #define AUTO_BED_LEVELING_GRID_POINTS 3
+ #define ABL_GRID_POINTS_X 3
+ #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
#else // !AUTO_BED_LEVELING_GRID
diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h
index 6612004329d4dc1bb20f97c9adc9501d6aad0752..4596253c9e6fbc23a5da410f42cf2d91abe7973e 100644
--- a/Marlin/example_configurations/delta/biv2.5/Configuration.h
+++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h
@@ -844,8 +844,9 @@
// Non-linear bed leveling will be used.
// Compensate by interpolating between the nearest four Z probe values for each point.
// Useful for deltas where the print surface may appear like a bowl or dome shape.
- // Works best with AUTO_BED_LEVELING_GRID_POINTS 5 or higher.
- #define AUTO_BED_LEVELING_GRID_POINTS 9
+ // Works best with 5 or more points in each dimension.
+ #define ABL_GRID_POINTS_X 9
+ #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
#else // !AUTO_BED_LEVELING_GRID
diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h
index 6ec9217c0c16795aa6b1f206f6612e27e44ebdb7..c66410c2e3e73b2a7f783b0d3491839e5b145a1e 100644
--- a/Marlin/example_configurations/delta/generic/Configuration.h
+++ b/Marlin/example_configurations/delta/generic/Configuration.h
@@ -838,8 +838,9 @@
// Non-linear bed leveling will be used.
// Compensate by interpolating between the nearest four Z probe values for each point.
// Useful for deltas where the print surface may appear like a bowl or dome shape.
- // Works best with AUTO_BED_LEVELING_GRID_POINTS 5 or higher.
- #define AUTO_BED_LEVELING_GRID_POINTS 9
+ // Works best with 5 or more points in each dimension.
+ #define ABL_GRID_POINTS_X 9
+ #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
#else // !AUTO_BED_LEVELING_GRID
diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
index cb136b1589355a0b702573e7629dd485ae32d092..4159567c7501d23a26f8f6d79413899fd17bdb16 100644
--- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
@@ -841,8 +841,9 @@
// Non-linear bed leveling will be used.
// Compensate by interpolating between the nearest four Z probe values for each point.
// Useful for deltas where the print surface may appear like a bowl or dome shape.
- // Works best with AUTO_BED_LEVELING_GRID_POINTS 5 or higher.
- #define AUTO_BED_LEVELING_GRID_POINTS 9
+ // Works best with 5 or more points in each dimension.
+ #define ABL_GRID_POINTS_X 9
+ #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
#else // !AUTO_BED_LEVELING_GRID
diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h
index d0dc57e903fb43b969ffd7b9ee640f8c4842d2cf..f5ff185114f469493bb0f6a670a0cbe09e07b8ed 100644
--- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h
@@ -842,8 +842,9 @@
// Non-linear bed leveling will be used.
// Compensate by interpolating between the nearest four Z probe values for each point.
// Useful for deltas where the print surface may appear like a bowl or dome shape.
- // Works best with AUTO_BED_LEVELING_GRID_POINTS 5 or higher.
- #define AUTO_BED_LEVELING_GRID_POINTS 7
+ // Works best with 5 or more points in each dimension.
+ #define ABL_GRID_POINTS_X 7
+ #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
#else // !AUTO_BED_LEVELING_GRID
diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h
index 42c9d50843c081c25e1d283b52aaefc7b5f0cc11..f644a04759a230057c20cee0b93e3ec6613ee8c1 100644
--- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h
@@ -844,8 +844,9 @@
// Non-linear bed leveling will be used.
// Compensate by interpolating between the nearest four Z probe values for each point.
// Useful for deltas where the print surface may appear like a bowl or dome shape.
- // Works best with AUTO_BED_LEVELING_GRID_POINTS 5 or higher.
- #define AUTO_BED_LEVELING_GRID_POINTS 5
+ // Works best with 5 or more points in each dimension.
+ #define ABL_GRID_POINTS_X 5
+ #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
#else // !AUTO_BED_LEVELING_GRID
diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h
index f1fc9b8b0f6eb75ad26cc63011b16cb2d1a274ac..6cfb9d5c38783e478ed1271c75bd99e0f946a850 100644
--- a/Marlin/example_configurations/makibox/Configuration.h
+++ b/Marlin/example_configurations/makibox/Configuration.h
@@ -754,7 +754,8 @@
// Set the number of grid points per dimension.
// You probably don't need more than 3 (squared=9).
- #define AUTO_BED_LEVELING_GRID_POINTS 3
+ #define ABL_GRID_POINTS_X 3
+ #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
#else // !AUTO_BED_LEVELING_GRID
diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
index c56cd6cbe2052e741651be7dd85ef6d86b4163e8..b7d939c20b084697f3ae4c4f4d7241277f14eb76 100644
--- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h
+++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
@@ -747,7 +747,8 @@
// Set the number of grid points per dimension.
// You probably don't need more than 3 (squared=9).
- #define AUTO_BED_LEVELING_GRID_POINTS 3
+ #define ABL_GRID_POINTS_X 3
+ #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
#else // !AUTO_BED_LEVELING_GRID