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

remove obsolete code

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2019-07-10 12:42:33 +02:00
parent b63e513200
commit 7c6ebd8d0c
1 changed files with 4 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/RegisterDatapoint.py
View File

@ -50,19 +50,10 @@ class HoldingRegisterDatapoint(AbstractModbusDatapoint):
self.writeRequestValue)) self.writeRequestValue))
def process(self, client, pubQueue): def process(self, client, pubQueue):
successFull = True
giveUp = False
if self.writeRequestValue: if self.writeRequestValue:
# perform write operation # perform write operation
print("Holding register, perform write operation") print("Holding register, perform write operation")
if successFull: self.writeRequestValue = None
# give feedback
self.writeRequestValue = None
else:
# retries handling
if giveUp:
# give negative feedback
self.writeRequestValue = None
else: else:
# perform read operation # perform read operation
print("Holding register, perform read operation") print("Holding register, perform read operation")
@ -75,15 +66,7 @@ class HoldingRegisterDatapoint(AbstractModbusDatapoint):
raise DatapointException(result) raise DatapointException(result)
print("{0}: {1!s}".format(self.label, result.registers)) print("{0}: {1!s}".format(self.label, result.registers))
pubQueue.put(MqttProcessor.PublishItem(self.publishTopic, str(result.registers))) pubQueue.put(MqttProcessor.PublishItem(self.publishTopic, str(result.registers)))
if successFull: self.lastContact = datetime.datetime.now()
self.lastContact = datetime.datetime.now()
# publish value
else:
# retries handling
if giveUp:
# backoff and availability handling
# give negative feedback
pass
def onMessage(self, value): def onMessage(self, value):
self.writeRequestValue = value self.writeRequestValue = value
@ -109,8 +92,6 @@ class InputRegisterDatapoint(ReadOnlyDatapoint):
self.type = 'input register' self.type = 'input register'
def process(self, client, pubQueue): def process(self, client, pubQueue):
successFull = True
giveUp = False
# perform read operation # perform read operation
print("Input register, perform read operation") print("Input register, perform read operation")
self.processCount += 1 self.processCount += 1
@ -124,16 +105,7 @@ class InputRegisterDatapoint(ReadOnlyDatapoint):
self.lastValue = result.registers self.lastValue = result.registers
print("{0}: {1!s}".format(self.label, result.registers)) print("{0}: {1!s}".format(self.label, result.registers))
pubQueue.put(MqttProcessor.PublishItem(self.publishTopic, str(result.registers))) pubQueue.put(MqttProcessor.PublishItem(self.publishTopic, str(result.registers)))
self.lastContact = datetime.datetime.now()
if successFull:
self.lastContact = datetime.datetime.now()
# publish value
else:
# retries handling
if giveUp:
# backoff and availability handling
# give negative feedback
pass
class DiscreteInputDatapoint(ReadOnlyDatapoint): class DiscreteInputDatapoint(ReadOnlyDatapoint):
@ -142,8 +114,6 @@ class DiscreteInputDatapoint(ReadOnlyDatapoint):
self.type = 'discrete input' self.type = 'discrete input'
def process(self, client, pubQueue): def process(self, client, pubQueue):
successFull = True
giveUp = False
# perform read operation # perform read operation
print("Discrete input, perform read operation") print("Discrete input, perform read operation")
self.processCount += 1 self.processCount += 1
@ -157,18 +127,7 @@ class DiscreteInputDatapoint(ReadOnlyDatapoint):
self.lastValue = result.bits self.lastValue = result.bits
print("{0}: {1!s}".format(self.label, result.bits)) print("{0}: {1!s}".format(self.label, result.bits))
pubQueue.put(MqttProcessor.PublishItem(self.publishTopic, str(result.bits))) pubQueue.put(MqttProcessor.PublishItem(self.publishTopic, str(result.bits)))
self.lastContact = datetime.datetime.now()
if successFull:
self.lastContact = datetime.datetime.now()
# publish value
else:
# retries handling
if giveUp:
# backoff and availability handling
# give negative feedback
pass
def checkRegisterList(registers, reset=False): def checkRegisterList(registers, reset=False):