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

wiringpi instead of wiringpi2

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2019-07-10 12:38:47 +02:00
parent 57c2c7251d
commit b63e513200
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/CommunicationProcessor.py
View File

@ -3,7 +3,7 @@ import datetime
import RS485Ext import RS485Ext
import RegisterDatapoint import RegisterDatapoint
from pymodbus.client.sync import ModbusSerialClient from pymodbus.client.sync import ModbusSerialClient
import wiringpi2 import wiringpi
ERROR_PIN = 29 ERROR_PIN = 29
@ -14,8 +14,8 @@ class CommunicationProcessor(threading.Thread):
self.config = config self.config = config
self.queue = queue self.queue = queue
self.pubQueue = pubQueue self.pubQueue = pubQueue
wiringpi2.wiringPiSetup() wiringpi.wiringPiSetup()
wiringpi2.pinMode(ERROR_PIN, wiringpi2.OUTPUT) wiringpi.pinMode(ERROR_PIN, wiringpi.OUTPUT)
self.daemon = True self.daemon = True
def __getSerial(self): def __getSerial(self):
@ -31,12 +31,12 @@ class CommunicationProcessor(threading.Thread):
while True: while True:
r = self.queue.get() r = self.queue.get()
try: try:
wiringpi2.digitalWrite(ERROR_PIN, wiringpi2.LOW) wiringpi.digitalWrite(ERROR_PIN, wiringpi.LOW)
print("Dequeued: {0!s}".format(r)) print("Dequeued: {0!s}".format(r))
r.enqueued = False r.enqueued = False
r.process(client, self.pubQueue) r.process(client, self.pubQueue)
except RegisterDatapoint.DatapointException as e: except RegisterDatapoint.DatapointException as e:
wiringpi2.digitalWrite(ERROR_PIN, wiringpi2.HIGH) wiringpi.digitalWrite(ERROR_PIN, wiringpi.HIGH)
print("ERROR when processing '{0}': {1!s}".format(r.label, e)) print("ERROR when processing '{0}': {1!s}".format(r.label, e))
if client.socket is None: if client.socket is None:
print("renew socket") print("renew socket")