sv/tsun-gen3-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log MQTT to data topic

Browse Source
This commit is contained in:
Stefan Allius
2024-05-22 22:53:04 +02:00
parent 55fc834a1e
commit 8fc5eb3670
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/modbus.py
View File

@@ -21,6 +21,7 @@ if __name__ == "app.src.modbus":
else: # pragma: no cover else: # pragma: no cover
from infos import Register from infos import Register
logger = logging.getLogger('data')
CRC_POLY = 0xA001 # (LSBF/reverse) CRC_POLY = 0xA001 # (LSBF/reverse)
CRC_INIT = 0xFFFF CRC_INIT = 0xFFFF
@@ -136,7 +137,7 @@ class Modbus():
# logging.info(f'recv_req: first byte modbus:{buf[0]} len:{len(buf)}') # logging.info(f'recv_req: first byte modbus:{buf[0]} len:{len(buf)}')
if not self.__check_crc(buf): if not self.__check_crc(buf):
self.err = 1 self.err = 1
logging.error('Modbus recv: CRC error') logger.error('Modbus recv: CRC error')
return False return False
self.que.put_nowait({'req': buf, self.que.put_nowait({'req': buf,
'rsp_hdl': rsp_handler}) 'rsp_hdl': rsp_handler})
@@ -166,23 +167,23 @@ class Modbus():
self.err = 5 self.err = 5
return return
if not self.__check_crc(buf): if not self.__check_crc(buf):
logging.error('Modbus resp: CRC error') logger.error('Modbus resp: CRC error')
self.err = 1 self.err = 1
return return
if buf[0] != self.last_addr: if buf[0] != self.last_addr:
logging.info(f'Modbus resp: Wrong addr {buf[0]}') logger.info(f'Modbus resp: Wrong addr {buf[0]}')
self.err = 2 self.err = 2
return return
fcode = buf[1] fcode = buf[1]
if fcode != self.last_fcode: if fcode != self.last_fcode:
logging.info(f'Modbus: Wrong fcode {fcode} != {self.last_fcode}') logger.info(f'Modbus: Wrong fcode {fcode} != {self.last_fcode}')
self.err = 3 self.err = 3
return return
if self.last_addr == self.INV_ADDR and \ if self.last_addr == self.INV_ADDR and \
(fcode == 3 or fcode == 4): (fcode == 3 or fcode == 4):
elmlen = buf[2] >> 1 elmlen = buf[2] >> 1
if elmlen != self.last_len: if elmlen != self.last_len:
logging.info(f'Modbus: len error {elmlen} != {self.last_len}') logger.info(f'Modbus: len error {elmlen} != {self.last_len}')
self.err = 4 self.err = 4
return return
first_reg = self.last_reg # save last_reg before sending next pdu first_reg = self.last_reg # save last_reg before sending next pdu
@@ -241,12 +242,12 @@ class Modbus():
self.req_pend = False self.req_pend = False
if self.retry_cnt < self.max_retries: if self.retry_cnt < self.max_retries:
logging.debug(f'Modbus retrans {self}') logger.debug(f'Modbus retrans {self}')
self.retry_cnt += 1 self.retry_cnt += 1
self.__start_timer() self.__start_timer()
self.snd_handler(self.last_req, state='Retrans') self.snd_handler(self.last_req, state='Retrans')
else: else:
logging.info(f'Modbus timeout {self}') logger.info(f'Modbus timeout {self}')
self.counter['timeouts'] += 1 self.counter['timeouts'] += 1
self.__send_next_from_que() self.__send_next_from_que()