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

improve bit output

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2019-07-17 12:18:48 +02:00
parent 0bae0f4bb2
commit bf3475a796
Signed by: wn
GPG Key ID: 6C1E5E531E0D5D7F
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/RegisterDatapoint.py
View File

@ -111,7 +111,8 @@ class ReadOnlyDatapoint(AbstractModbusDatapoint):
class InputRegisterDatapoint(ReadOnlyDatapoint): class InputRegisterDatapoint(ReadOnlyDatapoint):
def __init__(self, label=None, unit=None, address=None, count=None, scanRate=None, updateOnly=None, publishTopic=None, converter=None): def __init__(self, label=None, unit=None, address=None, count=None, scanRate=None, updateOnly=None,
publishTopic=None, converter=None):
super().__init__(label, unit, address, count, scanRate, updateOnly, publishTopic, converter) super().__init__(label, unit, address, count, scanRate, updateOnly, publishTopic, converter)
self.type = 'input register' self.type = 'input register'
@ -143,9 +144,11 @@ class InputRegisterDatapoint(ReadOnlyDatapoint):
class DiscreteInputDatapoint(ReadOnlyDatapoint): class DiscreteInputDatapoint(ReadOnlyDatapoint):
def __init__(self, label=None, unit=None, address=None, count=None, scanRate=None, updateOnly=None, publishTopic=None, converter=None): def __init__(self, label=None, unit=None, address=None, count=None, scanRate=None, updateOnly=None,
publishTopic=None, converter=None, bitCount=8):
super().__init__(label, unit, address, count, scanRate, updateOnly, publishTopic, converter) super().__init__(label, unit, address, count, scanRate, updateOnly, publishTopic, converter)
self.type = 'discrete input' self.type = 'discrete input'
self.bitCount = bitCount
def process(self, client, pubQueue): def process(self, client, pubQueue):
logger = logging.getLogger('DiscreteInputDatapoint') logger = logging.getLogger('DiscreteInputDatapoint')
@ -161,7 +164,8 @@ class DiscreteInputDatapoint(ReadOnlyDatapoint):
if not self.updateOnly or (result.bits != self.lastValue): if not self.updateOnly or (result.bits != self.lastValue):
self.lastValue = result.bits self.lastValue = result.bits
logger.debug("{0}: {1!s}".format(self.label, result.bits)) logger.debug("{0}: {1!s}".format(self.label, result.bits))
pubQueue.put(MqttProcessor.PublishItem(self.publishTopic, str(result.bits))) for i in range(self.bitCount):
pubQueue.put(MqttProcessor.PublishItem("{0}/{1}".format(self.publishTopic, i), str(result.getBit(i))))
self.lastContact = datetime.datetime.now() self.lastContact = datetime.datetime.now()