Browse Source

Split G10/G11 into separate functions

Scott Lahteine 8 years ago
parent
commit
7afafb05b8
1 changed files with 18 additions and 13 deletions
  1. 18
    13
      Marlin/Marlin_main.cpp

+ 18
- 13
Marlin/Marlin_main.cpp View File

3403
 
3403
 
3404
   /**
3404
   /**
3405
    * G10 - Retract filament according to settings of M207
3405
    * G10 - Retract filament according to settings of M207
3406
-   * G11 - Recover filament according to settings of M208
3407
    */
3406
    */
3408
-  inline void gcode_G10_G11(bool doRetract=false) {
3407
+  inline void gcode_G10() {
3409
     #if EXTRUDERS > 1
3408
     #if EXTRUDERS > 1
3410
-      if (doRetract)
3411
-        retracted_swap[active_extruder] = parser.boolval('S'); // checks for swap retract argument
3409
+      const bool rs = parser.boolval('S');
3410
+      retracted_swap[active_extruder] = rs; // Use 'S' for swap, default to false
3412
     #endif
3411
     #endif
3413
-    retract(doRetract
3414
-     #if EXTRUDERS > 1
3415
-      , retracted_swap[active_extruder]
3416
-     #endif
3412
+    retract(true
3413
+      #if EXTRUDERS > 1
3414
+        , rs
3415
+      #endif
3417
     );
3416
     );
3418
   }
3417
   }
3419
 
3418
 
3419
+  /**
3420
+   * G11 - Recover filament according to settings of M208
3421
+   */
3422
+  inline void gcode_G11() { retract(false); }
3423
+
3420
 #endif // FWRETRACT
3424
 #endif // FWRETRACT
3421
 
3425
 
3422
 #if ENABLED(NOZZLE_CLEAN_FEATURE)
3426
 #if ENABLED(NOZZLE_CLEAN_FEATURE)
10450
 
10454
 
10451
       // G2, G3
10455
       // G2, G3
10452
       #if ENABLED(ARC_SUPPORT) && DISABLED(SCARA)
10456
       #if ENABLED(ARC_SUPPORT) && DISABLED(SCARA)
10453
-        case 2: // G2  - CW ARC
10454
-        case 3: // G3  - CCW ARC
10457
+        case 2: // G2: CW ARC
10458
+        case 3: // G3: CCW ARC
10455
           gcode_G2_G3(parser.codenum == 2);
10459
           gcode_G2_G3(parser.codenum == 2);
10456
           break;
10460
           break;
10457
       #endif
10461
       #endif
10462
         break;
10466
         break;
10463
 
10467
 
10464
       #if ENABLED(BEZIER_CURVE_SUPPORT)
10468
       #if ENABLED(BEZIER_CURVE_SUPPORT)
10465
-        // G5
10466
-        case 5: // G5  - Cubic B_spline
10469
+        case 5: // G5: Cubic B_spline
10467
           gcode_G5();
10470
           gcode_G5();
10468
           break;
10471
           break;
10469
       #endif // BEZIER_CURVE_SUPPORT
10472
       #endif // BEZIER_CURVE_SUPPORT
10470
 
10473
 
10471
       #if ENABLED(FWRETRACT)
10474
       #if ENABLED(FWRETRACT)
10472
         case 10: // G10: retract
10475
         case 10: // G10: retract
10476
+          gcode_G10();
10477
+          break;
10473
         case 11: // G11: retract_recover
10478
         case 11: // G11: retract_recover
10474
-          gcode_G10_G11(parser.codenum == 10);
10479
+          gcode_G11();
10475
           break;
10480
           break;
10476
       #endif // FWRETRACT
10481
       #endif // FWRETRACT
10477
 
10482
 

Loading…
Cancel
Save