Skip to content

Commit

Permalink
Move delta ABL sanity checks up
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Jul 12, 2016
1 parent db0882d commit 655c3fd
Showing 1 changed file with 13 additions and 23 deletions.
36 changes: 13 additions & 23 deletions Marlin/SanityCheck.h
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,9 @@
#if ENABLED(MESH_BED_LEVELING)
#if ENABLED(DELTA)
#error "MESH_BED_LEVELING does not yet support DELTA printers."
#endif
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#elif ENABLED(AUTO_BED_LEVELING_FEATURE)
#error "Select AUTO_BED_LEVELING_FEATURE or MESH_BED_LEVELING, not both."
#endif
#if MESH_NUM_X_POINTS > 7 || MESH_NUM_Y_POINTS > 7
#elif MESH_NUM_X_POINTS > 7 || MESH_NUM_Y_POINTS > 7
#error "MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS need to be less than 8."
#endif
#elif ENABLED(MANUAL_BED_LEVELING)
Expand All @@ -219,6 +217,10 @@

#if PROBE_SELECTED

#if ENABLED(Z_PROBE_SLED) && ENABLED(DELTA)
#error "You cannot use Z_PROBE_SLED with DELTA."
#endif

/**
* NUM_SERVOS is required for a Z servo probe
*/
Expand Down Expand Up @@ -326,6 +328,13 @@
*/
#if ENABLED(AUTO_BED_LEVELING_FEATURE)

/**
* Delta has limited bed leveling options
*/
#if ENABLED(DELTA) && DISABLED(AUTO_BED_LEVELING_GRID)
#error "You must use AUTO_BED_LEVELING_GRID for DELTA bed leveling."
#endif

/**
* Require a Z min pin
*/
Expand Down Expand Up @@ -410,25 +419,6 @@
#error "Only enable one SAV_3DGLCD display type: U8GLIB_SSD1306 or U8GLIB_SH1106."
#endif

/**
* Delta has limited bed leveling options
*/
#if ENABLED(DELTA)

#if ENABLED(AUTO_BED_LEVELING_FEATURE)

#if DISABLED(AUTO_BED_LEVELING_GRID)
#error "Only AUTO_BED_LEVELING_GRID is supported with DELTA."
#endif

#if ENABLED(Z_PROBE_SLED)
#error "You cannot use Z_PROBE_SLED with DELTA."
#endif

#endif

#endif

/**
* Don't set more than one kinematic type
*/
Expand Down

0 comments on commit 655c3fd

Please sign in to comment.