From def600ff6ab797144c0eafd2f4c652768a0a6d0d Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Fri, 16 Oct 2026 13:46:02 -1000 Subject: [PATCH] [seeed_mr24hpc1] Use Apply buttons --- .../seeed_mr24hpc1/button/__init__.py | 17 +++++++++-------- .../button/custom_mode_end_button.cpp | 7 ------- .../button/custom_mode_end_button.h | 16 ---------------- .../seeed_mr24hpc1/button/restart_button.cpp | 7 ------- .../seeed_mr24hpc1/button/restart_button.h | 16 ---------------- 5 files changed, 9 insertions(+), 54 deletions(-) delete mode 100644 esphome/components/seeed_mr24hpc1/button/custom_mode_end_button.cpp delete mode 100644 esphome/components/seeed_mr24hpc1/button/custom_mode_end_button.h delete mode 100644 esphome/components/seeed_mr24hpc1/button/restart_button.cpp delete mode 100644 esphome/components/seeed_mr24hpc1/button/restart_button.h diff --git a/esphome/components/seeed_mr24hpc1/button/__init__.py b/esphome/components/seeed_mr24hpc1/button/__init__.py index 58c62652b09..c25e8381693 100644 --- a/esphome/components/seeed_mr24hpc1/button/__init__.py +++ b/esphome/components/seeed_mr24hpc1/button/__init__.py @@ -9,23 +9,20 @@ from esphome.const import ( ) from esphome.types import ConfigType -from .. import CONF_MR24HPC1_ID, MR24HPC1Component, mr24hpc1_ns - -RestartButton = mr24hpc1_ns.class_("RestartButton", button.Button) -CustomSetEndButton = mr24hpc1_ns.class_("CustomSetEndButton", button.Button) +from .. import CONF_MR24HPC1_ID, MR24HPC1Component CONF_CUSTOM_SET_END = "custom_set_end" CONFIG_SCHEMA = { cv.GenerateID(CONF_MR24HPC1_ID): cv.use_id(MR24HPC1Component), cv.Optional(CONF_RESTART): button.button_schema( - RestartButton, + button.ApplyButton, device_class=DEVICE_CLASS_RESTART, entity_category=ENTITY_CATEGORY_CONFIG, icon=ICON_RESTART_ALERT, ), cv.Optional(CONF_CUSTOM_SET_END): button.button_schema( - CustomSetEndButton, + button.ApplyButton, entity_category=ENTITY_CATEGORY_CONFIG, icon="mdi:cog", ), @@ -35,5 +32,9 @@ CONFIG_SCHEMA = { async def to_code(config: ConfigType) -> None: hub = await cg.get_variable(config[CONF_MR24HPC1_ID]) buttons = button.sub_buttons(config, parent=hub) - await buttons(CONF_RESTART, hub.set_restart_button) - await buttons(CONF_CUSTOM_SET_END, hub.set_custom_set_end_button) + await buttons(CONF_RESTART, hub.set_restart_button, apply="set_restart()") + await buttons( + CONF_CUSTOM_SET_END, + hub.set_custom_set_end_button, + apply="set_custom_end_mode()", + ) diff --git a/esphome/components/seeed_mr24hpc1/button/custom_mode_end_button.cpp b/esphome/components/seeed_mr24hpc1/button/custom_mode_end_button.cpp deleted file mode 100644 index aec940dd22e..00000000000 --- a/esphome/components/seeed_mr24hpc1/button/custom_mode_end_button.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "custom_mode_end_button.h" - -namespace esphome::seeed_mr24hpc1 { - -void CustomSetEndButton::press_action() { this->parent_->set_custom_end_mode(); } - -} // namespace esphome::seeed_mr24hpc1 diff --git a/esphome/components/seeed_mr24hpc1/button/custom_mode_end_button.h b/esphome/components/seeed_mr24hpc1/button/custom_mode_end_button.h deleted file mode 100644 index fc0cbbdc769..00000000000 --- a/esphome/components/seeed_mr24hpc1/button/custom_mode_end_button.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "esphome/components/button/button.h" -#include "../seeed_mr24hpc1.h" - -namespace esphome::seeed_mr24hpc1 { - -class CustomSetEndButton final : public button::Button, public Parented { - public: - CustomSetEndButton() = default; - - protected: - void press_action() override; -}; - -} // namespace esphome::seeed_mr24hpc1 diff --git a/esphome/components/seeed_mr24hpc1/button/restart_button.cpp b/esphome/components/seeed_mr24hpc1/button/restart_button.cpp deleted file mode 100644 index f32056ee1ba..00000000000 --- a/esphome/components/seeed_mr24hpc1/button/restart_button.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "restart_button.h" - -namespace esphome::seeed_mr24hpc1 { - -void RestartButton::press_action() { this->parent_->set_restart(); } - -} // namespace esphome::seeed_mr24hpc1 diff --git a/esphome/components/seeed_mr24hpc1/button/restart_button.h b/esphome/components/seeed_mr24hpc1/button/restart_button.h deleted file mode 100644 index c6c530004b3..00000000000 --- a/esphome/components/seeed_mr24hpc1/button/restart_button.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "esphome/components/button/button.h" -#include "../seeed_mr24hpc1.h" - -namespace esphome::seeed_mr24hpc1 { - -class RestartButton final : public button::Button, public Parented { - public: - RestartButton() = default; - - protected: - void press_action() override; -}; - -} // namespace esphome::seeed_mr24hpc1