From c1bb481caca0c18839e48e4e315438a2513c0da6 Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>
Date: Sun, 14 Jul 2019 00:24:03 +0200
Subject: [PATCH] update pickle file

---
 src/RegisterDatapoint.py  | 11 ++++++-----
 src/updateRegisterFile.py | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/RegisterDatapoint.py b/src/RegisterDatapoint.py
index 10a4f48..80450fe 100644
--- a/src/RegisterDatapoint.py
+++ b/src/RegisterDatapoint.py
@@ -8,7 +8,7 @@ import logging
 class DatapointException(Exception): pass
 
 class AbstractModbusDatapoint(object):
-    def __init__(self, label, unit, address, count, scanRate):
+    def __init__(self, label=None, unit=None, address=None, count=None, scanRate=None):
         self.label = label
         self.unit = unit
         self.address = address
@@ -36,7 +36,8 @@ class AbstractModbusDatapoint(object):
 
 
 class HoldingRegisterDatapoint(AbstractModbusDatapoint):
-    def __init__(self, label, unit, address, count, scanRate, publishTopic, subscribeTopic, feedbackTopic):
+    def __init__(self, label=None, unit=None, address=None, count=None, scanRate=None, 
+                 publishTopic=None, subscribeTopic=None, feedbackTopic=None):
         super().__init__(label, unit, address, count, scanRate)
         self.publishTopic = publishTopic
         self.subscribeTopic = subscribeTopic
@@ -75,7 +76,7 @@ class HoldingRegisterDatapoint(AbstractModbusDatapoint):
 
 
 class ReadOnlyDatapoint(AbstractModbusDatapoint):
-    def __init__(self, label, unit, address, count, scanRate, updateOnly, publishTopic):
+    def __init__(self, label=None, unit=None, address=None, count=None, scanRate=None, updateOnly=None, publishTopic=None):
         super().__init__(label, unit, address, count, scanRate)
         self.updateOnly = updateOnly
         self.lastValue = None
@@ -89,7 +90,7 @@ class ReadOnlyDatapoint(AbstractModbusDatapoint):
 
 
 class InputRegisterDatapoint(ReadOnlyDatapoint):
-    def __init__(self, label, unit, address, count, scanRate, updateOnly, publishTopic):
+    def __init__(self, label=None, unit=None, address=None, count=None, scanRate=None, updateOnly=None, publishTopic=None):
         super().__init__(label, unit, address, count, scanRate, updateOnly, publishTopic)
         self.type = 'input register'
         self.logger = logging.getLogger('InputRegisterDatapoint')
@@ -112,7 +113,7 @@ class InputRegisterDatapoint(ReadOnlyDatapoint):
 
 
 class DiscreteInputDatapoint(ReadOnlyDatapoint):
-    def __init__(self, label, unit, address, count, scanRate, updateOnly, publishTopic):
+    def __init__(self, label=None, unit=None, address=None, count=None, scanRate=None, updateOnly=None, publishTopic=None):
         super().__init__(label, unit, address, count, scanRate, updateOnly, publishTopic)
         self.type = 'discrete input'
         self.logger = logging.getLogger('DiscreteInputDatapoint')
diff --git a/src/updateRegisterFile.py b/src/updateRegisterFile.py
index 9a7c757..8ad9eef 100644
--- a/src/updateRegisterFile.py
+++ b/src/updateRegisterFile.py
@@ -7,3 +7,18 @@ import pickle
 with open('registers.pkl', 'rb') as f:
     datapoints = pickle.load(f)
 
+RegisterDatapoint.checkRegisterList(datapoints, reset=True)
+
+newDatapoints = []
+for dp in datapoints:
+    ndp = type(dp)()
+    for k,v in dp.__dict__.items():
+        ndp.__dict__[k] = v
+    newDatapoints.append(ndp)
+
+RegisterDatapoint.checkRegisterList(newDatapoints, reset=True)
+
+with open('registers.pkl', 'wb') as f:
+    pickle.dump(newDatapoints, f)
+
+