Add on-grid discharge stop SOC control for Growatt MIN devices (#160634)

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

homeassistant/components/growatt_server/number.py

@@ -68,15 +68,25 @@ MIN_NUMBER_TYPES: tuple[GrowattNumberEntityDescription, ...] = (
         native_unit_of_measurement=PERCENTAGE,
     ),
     GrowattNumberEntityDescription(
-        key="battery_discharge_soc_limit",
-        translation_key="battery_discharge_soc_limit",
-        api_key="wdisChargeSOCLowLimit",  # Key returned by V1 API
+        key="battery_discharge_soc_limit",  # Keep original key to preserve unique_id
+        translation_key="battery_discharge_soc_limit_off_grid",
+        api_key="wdisChargeSOCLowLimit",  # Key returned by V1 API (off-grid)
         write_key="discharge_stop_soc",  # Key used to write parameter
         native_step=1,
         native_min_value=0,
         native_max_value=100,
         native_unit_of_measurement=PERCENTAGE,
     ),
+    GrowattNumberEntityDescription(
+        key="battery_discharge_soc_limit_on_grid",
+        translation_key="battery_discharge_soc_limit_on_grid",
+        api_key="onGridDischargeStopSOC",  # Key returned by V1 API (on-grid)
+        write_key="on_grid_discharge_stop_soc",  # Key used to write parameter
+        native_step=1,
+        native_min_value=0,
+        native_max_value=100,
+        native_unit_of_measurement=PERCENTAGE,
+    ),
 )
 
 

homeassistant/components/growatt_server/strings.json

@@ -53,8 +53,11 @@
       "battery_discharge_power_limit": {
         "name": "Battery discharge power limit"
       },
-      "battery_discharge_soc_limit": {
-        "name": "Battery discharge SOC limit"
+      "battery_discharge_soc_limit_off_grid": {
+        "name": "Battery discharge SOC limit (off-grid)"
+      },
+      "battery_discharge_soc_limit_on_grid": {
+        "name": "Battery discharge SOC limit (on-grid)"
       }
     },
     "sensor": {

tests/components/growatt_server/conftest.py

@@ -64,7 +64,8 @@ def mock_growatt_v1_api():
             "chargePowerCommand": 50,  # 50% charge power - read by number entity
             "wchargeSOCLowLimit": 10,  # 10% charge stop SOC - read by number entity
             "disChargePowerCommand": 80,  # 80% discharge power - read by number entity
-            "wdisChargeSOCLowLimit": 20,  # 20% discharge stop SOC - read by number entity
+            "wdisChargeSOCLowLimit": 20,  # 20% discharge stop SOC (off-grid) - read by number entity
+            "onGridDischargeStopSOC": 15,  # 15% on-grid discharge stop SOC - read by number entity
         }
 
         # Called by MIN device coordinator during refresh

tests/components/growatt_server/snapshots/test_number.ambr

@@ -176,7 +176,7 @@
     'state': '80',
   })
 # ---
-# name: test_number_entities[number.min123456_battery_discharge_soc_limit-entry]
+# name: test_number_entities[number.min123456_battery_discharge_soc_limit_off_grid-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -194,7 +194,7 @@
     'disabled_by': None,
     'domain': 'number',
     'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'number.min123456_battery_discharge_soc_limit',
+    'entity_id': 'number.min123456_battery_discharge_soc_limit_off_grid',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -202,25 +202,25 @@
     'labels': set({
     }),
     'name': None,
-    'object_id_base': 'Battery discharge SOC limit',
+    'object_id_base': 'Battery discharge SOC limit (off-grid)',
     'options': dict({
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': 'Battery discharge SOC limit',
+    'original_name': 'Battery discharge SOC limit (off-grid)',
     'platform': 'growatt_server',
     'previous_unique_id': None,
     'suggested_object_id': None,
     'supported_features': 0,
-    'translation_key': 'battery_discharge_soc_limit',
+    'translation_key': 'battery_discharge_soc_limit_off_grid',
     'unique_id': 'MIN123456_battery_discharge_soc_limit',
     'unit_of_measurement': '%',
   })
 # ---
-# name: test_number_entities[number.min123456_battery_discharge_soc_limit-state]
+# name: test_number_entities[number.min123456_battery_discharge_soc_limit_off_grid-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'MIN123456 Battery discharge SOC limit',
+      'friendly_name': 'MIN123456 Battery discharge SOC limit (off-grid)',
       'max': 100,
       'min': 0,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -228,10 +228,69 @@
       'unit_of_measurement': '%',
     }),
     'context': <ANY>,
-    'entity_id': 'number.min123456_battery_discharge_soc_limit',
+    'entity_id': 'number.min123456_battery_discharge_soc_limit_off_grid',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '20',
   })
 # ---
+# name: test_number_entities[number.min123456_battery_discharge_soc_limit_on_grid-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max': 100,
+      'min': 0,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 1,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'number',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'number.min123456_battery_discharge_soc_limit_on_grid',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'object_id_base': 'Battery discharge SOC limit (on-grid)',
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Battery discharge SOC limit (on-grid)',
+    'platform': 'growatt_server',
+    'previous_unique_id': None,
+    'suggested_object_id': None,
+    'supported_features': 0,
+    'translation_key': 'battery_discharge_soc_limit_on_grid',
+    'unique_id': 'MIN123456_battery_discharge_soc_limit_on_grid',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_number_entities[number.min123456_battery_discharge_soc_limit_on_grid-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'MIN123456 Battery discharge SOC limit (on-grid)',
+      'max': 100,
+      'min': 0,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 1,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'number.min123456_battery_discharge_soc_limit_on_grid',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '15',
+  })
+# ---

tests/components/growatt_server/test_number.py

@@ -72,12 +72,21 @@ async def test_all_number_entities_service_calls(
     mock_growatt_v1_api,
 ) -> None:
     """Test service calls work for all number entities."""
-    # Test all four number entities
+    # Test all five number entities
     test_cases = [
         ("number.min123456_battery_charge_power_limit", "charge_power", 75),
         ("number.min123456_battery_charge_soc_limit", "charge_stop_soc", 85),
         ("number.min123456_battery_discharge_power_limit", "discharge_power", 90),
-        ("number.min123456_battery_discharge_soc_limit", "discharge_stop_soc", 25),
+        (
+            "number.min123456_battery_discharge_soc_limit_off_grid",
+            "discharge_stop_soc",
+            25,
+        ),
+        (
+            "number.min123456_battery_discharge_soc_limit_on_grid",
+            "on_grid_discharge_stop_soc",
+            30,
+        ),
     ]
 
     for entity_id, expected_write_key, test_value in test_cases:
@@ -110,6 +119,7 @@ async def test_number_missing_data(
         "wchargeSOCLowLimit": 10,
         "disChargePowerCommand": 80,
         "wdisChargeSOCLowLimit": 20,
+        "onGridDischargeStopSOC": 15,
     }
 
     mock_config_entry.add_to_hass(hass)
@@ -228,6 +238,7 @@ async def test_number_coordinator_data_update(
         "wchargeSOCLowLimit": 10,
         "disChargePowerCommand": 80,
         "wdisChargeSOCLowLimit": 20,
+        "onGridDischargeStopSOC": 15,
     }
 
     # Advance time to trigger coordinator refresh