From 1658036a261781225b3a72e8397fba0a4e538e36 Mon Sep 17 00:00:00 2001 From: Stefan Allius Date: Sun, 12 May 2024 23:09:51 +0200 Subject: [PATCH] store modbus params always on the server side --- app/src/gen3/talent.py | 10 +++++----- app/src/gen3plus/solarman_v5.py | 9 +++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/src/gen3/talent.py b/app/src/gen3/talent.py index f82f47c..c007295 100644 --- a/app/src/gen3/talent.py +++ b/app/src/gen3/talent.py @@ -392,11 +392,11 @@ class Talent(Message): self.header_len+self.data_len] if self.ctrl.is_req(): - if not self.mb.recv_req(data[hdr_len:]): - return - - self.forward_modbus_resp = True - self.inc_counter('Modbus_Command') + if not self.remoteStream.mb.recv_req(data[hdr_len:]): + self.inc_counter('Invalid_Msg_Format') + else: + self.inc_counter('Modbus_Command') + self.remoteStream.forward_modbus_resp = True elif self.ctrl.is_ind(): # logger.debug(f'Modbus Ind MsgLen: {modbus_len}') self.modbus_elms = 0 diff --git a/app/src/gen3plus/solarman_v5.py b/app/src/gen3plus/solarman_v5.py index a766ce8..8e926ac 100644 --- a/app/src/gen3plus/solarman_v5.py +++ b/app/src/gen3plus/solarman_v5.py @@ -427,10 +427,11 @@ class SolarmanV5(Message): if ftype == self.AT_CMD: self.inc_counter('AT_Command') elif ftype == self.MB_RTU_CMD: - if not self.mb.recv_req(data[15:]): - return - self.forward_modbus_resp = True - self.inc_counter('Modbus_Command') + if not self.remoteStream.mb.recv_req(data[15:]): + self.inc_counter('Invalid_Msg_Format') + else: + self.inc_counter('Modbus_Command') + self.remoteStream.forward_modbus_resp = True self.__forward_msg() # self.__send_ack_rsp(0x1510, ftype)