From 348b4544018c0279c4ba623a2109e009bdd7a893 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 22 Jan 2018 00:55:13 -0600 Subject: [PATCH] Probe bounds based on bed size --- Marlin/Configuration.h | 12 ++++++------ Marlin/src/config/default/Configuration.h | 12 ++++++------ .../examples/AlephObjects/TAZ4/Configuration.h | 12 ++++++------ .../examples/AliExpress/CL-260/Configuration.h | 12 ++++++------ Marlin/src/config/examples/Anet/A6/Configuration.h | 6 +++--- Marlin/src/config/examples/Anet/A8/Configuration.h | 12 ++++++------ .../src/config/examples/Azteeg/X5GT/Configuration.h | 12 ++++++------ .../src/config/examples/BQ/Hephestos/Configuration.h | 12 ++++++------ Marlin/src/config/examples/BQ/WITBOX/Configuration.h | 12 ++++++------ Marlin/src/config/examples/Cartesio/Configuration.h | 12 ++++++------ .../config/examples/Creality/CR-10/Configuration.h | 12 ++++++------ .../config/examples/Creality/CR-10S/Configuration.h | 12 ++++++------ .../config/examples/Creality/Ender/Configuration.h | 12 ++++++------ Marlin/src/config/examples/Felix/Configuration.h | 12 ++++++------ .../src/config/examples/Felix/DUAL/Configuration.h | 12 ++++++------ .../config/examples/Geeetech/GT2560/Configuration.h | 12 ++++++------ .../Geeetech/I3_Pro_X-GT2560/Configuration.h | 12 ++++++------ .../config/examples/Infitary/i3-M508/Configuration.h | 12 ++++++------ .../src/config/examples/MakerParts/Configuration.h | 12 ++++++------ .../src/config/examples/Malyan/M200/Configuration.h | 12 ++++++------ .../examples/Micromake/C1/basic/Configuration.h | 12 ++++++------ .../examples/Micromake/C1/enhanced/Configuration.h | 12 ++++++------ .../examples/RepRapWorld/Megatronics/Configuration.h | 12 ++++++------ Marlin/src/config/examples/RigidBot/Configuration.h | 12 ++++++------ Marlin/src/config/examples/SCARA/Configuration.h | 12 ++++++------ Marlin/src/config/examples/STM32F10/Configuration.h | 12 ++++++------ .../src/config/examples/Sanguinololu/Configuration.h | 12 ++++++------ Marlin/src/config/examples/TinyBoy2/Configuration.h | 12 ++++++------ Marlin/src/config/examples/Tronxy/X1/Configuration.h | 12 ++++++------ .../examples/UltiMachine/Archim2/Configuration.h | 12 ++++++------ .../config/examples/Velleman/K8200/Configuration.h | 12 ++++++------ .../config/examples/Velleman/K8400/Configuration.h | 12 ++++++------ .../Velleman/K8400/Dual-head/Configuration.h | 12 ++++++------ .../examples/Wanhao/Duplicator 6/Configuration.h | 12 ++++++------ .../config/examples/adafruit/ST7565/Configuration.h | 12 ++++++------ .../delta/FLSUN/auto_calibrate/Configuration.h | 6 +++--- .../examples/delta/FLSUN/kossel/Configuration.h | 6 +++--- .../examples/delta/FLSUN/kossel_mini/Configuration.h | 6 +++--- .../config/examples/delta/generic/Configuration.h | 6 +++--- .../examples/delta/kossel_mini/Configuration.h | 6 +++--- .../config/examples/delta/kossel_pro/Configuration.h | 6 +++--- .../config/examples/delta/kossel_xl/Configuration.h | 6 +++--- .../config/examples/gCreate/gMax1.5+/Configuration.h | 12 ++++++------ Marlin/src/config/examples/makibox/Configuration.h | 12 ++++++------ .../config/examples/stm32f103ret6/Configuration.h | 12 ++++++------ .../config/examples/tvrrug/Round2/Configuration.h | 12 ++++++------ Marlin/src/config/examples/wt150/Configuration.h | 12 ++++++------ 47 files changed, 258 insertions(+), 258 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index d97c68eb85..f8abcedb39 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -926,15 +926,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/default/Configuration.h b/Marlin/src/config/default/Configuration.h index 27eb677beb..ca260a3283 100644 --- a/Marlin/src/config/default/Configuration.h +++ b/Marlin/src/config/default/Configuration.h @@ -926,15 +926,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h index 4b2515cc57..94e98e6531 100644 --- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h +++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h @@ -946,15 +946,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h index f3a7d88b50..f77bcb7f4f 100644 --- a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h +++ b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h @@ -926,15 +926,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/Anet/A6/Configuration.h b/Marlin/src/config/examples/Anet/A6/Configuration.h index 25cbf36718..a6da727393 100644 --- a/Marlin/src/config/examples/Anet/A6/Configuration.h +++ b/Marlin/src/config/examples/Anet/A6/Configuration.h @@ -1038,9 +1038,9 @@ // 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 RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15) + //#define FRONT_PROBE_BED_POSITION 15 + //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15) // ANET A6 //#define LEFT_PROBE_BED_POSITION 20 diff --git a/Marlin/src/config/examples/Anet/A8/Configuration.h b/Marlin/src/config/examples/Anet/A8/Configuration.h index 93465dd29a..05dd14af0f 100644 --- a/Marlin/src/config/examples/Anet/A8/Configuration.h +++ b/Marlin/src/config/examples/Anet/A8/Configuration.h @@ -933,15 +933,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h index 0da6de5bbc..d197fcd54e 100644 --- a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h +++ b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h @@ -926,15 +926,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h index 3f42ca52df..f5daf2cac5 100644 --- a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h +++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h @@ -914,15 +914,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h index 9d24c804b6..28c7168c98 100644 --- a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h +++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h @@ -914,15 +914,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/Cartesio/Configuration.h b/Marlin/src/config/examples/Cartesio/Configuration.h index ae98e5e1b8..3b8c253cb9 100644 --- a/Marlin/src/config/examples/Cartesio/Configuration.h +++ b/Marlin/src/config/examples/Cartesio/Configuration.h @@ -925,15 +925,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/Creality/CR-10/Configuration.h b/Marlin/src/config/examples/Creality/CR-10/Configuration.h index 9e708ed612..e2dfb024d7 100755 --- a/Marlin/src/config/examples/Creality/CR-10/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10/Configuration.h @@ -936,15 +936,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h index c9c4cb850e..f7ec7834e4 100644 --- a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h @@ -918,15 +918,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/Creality/Ender/Configuration.h b/Marlin/src/config/examples/Creality/Ender/Configuration.h index fd7ae2cabe..74c42e83a2 100644 --- a/Marlin/src/config/examples/Creality/Ender/Configuration.h +++ b/Marlin/src/config/examples/Creality/Ender/Configuration.h @@ -921,15 +921,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/Felix/Configuration.h b/Marlin/src/config/examples/Felix/Configuration.h index 6f994ef174..d55a434618 100644 --- a/Marlin/src/config/examples/Felix/Configuration.h +++ b/Marlin/src/config/examples/Felix/Configuration.h @@ -908,15 +908,15 @@ #define GRID_MAX_POINTS_X 3 #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 180 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/Felix/DUAL/Configuration.h b/Marlin/src/config/examples/Felix/DUAL/Configuration.h index b64b3a16eb..d44fe6dfcb 100644 --- a/Marlin/src/config/examples/Felix/DUAL/Configuration.h +++ b/Marlin/src/config/examples/Felix/DUAL/Configuration.h @@ -908,15 +908,15 @@ #define GRID_MAX_POINTS_X 3 #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 180 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h index 1aa6794938..3b69ae539e 100644 --- a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h @@ -941,15 +941,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h b/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h index bafce020c3..e49e78a508 100644 --- a/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h @@ -926,15 +926,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 8 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h index 49bf39f04b..d1925e1b0f 100644 --- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h +++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h @@ -930,15 +930,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/MakerParts/Configuration.h b/Marlin/src/config/examples/MakerParts/Configuration.h index 89dfd55aff..d3a49dde0a 100644 --- a/Marlin/src/config/examples/MakerParts/Configuration.h +++ b/Marlin/src/config/examples/MakerParts/Configuration.h @@ -933,15 +933,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration.h b/Marlin/src/config/examples/Malyan/M200/Configuration.h index b509333ffb..b82f35da78 100644 --- a/Marlin/src/config/examples/Malyan/M200/Configuration.h +++ b/Marlin/src/config/examples/Malyan/M200/Configuration.h @@ -916,15 +916,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h index 0c52b3480d..55237a3bc8 100644 --- a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h +++ b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h @@ -930,15 +930,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h index 8b8cc888d3..45fb90b448 100644 --- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h +++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h @@ -930,15 +930,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h index d56859e8af..c00f416c12 100644 --- a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h @@ -926,15 +926,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/RigidBot/Configuration.h b/Marlin/src/config/examples/RigidBot/Configuration.h index 08951b9576..dfc2624eae 100644 --- a/Marlin/src/config/examples/RigidBot/Configuration.h +++ b/Marlin/src/config/examples/RigidBot/Configuration.h @@ -924,15 +924,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/SCARA/Configuration.h b/Marlin/src/config/examples/SCARA/Configuration.h index 2f7a76051b..ea5384f4a1 100644 --- a/Marlin/src/config/examples/SCARA/Configuration.h +++ b/Marlin/src/config/examples/SCARA/Configuration.h @@ -938,15 +938,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/STM32F10/Configuration.h b/Marlin/src/config/examples/STM32F10/Configuration.h index 1a0135eadf..2af3edeb79 100644 --- a/Marlin/src/config/examples/STM32F10/Configuration.h +++ b/Marlin/src/config/examples/STM32F10/Configuration.h @@ -929,15 +929,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration.h b/Marlin/src/config/examples/Sanguinololu/Configuration.h index 692feb494c..bb71c9103d 100644 --- a/Marlin/src/config/examples/Sanguinololu/Configuration.h +++ b/Marlin/src/config/examples/Sanguinololu/Configuration.h @@ -957,15 +957,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration.h b/Marlin/src/config/examples/TinyBoy2/Configuration.h index c8fe7f5fa5..fcb2a7c027 100644 --- a/Marlin/src/config/examples/TinyBoy2/Configuration.h +++ b/Marlin/src/config/examples/TinyBoy2/Configuration.h @@ -982,15 +982,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/Tronxy/X1/Configuration.h b/Marlin/src/config/examples/Tronxy/X1/Configuration.h index 4834f00e56..4c583710b7 100644 --- a/Marlin/src/config/examples/Tronxy/X1/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/X1/Configuration.h @@ -917,15 +917,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h index 3cb4748c3f..75c814f582 100644 --- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h +++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h @@ -917,15 +917,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration.h b/Marlin/src/config/examples/Velleman/K8200/Configuration.h index 5f2627451f..4e847b526d 100644 --- a/Marlin/src/config/examples/Velleman/K8200/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8200/Configuration.h @@ -956,15 +956,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration.h b/Marlin/src/config/examples/Velleman/K8400/Configuration.h index 9b8c20ec05..c2d7fdb461 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8400/Configuration.h @@ -926,15 +926,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h b/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h index 3e14a0eaff..fd816e59e4 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h @@ -926,15 +926,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h index 5ecbe8e9dd..c81165ac54 100644 --- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h +++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h @@ -927,15 +927,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h index 757d64cc2e..ee22350e03 100644 --- a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h +++ b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h @@ -926,15 +926,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h index 987f7b914d..7f17add305 100644 --- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h @@ -1057,6 +1057,9 @@ #define GRID_MAX_POINTS_X 7 #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X + // The Z probe minimum outer margin (to validate G29 parameters). + #define MIN_PROBE_EDGE 20 + // 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) @@ -1064,9 +1067,6 @@ #define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS) #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS - // The Z probe minimum outer margin (to validate G29 parameters). - #define MIN_PROBE_EDGE 20 - // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h index 772c97a1d4..a3664c6f5b 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h @@ -1048,6 +1048,9 @@ #define GRID_MAX_POINTS_X 7 #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X + // The Z probe minimum outer margin (to validate G29 parameters). + #define MIN_PROBE_EDGE 20 + // 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) @@ -1055,9 +1058,6 @@ #define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS) #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS - // The Z probe minimum outer margin (to validate G29 parameters). - #define MIN_PROBE_EDGE 20 - // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h index c86064c0ea..5f89bb101a 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h @@ -1056,6 +1056,9 @@ #define GRID_MAX_POINTS_X 9 #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X + // The Z probe minimum outer margin (to validate G29 parameters). + #define MIN_PROBE_EDGE 10 + // 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) @@ -1063,9 +1066,6 @@ #define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS) #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS - // The Z probe minimum outer margin (to validate G29 parameters). - #define MIN_PROBE_EDGE 10 - // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/delta/generic/Configuration.h b/Marlin/src/config/examples/delta/generic/Configuration.h index 86c5cca2ba..7f5e42002f 100644 --- a/Marlin/src/config/examples/delta/generic/Configuration.h +++ b/Marlin/src/config/examples/delta/generic/Configuration.h @@ -1047,14 +1047,14 @@ #define GRID_MAX_POINTS_X 9 #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X + // The Z probe minimum outer margin (to validate G29 parameters). + #define MIN_PROBE_EDGE 10 + #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 - // The Z probe minimum outer margin (to validate G29 parameters). - #define MIN_PROBE_EDGE 10 - // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h index f8c324a06d..bf1d2a7750 100644 --- a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h @@ -1050,14 +1050,14 @@ #define GRID_MAX_POINTS_X 9 #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X + // The Z probe minimum outer margin (to validate G29 parameters). + #define MIN_PROBE_EDGE 10 + #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 - // The Z probe minimum outer margin (to validate G29 parameters). - #define MIN_PROBE_EDGE 10 - // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h index 06a4f90107..1d8059ef2b 100644 --- a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h @@ -1050,14 +1050,14 @@ #define GRID_MAX_POINTS_X 7 #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X + // The Z probe minimum outer margin (to validate G29 parameters). + #define MIN_PROBE_EDGE 10 + #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 - // The Z probe minimum outer margin (to validate G29 parameters). - #define MIN_PROBE_EDGE 10 - // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h index 45481c1194..714bb8e7e6 100644 --- a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h @@ -1059,14 +1059,14 @@ #define GRID_MAX_POINTS_X 5 #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X + // The Z probe minimum outer margin (to validate G29 parameters). + #define MIN_PROBE_EDGE 10 + #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 - // The Z probe minimum outer margin (to validate G29 parameters). - #define MIN_PROBE_EDGE 10 - // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h index aba5d1bc9c..410d33b18e 100644 --- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h +++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h @@ -940,15 +940,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/makibox/Configuration.h b/Marlin/src/config/examples/makibox/Configuration.h index 253c88fb77..32c02d8ea6 100644 --- a/Marlin/src/config/examples/makibox/Configuration.h +++ b/Marlin/src/config/examples/makibox/Configuration.h @@ -929,15 +929,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/stm32f103ret6/Configuration.h b/Marlin/src/config/examples/stm32f103ret6/Configuration.h index 74831865a3..c5846de324 100644 --- a/Marlin/src/config/examples/stm32f103ret6/Configuration.h +++ b/Marlin/src/config/examples/stm32f103ret6/Configuration.h @@ -862,15 +862,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h index 2fa77b3d05..1712ce31a3 100644 --- a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h +++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h @@ -921,15 +921,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST diff --git a/Marlin/src/config/examples/wt150/Configuration.h b/Marlin/src/config/examples/wt150/Configuration.h index a954874fbe..485ab2f800 100644 --- a/Marlin/src/config/examples/wt150/Configuration.h +++ b/Marlin/src/config/examples/wt150/Configuration.h @@ -931,15 +931,15 @@ #define GRID_MAX_POINTS_X 3 #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 - // The Z probe minimum outer margin (to validate G29 parameters). #define MIN_PROBE_EDGE 10 + // 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) + // Probe along the Y axis, advancing X after each column //#define PROBE_Y_FIRST