From 58467d9c9d9d61814c6b7034c44e45e1993af139 Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>
Date: Mon, 8 Jul 2019 14:36:47 +0100
Subject: [PATCH] changes

---
 src/CommunicationProcessor.py |   4 ++--
 src/Config.py                 |   2 +-
 src/initialRegisterFile.py    |  11 ++---------
 src/registers.pkl             | Bin 1127 -> 401 bytes
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/CommunicationProcessor.py b/src/CommunicationProcessor.py
index c479e87..2f6941a 100644
--- a/src/CommunicationProcessor.py
+++ b/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()
 
 
 
diff --git a/src/Config.py b/src/Config.py
index 3356973..89cd369 100644
--- a/src/Config.py
+++ b/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 = ''
diff --git a/src/initialRegisterFile.py b/src/initialRegisterFile.py
index 4687789..c94756f 100644
--- a/src/initialRegisterFile.py
+++ b/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'),
 ]
 
 
diff --git a/src/registers.pkl b/src/registers.pkl
index c7688dff61ef18ef966891d04d493aa5680f6af6..4a270f1ba0228077c75402786de4acf8ec78cf93 100644
GIT binary patch
literal 401
zcmZWlJx{|h5KTYQmZWXUH*Ab$fgb?_C{l%@4qh0X<iuG@9G`O@I#hxQ^<U#es6t}#
z>Aib*@0~wK?-Z<y3_euLV4o#R(<sf+t2U1R(=@pMqT!xKYcURjz-h%aPD2rUP|22`
z8qKm`3O9Y9cLr!8mcFaHg?IMXh^AuhN#pWLwYY7JDrhDWPrbSPaSOEpE7@6~6A^m0
zXq;w>(m{_ZnL|Z!@A_9e7c;K~O%5ECv^ezGSk+j?J6ihjsTatyw9vMcc-#%Nh18j3
zpjA=&!m5U-drGKSMs%76=^zch=`5pjmt*$@7kj!~qrV)(4Nh>1v;Lkg{EMqq+1Xv8
d&x>(yaU`#CaX=pglXQqHJnp{9=+@=%@B>AJbE*IU

literal 1127
zcmZ{jSx?(Q5XT(|F@z)#j?laA9eO}1y-(Uu8X6Iy6+(Wg)V00MT6JuXy{jq@k=lo-
z;=SLnU!=3fxe7e^+V%YZznPu+Ir#;&s!dqSjRlLgsi0xt`XXNsJjeB0CpRFo`U@ty
zFj+OHG)?oU#XQKGI=&wUo}euTQ)U*wr0)vIH8RN-b)1OBG3a}mk;K`7^aV^eCd_I4
zH@2xys9-Q-JNOW8o8{HbVW^mgd_!yC^&4gh6cTaK2^kd4d5q=9q(+qH0Hs8d`5>8O
z4$K`T-(lnikt;edk4OcK3#H|`F+T`G*M_n=i%a{`TJI;ZV3rh^v|>AQEq46dV$&?*
z>Nmz5i`w6h7nho585e(`IwK5SV{u45$zZvesCqOOwZIqD7El@HH%Js#YI*&yK3$qB
z<aS$dt_SA{T#y!5mA=@8OI4mVXV76MQtH0lfy*2V%k@3O;8;RF!v__*Lf|Sd@)Dmr
z;+QEfC%`JPVYI;)n|!Ismz%u8$IY+x;5vaDsrk(=+*0Q1aBDJ(7#`W})cWfQ>pKLh
z<JSF}_G4GiHon_~dj#&M#t*u%ri_=+n6MaollnF@YMlB$^NbBxM~VrqH?kx7XH<tg
zB(O0KQ9%ur|4=8D*?>o<@|1IA6E=JBn81^i=V=$7DV}B2I$-UPMO4UW6zF*hRQMn0
z1%a32Kr1QGh|qxO)!9U^d+>(9TWOs#t-F3G#VND;4m)V83-1-XnzOoWyN()y4~VN{
z{W6G~N&83pyj7gU64nT8^J3EeuF@S&*2iI2sR>e59VqUM_R>Ob{||iXL7l*^wAk7|
Dg*reR