From 1b2fb2bdc7141f619146d4e0216183311c914c91 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Fri, 9 Dec 2016 21:38:28 -0800
Subject: [PATCH] ABL_GRID_POINTS_* => ABL_GRID_MAX_POINTS_*
---
Marlin/Configuration.h | 4 +-
Marlin/Marlin_main.cpp | 68 +++++++++----------
Marlin/SanityCheck.h | 12 ++--
.../Cartesio/Configuration.h | 4 +-
.../Felix/Configuration.h | 4 +-
.../Felix/DUAL/Configuration.h | 4 +-
.../Hephestos/Configuration.h | 4 +-
.../Hephestos_2/Configuration.h | 4 +-
.../K8200/Configuration.h | 4 +-
.../K8400/Configuration.h | 4 +-
.../K8400/Dual-head/Configuration.h | 4 +-
.../RepRapWorld/Megatronics/Configuration.h | 4 +-
.../RigidBot/Configuration.h | 4 +-
.../SCARA/Configuration.h | 4 +-
.../TAZ4/Configuration.h | 4 +-
.../WITBOX/Configuration.h | 4 +-
.../adafruit/ST7565/Configuration.h | 4 +-
.../delta/biv2.5/Configuration.h | 4 +-
.../delta/generic/Configuration.h | 4 +-
.../delta/kossel_mini/Configuration.h | 4 +-
.../delta/kossel_pro/Configuration.h | 4 +-
.../delta/kossel_xl/Configuration.h | 4 +-
.../makibox/Configuration.h | 4 +-
.../tvrrug/Round2/Configuration.h | 4 +-
24 files changed, 85 insertions(+), 83 deletions(-)
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index a07532336e..859e5f5a99 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -805,8 +805,8 @@
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
// Set the number of grid points per dimension.
- #define ABL_GRID_POINTS_X 3
- #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
+ #define ABL_GRID_MAX_POINTS_X 3
+ #define ABL_GRID_MAX_POINTS_Y ABL_GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
#define LEFT_PROBE_BED_POSITION 15
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 66e9ecdcd1..50e72be8ee 100755
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -576,7 +576,7 @@ static uint8_t target_extruder;
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
int bilinear_grid_spacing[2] = { 0 }, bilinear_start[2] = { 0 };
- float bed_level_grid[ABL_GRID_POINTS_X][ABL_GRID_POINTS_Y];
+ float bed_level_grid[ABL_GRID_MAX_POINTS_X][ABL_GRID_MAX_POINTS_Y];
#endif
#if IS_SCARA
@@ -2303,8 +2303,8 @@ static void clean_up_after_endstop_or_probe_move() {
#if ABL_PLANAR
planner.bed_level_matrix.set_to_identity();
#elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
- for (uint8_t x = 0; x < ABL_GRID_POINTS_X; x++)
- for (uint8_t y = 0; y < ABL_GRID_POINTS_Y; y++)
+ for (uint8_t x = 0; x < ABL_GRID_MAX_POINTS_X; x++)
+ for (uint8_t y = 0; y < ABL_GRID_MAX_POINTS_Y; y++)
bed_level_grid[x][y] = 1000.0;
#endif
#endif
@@ -2363,9 +2363,9 @@ static void clean_up_after_endstop_or_probe_move() {
//#define EXTRAPOLATE_FROM_EDGE
#if ENABLED(EXTRAPOLATE_FROM_EDGE)
- #if ABL_GRID_POINTS_X < ABL_GRID_POINTS_Y
+ #if ABL_GRID_MAX_POINTS_X < ABL_GRID_MAX_POINTS_Y
#define HALF_IN_X
- #elif ABL_GRID_POINTS_Y < ABL_GRID_POINTS_X
+ #elif ABL_GRID_MAX_POINTS_Y < ABL_GRID_MAX_POINTS_X
#define HALF_IN_Y
#endif
#endif
@@ -2376,18 +2376,18 @@ static void clean_up_after_endstop_or_probe_move() {
*/
static void extrapolate_unprobed_bed_level() {
#ifdef HALF_IN_X
- const uint8_t ctrx2 = 0, xlen = ABL_GRID_POINTS_X - 1;
+ const uint8_t ctrx2 = 0, xlen = ABL_GRID_MAX_POINTS_X - 1;
#else
- const uint8_t ctrx1 = (ABL_GRID_POINTS_X - 1) / 2, // left-of-center
- ctrx2 = ABL_GRID_POINTS_X / 2, // right-of-center
+ const uint8_t ctrx1 = (ABL_GRID_MAX_POINTS_X - 1) / 2, // left-of-center
+ ctrx2 = ABL_GRID_MAX_POINTS_X / 2, // right-of-center
xlen = ctrx1;
#endif
#ifdef HALF_IN_Y
- const uint8_t ctry2 = 0, ylen = ABL_GRID_POINTS_Y - 1;
+ const uint8_t ctry2 = 0, ylen = ABL_GRID_MAX_POINTS_Y - 1;
#else
- const uint8_t ctry1 = (ABL_GRID_POINTS_Y - 1) / 2, // top-of-center
- ctry2 = ABL_GRID_POINTS_Y / 2, // bottom-of-center
+ const uint8_t ctry1 = (ABL_GRID_MAX_POINTS_Y - 1) / 2, // top-of-center
+ ctry2 = ABL_GRID_MAX_POINTS_Y / 2, // bottom-of-center
ylen = ctry1;
#endif
@@ -2417,16 +2417,16 @@ static void clean_up_after_endstop_or_probe_move() {
*/
static void print_bed_level() {
SERIAL_ECHOPGM("Bilinear Leveling Grid:\n ");
- for (uint8_t x = 0; x < ABL_GRID_POINTS_X; x++) {
+ for (uint8_t x = 0; x < ABL_GRID_MAX_POINTS_X; x++) {
SERIAL_PROTOCOLPGM(" ");
if (x < 10) SERIAL_PROTOCOLCHAR(' ');
SERIAL_PROTOCOL((int)x);
}
SERIAL_EOL;
- for (uint8_t y = 0; y < ABL_GRID_POINTS_Y; y++) {
+ for (uint8_t y = 0; y < ABL_GRID_MAX_POINTS_Y; y++) {
if (y < 10) SERIAL_PROTOCOLCHAR(' ');
SERIAL_PROTOCOL((int)y);
- for (uint8_t x = 0; x < ABL_GRID_POINTS_X; x++) {
+ for (uint8_t x = 0; x < ABL_GRID_MAX_POINTS_X; x++) {
SERIAL_PROTOCOLCHAR(' ');
float offset = bed_level_grid[x][y];
if (offset < 999.0) {
@@ -2442,10 +2442,10 @@ static void clean_up_after_endstop_or_probe_move() {
}
#if ENABLED(ABL_BILINEAR_SUBDIVISION)
- #define ABL_GRID_POINTS_VIRT_X (ABL_GRID_POINTS_X - 1) * (BILINEAR_SUBDIVISIONS) + 1
- #define ABL_GRID_POINTS_VIRT_Y (ABL_GRID_POINTS_Y - 1) * (BILINEAR_SUBDIVISIONS) + 1
+ #define ABL_GRID_POINTS_VIRT_X (ABL_GRID_MAX_POINTS_X - 1) * (BILINEAR_SUBDIVISIONS) + 1
+ #define ABL_GRID_POINTS_VIRT_Y (ABL_GRID_MAX_POINTS_Y - 1) * (BILINEAR_SUBDIVISIONS) + 1
float bed_level_grid_virt[ABL_GRID_POINTS_VIRT_X][ABL_GRID_POINTS_VIRT_Y];
- float bed_level_grid_virt_temp[ABL_GRID_POINTS_X + 2][ABL_GRID_POINTS_Y + 2]; //temporary for calculation (maybe dynamical?)
+ float bed_level_grid_virt_temp[ABL_GRID_MAX_POINTS_X + 2][ABL_GRID_MAX_POINTS_Y + 2]; //temporary for calculation (maybe dynamical?)
int bilinear_grid_spacing_virt[2] = { 0 };
static void bed_level_virt_print() {
@@ -2475,9 +2475,9 @@ static void clean_up_after_endstop_or_probe_move() {
}
#define LINEAR_EXTRAPOLATION(E, I) (E * 2 - I)
static void bed_level_virt_prepare() {
- for (uint8_t y = 1; y <= ABL_GRID_POINTS_Y; y++) {
+ for (uint8_t y = 1; y <= ABL_GRID_MAX_POINTS_Y; y++) {
- for (uint8_t x = 1; x <= ABL_GRID_POINTS_X; x++)
+ for (uint8_t x = 1; x <= ABL_GRID_MAX_POINTS_X; x++)
bed_level_grid_virt_temp[x][y] = bed_level_grid[x - 1][y - 1];
bed_level_grid_virt_temp[0][y] = LINEAR_EXTRAPOLATION(
@@ -2485,21 +2485,21 @@ static void clean_up_after_endstop_or_probe_move() {
bed_level_grid_virt_temp[2][y]
);
- bed_level_grid_virt_temp[(ABL_GRID_POINTS_X + 2) - 1][y] =
+ bed_level_grid_virt_temp[(ABL_GRID_MAX_POINTS_X + 2) - 1][y] =
LINEAR_EXTRAPOLATION(
- bed_level_grid_virt_temp[(ABL_GRID_POINTS_X + 2) - 2][y],
- bed_level_grid_virt_temp[(ABL_GRID_POINTS_X + 2) - 3][y]
+ bed_level_grid_virt_temp[(ABL_GRID_MAX_POINTS_X + 2) - 2][y],
+ bed_level_grid_virt_temp[(ABL_GRID_MAX_POINTS_X + 2) - 3][y]
);
}
- for (uint8_t x = 0; x < ABL_GRID_POINTS_X + 2; x++) {
+ for (uint8_t x = 0; x < ABL_GRID_MAX_POINTS_X + 2; x++) {
bed_level_grid_virt_temp[x][0] = LINEAR_EXTRAPOLATION(
bed_level_grid_virt_temp[x][1],
bed_level_grid_virt_temp[x][2]
);
- bed_level_grid_virt_temp[x][(ABL_GRID_POINTS_Y + 2) - 1] =
+ bed_level_grid_virt_temp[x][(ABL_GRID_MAX_POINTS_Y + 2) - 1] =
LINEAR_EXTRAPOLATION(
- bed_level_grid_virt_temp[x][(ABL_GRID_POINTS_Y + 2) - 2],
- bed_level_grid_virt_temp[x][(ABL_GRID_POINTS_Y + 2) - 3]
+ bed_level_grid_virt_temp[x][(ABL_GRID_MAX_POINTS_Y + 2) - 2],
+ bed_level_grid_virt_temp[x][(ABL_GRID_MAX_POINTS_Y + 2) - 3]
);
}
}
@@ -2521,11 +2521,11 @@ static void clean_up_after_endstop_or_probe_move() {
return bed_level_virt_cmr(row, 1, tx);
}
static void bed_level_virt_interpolate() {
- for (uint8_t y = 0; y < ABL_GRID_POINTS_Y; y++)
- for (uint8_t x = 0; x < ABL_GRID_POINTS_X; x++)
+ for (uint8_t y = 0; y < ABL_GRID_MAX_POINTS_Y; y++)
+ for (uint8_t x = 0; x < ABL_GRID_MAX_POINTS_X; x++)
for (uint8_t ty = 0; ty < BILINEAR_SUBDIVISIONS; ty++)
for (uint8_t tx = 0; tx < BILINEAR_SUBDIVISIONS; tx++) {
- if ((ty && y == ABL_GRID_POINTS_Y - 1) || (tx && x == ABL_GRID_POINTS_X - 1))
+ if ((ty && y == ABL_GRID_MAX_POINTS_Y - 1) || (tx && x == ABL_GRID_MAX_POINTS_X - 1))
continue;
bed_level_grid_virt[x * (BILINEAR_SUBDIVISIONS) + tx][y * (BILINEAR_SUBDIVISIONS) + ty] =
bed_level_virt_2cmr(
@@ -3934,8 +3934,8 @@ inline void gcode_G28() {
// X and Y specify points in each direction, overriding the default
// These values may be saved with the completed mesh
- int abl_grid_points_x = code_seen('X') ? code_value_int() : ABL_GRID_POINTS_X,
- abl_grid_points_y = code_seen('Y') ? code_value_int() : ABL_GRID_POINTS_Y;
+ int abl_grid_points_x = code_seen('X') ? code_value_int() : ABL_GRID_MAX_POINTS_X,
+ abl_grid_points_y = code_seen('Y') ? code_value_int() : ABL_GRID_MAX_POINTS_Y;
if (code_seen('P')) abl_grid_points_x = abl_grid_points_y = code_value_int();
@@ -3946,7 +3946,7 @@ inline void gcode_G28() {
#else
- const int abl_grid_points_x = ABL_GRID_POINTS_X, abl_grid_points_y = ABL_GRID_POINTS_Y;
+ const int abl_grid_points_x = ABL_GRID_MAX_POINTS_X, abl_grid_points_y = ABL_GRID_MAX_POINTS_Y;
#endif
@@ -8757,8 +8757,8 @@ void ok_to_send() {
#define ABL_BG_GRID(X,Y) bed_level_grid_virt[X][Y]
#else
#define ABL_BG_SPACING(A) bilinear_grid_spacing[A]
- #define ABL_BG_POINTS_X ABL_GRID_POINTS_X
- #define ABL_BG_POINTS_Y ABL_GRID_POINTS_Y
+ #define ABL_BG_POINTS_X ABL_GRID_MAX_POINTS_X
+ #define ABL_BG_POINTS_Y ABL_GRID_MAX_POINTS_Y
#define ABL_BG_GRID(X,Y) bed_level_grid[X][Y]
#endif
diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h
index 56032fc405..0890f581bb 100644
--- a/Marlin/SanityCheck.h
+++ b/Marlin/SanityCheck.h
@@ -142,7 +142,9 @@
#elif defined(AUTO_BED_LEVELING_FEATURE)
#error "AUTO_BED_LEVELING_FEATURE is deprecated. Specify AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR, or AUTO_BED_LEVELING_3POINT."
#elif defined(ABL_GRID_POINTS)
- #error "ABL_GRID_POINTS is now ABL_GRID_POINTS_X and ABL_GRID_POINTS_Y. Please update your configuration."
+ #error "ABL_GRID_POINTS is now ABL_GRID_MAX_POINTS_X and ABL_GRID_MAX_POINTS_Y. Please update your configuration."
+#elif defined(ABL_GRID_POINTS_X) || defined(ABL_GRID_POINTS_Y)
+ #error "ABL_GRID_POINTS_[XY] is now ABL_GRID_MAX_POINTS_[XY]. Please update your configuration."
#elif defined(BEEPER)
#error "BEEPER is now BEEPER_PIN. Please update your pins definitions."
#elif defined(SDCARDDETECT)
@@ -212,10 +214,10 @@
#error "You probably want to use Max Endstops for DELTA!"
#endif
#if ABL_GRID
- #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."
+ #if (ABL_GRID_MAX_POINTS_X & 1) == 0 || (ABL_GRID_MAX_POINTS_Y & 1) == 0
+ #error "DELTA requires ABL_GRID_MAX_POINTS_X and ABL_GRID_MAX_POINTS_Y to be odd numbers."
+ #elif ABL_GRID_MAX_POINTS_X < 3
+ #error "DELTA requires ABL_GRID_MAX_POINTS_X and ABL_GRID_MAX_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 75e6b12a08..835391590e 100644
--- a/Marlin/example_configurations/Cartesio/Configuration.h
+++ b/Marlin/example_configurations/Cartesio/Configuration.h
@@ -805,8 +805,8 @@
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
// Set the number of grid points per dimension.
- #define ABL_GRID_POINTS_X 3
- #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
+ #define ABL_GRID_MAX_POINTS_X 3
+ #define ABL_GRID_MAX_POINTS_Y ABL_GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
#define LEFT_PROBE_BED_POSITION 15
diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h
index 3022ac98a3..8fa885c053 100644
--- a/Marlin/example_configurations/Felix/Configuration.h
+++ b/Marlin/example_configurations/Felix/Configuration.h
@@ -788,8 +788,8 @@
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
// Set the number of grid points per dimension.
- #define ABL_GRID_POINTS_X 3
- #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
+ #define ABL_GRID_MAX_POINTS_X 3
+ #define ABL_GRID_MAX_POINTS_Y ABL_GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
#define LEFT_PROBE_BED_POSITION 15
diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h
index 2e72ae8596..b9664551fa 100644
--- a/Marlin/example_configurations/Felix/DUAL/Configuration.h
+++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h
@@ -788,8 +788,8 @@
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
// Set the number of grid points per dimension.
- #define ABL_GRID_POINTS_X 3
- #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
+ #define ABL_GRID_MAX_POINTS_X 3
+ #define ABL_GRID_MAX_POINTS_Y ABL_GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
#define LEFT_PROBE_BED_POSITION 15
diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h
index fe41fd9e3e..4a8cf4d4d5 100644
--- a/Marlin/example_configurations/Hephestos/Configuration.h
+++ b/Marlin/example_configurations/Hephestos/Configuration.h
@@ -797,8 +797,8 @@
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
// Set the number of grid points per dimension.
- #define ABL_GRID_POINTS_X 3
- #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
+ #define ABL_GRID_MAX_POINTS_X 3
+ #define ABL_GRID_MAX_POINTS_Y ABL_GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
#define LEFT_PROBE_BED_POSITION 15
diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h
index 2f971ee70d..497cb3c37a 100644
--- a/Marlin/example_configurations/Hephestos_2/Configuration.h
+++ b/Marlin/example_configurations/Hephestos_2/Configuration.h
@@ -799,8 +799,8 @@
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
// Set the number of grid points per dimension.
- #define ABL_GRID_POINTS_X 3
- #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
+ #define ABL_GRID_MAX_POINTS_X 3
+ #define ABL_GRID_MAX_POINTS_Y ABL_GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
#define LEFT_PROBE_BED_POSITION X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER
diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h
index f8b9076199..2216a4d513 100644
--- a/Marlin/example_configurations/K8200/Configuration.h
+++ b/Marlin/example_configurations/K8200/Configuration.h
@@ -834,8 +834,8 @@
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
// Set the number of grid points per dimension.
- #define ABL_GRID_POINTS_X 3
- #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
+ #define ABL_GRID_MAX_POINTS_X 3
+ #define ABL_GRID_MAX_POINTS_Y ABL_GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
#define LEFT_PROBE_BED_POSITION 15
diff --git a/Marlin/example_configurations/K8400/Configuration.h b/Marlin/example_configurations/K8400/Configuration.h
index 7544ff2e2d..2184c8453e 100644
--- a/Marlin/example_configurations/K8400/Configuration.h
+++ b/Marlin/example_configurations/K8400/Configuration.h
@@ -805,8 +805,8 @@
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
// Set the number of grid points per dimension.
- #define ABL_GRID_POINTS_X 3
- #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
+ #define ABL_GRID_MAX_POINTS_X 3
+ #define ABL_GRID_MAX_POINTS_Y ABL_GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
#define LEFT_PROBE_BED_POSITION 15
diff --git a/Marlin/example_configurations/K8400/Dual-head/Configuration.h b/Marlin/example_configurations/K8400/Dual-head/Configuration.h
index 724d8eed3a..44b3627c76 100644
--- a/Marlin/example_configurations/K8400/Dual-head/Configuration.h
+++ b/Marlin/example_configurations/K8400/Dual-head/Configuration.h
@@ -805,8 +805,8 @@
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
// Set the number of grid points per dimension.
- #define ABL_GRID_POINTS_X 3
- #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
+ #define ABL_GRID_MAX_POINTS_X 3
+ #define ABL_GRID_MAX_POINTS_Y ABL_GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
#define LEFT_PROBE_BED_POSITION 15
diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
index afeb989b09..880abf55b7 100644
--- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
+++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
@@ -805,8 +805,8 @@
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
// Set the number of grid points per dimension.
- #define ABL_GRID_POINTS_X 3
- #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
+ #define ABL_GRID_MAX_POINTS_X 3
+ #define ABL_GRID_MAX_POINTS_Y ABL_GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
#define LEFT_PROBE_BED_POSITION 15
diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h
index 394b8747e7..b6f54fccb0 100644
--- a/Marlin/example_configurations/RigidBot/Configuration.h
+++ b/Marlin/example_configurations/RigidBot/Configuration.h
@@ -804,8 +804,8 @@
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
// Set the number of grid points per dimension.
- #define ABL_GRID_POINTS_X 3
- #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
+ #define ABL_GRID_MAX_POINTS_X 3
+ #define ABL_GRID_MAX_POINTS_Y ABL_GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
#define LEFT_PROBE_BED_POSITION 15
diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h
index 8a4ff9632c..60c83ad43e 100644
--- a/Marlin/example_configurations/SCARA/Configuration.h
+++ b/Marlin/example_configurations/SCARA/Configuration.h
@@ -820,8 +820,8 @@
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
// Set the number of grid points per dimension.
- #define ABL_GRID_POINTS_X 3
- #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
+ #define ABL_GRID_MAX_POINTS_X 3
+ #define ABL_GRID_MAX_POINTS_Y ABL_GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
#define LEFT_PROBE_BED_POSITION 15
diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h
index e62747b2fc..f87e26b632 100644
--- a/Marlin/example_configurations/TAZ4/Configuration.h
+++ b/Marlin/example_configurations/TAZ4/Configuration.h
@@ -826,8 +826,8 @@
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
// Set the number of grid points per dimension.
- #define ABL_GRID_POINTS_X 3
- #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
+ #define ABL_GRID_MAX_POINTS_X 3
+ #define ABL_GRID_MAX_POINTS_Y ABL_GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
#define LEFT_PROBE_BED_POSITION 15
diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h
index dc0df50b4f..9600237337 100644
--- a/Marlin/example_configurations/WITBOX/Configuration.h
+++ b/Marlin/example_configurations/WITBOX/Configuration.h
@@ -797,8 +797,8 @@
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
// Set the number of grid points per dimension.
- #define ABL_GRID_POINTS_X 3
- #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
+ #define ABL_GRID_MAX_POINTS_X 3
+ #define ABL_GRID_MAX_POINTS_Y ABL_GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
#define LEFT_PROBE_BED_POSITION 15
diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h
index 9f5bc335f5..740f2743d8 100644
--- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h
+++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h
@@ -805,8 +805,8 @@
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
// Set the number of grid points per dimension.
- #define ABL_GRID_POINTS_X 3
- #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
+ #define ABL_GRID_MAX_POINTS_X 3
+ #define ABL_GRID_MAX_POINTS_Y ABL_GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
#define LEFT_PROBE_BED_POSITION 15
diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h
index 8c817681cc..f64ac6448a 100644
--- a/Marlin/example_configurations/delta/biv2.5/Configuration.h
+++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h
@@ -898,8 +898,8 @@
// Set the number of grid points per dimension.
// 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
+ #define ABL_GRID_MAX_POINTS_X 9
+ #define ABL_GRID_MAX_POINTS_Y ABL_GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
#define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h
index a3482357fe..3b04870dc6 100644
--- a/Marlin/example_configurations/delta/generic/Configuration.h
+++ b/Marlin/example_configurations/delta/generic/Configuration.h
@@ -892,8 +892,8 @@
// Set the number of grid points per dimension.
// 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
+ #define ABL_GRID_MAX_POINTS_X 9
+ #define ABL_GRID_MAX_POINTS_Y ABL_GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
#define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
index d6e5106030..faba76cbd0 100644
--- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
@@ -895,8 +895,8 @@
// Set the number of grid points per dimension.
// 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
+ #define ABL_GRID_MAX_POINTS_X 9
+ #define ABL_GRID_MAX_POINTS_Y ABL_GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
#define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h
index c6510b2bb0..bc7dc92a3c 100644
--- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h
@@ -894,8 +894,8 @@
// Set the number of grid points per dimension.
// 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
+ #define ABL_GRID_MAX_POINTS_X 7
+ #define ABL_GRID_MAX_POINTS_Y ABL_GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
#define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS-25)
diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h
index a539152c6d..b7687b52a0 100644
--- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h
@@ -898,8 +898,8 @@
// Set the number of grid points per dimension.
// 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
+ #define ABL_GRID_MAX_POINTS_X 5
+ #define ABL_GRID_MAX_POINTS_Y ABL_GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
#define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h
index ca1b94e3da..14d37d7b89 100644
--- a/Marlin/example_configurations/makibox/Configuration.h
+++ b/Marlin/example_configurations/makibox/Configuration.h
@@ -808,8 +808,8 @@
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
// Set the number of grid points per dimension.
- #define ABL_GRID_POINTS_X 3
- #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
+ #define ABL_GRID_MAX_POINTS_X 3
+ #define ABL_GRID_MAX_POINTS_Y ABL_GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
#define LEFT_PROBE_BED_POSITION 15
diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
index 18cc89f050..2d3a50f39c 100644
--- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h
+++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
@@ -801,8 +801,8 @@
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
// Set the number of grid points per dimension.
- #define ABL_GRID_POINTS_X 3
- #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
+ #define ABL_GRID_MAX_POINTS_X 3
+ #define ABL_GRID_MAX_POINTS_Y ABL_GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
#define LEFT_PROBE_BED_POSITION 15
--
GitLab