From 520c9646560cce3581d902a5e672637f9f5faa45 Mon Sep 17 00:00:00 2001
From: G Johansson <goran.johansson@shiftit.se>
Date: Sun, 18 May 2025 20:50:33 +0200
Subject: [PATCH] Remove deprecated aux heat from elkm1 (#145148)

---
 homeassistant/components/elkm1/climate.py   | 36 ---------------------
 homeassistant/components/elkm1/strings.json | 13 --------
 2 files changed, 49 deletions(-)

diff --git a/homeassistant/components/elkm1/climate.py b/homeassistant/components/elkm1/climate.py
index 55af0cfa29c..59d3aa9605a 100644
--- a/homeassistant/components/elkm1/climate.py
+++ b/homeassistant/components/elkm1/climate.py
@@ -20,10 +20,8 @@ from homeassistant.components.climate import (
 from homeassistant.const import PRECISION_WHOLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 
 from . import ElkM1ConfigEntry
-from .const import DOMAIN
 from .entity import ElkEntity, create_elk_entities
 
 SUPPORT_HVAC = [
@@ -78,7 +76,6 @@ class ElkThermostat(ElkEntity, ClimateEntity):
     _attr_precision = PRECISION_WHOLE
     _attr_supported_features = (
         ClimateEntityFeature.FAN_MODE
-        | ClimateEntityFeature.AUX_HEAT
         | ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
         | ClimateEntityFeature.TURN_OFF
         | ClimateEntityFeature.TURN_ON
@@ -128,11 +125,6 @@ class ElkThermostat(ElkEntity, ClimateEntity):
         """Return the current humidity."""
         return self._element.humidity
 
-    @property
-    def is_aux_heat(self) -> bool:
-        """Return if aux heater is on."""
-        return self._element.mode == ThermostatMode.EMERGENCY_HEAT
-
     @property
     def fan_mode(self) -> str | None:
         """Return the fan setting."""
@@ -151,34 +143,6 @@ class ElkThermostat(ElkEntity, ClimateEntity):
         thermostat_mode, fan_mode = HASS_TO_ELK_HVAC_MODES[hvac_mode]
         self._elk_set(thermostat_mode, fan_mode)
 
-    async def async_turn_aux_heat_on(self) -> None:
-        """Turn auxiliary heater on."""
-        async_create_issue(
-            self.hass,
-            DOMAIN,
-            "migrate_aux_heat",
-            breaks_in_ha_version="2025.4.0",
-            is_fixable=True,
-            is_persistent=True,
-            translation_key="migrate_aux_heat",
-            severity=IssueSeverity.WARNING,
-        )
-        self._elk_set(ThermostatMode.EMERGENCY_HEAT, None)
-
-    async def async_turn_aux_heat_off(self) -> None:
-        """Turn auxiliary heater off."""
-        async_create_issue(
-            self.hass,
-            DOMAIN,
-            "migrate_aux_heat",
-            breaks_in_ha_version="2025.4.0",
-            is_fixable=True,
-            is_persistent=True,
-            translation_key="migrate_aux_heat",
-            severity=IssueSeverity.WARNING,
-        )
-        self._elk_set(ThermostatMode.HEAT, None)
-
     async def async_set_fan_mode(self, fan_mode: str) -> None:
         """Set new target fan mode."""
         thermostat_mode, elk_fan_mode = HASS_TO_ELK_FAN_MODES[fan_mode]
diff --git a/homeassistant/components/elkm1/strings.json b/homeassistant/components/elkm1/strings.json
index b50c1817838..19967612b0f 100644
--- a/homeassistant/components/elkm1/strings.json
+++ b/homeassistant/components/elkm1/strings.json
@@ -189,18 +189,5 @@
       "name": "Sensor zone trigger",
       "description": "Triggers zone."
     }
-  },
-  "issues": {
-    "migrate_aux_heat": {
-      "title": "Migration of Elk-M1 set_aux_heat action",
-      "fix_flow": {
-        "step": {
-          "confirm": {
-            "description": "The Elk-M1 `set_aux_heat` action has been migrated. A new emergency heat switch entity is available for each thermostat.\n\nUpdate any automations to use the new emergency heat switch entity. When this is done, select **Submit** to fix this issue.",
-            "title": "[%key:component::elkm1::issues::migrate_aux_heat::title%]"
-          }
-        }
-      }
-    }
   }
 }