diff --git a/src/CommunicationProcessor.py b/src/CommunicationProcessor.py index f2a03dc..53a18b8 100644 --- a/src/CommunicationProcessor.py +++ b/src/CommunicationProcessor.py @@ -6,6 +6,7 @@ from pymodbus.client.sync import ModbusSerialClient import wiringpi import MyRS485 import time +import logging ERROR_PIN = 29 @@ -19,6 +20,8 @@ class CommunicationProcessor(threading.Thread): wiringpi.wiringPiSetup() wiringpi.pinMode(ERROR_PIN, wiringpi.OUTPUT) self.daemon = True + logging.getLogger('pymodbus').setLevel(logging.ERROR) + def __getSerial(self): # return RS485Ext.RS485Ext(port=self.config.serialPort, baudrate=self.config.serialBaudRate, stopbits=1, diff --git a/src/RegisterDatapoint.py b/src/RegisterDatapoint.py index 667ab24..a930ed4 100644 --- a/src/RegisterDatapoint.py +++ b/src/RegisterDatapoint.py @@ -44,7 +44,6 @@ class HoldingRegisterDatapoint(AbstractModbusDatapoint): self.feedbackTopic = feedbackTopic self.writeRequestValue = None self.type = 'holding register' - self.logger = logging.getLogger('HoldingRegisterDatapoint') def __str__(self): return ("[{0!s}, publishTopic: {1}, subscribeTopic: {2}, feedbackTopic: {3}, " @@ -53,6 +52,7 @@ class HoldingRegisterDatapoint(AbstractModbusDatapoint): self.writeRequestValue)) def process(self, client, pubQueue): + self.logger = logging.getLogger('HoldingRegisterDatapoint') if self.writeRequestValue: # 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): super().__init__(label, unit, address, count, scanRate, updateOnly, publishTopic) self.type = 'input register' - self.logger = logging.getLogger('InputRegisterDatapoint') def process(self, client, pubQueue): + self.logger = logging.getLogger('InputRegisterDatapoint') # perform read operation self.logger.debug("Input register, perform read operation") 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): super().__init__(label, unit, address, count, scanRate, updateOnly, publishTopic) self.type = 'discrete input' - self.logger = logging.getLogger('DiscreteInputDatapoint') def process(self, client, pubQueue): + self.logger = logging.getLogger('DiscreteInputDatapoint') # perform read operation self.logger.debug("Discrete input, perform read operation") self.processCount += 1 diff --git a/src/registers.pkl b/src/registers.pkl index 21dd65d..7fd2742 100644 Binary files a/src/registers.pkl and b/src/registers.pkl differ