[ld2410] Use Apply buttons

esphome/components/ld2410/button/__init__.py

@@ -15,29 +15,25 @@ from esphome.const import (
 )
 from esphome.types import ConfigType
 
-from .. import CONF_LD2410_ID, LD2410Component, ld2410_ns
-
-FactoryResetButton = ld2410_ns.class_("FactoryResetButton", button.Button)
-QueryButton = ld2410_ns.class_("QueryButton", button.Button)
-RestartButton = ld2410_ns.class_("RestartButton", button.Button)
+from .. import CONF_LD2410_ID, LD2410Component
 
 CONFIG_SCHEMA = {
     cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase),
     cv.GenerateID(CONF_LD2410_ID): cv.use_id(LD2410Component),
     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_RESTART): button.button_schema(
-        RestartButton,
+        button.ApplyButton,
         device_class=DEVICE_CLASS_RESTART,
         entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
         icon=ICON_RESTART,
     ),
     cv.Optional(CONF_QUERY_PARAMS): button.button_schema(
-        QueryButton,
+        button.ApplyButton,
         entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
         icon=ICON_DATABASE,
     ),
@@ -47,6 +43,10 @@ CONFIG_SCHEMA = {
 async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_LD2410_ID])
     buttons = button.sub_buttons(config, parent=hub)
-    await buttons(CONF_FACTORY_RESET, hub.set_factory_reset_button)
-    await buttons(CONF_RESTART, hub.set_restart_button)
-    await buttons(CONF_QUERY_PARAMS, hub.set_query_button)
+    await buttons(
+        CONF_FACTORY_RESET, hub.set_factory_reset_button, apply="factory_reset()"
+    )
+    await buttons(
+        CONF_RESTART, hub.set_restart_button, apply="restart_and_read_all_info()"
+    )
+    await buttons(CONF_QUERY_PARAMS, hub.set_query_button, apply="read_all_info()")

esphome/components/ld2410/button/factory_reset_button.cpp

@@ -1,7 +0,0 @@
-#include "factory_reset_button.h"
-
-namespace esphome::ld2410 {
-
-void FactoryResetButton::press_action() { this->parent_->factory_reset(); }
-
-}  // namespace esphome::ld2410

esphome/components/ld2410/button/factory_reset_button.h

@@ -1,16 +0,0 @@
-#pragma once
-
-#include "esphome/components/button/button.h"
-#include "../ld2410.h"
-
-namespace esphome::ld2410 {
-
-class FactoryResetButton final : public button::Button, public Parented<LD2410Component> {
- public:
-  FactoryResetButton() = default;
-
- protected:
-  void press_action() override;
-};
-
-}  // namespace esphome::ld2410

esphome/components/ld2410/button/query_button.cpp

@@ -1,7 +0,0 @@
-#include "query_button.h"
-
-namespace esphome::ld2410 {
-
-void QueryButton::press_action() { this->parent_->read_all_info(); }
-
-}  // namespace esphome::ld2410

esphome/components/ld2410/button/query_button.h

@@ -1,16 +0,0 @@
-#pragma once
-
-#include "esphome/components/button/button.h"
-#include "../ld2410.h"
-
-namespace esphome::ld2410 {
-
-class QueryButton final : public button::Button, public Parented<LD2410Component> {
- public:
-  QueryButton() = default;
-
- protected:
-  void press_action() override;
-};
-
-}  // namespace esphome::ld2410

esphome/components/ld2410/button/restart_button.cpp

@@ -1,7 +0,0 @@
-#include "restart_button.h"
-
-namespace esphome::ld2410 {
-
-void RestartButton::press_action() { this->parent_->restart_and_read_all_info(); }
-
-}  // namespace esphome::ld2410

esphome/components/ld2410/button/restart_button.h

@@ -1,16 +0,0 @@
-#pragma once
-
-#include "esphome/components/button/button.h"
-#include "../ld2410.h"
-
-namespace esphome::ld2410 {
-
-class RestartButton final : public button::Button, public Parented<LD2410Component> {
- public:
-  RestartButton() = default;
-
- protected:
-  void press_action() override;
-};
-
-}  // namespace esphome::ld2410