Conditionals for SWITCHING_EXTRUDER

In reference to #5367. SWITCHING_EXTRUDER was not fully implemented for EXTRUDERS > 2.
This commit is contained in:
Scott Lahteine 2018-02-19 10:59:23 -06:00
parent d4e4fe40e0
commit c4ec01d59b

View file

@ -421,18 +421,28 @@
#define HOTEND_INDEX e #define HOTEND_INDEX e
#endif #endif
#if ENABLED(SWITCHING_EXTRUDER) || ENABLED(MIXING_EXTRUDER) // Unified E axis #if ENABLED(SWITCHING_EXTRUDER) // One stepper for every two EXTRUDERS
#if ENABLED(MIXING_EXTRUDER) #if EXTRUDERS > 4
#define E_STEPPERS MIXING_STEPPERS #define E_STEPPERS 3
#define E_MANUAL 3
#define TOOL_E_INDEX current_block->active_extruder
#elif EXTRUDERS > 2
#define E_STEPPERS 2
#define E_MANUAL 2
#define TOOL_E_INDEX current_block->active_extruder
#else #else
#define E_STEPPERS 1 // One E stepper #define E_STEPPERS 1
#define TOOL_E_INDEX 0
#endif #endif
#define E_MANUAL 1 #define E_MANUAL E_STEPPERS
#define TOOL_E_INDEX 0 #elif ENABLED(MIXING_EXTRUDER)
#define E_STEPPERS MIXING_STEPPERS
#define E_MANUAL 1
#define TOOL_E_INDEX 0
#else #else
#define E_STEPPERS EXTRUDERS #define E_STEPPERS EXTRUDERS
#define E_MANUAL EXTRUDERS #define E_MANUAL EXTRUDERS
#define TOOL_E_INDEX current_block->active_extruder #define TOOL_E_INDEX current_block->active_extruder
#endif #endif
/** /**