read coils 5

.woodpecker.yml

@@ -2,23 +2,23 @@ steps:
   build:
     image: plugins/kaniko
     settings:
-      repo: gitea.hottis.de/wn/pv-controller
+      repo: gitea.hottis.de/wn/digitaltwin1
       registry: 
-        from_secret: container_registry
+        from_secret: local_registry
-      tags: latest,${CI_COMMIT_SHA},${CI_COMMIT_TAG}
+      tags: latest,${CI_COMMIT_TAG}
       username: 
-        from_secret: container_registry_username
+        from_secret: local_username
       password: 
-        from_secret: container_registry_password
+        from_secret: local_password
       dockerfile: Dockerfile
     when:
-      - event: [push, tag]
+      - event: tag
 
   deploy:
     image: portainer/kubectl-shell:latest
-    secrets:
+    environment:
-      - source: kube_config
+      KUBE_CONFIG_CONTENT:
-        target: KUBE_CONFIG_CONTENT
+        from_secret: kube_config
     commands:
       - export IMAGE_TAG=$CI_COMMIT_TAG
       - printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig
@@ -27,3 +27,4 @@ steps:
     when:
       - event: tag
 
+

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 \

deployment/install-yml.tmpl

@@ -12,11 +12,12 @@ data:
   MQTT__BROKER: "emqx01-anonymous-cluster-internal.broker.svc.cluster.local"
   MQTT__DIGITALOUTPUTTOPICPREFIX: "dt1/coil"
   MQTT__DIGITALINPUTTOPICPREFIX: "dt1/di"
+  MQTT__COILINPUTTOPICPREFIX: "dt1/ci"
   MQTT__ANALOGINPUTEVENTTOPICPREFIX: "dt1/ai/event"
   MQTT__ANALOGINPUTPERIODICTOPICPREFIX: "dt1/ai/periodic"
-  MQTT__ANALOGPUBLISHPERIOD: "10.0"
+  MQTT__ANALOGINPUTPUBLISHPERIOD: "60.0"
   MQTT__DISABLEANALOGINPUTEVENTPUBLISHING: "true"
-  MODBUS__CLIENT: "172.16.2.157"
+  MODBUS__CLIENT: "172.16.2.31"
   MODBUS__SCANRATE: "0.25"
 ---
 apiVersion: apps/v1

src/ModbusHandler.py

@@ -1,4 +1,4 @@
-from pymodbus.client.sync import ModbusTcpClient as ModbusClient
+from pymodbus.client import ModbusTcpClient as ModbusClient
 from pymodbus.exceptions import ModbusIOException
 from time import sleep
 import threading
@@ -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/MqttEventPublisher.py

@@ -22,6 +22,7 @@ class MqttEventPublisher(AbstractMqttPublisher):
                     continue
 
                 discreteInputChangeset = self.processImage.getChangedDiscreteInputs()
+                coilInputChangeset = self.processImage.getChangedCoils()
                 if not self.disableAnalogInputEventPublishing:
                     analogInputChangeset = self.processImage.getChangedAnalogsInputs()
 
@@ -34,6 +35,15 @@ class MqttEventPublisher(AbstractMqttPublisher):
                                     str(discreteInputChangeItem[1][0]),
                                     retain=True)
 
+            for coilInputChangeItem in coilInputChangeset:
+                logger.debug("Coil input {} changed from {} to {}"
+                               .format(coilInputChangeItem[0],
+                                       coilInputChangeItem[1][1],
+                                       coilInputChangeItem[1][0]))
+                self.client.publish("{}/{}".format(self.config["coilInputTopicPrefix"], str(coilInputChangeItem[0])),
+                                    str(coilInputChangeItem[1][0]),
+                                    retain=True)
+
             if not self.disableAnalogInputEventPublishing:
                 for analogInputChangeItem in analogInputChangeset:
                     logger.debug("Analog input {} changed from {} to {}"

src/ProcessImage.py

@@ -64,12 +64,12 @@ class ProcessImage(Condition):
         self.coils[coilNum] = value
         self.coilEvent.set()
 
-#    def getChangedCoils(self):
+    def getChangedCoils(self):
-#        if not self.initialized:
+        if not self.initialized:
-#            raise NotInitializedException
+            raise NotInitializedException
-#        changedCoils = zippingFilter(self.coils, self.shadowCoils)
+        changedCoils = zippingFilter(self.coils, self.shadowCoils)
 #        self.shadowCoils = self.coils
-#        return changedCoils
+        return changedCoils
     
     def getCoils(self):
         if not self.initialized:

src/config.py

@@ -4,8 +4,9 @@ from loguru import logger
 class Config:
     OPTIONS = {
             'mqtt': [ 'broker', 
+                      'digitalOutputTopicPrefix', 
                       'digitalInputTopicPrefix', 
-                      'digitalInputTopicPrefix', 
+                      'coilInputTopicPrefix',
                       'analogInputEventTopicPrefix', 
                       'analogInputPeriodicTopicPrefix', 
                       'analogInputPublishPeriod',