FWRETRACT as a feature

Marlin/src/gcode/feature/fwretract/G10_G11.cpp

@@ -20,15 +20,23 @@
  *
  */
 
+#include "../../../inc/MarlinConfig.h"
+
+#if ENABLED(FWRETRACT)
+
+#include "../../../feature/fwretract.h"
+#include "../../gcode.h"
+#include "../../../module/motion.h"
+
 /**
  * G10 - Retract filament according to settings of M207
  */
-void gcode_G10() {
+void GcodeSuite::G10() {
   #if EXTRUDERS > 1
     const bool rs = parser.boolval('S');
-    retracted_swap[active_extruder] = rs; // Use 'S' for swap, default to false
+    fwretract.retracted_swap[active_extruder] = rs; // Use 'S' for swap, default to false
   #endif
-  retract(true
+  fwretract.retract(true
     #if EXTRUDERS > 1
       , rs
     #endif
@@ -38,4 +46,6 @@ void gcode_G10() {
 /**
  * G11 - Recover filament according to settings of M208
  */
-void gcode_G11() { retract(false); }
+void GcodeSuite::G11() { fwretract.retract(false); }
+
+#endif // FWRETRACT

Marlin/src/gcode/feature/fwretract/M207.cpp

@@ -20,6 +20,13 @@
  *
  */
 
+#include "../../../inc/MarlinConfig.h"
+
+#if ENABLED(FWRETRACT)
+
+#include "../../../feature/fwretract.h"
+#include "../../gcode.h"
+
 /**
  * M207: Set firmware retraction values
  *
@@ -28,9 +35,11 @@
  *   F[units/min] retract_feedrate_mm_s
  *   Z[units]     retract_zlift
  */
-void gcode_M207() {
-  if (parser.seen('S')) retract_length = parser.value_axis_units(E_AXIS);
-  if (parser.seen('F')) retract_feedrate_mm_s = MMM_TO_MMS(parser.value_axis_units(E_AXIS));
-  if (parser.seen('Z')) retract_zlift = parser.value_linear_units();
-  if (parser.seen('W')) swap_retract_length = parser.value_axis_units(E_AXIS);
+void GcodeSuite::M207() {
+  if (parser.seen('S')) fwretract.retract_length = parser.value_axis_units(E_AXIS);
+  if (parser.seen('F')) fwretract.retract_feedrate_mm_s = MMM_TO_MMS(parser.value_axis_units(E_AXIS));
+  if (parser.seen('Z')) fwretract.retract_zlift = parser.value_linear_units();
+  if (parser.seen('W')) fwretract.swap_retract_length = parser.value_axis_units(E_AXIS);
 }
+
+#endif // FWRETRACT

Marlin/src/gcode/feature/fwretract/M208.cpp

@@ -20,6 +20,13 @@
  *
  */
 
+#include "../../../inc/MarlinConfig.h"
+
+#if ENABLED(FWRETRACT)
+
+#include "../../../feature/fwretract.h"
+#include "../../gcode.h"
+
 /**
  * M208: Set firmware un-retraction values
  *
@@ -28,9 +35,11 @@
  *   F[units/min] retract_recover_feedrate_mm_s
  *   R[units/min] swap_retract_recover_feedrate_mm_s
  */
-void gcode_M208() {
-  if (parser.seen('S')) retract_recover_length = parser.value_axis_units(E_AXIS);
-  if (parser.seen('F')) retract_recover_feedrate_mm_s = MMM_TO_MMS(parser.value_axis_units(E_AXIS));
-  if (parser.seen('R')) swap_retract_recover_feedrate_mm_s = MMM_TO_MMS(parser.value_axis_units(E_AXIS));
-  if (parser.seen('W')) swap_retract_recover_length = parser.value_axis_units(E_AXIS);
+void GcodeSuite::M208() {
+  if (parser.seen('S')) fwretract.retract_recover_length = parser.value_axis_units(E_AXIS);
+  if (parser.seen('F')) fwretract.retract_recover_feedrate_mm_s = MMM_TO_MMS(parser.value_axis_units(E_AXIS));
+  if (parser.seen('R')) fwretract.swap_retract_recover_feedrate_mm_s = MMM_TO_MMS(parser.value_axis_units(E_AXIS));
+  if (parser.seen('W')) fwretract.swap_retract_recover_length = parser.value_axis_units(E_AXIS);
 }
+
+#endif // FWRETRACT

Marlin/src/gcode/feature/fwretract/M209.cpp

@@ -20,16 +20,25 @@
  *
  */
 
+#include "../../../inc/MarlinConfig.h"
+
+#if ENABLED(FWRETRACT)
+
+#include "../../../feature/fwretract.h"
+#include "../../gcode.h"
+
 /**
  * M209: Enable automatic retract (M209 S1)
  *   For slicers that don't support G10/11, reversed extrude-only
  *   moves will be classified as retraction.
  */
-void gcode_M209() {
+void GcodeSuite::M209() {
   if (MIN_AUTORETRACT <= MAX_AUTORETRACT) {
     if (parser.seen('S')) {
-      autoretract_enabled = parser.value_bool();
-      for (uint8_t i = 0; i < EXTRUDERS; i++) retracted[i] = false;
+      fwretract.autoretract_enabled = parser.value_bool();
+      for (uint8_t i = 0; i < EXTRUDERS; i++) fwretract.retracted[i] = false;
     }
   }
 }
+
+#endif // FWRETRACT