diff --git a/app/src/gen3plus/solarman_v5.py b/app/src/gen3plus/solarman_v5.py index 355890b..76d9297 100755 --- a/app/src/gen3plus/solarman_v5.py +++ b/app/src/gen3plus/solarman_v5.py @@ -341,9 +341,9 @@ class SolarmanV5(SolarmanBase): self.log_lvl.clear() super().close() - async def send_start_cmd(self, snr: int, host: str, - forward: bool, - start_timeout=MB_CLIENT_DATA_UP): + def send_start_cmd(self, snr: int, host: str, + forward: bool, + start_timeout=MB_CLIENT_DATA_UP): self.no_forwarding = True self.establish_inv_emu = forward self.snr = snr diff --git a/app/src/modbus_tcp.py b/app/src/modbus_tcp.py index 49786df..f51eef0 100644 --- a/app/src/modbus_tcp.py +++ b/app/src/modbus_tcp.py @@ -66,7 +66,7 @@ class ModbusTcp(): try: async with ModbusConn(host, port) as inverter: stream = inverter.local.stream - await stream.send_start_cmd(snr, host, forward) + stream.send_start_cmd(snr, host, forward) await stream.ifc.loop() logger.info(f'[{stream.node_id}:{stream.conn_no}] ' f'Connection closed - Shutdown: ' diff --git a/app/tests/test_solarman.py b/app/tests/test_solarman.py index 3365703..71ad8f7 100755 --- a/app/tests/test_solarman.py +++ b/app/tests/test_solarman.py @@ -2318,7 +2318,7 @@ async def test_start_client_mode(my_loop, config_tsun_inv1, str_test_ip): assert m.no_forwarding == False assert m.mb_timer.tim == None assert asyncio.get_running_loop() == m.mb_timer.loop - await m.send_start_cmd(get_sn_int(), str_test_ip, False, m.mb_first_timeout) + m.send_start_cmd(get_sn_int(), str_test_ip, False, m.mb_first_timeout) assert m.sent_pdu==bytearray(b'\xa5\x17\x00\x10E\x01\x00!Ce{\x02\xb0\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x030\x00\x000J\xde\xf1\x15') assert m.db.get_db_value(Register.IP_ADDRESS) == str_test_ip assert isclose(m.db.get_db_value(Register.POLLING_INTERVAL), 0.5) @@ -2351,7 +2351,7 @@ async def test_start_client_mode_scan(config_tsun_scan_dcu, str_test_ip, dcu_mod assert m.no_forwarding == False assert m.mb_timer.tim == None assert asyncio.get_running_loop() == m.mb_timer.loop - await m.send_start_cmd(get_dcu_sn_int(), str_test_ip, False, m.mb_first_timeout) + m.send_start_cmd(get_dcu_sn_int(), str_test_ip, False, m.mb_first_timeout) assert m.mb_start_reg == 0x0000 assert m.mb_step == 0x100 assert m.mb_bytes == 0x2d diff --git a/app/tests/test_solarman_emu.py b/app/tests/test_solarman_emu.py index a3d517c..d511f22 100644 --- a/app/tests/test_solarman_emu.py +++ b/app/tests/test_solarman_emu.py @@ -144,7 +144,7 @@ async def test_emu_start(my_loop, config_tsun_inv1, msg_modbus_rsp, str_test_ip, inv = InvStream(msg_modbus_rsp) assert asyncio.get_running_loop() == inv.mb_timer.loop - await inv.send_start_cmd(get_sn_int(), str_test_ip, True, inv.mb_first_timeout) + inv.send_start_cmd(get_sn_int(), str_test_ip, True, inv.mb_first_timeout) inv.read() # read complete msg, and dispatch msg assert not inv.header_valid # must be invalid, since msg was handled and buffer flushed assert inv.msg_count == 1 @@ -161,7 +161,7 @@ async def test_snd_hb(my_loop, config_tsun_inv1, heartbeat_ind): inv = InvStream() cld = CldStream(inv) - # await inv.send_start_cmd(get_sn_int(), str_test_ip, False, inv.mb_first_timeout) + # inv.send_start_cmd(get_sn_int(), str_test_ip, False, inv.mb_first_timeout) cld.send_heartbeat_cb(0) assert cld.ifc.tx_fifo.peek() == heartbeat_ind cld.close() @@ -178,7 +178,7 @@ async def test_snd_inv_data(my_loop, config_tsun_inv1, inverter_ind_msg, inverte inv.db.set_db_def_value(Register.GRID_FREQUENCY, 50.05) inv.db.set_db_def_value(Register.PROD_COMPL_TYPE, 6) assert asyncio.get_running_loop() == inv.mb_timer.loop - await inv.send_start_cmd(get_sn_int(), str_test_ip, False, inv.mb_first_timeout) + inv.send_start_cmd(get_sn_int(), str_test_ip, False, inv.mb_first_timeout) inv.db.set_db_def_value(Register.DATA_UP_INTERVAL, 17) # set test value cld = CldStream(inv) @@ -213,7 +213,7 @@ async def test_rcv_invalid(my_loop, config_tsun_inv1, inverter_ind_msg, inverter _ = config_tsun_inv1 inv = InvStream() assert asyncio.get_running_loop() == inv.mb_timer.loop - await inv.send_start_cmd(get_sn_int(), str_test_ip, False, inv.mb_first_timeout) + inv.send_start_cmd(get_sn_int(), str_test_ip, False, inv.mb_first_timeout) inv.db.set_db_def_value(Register.DATA_UP_INTERVAL, 17) # set test value cld = CldStream(inv)