Scott Lahteine преди 6 години
родител
ревизия
1b0acbff72
променени са 3 файла, в които са добавени 14 реда и са изтрити 11 реда
  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 Целия файл

@@ -359,10 +359,6 @@ void quickstop_stepper() {
359 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 362
 #if ENABLED(LIN_ADVANCE)
367 363
   #include "gcode/feature/advance/M900.h"
368 364
 #endif

Marlin/src/gcode/control/M605.h → Marlin/src/gcode/control/M605.cpp Целия файл

@@ -20,6 +20,14 @@
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 31
 #if ENABLED(DUAL_X_CARRIAGE)
24 32
 
25 33
   /**
@@ -34,7 +42,7 @@
34 42
    *
35 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 46
     stepper.synchronize();
39 47
     if (parser.seen('S')) dual_x_carriage_mode = (DualXMode)parser.value_byte();
40 48
     switch (dual_x_carriage_mode) {
@@ -66,7 +74,7 @@
66 74
 
67 75
 #elif ENABLED(DUAL_NOZZLE_DUPLICATION_MODE)
68 76
 
69
-  void gcode_M605() {
77
+  void GcodeSuite::M605() {
70 78
     stepper.synchronize();
71 79
     extruder_duplication_enabled = parser.intval('S') == (int)DXC_DUPLICATION_MODE;
72 80
     SERIAL_ECHO_START();
@@ -74,3 +82,5 @@
74 82
   }
75 83
 
76 84
 #endif // DUAL_NOZZLE_DUPLICATION_MODE
85
+
86
+#endif // DUAL_X_CARRIAGE || DUAL_NOZZLE_DUPLICATION_MODE

+ 2
- 5
Marlin/src/gcode/gcode.cpp Целия файл

@@ -122,7 +122,6 @@ extern void gcode_M165();
122 122
 extern void gcode_M350();
123 123
 extern void gcode_M351();
124 124
 extern void gcode_M355();
125
-extern void gcode_M605();
126 125
 extern void gcode_M900();
127 126
 extern void gcode_M906();
128 127
 extern void gcode_M911();
@@ -651,10 +650,8 @@ void GcodeSuite::process_next_command() {
651 650
       #endif // ADVANCED_PAUSE_FEATURE
652 651
 
653 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 656
       #if ENABLED(MK2_MULTIPLEXER)
660 657
         case 702: M702(); break;  // M702: Unload all extruders

Loading…
Отказ
Запис