瀏覽代碼

Improve DUAL_X_CARRIAGE sanity check errors

Scott Lahteine 8 年之前
父節點
當前提交
2a7b1a85f7
共有 1 個文件被更改,包括 12 次插入8 次删除
  1. 12
    8
      Marlin/SanityCheck.h

+ 12
- 8
Marlin/SanityCheck.h 查看文件

@@ -398,14 +398,18 @@
398 398
  * Dual X Carriage requirements
399 399
  */
400 400
 #if ENABLED(DUAL_X_CARRIAGE)
401
-  #if EXTRUDERS == 1 || ENABLED(COREXY) \
402
-      || !HAS_X2_ENABLE || !HAS_X2_STEP || !HAS_X2_DIR \
403
-      || !defined(X2_HOME_POS) || !defined(X2_MIN_POS) || !defined(X2_MAX_POS) \
404
-      || !HAS_X_MAX
405
-    #error "Missing or invalid definitions for DUAL_X_CARRIAGE mode."
406
-  #endif
407
-  #if X_HOME_DIR != -1 || X2_HOME_DIR != 1
408
-    #error "Please use canonical x-carriage assignment."
401
+  #if EXTRUDERS == 1
402
+    #error "DUAL_X_CARRIAGE requires 2 (or more) extruders."
403
+  #elif ENABLED(COREXY) || ENABLED(COREXZ)
404
+    #error "DUAL_X_CARRIAGE cannot be used with COREXY or COREXZ."
405
+  #elif !HAS_X2_ENABLE || !HAS_X2_STEP || !HAS_X2_DIR
406
+    #error "DUAL_X_CARRIAGE requires X2 stepper pins to be defined."
407
+  #elif !HAS_X_MAX
408
+    #error "DUAL_X_CARRIAGE requires USE_XMAX_PLUG and an X Max Endstop."
409
+  #elif !defined(X2_HOME_POS) || !defined(X2_MIN_POS) || !defined(X2_MAX_POS)
410
+    #error "DUAL_X_CARRIAGE requires X2_HOME_POS, X2_MIN_POS, and X2_MAX_POS."
411
+  #elif X_HOME_DIR != -1 || X2_HOME_DIR != 1
412
+    #error "DUAL_X_CARRIAGE requires X_HOME_DIR -1 and X2_HOME_DIR 1."
409 413
   #endif
410 414
 #endif // DUAL_X_CARRIAGE
411 415
 

Loading…
取消
儲存