Add Battery 2 power and mode sensors for ET models

Author: pravussum

goodwe/et.py

@@ -153,9 +153,8 @@ class ET(Inverter):
                    read_bytes2_signed(data, 35140),
                    "House Consumption", "W", Kind.AC),
 
-        # Power4S("pbattery2", 35264, "Battery2 Power", Kind.BAT),
-        # Integer("battery2_mode", 35266, "Battery2 Mode code", "", Kind.BAT),
-        # Enum2("battery2_mode_label", 35184, BATTERY_MODES, "Battery2 Mode", Kind.BAT),
+#        Voltage("vbattery2", 47924, "Battery2 Voltage", Kind.BAT),
+#        Enum2("battery2_mode_label", 35184, BATTERY_MODES, "Battery2 Mode", Kind.BAT),
     )
 
     # Modbus registers from offset 0x9088 (37000)
@@ -222,6 +221,13 @@ class ET(Inverter):
         # String8("battery2_sn", 39058, "Battery 2 S/N", Kind.BAT),
     )
 
+    # Modbus registers from offset 0x89be (35262)
+    __all_sensors_battery2_extended: tuple[Sensor, ...] = (
+        Power4S("pbattery2", 35264, "Battery2 Power", Kind.BAT),
+        Integer("battery2_mode", 35266, "Battery2 Mode code", "", Kind.BAT),
+        Enum2("battery2_mode_label", 35266, BATTERY_MODES, "Battery2 Mode", Kind.BAT)
+    )
+
     # Inverter's meter data
     # Modbus registers from offset 0x8ca0 (36000)
     __all_sensors_meter: tuple[Sensor, ...] = (
@@ -479,6 +485,7 @@ def __init__(self, host: str, port: int, comm_addr: int = 0, timeout: int = 1, r
         self._READ_BATTERY_INFO: ProtocolCommand = self._read_command(0x9088, 0x0018)
         self._READ_BATTERY2_INFO: ProtocolCommand = self._read_command(0x9858, 0x0016)
         self._READ_MPPT_DATA: ProtocolCommand = self._read_command(0x89e5, 0x3d)
+        self._READ_BATTERY2_INFO_EXTENDED = self._read_command(0x89be, 0x06)
         self._has_eco_mode_v2: bool = True
         self._has_peak_shaving: bool = True
         self._has_battery: bool = True
@@ -489,6 +496,7 @@ def __init__(self, host: str, port: int, comm_addr: int = 0, timeout: int = 1, r
         self._sensors = self.__all_sensors
         self._sensors_battery = self.__all_sensors_battery
         self._sensors_battery2 = self.__all_sensors_battery2
+        self._sensors_battery2_extended = self.__all_sensors_battery2_extended
         self._sensors_meter = self.__all_sensors_meter
         self._sensors_mppt = self.__all_sensors_mppt
         self._settings: dict[str, Sensor] = {s.id_: s for s in self.__all_settings}
@@ -590,6 +598,9 @@ async def read_runtime_data(self) -> dict[str, Any]:
                 response = await self._read_from_socket(self._READ_BATTERY2_INFO)
                 data.update(
                     self._map_response(response, self._sensors_battery2))
+                response = await self._read_from_socket(self._READ_BATTERY2_INFO_EXTENDED)
+                data.update(
+                    self._map_response(response, self._sensors_battery2_extended))
             except RequestRejectedException as ex:
                 if ex.message == ILLEGAL_DATA_ADDRESS:
                     logger.info("Battery 2 values not supported, disabling further attempts.")
@@ -820,6 +831,7 @@ def sensors(self) -> tuple[Sensor, ...]:
             result = result + self._sensors_battery
         if self._has_battery2:
             result = result + self._sensors_battery2
+            result = result + self._sensors_battery2_extended
         if self._has_mppt:
             result = result + self._sensors_mppt
         return result

tests/sample/et/GW25K-ET_battery2_info_extended.hex

@@ -0,0 +1 @@
+aa55f7030c1052ffe2fffffb1a0003000836a3

tests/sample/et/GW29K9-ET_battery2_info_extended.hex

@@ -0,0 +1 @@
+aa55f7030c1052ffe2fffffb1a0003000836a3

tests/test_et.py

@@ -767,6 +767,7 @@ def __init__(self, methodName='runTest'):
         self.mock_response(self._READ_METER_DATA_EXTENDED, 'GW25K-ET_meter_data.hex')
         self.mock_response(self._READ_BATTERY_INFO, 'GW25K-ET_battery_info.hex')
         self.mock_response(self._READ_MPPT_DATA, 'GW25K-ET_mppt_data.hex')
+        self.mock_response(self._READ_BATTERY2_INFO_EXTENDED, 'GW25K-ET_battery2_info_extended.hex')
 
     def test_GW25K_ET_device_info(self):
         self.loop.run_until_complete(self.read_device_info())
@@ -788,7 +789,7 @@ def test_GW25K_ET_runtime_data(self):
         self.loop.run_until_complete(self.read_device_info())
 
         data = self.loop.run_until_complete(self.read_runtime_data())
-        self.assertEqual(237, len(data))
+        self.assertEqual(240, len(data))
 
         self.sensor_map = {s.id_: s for s in self.sensors()}
 
@@ -1033,6 +1034,9 @@ def test_GW25K_ET_runtime_data(self):
         self.assertSensor('apparent_power1', 0, 'VA', data)
         self.assertSensor('apparent_power2', 0, 'VA', data)
         self.assertSensor('apparent_power3', 0, 'VA', data)
+        self.assertSensor('pbattery2', -1254, 'W', data)
+        self.assertSensor('battery2_mode', 3, '', data)
+        self.assertSensor('battery2_mode_label', 'Charge', '', data)
 
         self.assertFalse(self.sensor_map, f"Some sensors were not tested {self.sensor_map}")
 
@@ -1048,6 +1052,7 @@ def __init__(self, methodName='runTest'):
         self.mock_response(self._READ_BATTERY_INFO, 'GW29K9-ET_battery_info.hex')
         self.mock_response(self._READ_BATTERY2_INFO, 'GW29K9-ET_battery2_info.hex')
         self.mock_response(self._READ_MPPT_DATA, 'GW29K9-ET_mppt_data.hex')
+        self.mock_response(self._READ_BATTERY2_INFO_EXTENDED, 'GW29K9-ET_battery2_info_extended.hex')
 
     def test_GW29K9_ET_device_info(self):
         self.loop.run_until_complete(self.read_device_info())
@@ -1068,8 +1073,10 @@ def test_GW29K9_ET_runtime_data(self):
         # Reset sensors
         self.loop.run_until_complete(self.read_device_info())
 
+        self.sensor_map = {s.id_: s for s in self.sensors()}
+
         data = self.loop.run_until_complete(self.read_runtime_data())
-        self.assertEqual(211, len(data))
+        self.assertEqual(214, len(data))
 
         self.sensor_map = {s.id_: s for s in self.sensors()}
 
@@ -1287,6 +1294,10 @@ def test_GW29K9_ET_runtime_data(self):
         self.assertSensor('apparent_power1', 0, 'VA', data)
         self.assertSensor('apparent_power2', 0, 'VA', data)
         self.assertSensor('apparent_power3', 0, 'VA', data)
+        self.assertSensor('pbattery2', -1254, 'W', data)
+        self.assertSensor('battery2_mode', 3, '', data)
+        self.assertSensor('battery2_mode_label', 'Charge', '', data)
+
 
         self.assertFalse(self.sensor_map, f"Some sensors were not tested {self.sensor_map}")