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

avoid sending responses to TSUN for local at commands

Browse Source
This commit is contained in:
Stefan Allius
2024-05-13 22:46:23 +02:00
parent 036af8e127
commit 2e214b1e71
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,6 +61,7 @@ class SolarmanV5(Message):
self.db = InfosG3P() self.db = InfosG3P()
self.time_ofs = 0 self.time_ofs = 0
self.forward_modbus_resp = False self.forward_modbus_resp = False
self.forward_at_cmd_resp = False
self.switch = { self.switch = {
0x4210: self.msg_data_ind, # real time data 0x4210: self.msg_data_ind, # real time data
@@ -318,6 +319,7 @@ class SolarmanV5(Message):
async def send_at_cmd(self, AT_cmd: str) -> None: async def send_at_cmd(self, AT_cmd: str) -> None:
if self.state != self.STATE_UP: if self.state != self.STATE_UP:
return return
self.forward_at_cmd_resp = False
self.__build_header(0x4510) self.__build_header(0x4510)
self._send_buffer += struct.pack(f'<BHLLL{len(AT_cmd)}sc', self.AT_CMD, self._send_buffer += struct.pack(f'<BHLLL{len(AT_cmd)}sc', self.AT_CMD,
2, 0, 0, 0, AT_cmd.encode('utf-8'), 2, 0, 0, 0, AT_cmd.encode('utf-8'),
@@ -371,14 +373,14 @@ class SolarmanV5(Message):
data = self._recv_buffer[self.header_len:] data = self._recv_buffer[self.header_len:]
result = struct.unpack_from('<BLLL', data, 0) result = struct.unpack_from('<BLLL', data, 0)
ftype = result[0] # always 2 ftype = result[0] # always 2
total = result[1] # total = result[1]
tim = result[2] tim = result[2]
res = result[3] # always zero res = result[3] # always zero
logger.info(f'frame type:{ftype:02x}' logger.info(f'frame type:{ftype:02x}'
f' timer:{tim:08x}s null:{res}') f' timer:{tim:08x}s null:{res}')
if self.time_ofs: # if self.time_ofs:
dt = datetime.fromtimestamp(total + self.time_ofs) # dt = datetime.fromtimestamp(total + self.time_ofs)
logger.info(f'ts: {dt.strftime("%Y-%m-%d %H:%M:%S")}') # logger.info(f'ts: {dt.strftime("%Y-%m-%d %H:%M:%S")}')
self.__process_data(ftype) self.__process_data(ftype)
self.__forward_msg() self.__forward_msg()
@@ -388,7 +390,7 @@ class SolarmanV5(Message):
data = self._recv_buffer data = self._recv_buffer
result = struct.unpack_from('<BHLLLHL', data, self.header_len) result = struct.unpack_from('<BHLLLHL', data, self.header_len)
ftype = result[0] # 1 or 0x81 ftype = result[0] # 1 or 0x81
total = result[2] # total = result[2]
tim = result[3] tim = result[3]
if 1 == ftype: if 1 == ftype:
self.time_ofs = result[4] self.time_ofs = result[4]
@@ -396,9 +398,9 @@ class SolarmanV5(Message):
cnt = result[6] cnt = result[6]
logger.info(f'ftype:{ftype:02x} timer:{tim:08x}s' logger.info(f'ftype:{ftype:02x} timer:{tim:08x}s'
f' ??: {unkn:04x} cnt:{cnt}') f' ??: {unkn:04x} cnt:{cnt}')
if self.time_ofs: # if self.time_ofs:
dt = datetime.fromtimestamp(total + self.time_ofs) # dt = datetime.fromtimestamp(total + self.time_ofs)
logger.info(f'ts: {dt.strftime("%Y-%m-%d %H:%M:%S")}') # logger.info(f'ts: {dt.strftime("%Y-%m-%d %H:%M:%S")}')
self.__process_data(ftype) self.__process_data(ftype)
self.__forward_msg() self.__forward_msg()
@@ -425,6 +427,7 @@ class SolarmanV5(Message):
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')
self.forward_at_cmd_resp = True
elif ftype == self.MB_RTU_CMD: elif ftype == self.MB_RTU_CMD:
if not self.remoteStream.mb.recv_req(data[15:]): if not self.remoteStream.mb.recv_req(data[15:]):
self.inc_counter('Invalid_Msg_Format') self.inc_counter('Invalid_Msg_Format')
@@ -440,7 +443,8 @@ class SolarmanV5(Message):
self.header_len+self.data_len] self.header_len+self.data_len]
ftype = data[0] ftype = data[0]
if ftype == self.AT_CMD: if ftype == self.AT_CMD:
pass if not self.forward_at_cmd_resp:
return
elif ftype == self.MB_RTU_CMD: elif ftype == self.MB_RTU_CMD:
valid = data[1] valid = data[1]
modbus_msg_len = self.data_len - 14 modbus_msg_len = self.data_len - 14