refactor: move the four already-conformant entity classes onto GrowattEntity

GrowattGenericNumber, GrowattGenericSelect, GrowattGenericTime and
GrowattModTouTime already set has_entity_name = True and do not bake the
device name into _attr_name, so they are on the same convention
GrowattEntity provides. Moving them removes the duplicated unique_id
assignment and device_info property with no user-visible change.

The other 16 classes set has_entity_name = False and build names like
f'{entry_name} Work Mode'. GrowattEntity sets the flag True, which makes
Home Assistant prefix the device name itself -- so migrating those
unchanged would render 'Growatt Growatt Work Mode'. They need the baked-in
prefixes stripped, which changes displayed names, so they are deliberately
left for a separate decision.

Co-Authored-By: Claude <noreply@anthropic.com>

Author: 0xAHA

custom_components/growatt_modbus/number.py

@@ -17,6 +17,7 @@
     get_device_type_for_control,
 )
 from .coordinator import GrowattModbusCoordinator
+from .entity import GrowattEntity
 from .growatt_modbus import ModbusWriteError
 
 _LOGGER = logging.getLogger(__name__)
@@ -132,10 +133,10 @@ async def async_setup_entry(
         async_add_entities(entities)
 
 
-class GrowattGenericNumber(CoordinatorEntity, NumberEntity):
+class GrowattGenericNumber(GrowattEntity, NumberEntity):
     """Generic number entity for any numeric control."""
 
-    _attr_has_entity_name = True
+    # has_entity_name comes from GrowattEntity, as do unique_id and device_info.
     _attr_mode = NumberMode.SLIDER
     _attr_entity_category = EntityCategory.CONFIG
 
@@ -147,9 +148,13 @@ def __init__(
         control_config: dict,
     ) -> None:
         """Initialize the number entity."""
-        super().__init__(coordinator)
+        super().__init__(
+            coordinator,
+            config_entry,
+            control_name,
+            get_device_type_for_control(control_name),
+        )
 
-        self._config_entry = config_entry
         self._control_name = control_name
         self._control_config = control_config
 
@@ -170,7 +175,6 @@ def __init__(
         }
         friendly_name = friendly_overrides.get(control_name, control_name.replace('_', ' ').title())
         self._attr_name = friendly_name
-        self._attr_unique_id = f"{config_entry.entry_id}_{control_name}"
 
         # Set icon
         self._attr_icon = self._get_icon(control_name)
@@ -236,12 +240,6 @@ def _configure_range_and_unit(self):
 
             self._attr_native_unit_of_measurement = unit
 
-    @property
-    def device_info(self) -> dict[str, Any]:
-        """Return device information."""
-        device_type = get_device_type_for_control(self._control_name)
-        return self.coordinator.get_device_info(device_type)
-
     @property
     def native_value(self) -> float | None:
         """Return the current value."""

custom_components/growatt_modbus/select.py

@@ -19,6 +19,7 @@
     MOD_TOU_PERIODS,
 )
 from .coordinator import GrowattModbusCoordinator
+from .entity import GrowattEntity
 from .growatt_modbus import ModbusWriteError
 
 _LOGGER = logging.getLogger(__name__)
@@ -194,10 +195,10 @@ def _async_check_deferred_vpp() -> None:
         config_entry.async_on_unload(_remove_vpp_listener)
 
 
-class GrowattGenericSelect(CoordinatorEntity, SelectEntity):
+class GrowattGenericSelect(GrowattEntity, SelectEntity):
     """Generic select entity for any control with options."""
 
-    _attr_has_entity_name = True
+    # has_entity_name comes from GrowattEntity, as do unique_id and device_info.
     _attr_entity_category = EntityCategory.CONFIG
 
     def __init__(
@@ -208,16 +209,19 @@ def __init__(
         control_config: dict,
     ) -> None:
         """Initialize the select entity."""
-        super().__init__(coordinator)
+        super().__init__(
+            coordinator,
+            config_entry,
+            control_name,
+            get_device_type_for_control(control_name),
+        )
 
-        self._config_entry = config_entry
         self._control_name = control_name
         self._control_config = control_config
 
         # Generate friendly name (e.g., "output_config" -> "Output Config")
         friendly_name = control_name.replace('_', ' ').title()
         self._attr_name = friendly_name
-        self._attr_unique_id = f"{config_entry.entry_id}_{control_name}"
 
         # Set icon based on control type
         self._attr_icon = self._get_icon(control_name)
@@ -236,13 +240,6 @@ def _get_icon(self, control_name: str) -> str:
         }
         return icon_map.get(control_name, 'mdi:tune')
 
-    @property
-    def device_info(self) -> dict[str, Any]:
-        """Return device information."""
-        # Determine device based on control type
-        device_type = get_device_type_for_control(self._control_name)
-        return self.coordinator.get_device_info(device_type)
-
     @property
     def current_option(self) -> str | None:
         """Return the current selected option."""

custom_components/growatt_modbus/time.py

@@ -12,6 +12,7 @@
 
 from .const import DOMAIN, WRITABLE_REGISTERS, CONF_REGISTER_MAP, get_device_type_for_control, DEVICE_TYPE_BATTERY, MOD_TOU_PERIODS
 from .coordinator import GrowattModbusCoordinator
+from .entity import GrowattEntity
 from .growatt_modbus import ModbusWriteError
 
 _LOGGER = logging.getLogger(__name__)
@@ -137,14 +138,14 @@ async def async_set_value(self, value: dt_time) -> None:
             _LOGGER.exception("[WIT-TOU] Period %d %s write error: %s", self._period, slot, err)
 
 
-class GrowattGenericTime(CoordinatorEntity, TimeEntity):
+class GrowattGenericTime(GrowattEntity, TimeEntity):
     """Time entity for inverter time period start/end controls.
 
     Hardware stores time as hex-packed bytes: hours*256 + minutes.
     e.g. 06:00 = 0x0600 = 1536, 22:00 = 0x1600 = 5632.
     """
 
-    _attr_has_entity_name = True
+    # has_entity_name comes from GrowattEntity, as do unique_id and device_info.
     _attr_entity_category = EntityCategory.CONFIG
     _attr_icon = "mdi:clock-outline"
 
@@ -156,19 +157,17 @@ def __init__(
         control_config: dict,
     ) -> None:
         """Initialize the time entity."""
-        super().__init__(coordinator)
-        self._config_entry = config_entry
+        super().__init__(
+            coordinator,
+            config_entry,
+            control_name,
+            get_device_type_for_control(control_name),
+        )
         self._control_name = control_name
         self._control_config = control_config
 
         friendly_name = control_config.get('label') or control_name.replace('_', ' ').title()
         self._attr_name = friendly_name
-        self._attr_unique_id = f"{config_entry.entry_id}_{control_name}"
-
-    @property
-    def device_info(self) -> dict[str, Any]:
-        """Return device information."""
-        return self.coordinator.get_device_info(get_device_type_for_control(self._control_name))
 
     @property
     def native_value(self) -> dt_time | None:
@@ -336,8 +335,12 @@ def __init__(
         is_start: bool,
     ) -> None:
         """Initialize the MOD TOU time entity."""
-        super().__init__(coordinator)
-        self._config_entry = config_entry
+        super().__init__(
+            coordinator,
+            config_entry,
+            f"mod_tou_{period_def['period']}_{'start' if is_start else 'end'}",
+            DEVICE_TYPE_BATTERY,
+        )
         self._period_def = period_def
         self._is_start = is_start
         self._period = period_def["period"]
@@ -351,13 +354,6 @@ def __init__(
             self._data_field = period_def["end_field"]
             self._attr_name = f"TOU Period {self._period} End"
 
-        self._attr_unique_id = f"{config_entry.entry_id}_mod_tou_{self._period}_{'start' if is_start else 'end'}"
-
-    @property
-    def device_info(self) -> dict[str, Any]:
-        """Return device information."""
-        return self.coordinator.get_device_info(DEVICE_TYPE_BATTERY)
-
     @property
     def native_value(self) -> dt_time | None:
         """Return the current time value decoded from the packed register."""