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

code style

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2019-09-14 22:10:09 +02:00
parent de7a3fb0da
commit 4e422223bd
Signed by: wn
GPG Key ID: 6C1E5E531E0D5D7F
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/CmdServer.py
View File

@ -134,11 +134,11 @@ class CmdInterpreter(cmd.Cmd):
unit = parseIntArbitraryBase(unit) unit = parseIntArbitraryBase(unit)
address = parseIntArbitraryBase(address) address = parseIntArbitraryBase(address)
scanrate = 0.0 scanrate = 0.0
r = RegisterDatapoint.CoilDatapoint(label=label, r = RegisterDatapoint.CoilDatapoint(label=label,
unit=unit, unit=unit,
address=address, address=address,
scanRate=datetime.timedelta(seconds=scanrate), scanRate=datetime.timedelta(seconds=scanrate),
subscribeTopic=writeTopic, subscribeTopic=writeTopic,
feedbackTopic=feedbackTopic) feedbackTopic=feedbackTopic)
self.registers.append(r) self.registers.append(r)
except ValueError as e: except ValueError as e:

6
src/RegisterDatapoint.py
View File

@ -121,7 +121,7 @@ class CoilDatapoint(AbstractModbusDatapoint):
def __init__(self, label=None, unit=None, address=None, scanRate=None, subscribeTopic=None, def __init__(self, label=None, unit=None, address=None, scanRate=None, subscribeTopic=None,
feedbackTopic=None): feedbackTopic=None):
super().__init__(label, unit, address, 1, scanRate, 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.subscribeTopic = subscribeTopic
self.feedbackTopic = feedbackTopic self.feedbackTopic = feedbackTopic
self.writeRequestValue = None self.writeRequestValue = None
@ -133,7 +133,7 @@ class CoilDatapoint(AbstractModbusDatapoint):
"writeCount: {9}, subscribeTopic: {10}, feedbackTopic: {11}" "writeCount: {9}, subscribeTopic: {10}, feedbackTopic: {11}"
.format(self.type, self.label, self.unit, self.address, .format(self.type, self.label, self.unit, self.address,
self.scanRate, self.enqueued, self.lastContact, self.scanRate, self.enqueued, self.lastContact,
self.errorCount, self.readCount, self.writeCount, self.errorCount, self.readCount, self.writeCount,
self.subscribeTopic, self.feedbackTopic)) self.subscribeTopic, self.feedbackTopic))
def onMessage(self, value): def onMessage(self, value):
@ -157,7 +157,7 @@ class CoilDatapoint(AbstractModbusDatapoint):
result = client.write_coil(address=self.address, result = client.write_coil(address=self.address,
unit=self.unit, unit=self.unit,
value=value) value=value)
logger.debug("Write result: {0!s}".format(result)) logger.debug("Write result: {0!s}".format(result))
if self.feedbackTopic: if self.feedbackTopic:
pubQueue.put(MqttProcessor.PublishItem(self.feedbackTopic, str(value))) pubQueue.put(MqttProcessor.PublishItem(self.feedbackTopic, str(value)))
self.writeRequestValue = None self.writeRequestValue = None