Browse Source

Move M605 to cpp

Scott Lahteine 6 years ago
parent
commit
1b0acbff72
3 changed files with 14 additions and 11 deletions
  1. 0
    4
      Marlin/src/Marlin.cpp
  2. 12
    2
      Marlin/src/gcode/control/M605.cpp
  3. 2
    5
      Marlin/src/gcode/gcode.cpp

+ 0
- 4
Marlin/src/Marlin.cpp View File

359
   SYNC_PLAN_POSITION_KINEMATIC();
359
   SYNC_PLAN_POSITION_KINEMATIC();
360
 }
360
 }
361
 
361
 
362
-#if ENABLED(DUAL_X_CARRIAGE) || ENABLED(DUAL_NOZZLE_DUPLICATION_MODE)
363
-  #include "gcode/control/M605.h"
364
-#endif
365
-
366
 #if ENABLED(LIN_ADVANCE)
362
 #if ENABLED(LIN_ADVANCE)
367
   #include "gcode/feature/advance/M900.h"
363
   #include "gcode/feature/advance/M900.h"
368
 #endif
364
 #endif

Marlin/src/gcode/control/M605.h → Marlin/src/gcode/control/M605.cpp View File

20
  *
20
  *
21
  */
21
  */
22
 
22
 
23
+#include "../../inc/MarlinConfig.h"
24
+
25
+#if ENABLED(DUAL_X_CARRIAGE) || ENABLED(DUAL_NOZZLE_DUPLICATION_MODE)
26
+
27
+#include "../gcode.h"
28
+#include "../../module/motion.h"
29
+#include "../../module/stepper.h"
30
+
23
 #if ENABLED(DUAL_X_CARRIAGE)
31
 #if ENABLED(DUAL_X_CARRIAGE)
24
 
32
 
25
   /**
33
   /**
34
    *
42
    *
35
    *    Note: the X axis should be homed after changing dual x-carriage mode.
43
    *    Note: the X axis should be homed after changing dual x-carriage mode.
36
    */
44
    */
37
-  void gcode_M605() {
45
+  void GcodeSuite::M605() {
38
     stepper.synchronize();
46
     stepper.synchronize();
39
     if (parser.seen('S')) dual_x_carriage_mode = (DualXMode)parser.value_byte();
47
     if (parser.seen('S')) dual_x_carriage_mode = (DualXMode)parser.value_byte();
40
     switch (dual_x_carriage_mode) {
48
     switch (dual_x_carriage_mode) {
66
 
74
 
67
 #elif ENABLED(DUAL_NOZZLE_DUPLICATION_MODE)
75
 #elif ENABLED(DUAL_NOZZLE_DUPLICATION_MODE)
68
 
76
 
69
-  void gcode_M605() {
77
+  void GcodeSuite::M605() {
70
     stepper.synchronize();
78
     stepper.synchronize();
71
     extruder_duplication_enabled = parser.intval('S') == (int)DXC_DUPLICATION_MODE;
79
     extruder_duplication_enabled = parser.intval('S') == (int)DXC_DUPLICATION_MODE;
72
     SERIAL_ECHO_START();
80
     SERIAL_ECHO_START();
74
   }
82
   }
75
 
83
 
76
 #endif // DUAL_NOZZLE_DUPLICATION_MODE
84
 #endif // DUAL_NOZZLE_DUPLICATION_MODE
85
+
86
+#endif // DUAL_X_CARRIAGE || DUAL_NOZZLE_DUPLICATION_MODE

+ 2
- 5
Marlin/src/gcode/gcode.cpp View File

122
 extern void gcode_M350();
122
 extern void gcode_M350();
123
 extern void gcode_M351();
123
 extern void gcode_M351();
124
 extern void gcode_M355();
124
 extern void gcode_M355();
125
-extern void gcode_M605();
126
 extern void gcode_M900();
125
 extern void gcode_M900();
127
 extern void gcode_M906();
126
 extern void gcode_M906();
128
 extern void gcode_M911();
127
 extern void gcode_M911();
651
       #endif // ADVANCED_PAUSE_FEATURE
650
       #endif // ADVANCED_PAUSE_FEATURE
652
 
651
 
653
       #if ENABLED(DUAL_X_CARRIAGE) || ENABLED(DUAL_NOZZLE_DUPLICATION_MODE)
652
       #if ENABLED(DUAL_X_CARRIAGE) || ENABLED(DUAL_NOZZLE_DUPLICATION_MODE)
654
-        case 605: // M605: Set Dual X Carriage movement mode
655
-          gcode_M605();
656
-          break;
657
-      #endif // DUAL_X_CARRIAGE
653
+        case 605: M605(); break;  // M605: Set Dual X Carriage movement mode
654
+      #endif
658
 
655
 
659
       #if ENABLED(MK2_MULTIPLEXER)
656
       #if ENABLED(MK2_MULTIPLEXER)
660
         case 702: M702(); break;  // M702: Unload all extruders
657
         case 702: M702(); break;  // M702: Unload all extruders

Loading…
Cancel
Save