diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 9234d2ce7a..788ee58ff5 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -431,11 +431,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic #endif // MANUAL_BED_LEVELING #ifdef MESH_BED_LEVELING - - #ifdef DELTA - #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers - #endif - #define MESH_MIN_X 10 #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) #define MESH_MIN_Y 10 @@ -456,10 +451,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic #ifdef ENABLE_AUTO_BED_LEVELING - #ifdef MESH_BED_LEVELING - #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both - #endif // MESH_BED_LEVELING - // There are 2 different ways to specify probing locations // // - "grid" mode diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index d92938c1d3..d1be7703d9 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -91,6 +91,18 @@ #error You must enable either DISPLAY_CHARSET_HD44780_JAPAN or DISPLAY_CHARSET_HD44780_WESTERN for your LCD controller. #endif + /** + * Mesh Bed Leveling + */ + #ifdef MESH_BED_LEVELING + #ifdef DELTA + #error MESH_BED_LEVELING does not yet support DELTA printers + #endif + #ifdef ENABLE_AUTO_BED_LEVELING + #error Select ENABLE_AUTO_BED_LEVELING or MESH_BED_LEVELING, not both + #endif + #endif + /** * Auto Bed Leveling */ diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h index 025bfea892..e5130531b4 100644 --- a/Marlin/configurator/config/Configuration.h +++ b/Marlin/configurator/config/Configuration.h @@ -431,11 +431,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic #endif // MANUAL_BED_LEVELING #ifdef MESH_BED_LEVELING - - #ifdef DELTA - #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers - #endif - #define MESH_MIN_X 10 #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) #define MESH_MIN_Y 10 @@ -456,10 +451,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic #ifdef ENABLE_AUTO_BED_LEVELING - #ifdef MESH_BED_LEVELING - #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both - #endif // MESH_BED_LEVELING - // There are 2 different ways to specify probing locations // // - "grid" mode diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index 69b6025023..9ed9472548 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -369,11 +369,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #endif // MANUAL_BED_LEVELING #ifdef MESH_BED_LEVELING - - #ifdef DELTA - #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers - #endif - #define MESH_MIN_X 10 #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) #define MESH_MIN_Y 10 @@ -392,10 +387,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #ifdef ENABLE_AUTO_BED_LEVELING - #ifdef MESH_BED_LEVELING - #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both - #endif // MESH_BED_LEVELING - // There are 2 different ways to specify probing locations // // - "grid" mode diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 39b1198d76..d320e9ea9d 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -392,11 +392,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #endif // MANUAL_BED_LEVELING #ifdef MESH_BED_LEVELING - - #ifdef DELTA - #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers - #endif - #define MESH_MIN_X 10 #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) #define MESH_MIN_Y 10 @@ -415,10 +410,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #ifdef ENABLE_AUTO_BED_LEVELING - #ifdef MESH_BED_LEVELING - #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both - #endif // MESH_BED_LEVELING - // There are 2 different ways to specify probing locations // // - "grid" mode diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 31e6f3f4bc..fdbb32a864 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -397,11 +397,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #endif // MANUAL_BED_LEVELING #ifdef MESH_BED_LEVELING - - #ifdef DELTA - #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers - #endif - #define MESH_MIN_X 10 #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) #define MESH_MIN_Y 10 @@ -420,10 +415,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #ifdef ENABLE_AUTO_BED_LEVELING - #ifdef MESH_BED_LEVELING - #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both - #endif // MESH_BED_LEVELING - // There are 2 different ways to specify probing locations // // - "grid" mode diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 283922eddf..96e05e656b 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -421,11 +421,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #endif // MANUAL_BED_LEVELING #ifdef MESH_BED_LEVELING - - #ifdef DELTA - #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers - #endif - #define MESH_MIN_X 10 #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) #define MESH_MIN_Y 10 @@ -444,10 +439,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #ifdef ENABLE_AUTO_BED_LEVELING - #ifdef MESH_BED_LEVELING - #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both - #endif // MESH_BED_LEVELING - // There are 2 different ways to specify probing locations // // - "grid" mode diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index dd00a4bc8d..2bbe50938f 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -391,11 +391,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #endif // MANUAL_BED_LEVELING #ifdef MESH_BED_LEVELING - - #ifdef DELTA - #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers - #endif - #define MESH_MIN_X 10 #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) #define MESH_MIN_Y 10 @@ -414,10 +409,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #ifdef ENABLE_AUTO_BED_LEVELING - #ifdef MESH_BED_LEVELING - #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both - #endif // MESH_BED_LEVELING - // There are 2 different ways to specify probing locations // // - "grid" mode diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index a757ff7ab4..c5ab70da24 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -419,11 +419,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #endif // MANUAL_BED_LEVELING #ifdef MESH_BED_LEVELING - - #ifdef DELTA - #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers - #endif - #define MESH_MIN_X 10 #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) #define MESH_MIN_Y 10 @@ -442,10 +437,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #ifdef ENABLE_AUTO_BED_LEVELING - #ifdef MESH_BED_LEVELING - #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both - #endif // MESH_BED_LEVELING - // There are 2 different ways to specify probing locations // // - "grid" mode diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 6ac4669ae9..22f4f3f39d 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -419,11 +419,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o #endif // MANUAL_BED_LEVELING #ifdef MESH_BED_LEVELING - - #ifdef DELTA - #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers - #endif - #define MESH_MIN_X 10 #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) #define MESH_MIN_Y 10 @@ -442,10 +437,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o #ifdef ENABLE_AUTO_BED_LEVELING - #ifdef MESH_BED_LEVELING - #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both - #endif // MESH_BED_LEVELING - // There are 2 different ways to specify probing locations // // - "grid" mode diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 2b6834b617..fffc81c704 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -389,11 +389,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #endif // MANUAL_BED_LEVELING #ifdef MESH_BED_LEVELING - - #ifdef DELTA - #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers - #endif - #define MESH_MIN_X 10 #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) #define MESH_MIN_Y 10 @@ -412,10 +407,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #ifdef ENABLE_AUTO_BED_LEVELING - #ifdef MESH_BED_LEVELING - #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both - #endif // MESH_BED_LEVELING - // There are 2 different ways to specify probing locations // // - "grid" mode diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 7f4867890a..eb0e5a290a 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -391,11 +391,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #endif // MANUAL_BED_LEVELING #ifdef MESH_BED_LEVELING - - #ifdef DELTA - #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers - #endif - #define MESH_MIN_X 10 #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) #define MESH_MIN_Y 10 @@ -414,10 +409,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #ifdef ENABLE_AUTO_BED_LEVELING - #ifdef MESH_BED_LEVELING - #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both - #endif // MESH_BED_LEVELING - // There are 2 different ways to specify probing locations // // - "grid" mode