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

drop publishTopic from coil

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

3
src/CmdServer.py
View File

@ -117,7 +117,6 @@ class CmdInterpreter(cmd.Cmd):
self.__println("Label: {0}".format(label))
self.__println("Unit: {0}".format(unit))
self.__println("Address: {0}".format(address))
self.__println("ScanRate: {0}".format(scanrate))
self.__println("ReadTopic: {0}".format(readTopic))
self.__println("WriteTopic: {0}".format(writeTopic))
self.__println("FeedbackTopic: {0}".format(feedbackTopic))
@ -130,7 +129,7 @@ class CmdInterpreter(cmd.Cmd):
feedbackTopic = None
unit = parseIntArbitraryBase(unit)
address = parseIntArbitraryBase(address)
scanrate = float(scanrate)
scanrate = 0.0
r = RegisterDatapoint.CoilDatapoint(label=label,
unit=unit,
address=address,

26
src/RegisterDatapoint.py
View File

@ -116,11 +116,10 @@ class HoldingRegisterDatapoint(AbstractModbusDatapoint):
class CoilDatapoint(AbstractModbusDatapoint):
def __init__(self, label=None, unit=None, address=None, scanRate=None, publishTopic=None, subscribeTopic=None,
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','publishTopic', 'subscribeTopic', 'feedbackTopic']
self.publishTopic = publishTopic
self.argList = ['label', 'unit','address','scanRate','subscribeTopic', 'feedbackTopic']
self.subscribeTopic = subscribeTopic
self.feedbackTopic = feedbackTopic
self.writeRequestValue = None
@ -129,11 +128,11 @@ class CoilDatapoint(AbstractModbusDatapoint):
def __str__(self):
return ("{0}, {1}: unit: {2}, address: {3}, scanRate: {4}, "
"enqueued: {5}, lastContact: {6}, errorCount: {7}, readCount: {8}, "
"writeCount: {9}, publishTopic: {10}, subscribeTopic: {11}, feedbackTopic: {12}"
"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.publishTopic, self.subscribeTopic, self.feedbackTopic))
self.subscribeTopic, self.feedbackTopic))
def onMessage(self, value):
self.writeRequestValue = value.decode()
@ -157,21 +156,12 @@ class CoilDatapoint(AbstractModbusDatapoint):
unit=self.unit,
value=value)
logger.debug("Write result: {0!s}".format(result))
if self.feedbackTopic:
pubQueue.put(MqttProcessor.PublishItem(self.feedbackTopic, str(value)))
self.writeRequestValue = None
else:
# perform read operation
logger.debug("Coil, perform read operation")
self.readCount += 1
result = client.read_coils(address=self.address,
unit=self.unit)
if type(result) in [ExceptionResponse, ModbusIOException]:
self.errorCount += 1
raise DatapointException(result)
logger.debug("{0}: {1!s}".format(self.label, result.getBit(0)))
value = result.getBit(0)
if self.publishTopic:
pubQueue.put(MqttProcessor.PublishItem(self.publishTopic, str(value)))
self.lastContact = datetime.datetime.now()
# no write op, strange
logger.debug("Coil, process call but no write value available, strange")
class ReadOnlyDatapoint(AbstractModbusDatapoint):