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

add fifo and timeout handler for modbus

Browse Source
This commit is contained in:
Stefan Allius
2024-05-18 20:18:15 +02:00
parent 841877305d
commit f4da16987f
4 changed files with 129 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,7 @@ class SolarmanV5(Message):
MB_RTU_CMD = 2
def __init__(self, server_side: bool):
super().__init__(server_side)
super().__init__(server_side, self.send_modbus_cb, 5)
self.header_len = 11 # overwrite construcor in class Message
self.control = 0
@@ -104,6 +104,7 @@ class SolarmanV5(Message):
# deallocated by the garbage collector ==> we get a memory leak
self.switch.clear()
self.state = self.STATE_CLOSED
super().close()
def __set_serial_no(self, snr: int):
serial_no = str(snr)
@@ -301,20 +302,22 @@ class SolarmanV5(Message):
self._heartbeat())
self.__finish_send_msg()
async def send_modbus_cmd(self, func, addr, val) -> None:
if self.state != self.STATE_UP:
return
def send_modbus_cb(self, pdu: bytearray):
self.forward_modbus_resp = False
self.__build_header(0x4510)
self._send_buffer += struct.pack('<BHLLL', self.MB_RTU_CMD,
0x2b0, 0, 0, 0)
self._send_buffer += self.mb.build_msg(Modbus.INV_ADDR,
func, addr, val)
self._send_buffer += pdu
self.__finish_send_msg()
try:
await self.async_write('Send Modbus Command:')
except Exception:
self._send_buffer = bytearray(0)
hex_dump_memory(logging.INFO, f'Send Modbus Command:{self.addr}:',
self._send_buffer, len(self._send_buffer))
self.writer.write(self._send_buffer)
self._send_buffer = bytearray(0) # self._send_buffer[sent:]
async def send_modbus_cmd(self, func, addr, val) -> None:
if self.state != self.STATE_UP:
return
self.mb.build_msg(Modbus.INV_ADDR, func, addr, val)
async def send_at_cmd(self, AT_cmd: str) -> None:
if self.state != self.STATE_UP: