Browse Source

Move M206 to cpp

Scott Lahteine 7 years ago
parent
commit
33861d4e04
3 changed files with 11 additions and 9 deletions
  1. 0
    4
      Marlin/src/Marlin.cpp
  2. 1
    4
      Marlin/src/gcode/gcode.cpp
  3. 10
    1
      Marlin/src/gcode/geometry/M206.cpp

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

355
   return false;
355
   return false;
356
 }
356
 }
357
 
357
 
358
-#if HAS_M206_COMMAND
359
-  #include "gcode/geometry/M206.h"
360
-#endif
361
-
362
 #if IS_KINEMATIC
358
 #if IS_KINEMATIC
363
   #include "gcode/calibrate/M665.h"
359
   #include "gcode/calibrate/M665.h"
364
 #endif
360
 #endif

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

119
 extern void gcode_M163();
119
 extern void gcode_M163();
120
 extern void gcode_M164();
120
 extern void gcode_M164();
121
 extern void gcode_M165();
121
 extern void gcode_M165();
122
-extern void gcode_M206();
123
 extern void gcode_M211();
122
 extern void gcode_M211();
124
 extern void gcode_M220();
123
 extern void gcode_M220();
125
 extern void gcode_M226();
124
 extern void gcode_M226();
538
       case 205: M205(); break;    // M205: Set advanced settings
537
       case 205: M205(); break;    // M205: Set advanced settings
539
 
538
 
540
       #if HAS_M206_COMMAND
539
       #if HAS_M206_COMMAND
541
-        case 206: // M206: Set home offsets
542
-          gcode_M206();
543
-          break;
540
+        case 206: M206(); break;  // M206: Set home offsets
544
       #endif
541
       #endif
545
 
542
 
546
       #if ENABLED(DELTA)
543
       #if ENABLED(DELTA)

Marlin/src/gcode/geometry/M206.h → Marlin/src/gcode/geometry/M206.cpp View File

20
  *
20
  *
21
  */
21
  */
22
 
22
 
23
+#include "../../inc/MarlinConfig.h"
24
+
25
+#if HAS_M206_COMMAND
26
+
27
+#include "../gcode.h"
28
+#include "../../module/motion.h"
29
+
23
 /**
30
 /**
24
  * M206: Set Additional Homing Offset (X Y Z). SCARA aliases T=X, P=Y
31
  * M206: Set Additional Homing Offset (X Y Z). SCARA aliases T=X, P=Y
25
  *
32
  *
27
  * ***              M206 for SCARA will remain enabled in 1.1.x for compatibility.
34
  * ***              M206 for SCARA will remain enabled in 1.1.x for compatibility.
28
  * ***              In the 2.0 release, it will simply be disabled by default.
35
  * ***              In the 2.0 release, it will simply be disabled by default.
29
  */
36
  */
30
-void gcode_M206() {
37
+void GcodeSuite::M206() {
31
   LOOP_XYZ(i)
38
   LOOP_XYZ(i)
32
     if (parser.seen(axis_codes[i]))
39
     if (parser.seen(axis_codes[i]))
33
       set_home_offset((AxisEnum)i, parser.value_linear_units());
40
       set_home_offset((AxisEnum)i, parser.value_linear_units());
40
   SYNC_PLAN_POSITION_KINEMATIC();
47
   SYNC_PLAN_POSITION_KINEMATIC();
41
   report_current_position();
48
   report_current_position();
42
 }
49
 }
50
+
51
+#endif // HAS_M206_COMMAND

Loading…
Cancel
Save