mirror of
https://github.com/home-assistant/core.git
synced 2025-07-10 14:57:09 +00:00
Fix merge conflict resolution error in flux_led (#66775)
This commit is contained in:
parent
8b557884b7
commit
736a1ca0a3
@ -110,7 +110,7 @@ class FluxPowerStateSelect(FluxConfigAtStartSelect, SelectEntity):
|
|||||||
) -> None:
|
) -> None:
|
||||||
"""Initialize the power state select."""
|
"""Initialize the power state select."""
|
||||||
super().__init__(device, entry)
|
super().__init__(device, entry)
|
||||||
self._attr_name = f"{entry.data[CONF_NAME]} Power Restored"
|
self._attr_name = f"{entry.data.get(CONF_NAME, entry.title)} Power Restored"
|
||||||
base_unique_id = entry.unique_id or entry.entry_id
|
base_unique_id = entry.unique_id or entry.entry_id
|
||||||
self._attr_unique_id = f"{base_unique_id}_power_restored"
|
self._attr_unique_id = f"{base_unique_id}_power_restored"
|
||||||
self._async_set_current_option_from_device()
|
self._async_set_current_option_from_device()
|
||||||
@ -237,7 +237,7 @@ class FluxWhiteChannelSelect(FluxConfigAtStartSelect):
|
|||||||
) -> None:
|
) -> None:
|
||||||
"""Initialize the white channel select."""
|
"""Initialize the white channel select."""
|
||||||
super().__init__(device, entry)
|
super().__init__(device, entry)
|
||||||
self._attr_name = f"{entry.data[CONF_NAME]} White Channel"
|
self._attr_name = f"{entry.data.get(CONF_NAME, entry.title)} White Channel"
|
||||||
base_unique_id = entry.unique_id or entry.entry_id
|
base_unique_id = entry.unique_id or entry.entry_id
|
||||||
self._attr_unique_id = f"{base_unique_id}_white_channel"
|
self._attr_unique_id = f"{base_unique_id}_white_channel"
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user