瀏覽代碼

Conditionals for SWITCHING_EXTRUDER

In reference to #5367. SWITCHING_EXTRUDER was not fully implemented for EXTRUDERS > 2.
Scott Lahteine 7 年之前
父節點
當前提交
c4ec01d59b
共有 1 個檔案被更改,包括 19 行新增9 行删除
  1. 19
    9
      Marlin/src/inc/Conditionals_LCD.h

+ 19
- 9
Marlin/src/inc/Conditionals_LCD.h 查看文件

@@ -421,18 +421,28 @@
421 421
   #define HOTEND_INDEX  e
422 422
 #endif
423 423
 
424
-#if ENABLED(SWITCHING_EXTRUDER) || ENABLED(MIXING_EXTRUDER)   // Unified E axis
425
-  #if ENABLED(MIXING_EXTRUDER)
426
-    #define E_STEPPERS  MIXING_STEPPERS
424
+#if ENABLED(SWITCHING_EXTRUDER)                               // One stepper for every two EXTRUDERS
425
+  #if EXTRUDERS > 4
426
+    #define E_STEPPERS    3
427
+    #define E_MANUAL      3
428
+    #define TOOL_E_INDEX  current_block->active_extruder
429
+  #elif EXTRUDERS > 2
430
+    #define E_STEPPERS    2
431
+    #define E_MANUAL      2
432
+    #define TOOL_E_INDEX  current_block->active_extruder
427 433
   #else
428
-    #define E_STEPPERS  1                                     // One E stepper
434
+    #define E_STEPPERS    1
435
+    #define TOOL_E_INDEX  0
429 436
   #endif
430
-  #define E_MANUAL      1
431
-  #define TOOL_E_INDEX  0
437
+  #define E_MANUAL        E_STEPPERS
438
+#elif ENABLED(MIXING_EXTRUDER)
439
+  #define E_STEPPERS      MIXING_STEPPERS
440
+  #define E_MANUAL        1
441
+  #define TOOL_E_INDEX    0
432 442
 #else
433
-  #define E_STEPPERS    EXTRUDERS
434
-  #define E_MANUAL      EXTRUDERS
435
-  #define TOOL_E_INDEX  current_block->active_extruder
443
+  #define E_STEPPERS      EXTRUDERS
444
+  #define E_MANUAL        EXTRUDERS
445
+  #define TOOL_E_INDEX    current_block->active_extruder
436 446
 #endif
437 447
 
438 448
 /**

Loading…
取消
儲存