Feature sungrow firmware

packages/helpermodules/update_config.py

@@ -51,7 +51,7 @@
 
 
 class UpdateConfig:
-    DATASTORE_VERSION = 71
+    DATASTORE_VERSION = 72
     valid_topic = [
         "^openWB/bat/config/configured$",
         "^openWB/bat/config/power_limit_mode$",
@@ -1847,14 +1847,7 @@ def upgrade_datastore_64(self) -> None:
         self.__update_topic("openWB/system/datastore_version", 65)
 
     def upgrade_datastore_65(self) -> None:
-        def upgrade(topic: str, payload) -> None:
-            if re.search("openWB/system/device/[0-9]+", topic) is not None:
-                payload = decode_payload(payload)
-                # update firmware of Sungrow
-                if payload.get("type") == "sungrow" and "firmware" not in payload["configuration"]:
-                    payload["configuration"].update({"firmware": "v111"})
-                Pub().pub(topic, payload)
-        self._loop_all_received_topics(upgrade)
+        # sungrow version fixed in upgrade_datastore_71
         self.__update_topic("openWB/system/datastore_version", 66)
 
     def upgrade_datastore_66(self) -> None:
@@ -1914,3 +1907,19 @@ def upgrade(topic: str, payload) -> None:
                 Pub().pub(topic, payload)
         self._loop_all_received_topics(upgrade)
         self.__update_topic("openWB/system/datastore_version", 71)
+
+    def upgrade_datastore_71(self) -> None:
+        def upgrade(topic: str, payload) -> None:
+            if re.search("openWB/system/device/[0-9]+", topic) is not None:
+                payload = decode_payload(payload)
+                # update firmware of Sungrow
+                if payload.get("type") == "sungrow":
+                    if "firmware" not in payload["configuration"]:
+                        payload["configuration"].update({"firmware": "v1"})
+                    elif payload["configuration"].get("firmware") == "v111":
+                        payload["configuration"]["firmware"] = "v1"
+                    elif payload["configuration"].get("firmware") == "v112":
+                        payload["configuration"]["firmware"] = "v2"
+                Pub().pub(topic, payload)
+        self._loop_all_received_topics(upgrade)
+        self.__update_topic("openWB/system/datastore_version", 72)

packages/modules/devices/sungrow/sungrow/bat.py

@@ -31,8 +31,8 @@ def update(self) -> None:
         unit = self.device_config.configuration.modbus_id
         soc = int(self.__tcp_client.read_input_registers(13022, ModbusDataType.UINT_16, unit=unit) / 10)
 
-        if Firmware(self.device_config.configuration.firmware) == Firmware.v112:
-            bat_power = self.__tcp_client.read_input_registers(13021, ModbusDataType.INT_16, unit=unit)
+        if Firmware(self.device_config.configuration.firmware) == Firmware.v2:
+            bat_power = self.__tcp_client.read_input_registers(13021, ModbusDataType.INT_16, unit=unit) * -1
         else:
             bat_power = self.__tcp_client.read_input_registers(13021, ModbusDataType.UINT_16, unit=unit)
 

packages/modules/devices/sungrow/sungrow/config.py

@@ -12,7 +12,7 @@ def __init__(self,
                  port: int = 502,
                  modbus_id: int = 1,
                  version: Version = Version.SG,
-                 firmware: Firmware = Firmware.v111):
+                 firmware: Firmware = Firmware.v1):
         self.ip_address = ip_address
         self.port = port
         self.modbus_id = modbus_id

packages/modules/devices/sungrow/sungrow/firmware.py

@@ -2,5 +2,5 @@
 
 
 class Firmware(Enum):
-    v111 = "v111"
-    v112 = "v112"
+    v1 = "v1"  # bis 11/2024
+    v2 = "v2"  # ab 11/2024