diff --git a/homeassistant/components/flexit_bacnet/icons.json b/homeassistant/components/flexit_bacnet/icons.json index 07423f8fd126..434f2338ec06 100644 --- a/homeassistant/components/flexit_bacnet/icons.json +++ b/homeassistant/components/flexit_bacnet/icons.json @@ -59,12 +59,6 @@ "state": { "off": "mdi:radiator-off" } - }, - "fireplace_mode": { - "default": "mdi:fireplace", - "state": { - "off": "mdi:fireplace-off" - } } } } diff --git a/homeassistant/components/flexit_bacnet/strings.json b/homeassistant/components/flexit_bacnet/strings.json index 8b9ff3c0199a..d4a9c975d102 100644 --- a/homeassistant/components/flexit_bacnet/strings.json +++ b/homeassistant/components/flexit_bacnet/strings.json @@ -126,9 +126,6 @@ }, "electric_heater": { "name": "Electric heater" - }, - "fireplace_mode": { - "name": "Fireplace mode" } } }, @@ -151,11 +148,5 @@ "switch_turn": { "message": "Failed to turn the switch {state}." } - }, - "issues": { - "deprecated_fireplace_switch": { - "description": "The fireplace mode switch entity `{entity_id}` is deprecated and will be removed in Home Assistant 2026.9.\n\nFireplace mode has been moved to a climate preset on the climate entity to better match the device interface.\n\nPlease update your automations to use the `climate.set_preset_mode` action with preset mode `fireplace` instead of using the switch entity.\n\nAfter updating your automations, you can safely disable this switch entity.", - "title": "Fireplace mode switch is deprecated" - } } } diff --git a/homeassistant/components/flexit_bacnet/switch.py b/homeassistant/components/flexit_bacnet/switch.py index 191e49e42eef..90ebf0eda026 100644 --- a/homeassistant/components/flexit_bacnet/switch.py +++ b/homeassistant/components/flexit_bacnet/switch.py @@ -13,12 +13,9 @@ from homeassistant.components.switch import ( SwitchEntity, SwitchEntityDescription, ) -from homeassistant.const import Platform from homeassistant.core import HomeAssistant from homeassistant.exceptions import HomeAssistantError -from homeassistant.helpers import entity_registry as er from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback -from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue from .const import DOMAIN from .coordinator import FlexitConfigEntry, FlexitCoordinator @@ -49,13 +46,6 @@ SWITCHES: tuple[FlexitSwitchEntityDescription, ...] = ( turn_on_fn=lambda data: data.activate_cooker_hood(), turn_off_fn=lambda data: data.deactivate_cooker_hood(), ), - FlexitSwitchEntityDescription( - key="fireplace_mode", - translation_key="fireplace_mode", - is_on_fn=lambda data: data.fireplace_ventilation_status, - turn_on_fn=lambda data: data.trigger_fireplace_mode(), - turn_off_fn=lambda data: data.trigger_fireplace_mode(), - ), ) @@ -67,43 +57,9 @@ async def async_setup_entry( """Set up Flexit (bacnet) switch from a config entry.""" coordinator = config_entry.runtime_data - entities: list[FlexitSwitch] = [] - for description in SWITCHES: - if description.key == "fireplace_mode": - # Check if deprecated fireplace switch is enabled and create repair issue - entity_reg = er.async_get(hass) - fireplace_switch_unique_id = ( - f"{coordinator.device.serial_number}-fireplace_mode" - ) - # Look up the fireplace switch entity by unique_id - fireplace_switch_entity_id = entity_reg.async_get_entity_id( - Platform.SWITCH, DOMAIN, fireplace_switch_unique_id - ) - if not fireplace_switch_entity_id: - continue - entity_registry_entry = entity_reg.async_get(fireplace_switch_entity_id) - - if entity_registry_entry: - if entity_registry_entry.disabled: - entity_reg.async_remove(fireplace_switch_entity_id) - else: - async_create_issue( - hass, - DOMAIN, - f"deprecated_switch_{fireplace_switch_unique_id}", - breaks_in_ha_version="2026.9.0", - is_fixable=False, - issue_domain=DOMAIN, - severity=IssueSeverity.WARNING, - translation_key="deprecated_fireplace_switch", - translation_placeholders={ - "entity_id": fireplace_switch_entity_id, - }, - ) - entities.append(FlexitSwitch(coordinator, description)) - else: - entities.append(FlexitSwitch(coordinator, description)) - async_add_entities(entities) + async_add_entities( + FlexitSwitch(coordinator, description) for description in SWITCHES + ) PARALLEL_UPDATES = 1