goodwe 0.3.4__tar.gz → 0.3.6__tar.gz

{goodwe-0.3.4/goodwe.egg-info → goodwe-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: goodwe
-Version: 0.3.4
+Version: 0.3.6
 Summary: Read data from GoodWe inverter via local network
 Home-page: https://github.com/marcelblijleven/goodwe
 Author: Martin Letenay, Marcel Blijleven

goodwe-0.3.6/VERSION

@@ -0,0 +1 @@
+0.3.6

{goodwe-0.3.4 → goodwe-0.3.6}/goodwe/dt.py

@@ -110,6 +110,10 @@ class DT(Inverter):
         Integer("shadow_scan", 40326, "Shadow Scan", "", Kind.PV),
         Integer("grid_export", 40327, "Grid Export Enabled", "", Kind.GRID),
         Integer("grid_export_limit", 40328, "Grid Export Limit", "%", Kind.GRID),
+        Integer("start", 40330, "Start / Power On", "", Kind.GRID),
+        Integer("stop", 40331, "Stop / Power Off", "", Kind.GRID),
+        Integer("restart", 40332, "Restart", "", Kind.GRID),
+        Integer("grid_export_hw", 40345, "Grid Export Enabled (HW)", "", Kind.GRID),
     )
 
     # Settings for single phase inverters

{goodwe-0.3.4 → goodwe-0.3.6}/goodwe/es.py

@@ -178,11 +178,11 @@ class ES(Inverter):
     def _supports_eco_mode_v2(self) -> bool:
         if self.arm_version < 14:
             return False
-        if "EMU" in self.serial_number:
+        if "EMU" in self.serial_number or "EMJ" in self.serial_number:
             return self.dsp1_version >= 11
-        if "ESU" in self.serial_number:
+        if "ESU" in self.serial_number or "ESA" in self.serial_number:
             return self.dsp1_version >= 22
-        if "BPS" in self.serial_number:
+        if "BPS" in self.serial_number or "BPU" in self.serial_number:
             return self.dsp1_version >= 10
         return False
 
@@ -192,7 +192,7 @@ class ES(Inverter):
         self.firmware = self._decode(response[0:5]).rstrip()
         self.model_name = self._decode(response[5:15]).rstrip()
         self.serial_number = self._decode(response[31:47])
-        self.software_version = self._decode(response[51:63])
+        self.arm_firmware = self._decode(response[51:63])  # AKA software_version
         try:
             if len(self.firmware) >= 2:
                 self.dsp1_version = int(self.firmware[0:2])
@@ -250,10 +250,9 @@ class ES(Inverter):
             # modbus can address/store only 16 bit values, read the other 8 bytes
             if self._is_modbus_setting(setting):
                 response = await self._read_from_socket(ModbusReadCommand(self.comm_addr, setting.offset, 1))
-                raw_value = setting.encode_value(value, response.response_data()[0:2])
             else:
                 response = await self._read_from_socket(Aa55ReadCommand(setting.offset, 1))
-                raw_value = setting.encode_value(value, response.response_data()[2:4])
+            raw_value = setting.encode_value(value, response.response_data()[0:2])
         else:
             raw_value = setting.encode_value(value)
         if len(raw_value) <= 2:

{goodwe-0.3.4 → goodwe-0.3.6}/goodwe/et.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import logging
 from typing import Tuple
 
-from .exceptions import RequestRejectedException
+from .exceptions import RequestFailedException, RequestRejectedException
 from .inverter import Inverter
 from .inverter import OperationMode
 from .inverter import SensorKind as Kind
@@ -252,7 +252,8 @@ class ET(Inverter):
         Apparent4("meter_apparent_power_total", 36041, "Meter Apparent Power Total", Kind.GRID),
         Integer("meter_type", 36043, "Meter Type", "", Kind.GRID),  # (0: Single phase, 1: 3P3W, 2: 3P4W, 3: HomeKit)
         Integer("meter_sw_version", 36044, "Meter Software Version", "", Kind.GRID),
-        # Sensors added in some ARM fw update, read when flag _has_meter_extended is on
+
+        # Sensors added in some ARM fw update (or platform 745/753), read when flag _has_meter_extended is on
         Power4S("meter2_active_power", 36045, "Meter 2 Active Power", Kind.GRID),
         Float("meter2_e_total_exp", 36047, 1000, "Meter 2 Total Energy (export)", "kWh", Kind.GRID),
         Float("meter2_e_total_imp", 36049, 1000, "Meter 2 Total Energy (import)", "kWh", Kind.GRID),
@@ -263,6 +264,15 @@ class ET(Inverter):
         Current("meter_current1", 36055, "Meter L1 Current", Kind.GRID),
         Current("meter_current2", 36056, "Meter L2 Current", Kind.GRID),
         Current("meter_current3", 36057, "Meter L3 Current", Kind.GRID),
+
+        Energy8("meter_e_total_exp1", 36092, "Meter Total Energy (export) L1", Kind.GRID),
+        Energy8("meter_e_total_exp2", 36096, "Meter Total Energy (export) L2", Kind.GRID),
+        Energy8("meter_e_total_exp3", 36100, "Meter Total Energy (export) L3", Kind.GRID),
+        Energy8("meter_e_total_exp", 36104, "Meter Total Energy (export)", Kind.GRID),
+        Energy8("meter_e_total_imp1", 36108, "Meter Total Energy (import) L1", Kind.GRID),
+        Energy8("meter_e_total_imp2", 36112, "Meter Total Energy (import) L2", Kind.GRID),
+        Energy8("meter_e_total_imp3", 36116, "Meter Total Energy (import) L3", Kind.GRID),
+        Energy8("meter_e_total_imp", 36120, "Meter Total Energy (import)", Kind.GRID),
     )
 
     # Inverter's MPPT data
@@ -414,6 +424,7 @@ class ET(Inverter):
         self._READ_RUNNING_DATA: ProtocolCommand = ModbusReadCommand(self.comm_addr, 0x891c, 0x007d)
         self._READ_METER_DATA: ProtocolCommand = ModbusReadCommand(self.comm_addr, 0x8ca0, 0x2d)
         self._READ_METER_DATA_EXTENDED: ProtocolCommand = ModbusReadCommand(self.comm_addr, 0x8ca0, 0x3a)
+        self._READ_METER_DATA_EXTENDED2: ProtocolCommand = ModbusReadCommand(self.comm_addr, 0x8ca0, 0x7d)
         self._READ_BATTERY_INFO: ProtocolCommand = ModbusReadCommand(self.comm_addr, 0x9088, 0x0018)
         self._READ_BATTERY2_INFO: ProtocolCommand = ModbusReadCommand(self.comm_addr, 0x9858, 0x0016)
         self._READ_MPPT_DATA: ProtocolCommand = ModbusReadCommand(self.comm_addr, 0x89e5, 0x3d)
@@ -422,6 +433,7 @@ class ET(Inverter):
         self._has_battery: bool = True
         self._has_battery2: bool = False
         self._has_meter_extended: bool = False
+        self._has_meter_extended2: bool = False
         self._has_mppt: bool = False
         self._sensors = self.__all_sensors
         self._sensors_battery = self.__all_sensors_battery
@@ -440,6 +452,11 @@ class ET(Inverter):
         """Filter to exclude extended meter sensors"""
         return s.offset < 36045
 
+    @staticmethod
+    def _not_extended_meter2(s: Sensor) -> bool:
+        """Filter to exclude extended meter sensors"""
+        return s.offset < 36058
+
     async def read_device_info(self):
         response = await self._read_from_socket(self._READ_DEVICE_VERSION_INFO)
         response = response.response_data()
@@ -470,9 +487,10 @@ class ET(Inverter):
         if is_2_battery(self) or self.rated_power >= 25000:
             self._has_battery2 = True
 
-        if self.rated_power >= 15000:
+        if is_745_platform(self) or self.rated_power >= 15000:
             self._has_mppt = True
             self._has_meter_extended = True
+            self._has_meter_extended2 = True
         else:
             self._sensors_meter = tuple(filter(self._not_extended_meter, self._sensors_meter))
 
@@ -482,8 +500,11 @@ class ET(Inverter):
             self._settings.update({s.id_: s for s in self.__settings_arm_fw_19})
         except RequestRejectedException as ex:
             if ex.message == 'ILLEGAL DATA ADDRESS':
-                logger.debug("Cannot read EcoModeV2 settings, using to EcoModeV1.")
+                logger.debug("EcoModeV2 settings not supported, switching to EcoModeV1.")
                 self._has_eco_mode_v2 = False
+        except RequestFailedException as ex:
+            logger.debug("Cannot read EcoModeV2 settings, switching to EcoModeV1.")
+            self._has_eco_mode_v2 = False
 
         # Check and add Peak Shaving settings added in (ETU fw 22)
         try:
@@ -491,8 +512,11 @@ class ET(Inverter):
             self._settings.update({s.id_: s for s in self.__settings_arm_fw_22})
         except RequestRejectedException as ex:
             if ex.message == 'ILLEGAL DATA ADDRESS':
-                logger.debug("Cannot read PeakShaving setting, disabling it.")
+                logger.debug("PeakShaving setting not supported, disabling it.")
                 self._has_peak_shaving = False
+        except RequestFailedException as ex:
+            logger.debug("Cannot read _has_peak_shaving settings, disabling it.")
+            self._has_peak_shaving = False
 
     async def read_runtime_data(self) -> Dict[str, Any]:
         response = await self._read_from_socket(self._READ_RUNNING_DATA)
@@ -505,7 +529,7 @@ class ET(Inverter):
                 data.update(self._map_response(response, self._sensors_battery))
             except RequestRejectedException as ex:
                 if ex.message == 'ILLEGAL DATA ADDRESS':
-                    logger.warning("Cannot read battery values, disabling further attempts.")
+                    logger.warning("Battery values not supported, disabling further attempts.")
                     self._has_battery = False
                 else:
                     raise ex
@@ -516,18 +540,32 @@ class ET(Inverter):
                     self._map_response(response, self._sensors_battery2))
             except RequestRejectedException as ex:
                 if ex.message == 'ILLEGAL DATA ADDRESS':
-                    logger.warning("Cannot read battery 2 values, disabling further attempts.")
+                    logger.warning("Battery 2 values not supported, disabling further attempts.")
                     self._has_battery2 = False
                 else:
                     raise ex
 
-        if self._has_meter_extended:
+        if self._has_meter_extended2:
+            try:
+                response = await self._read_from_socket(self._READ_METER_DATA_EXTENDED2)
+                data.update(self._map_response(response, self._sensors_meter))
+            except RequestRejectedException as ex:
+                if ex.message == 'ILLEGAL DATA ADDRESS':
+                    logger.info("Extended meter values not supported, disabling further attempts.")
+                    self._has_meter_extended2 = False
+                    self._sensors_meter = tuple(filter(self._not_extended_meter2, self._sensors_meter))
+                    response = await self._read_from_socket(self._READ_METER_DATA_EXTENDED)
+                    data.update(
+                        self._map_response(response, self._sensors_meter))
+                else:
+                    raise ex
+        elif self._has_meter_extended:
             try:
                 response = await self._read_from_socket(self._READ_METER_DATA_EXTENDED)
                 data.update(self._map_response(response, self._sensors_meter))
             except RequestRejectedException as ex:
                 if ex.message == 'ILLEGAL DATA ADDRESS':
-                    logger.warning("Cannot read extended meter values, disabling further attempts.")
+                    logger.warning("Extended meter values not supported, disabling further attempts.")
                     self._has_meter_extended = False
                     self._sensors_meter = tuple(filter(self._not_extended_meter, self._sensors_meter))
                     response = await self._read_from_socket(self._READ_METER_DATA)
@@ -545,7 +583,7 @@ class ET(Inverter):
                 data.update(self._map_response(response, self._sensors_mppt))
             except RequestRejectedException as ex:
                 if ex.message == 'ILLEGAL DATA ADDRESS':
-                    logger.warning("Cannot read MPPT values, disabling further attempts.")
+                    logger.warning("MPPT values not supported, disabling further attempts.")
                     self._has_mppt = False
                 else:
                     raise ex

{goodwe-0.3.4 → goodwe-0.3.6}/goodwe/model.py

@@ -48,3 +48,7 @@ def is_2_battery(inverter: Inverter) -> bool:
 def is_745_platform(inverter: Inverter) -> bool:
     return any(model in inverter.serial_number for model in PLATFORM_745_LV_MODELS) or any(
         model in inverter.serial_number for model in PLATFORM_745_HV_MODELS)
+
+
+def is_753_platform(inverter: Inverter) -> bool:
+    return any(model in inverter.serial_number for model in PLATFORM_753_MODELS)

{goodwe-0.3.4 → goodwe-0.3.6}/goodwe/sensor.py

@@ -183,7 +183,7 @@ class Energy(Sensor):
 
     def read_value(self, data: ProtocolResponse):
         value = read_bytes2(data)
-        return float(value) / 10 if value else None
+        return float(value) / 10 if value is not None else None
 
 
 class Energy4(Sensor):
@@ -194,7 +194,18 @@ class Energy4(Sensor):
 
     def read_value(self, data: ProtocolResponse):
         value = read_bytes4(data)
-        return float(value) / 10 if value else None
+        return float(value) / 10 if value is not None else None
+
+
+class Energy8(Sensor):
+    """Sensor representing energy [kWh] value encoded in 8 bytes"""
+
+    def __init__(self, id_: str, offset: int, name: str, kind: Optional[SensorKind]):
+        super().__init__(id_, offset, name, 8, "kWh", kind)
+
+    def read_value(self, data: ProtocolResponse):
+        value = read_bytes8(data)
+        return float(value) / 100 if value is not None else None
 
 
 class Apparent(Sensor):
@@ -816,6 +827,14 @@ def read_bytes4_signed(buffer: ProtocolResponse, offset: int = None) -> int:
     return int.from_bytes(buffer.read(4), byteorder="big", signed=True)
 
 
+def read_bytes8(buffer: ProtocolResponse, offset: int = None, undef: int = None) -> int:
+    """Retrieve 8 byte (unsigned int) value from buffer"""
+    if offset is not None:
+        buffer.seek(offset)
+    value = int.from_bytes(buffer.read(8), byteorder="big", signed=False)
+    return undef if value == 0xffffffffffffffff else value
+
+
 def read_decimal2(buffer: ProtocolResponse, scale: int, offset: int = None) -> float:
     """Retrieve 2 byte (signed float) value from buffer"""
     if offset is not None:

{goodwe-0.3.4 → goodwe-0.3.6/goodwe.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: goodwe
-Version: 0.3.4
+Version: 0.3.6
 Summary: Read data from GoodWe inverter via local network
 Home-page: https://github.com/marcelblijleven/goodwe
 Author: Martin Letenay, Marcel Blijleven

{goodwe-0.3.4 → goodwe-0.3.6}/tests/test_dt.py

@@ -101,7 +101,7 @@ class GW6000_DT_Test(DtMock):
         self.assertFalse(self.sensor_map, f"Some sensors were not tested {self.sensor_map}")
 
     def test_GW6000_DT_setting(self):
-        self.assertEqual(4, len(self.settings()))
+        self.assertEqual(8, len(self.settings()))
         settings = {s.id_: s for s in self.settings()}
         self.assertEqual('Timestamp', type(settings.get("time")).__name__)
         self.assertEqual('Integer', type(settings.get("grid_export")).__name__)
@@ -221,7 +221,7 @@ class GW5000D_NS_Test(DtMock):
         self.assertSensor("apparent_power", -1, "VA", data),
         self.assertSensor("reactive_power", -1, "var", data),
         self.assertSensor('temperature', 1.4, 'C', data)
-        self.assertSensor('e_day', None, 'kWh', data)
+        self.assertSensor('e_day', 0, 'kWh', data)
         self.assertSensor('e_total', 881.7, 'kWh', data)
         self.assertSensor('h_total', 955, 'h', data)
         self.assertSensor('safety_country', 73, '', data)

{goodwe-0.3.4 → goodwe-0.3.6}/tests/test_es.py

@@ -7,7 +7,7 @@ from goodwe import DISCOVERY_COMMAND
 from goodwe.es import ES
 from goodwe.exceptions import RequestFailedException
 from goodwe.inverter import OperationMode
-from goodwe.protocol import ProtocolCommand, ProtocolResponse
+from goodwe.protocol import Aa55ReadCommand, ProtocolCommand, ProtocolResponse
 
 
 class EsMock(TestCase, ES):
@@ -26,6 +26,8 @@ class EsMock(TestCase, ES):
         root_dir = os.path.dirname(os.path.abspath(__file__))
         filename = self._mock_responses.get(command)
         if filename is not None:
+            if filename.startswith('aa55'):
+                return ProtocolResponse(bytes.fromhex(filename), command)
             with open(root_dir + '/sample/es/' + filename, 'r') as f:
                 response = bytes.fromhex(f.read())
                 if not command.validator(response):
@@ -52,6 +54,8 @@ class GW5048D_ES_Test(EsMock):
         self.mock_response(self._READ_DEVICE_VERSION_INFO, 'GW5048D-ES_device_info.hex')
         self.mock_response(self._READ_DEVICE_RUNNING_DATA, 'GW5048D-ES_running_data.hex')
         self.mock_response(self._READ_DEVICE_SETTINGS_DATA, 'GW5048D-ES_settings_data.hex')
+        self.mock_response(Aa55ReadCommand(1793, 1), 'aa557fc0019a08000000000000007f0360')
+        self.mock_response(Aa55ReadCommand(1800, 1), 'aa557fc0019a02007f035a')
 
     def test_GW5048D_ES_device_info(self):
         self.loop.run_until_complete(self.read_device_info())
@@ -163,6 +167,16 @@ class GW5048D_ES_Test(EsMock):
         data = self.loop.run_until_complete(self.read_setting('grid_export_limit'))
         self.assertEqual(10000, data)
 
+        data = self.loop.run_until_complete(self.read_setting('eco_mode_1'))
+        self.assertEqual(
+            "EcoModeV1(id_='eco_mode_1', offset=1793, name='Eco Mode Group 1', size_=8, unit='', kind=<SensorKind.BAT: 4>)",
+            repr(data))
+        data = self.loop.run_until_complete(self.read_setting('eco_mode_2_switch'))
+        self.assertEqual(0, data)
+
+    def test_write_setting(self):
+        self.loop.run_until_complete(self.write_setting('eco_mode_2_switch', 0))
+
 
 class GW5048_EM_Test(EsMock):
 

{goodwe-0.3.4 → goodwe-0.3.6}/tests/test_et.py

@@ -14,7 +14,7 @@ class EtMock(TestCase, ET):
     def __init__(self, methodName='runTest'):
         TestCase.__init__(self, methodName)
         ET.__init__(self, "localhost")
-        self.sensor_map = {s.id_: s.unit for s in self.sensors()}
+        self.sensor_map = {s.id_: s for s in self.sensors()}
         self._mock_responses = {}
         self._list_of_requests = []
 
@@ -28,6 +28,8 @@ class EtMock(TestCase, ET):
         if filename is not None:
             if 'ILLEGAL DATA ADDRESS' == filename:
                 raise RequestRejectedException('ILLEGAL DATA ADDRESS')
+            if 'NO RESPONSE' == filename:
+                raise RequestFailedException()
             with open(root_dir + '/sample/et/' + filename, 'r') as f:
                 response = bytes.fromhex(f.read())
                 if not command.validator(response):
@@ -38,10 +40,11 @@ class EtMock(TestCase, ET):
             self._list_of_requests.append(command.request)
             return ProtocolResponse(bytes.fromhex("aa55f700010203040506070809"), command)
 
-    def assertSensor(self, sensor, expected_value, expected_unit, data):
-        self.assertEqual(expected_value, data.get(sensor))
-        self.assertEqual(expected_unit, self.sensor_map.get(sensor))
-        self.sensor_map.pop(sensor)
+    def assertSensor(self, sensor_name, expected_value, expected_unit, data):
+        self.assertEqual(expected_value, data.get(sensor_name))
+        sensor = self.sensor_map.get(sensor_name)
+        self.assertEqual(expected_unit, sensor.unit)
+        self.sensor_map.pop(sensor_name)
 
     @classmethod
     def setUpClass(cls):
@@ -78,13 +81,15 @@ class GW10K_ET_Test(EtMock):
     def test_GW10K_ET_runtime_data(self):
         # Reset sensors
         self.loop.run_until_complete(self.read_device_info())
-        self.sensor_map = {s.id_: s.unit for s in self.sensors()}
+        self.sensor_map = {s.id_: s for s in self.sensors()}
 
         data = self.loop.run_until_complete(self.read_runtime_data())
         self.assertEqual(145, len(data))
 
+        self.assertEqual(36015, self.sensor_map.get("meter_e_total_exp").offset)
+
         # for sensor in self.sensors():
-        #   print(f"self.assertSensor('{sensor.id_}', {data[sensor.id_]}, '{self.sensor_map.get(sensor.id_)}', data)")
+        #   print(f"self.assertSensor('{sensor.id_}', {data[sensor.id_]}, '{self.sensor_map.get(sensor.id_).unit}', data)")
 
         self.assertSensor('timestamp', datetime.strptime('2021-08-22 11:11:12', '%Y-%m-%d %H:%M:%S'), '', data)
         self.assertSensor('vpv1', 332.6, 'V', data)
@@ -164,7 +169,7 @@ class GW10K_ET_Test(EtMock):
         self.assertSensor('h_total', 9246, 'h', data)
         self.assertSensor("e_day_exp", 9.8, 'kWh', data)
         self.assertSensor("e_total_imp", 58.0, 'kWh', data)
-        self.assertSensor("e_day_imp", None, 'kWh', data)
+        self.assertSensor("e_day_imp", 0, 'kWh', data)
         self.assertSensor("e_load_total", 8820.2, 'kWh', data)
         self.assertSensor("e_load_day", 11.6, 'kWh', data)
         self.assertSensor("e_bat_charge_total", 2758.1, 'kWh', data)
@@ -457,14 +462,14 @@ class GW6000_EH_Test(EtMock):
         self.assertSensor("e_total_exp", 58.6, 'kWh', data)
         self.assertSensor('h_total', 33, 'h', data)
         self.assertSensor("e_day_exp", 21.6, 'kWh', data)
-        self.assertSensor("e_total_imp", None, 'kWh', data)
-        self.assertSensor("e_day_imp", None, 'kWh', data)
+        self.assertSensor("e_total_imp", 0, 'kWh', data)
+        self.assertSensor("e_day_imp", 0, 'kWh', data)
         self.assertSensor("e_load_total", 70.1, 'kWh', data)
         self.assertSensor("e_load_day", 27.1, 'kWh', data)
-        self.assertSensor("e_bat_charge_total", None, 'kWh', data)
-        self.assertSensor("e_bat_charge_day", None, 'kWh', data)
-        self.assertSensor("e_bat_discharge_total", None, 'kWh', data)
-        self.assertSensor("e_bat_discharge_day", None, 'kWh', data)
+        self.assertSensor("e_bat_charge_total", 0, 'kWh', data)
+        self.assertSensor("e_bat_charge_day", 0, 'kWh', data)
+        self.assertSensor("e_bat_discharge_total", 0, 'kWh', data)
+        self.assertSensor("e_bat_discharge_day", 0, 'kWh', data)
         self.assertSensor('diagnose_result', 117983303, '', data)
         self.assertSensor('diagnose_result_label',
                           'Battery voltage low, Battery SOC low, Battery SOC in back, Discharge Driver On, Self-use load light, Battery Disconnected, Self-use off, Export power limit set, PF value set, Real power limit set',
@@ -486,7 +491,7 @@ class GEH10_1U_10_Test(EtMock):
     def test_GEH10_1U_10_runtime_data(self):
         # Reset sensors
         self.loop.run_until_complete(self.read_device_info())
-        self.sensor_map = {s.id_: s.unit for s in self.sensors()}
+        self.sensor_map = {s.id_: s for s in self.sensors()}
 
         data = self.loop.run_until_complete(self.read_runtime_data())
         self.assertEqual(125, len(data))
@@ -558,8 +563,8 @@ class GEH10_1U_10_Test(EtMock):
         self.assertSensor('e_total_exp', 10273.3, 'kWh', data)
         self.assertSensor('h_total', 3256, 'h', data)
         self.assertSensor('e_day_exp', 16.6, 'kWh', data)
-        self.assertSensor('e_total_imp', None, 'kWh', data)
-        self.assertSensor('e_day_imp', None, 'kWh', data)
+        self.assertSensor('e_total_imp', 0, 'kWh', data)
+        self.assertSensor('e_day_imp', 0, 'kWh', data)
         self.assertSensor('e_load_total', 4393.9, 'kWh', data)
         self.assertSensor('e_load_day', 10.7, 'kWh', data)
         self.assertSensor('e_bat_charge_total', 141.9, 'kWh', data)
@@ -650,6 +655,7 @@ class GW25K_ET_Test(EtMock):
         EtMock.__init__(self, methodName)
         self.mock_response(self._READ_DEVICE_VERSION_INFO, 'GW25K-ET_device_info.hex')
         self.mock_response(self._READ_RUNNING_DATA, 'GW25K-ET_running_data.hex')
+        self.mock_response(self._READ_METER_DATA_EXTENDED2, 'ILLEGAL DATA ADDRESS')
         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')
@@ -672,11 +678,14 @@ class GW25K_ET_Test(EtMock):
     def test_GW25K_ET_runtime_data(self):
         # Reset sensors
         self.loop.run_until_complete(self.read_device_info())
-        self.sensor_map = {s.id_: s.unit for s in self.sensors()}
 
         data = self.loop.run_until_complete(self.read_runtime_data())
         self.assertEqual(237, len(data))
 
+        self.sensor_map = {s.id_: s for s in self.sensors()}
+
+        # self.assertEqual(36104, self.sensor_map.get("meter_e_total_exp").offset)
+
         self.assertSensor('timestamp', datetime.strptime('2023-12-03 14:07:07', '%Y-%m-%d %H:%M:%S'), '', data)
         self.assertSensor('vpv1', 737.9, 'V', data)
         self.assertSensor('ipv1', 1.4, 'A', data)
@@ -771,7 +780,7 @@ class GW25K_ET_Test(EtMock):
         self.assertSensor('e_bat_charge_total', 91.3, 'kWh', data)
         self.assertSensor('e_bat_charge_day', 11.0, 'kWh', data)
         self.assertSensor('e_bat_discharge_total', 69.6, 'kWh', data)
-        self.assertSensor('e_bat_discharge_day', None, 'kWh', data)
+        self.assertSensor('e_bat_discharge_day', 0, 'kWh', data)
         self.assertSensor('diagnose_result', 33816960, '', data)
         self.assertSensor('diagnose_result_label',
                           'BMS: Discharge current low, APP: Discharge current too low, BMS: Charge disabled, PF value set',
@@ -926,6 +935,7 @@ class GW29K9_ET_Test(EtMock):
         EtMock.__init__(self, methodName)
         self.mock_response(self._READ_DEVICE_VERSION_INFO, 'GW29K9-ET_device_info.hex')
         self.mock_response(self._READ_RUNNING_DATA, 'GW29K9-ET_running_data.hex')
+        self.mock_response(self._READ_METER_DATA_EXTENDED2, 'ILLEGAL DATA ADDRESS')
         self.mock_response(self._READ_METER_DATA_EXTENDED, 'GW29K9-ET_meter_data.hex')
         self.mock_response(self._READ_BATTERY_INFO, 'GW29K9-ET_battery_info.hex')
         self.mock_response(self._READ_BATTERY2_INFO, 'GW29K9-ET_battery2_info.hex')
@@ -949,11 +959,12 @@ class GW29K9_ET_Test(EtMock):
     def test_GW29K9_ET_runtime_data(self):
         # Reset sensors
         self.loop.run_until_complete(self.read_device_info())
-        self.sensor_map = {s.id_: s.unit for s in self.sensors()}
 
         data = self.loop.run_until_complete(self.read_runtime_data())
         self.assertEqual(211, len(data))
 
+        self.sensor_map = {s.id_: s for s in self.sensors()}
+
         self.assertSensor('timestamp', datetime.strptime('2024-01-17 14:49:14', '%Y-%m-%d %H:%M:%S'), '', data)
         self.assertSensor('vpv1', 682.9, 'V', data)
         self.assertSensor('ipv1', 1.5, 'A', data)
@@ -1042,13 +1053,13 @@ class GW29K9_ET_Test(EtMock):
         self.assertSensor('h_total', 1175, 'h', data)
         self.assertSensor('e_day_exp', 1.2, 'kWh', data)
         self.assertSensor('e_total_imp', 8.7, 'kWh', data)
-        self.assertSensor('e_day_imp', None, 'kWh', data)
+        self.assertSensor('e_day_imp', 0, 'kWh', data)
         self.assertSensor('e_load_total', 10742.2, 'kWh', data)
         self.assertSensor('e_load_day', 43.8, 'kWh', data)
-        self.assertSensor('e_bat_charge_total', None, 'kWh', data)
-        self.assertSensor('e_bat_charge_day', None, 'kWh', data)
-        self.assertSensor('e_bat_discharge_total', None, 'kWh', data)
-        self.assertSensor('e_bat_discharge_day', None, 'kWh', data)
+        self.assertSensor('e_bat_charge_total', 0, 'kWh', data)
+        self.assertSensor('e_bat_charge_day', 0, 'kWh', data)
+        self.assertSensor('e_bat_discharge_total', 0, 'kWh', data)
+        self.assertSensor('e_bat_discharge_day', 0, 'kWh', data)
         self.assertSensor('diagnose_result', 33816782, '', data)
         self.assertSensor('diagnose_result_label',
                           'Battery SOC low, Battery SOC in back, BMS: Discharge disabled, '
@@ -1096,32 +1107,6 @@ class GW29K9_ET_Test(EtMock):
         self.assertSensor('meter_current1', 4.6, 'A', data)
         self.assertSensor('meter_current2', 6.0, 'A', data)
         self.assertSensor('meter_current3', 13.6, 'A', data)
-        self.assertSensor('battery_bms', None, '', data)
-        self.assertSensor('battery_index', None, '', data)
-        self.assertSensor('battery_status', None, '', data)
-        self.assertSensor('battery_temperature', None, 'C', data)
-        self.assertSensor('battery_charge_limit', None, 'A', data)
-        self.assertSensor('battery_discharge_limit', None, 'A', data)
-        self.assertSensor('battery_error_l', None, '', data)
-        self.assertSensor('battery_soc', None, '%', data)
-        self.assertSensor('battery_soh', None, '%', data)
-        self.assertSensor('battery_modules', None, '', data)
-        self.assertSensor('battery_warning_l', None, '', data)
-        self.assertSensor('battery_protocol', None, '', data)
-        self.assertSensor('battery_error_h', None, '', data)
-        self.assertSensor('battery_error', None, '', data)
-        self.assertSensor('battery_warning_h', None, '', data)
-        self.assertSensor('battery_warning', None, '', data)
-        self.assertSensor('battery_sw_version', None, '', data)
-        self.assertSensor('battery_hw_version', None, '', data)
-        self.assertSensor('battery_max_cell_temp_id', None, '', data)
-        self.assertSensor('battery_min_cell_temp_id', None, '', data)
-        self.assertSensor('battery_max_cell_voltage_id', None, '', data)
-        self.assertSensor('battery_min_cell_voltage_id', None, '', data)
-        self.assertSensor('battery_max_cell_temp', None, 'C', data)
-        self.assertSensor('battery_min_cell_temp', None, 'C', data)
-        self.assertSensor('battery_max_cell_voltage', None, 'V', data)
-        self.assertSensor('battery_min_cell_voltage', None, 'V', data)
         self.assertSensor('battery2_status', 0, '', data)
         self.assertSensor('battery2_temperature', 0.0, 'C', data)
         self.assertSensor('battery2_charge_limit', 0, 'A', data)
@@ -1196,3 +1181,26 @@ class GW29K9_ET_Test(EtMock):
         self.assertSensor('apparent_power3', 0, 'VA', data)
 
         self.assertFalse(self.sensor_map, f"Some sensors were not tested {self.sensor_map}")
+
+
+class GW5K_BT_Test(EtMock):
+
+    def __init__(self, methodName='runTest'):
+        EtMock.__init__(self, methodName)
+        self.mock_response(self._READ_DEVICE_VERSION_INFO, 'GW5K-BT_device_info.hex')
+        self.mock_response(ModbusReadCommand(self.comm_addr, 47547, 6), 'NO RESPONSE')
+
+    def test_GW5K_BT_device_info(self):
+        self.loop.run_until_complete(self.read_device_info())
+        self.assertEqual('GW5K-BT', self.model_name)
+        self.assertEqual('95000BTU203W0000', self.serial_number)
+        self.assertEqual(5000, self.rated_power)
+        self.assertEqual(0, self.modbus_version)
+        self.assertEqual(254, self.ac_output_type)
+        self.assertEqual(3, self.dsp1_version)
+        self.assertEqual(3, self.dsp2_version)
+        self.assertEqual(124, self.dsp_svn_version)
+        self.assertEqual(11, self.arm_version)
+        self.assertEqual(147, self.arm_svn_version)
+        self.assertEqual('04029-03-S10', self.firmware)
+        self.assertEqual('02041-11-S00', self.arm_firmware)

{goodwe-0.3.4 → goodwe-0.3.6}/tests/test_sensor.py

@@ -155,6 +155,16 @@ class TestUtils(TestCase):
         data = MockResponse("ffffffff")
         self.assertIsNone(testee.read(data))
 
+    def test_energy8(self):
+        testee = Energy8("", 0, "", None)
+
+        data = MockResponse("0000000000015b41")
+        self.assertEqual(888.97, testee.read(data))
+        data = MockResponse("0000000000038E6C")
+        self.assertEqual(2330.68, testee.read(data))
+        data = MockResponse("ffffffffffffffff")
+        self.assertIsNone(testee.read(data))
+
     def test_timestamp(self):
         testee = Timestamp("", 0, "", None)
 

goodwe-0.3.4/VERSION

@@ -1 +0,0 @@
-0.3.4