MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Turn off DISABLE_INACTIVE_EXTRUDER with SWITCHING_NOZZLE

Browse Source 
Fix #11183
This commit is contained in:
Scott Lahteine 2018-07-02 16:57:24 -05:00
parent 5700360adf
commit a83f7f1d25
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Marlin/Conditionals_LCD.h
View File

@ -380,12 +380,6 @@
#define HAS_DEBUG_MENU (ENABLED(ULTIPANEL) && ENABLED(LCD_PROGRESS_BAR_TEST))
// MK2 Multiplexer forces SINGLENOZZLE and kills DISABLE_INACTIVE_EXTRUDER
#if ENABLED(MK2_MULTIPLEXER)
#define SINGLENOZZLE
#undef DISABLE_INACTIVE_EXTRUDER
#endif
/**
* Extruders have some combination of stepper motors and hotends
* so we separate these concepts into the defines:
@ -416,6 +410,16 @@
#define E_MANUAL EXTRUDERS
#endif
// No inactive extruders with MK2_MULTIPLEXER or SWITCHING_NOZZLE
#if ENABLED(MK2_MULTIPLEXER) || ENABLED(SWITCHING_NOZZLE)
#undef DISABLE_INACTIVE_EXTRUDER
#endif
// MK2 Multiplexer forces SINGLENOZZLE
#if ENABLED(MK2_MULTIPLEXER)
#define SINGLENOZZLE
#endif
#if ENABLED(SINGLENOZZLE) || ENABLED(MIXING_EXTRUDER) // One hotend, one thermistor, no XY offset
#undef HOTENDS
#define HOTENDS 1