|
@@ -20,9 +20,9 @@
|
20
|
20
|
*
|
21
|
21
|
*/
|
22
|
22
|
|
23
|
|
-#include "../../inc/MarlinConfig.h"
|
|
23
|
+#include "../../inc/MarlinConfigPre.h"
|
24
|
24
|
|
25
|
|
-#if ENABLED(COOLANT_CONTROL)
|
|
25
|
+#if ANY(COOLANT_MIST, COOLANT_FLOOD, AIR_ASSIST)
|
26
|
26
|
|
27
|
27
|
#include "../gcode.h"
|
28
|
28
|
#include "../../module/planner.h"
|
|
@@ -37,51 +37,41 @@
|
37
|
37
|
}
|
38
|
38
|
#endif
|
39
|
39
|
|
40
|
|
-#if ENABLED(COOLANT_FLOOD)
|
|
40
|
+#if EITHER(COOLANT_FLOOD, AIR_ASSIST)
|
|
41
|
+
|
|
42
|
+ #if ENABLED(AIR_ASSIST)
|
|
43
|
+ #include "../../feature/spindle_laser.h"
|
|
44
|
+ #endif
|
|
45
|
+
|
41
|
46
|
/**
|
42
|
|
- * M8: Flood Coolant On
|
|
47
|
+ * M8: Flood Coolant / Air Assist ON
|
43
|
48
|
*/
|
44
|
49
|
void GcodeSuite::M8() {
|
45
|
|
- planner.synchronize(); // Wait for move to arrive
|
46
|
|
- WRITE(COOLANT_FLOOD_PIN, !(COOLANT_FLOOD_INVERT)); // Turn on Flood coolant
|
|
50
|
+ planner.synchronize(); // Wait for move to arrive
|
|
51
|
+ #if ENABLED(COOLANT_FLOOD)
|
|
52
|
+ WRITE(COOLANT_FLOOD_PIN, !(COOLANT_FLOOD_INVERT)); // Turn on Flood coolant
|
|
53
|
+ #endif
|
|
54
|
+ #if ENABLED(AIR_ASSIST)
|
|
55
|
+ cutter.air_assist_enable(); // Turn on Air Assist
|
|
56
|
+ #endif
|
47
|
57
|
}
|
|
58
|
+
|
48
|
59
|
#endif
|
49
|
60
|
|
50
|
61
|
/**
|
51
|
|
- * M9: Coolant OFF
|
|
62
|
+ * M9: Coolant / Air Assist OFF
|
52
|
63
|
*/
|
53
|
64
|
void GcodeSuite::M9() {
|
54
|
|
- planner.synchronize(); // Wait for move to arrive
|
|
65
|
+ planner.synchronize(); // Wait for move to arrive
|
55
|
66
|
#if ENABLED(COOLANT_MIST)
|
56
|
|
- WRITE(COOLANT_MIST_PIN, COOLANT_MIST_INVERT); // Turn off Mist coolant
|
|
67
|
+ WRITE(COOLANT_MIST_PIN, COOLANT_MIST_INVERT); // Turn off Mist coolant
|
57
|
68
|
#endif
|
58
|
69
|
#if ENABLED(COOLANT_FLOOD)
|
59
|
|
- WRITE(COOLANT_FLOOD_PIN, COOLANT_FLOOD_INVERT); // Turn off Flood coolant
|
|
70
|
+ WRITE(COOLANT_FLOOD_PIN, COOLANT_FLOOD_INVERT); // Turn off Flood coolant
|
|
71
|
+ #endif
|
|
72
|
+ #if ENABLED(AIR_ASSIST)
|
|
73
|
+ cutter.air_assist_disable(); // Turn off Air Assist
|
60
|
74
|
#endif
|
61
|
75
|
}
|
62
|
76
|
|
63
|
|
-#endif // COOLANT_CONTROL
|
64
|
|
-
|
65
|
|
-#if ENABLED(AIR_ASSIST)
|
66
|
|
-
|
67
|
|
-#include "../gcode.h"
|
68
|
|
-#include "../../module/planner.h"
|
69
|
|
-#include "../../feature/spindle_laser.h"
|
70
|
|
-
|
71
|
|
-/**
|
72
|
|
- * M8: Air Assist On
|
73
|
|
- */
|
74
|
|
-void GcodeSuite::M8() {
|
75
|
|
- planner.synchronize();
|
76
|
|
- cutter.air_assist_enable(); // Turn on Air Assist pin
|
77
|
|
-}
|
78
|
|
-
|
79
|
|
-/**
|
80
|
|
- * M9: Air Assist Off
|
81
|
|
- */
|
82
|
|
-void GcodeSuite::M9() {
|
83
|
|
- planner.synchronize();
|
84
|
|
- cutter.air_assist_disable(); // Turn off Air Assist pin
|
85
|
|
-}
|
86
|
|
-
|
87
|
|
-#endif // AIR_ASSIST
|
|
77
|
+#endif // COOLANT_MIST | COOLANT_FLOOD | AIR_ASSIST
|