From 262ade0598fb69511a6dc5cdf1025a3124f6c79b Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 25 Sep 2026 19:09:37 +0100
Subject: [PATCH] [senseair] Use register_apply_action for the five senseair
 actions (#19643)

---
 esphome/components/senseair/senseair.h | 51 ---------------------
 esphome/components/senseair/sensor.py  | 63 ++++----------------------
 2 files changed, 10 insertions(+), 104 deletions(-)

diff --git a/esphome/components/senseair/senseair.h b/esphome/components/senseair/senseair.h
index 48154a53d9..b376f1f657 100644
--- a/esphome/components/senseair/senseair.h
+++ b/esphome/components/senseair/senseair.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "esphome/core/component.h"
-#include "esphome/core/automation.h"
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/uart/uart.h"
 
@@ -37,54 +36,4 @@ class SenseAirComponent final : public PollingComponent, public uart::UARTDevice
   sensor::Sensor *co2_sensor_{nullptr};
 };
 
-template<typename... Ts> class SenseAirBackgroundCalibrationAction final : public Action<Ts...> {
- public:
-  SenseAirBackgroundCalibrationAction(SenseAirComponent *senseair) : senseair_(senseair) {}
-
-  void play(const Ts &...x) override { this->senseair_->background_calibration(); }
-
- protected:
-  SenseAirComponent *senseair_;
-};
-
-template<typename... Ts> class SenseAirBackgroundCalibrationResultAction final : public Action<Ts...> {
- public:
-  SenseAirBackgroundCalibrationResultAction(SenseAirComponent *senseair) : senseair_(senseair) {}
-
-  void play(const Ts &...x) override { this->senseair_->background_calibration_result(); }
-
- protected:
-  SenseAirComponent *senseair_;
-};
-
-template<typename... Ts> class SenseAirABCEnableAction final : public Action<Ts...> {
- public:
-  SenseAirABCEnableAction(SenseAirComponent *senseair) : senseair_(senseair) {}
-
-  void play(const Ts &...x) override { this->senseair_->abc_enable(); }
-
- protected:
-  SenseAirComponent *senseair_;
-};
-
-template<typename... Ts> class SenseAirABCDisableAction final : public Action<Ts...> {
- public:
-  SenseAirABCDisableAction(SenseAirComponent *senseair) : senseair_(senseair) {}
-
-  void play(const Ts &...x) override { this->senseair_->abc_disable(); }
-
- protected:
-  SenseAirComponent *senseair_;
-};
-
-template<typename... Ts> class SenseAirABCGetPeriodAction final : public Action<Ts...> {
- public:
-  SenseAirABCGetPeriodAction(SenseAirComponent *senseair) : senseair_(senseair) {}
-
-  void play(const Ts &...x) override { this->senseair_->abc_get_period(); }
-
- protected:
-  SenseAirComponent *senseair_;
-};
-
 }  // namespace esphome::senseair
diff --git a/esphome/components/senseair/sensor.py b/esphome/components/senseair/sensor.py
index ac92efa3a4..9445e5867c 100644
--- a/esphome/components/senseair/sensor.py
+++ b/esphome/components/senseair/sensor.py
@@ -19,21 +19,6 @@ senseair_ns = cg.esphome_ns.namespace("senseair")
 SenseAirComponent = senseair_ns.class_(
     "SenseAirComponent", cg.PollingComponent, uart.UARTDevice
 )
-SenseAirBackgroundCalibrationAction = senseair_ns.class_(
-    "SenseAirBackgroundCalibrationAction", automation.Action
-)
-SenseAirBackgroundCalibrationResultAction = senseair_ns.class_(
-    "SenseAirBackgroundCalibrationResultAction", automation.Action
-)
-SenseAirABCEnableAction = senseair_ns.class_(
-    "SenseAirABCEnableAction", automation.Action
-)
-SenseAirABCDisableAction = senseair_ns.class_(
-    "SenseAirABCDisableAction", automation.Action
-)
-SenseAirABCGetPeriodAction = senseair_ns.class_(
-    "SenseAirABCGetPeriodAction", automation.Action
-)
 
 CONFIG_SCHEMA = (
     cv.Schema(
@@ -80,41 +65,13 @@ CALIBRATION_ACTION_SCHEMA = maybe_simple_id(
 )
 
 
-automation.register_simple_action(
-    "senseair.background_calibration",
-    SenseAirBackgroundCalibrationAction,
-    CALIBRATION_ACTION_SCHEMA,
-    synchronous=True,
-)
-
-
-automation.register_simple_action(
-    "senseair.background_calibration_result",
-    SenseAirBackgroundCalibrationResultAction,
-    CALIBRATION_ACTION_SCHEMA,
-    synchronous=True,
-)
-
-
-automation.register_simple_action(
-    "senseair.abc_enable",
-    SenseAirABCEnableAction,
-    CALIBRATION_ACTION_SCHEMA,
-    synchronous=True,
-)
-
-
-automation.register_simple_action(
-    "senseair.abc_disable",
-    SenseAirABCDisableAction,
-    CALIBRATION_ACTION_SCHEMA,
-    synchronous=True,
-)
-
-
-automation.register_simple_action(
-    "senseair.abc_get_period",
-    SenseAirABCGetPeriodAction,
-    CALIBRATION_ACTION_SCHEMA,
-    synchronous=True,
-)
+for _name, _call in (
+    ("senseair.background_calibration", "background_calibration()"),
+    ("senseair.background_calibration_result", "background_calibration_result()"),
+    ("senseair.abc_enable", "abc_enable()"),
+    ("senseair.abc_disable", "abc_disable()"),
+    ("senseair.abc_get_period", "abc_get_period()"),
+):
+    automation.register_apply_action(
+        _name, CALIBRATION_ACTION_SCHEMA, automation.ApplyCall(_call)
+    )