changes

src/CommunicationProcessor.py

@@ -18,7 +18,7 @@ class CommunicationProcessor(threading.Thread):
 
     def run(self):
         client = ModbusSerialClient(method='rtu')
-        client.socket = self.getSerial()
+        client.socket = self.__getSerial()
         client.connect()
 
         while True:
@@ -31,7 +31,7 @@ class CommunicationProcessor(threading.Thread):
                 print("ERROR when processing '{0}': {1!s}".format(r.label, e))
                 if client.socket is None:
                     print("renew socket")
-                    client.socket = self.getSerial()
+                    client.socket = self.__getSerial()
 
 
 

src/Config.py

@@ -1,7 +1,7 @@
 
 class Config(object):
     def __init__(self):
-        self.mqttBrokerHost = '127.0.0.1'
+        self.mqttBrokerHost = '172.16.2.16'
         self.mqttBrokerPort = 1883
         self.mqttLogin = ''
         self.mqttPassword = ''

src/initialRegisterFile.py

@@ -4,15 +4,8 @@ import pickle
 
 
 datapoints = [
-    RegisterDatapoint.HoldingRegisterDatapoint('Voltage', 1, 0x2000, 2, datetime.timedelta(seconds=10), 'Pub/Voltage', None, None),
-    RegisterDatapoint.HoldingRegisterDatapoint('Frequency', 1, 0x2020, 2, datetime.timedelta(seconds=10), 'Pub/Frequency', None, None),
-    RegisterDatapoint.HoldingRegisterDatapoint('Current', 1, 0x2060, 2, datetime.timedelta(seconds=10), 'Pub/Current', None, None),
-    RegisterDatapoint.HoldingRegisterDatapoint('Resistance Channel 1', 2, 0x0004, 2, datetime.timedelta(seconds=1), 'Pub/ResistanceChannel1', None, None),
-    RegisterDatapoint.HoldingRegisterDatapoint('Temperature Channel 1', 2, 0x000c, 2, datetime.timedelta(seconds=1), 'Pub/TemperatureChannel1', None, None),
-    RegisterDatapoint.HoldingRegisterDatapoint('Resistance Channel 2', 2, 0x0014, 2, datetime.timedelta(seconds=1), 'Pub/ResistanceChannel2', None, None),
-    RegisterDatapoint.HoldingRegisterDatapoint('Temperature Channel 2', 2, 0x001c, 2, datetime.timedelta(seconds=1), 'Pub/TemperatureChannel2', None, None),
-    RegisterDatapoint.HoldingRegisterDatapoint('Relay1', 5, 0x0001, 1, None, None, 'Sub/Relay1', 'Feedback/Relay1'),
-    RegisterDatapoint.InputRegisterDatapoint('Humidity 1', 6, 0x0001, 1, datetime.timedelta(seconds=1), 'Pub/Humidity1'),
+    RegisterDatapoint.InputRegisterDatapoint('Temperature', 5, 0x0001, 1, datetime.timedelta(seconds=1), 'Pub/Temperature'),
+    RegisterDatapoint.InputRegisterDatapoint('Humidity', 5, 0x0002, 1, datetime.timedelta(seconds=1), 'Pub/Humidity'),
 ]