Browse Source

COREYZ Conditionals, SanityCheck for only a single kinematic

Scott Lahteine 8 years ago
parent
commit
6c7f4909b1
2 changed files with 18 additions and 2 deletions
  1. 8
    2
      Marlin/Conditionals.h
  2. 10
    0
      Marlin/SanityCheck.h

+ 8
- 2
Marlin/Conditionals.h View File

@@ -315,11 +315,17 @@
315 315
    * CoreXY and CoreXZ
316 316
    */
317 317
   #if ENABLED(COREXY)
318
+    #define CORE_AXIS_1 A_AXIS // XY from A + B
318 319
     #define CORE_AXIS_2 B_AXIS
319
-    #define CORE_AXIS_3 Z_AXIS
320
+    #define CORE_AXIS_3 Z_AXIS // normal axis
320 321
   #elif ENABLED(COREXZ)
322
+    #define CORE_AXIS_1 A_AXIS // XZ from A + C
321 323
     #define CORE_AXIS_2 C_AXIS
322
-    #define CORE_AXIS_3 Y_AXIS
324
+    #define CORE_AXIS_3 Y_AXIS // normal axis
325
+  #elif ENABLED(COREYZ)
326
+    #define CORE_AXIS_1 B_AXIS // YZ from B + C
327
+    #define CORE_AXIS_2 C_AXIS
328
+    #define CORE_AXIS_3 X_AXIS // normal axis
323 329
   #endif
324 330
 
325 331
   /**

+ 10
- 0
Marlin/SanityCheck.h View File

@@ -388,6 +388,16 @@
388 388
 #endif
389 389
 
390 390
 /**
391
+ * Don't set more than one kinematic type
392
+ */
393
+#if (ENABLED(DELTA) && (ENABLED(SCARA) || ENABLED(COREXY) || ENABLED(COREXZ) || ENABLED(COREYZ))) \
394
+ || (ENABLED(SCARA) && (ENABLED(COREXY) || ENABLED(COREXZ) || ENABLED(COREYZ))) \
395
+ || (ENABLED(COREXY) && (ENABLED(COREXZ) || ENABLED(COREYZ))) \
396
+ || (ENABLED(COREXZ) && ENABLED(COREYZ))
397
+  #error "Please enable only one of DELTA, SCARA, COREXY, COREXZ, or COREYZ."
398
+#endif
399
+
400
+/**
391 401
  * Allen Key Z probe requires Auto Bed Leveling grid and Delta
392 402
  */
393 403
 #if ENABLED(Z_PROBE_ALLEN_KEY) && !(ENABLED(AUTO_BED_LEVELING_GRID) && ENABLED(DELTA))

Loading…
Cancel
Save