Browse Source

Move M665 to cpp

Scott Lahteine 8 years ago
parent
commit
f5877aa93e
3 changed files with 16 additions and 10 deletions
  1. 0
    4
      Marlin/src/Marlin.cpp
  2. 15
    2
      Marlin/src/gcode/calibrate/M665.cpp
  3. 1
    4
      Marlin/src/gcode/gcode.cpp

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

355
   return false;
355
   return false;
356
 }
356
 }
357
 
357
 
358
-#if IS_KINEMATIC
359
-  #include "gcode/calibrate/M665.h"
360
-#endif
361
-
362
 #if ENABLED(DELTA) || ENABLED(Z_DUAL_ENDSTOPS)
358
 #if ENABLED(DELTA) || ENABLED(Z_DUAL_ENDSTOPS)
363
   #include "gcode/calibrate/M666.h"
359
   #include "gcode/calibrate/M666.h"
364
 #endif
360
 #endif

Marlin/src/gcode/calibrate/M665.h → Marlin/src/gcode/calibrate/M665.cpp View File

20
  *
20
  *
21
  */
21
  */
22
 
22
 
23
+#include "../../inc/MarlinConfig.h"
24
+
25
+#if IS_KINEMATIC
26
+
27
+#include "../gcode.h"
28
+#include "../../module/motion.h"
29
+
23
 #if ENABLED(DELTA)
30
 #if ENABLED(DELTA)
24
 
31
 
32
+  #include "../../module/delta.h"
33
+
25
   /**
34
   /**
26
    * M665: Set delta configurations
35
    * M665: Set delta configurations
27
    *
36
    *
34
    *    Y = Beta (Tower 2) angle trim
43
    *    Y = Beta (Tower 2) angle trim
35
    *    Z = Rotate A and B by this angle
44
    *    Z = Rotate A and B by this angle
36
    */
45
    */
37
-  void gcode_M665() {
46
+  void GcodeSuite::M665() {
38
     if (parser.seen('H')) {
47
     if (parser.seen('H')) {
39
       home_offset[Z_AXIS] = parser.value_linear_units() - DELTA_HEIGHT;
48
       home_offset[Z_AXIS] = parser.value_linear_units() - DELTA_HEIGHT;
40
       update_software_endstops(Z_AXIS);
49
       update_software_endstops(Z_AXIS);
54
 
63
 
55
 #elif IS_SCARA
64
 #elif IS_SCARA
56
 
65
 
66
+  #include "../../module/scara.h"
67
+
57
   /**
68
   /**
58
    * M665: Set SCARA settings
69
    * M665: Set SCARA settings
59
    *
70
    *
66
    *   A, P, and X are all aliases for the shoulder angle
77
    *   A, P, and X are all aliases for the shoulder angle
67
    *   B, T, and Y are all aliases for the elbow angle
78
    *   B, T, and Y are all aliases for the elbow angle
68
    */
79
    */
69
-  void gcode_M665() {
80
+  void GcodeSuite::M665() {
70
     if (parser.seen('S')) delta_segments_per_second = parser.value_float();
81
     if (parser.seen('S')) delta_segments_per_second = parser.value_float();
71
 
82
 
72
     const bool hasA = parser.seen('A'), hasP = parser.seen('P'), hasX = parser.seen('X');
83
     const bool hasA = parser.seen('A'), hasP = parser.seen('P'), hasX = parser.seen('X');
91
   }
102
   }
92
 
103
 
93
 #endif
104
 #endif
105
+
106
+#endif // IS_KINEMATIC

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

151
 extern void gcode_M503();
151
 extern void gcode_M503();
152
 extern void gcode_M540();
152
 extern void gcode_M540();
153
 extern void gcode_M605();
153
 extern void gcode_M605();
154
-extern void gcode_M665();
155
 extern void gcode_M666();
154
 extern void gcode_M666();
156
 extern void gcode_M702();
155
 extern void gcode_M702();
157
 extern void gcode_M900();
156
 extern void gcode_M900();
541
       #endif
540
       #endif
542
 
541
 
543
       #if ENABLED(DELTA)
542
       #if ENABLED(DELTA)
544
-        case 665: // M665: Set delta configurations
545
-          gcode_M665();
546
-          break;
543
+        case 665: M665(); break;  // M665: Set delta configurations
547
       #endif
544
       #endif
548
 
545
 
549
       #if ENABLED(DELTA) || ENABLED(Z_DUAL_ENDSTOPS)
546
       #if ENABLED(DELTA) || ENABLED(Z_DUAL_ENDSTOPS)

Loading…
Cancel
Save