From 0ff2a0d66db24887a6d5213a5268b36443322547 Mon Sep 17 00:00:00 2001
From: mvn23 <schopdiedwaas@gmail.com>
Date: Wed, 18 Dec 2024 19:46:30 +0100
Subject: [PATCH] Add "cancel room setpoint override" button to opentherm_gw
 (#132162)

---
 .../components/opentherm_gw/button.py         | 13 ++++++-
 .../components/opentherm_gw/strings.json      |  5 +++
 tests/components/opentherm_gw/test_button.py  | 34 +++++++++++++++++++
 3 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/opentherm_gw/button.py b/homeassistant/components/opentherm_gw/button.py
index bac50295199..00b91ad33e0 100644
--- a/homeassistant/components/opentherm_gw/button.py
+++ b/homeassistant/components/opentherm_gw/button.py
@@ -16,7 +16,12 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from . import OpenThermGatewayHub
-from .const import DATA_GATEWAYS, DATA_OPENTHERM_GW, GATEWAY_DEVICE_DESCRIPTION
+from .const import (
+    DATA_GATEWAYS,
+    DATA_OPENTHERM_GW,
+    GATEWAY_DEVICE_DESCRIPTION,
+    THERMOSTAT_DEVICE_DESCRIPTION,
+)
 from .entity import OpenThermEntity, OpenThermEntityDescription
 
 
@@ -30,6 +35,12 @@ class OpenThermButtonEntityDescription(
 
 
 BUTTON_DESCRIPTIONS: tuple[OpenThermButtonEntityDescription, ...] = (
+    OpenThermButtonEntityDescription(
+        key="cancel_room_setpoint_override",
+        translation_key="cancel_room_setpoint_override",
+        device_description=THERMOSTAT_DEVICE_DESCRIPTION,
+        action=lambda hub: hub.set_room_setpoint(0),
+    ),
     OpenThermButtonEntityDescription(
         key="restart_button",
         device_class=ButtonDeviceClass.RESTART,
diff --git a/homeassistant/components/opentherm_gw/strings.json b/homeassistant/components/opentherm_gw/strings.json
index 834168eb113..4c452da41ae 100644
--- a/homeassistant/components/opentherm_gw/strings.json
+++ b/homeassistant/components/opentherm_gw/strings.json
@@ -158,6 +158,11 @@
         "name": "Programmed change has priority over override"
       }
     },
+    "button": {
+      "cancel_room_setpoint_override": {
+        "name": "Cancel room setpoint override"
+      }
+    },
     "select": {
       "gpio_mode_n": {
         "name": "GPIO {gpio_id} mode",
diff --git a/tests/components/opentherm_gw/test_button.py b/tests/components/opentherm_gw/test_button.py
index b02a9d9fef0..d8de52559e7 100644
--- a/tests/components/opentherm_gw/test_button.py
+++ b/tests/components/opentherm_gw/test_button.py
@@ -16,6 +16,40 @@ from .conftest import MINIMAL_STATUS
 from tests.common import MockConfigEntry
 
 
+async def test_cancel_room_setpoint_override_button(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    mock_config_entry: MockConfigEntry,
+    mock_pyotgw: MagicMock,
+) -> None:
+    """Test cancel room setpoint override button."""
+
+    mock_pyotgw.return_value.set_target_temp = AsyncMock(return_value=0)
+    mock_config_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert (
+        button_entity_id := entity_registry.async_get_entity_id(
+            BUTTON_DOMAIN,
+            OPENTHERM_DOMAIN,
+            f"{mock_config_entry.data[CONF_ID]}-{OpenThermDeviceIdentifier.THERMOSTAT}-cancel_room_setpoint_override",
+        )
+    ) is not None
+
+    await hass.services.async_call(
+        BUTTON_DOMAIN,
+        SERVICE_PRESS,
+        {
+            ATTR_ENTITY_ID: button_entity_id,
+        },
+        blocking=True,
+    )
+
+    mock_pyotgw.return_value.set_target_temp.assert_awaited_once_with(0, True)
+
+
 async def test_restart_button(
     hass: HomeAssistant,
     entity_registry: er.EntityRegistry,