0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Moved checks into SanityCheck.h + removed previous added checks.

Browse source
This commit is contained in:
Edward Patel 2015-04-07 22:58:08 +02:00
parent 002340f32c
commit a9ed39b12d
12 changed files with 12 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Marlin/Configuration.h
View file

@ -431,11 +431,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
#endif // MANUAL_BED_LEVELING #endif // MANUAL_BED_LEVELING
#ifdef MESH_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_MIN_X 10
#define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
#define MESH_MIN_Y 10 #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 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 // There are 2 different ways to specify probing locations
// //
// - "grid" mode // - "grid" mode

12
Marlin/SanityCheck.h
View file

@ -91,6 +91,18 @@
#error You must enable either DISPLAY_CHARSET_HD44780_JAPAN or DISPLAY_CHARSET_HD44780_WESTERN for your LCD controller. #error You must enable either DISPLAY_CHARSET_HD44780_JAPAN or DISPLAY_CHARSET_HD44780_WESTERN for your LCD controller.
#endif #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 * Auto Bed Leveling
*/ */

9
Marlin/configurator/config/Configuration.h
View file

@ -431,11 +431,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
#endif // MANUAL_BED_LEVELING #endif // MANUAL_BED_LEVELING
#ifdef MESH_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_MIN_X 10
#define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
#define MESH_MIN_Y 10 #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 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 // There are 2 different ways to specify probing locations
// //
// - "grid" mode // - "grid" mode

9
Marlin/example_configurations/Felix/Configuration.h
View file

@ -369,11 +369,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#endif // MANUAL_BED_LEVELING #endif // MANUAL_BED_LEVELING
#ifdef MESH_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_MIN_X 10
#define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
#define MESH_MIN_Y 10 #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 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 // There are 2 different ways to specify probing locations
// //
// - "grid" mode // - "grid" mode

9
Marlin/example_configurations/Hephestos/Configuration.h
View file

@ -392,11 +392,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#endif // MANUAL_BED_LEVELING #endif // MANUAL_BED_LEVELING
#ifdef MESH_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_MIN_X 10
#define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
#define MESH_MIN_Y 10 #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 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 // There are 2 different ways to specify probing locations
// //
// - "grid" mode // - "grid" mode

9
Marlin/example_configurations/K8200/Configuration.h
View file

@ -397,11 +397,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#endif // MANUAL_BED_LEVELING #endif // MANUAL_BED_LEVELING
#ifdef MESH_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_MIN_X 10
#define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
#define MESH_MIN_Y 10 #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 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 // There are 2 different ways to specify probing locations
// //
// - "grid" mode // - "grid" mode

9
Marlin/example_configurations/SCARA/Configuration.h
View file

@ -421,11 +421,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#endif // MANUAL_BED_LEVELING #endif // MANUAL_BED_LEVELING
#ifdef MESH_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_MIN_X 10
#define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
#define MESH_MIN_Y 10 #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 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 // There are 2 different ways to specify probing locations
// //
// - "grid" mode // - "grid" mode

9
Marlin/example_configurations/WITBOX/Configuration.h
View file

@ -391,11 +391,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#endif // MANUAL_BED_LEVELING #endif // MANUAL_BED_LEVELING
#ifdef MESH_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_MIN_X 10
#define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
#define MESH_MIN_Y 10 #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 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 // There are 2 different ways to specify probing locations
// //
// - "grid" mode // - "grid" mode

9
Marlin/example_configurations/delta/generic/Configuration.h
View file

@ -419,11 +419,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#endif // MANUAL_BED_LEVELING #endif // MANUAL_BED_LEVELING
#ifdef MESH_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_MIN_X 10
#define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
#define MESH_MIN_Y 10 #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 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 // There are 2 different ways to specify probing locations
// //
// - "grid" mode // - "grid" mode

9
Marlin/example_configurations/delta/kossel_mini/Configuration.h
View file

@ -419,11 +419,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
#endif // MANUAL_BED_LEVELING #endif // MANUAL_BED_LEVELING
#ifdef MESH_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_MIN_X 10
#define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
#define MESH_MIN_Y 10 #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 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 // There are 2 different ways to specify probing locations
// //
// - "grid" mode // - "grid" mode

9
Marlin/example_configurations/makibox/Configuration.h
View file

@ -389,11 +389,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#endif // MANUAL_BED_LEVELING #endif // MANUAL_BED_LEVELING
#ifdef MESH_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_MIN_X 10
#define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
#define MESH_MIN_Y 10 #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 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 // There are 2 different ways to specify probing locations
// //
// - "grid" mode // - "grid" mode

9
Marlin/example_configurations/tvrrug/Round2/Configuration.h
View file

@ -391,11 +391,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#endif // MANUAL_BED_LEVELING #endif // MANUAL_BED_LEVELING
#ifdef MESH_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_MIN_X 10
#define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
#define MESH_MIN_Y 10 #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 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 // There are 2 different ways to specify probing locations
// //
// - "grid" mode // - "grid" mode