wn/modbusmaster
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update pickle file

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2019-07-14 00:24:03 +02:00
parent c3cd27261d
commit c1bb481cac
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/RegisterDatapoint.py
View File

@ -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')

15
src/updateRegisterFile.py
View File

@ -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)