fix logging stuff
This commit is contained in:
@ -6,6 +6,7 @@ from pymodbus.client.sync import ModbusSerialClient
|
|||||||
import wiringpi
|
import wiringpi
|
||||||
import MyRS485
|
import MyRS485
|
||||||
import time
|
import time
|
||||||
|
import logging
|
||||||
|
|
||||||
|
|
||||||
ERROR_PIN = 29
|
ERROR_PIN = 29
|
||||||
@ -19,6 +20,8 @@ class CommunicationProcessor(threading.Thread):
|
|||||||
wiringpi.wiringPiSetup()
|
wiringpi.wiringPiSetup()
|
||||||
wiringpi.pinMode(ERROR_PIN, wiringpi.OUTPUT)
|
wiringpi.pinMode(ERROR_PIN, wiringpi.OUTPUT)
|
||||||
self.daemon = True
|
self.daemon = True
|
||||||
|
logging.getLogger('pymodbus').setLevel(logging.ERROR)
|
||||||
|
|
||||||
|
|
||||||
def __getSerial(self):
|
def __getSerial(self):
|
||||||
# return RS485Ext.RS485Ext(port=self.config.serialPort, baudrate=self.config.serialBaudRate, stopbits=1,
|
# return RS485Ext.RS485Ext(port=self.config.serialPort, baudrate=self.config.serialBaudRate, stopbits=1,
|
||||||
|
@ -44,7 +44,6 @@ class HoldingRegisterDatapoint(AbstractModbusDatapoint):
|
|||||||
self.feedbackTopic = feedbackTopic
|
self.feedbackTopic = feedbackTopic
|
||||||
self.writeRequestValue = None
|
self.writeRequestValue = None
|
||||||
self.type = 'holding register'
|
self.type = 'holding register'
|
||||||
self.logger = logging.getLogger('HoldingRegisterDatapoint')
|
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return ("[{0!s}, publishTopic: {1}, subscribeTopic: {2}, feedbackTopic: {3}, "
|
return ("[{0!s}, publishTopic: {1}, subscribeTopic: {2}, feedbackTopic: {3}, "
|
||||||
@ -53,6 +52,7 @@ class HoldingRegisterDatapoint(AbstractModbusDatapoint):
|
|||||||
self.writeRequestValue))
|
self.writeRequestValue))
|
||||||
|
|
||||||
def process(self, client, pubQueue):
|
def process(self, client, pubQueue):
|
||||||
|
self.logger = logging.getLogger('HoldingRegisterDatapoint')
|
||||||
if self.writeRequestValue:
|
if self.writeRequestValue:
|
||||||
# perform write operation
|
# perform write operation
|
||||||
self.logger.debug("Holding register, perform write operation")
|
self.logger.debug("Holding register, perform write operation")
|
||||||
@ -93,9 +93,9 @@ class InputRegisterDatapoint(ReadOnlyDatapoint):
|
|||||||
def __init__(self, label=None, unit=None, address=None, count=None, scanRate=None, updateOnly=None, publishTopic=None):
|
def __init__(self, label=None, unit=None, address=None, count=None, scanRate=None, updateOnly=None, publishTopic=None):
|
||||||
super().__init__(label, unit, address, count, scanRate, updateOnly, publishTopic)
|
super().__init__(label, unit, address, count, scanRate, updateOnly, publishTopic)
|
||||||
self.type = 'input register'
|
self.type = 'input register'
|
||||||
self.logger = logging.getLogger('InputRegisterDatapoint')
|
|
||||||
|
|
||||||
def process(self, client, pubQueue):
|
def process(self, client, pubQueue):
|
||||||
|
self.logger = logging.getLogger('InputRegisterDatapoint')
|
||||||
# perform read operation
|
# perform read operation
|
||||||
self.logger.debug("Input register, perform read operation")
|
self.logger.debug("Input register, perform read operation")
|
||||||
self.processCount += 1
|
self.processCount += 1
|
||||||
@ -116,9 +116,9 @@ class DiscreteInputDatapoint(ReadOnlyDatapoint):
|
|||||||
def __init__(self, label=None, unit=None, address=None, count=None, scanRate=None, updateOnly=None, publishTopic=None):
|
def __init__(self, label=None, unit=None, address=None, count=None, scanRate=None, updateOnly=None, publishTopic=None):
|
||||||
super().__init__(label, unit, address, count, scanRate, updateOnly, publishTopic)
|
super().__init__(label, unit, address, count, scanRate, updateOnly, publishTopic)
|
||||||
self.type = 'discrete input'
|
self.type = 'discrete input'
|
||||||
self.logger = logging.getLogger('DiscreteInputDatapoint')
|
|
||||||
|
|
||||||
def process(self, client, pubQueue):
|
def process(self, client, pubQueue):
|
||||||
|
self.logger = logging.getLogger('DiscreteInputDatapoint')
|
||||||
# perform read operation
|
# perform read operation
|
||||||
self.logger.debug("Discrete input, perform read operation")
|
self.logger.debug("Discrete input, perform read operation")
|
||||||
self.processCount += 1
|
self.processCount += 1
|
||||||
|
Binary file not shown.
Reference in New Issue
Block a user