From 655c3fd55f0be533f5a2fb08915716c9f4e4568c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Tue, 12 Jul 2016 15:57:04 -0700
Subject: [PATCH] Move delta ABL sanity checks up
---
Marlin/SanityCheck.h | 36 +++++++++++++-----------------------
1 file changed, 13 insertions(+), 23 deletions(-)
diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h
index 17d6cff5f9..b9d117c467 100644
--- a/Marlin/SanityCheck.h
+++ b/Marlin/SanityCheck.h
@@ -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)
@@ -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
*/
@@ -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
*/
@@ -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
*/
--
GitLab