CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7315 from fixoid/patch-1

Browse Source 
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
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/Marlin_main.cpp
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(fr_mm_s);
UNUSED(no_move); UNUSED(no_move);
#if ENABLED(SWITCHING_EXTRUDER) && !DONT_SWITCH #if ENABLED(MK2_MULTIPLEXER)
stepper.synchronize();
move_extruder_servo(tmp_extruder);
#elif ENABLED(MK2_MULTIPLEXER)
if (tmp_extruder >= E_STEPPERS) if (tmp_extruder >= E_STEPPERS)
return invalid_extruder_error(tmp_extruder); return invalid_extruder_error(tmp_extruder);
select_multiplexed_stepper(tmp_extruder); select_multiplexed_stepper(tmp_extruder);
#endif #endif
#endif // HOTENDS <= 1 #endif // HOTENDS <= 1
#if ENABLED(SWITCHING_EXTRUDER) && !DONT_SWITCH
stepper.synchronize();
move_extruder_servo(tmp_extruder);
#endif
active_extruder = tmp_extruder; active_extruder = tmp_extruder;
SERIAL_ECHO_START(); SERIAL_ECHO_START();