From 7c6c0fb4bcaf1a4eda4b5d78635d86e6fc6cbaa9 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Fri, 16 Oct 2026 13:46:01 -1000 Subject: [PATCH] [ld2412] Use Apply buttons --- esphome/components/ld2412/button/__init__.py | 27 +++++++++---------- .../ld2412/button/factory_reset_button.cpp | 7 ----- .../ld2412/button/factory_reset_button.h | 16 ----------- .../components/ld2412/button/query_button.cpp | 7 ----- .../components/ld2412/button/query_button.h | 16 ----------- .../ld2412/button/restart_button.cpp | 7 ----- .../components/ld2412/button/restart_button.h | 16 ----------- ...t_dynamic_background_correction_button.cpp | 9 ------- ...art_dynamic_background_correction_button.h | 16 ----------- 9 files changed, 13 insertions(+), 108 deletions(-) delete mode 100644 esphome/components/ld2412/button/factory_reset_button.cpp delete mode 100644 esphome/components/ld2412/button/factory_reset_button.h delete mode 100644 esphome/components/ld2412/button/query_button.cpp delete mode 100644 esphome/components/ld2412/button/query_button.h delete mode 100644 esphome/components/ld2412/button/restart_button.cpp delete mode 100644 esphome/components/ld2412/button/restart_button.h delete mode 100644 esphome/components/ld2412/button/start_dynamic_background_correction_button.cpp delete mode 100644 esphome/components/ld2412/button/start_dynamic_background_correction_button.h diff --git a/esphome/components/ld2412/button/__init__.py b/esphome/components/ld2412/button/__init__.py index c1737a494de..63c2d697230 100644 --- a/esphome/components/ld2412/button/__init__.py +++ b/esphome/components/ld2412/button/__init__.py @@ -16,38 +16,32 @@ from esphome.const import ( ) from esphome.types import ConfigType -from .. import CONF_LD2412_ID, LD2412_ns, LD2412Component +from .. import CONF_LD2412_ID, LD2412Component -FactoryResetButton = LD2412_ns.class_("FactoryResetButton", button.Button) -QueryButton = LD2412_ns.class_("QueryButton", button.Button) -RestartButton = LD2412_ns.class_("RestartButton", button.Button) -StartDynamicBackgroundCorrectionButton = LD2412_ns.class_( - "StartDynamicBackgroundCorrectionButton", button.Button -) CONF_START_DYNAMIC_BACKGROUND_CORRECTION = "start_dynamic_background_correction" CONFIG_SCHEMA = { cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase), cv.GenerateID(CONF_LD2412_ID): cv.use_id(LD2412Component), cv.Optional(CONF_FACTORY_RESET): button.button_schema( - FactoryResetButton, + button.ApplyButton, device_class=DEVICE_CLASS_RESTART, entity_category=ENTITY_CATEGORY_CONFIG, icon=ICON_RESTART_ALERT, ), cv.Optional(CONF_QUERY_PARAMS): button.button_schema( - QueryButton, + button.ApplyButton, entity_category=ENTITY_CATEGORY_DIAGNOSTIC, icon=ICON_DATABASE, ), cv.Optional(CONF_RESTART): button.button_schema( - RestartButton, + button.ApplyButton, device_class=DEVICE_CLASS_RESTART, entity_category=ENTITY_CATEGORY_DIAGNOSTIC, icon=ICON_RESTART, ), cv.Optional(CONF_START_DYNAMIC_BACKGROUND_CORRECTION): button.button_schema( - StartDynamicBackgroundCorrectionButton, + button.ApplyButton, entity_category=ENTITY_CATEGORY_CONFIG, icon=ICON_PULSE, ), @@ -57,10 +51,15 @@ CONFIG_SCHEMA = { async def to_code(config: ConfigType) -> None: hub = await cg.get_variable(config[CONF_LD2412_ID]) buttons = button.sub_buttons(config, parent=hub) - await buttons(CONF_FACTORY_RESET, hub.set_factory_reset_button) - await buttons(CONF_QUERY_PARAMS, hub.set_query_button) - await buttons(CONF_RESTART, hub.set_restart_button) + await buttons( + CONF_FACTORY_RESET, hub.set_factory_reset_button, apply="factory_reset()" + ) + await buttons(CONF_QUERY_PARAMS, hub.set_query_button, apply="read_all_info()") + await buttons( + CONF_RESTART, hub.set_restart_button, apply="restart_and_read_all_info()" + ) await buttons( CONF_START_DYNAMIC_BACKGROUND_CORRECTION, hub.set_start_dynamic_background_correction_button, + apply="start_dynamic_background_correction()", ) diff --git a/esphome/components/ld2412/button/factory_reset_button.cpp b/esphome/components/ld2412/button/factory_reset_button.cpp deleted file mode 100644 index e8fd891c0f1..00000000000 --- a/esphome/components/ld2412/button/factory_reset_button.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "factory_reset_button.h" - -namespace esphome::ld2412 { - -void FactoryResetButton::press_action() { this->parent_->factory_reset(); } - -} // namespace esphome::ld2412 diff --git a/esphome/components/ld2412/button/factory_reset_button.h b/esphome/components/ld2412/button/factory_reset_button.h deleted file mode 100644 index a6ea8f7365d..00000000000 --- a/esphome/components/ld2412/button/factory_reset_button.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "esphome/components/button/button.h" -#include "../ld2412.h" - -namespace esphome::ld2412 { - -class FactoryResetButton final : public button::Button, public Parented { - public: - FactoryResetButton() = default; - - protected: - void press_action() override; -}; - -} // namespace esphome::ld2412 diff --git a/esphome/components/ld2412/button/query_button.cpp b/esphome/components/ld2412/button/query_button.cpp deleted file mode 100644 index 9affb265562..00000000000 --- a/esphome/components/ld2412/button/query_button.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "query_button.h" - -namespace esphome::ld2412 { - -void QueryButton::press_action() { this->parent_->read_all_info(); } - -} // namespace esphome::ld2412 diff --git a/esphome/components/ld2412/button/query_button.h b/esphome/components/ld2412/button/query_button.h deleted file mode 100644 index 71e2ab14e88..00000000000 --- a/esphome/components/ld2412/button/query_button.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "esphome/components/button/button.h" -#include "../ld2412.h" - -namespace esphome::ld2412 { - -class QueryButton final : public button::Button, public Parented { - public: - QueryButton() = default; - - protected: - void press_action() override; -}; - -} // namespace esphome::ld2412 diff --git a/esphome/components/ld2412/button/restart_button.cpp b/esphome/components/ld2412/button/restart_button.cpp deleted file mode 100644 index 430f6c998f4..00000000000 --- a/esphome/components/ld2412/button/restart_button.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "restart_button.h" - -namespace esphome::ld2412 { - -void RestartButton::press_action() { this->parent_->restart_and_read_all_info(); } - -} // namespace esphome::ld2412 diff --git a/esphome/components/ld2412/button/restart_button.h b/esphome/components/ld2412/button/restart_button.h deleted file mode 100644 index 668ce1a8e6f..00000000000 --- a/esphome/components/ld2412/button/restart_button.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "esphome/components/button/button.h" -#include "../ld2412.h" - -namespace esphome::ld2412 { - -class RestartButton final : public button::Button, public Parented { - public: - RestartButton() = default; - - protected: - void press_action() override; -}; - -} // namespace esphome::ld2412 diff --git a/esphome/components/ld2412/button/start_dynamic_background_correction_button.cpp b/esphome/components/ld2412/button/start_dynamic_background_correction_button.cpp deleted file mode 100644 index 8ba41a03fbc..00000000000 --- a/esphome/components/ld2412/button/start_dynamic_background_correction_button.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "start_dynamic_background_correction_button.h" - -#include "restart_button.h" - -namespace esphome::ld2412 { - -void StartDynamicBackgroundCorrectionButton::press_action() { this->parent_->start_dynamic_background_correction(); } - -} // namespace esphome::ld2412 diff --git a/esphome/components/ld2412/button/start_dynamic_background_correction_button.h b/esphome/components/ld2412/button/start_dynamic_background_correction_button.h deleted file mode 100644 index 3b24f5dcf8b..00000000000 --- a/esphome/components/ld2412/button/start_dynamic_background_correction_button.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "esphome/components/button/button.h" -#include "../ld2412.h" - -namespace esphome::ld2412 { - -class StartDynamicBackgroundCorrectionButton final : public button::Button, public Parented { - public: - StartDynamicBackgroundCorrectionButton() = default; - - protected: - void press_action() override; -}; - -} // namespace esphome::ld2412