Adding new Grbl-Mega-5X digital output capability control.

Author: fra589

cn5X.py

@@ -263,6 +263,12 @@ def __init__(self, parent=None):
     self.ui.btnPausePooling.clicked.connect(self.on_btnPausePooling)
 
     self.ui.btnClearDebug.clicked.connect(self.clearDebug)
+
+    self.ui.btnM64P0.clicked.connect(lambda: self.on_btnM64(0))
+    self.ui.btnM64P1.clicked.connect(lambda: self.on_btnM64(1))
+    self.ui.btnM64P2.clicked.connect(lambda: self.on_btnM64(2))
+    self.ui.btnM64P3.clicked.connect(lambda: self.on_btnM64(3))
+
     self.ui.btnSpinM3.clicked.connect(self.on_btnSpinM3)
     self.ui.btnSpinM4.clicked.connect(self.on_btnSpinM4)
     self.ui.btnSpinM5.clicked.connect(self.on_btnSpinM5)
@@ -1985,6 +1991,14 @@ def on_dsbJogSpeed_valueChanged(self, val: float):
     self.__jog.setJogSpeed(val)
 
 
+  @pyqtSlot(int)
+  def on_btnM64(self, digitNum: int):
+    if self.__decode.getDigitalStatus(digitNum):
+      self.__grblCom.gcodePush("M65P{}".format(digitNum))
+    else:
+      self.__grblCom.gcodePush("M64P{}".format(digitNum))
+
+
   @pyqtSlot()
   def on_btnSpinM3(self):
     self.__grblCom.gcodeInsert("M3")

cn5X.qrc

@@ -1,7 +1,19 @@
 <RCC>
   <qresource prefix="cn5X">
+    <file>images/btnM64P0.svg</file>
+    <file>images/btnM64P1.svg</file>
+    <file>images/btnM64P2.svg</file>
+    <file>images/btnM64P3.svg</file>
     <file>images/btnJogNone.svg</file>
+    <file>images/btnM64P0_down.svg</file>
+    <file>images/btnM64P1_down.svg</file>
+    <file>images/btnM64P2_down.svg</file>
+    <file>images/btnM64P3_down.svg</file>
     <file>images/btnJogA.svg</file>
+    <file>images/btnM64P0_light.svg</file>
+    <file>images/btnM64P1_light.svg</file>
+    <file>images/btnM64P2_light.svg</file>
+    <file>images/btnM64P3_light.svg</file>
     <file>images/btnJogB.svg</file>
     <file>images/btnJogC.svg</file>
     <file>images/btnJogX.svg</file>

cn5X_rc.py

@@ -81,6 +81,7 @@ def __init__(self, ui, log, grbl: grblCom):
     self.__offsetG5x  = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
     self.__etatArrosage = None
     self.__etatMachine = None
+    self.__digitalStatus = [False, False, False, False]
     self.__getNextStatusOutput = False
     self.__getNextGCodeParams = False
     self.__getNextGCodeState = False
@@ -134,6 +135,8 @@ def decodeGrblStatus(self, grblOutput):
     self.ui.statusBar.showMessage("{} + {}".format(self.__grblCom.grblVersion(), grblOutput))
 
     flagPn = False
+    flagOv = False
+    flagDigital = False
     tblDecode = grblOutput[1:-1].split("|")
     for D in tblDecode:
       if D in self.__validMachineState:
@@ -261,6 +264,7 @@ def decodeGrblStatus(self, grblOutput):
         self.ui.progressBufferState.setToolTip("Buffer stat : " + tblValue[0] + "/" + tblValue[1])
 
       elif D[:3] == "Ov:": # Override Values for feed, rapids, and spindle
+        flagOv = True
         values = D.split(':')[1].split(',')
         # Avance de travail
         if int(self.ui.lblAvancePourcent.text()[:-1]) != int(values[0]):
@@ -285,6 +289,37 @@ def decodeGrblStatus(self, grblOutput):
           else:
             exec("self.ui.cnLed" + L + ".setLedStatus(False)")
 
+      elif D[:2] == "A:": # OverrideAccessory State
+        accessoryState = D[2:]
+        digitalFind = accessoryState.find("D")
+        if digitalFind >=0:
+          flagDigital = True
+          digitalState = accessoryState[digitalFind+1:]
+          if digitalState[3] == "1":
+            self.ui.btnM64P0.setButtonStatus(True)
+            self.__digitalStatus[0] = True
+          else:
+            self.ui.btnM64P0.setButtonStatus(False)
+            self.__digitalStatus[0] = False
+          if digitalState[2] == "1":
+            self.ui.btnM64P1.setButtonStatus(True)
+            self.__digitalStatus[1] = True
+          else:
+            self.ui.btnM64P1.setButtonStatus(False)
+            self.__digitalStatus[1] = False
+          if digitalState[1] == "1":
+            self.ui.btnM64P2.setButtonStatus(True)
+            self.__digitalStatus[2] = True
+          else:
+            self.ui.btnM64P2.setButtonStatus(False)
+            self.__digitalStatus[2] = False
+          if digitalState[0] == "1":
+            self.ui.btnM64P3.setButtonStatus(True)
+            self.__digitalStatus[3] = True
+          else:
+            self.ui.btnM64P3.setButtonStatus(False)
+            self.__digitalStatus[3] = False
+
       '''
       elif D[:3] == "Ln:": # Line Number
         return D
@@ -295,10 +330,21 @@ def decodeGrblStatus(self, grblOutput):
       elif D[3:] == "FS:": # Current Feed and Speed
         return D
       '''
-      '''
-      elif D[2:] == "A:": # OverrideAccessory State
-        return D
-      '''
+
+    if flagOv and not flagDigital:
+      if self.__digitalStatus[0]:
+        self.ui.btnM64P0.setButtonStatus(False)
+        self.__digitalStatus[0] = False
+      if self.__digitalStatus[1]:
+        self.ui.btnM64P1.setButtonStatus(False)
+        self.__digitalStatus[1] = False
+      if self.__digitalStatus[2]:
+        self.ui.btnM64P2.setButtonStatus(False)
+        self.__digitalStatus[2] = False
+      if self.__digitalStatus[3]:
+        self.ui.btnM64P3.setButtonStatus(False)
+        self.__digitalStatus[3] = False
+
     if not flagPn:
       # Eteint toute les leds. Si on a pas trouve la chaine Pn:, c'est que toute les leds sont eteintes.
       for L in ['X', 'Y', 'Z', 'A', 'B', 'C', 'P', 'D', 'H', 'R', 'S']:
@@ -581,6 +627,11 @@ def get_etatMachine(self):
     return self.__etatMachine
 
 
+  def getDigitalStatus(self, digitNum):
+    if digitNum >= 0 and digitNum <= 3:
+      return self.__digitalStatus[digitNum]
+
+
   def getWco(self, axis=None):
     if axis is not None:
       if axis in self.__axisNames: