From edeb4ea0f0d255de77b1223d28eed600de2728fe Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Wed, 10 Jul 2019 12:19:55 +0200 Subject: [PATCH] reset stats in separate function --- src/RegisterDatapoint.py | 9 ++++++--- src/master.py | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/RegisterDatapoint.py b/src/RegisterDatapoint.py index f70b3ba..589140f 100644 --- a/src/RegisterDatapoint.py +++ b/src/RegisterDatapoint.py @@ -170,14 +170,17 @@ class DiscreteInputDatapoint(ReadOnlyDatapoint): +def resetStatsRegisterList(registers): + for r in registers: + r.errorCount = 0 + r.processCount = 0 + r.enqueued = False + def checkRegisterList(registers): for r in registers: if not isinstance(r, AbstractModbusDatapoint): raise ValueError('Entry in register list {0!s} is not derived from class AbstractModbusDatapoint'.format(r)) else: - r.errorCount = 0 - r.processCount = 0 - r.enqueued = False print("Datapoint loaded: {0!s}".format(r)) diff --git a/src/master.py b/src/master.py index 46c82d4..e057aae 100644 --- a/src/master.py +++ b/src/master.py @@ -22,6 +22,7 @@ if __name__ == "__main__": with open(config.registerFile, 'rb') as f: datapoints = pickle.load(f) RegisterDatapoint.checkRegisterList(datapoints) + RegisterDatapoint.resetStatsRegisterList(datapoints) cp = CommunicationProcessor.CommunicationProcessor(config, queue, pubQueue) cp.start()