mirror of
https://github.com/home-assistant/core.git
synced 2025-07-16 09:47:13 +00:00
Move naming of entities in Rituals Perfume Genie (#92482)
This commit is contained in:
parent
5ee6595998
commit
46bf0e59f3
@ -14,8 +14,6 @@ from .const import DOMAIN
|
||||
from .coordinator import RitualsDataUpdateCoordinator
|
||||
from .entity import DiffuserEntity
|
||||
|
||||
CHARGING_SUFFIX = " Battery Charging"
|
||||
|
||||
|
||||
async def async_setup_entry(
|
||||
hass: HomeAssistant,
|
||||
@ -42,8 +40,9 @@ class DiffuserBatteryChargingBinarySensor(DiffuserEntity, BinarySensorEntity):
|
||||
|
||||
def __init__(self, coordinator: RitualsDataUpdateCoordinator) -> None:
|
||||
"""Initialize the battery charging binary sensor."""
|
||||
super().__init__(coordinator, CHARGING_SUFFIX)
|
||||
super().__init__(coordinator)
|
||||
self._attr_unique_id = f"{coordinator.diffuser.hublot}-charging"
|
||||
self._attr_name = f"{coordinator.diffuser.name} Battery Charging"
|
||||
|
||||
@property
|
||||
def is_on(self) -> bool:
|
||||
|
@ -18,19 +18,14 @@ class DiffuserEntity(CoordinatorEntity[RitualsDataUpdateCoordinator]):
|
||||
def __init__(
|
||||
self,
|
||||
coordinator: RitualsDataUpdateCoordinator,
|
||||
entity_suffix: str,
|
||||
) -> None:
|
||||
"""Init from config, hookup diffuser and coordinator."""
|
||||
super().__init__(coordinator)
|
||||
hublot = coordinator.diffuser.hublot
|
||||
hubname = coordinator.diffuser.name
|
||||
|
||||
self._attr_name = f"{hubname}{entity_suffix}"
|
||||
self._attr_device_info = DeviceInfo(
|
||||
identifiers={(DOMAIN, hublot)},
|
||||
identifiers={(DOMAIN, coordinator.diffuser.hublot)},
|
||||
manufacturer=MANUFACTURER,
|
||||
model=MODEL if coordinator.diffuser.has_battery else MODEL2,
|
||||
name=hubname,
|
||||
name=coordinator.diffuser.name,
|
||||
sw_version=coordinator.diffuser.version,
|
||||
)
|
||||
|
||||
|
@ -13,8 +13,6 @@ from .entity import DiffuserEntity
|
||||
MIN_PERFUME_AMOUNT = 1
|
||||
MAX_PERFUME_AMOUNT = 3
|
||||
|
||||
PERFUME_AMOUNT_SUFFIX = " Perfume Amount"
|
||||
|
||||
|
||||
async def async_setup_entry(
|
||||
hass: HomeAssistant,
|
||||
@ -39,8 +37,9 @@ class DiffuserPerfumeAmount(DiffuserEntity, NumberEntity):
|
||||
|
||||
def __init__(self, coordinator: RitualsDataUpdateCoordinator) -> None:
|
||||
"""Initialize the diffuser perfume amount number."""
|
||||
super().__init__(coordinator, PERFUME_AMOUNT_SUFFIX)
|
||||
super().__init__(coordinator)
|
||||
self._attr_unique_id = f"{coordinator.diffuser.hublot}-perfume_amount"
|
||||
self._attr_name = f"{coordinator.diffuser.name} Perfume Amount"
|
||||
|
||||
@property
|
||||
def native_value(self) -> int:
|
||||
|
@ -11,8 +11,6 @@ from .const import DOMAIN
|
||||
from .coordinator import RitualsDataUpdateCoordinator
|
||||
from .entity import DiffuserEntity
|
||||
|
||||
ROOM_SIZE_SUFFIX = " Room Size"
|
||||
|
||||
|
||||
async def async_setup_entry(
|
||||
hass: HomeAssistant,
|
||||
@ -39,11 +37,12 @@ class DiffuserRoomSize(DiffuserEntity, SelectEntity):
|
||||
|
||||
def __init__(self, coordinator: RitualsDataUpdateCoordinator) -> None:
|
||||
"""Initialize the diffuser room size select entity."""
|
||||
super().__init__(coordinator, ROOM_SIZE_SUFFIX)
|
||||
super().__init__(coordinator)
|
||||
self._attr_entity_registry_enabled_default = (
|
||||
self.coordinator.diffuser.has_battery
|
||||
)
|
||||
self._attr_unique_id = f"{coordinator.diffuser.hublot}-room_size_square_meter"
|
||||
self._attr_name = f"{coordinator.diffuser.name} Room Size"
|
||||
|
||||
@property
|
||||
def current_option(self) -> str:
|
||||
|
@ -11,11 +11,6 @@ from .const import DOMAIN
|
||||
from .coordinator import RitualsDataUpdateCoordinator
|
||||
from .entity import DiffuserEntity
|
||||
|
||||
BATTERY_SUFFIX = " Battery"
|
||||
PERFUME_SUFFIX = " Perfume"
|
||||
FILL_SUFFIX = " Fill"
|
||||
WIFI_SUFFIX = " Wifi"
|
||||
|
||||
|
||||
async def async_setup_entry(
|
||||
hass: HomeAssistant,
|
||||
@ -47,8 +42,9 @@ class DiffuserPerfumeSensor(DiffuserEntity, SensorEntity):
|
||||
|
||||
def __init__(self, coordinator: RitualsDataUpdateCoordinator) -> None:
|
||||
"""Initialize the perfume sensor."""
|
||||
super().__init__(coordinator, PERFUME_SUFFIX)
|
||||
super().__init__(coordinator)
|
||||
self._attr_unique_id = f"{coordinator.diffuser.hublot}-perfume"
|
||||
self._attr_name = f"{coordinator.diffuser.name} Perfume"
|
||||
|
||||
@property
|
||||
def icon(self) -> str:
|
||||
@ -68,8 +64,9 @@ class DiffuserFillSensor(DiffuserEntity, SensorEntity):
|
||||
|
||||
def __init__(self, coordinator: RitualsDataUpdateCoordinator) -> None:
|
||||
"""Initialize the fill sensor."""
|
||||
super().__init__(coordinator, FILL_SUFFIX)
|
||||
super().__init__(coordinator)
|
||||
self._attr_unique_id = f"{coordinator.diffuser.hublot}-fill"
|
||||
self._attr_name = f"{coordinator.diffuser.name} Fill"
|
||||
|
||||
@property
|
||||
def icon(self) -> str:
|
||||
@ -93,8 +90,9 @@ class DiffuserBatterySensor(DiffuserEntity, SensorEntity):
|
||||
|
||||
def __init__(self, coordinator: RitualsDataUpdateCoordinator) -> None:
|
||||
"""Initialize the battery sensor."""
|
||||
super().__init__(coordinator, BATTERY_SUFFIX)
|
||||
super().__init__(coordinator)
|
||||
self._attr_unique_id = f"{coordinator.diffuser.hublot}-battery_percentage"
|
||||
self._attr_name = f"{coordinator.diffuser.name} Battery"
|
||||
|
||||
@property
|
||||
def native_value(self) -> int:
|
||||
@ -110,8 +108,9 @@ class DiffuserWifiSensor(DiffuserEntity, SensorEntity):
|
||||
|
||||
def __init__(self, coordinator: RitualsDataUpdateCoordinator) -> None:
|
||||
"""Initialize the wifi sensor."""
|
||||
super().__init__(coordinator, WIFI_SUFFIX)
|
||||
super().__init__(coordinator)
|
||||
self._attr_unique_id = f"{coordinator.diffuser.hublot}-wifi_percentage"
|
||||
self._attr_name = f"{coordinator.diffuser.name} Wifi"
|
||||
|
||||
@property
|
||||
def native_value(self) -> int:
|
||||
|
@ -35,9 +35,10 @@ class DiffuserSwitch(DiffuserEntity, SwitchEntity):
|
||||
|
||||
def __init__(self, coordinator: RitualsDataUpdateCoordinator) -> None:
|
||||
"""Initialize the diffuser switch."""
|
||||
super().__init__(coordinator, "")
|
||||
super().__init__(coordinator)
|
||||
self._attr_is_on = self.coordinator.diffuser.is_on
|
||||
self._attr_unique_id = f"{coordinator.diffuser.hublot}-is_on"
|
||||
self._attr_name = coordinator.diffuser.name
|
||||
|
||||
async def async_turn_on(self, **kwargs: Any) -> None:
|
||||
"""Turn the device on."""
|
||||
|
Loading…
x
Reference in New Issue
Block a user