Browse Source

Move G12 to cpp

Scott Lahteine 8 years ago
parent
commit
94d9def81c
3 changed files with 14 additions and 7 deletions
  1. 0
    4
      Marlin/src/Marlin.cpp
  2. 13
    1
      Marlin/src/gcode/feature/clean/G12.cpp
  3. 1
    2
      Marlin/src/gcode/gcode.cpp

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

361
  ***************** GCode Handlers *****************
361
  ***************** GCode Handlers *****************
362
  **************************************************/
362
  **************************************************/
363
 
363
 
364
-#if ENABLED(NOZZLE_CLEAN_FEATURE)
365
-  #include "gcode/feature/clean/G12.h"
366
-#endif
367
-
368
 #if ENABLED(CNC_WORKSPACE_PLANES)
364
 #if ENABLED(CNC_WORKSPACE_PLANES)
369
   #include "gcode/geometry/G17-G19.h"
365
   #include "gcode/geometry/G17-G19.h"
370
 #endif
366
 #endif

Marlin/src/gcode/feature/clean/G12.h → Marlin/src/gcode/feature/clean/G12.cpp View File

20
  *
20
  *
21
  */
21
  */
22
 
22
 
23
+#include "../../../inc/MarlinConfig.h"
24
+
25
+#if ENABLED(NOZZLE_CLEAN_FEATURE)
26
+
27
+#include "../../../libs/nozzle.h"
28
+
29
+#include "../../gcode.h"
30
+#include "../../parser.h"
31
+#include "../../../module/motion.h"
32
+
23
 /**
33
 /**
24
  * G12: Clean the nozzle
34
  * G12: Clean the nozzle
25
  */
35
  */
26
-void gcode_G12() {
36
+void GcodeSuite::G12() {
27
   // Don't allow nozzle cleaning without homing first
37
   // Don't allow nozzle cleaning without homing first
28
   if (axis_unhomed_error()) return;
38
   if (axis_unhomed_error()) return;
29
 
39
 
34
 
44
 
35
   Nozzle::clean(pattern, strokes, radius, objects);
45
   Nozzle::clean(pattern, strokes, radius, objects);
36
 }
46
 }
47
+
48
+#endif // NOZZLE_CLEAN_FEATURE

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

112
 //
112
 //
113
 // Placeholders for non-migrated codes
113
 // Placeholders for non-migrated codes
114
 //
114
 //
115
-extern void gcode_G12();
116
 extern void gcode_G17();
115
 extern void gcode_G17();
117
 extern void gcode_G18();
116
 extern void gcode_G18();
118
 extern void gcode_G19();
117
 extern void gcode_G19();
313
 
312
 
314
       #if ENABLED(NOZZLE_CLEAN_FEATURE)
313
       #if ENABLED(NOZZLE_CLEAN_FEATURE)
315
         case 12:
314
         case 12:
316
-          gcode_G12(); // G12: Nozzle Clean
315
+          G12(); // G12: Nozzle Clean
317
           break;
316
           break;
318
       #endif // NOZZLE_CLEAN_FEATURE
317
       #endif // NOZZLE_CLEAN_FEATURE
319
 
318
 

Loading…
Cancel
Save