feat: add support for S6-GR1P(2.5-6)K string inverter and implement power limit functionality

Author: mkuthan

README.md

@@ -19,6 +19,10 @@ All Solis hybrid inverters should be supported, although the integration has bee
 * S6-EH3P(8-15)K02-NV-YD-L, model "3331"
 * RHI-3P(3-10)K-HVES-5G, model "CA"
 
+The integration also supports the following Solis string inverters:
+
+* S6-GR1P(2.5-6)K, model "0200"
+
 > [!NOTE]
 > If your inverter is not listed here, please open an issue on GitHub using "New Solis Inverter Support Request" template.
 

custom_components/solis_cloud_control/inverters/inverter.py

@@ -233,6 +233,11 @@ class InverterMaxExportPower:
     scale: float = 1
 
 
+@dataclass
+class InverterPowerLimit:
+    cid: int = 15
+
+
 @dataclass
 class InverterBatteryReserveSOC:
     cid: int = 157
@@ -271,32 +276,72 @@ class InverterBatteryMaxDischargeCurrent:
 @dataclass
 class Inverter:
     info: InverterInfo
-    storage_mode: InverterStorageMode = field(default_factory=InverterStorageMode)
-    charge_discharge_settings: InverterChargeDischargeSettings = field(default_factory=InverterChargeDischargeSettings)
-    charge_discharge_slots: InverterChargeDischargeSlots = field(default_factory=InverterChargeDischargeSlots)
-    max_export_power: InverterMaxExportPower = field(default_factory=InverterMaxExportPower)
-    battery_reserve_soc: InverterBatteryReserveSOC = field(default_factory=InverterBatteryReserveSOC)
-    battery_over_discharge_soc: InverterBatteryOverDischargeSOC = field(default_factory=InverterBatteryOverDischargeSOC)
-    battery_force_charge_soc: InverterBatteryForceChargeSOC = field(default_factory=InverterBatteryForceChargeSOC)
-    battery_recovery_soc: InverterBatteryRecoverySOC = field(default_factory=InverterBatteryRecoverySOC)
-    battery_max_charge_soc: InverterBatteryMaxChargeSOC = field(default_factory=InverterBatteryMaxChargeSOC)
-    battery_max_charge_current: InverterBatteryMaxChargeCurrent = field(default_factory=InverterBatteryMaxChargeCurrent)
-    battery_max_discharge_current: InverterBatteryMaxDischargeCurrent = field(
-        default_factory=InverterBatteryMaxDischargeCurrent
-    )
+    storage_mode: InverterStorageMode | None = None
+    charge_discharge_settings: InverterChargeDischargeSettings | None = None
+    charge_discharge_slots: InverterChargeDischargeSlots | None = None
+    max_export_power: InverterMaxExportPower | None = None
+    power_limit: InverterPowerLimit | None = None
+    battery_reserve_soc: InverterBatteryReserveSOC | None = None
+    battery_over_discharge_soc: InverterBatteryOverDischargeSOC | None = None
+    battery_force_charge_soc: InverterBatteryForceChargeSOC | None = None
+    battery_recovery_soc: InverterBatteryRecoverySOC | None = None
+    battery_max_charge_soc: InverterBatteryMaxChargeSOC | None = None
+    battery_max_charge_current: InverterBatteryMaxChargeCurrent | None = None
+    battery_max_discharge_current: InverterBatteryMaxDischargeCurrent | None = None
+
+    @staticmethod
+    def create_string_inverter(
+        inverter_info: InverterInfo,
+    ) -> "Inverter":
+        return Inverter(
+            info=inverter_info,
+            power_limit=InverterPowerLimit(),
+        )
+
+    @staticmethod
+    def create_hybrid_inverter(
+        inverter_info: InverterInfo,
+    ) -> "Inverter":
+        return Inverter(
+            info=inverter_info,
+            storage_mode=InverterStorageMode(),
+            charge_discharge_settings=InverterChargeDischargeSettings(),
+            charge_discharge_slots=InverterChargeDischargeSlots(),
+            max_export_power=InverterMaxExportPower(),
+            battery_reserve_soc=InverterBatteryReserveSOC(),
+            battery_over_discharge_soc=InverterBatteryOverDischargeSOC(),
+            battery_force_charge_soc=InverterBatteryForceChargeSOC(),
+            battery_recovery_soc=InverterBatteryRecoverySOC(),
+            battery_max_charge_soc=InverterBatteryMaxChargeSOC(),
+            battery_max_charge_current=InverterBatteryMaxChargeCurrent(),
+            battery_max_discharge_current=InverterBatteryMaxDischargeCurrent(),
+        )
 
     @property
     def all_cids(self) -> list[int]:
-        return [
-            self.storage_mode.cid,
-            self.charge_discharge_settings.cid,
-            *self.charge_discharge_slots.all_cids,
-            self.max_export_power.cid,
-            self.battery_reserve_soc.cid,
-            self.battery_over_discharge_soc.cid,
-            self.battery_force_charge_soc.cid,
-            self.battery_recovery_soc.cid,
-            self.battery_max_charge_soc.cid,
-            self.battery_max_charge_current.cid,
-            self.battery_max_discharge_current.cid,
-        ]
+        cids: list[int] = []
+        if self.storage_mode:
+            cids.append(self.storage_mode.cid)
+        if self.charge_discharge_settings:
+            cids.append(self.charge_discharge_settings.cid)
+        if self.charge_discharge_slots:
+            cids.extend(self.charge_discharge_slots.all_cids)
+        if self.max_export_power:
+            cids.append(self.max_export_power.cid)
+        if self.power_limit:
+            cids.append(self.power_limit.cid)
+        if self.battery_reserve_soc:
+            cids.append(self.battery_reserve_soc.cid)
+        if self.battery_over_discharge_soc:
+            cids.append(self.battery_over_discharge_soc.cid)
+        if self.battery_force_charge_soc:
+            cids.append(self.battery_force_charge_soc.cid)
+        if self.battery_recovery_soc:
+            cids.append(self.battery_recovery_soc.cid)
+        if self.battery_max_charge_soc:
+            cids.append(self.battery_max_charge_soc.cid)
+        if self.battery_max_charge_current:
+            cids.append(self.battery_max_charge_current.cid)
+        if self.battery_max_discharge_current:
+            cids.append(self.battery_max_discharge_current.cid)
+        return cids

custom_components/solis_cloud_control/inverters/inverter_factory.py

@@ -34,5 +34,5 @@ async def create_inverter(api_client: SolisCloudControlApiClient, inverter_info:
         _LOGGER.info("Inverter model '%s' created", inverter_info.model)
         return inverter
     except ImportError:
-        _LOGGER.warning("Unknown inverter model '%s', fallback to generic inverter", inverter_info.model)
+        _LOGGER.warning("Unknown inverter model '%s', fallback to generic hybrid inverter", inverter_info.model)
         return Inverter(inverter_info)

custom_components/solis_cloud_control/inverters/model_0200.py

@@ -0,0 +1,10 @@
+from custom_components.solis_cloud_control.api.solis_api import SolisCloudControlApiClient
+from custom_components.solis_cloud_control.inverters.inverter import Inverter, InverterInfo
+
+
+# S6-GR1P(2.5-6)K
+async def create_inverter(
+    inverter_info: InverterInfo,
+    api_client: SolisCloudControlApiClient,  # noqa: ARG001
+) -> Inverter:
+    return Inverter.create_string_inverter(inverter_info)

custom_components/solis_cloud_control/inverters/model_3331.py

@@ -7,7 +7,7 @@ async def create_inverter(
     inverter_info: InverterInfo,
     api_client: SolisCloudControlApiClient,  # noqa: ARG001
 ) -> Inverter:
-    inverter = Inverter(inverter_info)
+    inverter = Inverter.create_hybrid_inverter(inverter_info)
 
     power = inverter_info.power if inverter_info.power is not None else 15_000
     inverter.max_export_power = InverterMaxExportPower(max_value=power, step=100, scale=0.01)

custom_components/solis_cloud_control/inverters/model_ca.py

@@ -7,7 +7,7 @@ async def create_inverter(
     inverter_info: InverterInfo,
     api_client: SolisCloudControlApiClient,  # noqa: ARG001
 ) -> Inverter:
-    inverter = Inverter(inverter_info)
+    inverter = Inverter.create_hybrid_inverter(inverter_info)
 
     power = inverter_info.power if inverter_info.power is not None else 10_000
     inverter.max_export_power = InverterMaxExportPower(max_value=power)

custom_components/solis_cloud_control/number.py

@@ -13,6 +13,7 @@
     InverterBatteryOverDischargeSOC,
     InverterChargeDischargeSlot,
     InverterMaxExportPower,
+    InverterPowerLimit,
 )
 from custom_components.solis_cloud_control.utils.safe_converters import safe_get_float_value
 
@@ -34,65 +35,80 @@ async def async_setup_entry(
 
     slots = inverter.charge_discharge_slots
 
-    for i in range(1, slots.SLOTS_COUNT + 1):
-        entities.extend(
-            [
-                BatteryCurrent(
-                    coordinator=coordinator,
-                    entity_description=NumberEntityDescription(
-                        key=f"slot{i}_charge_current",
-                        name=f"Slot{i} Charge Current",
-                        icon="mdi:battery-plus-outline",
+    if slots is not None:
+        for i in range(1, slots.SLOTS_COUNT + 1):
+            entities.extend(
+                [
+                    BatteryCurrent(
+                        coordinator=coordinator,
+                        entity_description=NumberEntityDescription(
+                            key=f"slot{i}_charge_current",
+                            name=f"Slot{i} Charge Current",
+                            icon="mdi:battery-plus-outline",
+                        ),
+                        charge_discharge_slot=slots.get_charge_slot(i),
+                        battery_max_charge_discharge_current=inverter.battery_max_charge_current,
                     ),
-                    charge_discharge_slot=slots.get_charge_slot(i),
-                    battery_max_charge_discharge_current=inverter.battery_max_charge_current,
-                ),
-                BatteryCurrent(
-                    coordinator=coordinator,
-                    entity_description=NumberEntityDescription(
-                        key=f"slot{i}_discharge_current",
-                        name=f"Slot{i} Discharge Current",
-                        icon="mdi:battery-minus-outline",
+                    BatteryCurrent(
+                        coordinator=coordinator,
+                        entity_description=NumberEntityDescription(
+                            key=f"slot{i}_discharge_current",
+                            name=f"Slot{i} Discharge Current",
+                            icon="mdi:battery-minus-outline",
+                        ),
+                        charge_discharge_slot=slots.get_discharge_slot(i),
+                        battery_max_charge_discharge_current=inverter.battery_max_discharge_current,
                     ),
-                    charge_discharge_slot=slots.get_discharge_slot(i),
-                    battery_max_charge_discharge_current=inverter.battery_max_discharge_current,
-                ),
-                BatterySoc(
-                    coordinator=coordinator,
-                    entity_description=NumberEntityDescription(
-                        key=f"slot{i}_charge_soc",
-                        name=f"Slot{i} Charge SOC",
-                        icon="mdi:battery-plus-outline",
+                    BatterySoc(
+                        coordinator=coordinator,
+                        entity_description=NumberEntityDescription(
+                            key=f"slot{i}_charge_soc",
+                            name=f"Slot{i} Charge SOC",
+                            icon="mdi:battery-plus-outline",
+                        ),
+                        charge_discharge_slot=slots.get_charge_slot(i),
+                        battery_over_discharge_soc=inverter.battery_over_discharge_soc,
+                        battery_max_charge_soc=inverter.battery_max_charge_soc,
                     ),
-                    charge_discharge_slot=slots.get_charge_slot(i),
-                    battery_over_discharge_soc=inverter.battery_over_discharge_soc,
-                    battery_max_charge_soc=inverter.battery_max_charge_soc,
-                ),
-                BatterySoc(
-                    coordinator=coordinator,
-                    entity_description=NumberEntityDescription(
-                        key=f"slot{i}_discharge_soc",
-                        name=f"Slot{i} Discharge SOC",
-                        icon="mdi:battery-minus-outline",
+                    BatterySoc(
+                        coordinator=coordinator,
+                        entity_description=NumberEntityDescription(
+                            key=f"slot{i}_discharge_soc",
+                            name=f"Slot{i} Discharge SOC",
+                            icon="mdi:battery-minus-outline",
+                        ),
+                        charge_discharge_slot=slots.get_discharge_slot(i),
+                        battery_over_discharge_soc=inverter.battery_over_discharge_soc,
+                        battery_max_charge_soc=inverter.battery_max_charge_soc,
                     ),
-                    charge_discharge_slot=slots.get_discharge_slot(i),
-                    battery_over_discharge_soc=inverter.battery_over_discharge_soc,
-                    battery_max_charge_soc=inverter.battery_max_charge_soc,
+                ]
+            )
+
+    if inverter.max_export_power is not None:
+        entities.append(
+            MaxExportPower(
+                coordinator=coordinator,
+                entity_description=NumberEntityDescription(
+                    key="max_export_power",
+                    name="Max Export Power",
+                    icon="mdi:transmission-tower-export",
                 ),
-            ]
+                max_export_power=inverter.max_export_power,
+            )
         )
 
-    entities.append(
-        MaxExportPower(
-            coordinator=coordinator,
-            entity_description=NumberEntityDescription(
-                key="max_export_power",
-                name="Max Export Power",
-                icon="mdi:transmission-tower-export",
-            ),
-            max_export_power=inverter.max_export_power,
+    if inverter.power_limit is not None:
+        entities.append(
+            PowerLimit(
+                coordinator=coordinator,
+                entity_description=NumberEntityDescription(
+                    key="power_limit",
+                    name="Power Limit",
+                    icon="mdi:transmission-tower-export",
+                ),
+                power_limit=inverter.power_limit,
+            )
         )
-    )
 
     async_add_entities(entities)
 
@@ -220,3 +236,29 @@ async def async_set_native_value(self, value: float) -> None:
         value_str = str(int(round(value * self.max_export_power.scale)))
         _LOGGER.info("Setting max export power to %f (value: %s)", value, value_str)
         await self.coordinator.control(self.max_export_power.cid, value_str)
+
+
+class PowerLimit(SolisCloudControlEntity, NumberEntity):
+    def __init__(
+        self,
+        coordinator: SolisCloudControlCoordinator,
+        entity_description: NumberEntityDescription,
+        power_limit: InverterPowerLimit,
+    ) -> None:
+        super().__init__(coordinator, entity_description, power_limit.cid)
+        self.power_limit = power_limit
+
+        self._attr_native_min_value = 0
+        self._attr_native_max_value = 100
+        self._attr_native_step = 1
+        self._attr_native_unit_of_measurement = PERCENTAGE
+
+    @property
+    def native_value(self) -> float | None:
+        value_str = self.coordinator.data.get(self.power_limit.cid)
+        return safe_get_float_value(value_str)
+
+    async def async_set_native_value(self, value: float) -> None:
+        value_str = str(int(round(value)))
+        _LOGGER.info("Setting power limit to %f (value: %s)", value, value_str)
+        await self.coordinator.control(self.power_limit.cid, value_str)

custom_components/solis_cloud_control/select.py

@@ -22,8 +22,10 @@ async def async_setup_entry(
     inverter = entry.runtime_data.inverter
     coordinator = entry.runtime_data.coordinator
 
-    async_add_entities(
-        [
+    entities = []
+
+    if inverter.storage_mode is not None:
+        entities.append(
             StorageModeSelect(
                 coordinator=coordinator,
                 entity_description=SelectEntityDescription(
@@ -33,8 +35,9 @@ async def async_setup_entry(
                 ),
                 storage_mode=inverter.storage_mode,
             )
-        ]
-    )
+        )
+
+    async_add_entities(entities)
 
 
 class StorageModeSelect(SolisCloudControlEntity, SelectEntity):