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

store modbus params always on the server side

Browse Source
This commit is contained in:
Stefan Allius
2024-05-12 23:09:51 +02:00
parent 1ae7784bee
commit 1658036a26
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/gen3/talent.py
View File

@@ -392,11 +392,11 @@ class Talent(Message):
self.header_len+self.data_len] self.header_len+self.data_len]
if self.ctrl.is_req(): if self.ctrl.is_req():
if not self.mb.recv_req(data[hdr_len:]): if not self.remoteStream.mb.recv_req(data[hdr_len:]):
return self.inc_counter('Invalid_Msg_Format')
else:
self.forward_modbus_resp = True self.inc_counter('Modbus_Command')
self.inc_counter('Modbus_Command') self.remoteStream.forward_modbus_resp = True
elif self.ctrl.is_ind(): elif self.ctrl.is_ind():
# logger.debug(f'Modbus Ind MsgLen: {modbus_len}') # logger.debug(f'Modbus Ind MsgLen: {modbus_len}')
self.modbus_elms = 0 self.modbus_elms = 0

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

@@ -427,10 +427,11 @@ class SolarmanV5(Message):
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:]): if not self.remoteStream.mb.recv_req(data[15:]):
return self.inc_counter('Invalid_Msg_Format')
self.forward_modbus_resp = True else:
self.inc_counter('Modbus_Command') self.inc_counter('Modbus_Command')
self.remoteStream.forward_modbus_resp = True
self.__forward_msg() self.__forward_msg()
# self.__send_ack_rsp(0x1510, ftype) # self.__send_ack_rsp(0x1510, ftype)