feat: add Max Output Power control for hybrid inverters

Author: mkuthan

README.md

@@ -42,13 +42,13 @@ After successful configuration, the integration creates a new entity for your in
 
 All Solis inverters should be supported, although the integration has been tested with the following models:
 
-| Model Name               | Model Id | Hybrid |
+| Model Name               | Model Id | Type   |
 | ------------------------ | -------- | ------ |
-| S6-EH3P(8-15)K02-NV-YD-L | 3331     | ✅ |
-| S6-EH3P(5-10)K-H         | 3306     | ✅ |
-| RHI-3P(3-10)K-HVES-5G    | CA       | ✅ |
-| S6-GR1P(2.5-6)K          | 0200     | ❌ |
-| S5-GR3P(3-20)K           | 0507     | ❌ |
+| S6-EH3P(8-15)K02-NV-YD-L | 3331     | hybrid |
+| S6-EH3P(5-10)K-H         | 3306     | hybrid |
+| RHI-3P(3-10)K-HVES-5G    | CA       | hybrid |
+| S6-GR1P(2.5-6)K          | 0200     | string |
+| S5-GR3P(3-20)K           | 0507     | string |
 
 > [!NOTE]
 > If your inverter is not listed above, please open a GitHub issue using the "New Solis Inverter Support Request" template.
@@ -58,11 +58,17 @@ All Solis inverters should be supported, although the integration has been teste
 
 The integration provides a user-friendly interface to control your inverter settings. It allows you to:
 
-* ⚡ Control storage modes: "Self-Use", "Feed-In Priority" and "Off-Grid" (hybrid inverters only)
-* ⏱️ Schedule charge and discharge slots (hybrid inverters only)
-* 🛠️ "Battery Reserve" and "Allow Grid Charging" switches (hybrid inverters only)
-* ⚖️ Set maximum export power
-* 🔌 Switch the inverter on or off
+* ⚡ Control storage modes: "Self-Use", "Feed-In Priority" and "Off-Grid" 🟢
+* ⏱️ Schedule charge and discharge slots 🟢
+* Switch the inverter on or off 🟢 ⚪️
+* Toggle "Battery Reserve" 🟢
+* Toggle "Allow Grid Charging" 🟢
+* Set maximum output power 🟢
+* Set maximum export power 🟢
+* Set power limit ⚪️
+
+🟢 - Hybrid inverter  
+⚪️ - String inverter
 
 ![Inverter Controls](inverter_controls.png)
 

custom_components/solis_cloud_control/inverters/inverter.py

@@ -246,6 +246,11 @@ def get_discharge_slot(self, slot_number: int) -> InverterChargeDischargeSlot |
             return None
 
 
+@dataclass(frozen=True)
+class InverterMaxOutputPower:
+    cid: int = 376
+
+
 @dataclass(frozen=True)
 class InverterMaxExportPower:
     cid: int = 499
@@ -302,6 +307,7 @@ class Inverter:
     storage_mode: InverterStorageMode | None = None
     charge_discharge_settings: InverterChargeDischargeSettings | None = None
     charge_discharge_slots: InverterChargeDischargeSlots | None = None
+    max_output_power: InverterMaxOutputPower | None = None
     max_export_power: InverterMaxExportPower | None = None
     power_limit: InverterPowerLimit | None = None
     battery_reserve_soc: InverterBatteryReserveSOC | None = None
@@ -332,6 +338,7 @@ def create_hybrid_inverter(
             storage_mode=InverterStorageMode(),
             charge_discharge_settings=InverterChargeDischargeSettings(),
             charge_discharge_slots=InverterChargeDischargeSlots(),
+            max_output_power=InverterMaxOutputPower(),
             max_export_power=InverterMaxExportPower(),
             battery_reserve_soc=InverterBatteryReserveSOC(),
             battery_over_discharge_soc=InverterBatteryOverDischargeSOC(),
@@ -355,6 +362,8 @@ def all_cids(self) -> list[int]:
             cids.append(self.charge_discharge_settings.cid)
         if self.charge_discharge_slots:
             cids.extend(self.charge_discharge_slots.all_cids)
+        if self.max_output_power:
+            cids.append(self.max_output_power.cid)
         if self.max_export_power:
             cids.append(self.max_export_power.cid)
         if self.power_limit:

custom_components/solis_cloud_control/number.py

@@ -13,6 +13,7 @@
     InverterBatteryOverDischargeSOC,
     InverterChargeDischargeSlot,
     InverterMaxExportPower,
+    InverterMaxOutputPower,
     InverterPowerLimit,
 )
 from custom_components.solis_cloud_control.utils.safe_converters import safe_get_float_value
@@ -84,6 +85,19 @@ async def async_setup_entry(
                 ]
             )
 
+    if inverter.max_output_power is not None:
+        entities.append(
+            MaxOutputPower(
+                coordinator=coordinator,
+                entity_description=NumberEntityDescription(
+                    key="max_output_power",
+                    name="Max Output Power",
+                    icon="mdi:lightning-bolt-outline",
+                ),
+                max_output_power=inverter.max_output_power,
+            )
+        )
+
     if inverter.max_export_power is not None:
         entities.append(
             MaxExportPower(
@@ -210,6 +224,32 @@ async def async_set_native_value(self, value: float) -> None:
         await self.coordinator.control(self.charge_discharge_slot.soc_cid, value_str)
 
 
+class MaxOutputPower(SolisCloudControlEntity, NumberEntity):
+    def __init__(
+        self,
+        coordinator: SolisCloudControlCoordinator,
+        entity_description: NumberEntityDescription,
+        max_output_power: InverterMaxOutputPower,
+    ) -> None:
+        super().__init__(coordinator, entity_description, max_output_power.cid)
+        self.max_output_power = max_output_power
+
+        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.max_output_power.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 max output power to %f (value: %s)", value, value_str)
+        await self.coordinator.control(self.max_output_power.cid, value_str)
+
+
 class MaxExportPower(SolisCloudControlEntity, NumberEntity):
     def __init__(
         self,

tests/conftest.py

@@ -19,6 +19,7 @@
     InverterChargeDischargeSlots,
     InverterInfo,
     InverterMaxExportPower,
+    InverterMaxOutputPower,
     InverterOnOff,
     InverterStorageMode,
 )
@@ -93,6 +94,7 @@ def any_inverter(any_inverter_info: InverterInfo) -> Inverter:
         storage_mode=InverterStorageMode(),
         charge_discharge_settings=InverterChargeDischargeSettings(),
         charge_discharge_slots=InverterChargeDischargeSlots(),
+        max_output_power=InverterMaxOutputPower(),
         max_export_power=InverterMaxExportPower(),
         power_limit=InverterPowerLimit(),
         battery_reserve_soc=InverterBatteryReserveSOC(),

tests/test_init.py

@@ -59,7 +59,7 @@ async def test_async_setup_entry(hass, mock_api_client, mock_config_entry, any_i
     entries = er.async_entries_for_config_entry(entity_registry, mock_config_entry.entry_id)
 
     platform_counts = Counter(entry.domain for entry in entries)
-    assert platform_counts[Platform.NUMBER] == 26
+    assert platform_counts[Platform.NUMBER] == 27
     assert platform_counts[Platform.SELECT] == 1
     assert platform_counts[Platform.SENSOR] == 7
     assert platform_counts[Platform.SWITCH] == 15

tests/test_number.py

@@ -8,6 +8,7 @@
     BatteryCurrent,
     BatterySoc,
     MaxExportPower,
+    MaxOutputPower,
     PowerLimit,
 )
 
@@ -127,6 +128,54 @@ async def test_set_native_value(self, battery_soc_entity, value, expected_str):
         )
 
 
+@pytest.fixture
+def max_output_power_entity(mock_coordinator, any_inverter):
+    return MaxOutputPower(
+        coordinator=mock_coordinator,
+        entity_description=NumberEntityDescription(
+            key="any_key",
+            name="any name",
+        ),
+        max_output_power=any_inverter.max_output_power,
+    )
+
+
+class TestMaxOutputPower:
+    def test_attributes(self, max_output_power_entity):
+        assert max_output_power_entity.native_min_value == 0
+        assert max_output_power_entity.native_max_value == 100
+        assert max_output_power_entity.native_step == 1
+        assert max_output_power_entity.native_unit_of_measurement == PERCENTAGE
+
+    @pytest.mark.parametrize(
+        ("value", "expected"),
+        [
+            ("0", 0.0),
+            ("50", 50.0),
+            ("100", 100.0),
+            ("not a number", None),
+            (None, None),
+        ],
+    )
+    def test_native_value(self, max_output_power_entity, value, expected):
+        max_output_power_entity.coordinator.data = {max_output_power_entity.max_output_power.cid: value}
+        assert max_output_power_entity.native_value == expected
+
+    @pytest.mark.parametrize(
+        ("value", "expected_str"),
+        [
+            (0.1, "0"),
+            (50.4, "50"),
+            (99.9, "100"),
+        ],
+    )
+    async def test_set_native_value(self, max_output_power_entity, value, expected_str):
+        await max_output_power_entity.async_set_native_value(value)
+        max_output_power_entity.coordinator.control.assert_awaited_once_with(
+            max_output_power_entity.max_output_power.cid, expected_str
+        )
+
+
 @pytest.fixture
 def max_export_power_entity(mock_coordinator, any_inverter):
     return MaxExportPower(