Browse Source

Move M226 to cpp

Scott Lahteine 7 years ago
parent
commit
3e761696a0
3 changed files with 6 additions and 7 deletions
  1. 0
    2
      Marlin/src/Marlin.cpp
  2. 5
    1
      Marlin/src/gcode/control/M226.cpp
  3. 1
    4
      Marlin/src/gcode/gcode.cpp

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

@@ -355,8 +355,6 @@ bool pin_is_protected(const int8_t pin) {
355 355
   return false;
356 356
 }
357 357
 
358
-#include "gcode/control/M226.h"
359
-
360 358
 #if ENABLED(EXPERIMENTAL_I2CBUS)
361 359
   #include "gcode/feature/i2c/M260_M261.h"
362 360
 #endif

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

@@ -20,10 +20,14 @@
20 20
  *
21 21
  */
22 22
 
23
+#include "../gcode.h"
24
+#include "../../Marlin.h" // for pin_is_protected and idle()
25
+#include "../../module/stepper.h"
26
+
23 27
 /**
24 28
  * M226: Wait until the specified pin reaches the state required (M226 P<pin> S<state>)
25 29
  */
26
-void gcode_M226() {
30
+void GcodeSuite::M226() {
27 31
   if (parser.seen('P')) {
28 32
     const int pin_number = parser.value_int(),
29 33
               pin_state = parser.intval('S', -1); // required pin state - default is inverted

+ 1
- 4
Marlin/src/gcode/gcode.cpp View File

@@ -119,7 +119,6 @@ void GcodeSuite::dwell(millis_t time) {
119 119
 extern void gcode_M163();
120 120
 extern void gcode_M164();
121 121
 extern void gcode_M165();
122
-extern void gcode_M226();
123 122
 extern void gcode_M240();
124 123
 extern void gcode_M250();
125 124
 extern void gcode_M260();
@@ -564,9 +563,7 @@ void GcodeSuite::process_next_command() {
564 563
         M221();
565 564
         break;
566 565
 
567
-      case 226: // M226: Wait until a pin reaches a state
568
-        gcode_M226();
569
-        break;
566
+      case 226: M226(); break;    // M226: Wait until a pin reaches a state
570 567
 
571 568
       #if HAS_SERVOS
572 569
         case 280: // M280: Set servo position absolute

Loading…
Cancel
Save