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

fix Modbus CRC errors

Browse Source 
- parse Modbus messages well if another msg
  follows in the receive buffer
This commit is contained in:
Stefan Allius
2024-05-11 20:46:36 +02:00
parent 26f108cc51
commit 0e7fbc7820
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/gen3plus/solarman_v5.py
View File

@@ -419,22 +419,24 @@ class SolarmanV5(Message):
self.__send_ack_rsp(0x1310, ftype) self.__send_ack_rsp(0x1310, ftype)
def msg_command_req(self): def msg_command_req(self):
data = self._recv_buffer[self.header_len:] data = self._recv_buffer[self.header_len:
self.header_len+self.data_len]
result = struct.unpack_from('<B', data, 0) result = struct.unpack_from('<B', data, 0)
ftype = result[0] ftype = result[0]
if ftype == self.AT_CMD: if ftype == self.AT_CMD:
self.inc_counter('AT_Command') self.inc_counter('AT_Command')
elif ftype == self.MB_RTU_CMD: elif ftype == self.MB_RTU_CMD:
if not self.mb.recv_req(data[15:-2]): if not self.mb.recv_req(data[15:]):
return return
self.forward_modbus_resp = True self.forward_modbus_resp = True
self.inc_counter('Modbus_Command') self.inc_counter('Modbus_Command')
self.__forward_msg() self.__forward_msg()
self.__send_ack_rsp(0x1510, ftype) # self.__send_ack_rsp(0x1510, ftype)
def msg_command_rsp(self): def msg_command_rsp(self):
data = self._recv_buffer[self.header_len:] data = self._recv_buffer[self.header_len:
self.header_len+self.data_len]
ftype = data[0] ftype = data[0]
if ftype == self.AT_CMD: if ftype == self.AT_CMD:
pass pass
@@ -445,7 +447,7 @@ class SolarmanV5(Message):
if valid == 1 and modbus_msg_len > 4: if valid == 1 and modbus_msg_len > 4:
# logger.info(f'first byte modbus:{data[14]}') # logger.info(f'first byte modbus:{data[14]}')
inv_update = False inv_update = False
for key, update, _ in self.mb.recv_resp(self.db, data[14:-2], for key, update, _ in self.mb.recv_resp(self.db, data[14:],
self.node_id): self.node_id):
if update: if update:
if key == 'inverter': if key == 'inverter':