Merge pull request #455 from MaslowCNC/Add-support-for-M106-and-M107

Add support for M106 and M107
MaslowCNC · Jun 21, 2018 · 3ec93bd · 3ec93bd
2 parents d11de8a + 6a44c85
commit 3ec93bd
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 1 deletion.
diff --git a/cnc_ctrl_v1/GCode.cpp b/cnc_ctrl_v1/GCode.cpp
@@ -427,6 +427,14 @@ void  executeMcodeLine(const String& gcodeLine){
                 pause();
             }
             break;
+        case 106:
+            //Turn laser on
+            laserOn();
+            break;
+        case 107:
+            //Turn laser off
+            laserOff();
+            break;
         default:
             Serial.print(F("Command M"));
             Serial.print(mNumber);

diff --git a/cnc_ctrl_v1/Spindle.cpp b/cnc_ctrl_v1/Spindle.cpp
@@ -17,7 +17,7 @@
 #include "Maslow.h"
 #include "Settings.h"
 
-// the variable SpindlePowerControlPin is assigned in configAuxLow() in System.cpp 
+// the variables SpindlePowerControlPin and LaserPowerPin are assigned in configAuxLow() in System.cpp 
 
 // Globals for Spindle control, both poorly named
 Servo myservo;  // create servo object to control a servo
@@ -102,3 +102,15 @@ void  setSpindlePower(bool powerState) {
         maslowDelay(delayAfterChange);
     }
 }
+
+void laserOn() {
+    Serial.println("Laser on");
+    pinMode(LaserPowerPin, OUTPUT);
+    digitalWrite(LaserPowerPin, HIGH);
+}
+
+void laserOff(){
+    Serial.println("Laser off");
+    pinMode(LaserPowerPin, OUTPUT);
+    digitalWrite(LaserPowerPin, LOW);
+}
diff --git a/cnc_ctrl_v1/Spindle.h b/cnc_ctrl_v1/Spindle.h
@@ -18,5 +18,7 @@
 #define spindle_h
 
 void  setSpindlePower(bool powerState);
+void  laserOn();
+void  laserOff();
 
 #endif
diff --git a/cnc_ctrl_v1/System.cpp b/cnc_ctrl_v1/System.cpp
@@ -24,6 +24,7 @@ bool TLE5206;
 // extern values using AUX pins defined in  configAuxLow() and configAuxHigh()
 int SpindlePowerControlPin;  // output for controlling spindle power
 int ProbePin;                // use this input for zeroing zAxis with G38.2 gcode
+int LaserPowerPin;           // Use this output to turn on and off a laser diode
 
 
 void  calibrateChainLengths(String gcodeLine){
@@ -253,6 +254,9 @@ void   setupAxes(){
 void configAuxLow(int aux1, int aux2, int aux3, int aux4, int aux5, int aux6) {
   SpindlePowerControlPin = aux1;   // output for controlling spindle power
   ProbePin = aux4;                 // use this input for zeroing zAxis with G38.2 gcode
+  LaserPowerPin = aux2;            // output for controlling a laser diode
+  pinMode(LaserPowerPin, OUTPUT);
+  digitalWrite(LaserPowerPin, LOW);
 }
 
 void configAuxHigh(int aux7, int aux8, int aux9) {

diff --git a/cnc_ctrl_v1/System.h b/cnc_ctrl_v1/System.h
@@ -76,6 +76,7 @@ extern RingBuffer incSerialBuffer;
 extern Kinematics kinematics;
 extern byte systemRtExecAlarm;
 extern int SpindlePowerControlPin;
+extern int LaserPowerPin;
 extern int ProbePin;
 
 void  calibrateChainLengths(String);