diff --git a/app/tests/test_infos_g3p.py b/app/tests/test_infos_g3p.py index bcebe10..850dc67 100644 --- a/app/tests/test_infos_g3p.py +++ b/app/tests/test_infos_g3p.py @@ -71,8 +71,7 @@ def test_parse_4110(DeviceData: bytes): assert json.dumps(i.db) == json.dumps({ 'controller': {"Data_Up_Interval": 300, "Collect_Interval": 60, "Heartbeat_Interval": 120, "Signal_Strength": 100, "IP_Adress": "192.168.80.49"}, - 'collector': {"Collector_Fw_Version": "LSW5BLE_17_02B0_1.05"}, - 'inverter': {"Version": "V1.1.00.0B"}, + 'collector': {"Chip_Model": "LSW5BLE_17_02B0_1.05", "Collector_Fw_Version": "V1.1.00.0B"}, }) def test_parse_4210(InverterData: bytes): @@ -84,7 +83,7 @@ def test_parse_4210(InverterData: bytes): assert json.dumps(i.db) == json.dumps({ "controller": {"Power_On_Time": 2051}, - "inverter": {"Serial_Number": "Y17E00000000000E", "Rated_Power": 600, "Max_Designed_Power": 2000, "No_Inputs": 4}, + "inverter": {"Serial_Number": "Y17E00000000000E", "Version": "v4.0.10", "Rated_Power": 600, "Max_Designed_Power": 2000, "No_Inputs": 4}, "env": {"Inverter_Status": 1, "Inverter_Temp": 12.2}, "grid": {"Voltage": 224.8, "Current": 0.73, "Frequency": 50.05, "Output_Power": 165.8}, "input": {"pv1": {"Voltage": 35.3, "Current": 1.68, "Power": 59.6, "Daily_Generation": 0.04, "Total_Generation": 30.76}, diff --git a/app/tests/test_solarman.py b/app/tests/test_solarman.py index 0f54f0c..48f5509 100644 --- a/app/tests/test_solarman.py +++ b/app/tests/test_solarman.py @@ -938,8 +938,8 @@ def test_build_logger_modell(ConfigTsunAllowAll, DeviceIndMsg): assert 'IGEN TECH' == m.db.get_db_value(Register.CHIP_TYPE, None) assert None == m.db.get_db_value(Register.CHIP_MODEL, None) m.read() # read complete msg, and dispatch msg - assert 'LSW5BLE_17_02B0_1.05' == m.db.get_db_value(Register.COLLECTOR_FW_VERSION, 0).rstrip('\00') - assert 'LSW5BLE' == m.db.get_db_value(Register.CHIP_MODEL, 0) + assert 'LSW5BLE_17_02B0_1.05' == m.db.get_db_value(Register.CHIP_MODEL, 0) + assert 'V1.1.00.0B' == m.db.get_db_value(Register.COLLECTOR_FW_VERSION, 0).rstrip('\00') m.close() def test_AT_cmd(ConfigTsunAllowAll, DeviceIndMsg, DeviceRspMsg, AtCommandIndMsg):