Browse Source

No error on T0 with single-extruder and fix MIXING_EXTRUDER virtual tools (#12375)

InsanityAutomation 6 years ago
parent
commit
7665dff58b
1 changed files with 6 additions and 5 deletions
  1. 6
    5
      Marlin/src/module/tool_change.cpp

+ 6
- 5
Marlin/src/module/tool_change.cpp View File

@@ -498,11 +498,7 @@ inline void invalid_extruder_error(const uint8_t e) {
498 498
  * previous tool out of the way and the new tool into place.
499 499
  */
500 500
 void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool no_move/*=false*/) {
501
-  #if EXTRUDERS < 2
502
-
503
-    return invalid_extruder_error(tmp_extruder);
504
-
505
-  #elif ENABLED(MIXING_EXTRUDER) && MIXING_VIRTUAL_TOOLS > 1
501
+  #if ENABLED(MIXING_EXTRUDER) && MIXING_VIRTUAL_TOOLS > 1
506 502
 
507 503
       if (tmp_extruder >= MIXING_VIRTUAL_TOOLS)
508 504
         return invalid_extruder_error(tmp_extruder);
@@ -511,6 +507,11 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
511 507
       UNUSED(fr_mm_s);
512 508
       UNUSED(no_move);
513 509
 
510
+  #elif EXTRUDERS < 2
511
+
512
+    if (tmp_extruder) invalid_extruder_error(tmp_extruder);
513
+    return;
514
+
514 515
   #else
515 516
 
516 517
     #if DISABLED(MIXING_EXTRUDER)

Loading…
Cancel
Save