read coils 6

.woodpecker.yml

@@ -16,9 +16,9 @@ steps:
 
   deploy:
     image: portainer/kubectl-shell:latest
-    secrets:
-      - source: kube_config
-        target: KUBE_CONFIG_CONTENT
+    environment:
+      KUBE_CONFIG_CONTENT:
+        from_secret: kube_config
     commands:
       - export IMAGE_TAG=$CI_COMMIT_TAG
       - printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig

Dockerfile

@@ -11,7 +11,7 @@ ARG CONF_DIR="${APP_DIR}/config"
 RUN \
     apt update && \
     pip3 install loguru && \
-    pip3 install pymodbus && \
+    pip3 install pymodbus==3.6.3 && \
     pip3 install paho-mqtt
 
 RUN \

src/ModbusHandler.py

@@ -39,17 +39,17 @@ class ModbusHandler(threading.Thread):
 
             self.processImage.init(digitalOutputBits, digitalInputBits, analogInputBits)
 
-            reg = client.read_coils(0, digitalOutputBits)
-            if isinstance(reg, ModbusIOException):
-                raise Exception(reg)
-            with self.processImage:
-                self.processImage.setCoils(reg.bits)
 
             while not self.killBill:
                 try:
                     if not client.is_socket_open():
                         client.connect()
 
+                    reg = client.read_coils(0, digitalOutputBits)
+                    if isinstance(reg, ModbusIOException):
+                        raise Exception(reg)
+                    readCoils = reg.bits
+
                     reg = client.read_input_registers(0, analogInputBits // 8)
                     if isinstance(reg, ModbusIOException):
                         raise Exception(reg)
@@ -64,6 +64,7 @@ class ModbusHandler(threading.Thread):
                     with self.processImage:
                         self.processImage.setAnalogsInputs(analogInputs)
                         self.processImage.setDiscreteInputs(discreteInputs)
+                        self.processImage.setCoils(readCoils)
                         if self.processImage.hasPendingInputChanges():
                             self.processImage.notify()
                         if self.processImage.hasPendingOutputChanges():

src/ProcessImage.py

@@ -16,6 +16,8 @@ class ProcessImage(Condition):
         self.numCoils = numCoils
         self.coils = []
         self.shadowCoils = [ None ] * numCoils
+        self.readCoils = [ None ] * numCoils
+        self.readShadowCoils = [ None ] * numCoils
 
         self.numDiscreteInputs = numDiscreteInputs
         self.discreteInputs = []
@@ -31,7 +33,7 @@ class ProcessImage(Condition):
         return self.initialized
 
     def hasPendingInputChanges(self):
-        return (self.discreteInputs != self.shadowDiscreteInputs) or (self.analogInputs != self.shadowAnalogInputs)
+        return (self.discreteInputs != self.shadowDiscreteInputs) or (self.analogInputs != self.shadowAnalogInputs) or (self.readCoils != self.readShadowCoils)
 
     def hasPendingOutputChanges(self):
         return self.shadowCoils != self.coils
@@ -56,6 +58,8 @@ class ProcessImage(Condition):
     def setCoils(self, coils):
         if not self.initialized:
             raise NotInitializedException
+        self.readCoils = coils
+        if self.coils == []:
             self.coils = coils
 
     def setCoil(self, coilNum, value):
@@ -67,8 +71,8 @@ class ProcessImage(Condition):
     def getChangedCoils(self):
         if not self.initialized:
             raise NotInitializedException
-        changedCoils = zippingFilter(self.coils, self.shadowCoils)
-#        self.shadowCoils = self.coils
+        changedCoils = zippingFilter(self.coils, self.readCoils)
+        self.readShadowCoils = self.coils
         return changedCoils
     
     def getCoils(self):