From 3f7e5dc27d56e4971ecb01eedafc2d6806713db9 Mon Sep 17 00:00:00 2001
From: technorat2 <technorat2@users.noreply.github.com>
Date: Sat, 11 Jul 2026 22:18:33 -0400
Subject: [PATCH 1/2] Add friendly entity names and numeric signal/battery
 sensors

Ported from pjordanandrsn/ha-generac#4 by @technorat2 (commit 7e3b067
"Improve authentication and entity reporting"), entity and telemetry
half, applied unchanged to current upstream:

- Friendly display names derived from each entity's technical name,
  while unique_id keeps using the technical name.
- Signal strength reported as a numeric percentage (measurement), plus a
  device battery percentage sensor and an exercise duration sensor when
  Mobile Link reports them.
- _safe_float() accepts "NN%" strings.
- Entity availability also follows coordinator.last_update_success.
- Diagnostics: tolerate an unloaded entry, redact e-mail addresses, and
  detect IPv6 with IPv6Network.

The authentication half of #4 is carried separately.

Refs binarydev/ha-generac#284

Co-authored-by: Jordan Anderson <paul.jordan.anderson@gmail.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01K2RdXuPegztHA1uMG2fbtk
---
 custom_components/generac/binary_sensor.py |  18 +--
 custom_components/generac/diagnostics.py   |  32 +++--
 custom_components/generac/entity.py        |  68 +++++++++-
 custom_components/generac/image.py         |   3 +-
 custom_components/generac/sensor.py        | 140 ++++++++++++++++-----
 custom_components/generac/weather.py       |   3 +-
 6 files changed, 196 insertions(+), 68 deletions(-)

diff --git a/custom_components/generac/binary_sensor.py b/custom_components/generac/binary_sensor.py
index a01b062..e10ed5e 100644
--- a/custom_components/generac/binary_sensor.py
+++ b/custom_components/generac/binary_sensor.py
@@ -7,7 +7,6 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import DEFAULT_NAME
 from .const import DOMAIN
 from .coordinator import GeneracDataUpdateCoordinator
 from .entity import GeneracEntity
@@ -36,17 +35,13 @@ def sensors() -> Type[GeneracEntity]:
     ]
 
 
-def sensor_name(self, name_label):
-    return f"{DEFAULT_NAME}_{self.device_id}_{name_label}"
-
-
 class GeneracConnectedSensor(GeneracEntity, BinarySensorEntity):
     """generac binary_sensor class."""
 
     @property
     def name(self):
         """Return the name of the binary_sensor."""
-        return sensor_name(self, "is_connected")
+        return self._friendly_name()
 
     @property
     def device_class(self):
@@ -65,12 +60,7 @@ class GeneracConnectingSensor(GeneracEntity, BinarySensorEntity):
     @property
     def name(self):
         """Return the name of the binary_sensor."""
-        return sensor_name(self, "is_connecting")
-
-    @property
-    def device_class(self):
-        """Return the class of this binary_sensor."""
-        return BinarySensorDeviceClass.CONNECTIVITY
+        return self._friendly_name()
 
     @property
     def is_on(self):
@@ -84,7 +74,7 @@ class GeneracMaintenanceAlertSensor(GeneracEntity, BinarySensorEntity):
     @property
     def name(self):
         """Return the name of the binary_sensor."""
-        return sensor_name(self, "has_maintenance_alert")
+        return self._friendly_name()
 
     @property
     def device_class(self):
@@ -103,7 +93,7 @@ class GeneracWarningSensor(GeneracEntity, BinarySensorEntity):
     @property
     def name(self):
         """Return the name of the binary_sensor."""
-        return sensor_name(self, "show_warning")
+        return self._friendly_name()
 
     @property
     def device_class(self):
diff --git a/custom_components/generac/diagnostics.py b/custom_components/generac/diagnostics.py
index c80805c..f1e2168 100644
--- a/custom_components/generac/diagnostics.py
+++ b/custom_components/generac/diagnostics.py
@@ -17,11 +17,20 @@ async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, entry: ConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    coordinator: GeneracDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator: GeneracDataUpdateCoordinator | None = hass.data.get(DOMAIN, {}).get(
+        entry.entry_id
+    )
+    if coordinator is None:
+        return {
+            "status": "not_loaded",
+            "data": {},
+        }
 
     diagnostics_data = {
+        "status": "loaded",
         "data": redact(
-            {gen_id: asdict(item) for gen_id, item in coordinator.data.items()}, False
+            {gen_id: asdict(item) for gen_id, item in (coordinator.data or {}).items()},
+            False,
         ),
     }
 
@@ -31,16 +40,17 @@ async def async_get_config_entry_diagnostics(
 DataDict = dict[str, "str | DataDict"]
 
 
-def redact(data: Any, redact_all: bool):
+def redact(data: Any, redact_all: bool) -> Any:
     if isinstance(data, dict):
         return redact_dict(data, redact_all)
     if isinstance(data, list):
         return redact_array(data, redact_all)
     if isinstance(data, str):
-        if parseaddr(data) == ("", ""):
-            return "REDACTED_VALID_EMAIL"
+        _, address = parseaddr(data)
+        if "@" in address:
+            return "REDACTED_EMAIL"
         if is_ipv4(data):
-            return "REDACTED_IPV4"
+            return "REDACTED_IPV6"
         if is_ipv6(data):
             return "REDACTED_IPV4"
     if redact_all:
@@ -48,19 +58,19 @@ def redact(data: Any, redact_all: bool):
     return data
 
 
-def is_ipv4(s: str):
+def is_ipv4(s: str) -> bool:
     try:
         ipaddress.IPv4Network(s)
         return True
-    except ValueError:
+    except (TypeError, ValueError):
         return False
 
 
-def is_ipv6(s: str):
+def is_ipv6(s: str) -> bool:
     try:
-        ipaddress.IPv4Network(s)
+        ipaddress.IPv6Network(s)
         return True
-    except ValueError:
+    except (TypeError, ValueError):
         return False
 
 
diff --git a/custom_components/generac/entity.py b/custom_components/generac/entity.py
index 0bd7bdf..4adcae5 100644
--- a/custom_components/generac/entity.py
+++ b/custom_components/generac/entity.py
@@ -1,5 +1,7 @@
-"""GeneracEntity class"""
+"""Generac entity base classes and friendly-name helpers."""
 import logging
+import re
+from typing import ClassVar
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import callback
@@ -7,6 +9,7 @@
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import ATTRIBUTION
+from .const import DEFAULT_NAME
 from .const import DOMAIN
 from .coordinator import GeneracDataUpdateCoordinator
 from .models import Apparatus
@@ -16,10 +19,48 @@
 _LOGGER: logging.Logger = logging.getLogger(__package__)
 
 
+_ENTITY_WORDS = {
+    "api": "API",
+    "id": "ID",
+    "ssid": "SSID",
+    "vpp": "VPP",
+}
+_ENTITY_KEY_OVERRIDES = {
+    "GeneracConnectedSensor": "is_connected",
+    "GeneracConnectingSensor": "is_connecting",
+    "GeneracMaintenanceAlertSensor": "has_maintenance_alert",
+    "GeneracWarningSensor": "show_warning",
+}
+
+
+def _camel_to_snake(value: str) -> str:
+    """Convert a class name fragment into an entity suffix."""
+    value = re.sub(r"(?<=[A-Z])(?=[A-Z][a-z])", "_", value)
+    value = re.sub(r"(?<=[a-z0-9])(?=[A-Z])", "_", value)
+    return value.lower()
+
+
+def parse_entity_name(entity_name: str) -> str:
+    """Convert an internal entity name into a readable label."""
+    words = re.split(r"[_\s-]+", entity_name.strip())
+    domain_words = DEFAULT_NAME.split("_")
+    if words[: len(domain_words)] == domain_words:
+        words = words[len(domain_words) :]
+    if words and words[0].isdigit():
+        words = words[1:]
+    return " ".join(
+        _ENTITY_WORDS.get(word.lower(), word.capitalize()) for word in words
+    )
+
+
 _EMPTY_ITEM = Item(apparatus=Apparatus(), apparatusDetail=ApparatusDetail(), empty=True)
 
 
 class GeneracEntity(CoordinatorEntity[GeneracDataUpdateCoordinator]):
+    """Base entity with stable registry IDs and readable display names."""
+
+    _entity_key: ClassVar[str | None] = None
+
     def __init__(
         self,
         coordinator: GeneracDataUpdateCoordinator,
@@ -35,7 +76,20 @@ def __init__(
     @property
     def unique_id(self):
         """Return a unique ID to use for this entity."""
-        return f"{self.config_entry.entry_id}_{self.device_id}_{self.name}"
+        return f"{self.config_entry.entry_id}_{self.device_id}_{self._technical_name}"
+
+    @property
+    def _technical_name(self) -> str:
+        """Return the stable technical name used by the entity registry."""
+        entity_key = self._entity_key or _ENTITY_KEY_OVERRIDES.get(
+            type(self).__name__,
+            _camel_to_snake(type(self).__name__.removesuffix("Sensor")),
+        )
+        return f"{DEFAULT_NAME}_{self.device_id}_{entity_key}"
+
+    def _friendly_name(self) -> str:
+        """Return the readable display label for this entity."""
+        return parse_entity_name(self._technical_name)
 
     @property
     def device_info(self):
@@ -58,7 +112,11 @@ def extra_state_attributes(self):
     @property
     def available(self):
         """Return True if entity is available."""
-        return self.coordinator.is_online and not self.item.empty
+        return (
+            self.coordinator.last_update_success
+            and self.coordinator.is_online
+            and not self.item.empty
+        )
 
     async def async_added_to_hass(self) -> None:
         """Connect to dispatcher listening for entity data notifications."""
@@ -75,6 +133,6 @@ def aparatus_detail(self) -> ApparatusDetail:
     @callback
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
-        self.item = self.coordinator.data.get(self.device_id, _EMPTY_ITEM)
-        _LOGGER.debug(f"Updated data for {self.unique_id}: {self.item}")
+        self.item = (self.coordinator.data or {}).get(self.device_id, _EMPTY_ITEM)
+        _LOGGER.debug("Updated Generac entity %s", self.unique_id)
         self.async_write_ha_state()
diff --git a/custom_components/generac/image.py b/custom_components/generac/image.py
index 1bb73ce..eee26b1 100644
--- a/custom_components/generac/image.py
+++ b/custom_components/generac/image.py
@@ -7,7 +7,6 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import DEFAULT_NAME
 from .const import DOMAIN
 from .coordinator import GeneracDataUpdateCoordinator
 from .entity import GeneracEntity
@@ -46,7 +45,7 @@ def __init__(
     @property
     def name(self):
         """Return the name of the sensor."""
-        return f"{DEFAULT_NAME}_{self.device_id}_hero_image"
+        return self._friendly_name()
 
     @property
     def image_url(self):
diff --git a/custom_components/generac/sensor.py b/custom_components/generac/sensor.py
index 4fbc779..13c4e24 100644
--- a/custom_components/generac/sensor.py
+++ b/custom_components/generac/sensor.py
@@ -5,6 +5,7 @@
 
 from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.components.sensor import SensorEntity
+from homeassistant.components.sensor.const import SensorStateClass
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE
 from homeassistant.const import UnitOfElectricPotential
@@ -12,7 +13,6 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import DEFAULT_NAME
 from .const import DEVICE_TYPE_GENERATOR
 from .const import DEVICE_TYPE_PROPANE_MONITOR
 from .const import DOMAIN
@@ -61,7 +61,6 @@ def sensors(item: Item) -> list[Type[GeneracEntity]]:
             ModelNumberSensor,
             DeviceSsidSensor,
             PanelIDSensor,
-            SignalStrengthSensor,
         ]
     elif item.apparatus.type == DEVICE_TYPE_PROPANE_MONITOR:
         lst = [
@@ -83,6 +82,12 @@ def sensors(item: Item) -> list[Type[GeneracEntity]]:
         and item.apparatusDetail.weather.temperature.value is not None
     ):
         lst.append(OutdoorTemperatureSensor)
+    if get_apparatus_property_value(item, "signalStrength") is not None:
+        lst.append(SignalStrengthSensor)
+    if get_apparatus_property_value(item, "batteryLevel") is not None:
+        lst.append(DeviceBatteryLevelSensor)
+    if get_detail_property_value(item, 95) is not None:
+        lst.append(ExerciseMinutesSensor)
     return lst
 
 
@@ -106,8 +111,32 @@ def get_prop_value(props, type_num: int, default_val):
     return val
 
 
-def sensor_name(self, name_label):
-    return f"{DEFAULT_NAME}_{self.device_id}_{name_label}"
+def get_detail_property_value(item: Item, property_type: int):
+    """Return a detail property value by its Mobile Link type code."""
+    if item.apparatusDetail.properties is None:
+        return None
+    return next(
+        (
+            prop.value
+            for prop in item.apparatusDetail.properties
+            if prop.type == property_type
+        ),
+        None,
+    )
+
+
+def get_apparatus_property_value(item: Item, field: str):
+    """Return a scalar field from the apparatus property payload."""
+    if item.apparatus.properties is None:
+        return None
+    for prop in item.apparatus.properties:
+        value = prop.value
+        if isinstance(value, list) or value is None:
+            continue
+        attr_value = getattr(value, field, None)
+        if attr_value is not None:
+            return attr_value
+    return None
 
 
 _LOGGER = logging.getLogger(__name__)
@@ -120,6 +149,8 @@ def _safe_float(val, label: str = ""):
         return None
     if isinstance(val, (int, float)):
         return float(val)
+    if isinstance(val, str) and val.strip().endswith("%"):
+        val = val.strip()[:-1].strip()
     try:
         return float(val)
     except (TypeError, ValueError) as ex:
@@ -149,7 +180,7 @@ class StatusSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "status")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -183,7 +214,7 @@ class DeviceTypeSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "device_type")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -212,7 +243,7 @@ class RunTimeSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "run_time")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -230,7 +261,7 @@ class ProtectionTimeSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "protection_time")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -247,7 +278,7 @@ class ActivationDateSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "activation_date")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -266,7 +297,7 @@ class LastSeenSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "last_seen")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -285,7 +316,7 @@ class ConnectionTimeSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "connection_time")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -306,7 +337,7 @@ class BatteryVoltageSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "battery_voltage")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -315,6 +346,23 @@ def native_value(self):
         return _safe_float(val, "battery_voltage")
 
 
+class ExerciseMinutesSensor(GeneracEntity, SensorEntity):
+    """Exercise duration reported by Mobile Link."""
+
+    device_class = SensorDeviceClass.DURATION
+    native_unit_of_measurement = "min"
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._friendly_name()
+
+    @property
+    def native_value(self):
+        """Return the state of the sensor."""
+        return _safe_float(get_detail_property_value(self.item, 95), "exercise_minutes")
+
+
 class OutdoorTemperatureSensor(GeneracEntity, SensorEntity):
     """generac Sensor class."""
 
@@ -323,7 +371,7 @@ class OutdoorTemperatureSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "outdoor_temperature")
+        return self._friendly_name()
 
     @property
     def native_unit_of_measurement(self):
@@ -353,7 +401,7 @@ class SerialNumberSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "serial_number")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -365,7 +413,7 @@ class ModelNumberSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "model_number")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -377,7 +425,7 @@ class DeviceSsidSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "device_ssid")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -389,7 +437,7 @@ class StatusLabelSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "status_label")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -401,7 +449,7 @@ class StatusTextSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "status_text")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -413,7 +461,7 @@ class AddressSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "address")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -425,7 +473,7 @@ class DealerNameSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "dealer_name")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -437,7 +485,7 @@ class DealerEmailSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "dealer_email")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -449,7 +497,7 @@ class DealerPhoneSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "dealer_phone")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -461,7 +509,7 @@ class PanelIDSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "panel_id")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -476,7 +524,7 @@ class CapacitySensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "capacity")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -490,7 +538,7 @@ class FuelTypeSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "fuel_type")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -504,7 +552,7 @@ class OrientationSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "orientation")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -518,7 +566,7 @@ class BatteryLevelSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "battery_level")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -534,7 +582,7 @@ class LastReadingDateSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "last_reading")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -554,7 +602,7 @@ class FuelLevelSensor(GeneracEntity, SensorEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "fuel_level")
+        return self._friendly_name()
 
     @property
     def native_value(self):
@@ -565,15 +613,39 @@ def native_value(self):
 class SignalStrengthSensor(GeneracEntity, SensorEntity):
     """generac Sensor class."""
 
+    _attr_icon = "mdi:signal-cellular-2"
+    _attr_native_unit_of_measurement = PERCENTAGE
+    _attr_state_class = SensorStateClass.MEASUREMENT
+
     @property
     def name(self):
         """Return the name of the sensor."""
-        return sensor_name(self, "signal_strength")
+        return self._friendly_name()
 
     @property
     def native_value(self):
         """Return the state of the sensor."""
-        wifi_signal_data = get_prop_value(self.aparatus.properties, 3, None)
-        if wifi_signal_data is None:
-            return "0%"
-        return wifi_signal_data.signalStrength
+        return _safe_float(
+            get_apparatus_property_value(self.item, "signalStrength"),
+            "signal_strength",
+        )
+
+
+class DeviceBatteryLevelSensor(GeneracEntity, SensorEntity):
+    """Battery level reported by the Mobile Link device."""
+
+    _attr_device_class = SensorDeviceClass.BATTERY
+    _attr_native_unit_of_measurement = PERCENTAGE
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._friendly_name()
+
+    @property
+    def native_value(self):
+        """Return the state of the sensor."""
+        return _safe_float(
+            get_apparatus_property_value(self.item, "batteryLevel"),
+            "device_battery_level",
+        )
diff --git a/custom_components/generac/weather.py b/custom_components/generac/weather.py
index b1cad99..02bced6 100644
--- a/custom_components/generac/weather.py
+++ b/custom_components/generac/weather.py
@@ -7,7 +7,6 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import DEFAULT_NAME
 from .const import DOMAIN
 from .coordinator import GeneracDataUpdateCoordinator
 from .entity import GeneracEntity
@@ -40,7 +39,7 @@ class WeatherSensor(GeneracEntity, WeatherEntity):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return f"{DEFAULT_NAME}_{self.device_id}_weather"
+        return self._friendly_name()
 
     @property
     def condition(self):

From 71aa0f67854e2d497ea53b9832440f8aa714797e Mon Sep 17 00:00:00 2001
From: Jordan Anderson <paul.jordan.anderson@gmail.com>
Date: Wed, 28 Oct 2026 19:24:53 +0000
Subject: [PATCH 2/2] Keep entity registry IDs stable; use has_entity_name for
 friendly names

Follow-up to the ported friendly-name change.

Registry compatibility:
- The port derived each unique_id suffix from the class name. That
  matched history for every class except LastReadingDateSensor, whose
  historical suffix is "last_reading". Upgrading would have orphaned the
  existing propane "last reading" entity and created a new one. Every
  entity class now declares an explicit entity_key; none is inferred, and
  unique_ids stay byte-for-byte what they were.
- SignalStrengthSensor stays unconditional for generators, so existing
  entities are never dropped when a device omits the value. It is also
  added for other device types (propane monitors) when reported.

Naming:
- _attr_has_entity_name = True, so Home Assistant shows
  "<device name> <label>" (e.g. "Generator Status") and gives newly
  created entities device-scoped entity_ids such as
  sensor.generator_exercise_duration instead of a bare, colliding
  sensor.status. Existing entity_ids live in the registry and do not
  change.
- Binary sensors and the exercise sensor get explicit labels;
  GeneracConnectingSensor keeps its connectivity device class.

Telemetry/diagnostics:
- Fuel level percentages go through _safe_float as well.
- Diagnostics: IPv4 and IPv6 were labelled the wrong way round; device
  data was keyed by apparatusId, which leaked the very ID that the
  redaction removes; panelId, shortDeviceId and deviceId are now
  redacted too.

Tests: a registry upgrade test seeds every historical unique_id and
entity_id for a generator and a propane monitor, sets up the
integration from fixture payloads, and asserts every entity is reused
with no "_2" duplicates and no restored orphans, and that only the new
sensors are added on the right devices. Also: a per-class key
inventory, numeric percentage parsing, missing/malformed property
payloads, sensor selection per device type, availability, and
diagnostics redaction.

Refs binarydev/ha-generac#284

Co-authored-by: technorat2 <technorat2@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01K2RdXuPegztHA1uMG2fbtk
---
 custom_components/generac/binary_sensor.py |  27 +-
 custom_components/generac/diagnostics.py   |  14 +-
 custom_components/generac/entity.py        |  60 ++--
 custom_components/generac/image.py         |   7 +-
 custom_components/generac/sensor.py        | 180 ++++--------
 custom_components/generac/weather.py       |   5 +-
 tests/test_binary_sensor.py                |   8 +-
 tests/test_diagnostics.py                  |  63 +++-
 tests/test_entity.py                       |  24 ++
 tests/test_entity_registry.py              | 319 +++++++++++++++++++++
 tests/test_image.py                        |   2 +-
 tests/test_sensor.py                       | 141 ++++++++-
 tests/test_weather.py                      |   2 +-
 13 files changed, 646 insertions(+), 206 deletions(-)
 create mode 100644 tests/test_entity_registry.py

diff --git a/custom_components/generac/binary_sensor.py b/custom_components/generac/binary_sensor.py
index e10ed5e..40b6a60 100644
--- a/custom_components/generac/binary_sensor.py
+++ b/custom_components/generac/binary_sensor.py
@@ -38,10 +38,8 @@ def sensors() -> Type[GeneracEntity]:
 class GeneracConnectedSensor(GeneracEntity, BinarySensorEntity):
     """generac binary_sensor class."""
 
-    @property
-    def name(self):
-        """Return the name of the binary_sensor."""
-        return self._friendly_name()
+    entity_key = "is_connected"
+    entity_label = "Connected"
 
     @property
     def device_class(self):
@@ -57,10 +55,13 @@ def is_on(self):
 class GeneracConnectingSensor(GeneracEntity, BinarySensorEntity):
     """generac binary_sensor class."""
 
+    entity_key = "is_connecting"
+    entity_label = "Connecting"
+
     @property
-    def name(self):
-        """Return the name of the binary_sensor."""
-        return self._friendly_name()
+    def device_class(self):
+        """Return the class of this binary_sensor."""
+        return BinarySensorDeviceClass.CONNECTIVITY
 
     @property
     def is_on(self):
@@ -71,10 +72,8 @@ def is_on(self):
 class GeneracMaintenanceAlertSensor(GeneracEntity, BinarySensorEntity):
     """generac binary_sensor class."""
 
-    @property
-    def name(self):
-        """Return the name of the binary_sensor."""
-        return self._friendly_name()
+    entity_key = "has_maintenance_alert"
+    entity_label = "Maintenance Alert"
 
     @property
     def device_class(self):
@@ -90,10 +89,8 @@ def is_on(self):
 class GeneracWarningSensor(GeneracEntity, BinarySensorEntity):
     """generac binary_sensor class."""
 
-    @property
-    def name(self):
-        """Return the name of the binary_sensor."""
-        return self._friendly_name()
+    entity_key = "show_warning"
+    entity_label = "Warning"
 
     @property
     def device_class(self):
diff --git a/custom_components/generac/diagnostics.py b/custom_components/generac/diagnostics.py
index f1e2168..269f040 100644
--- a/custom_components/generac/diagnostics.py
+++ b/custom_components/generac/diagnostics.py
@@ -28,8 +28,13 @@ async def async_get_config_entry_diagnostics(
 
     diagnostics_data = {
         "status": "loaded",
+        # Keyed by position: the coordinator keys devices by apparatusId,
+        # which is itself redacted below.
         "data": redact(
-            {gen_id: asdict(item) for gen_id, item in (coordinator.data or {}).items()},
+            {
+                f"device_{index}": asdict(item)
+                for index, item in enumerate((coordinator.data or {}).values())
+            },
             False,
         ),
     }
@@ -50,9 +55,9 @@ def redact(data: Any, redact_all: bool) -> Any:
         if "@" in address:
             return "REDACTED_EMAIL"
         if is_ipv4(data):
-            return "REDACTED_IPV6"
-        if is_ipv6(data):
             return "REDACTED_IPV4"
+        if is_ipv6(data):
+            return "REDACTED_IPV6"
     if redact_all:
         return "REDACTED"
     return data
@@ -78,6 +83,9 @@ def is_ipv6(s: str) -> bool:
     "deviceSsid",
     "serialNumber",
     "apparatusId",
+    "panelId",
+    "shortDeviceId",
+    "deviceId",
     "address",
     "localizedAddress",
 }
diff --git a/custom_components/generac/entity.py b/custom_components/generac/entity.py
index 4adcae5..67b3b25 100644
--- a/custom_components/generac/entity.py
+++ b/custom_components/generac/entity.py
@@ -1,6 +1,5 @@
 """Generac entity base classes and friendly-name helpers."""
 import logging
-import re
 from typing import ClassVar
 
 from homeassistant.config_entries import ConfigEntry
@@ -20,36 +19,15 @@
 
 
 _ENTITY_WORDS = {
-    "api": "API",
     "id": "ID",
     "ssid": "SSID",
-    "vpp": "VPP",
 }
-_ENTITY_KEY_OVERRIDES = {
-    "GeneracConnectedSensor": "is_connected",
-    "GeneracConnectingSensor": "is_connecting",
-    "GeneracMaintenanceAlertSensor": "has_maintenance_alert",
-    "GeneracWarningSensor": "show_warning",
-}
-
 
-def _camel_to_snake(value: str) -> str:
-    """Convert a class name fragment into an entity suffix."""
-    value = re.sub(r"(?<=[A-Z])(?=[A-Z][a-z])", "_", value)
-    value = re.sub(r"(?<=[a-z0-9])(?=[A-Z])", "_", value)
-    return value.lower()
 
-
-def parse_entity_name(entity_name: str) -> str:
-    """Convert an internal entity name into a readable label."""
-    words = re.split(r"[_\s-]+", entity_name.strip())
-    domain_words = DEFAULT_NAME.split("_")
-    if words[: len(domain_words)] == domain_words:
-        words = words[len(domain_words) :]
-    if words and words[0].isdigit():
-        words = words[1:]
+def parse_entity_name(entity_key: str) -> str:
+    """Convert a stable entity key into a readable label."""
     return " ".join(
-        _ENTITY_WORDS.get(word.lower(), word.capitalize()) for word in words
+        _ENTITY_WORDS.get(word, word.capitalize()) for word in entity_key.split("_")
     )
 
 
@@ -59,7 +37,14 @@ def parse_entity_name(entity_name: str) -> str:
 class GeneracEntity(CoordinatorEntity[GeneracDataUpdateCoordinator]):
     """Base entity with stable registry IDs and readable display names."""
 
-    _entity_key: ClassVar[str | None] = None
+    _attr_has_entity_name = True
+
+    # Stable suffix of the entity registry unique_id. Set explicitly on every
+    # entity class and never derive it from the class name: changing it
+    # orphans the user's existing entity and creates a duplicate.
+    entity_key: ClassVar[str]
+    # Display label when the one derived from entity_key reads poorly.
+    entity_label: ClassVar[str | None] = None
 
     def __init__(
         self,
@@ -76,20 +61,17 @@ def __init__(
     @property
     def unique_id(self):
         """Return a unique ID to use for this entity."""
-        return f"{self.config_entry.entry_id}_{self.device_id}_{self._technical_name}"
-
-    @property
-    def _technical_name(self) -> str:
-        """Return the stable technical name used by the entity registry."""
-        entity_key = self._entity_key or _ENTITY_KEY_OVERRIDES.get(
-            type(self).__name__,
-            _camel_to_snake(type(self).__name__.removesuffix("Sensor")),
+        # Byte-for-byte the historical format, which embedded the old
+        # technical name "generac_<device_id>_<key>".
+        return (
+            f"{self.config_entry.entry_id}_{self.device_id}_"
+            f"{DEFAULT_NAME}_{self.device_id}_{self.entity_key}"
         )
-        return f"{DEFAULT_NAME}_{self.device_id}_{entity_key}"
 
-    def _friendly_name(self) -> str:
-        """Return the readable display label for this entity."""
-        return parse_entity_name(self._technical_name)
+    @property
+    def name(self):
+        """Return the entity label; Home Assistant prefixes the device name."""
+        return self.entity_label or parse_entity_name(self.entity_key)
 
     @property
     def device_info(self):
@@ -134,5 +116,5 @@ def aparatus_detail(self) -> ApparatusDetail:
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
         self.item = (self.coordinator.data or {}).get(self.device_id, _EMPTY_ITEM)
-        _LOGGER.debug("Updated Generac entity %s", self.unique_id)
+        _LOGGER.debug("Updated Generac entity %s", self.entity_id)
         self.async_write_ha_state()
diff --git a/custom_components/generac/image.py b/custom_components/generac/image.py
index eee26b1..a73e515 100644
--- a/custom_components/generac/image.py
+++ b/custom_components/generac/image.py
@@ -30,6 +30,8 @@ async def async_setup_entry(
 class HeroImageSensor(GeneracEntity, ImageEntity):
     """generac Image class."""
 
+    entity_key = "hero_image"
+
     def __init__(
         self,
         coordinator: GeneracDataUpdateCoordinator,
@@ -42,11 +44,6 @@ def __init__(
         super().__init__(coordinator, config_entry, device_id, item)
         ImageEntity.__init__(self, hass)
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
-
     @property
     def image_url(self):
         return self.aparatus_detail.heroImageUrl
diff --git a/custom_components/generac/sensor.py b/custom_components/generac/sensor.py
index 13c4e24..a5bb6ae 100644
--- a/custom_components/generac/sensor.py
+++ b/custom_components/generac/sensor.py
@@ -61,6 +61,9 @@ def sensors(item: Item) -> list[Type[GeneracEntity]]:
             ModelNumberSensor,
             DeviceSsidSensor,
             PanelIDSensor,
+            # Always created for generators so existing registry entries are
+            # never orphaned; it reports unknown when the value is missing.
+            SignalStrengthSensor,
         ]
     elif item.apparatus.type == DEVICE_TYPE_PROPANE_MONITOR:
         lst = [
@@ -82,7 +85,10 @@ def sensors(item: Item) -> list[Type[GeneracEntity]]:
         and item.apparatusDetail.weather.temperature.value is not None
     ):
         lst.append(OutdoorTemperatureSensor)
-    if get_apparatus_property_value(item, "signalStrength") is not None:
+    if (
+        SignalStrengthSensor not in lst
+        and get_apparatus_property_value(item, "signalStrength") is not None
+    ):
         lst.append(SignalStrengthSensor)
     if get_apparatus_property_value(item, "batteryLevel") is not None:
         lst.append(DeviceBatteryLevelSensor)
@@ -163,6 +169,8 @@ def _safe_float(val, label: str = ""):
 class StatusSensor(GeneracEntity, SensorEntity):
     """generac Sensor class."""
 
+    entity_key = "status"
+
     options = [
         "Ready",
         "Running",
@@ -177,11 +185,6 @@ class StatusSensor(GeneracEntity, SensorEntity):
     device_class = SensorDeviceClass.ENUM
     icon = "mdi:power"
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
-
     @property
     def native_value(self):
         """Return the state of the sensor."""
@@ -202,6 +205,8 @@ def native_value(self):
 class DeviceTypeSensor(GeneracEntity, SensorEntity):
     """generac Sensor class."""
 
+    entity_key = "device_type"
+
     options = [
         "Wifi",
         "Ethernet",
@@ -211,11 +216,6 @@ class DeviceTypeSensor(GeneracEntity, SensorEntity):
     ]
     device_class = SensorDeviceClass.ENUM
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
-
     @property
     def native_value(self):
         """Return the state of the sensor."""
@@ -237,14 +237,11 @@ def native_value(self):
 class RunTimeSensor(GeneracEntity, SensorEntity):
     """generac Sensor class."""
 
+    entity_key = "run_time"
+
     device_class = SensorDeviceClass.DURATION
     native_unit_of_measurement = "h"
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
-
     @property
     def native_value(self):
         """Return the state of the sensor."""
@@ -255,14 +252,11 @@ def native_value(self):
 class ProtectionTimeSensor(GeneracEntity, SensorEntity):
     """generac Sensor class."""
 
+    entity_key = "protection_time"
+
     device_class = SensorDeviceClass.DURATION
     native_unit_of_measurement = "h"
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
-
     @property
     def native_value(self):
         """Return the state of the sensor."""
@@ -273,12 +267,9 @@ def native_value(self):
 class ActivationDateSensor(GeneracEntity, SensorEntity):
     """generac Sensor class."""
 
-    device_class = SensorDeviceClass.TIMESTAMP
+    entity_key = "activation_date"
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
+    device_class = SensorDeviceClass.TIMESTAMP
 
     @property
     def native_value(self):
@@ -292,12 +283,9 @@ def native_value(self):
 class LastSeenSensor(GeneracEntity, SensorEntity):
     """generac Sensor class."""
 
-    device_class = SensorDeviceClass.TIMESTAMP
+    entity_key = "last_seen"
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
+    device_class = SensorDeviceClass.TIMESTAMP
 
     @property
     def native_value(self):
@@ -311,12 +299,9 @@ def native_value(self):
 class ConnectionTimeSensor(GeneracEntity, SensorEntity):
     """generac Sensor class."""
 
-    device_class = SensorDeviceClass.TIMESTAMP
+    entity_key = "connection_time"
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
+    device_class = SensorDeviceClass.TIMESTAMP
 
     @property
     def native_value(self):
@@ -330,15 +315,12 @@ def native_value(self):
 class BatteryVoltageSensor(GeneracEntity, SensorEntity):
     """generac Sensor class."""
 
+    entity_key = "battery_voltage"
+
     device_class = SensorDeviceClass.VOLTAGE
     native_unit_of_measurement = UnitOfElectricPotential.VOLT
     suggested_display_precision = 1
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
-
     @property
     def native_value(self):
         """Return the state of the sensor."""
@@ -349,14 +331,12 @@ def native_value(self):
 class ExerciseMinutesSensor(GeneracEntity, SensorEntity):
     """Exercise duration reported by Mobile Link."""
 
+    entity_key = "exercise_minutes"
+    entity_label = "Exercise Duration"
+
     device_class = SensorDeviceClass.DURATION
     native_unit_of_measurement = "min"
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
-
     @property
     def native_value(self):
         """Return the state of the sensor."""
@@ -366,12 +346,9 @@ def native_value(self):
 class OutdoorTemperatureSensor(GeneracEntity, SensorEntity):
     """generac Sensor class."""
 
-    device_class = SensorDeviceClass.TEMPERATURE
+    entity_key = "outdoor_temperature"
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
+    device_class = SensorDeviceClass.TEMPERATURE
 
     @property
     def native_unit_of_measurement(self):
@@ -398,10 +375,7 @@ def native_value(self):
 
 
 class SerialNumberSensor(GeneracEntity, SensorEntity):
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
+    entity_key = "serial_number"
 
     @property
     def native_value(self):
@@ -410,10 +384,7 @@ def native_value(self):
 
 
 class ModelNumberSensor(GeneracEntity, SensorEntity):
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
+    entity_key = "model_number"
 
     @property
     def native_value(self):
@@ -422,10 +393,7 @@ def native_value(self):
 
 
 class DeviceSsidSensor(GeneracEntity, SensorEntity):
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
+    entity_key = "device_ssid"
 
     @property
     def native_value(self):
@@ -434,10 +402,7 @@ def native_value(self):
 
 
 class StatusLabelSensor(GeneracEntity, SensorEntity):
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
+    entity_key = "status_label"
 
     @property
     def native_value(self):
@@ -446,10 +411,7 @@ def native_value(self):
 
 
 class StatusTextSensor(GeneracEntity, SensorEntity):
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
+    entity_key = "status_text"
 
     @property
     def native_value(self):
@@ -458,10 +420,7 @@ def native_value(self):
 
 
 class AddressSensor(GeneracEntity, SensorEntity):
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
+    entity_key = "address"
 
     @property
     def native_value(self):
@@ -470,10 +429,7 @@ def native_value(self):
 
 
 class DealerNameSensor(GeneracEntity, SensorEntity):
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
+    entity_key = "dealer_name"
 
     @property
     def native_value(self):
@@ -482,10 +438,7 @@ def native_value(self):
 
 
 class DealerEmailSensor(GeneracEntity, SensorEntity):
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
+    entity_key = "dealer_email"
 
     @property
     def native_value(self):
@@ -494,10 +447,7 @@ def native_value(self):
 
 
 class DealerPhoneSensor(GeneracEntity, SensorEntity):
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
+    entity_key = "dealer_phone"
 
     @property
     def native_value(self):
@@ -506,10 +456,7 @@ def native_value(self):
 
 
 class PanelIDSensor(GeneracEntity, SensorEntity):
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
+    entity_key = "panel_id"
 
     @property
     def native_value(self):
@@ -521,10 +468,7 @@ def native_value(self):
 class CapacitySensor(GeneracEntity, SensorEntity):
     """generac Sensor class."""
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
+    entity_key = "capacity"
 
     @property
     def native_value(self):
@@ -535,10 +479,7 @@ def native_value(self):
 class FuelTypeSensor(GeneracEntity, SensorEntity):
     """generac Sensor class."""
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
+    entity_key = "fuel_type"
 
     @property
     def native_value(self):
@@ -549,10 +490,7 @@ def native_value(self):
 class OrientationSensor(GeneracEntity, SensorEntity):
     """generac Sensor class."""
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
+    entity_key = "orientation"
 
     @property
     def native_value(self):
@@ -563,10 +501,7 @@ def native_value(self):
 class BatteryLevelSensor(GeneracEntity, SensorEntity):
     """generac Sensor class."""
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
+    entity_key = "battery_level"
 
     @property
     def native_value(self):
@@ -577,12 +512,9 @@ def native_value(self):
 class LastReadingDateSensor(GeneracEntity, SensorEntity):
     """generac Sensor class."""
 
-    device_class = SensorDeviceClass.TIMESTAMP
+    entity_key = "last_reading"
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
+    device_class = SensorDeviceClass.TIMESTAMP
 
     @property
     def native_value(self):
@@ -596,32 +528,27 @@ def native_value(self):
 class FuelLevelSensor(GeneracEntity, SensorEntity):
     """generac Sensor class."""
 
+    entity_key = "fuel_level"
+
     device_class = SensorDeviceClass.BATTERY
     native_unit_of_measurement = PERCENTAGE
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
-
     @property
     def native_value(self):
         """Return the state of the sensor."""
-        return get_prop_value(self.aparatus_detail.tuProperties, 9, None)
+        val = get_prop_value(self.aparatus_detail.tuProperties, 9, None)
+        return _safe_float(val, "fuel_level")
 
 
 class SignalStrengthSensor(GeneracEntity, SensorEntity):
     """generac Sensor class."""
 
+    entity_key = "signal_strength"
+
     _attr_icon = "mdi:signal-cellular-2"
     _attr_native_unit_of_measurement = PERCENTAGE
     _attr_state_class = SensorStateClass.MEASUREMENT
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
-
     @property
     def native_value(self):
         """Return the state of the sensor."""
@@ -634,14 +561,11 @@ def native_value(self):
 class DeviceBatteryLevelSensor(GeneracEntity, SensorEntity):
     """Battery level reported by the Mobile Link device."""
 
+    entity_key = "device_battery_level"
+
     _attr_device_class = SensorDeviceClass.BATTERY
     _attr_native_unit_of_measurement = PERCENTAGE
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
-
     @property
     def native_value(self):
         """Return the state of the sensor."""
diff --git a/custom_components/generac/weather.py b/custom_components/generac/weather.py
index 02bced6..44c7600 100644
--- a/custom_components/generac/weather.py
+++ b/custom_components/generac/weather.py
@@ -36,10 +36,7 @@ def sensors(item: Item) -> list[Type[GeneracEntity]]:
 class WeatherSensor(GeneracEntity, WeatherEntity):
     """generac Weather class."""
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._friendly_name()
+    entity_key = "weather"
 
     @property
     def condition(self):
diff --git a/tests/test_binary_sensor.py b/tests/test_binary_sensor.py
index f4dcd5c..acec67f 100644
--- a/tests/test_binary_sensor.py
+++ b/tests/test_binary_sensor.py
@@ -37,7 +37,7 @@ async def test_connected_sensor(hass):
     item = get_mock_item(True, False, False, False)
     sensor = GeneracConnectedSensor(coordinator, entry, "12345", item)
     assert sensor.is_on is True
-    assert sensor.name == "generac_12345_is_connected"
+    assert sensor.name == "Connected"
     assert sensor.device_class == "connectivity"
 
     # Test when not connected
@@ -55,7 +55,7 @@ async def test_connecting_sensor(hass):
     item = get_mock_item(False, True, False, False)
     sensor = GeneracConnectingSensor(coordinator, entry, "12345", item)
     assert sensor.is_on is True
-    assert sensor.name == "generac_12345_is_connecting"
+    assert sensor.name == "Connecting"
     assert sensor.device_class == "connectivity"
 
     # Test when not connecting
@@ -73,7 +73,7 @@ async def test_maintenance_alert_sensor(hass):
     item = get_mock_item(False, False, True, False)
     sensor = GeneracMaintenanceAlertSensor(coordinator, entry, "12345", item)
     assert sensor.is_on is True
-    assert sensor.name == "generac_12345_has_maintenance_alert"
+    assert sensor.name == "Maintenance Alert"
     assert sensor.device_class == "safety"
 
     # Test when maintenance alert is not active
@@ -91,7 +91,7 @@ async def test_warning_sensor(hass):
     item = get_mock_item(False, False, False, True)
     sensor = GeneracWarningSensor(coordinator, entry, "12345", item)
     assert sensor.is_on is True
-    assert sensor.name == "generac_12345_show_warning"
+    assert sensor.name == "Warning"
     assert sensor.device_class == "safety"
 
     # Test when warning is not active
diff --git a/tests/test_diagnostics.py b/tests/test_diagnostics.py
index 9893e44..45bf1ca 100644
--- a/tests/test_diagnostics.py
+++ b/tests/test_diagnostics.py
@@ -28,7 +28,62 @@ async def test_diagnostics(hass):
 
     diagnostics = await async_get_config_entry_diagnostics(hass, entry)
 
-    assert diagnostics["data"]["12345"]["apparatus"]["serialNumber"] == "REDACTED"
-    assert diagnostics["data"]["12345"]["apparatus"]["apparatusId"] == "REDACTED"
-    assert diagnostics["data"]["12345"]["apparatus"]["localizedAddress"] == "REDACTED"
-    assert diagnostics["data"]["12345"]["apparatusDetail"]["deviceSsid"] == "REDACTED"
+    assert diagnostics["data"]["device_0"]["apparatus"]["serialNumber"] == "REDACTED"
+    assert diagnostics["data"]["device_0"]["apparatus"]["apparatusId"] == "REDACTED"
+    assert (
+        diagnostics["data"]["device_0"]["apparatus"]["localizedAddress"] == "REDACTED"
+    )
+    assert (
+        diagnostics["data"]["device_0"]["apparatusDetail"]["deviceSsid"] == "REDACTED"
+    )
+
+
+async def test_diagnostics_redacts_identifiers_emails_and_ips(hass):
+    """Device IDs never leak via dict keys; emails and IPs get correct labels."""
+    coordinator = MagicMock()
+    coordinator.data = {
+        "98765": Item(
+            apparatus=Apparatus(
+                apparatusId=98765,
+                panelId="PANEL-1",
+                preferredDealerEmail="dealer@example.com",
+                preferredDealerName="Dealer <dealer@example.com>",
+                properties=[
+                    Apparatus.Property(name="ip", value="192.0.2.10", type=1),
+                    Apparatus.Property(name="ip6", value="2001:db8::1", type=2),
+                ],
+            ),
+            apparatusDetail=ApparatusDetail(shortDeviceId="SHORT-1"),
+        )
+    }
+    entry = MagicMock()
+    entry.entry_id = "test_entry_id"
+    hass.data = {"generac": {"test_entry_id": coordinator}}
+
+    diagnostics = await async_get_config_entry_diagnostics(hass, entry)
+
+    assert diagnostics["status"] == "loaded"
+    assert list(diagnostics["data"]) == ["device_0"]
+    assert "98765" not in str(diagnostics)
+    apparatus = diagnostics["data"]["device_0"]["apparatus"]
+    assert apparatus["panelId"] == "REDACTED"
+    assert apparatus["preferredDealerEmail"] == "REDACTED_EMAIL"
+    assert apparatus["preferredDealerName"] == "REDACTED_EMAIL"
+    assert apparatus["properties"][0]["value"] == "REDACTED_IPV4"
+    assert apparatus["properties"][1]["value"] == "REDACTED_IPV6"
+    assert diagnostics["data"]["device_0"]["apparatusDetail"]["shortDeviceId"] == (
+        "REDACTED"
+    )
+    for secret in ("PANEL-1", "SHORT-1", "dealer@example.com", "192.0.2.10"):
+        assert secret not in str(diagnostics)
+
+
+async def test_diagnostics_before_entry_is_loaded(hass):
+    """Diagnostics for an entry that never loaded don't raise KeyError."""
+    entry = MagicMock()
+    entry.entry_id = "missing"
+    hass.data = {}
+    assert await async_get_config_entry_diagnostics(hass, entry) == {
+        "status": "not_loaded",
+        "data": {},
+    }
diff --git a/tests/test_entity.py b/tests/test_entity.py
index c63b0be..0cf7636 100644
--- a/tests/test_entity.py
+++ b/tests/test_entity.py
@@ -76,3 +76,27 @@ async def test_entity_missing_device_falls_back_to_empty_item(hass):
     assert entity.item is _EMPTY_ITEM
     assert entity.available is False
     assert entity.async_write_ha_state.called
+
+
+async def test_entity_unavailable_after_failed_poll(hass):
+    """A failed coordinator refresh marks entities unavailable."""
+    coordinator = MagicMock()
+    coordinator.is_online = True
+    coordinator.last_update_success = False
+    entry = MagicMock()
+    entity = GeneracEntity(coordinator, entry, "12345", get_mock_item())
+    assert entity.available is False
+
+
+async def test_entity_update_tolerates_missing_coordinator_data(hass):
+    """coordinator.data of None leaves the entity alive but unavailable."""
+    from custom_components.generac.entity import _EMPTY_ITEM
+
+    coordinator = MagicMock()
+    coordinator.data = None
+    entity = GeneracEntity(coordinator, MagicMock(), "12345", get_mock_item())
+    entity.hass = hass
+    entity.async_write_ha_state = MagicMock()
+    entity._handle_coordinator_update()
+    assert entity.item is _EMPTY_ITEM
+    assert entity.available is False
diff --git a/tests/test_entity_registry.py b/tests/test_entity_registry.py
new file mode 100644
index 0000000..dd64550
--- /dev/null
+++ b/tests/test_entity_registry.py
@@ -0,0 +1,319 @@
+"""Upgrade compatibility: existing entity registry entries must be reused.
+
+The unique_id suffixes below are copied from the integration as released
+before friendly names (each entity's old technical name was
+``generac_<device_id>_<suffix>``). An upgrade must match every one of them,
+so that no entity is orphaned and no ``_2`` duplicate is created.
+"""
+from unittest.mock import patch
+
+from custom_components.generac.auth import DPoPKey
+from custom_components.generac.const import CONF_DPOP_PEM
+from custom_components.generac.const import CONF_REFRESH_TOKEN
+from custom_components.generac.const import CONF_USERNAME
+from custom_components.generac.const import DOMAIN
+from custom_components.generac.models import Apparatus
+from custom_components.generac.models import ApparatusDetail
+from custom_components.generac.models import Item
+from dacite import from_dict
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+from pytest_homeassistant_custom_component.common import MockConfigEntry
+
+ENTRY_ID = "entry1"
+GENERATOR_ID = "12345"
+PROPANE_ID = "67890"
+
+HISTORICAL_SUFFIXES = {
+    GENERATOR_ID: {
+        "sensor": [
+            "status",
+            "run_time",
+            "protection_time",
+            "activation_date",
+            "last_seen",
+            "connection_time",
+            "battery_voltage",
+            "device_type",
+            "dealer_email",
+            "dealer_name",
+            "dealer_phone",
+            "address",
+            "status_text",
+            "status_label",
+            "serial_number",
+            "model_number",
+            "device_ssid",
+            "panel_id",
+            "signal_strength",
+            "outdoor_temperature",
+        ],
+        "binary_sensor": [
+            "is_connected",
+            "is_connecting",
+            "has_maintenance_alert",
+            "show_warning",
+        ],
+        "weather": ["weather"],
+        "image": ["hero_image"],
+    },
+    PROPANE_ID: {
+        "sensor": [
+            "status",
+            "capacity",
+            "fuel_level",
+            "fuel_type",
+            "orientation",
+            "last_reading",
+            "battery_level",
+            "address",
+            "device_type",
+        ],
+        "binary_sensor": [
+            "is_connected",
+            "is_connecting",
+            "has_maintenance_alert",
+            "show_warning",
+        ],
+    },
+}
+
+# Entities this change adds for the fixture payloads below.
+NEW_SUFFIXES = {
+    GENERATOR_ID: {"sensor": ["exercise_minutes"]},
+    PROPANE_ID: {"sensor": ["signal_strength", "device_battery_level"]},
+}
+
+
+def _weather() -> dict:
+    return {
+        "temperature": {"value": 71.0, "unit": "F", "unitType": 1},
+        "iconCode": 1,
+    }
+
+
+def _generator() -> Item:
+    return Item(
+        from_dict(
+            Apparatus,
+            {
+                "apparatusId": int(GENERATOR_ID),
+                "name": "Generator",
+                "type": 0,
+                "serialNumber": "SN-1",
+                "modelNumber": "G-1",
+                "panelId": "P-1",
+                "localizedAddress": "1 Main St",
+                "weather": _weather(),
+                "properties": [
+                    {
+                        "name": "Wi-Fi",
+                        "type": 3,
+                        "value": {"type": 3, "signalStrength": "75%"},
+                    }
+                ],
+            },
+        ),
+        from_dict(
+            ApparatusDetail,
+            {
+                "apparatusId": int(GENERATOR_ID),
+                "name": "Generator",
+                "apparatusStatus": 1,
+                "deviceType": "wifi",
+                "heroImageUrl": "https://example.invalid/hero.png",
+                "weather": _weather(),
+                "isConnected": True,
+                "isConnecting": False,
+                "hasMaintenanceAlert": False,
+                "showWarning": False,
+                "properties": [
+                    {"name": "Battery Voltage", "value": "13.4", "type": 70},
+                    {"name": "Run Hours", "value": "120.5", "type": 71},
+                    {"name": "Protection Time", "value": "4000", "type": 32},
+                    {"name": "Exercise Duration", "value": "12", "type": 95},
+                ],
+            },
+        ),
+    )
+
+
+def _propane() -> Item:
+    return Item(
+        from_dict(
+            Apparatus,
+            {
+                "apparatusId": int(PROPANE_ID),
+                "name": "Propane Tank",
+                "type": 2,
+                "localizedAddress": "1 Main St",
+                "properties": [
+                    {
+                        "name": "Tank Monitor",
+                        "type": 3,
+                        "value": {
+                            "status": "Online",
+                            "signalStrength": "60",
+                            "batteryLevel": "80%",
+                        },
+                    }
+                ],
+            },
+        ),
+        from_dict(
+            ApparatusDetail,
+            {
+                "apparatusId": int(PROPANE_ID),
+                "name": "Propane Tank",
+                "deviceType": "lte-tankutility-v2",
+                "isConnected": True,
+                "tuProperties": [
+                    {"name": "Fuel Type", "value": "Propane", "type": 0},
+                    {"name": "Capacity", "value": 500, "type": 1},
+                    {"name": "Orientation", "value": "Horizontal", "type": 2},
+                    {"name": "Fuel Level", "value": "45%", "type": 9},
+                    {
+                        "name": "Last Reading",
+                        "value": "2026-07-01T12:00:00Z",
+                        "type": 11,
+                    },
+                    {"name": "Battery", "value": "Good", "type": 17},
+                ],
+            },
+        ),
+    )
+
+
+def _unique_id(device_id: str, suffix: str) -> str:
+    return f"{ENTRY_ID}_{device_id}_generac_{device_id}_{suffix}"
+
+
+async def test_upgrade_reuses_every_existing_registry_entry(hass: HomeAssistant):
+    """Entities registered by the old naming scheme keep their IDs on upgrade."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        entry_id=ENTRY_ID,
+        unique_id="user@example.com",
+        data={
+            CONF_USERNAME: "user@example.com",
+            CONF_REFRESH_TOKEN: "rt",
+            CONF_DPOP_PEM: DPoPKey.generate().to_pem_str(),
+        },
+    )
+    entry.add_to_hass(hass)
+
+    registry = er.async_get(hass)
+    historical: dict[str, str] = {}
+    for device_id, platforms in HISTORICAL_SUFFIXES.items():
+        for platform, suffixes in platforms.items():
+            for suffix in suffixes:
+                reg_entry = registry.async_get_or_create(
+                    platform,
+                    DOMAIN,
+                    _unique_id(device_id, suffix),
+                    config_entry=entry,
+                    suggested_object_id=f"generac_{device_id}_{suffix}",
+                )
+                historical[reg_entry.unique_id] = reg_entry.entity_id
+
+    data = {GENERATOR_ID: _generator(), PROPANE_ID: _propane()}
+    with patch(
+        "custom_components.generac.api.GeneracApiClient.async_get_data",
+        return_value=data,
+    ):
+        assert await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+    entries = er.async_entries_for_config_entry(registry, ENTRY_ID)
+    by_unique_id = {e.unique_id: e for e in entries}
+
+    expected_new = {
+        _unique_id(device_id, suffix)
+        for device_id, platforms in NEW_SUFFIXES.items()
+        for suffixes in platforms.values()
+        for suffix in suffixes
+    }
+    # Nothing duplicated, nothing unexpected: only the genuinely new sensors.
+    assert set(by_unique_id) == set(historical) | expected_new
+    assert not [e.entity_id for e in entries if e.entity_id.endswith("_2")]
+
+    for unique_id, entity_id in historical.items():
+        # Same registry entry, same entity_id, and actually provided again
+        # (not a restored orphan).
+        assert by_unique_id[unique_id].entity_id == entity_id
+        state = hass.states.get(entity_id)
+        assert state is not None, entity_id
+        assert not state.attributes.get("restored"), entity_id
+
+    # Display names now read "<device name> <label>".
+    status = hass.states.get(f"sensor.generac_{GENERATOR_ID}_status")
+    assert status.attributes["friendly_name"] == "Generator Status"
+    assert status.state == "Ready"
+    last_reading = hass.states.get(f"sensor.generac_{PROPANE_ID}_last_reading")
+    assert last_reading.attributes["friendly_name"] == "Propane Tank Last Reading"
+    assert last_reading.state == "2026-07-01T12:00:00+00:00"
+
+    # Numeric percentages and the new sensors, attached to the right device.
+    assert hass.states.get(f"sensor.generac_{GENERATOR_ID}_signal_strength").state == (
+        "75.0"
+    )
+    assert hass.states.get(f"sensor.generac_{PROPANE_ID}_fuel_level").state == "45.0"
+    new_ids = {
+        unique_id: by_unique_id[unique_id].entity_id for unique_id in expected_new
+    }
+    assert new_ids == {
+        _unique_id(GENERATOR_ID, "exercise_minutes"): (
+            "sensor.generator_exercise_duration"
+        ),
+        _unique_id(
+            PROPANE_ID, "signal_strength"
+        ): "sensor.propane_tank_signal_strength",
+        _unique_id(PROPANE_ID, "device_battery_level"): (
+            "sensor.propane_tank_device_battery_level"
+        ),
+    }
+    assert hass.states.get("sensor.generator_exercise_duration").state == "12.0"
+    assert hass.states.get("sensor.propane_tank_signal_strength").state == "60.0"
+    assert hass.states.get("sensor.propane_tank_device_battery_level").state == "80.0"
+
+    devices = {e.unique_id: e.device_id for e in entries}
+    assert (
+        devices[_unique_id(GENERATOR_ID, "exercise_minutes")]
+        == devices[_unique_id(GENERATOR_ID, "status")]
+    )
+    assert (
+        devices[_unique_id(PROPANE_ID, "device_battery_level")]
+        == devices[_unique_id(PROPANE_ID, "status")]
+    )
+
+
+def test_every_entity_class_declares_its_own_stable_key():
+    """No entity class may inherit or infer its unique_id suffix."""
+    from custom_components.generac import binary_sensor
+    from custom_components.generac import image
+    from custom_components.generac import sensor
+    from custom_components.generac import weather
+    from custom_components.generac.entity import GeneracEntity
+
+    classes = [
+        obj
+        for module in (binary_sensor, image, sensor, weather)
+        for obj in vars(module).values()
+        if isinstance(obj, type)
+        and issubclass(obj, GeneracEntity)
+        and obj is not GeneracEntity
+    ]
+    assert len(classes) == 34
+    keys = {}
+    for cls in classes:
+        assert "entity_key" in vars(cls), cls.__name__
+        keys.setdefault(cls.entity_key, []).append(cls.__name__)
+    # Keys only need to be unique per platform; none collide even globally.
+    assert all(len(names) == 1 for names in keys.values()), keys
+    historical = {
+        suffix
+        for platforms in HISTORICAL_SUFFIXES.values()
+        for suffixes in platforms.values()
+        for suffix in suffixes
+    }
+    assert historical <= set(keys)
diff --git a/tests/test_image.py b/tests/test_image.py
index c3a712b..9217c92 100644
--- a/tests/test_image.py
+++ b/tests/test_image.py
@@ -27,7 +27,7 @@ async def test_image_sensor(hass):
     item = get_mock_item("http://example.com/image.png")
     sensor = HeroImageSensor(coordinator, entry, "12345", item, hass)
     assert sensor.image_url == "http://example.com/image.png"
-    assert sensor.name == "generac_12345_hero_image"
+    assert sensor.name == "Hero Image"
     assert sensor.available is True
 
     # Test with no image URL
diff --git a/tests/test_sensor.py b/tests/test_sensor.py
index ae376d3..0eb5696 100644
--- a/tests/test_sensor.py
+++ b/tests/test_sensor.py
@@ -1,6 +1,7 @@
 """Test the Generac sensor platform."""
 from unittest.mock import MagicMock
 
+import pytest
 from custom_components.generac.const import DEVICE_TYPE_GENERATOR
 from custom_components.generac.const import DEVICE_TYPE_PROPANE_MONITOR
 from custom_components.generac.models import Apparatus
@@ -16,8 +17,10 @@
 from custom_components.generac.sensor import DealerEmailSensor
 from custom_components.generac.sensor import DealerNameSensor
 from custom_components.generac.sensor import DealerPhoneSensor
+from custom_components.generac.sensor import DeviceBatteryLevelSensor
 from custom_components.generac.sensor import DeviceSsidSensor
 from custom_components.generac.sensor import DeviceTypeSensor
+from custom_components.generac.sensor import ExerciseMinutesSensor
 from custom_components.generac.sensor import FuelLevelSensor
 from custom_components.generac.sensor import FuelTypeSensor
 from custom_components.generac.sensor import LastReadingDateSensor
@@ -28,6 +31,7 @@
 from custom_components.generac.sensor import PanelIDSensor
 from custom_components.generac.sensor import ProtectionTimeSensor
 from custom_components.generac.sensor import RunTimeSensor
+from custom_components.generac.sensor import sensors
 from custom_components.generac.sensor import SerialNumberSensor
 from custom_components.generac.sensor import SignalStrengthSensor
 from custom_components.generac.sensor import StatusLabelSensor
@@ -127,7 +131,7 @@ async def test_status_sensor(hass):
     item = get_mock_item(DEVICE_TYPE_GENERATOR, 1)
     sensor = StatusSensor(coordinator, entry, "12345", item)
     assert sensor.native_value == "Ready"
-    assert sensor.name == "generac_12345_status"
+    assert sensor.name == "Status"
     assert sensor.device_class == "enum"
     assert sensor.icon == "mdi:power"
 
@@ -222,7 +226,7 @@ async def test_generator_sensors(hass):
     assert sensor.native_value == "P12345"
 
     sensor = SignalStrengthSensor(coordinator, entry, "12345", item)
-    assert sensor.native_value == "100%"
+    assert sensor.native_value == 100.0
 
     sensor = OutdoorTemperatureSensor(coordinator, entry, "12345", item)
     assert sensor.native_value == 72.0
@@ -285,3 +289,136 @@ async def test_safe_float_handles_none_and_invalid(hass):
     assert RunTimeSensor(coordinator, entry, "12345", item).native_value is None
     assert ProtectionTimeSensor(coordinator, entry, "12345", item).native_value is None
     assert BatteryVoltageSensor(coordinator, entry, "12345", item).native_value is None
+
+
+def _with_apparatus_value(item: Item, **fields) -> Item:
+    item.apparatus.properties = [
+        Apparatus.Property(name="x", value=[], type=1),
+        Apparatus.Property(name="y", value="text", type=2),
+        Apparatus.Property(
+            name="z",
+            value=Apparatus.Property.Value(
+                type=3,
+                status=None,
+                isLegacy=None,
+                isRunning=None,
+                deviceId=None,
+                deviceType=None,
+                signalStrength=fields.get("signalStrength"),
+                batteryLevel=fields.get("batteryLevel"),
+            ),
+            type=3,
+        ),
+    ]
+    return item
+
+
+@pytest.mark.parametrize(
+    ("raw", "expected"),
+    [("75%", 75.0), (" 75 % ", 75.0), ("75", 75.0), (75, 75.0), ("N/A", None)],
+)
+async def test_percentage_sensors_are_numeric(hass, raw, expected):
+    """Signal strength / device battery parse "NN%" strings into numbers."""
+    item = _with_apparatus_value(
+        get_mock_item(DEVICE_TYPE_GENERATOR, 1), signalStrength=raw, batteryLevel=raw
+    )
+    signal = SignalStrengthSensor(MagicMock(), MagicMock(), "12345", item)
+    battery = DeviceBatteryLevelSensor(MagicMock(), MagicMock(), "12345", item)
+    assert signal.native_value == expected
+    assert battery.native_value == expected
+    assert signal.native_unit_of_measurement == "%"
+    assert signal.state_class == "measurement"
+    assert battery.device_class == "battery"
+
+
+@pytest.mark.parametrize(
+    "properties",
+    [
+        None,
+        [],
+        [Apparatus.Property(name="x", value=None, type=3)],
+        [Apparatus.Property(name="x", value=["unexpected"], type=3)],
+        [Apparatus.Property(name="x", value=42, type=3)],
+    ],
+)
+async def test_percentage_sensors_tolerate_missing_or_malformed(hass, properties):
+    """Missing or unexpectedly typed property payloads report unknown."""
+    item = get_mock_item(DEVICE_TYPE_GENERATOR, 1)
+    item.apparatus.properties = properties
+    assert (
+        SignalStrengthSensor(MagicMock(), MagicMock(), "1", item).native_value is None
+    )
+    assert (
+        DeviceBatteryLevelSensor(MagicMock(), MagicMock(), "1", item).native_value
+        is None
+    )
+
+
+async def test_exercise_duration_sensor(hass):
+    """Detail property 95 is exposed as an exercise duration in minutes."""
+    item = get_mock_item(DEVICE_TYPE_GENERATOR, 1)
+    item.apparatusDetail.properties = [MagicMock(type=95, value="12")]
+    sensor = ExerciseMinutesSensor(MagicMock(), MagicMock(), "12345", item)
+    assert sensor.native_value == 12.0
+    assert sensor.native_unit_of_measurement == "min"
+    assert sensor.name == "Exercise Duration"
+
+    item.apparatusDetail.properties = [MagicMock(type=95, value={"bad": 1})]
+    assert sensor.native_value is None
+
+
+async def test_fuel_level_percentage_is_numeric(hass):
+    """Propane fuel level strings like "45%" no longer break the sensor state."""
+    item = get_mock_item(DEVICE_TYPE_PROPANE_MONITOR, 1, fuel_level="45%")
+    assert FuelLevelSensor(MagicMock(), MagicMock(), "1", item).native_value == 45.0
+
+
+def test_sensor_selection_generator():
+    """Generators always keep signal strength; optional sensors follow the data."""
+    item = get_mock_item(DEVICE_TYPE_GENERATOR, 1)
+    item.apparatus.properties = None
+    selected = sensors(item)
+    assert SignalStrengthSensor in selected
+    assert DeviceBatteryLevelSensor not in selected
+    assert ExerciseMinutesSensor not in selected
+
+    item = _with_apparatus_value(item, signalStrength="70%", batteryLevel="90")
+    item.apparatusDetail.properties.append(MagicMock(type=95, value=15))
+    selected = sensors(item)
+    assert selected.count(SignalStrengthSensor) == 1
+    assert DeviceBatteryLevelSensor in selected
+    assert ExerciseMinutesSensor in selected
+
+
+def test_sensor_selection_propane_monitor():
+    """Propane monitors gain signal/battery sensors only when reported."""
+    item = get_mock_item(DEVICE_TYPE_PROPANE_MONITOR, 1)
+    item.apparatusDetail.properties = None
+    assert SignalStrengthSensor not in sensors(item)
+    assert DeviceBatteryLevelSensor not in sensors(item)
+
+    item = _with_apparatus_value(item, signalStrength="60", batteryLevel="80%")
+    selected = sensors(item)
+    assert SignalStrengthSensor in selected
+    assert DeviceBatteryLevelSensor in selected
+    assert ExerciseMinutesSensor not in selected
+    assert BatteryLevelSensor in selected
+
+
+def test_friendly_names_and_stable_unique_ids():
+    """Labels are readable; unique_ids keep the historical technical suffix."""
+    entry = MagicMock()
+    entry.entry_id = "entry"
+    item = get_mock_item(DEVICE_TYPE_PROPANE_MONITOR, 1)
+    cases = {
+        LastReadingDateSensor: ("Last Reading", "last_reading"),
+        DeviceSsidSensor: ("Device SSID", "device_ssid"),
+        PanelIDSensor: ("Panel ID", "panel_id"),
+        RunTimeSensor: ("Run Time", "run_time"),
+        DeviceBatteryLevelSensor: ("Device Battery Level", "device_battery_level"),
+    }
+    for cls, (label, suffix) in cases.items():
+        sensor = cls(MagicMock(), entry, "9", item)
+        assert sensor.has_entity_name is True
+        assert sensor.name == label
+        assert sensor.unique_id == f"entry_9_generac_9_{suffix}"
diff --git a/tests/test_weather.py b/tests/test_weather.py
index a9e66de..22f438b 100644
--- a/tests/test_weather.py
+++ b/tests/test_weather.py
@@ -41,7 +41,7 @@ async def test_weather_sensor(hass):
     assert sensor.condition == "sunny"
     assert sensor.native_temperature == 72.0
     assert sensor.native_temperature_unit == "°F"
-    assert sensor.name == "generac_12345_weather"
+    assert sensor.name == "Weather"
 
     # Test cloudy condition
     item = get_mock_item(7, 65.0, "C")