Merge pull request #7315 from fixoid/patch-1

Fixing SWITCHING_EXTRUDER feature to work with HOTENDS > 1
This commit is contained in:
Scott Lahteine 2017-07-21 19:10:54 -05:00 committed by GitHub
commit b7a16e4468

View file

@ -10341,22 +10341,20 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
UNUSED(fr_mm_s);
UNUSED(no_move);
#if ENABLED(SWITCHING_EXTRUDER) && !DONT_SWITCH
stepper.synchronize();
move_extruder_servo(tmp_extruder);
#elif ENABLED(MK2_MULTIPLEXER)
#if ENABLED(MK2_MULTIPLEXER)
if (tmp_extruder >= E_STEPPERS)
return invalid_extruder_error(tmp_extruder);
select_multiplexed_stepper(tmp_extruder);
#endif
#endif // HOTENDS <= 1
#if ENABLED(SWITCHING_EXTRUDER) && !DONT_SWITCH
stepper.synchronize();
move_extruder_servo(tmp_extruder);
#endif
active_extruder = tmp_extruder;
SERIAL_ECHO_START();