Browse Source

Merge pull request #7315 from fixoid/patch-1

Fixing SWITCHING_EXTRUDER feature to work with HOTENDS > 1
Scott Lahteine 7 years ago
parent
commit
b7a16e4468
1 changed files with 6 additions and 8 deletions
  1. 6
    8
      Marlin/Marlin_main.cpp

+ 6
- 8
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
10341 10341
       UNUSED(fr_mm_s);
10342 10342
       UNUSED(no_move);
10343 10343
 
10344
-      #if ENABLED(SWITCHING_EXTRUDER) && !DONT_SWITCH
10345
-
10346
-        stepper.synchronize();
10347
-        move_extruder_servo(tmp_extruder);
10348
-
10349
-      #elif ENABLED(MK2_MULTIPLEXER)
10350
-
10344
+      #if ENABLED(MK2_MULTIPLEXER)
10351 10345
         if (tmp_extruder >= E_STEPPERS)
10352 10346
           return invalid_extruder_error(tmp_extruder);
10353 10347
 
10354 10348
         select_multiplexed_stepper(tmp_extruder);
10355
-
10356 10349
       #endif
10357 10350
 
10358 10351
     #endif // HOTENDS <= 1
10359 10352
 
10353
+    #if ENABLED(SWITCHING_EXTRUDER) && !DONT_SWITCH
10354
+      stepper.synchronize();
10355
+      move_extruder_servo(tmp_extruder);
10356
+    #endif
10357
+
10360 10358
     active_extruder = tmp_extruder;
10361 10359
 
10362 10360
     SERIAL_ECHO_START();

Loading…
Cancel
Save