Browse Source

Move delta ABL sanity checks up

Scott Lahteine 8 years ago
parent
commit
655c3fd55f
1 changed files with 13 additions and 23 deletions
  1. 13
    23
      Marlin/SanityCheck.h

+ 13
- 23
Marlin/SanityCheck.h View File

202
 #if ENABLED(MESH_BED_LEVELING)
202
 #if ENABLED(MESH_BED_LEVELING)
203
   #if ENABLED(DELTA)
203
   #if ENABLED(DELTA)
204
     #error "MESH_BED_LEVELING does not yet support DELTA printers."
204
     #error "MESH_BED_LEVELING does not yet support DELTA printers."
205
-  #endif
206
-  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
205
+  #elif ENABLED(AUTO_BED_LEVELING_FEATURE)
207
     #error "Select AUTO_BED_LEVELING_FEATURE or MESH_BED_LEVELING, not both."
206
     #error "Select AUTO_BED_LEVELING_FEATURE or MESH_BED_LEVELING, not both."
208
-  #endif
209
-  #if MESH_NUM_X_POINTS > 7 || MESH_NUM_Y_POINTS > 7
207
+  #elif MESH_NUM_X_POINTS > 7 || MESH_NUM_Y_POINTS > 7
210
     #error "MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS need to be less than 8."
208
     #error "MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS need to be less than 8."
211
   #endif
209
   #endif
212
 #elif ENABLED(MANUAL_BED_LEVELING)
210
 #elif ENABLED(MANUAL_BED_LEVELING)
219
 
217
 
220
 #if PROBE_SELECTED
218
 #if PROBE_SELECTED
221
 
219
 
220
+  #if ENABLED(Z_PROBE_SLED) && ENABLED(DELTA)
221
+    #error "You cannot use Z_PROBE_SLED with DELTA."
222
+  #endif
223
+
222
   /**
224
   /**
223
    * NUM_SERVOS is required for a Z servo probe
225
    * NUM_SERVOS is required for a Z servo probe
224
    */
226
    */
327
 #if ENABLED(AUTO_BED_LEVELING_FEATURE)
329
 #if ENABLED(AUTO_BED_LEVELING_FEATURE)
328
 
330
 
329
   /**
331
   /**
332
+   * Delta has limited bed leveling options
333
+   */
334
+  #if ENABLED(DELTA) && DISABLED(AUTO_BED_LEVELING_GRID)
335
+    #error "You must use AUTO_BED_LEVELING_GRID for DELTA bed leveling."
336
+  #endif
337
+
338
+  /**
330
    * Require a Z min pin
339
    * Require a Z min pin
331
    */
340
    */
332
   #if !PIN_EXISTS(Z_MIN)
341
   #if !PIN_EXISTS(Z_MIN)
411
 #endif
420
 #endif
412
 
421
 
413
 /**
422
 /**
414
- * Delta has limited bed leveling options
415
- */
416
-#if ENABLED(DELTA)
417
-
418
-  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
419
-
420
-    #if DISABLED(AUTO_BED_LEVELING_GRID)
421
-      #error "Only AUTO_BED_LEVELING_GRID is supported with DELTA."
422
-    #endif
423
-
424
-    #if ENABLED(Z_PROBE_SLED)
425
-      #error "You cannot use Z_PROBE_SLED with DELTA."
426
-    #endif
427
-
428
-  #endif
429
-
430
-#endif
431
-
432
-/**
433
  * Don't set more than one kinematic type
423
  * Don't set more than one kinematic type
434
  */
424
  */
435
 #if (ENABLED(DELTA) && (ENABLED(SCARA) || ENABLED(COREXY) || ENABLED(COREXZ) || ENABLED(COREYZ))) \
425
 #if (ENABLED(DELTA) && (ENABLED(SCARA) || ENABLED(COREXY) || ENABLED(COREXZ) || ENABLED(COREYZ))) \

Loading…
Cancel
Save