From 2b88ccd0aac55e7eabe1ea486b1f6286331aa06e Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Sun, 9 Apr 2017 03:15:59 -0500 Subject: [PATCH] Apply UBL mesh bounds to remaining configs --- Marlin/Configuration_adv.h | 4 +--- Marlin/example_configurations/Cartesio/Configuration_adv.h | 5 +++++ Marlin/example_configurations/Felix/Configuration_adv.h | 5 +++++ Marlin/example_configurations/Hephestos/Configuration_adv.h | 5 +++++ .../example_configurations/Hephestos_2/Configuration_adv.h | 5 +++++ Marlin/example_configurations/K8200/Configuration_adv.h | 5 +++++ Marlin/example_configurations/K8400/Configuration_adv.h | 5 +++++ Marlin/example_configurations/RigidBot/Configuration_adv.h | 5 +++++ Marlin/example_configurations/SCARA/Configuration_adv.h | 5 +++++ Marlin/example_configurations/TAZ4/Configuration_adv.h | 5 +++++ Marlin/example_configurations/TinyBoy2/Configuration_adv.h | 4 +--- Marlin/example_configurations/WITBOX/Configuration_adv.h | 5 +++++ .../example_configurations/delta/generic/Configuration_adv.h | 5 +++++ .../delta/kossel_mini/Configuration_adv.h | 5 +++++ .../delta/kossel_pro/Configuration_adv.h | 5 +++++ .../delta/kossel_xl/Configuration_adv.h | 5 +++++ Marlin/example_configurations/makibox/Configuration_adv.h | 5 +++++ .../example_configurations/tvrrug/Round2/Configuration_adv.h | 5 +++++ 18 files changed, 82 insertions(+), 6 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index fb29760494..abe82ff580 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -648,9 +648,7 @@ #define MESH_MAX_X (X_MAX_POS - (MESH_INSET)) #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET) #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET)) -#endif - -#if ENABLED(AUTO_BED_LEVELING_UBL) +#elif ENABLED(AUTO_BED_LEVELING_UBL) #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET) #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET)) #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET) diff --git a/Marlin/example_configurations/Cartesio/Configuration_adv.h b/Marlin/example_configurations/Cartesio/Configuration_adv.h index f832fedec5..00bdd9588c 100644 --- a/Marlin/example_configurations/Cartesio/Configuration_adv.h +++ b/Marlin/example_configurations/Cartesio/Configuration_adv.h @@ -645,6 +645,11 @@ #define MESH_MAX_X (X_MAX_POS - (MESH_INSET)) #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET) #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET)) +#elif ENABLED(AUTO_BED_LEVELING_UBL) + #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET)) + #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET)) #endif // @section extras diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h index 2e7efabe6d..aa4dbf09e7 100644 --- a/Marlin/example_configurations/Felix/Configuration_adv.h +++ b/Marlin/example_configurations/Felix/Configuration_adv.h @@ -645,6 +645,11 @@ #define MESH_MAX_X (X_MAX_POS - (MESH_INSET)) #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET) #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET)) +#elif ENABLED(AUTO_BED_LEVELING_UBL) + #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET)) + #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET)) #endif // @section extras diff --git a/Marlin/example_configurations/Hephestos/Configuration_adv.h b/Marlin/example_configurations/Hephestos/Configuration_adv.h index a7a6a31ef8..fe71096ec9 100644 --- a/Marlin/example_configurations/Hephestos/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos/Configuration_adv.h @@ -645,6 +645,11 @@ #define MESH_MAX_X (X_MAX_POS - (MESH_INSET)) #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET) #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET)) +#elif ENABLED(AUTO_BED_LEVELING_UBL) + #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET)) + #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET)) #endif // @section extras diff --git a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h index 89287837b6..bfdc956197 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h @@ -629,6 +629,11 @@ #define MESH_MAX_X (X_MAX_POS - (MESH_INSET)) #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET) #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET)) +#elif ENABLED(AUTO_BED_LEVELING_UBL) + #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET)) + #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET)) #endif // @section extras diff --git a/Marlin/example_configurations/K8200/Configuration_adv.h b/Marlin/example_configurations/K8200/Configuration_adv.h index f54193efa1..e1dc03cf5f 100644 --- a/Marlin/example_configurations/K8200/Configuration_adv.h +++ b/Marlin/example_configurations/K8200/Configuration_adv.h @@ -658,6 +658,11 @@ #define MESH_MAX_X (X_MAX_POS - (MESH_INSET)) #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET) #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET)) +#elif ENABLED(AUTO_BED_LEVELING_UBL) + #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET)) + #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET)) #endif // @section extras diff --git a/Marlin/example_configurations/K8400/Configuration_adv.h b/Marlin/example_configurations/K8400/Configuration_adv.h index e35effc437..19ccbcaddf 100644 --- a/Marlin/example_configurations/K8400/Configuration_adv.h +++ b/Marlin/example_configurations/K8400/Configuration_adv.h @@ -645,6 +645,11 @@ #define MESH_MAX_X (X_MAX_POS - (MESH_INSET)) #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET) #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET)) +#elif ENABLED(AUTO_BED_LEVELING_UBL) + #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET)) + #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET)) #endif // @section extras diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h index fb9cc9de6c..e6031e329d 100644 --- a/Marlin/example_configurations/RigidBot/Configuration_adv.h +++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h @@ -645,6 +645,11 @@ #define MESH_MAX_X (X_MAX_POS - (MESH_INSET)) #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET) #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET)) +#elif ENABLED(AUTO_BED_LEVELING_UBL) + #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET)) + #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET)) #endif // @section extras diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h index 029bf9c2ac..ca0052dcc7 100644 --- a/Marlin/example_configurations/SCARA/Configuration_adv.h +++ b/Marlin/example_configurations/SCARA/Configuration_adv.h @@ -645,6 +645,11 @@ #define MESH_MAX_X (X_MAX_POS - (MESH_INSET)) #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET) #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET)) +#elif ENABLED(AUTO_BED_LEVELING_UBL) + #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET)) + #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET)) #endif // @section extras diff --git a/Marlin/example_configurations/TAZ4/Configuration_adv.h b/Marlin/example_configurations/TAZ4/Configuration_adv.h index dee0ad4075..db1b995dc0 100644 --- a/Marlin/example_configurations/TAZ4/Configuration_adv.h +++ b/Marlin/example_configurations/TAZ4/Configuration_adv.h @@ -653,6 +653,11 @@ #define MESH_MAX_X (X_MAX_POS - (MESH_INSET)) #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET) #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET)) +#elif ENABLED(AUTO_BED_LEVELING_UBL) + #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET)) + #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET)) #endif // @section extras diff --git a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h index aba1cb5cd0..986a42f051 100644 --- a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h +++ b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h @@ -630,9 +630,7 @@ #define MESH_MAX_X (X_MAX_POS - (MESH_INSET)) #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET) #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET)) -#endif - -#if ENABLED(AUTO_BED_LEVELING_UBL) +#elif ENABLED(AUTO_BED_LEVELING_UBL) #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET) #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET)) #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET) diff --git a/Marlin/example_configurations/WITBOX/Configuration_adv.h b/Marlin/example_configurations/WITBOX/Configuration_adv.h index a7a6a31ef8..fe71096ec9 100644 --- a/Marlin/example_configurations/WITBOX/Configuration_adv.h +++ b/Marlin/example_configurations/WITBOX/Configuration_adv.h @@ -645,6 +645,11 @@ #define MESH_MAX_X (X_MAX_POS - (MESH_INSET)) #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET) #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET)) +#elif ENABLED(AUTO_BED_LEVELING_UBL) + #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET)) + #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET)) #endif // @section extras diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h index 44f80c1ca9..9238f00030 100644 --- a/Marlin/example_configurations/delta/generic/Configuration_adv.h +++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h @@ -647,6 +647,11 @@ #define MESH_MAX_X (X_MAX_POS - (MESH_INSET)) #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET) #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET)) +#elif ENABLED(AUTO_BED_LEVELING_UBL) + #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET)) + #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET)) #endif // @section extras diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h index 44f80c1ca9..9238f00030 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h @@ -647,6 +647,11 @@ #define MESH_MAX_X (X_MAX_POS - (MESH_INSET)) #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET) #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET)) +#elif ENABLED(AUTO_BED_LEVELING_UBL) + #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET)) + #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET)) #endif // @section extras diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h index 6fc72b8af1..493a5991f6 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h @@ -652,6 +652,11 @@ #define MESH_MAX_X (X_MAX_POS - (MESH_INSET)) #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET) #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET)) +#elif ENABLED(AUTO_BED_LEVELING_UBL) + #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET)) + #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET)) #endif // @section extras diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h index ef3e6272c5..321dc1b43b 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h @@ -647,6 +647,11 @@ #define MESH_MAX_X (X_MAX_POS - (MESH_INSET)) #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET) #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET)) +#elif ENABLED(AUTO_BED_LEVELING_UBL) + #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET)) + #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET)) #endif // @section extras diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h index c15f34e834..9a8be713cd 100644 --- a/Marlin/example_configurations/makibox/Configuration_adv.h +++ b/Marlin/example_configurations/makibox/Configuration_adv.h @@ -645,6 +645,11 @@ #define MESH_MAX_X (X_MAX_POS - (MESH_INSET)) #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET) #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET)) +#elif ENABLED(AUTO_BED_LEVELING_UBL) + #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET)) + #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET)) #endif // @section extras diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h index cb96f0260a..e4699e4388 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h @@ -645,6 +645,11 @@ #define MESH_MAX_X (X_MAX_POS - (MESH_INSET)) #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET) #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET)) +#elif ENABLED(AUTO_BED_LEVELING_UBL) + #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET)) + #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET)) #endif // @section extras -- GitLab