From 4e422223bd3095cb56ccae97316d7a475e20ef0b Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Sat, 14 Sep 2019 22:10:09 +0200 Subject: [PATCH] code style --- src/CmdServer.py | 10 +++++----- src/RegisterDatapoint.py | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/CmdServer.py b/src/CmdServer.py index c7b0956..138299f 100644 --- a/src/CmdServer.py +++ b/src/CmdServer.py @@ -134,11 +134,11 @@ class CmdInterpreter(cmd.Cmd): unit = parseIntArbitraryBase(unit) address = parseIntArbitraryBase(address) scanrate = 0.0 - r = RegisterDatapoint.CoilDatapoint(label=label, - unit=unit, - address=address, - scanRate=datetime.timedelta(seconds=scanrate), - subscribeTopic=writeTopic, + r = RegisterDatapoint.CoilDatapoint(label=label, + unit=unit, + address=address, + scanRate=datetime.timedelta(seconds=scanrate), + subscribeTopic=writeTopic, feedbackTopic=feedbackTopic) self.registers.append(r) except ValueError as e: diff --git a/src/RegisterDatapoint.py b/src/RegisterDatapoint.py index 27bdf56..52a4936 100644 --- a/src/RegisterDatapoint.py +++ b/src/RegisterDatapoint.py @@ -121,7 +121,7 @@ class CoilDatapoint(AbstractModbusDatapoint): def __init__(self, label=None, unit=None, address=None, scanRate=None, subscribeTopic=None, feedbackTopic=None): super().__init__(label, unit, address, 1, scanRate, None) - self.argList = ['label', 'unit','address','scanRate','subscribeTopic', 'feedbackTopic'] + self.argList = ['label', 'unit', 'address', 'scanRate', 'subscribeTopic', 'feedbackTopic'] self.subscribeTopic = subscribeTopic self.feedbackTopic = feedbackTopic self.writeRequestValue = None @@ -133,7 +133,7 @@ class CoilDatapoint(AbstractModbusDatapoint): "writeCount: {9}, subscribeTopic: {10}, feedbackTopic: {11}" .format(self.type, self.label, self.unit, self.address, self.scanRate, self.enqueued, self.lastContact, - self.errorCount, self.readCount, self.writeCount, + self.errorCount, self.readCount, self.writeCount, self.subscribeTopic, self.feedbackTopic)) def onMessage(self, value): @@ -157,7 +157,7 @@ class CoilDatapoint(AbstractModbusDatapoint): result = client.write_coil(address=self.address, unit=self.unit, value=value) - logger.debug("Write result: {0!s}".format(result)) + logger.debug("Write result: {0!s}".format(result)) if self.feedbackTopic: pubQueue.put(MqttProcessor.PublishItem(self.feedbackTopic, str(value))) self.writeRequestValue = None