From b9e0fefe17a7fe9ea70fa7766624f1efd9bb6904 Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <w.hottgenroth@krohne.com>
Date: Wed, 17 Jul 2019 11:51:15 +0200
Subject: [PATCH] introduce converter stuff

---
 src/Converters.py        | 11 +++++++++++
 src/RegisterDatapoint.py | 22 ++++++++++++++++------
 src/registers.json       |  2 ++
 3 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 src/Converters.py

diff --git a/src/Converters.py b/src/Converters.py
new file mode 100644
index 0000000..a79af12
--- /dev/null
+++ b/src/Converters.py
@@ -0,0 +1,11 @@
+# in:  from Modbus to MQTT, input is a list of 16bit integers, output shall be the desired format 
+#      to be sent in the MQTT message
+# out: from MQTT to Modbus, input is the format received from MQTT, output shall be a list of 
+#      16bit integers to be written to the Modbus slave
+
+Converters = {
+    "dht20TOFloat": {
+        "in": lambda x : float(x[0]) / 10.0,
+        "out": None
+    }
+}
\ No newline at end of file
diff --git a/src/RegisterDatapoint.py b/src/RegisterDatapoint.py
index e0033d6..2d93ee0 100644
--- a/src/RegisterDatapoint.py
+++ b/src/RegisterDatapoint.py
@@ -4,17 +4,18 @@ from pymodbus.exceptions import ModbusIOException
 import MqttProcessor
 import logging
 import json
-
+import Converters
 
 class DatapointException(Exception): pass
 
 class AbstractModbusDatapoint(object):
-    def __init__(self, label=None, unit=None, address=None, count=None, scanRate=None):
+    def __init__(self, label=None, unit=None, address=None, count=None, scanRate=None, converter=None):
         self.argList = ['label', 'unit', 'address', 'count', 'scanRate']
         self.label = label
         self.unit = unit
         self.address = address
         self.count = count
+        self.converter = None
         if type(scanRate) == float:
             self.scanRate = datetime.timedelta(seconds=scanRate)
         else:
@@ -31,10 +32,11 @@ class AbstractModbusDatapoint(object):
 
     def __str__(self):
         return ("{0}, {1}: unit: {2},  address: {3}, count: {4}, scanRate: {5}, "
-                "enqueued: {6}, lastContact: {7}, errorCount: {8}, processCount: {9}"
+                "enqueued: {6}, lastContact: {7}, errorCount: {8}, processCount: {9}, "
+                "converter: {10}"
                 .format(self.type, self.label, self.unit, self.address, self.count,
                         self.scanRate, self.enqueued, self.lastContact,
-                        self.errorCount, self.processCount))
+                        self.errorCount, self.processCount, self.converter))
 
     def jsonify(self):
         return {'type':self.__class__.__name__, 
@@ -126,8 +128,16 @@ class InputRegisterDatapoint(ReadOnlyDatapoint):
             raise DatapointException(result)
         if not self.updateOnly or (result.registers != self.lastValue):
             self.lastValue = result.registers
-            logger.debug("{0}: {1!s}".format(self.label, result.registers))        
-            pubQueue.put(MqttProcessor.PublishItem(self.publishTopic, str(result.registers)))
+            logger.debug("{0}: {1!s}".format(self.label, result.registers))
+            value = None
+            if Converters.Converters[self.converter]['in']:
+                try:
+                    value = Converters.Converters[self.converter]['in'](result.registers)
+                except Exception as e:
+                    raise DatapointException("Exception caught when trying to converter modbus data: {0!s}".format(e))
+            else:
+                value = result.registers
+            pubQueue.put(MqttProcessor.PublishItem(self.publishTopic, str(value)))
         self.lastContact = datetime.datetime.now()
 
 
diff --git a/src/registers.json b/src/registers.json
index 3d594bc..89c4317 100644
--- a/src/registers.json
+++ b/src/registers.json
@@ -4,6 +4,7 @@
             "address": 1,
             "count": 1,
             "label": "Temperature",
+            "converter": "dht20TOFloat",
             "publishTopic": "Pub/Temperature",
             "scanRate": null,
             "unit": 5,
@@ -16,6 +17,7 @@
             "address": 2,
             "count": 1,
             "label": "Humidity",
+            "converter": "dht20TOFloat",
             "publishTopic": "Pub/Humidity",
             "scanRate": null,
             "unit": 5,