handle and test DCU Command responses

app/src/gen3plus/solarman_v5.py

@@ -543,6 +543,8 @@ class SolarmanV5(SolarmanBase):
             logger.warning(f'[{self.node_id}] ignore DCU CMD,'
                            ' cause the state is not UP anymore')
             return
+
+        self.inverter.forward_dcu_cmd_resp = False
         self._build_header(0x4510)
         self.ifc.tx_add(struct.pack('<BHLLL', self.DCU_CMD,
                                     self.sensor_list, 0, 0, 0))
@@ -666,6 +668,10 @@ class SolarmanV5(SolarmanBase):
             self.inc_counter('AT_Command')
             self.inverter.forward_at_cmd_resp = True
 
+        if ftype == self.DCU_CMD:
+            self.inc_counter('DCU_Command')
+            self.inverter.forward_dcu_cmd_resp = True
+
         elif ftype == self.MB_RTU_CMD:
             rstream = self.ifc.remote.stream
             if rstream.mb.recv_req(data[15:],
@@ -689,6 +695,10 @@ class SolarmanV5(SolarmanBase):
             if self.inverter.forward_at_cmd_resp:
                 return logging.INFO
             return logging.DEBUG
+        elif ftype == self.DCU_CMD:
+            if self.inverter.forward_dcu_cmd_resp:
+                return logging.INFO
+            return logging.DEBUG
         elif ftype == self.MB_RTU_CMD \
                 and self.server_side:
             return self.mb.last_log_lvl
@@ -708,6 +718,16 @@ class SolarmanV5(SolarmanBase):
                 logger.info(f'{key}: {data_json}')
                 self.publish_mqtt(f'{Proxy.entity_prfx}{node_id}{key}', data_json)  # noqa: E501
                 return
+
+        elif ftype == self.DCU_CMD:
+            if not self.inverter.forward_dcu_cmd_resp:
+                data_json = '+ok'
+                node_id = self.node_id
+                key = 'dcu_resp'
+                logger.info(f'{key}: {data_json}')
+                self.publish_mqtt(f'{Proxy.entity_prfx}{node_id}{key}', data_json)  # noqa: E501
+                return
+
         elif ftype == self.MB_RTU_CMD:
             self.__modbus_command_rsp(data)
             return

app/tests/test_solarman.py

@@ -821,6 +821,17 @@ def dcu_command_ind_msg():  # 0x4510
     msg += b'\x15'
     return msg
 
+@pytest.fixture
+def dcu_command_rsp_msg():  # 0x1510
+    msg  = b'\xa5\x11\x00\x10\x15\x94\x03' +get_dcu_sn()  +b'\x05\x01'
+    msg += total()  
+    msg += hb()
+    msg += b'\x00\x00\x00\x00'
+    msg += b'\x01\x01\x01'
+    msg += correct_checksum(msg)
+    msg += b'\x15'
+    return msg
+
 @pytest.fixture
 def config_tsun_allow_all():
     Config.act_config = {
@@ -2413,7 +2424,7 @@ async def test_proxy_at_blocked(my_loop, config_tsun_inv1, patch_open_connection
         assert Proxy.mqtt.data == "+ok"
 
 @pytest.mark.asyncio
-async def test_dcu_cmd(my_loop, config_tsun_allow_all, dcu_dev_ind_msg, dcu_dev_rsp_msg, dcu_data_ind_msg, dcu_data_rsp_msg, dcu_command_ind_msg, at_command_rsp_msg):
+async def test_dcu_cmd(my_loop, config_tsun_allow_all, dcu_dev_ind_msg, dcu_dev_rsp_msg, dcu_data_ind_msg, dcu_data_rsp_msg, dcu_command_ind_msg, dcu_command_rsp_msg):
     _ = config_tsun_allow_all
     m = MemoryStream(dcu_dev_ind_msg, (0,), True)
     m.read()   # read device ind
@@ -2447,15 +2458,15 @@ async def test_dcu_cmd(my_loop, config_tsun_allow_all, dcu_dev_ind_msg, dcu_dev_
     assert Proxy.mqtt.key == ''
     assert Proxy.mqtt.data == ""
 
-    # m.append_msg(at_command_rsp_msg)
-    # m.read() # read at resp
-    # assert m.control == 0x1510
-    # assert str(m.seq) == '03:03'
-    # assert m.ifc.rx_get()==b''
-    # assert m.ifc.tx_fifo.get()==b''
-    # assert m.ifc.fwd_fifo.get()==b''
-    # assert Proxy.mqtt.key == 'tsun/at_resp'
-    # assert Proxy.mqtt.data == "+ok"
+    m.append_msg(dcu_command_rsp_msg)
+    m.read() # read at resp
+    assert m.control == 0x1510
+    assert str(m.seq) == '03:94'
+    assert m.ifc.rx_get()==b''
+    assert m.ifc.tx_fifo.get()==b''
+    assert m.ifc.fwd_fifo.get()==b''
+    assert Proxy.mqtt.key == 'tsun/dcu_resp'
+    assert Proxy.mqtt.data == "+ok"
     Proxy.mqtt.clear()  # clear last test result
 
 @pytest.mark.asyncio