Browse Source

Turn off DISABLE_INACTIVE_EXTRUDER with SWITCHING_NOZZLE

Fix #11183
Scott Lahteine 7 years ago
parent
commit
1ea222e6fc
1 changed files with 12 additions and 8 deletions
  1. 12
    8
      Marlin/src/inc/Conditionals_LCD.h

+ 12
- 8
Marlin/src/inc/Conditionals_LCD.h View File

390
 
390
 
391
 #define HAS_DEBUG_MENU (ENABLED(ULTIPANEL) && ENABLED(LCD_PROGRESS_BAR_TEST))
391
 #define HAS_DEBUG_MENU (ENABLED(ULTIPANEL) && ENABLED(LCD_PROGRESS_BAR_TEST))
392
 
392
 
393
-// MK2 Multiplexer forces SINGLENOZZLE and kills DISABLE_INACTIVE_EXTRUDER
394
-#if ENABLED(MK2_MULTIPLEXER)
395
-  #define SINGLENOZZLE
396
-  #undef DISABLE_INACTIVE_EXTRUDER
397
-#endif
398
-
399
 /**
393
 /**
400
  * Extruders have some combination of stepper motors and hotends
394
  * Extruders have some combination of stepper motors and hotends
401
  * so we separate these concepts into the defines:
395
  * so we separate these concepts into the defines:
406
  *  E_MANUAL     - Number of E steppers for LCD move options
400
  *  E_MANUAL     - Number of E steppers for LCD move options
407
  *
401
  *
408
  */
402
  */
409
-#define HOTEND_LOOP() for (int8_t e = 0; e < HOTENDS; e++)
410
-
411
 #if ENABLED(SWITCHING_EXTRUDER)                               // One stepper for every two EXTRUDERS
403
 #if ENABLED(SWITCHING_EXTRUDER)                               // One stepper for every two EXTRUDERS
412
   #if EXTRUDERS > 4
404
   #if EXTRUDERS > 4
413
     #define E_STEPPERS    3
405
     #define E_STEPPERS    3
428
   #define E_MANUAL        EXTRUDERS
420
   #define E_MANUAL        EXTRUDERS
429
 #endif
421
 #endif
430
 
422
 
423
+// No inactive extruders with MK2_MULTIPLEXER or SWITCHING_NOZZLE
424
+#if ENABLED(MK2_MULTIPLEXER) || ENABLED(SWITCHING_NOZZLE)
425
+  #undef DISABLE_INACTIVE_EXTRUDER
426
+#endif
427
+
428
+// MK2 Multiplexer forces SINGLENOZZLE
429
+#if ENABLED(MK2_MULTIPLEXER)
430
+  #define SINGLENOZZLE
431
+#endif
432
+
431
 #if ENABLED(SINGLENOZZLE) || ENABLED(MIXING_EXTRUDER)         // One hotend, one thermistor, no XY offset
433
 #if ENABLED(SINGLENOZZLE) || ENABLED(MIXING_EXTRUDER)         // One hotend, one thermistor, no XY offset
432
   #undef HOTENDS
434
   #undef HOTENDS
433
   #define HOTENDS       1
435
   #define HOTENDS       1
440
   #define HOTENDS EXTRUDERS
442
   #define HOTENDS EXTRUDERS
441
 #endif
443
 #endif
442
 
444
 
445
+#define HOTEND_LOOP() for (int8_t e = 0; e < HOTENDS; e++)
446
+
443
 #define DO_SWITCH_EXTRUDER (ENABLED(SWITCHING_EXTRUDER) && (DISABLED(SWITCHING_NOZZLE) || SWITCHING_EXTRUDER_SERVO_NR != SWITCHING_NOZZLE_SERVO_NR))
447
 #define DO_SWITCH_EXTRUDER (ENABLED(SWITCHING_EXTRUDER) && (DISABLED(SWITCHING_NOZZLE) || SWITCHING_EXTRUDER_SERVO_NR != SWITCHING_NOZZLE_SERVO_NR))
444
 
448
 
445
 /**
449
 /**

Loading…
Cancel
Save