From 288a7b376a56b8aa620c4bdd66b91acfd80d73ea Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 25 Sep 2026 19:52:16 +0100
Subject: [PATCH] [htu21d] Use register_apply_action for htu21d.set_heater and
 htu21d.set_heater_level (#19658)

---
 esphome/components/htu21d/htu21d.h  | 23 ------------------
 esphome/components/htu21d/sensor.py | 37 ++++-------------------------
 2 files changed, 4 insertions(+), 56 deletions(-)

diff --git a/esphome/components/htu21d/htu21d.h b/esphome/components/htu21d/htu21d.h
index f86d62c5e8..c4babfd797 100644
--- a/esphome/components/htu21d/htu21d.h
+++ b/esphome/components/htu21d/htu21d.h
@@ -3,7 +3,6 @@
 #include "esphome/core/component.h"
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/i2c/i2c.h"
-#include "esphome/core/automation.h"
 
 namespace esphome::htu21d {
 
@@ -34,26 +33,4 @@ class HTU21DComponent final : public PollingComponent, public i2c::I2CDevice {
   HTU21DSensorModels sensor_model_{HTU21D_SENSOR_MODEL_HTU21D};
 };
 
-template<typename... Ts> class SetHeaterLevelAction final : public Action<Ts...>, public Parented<HTU21DComponent> {
- public:
-  TEMPLATABLE_VALUE(uint8_t, level)
-
-  void play(const Ts &...x) override {
-    auto level = this->level_.value(x...);
-
-    this->parent_->set_heater_level(level);
-  }
-};
-
-template<typename... Ts> class SetHeaterAction final : public Action<Ts...>, public Parented<HTU21DComponent> {
- public:
-  TEMPLATABLE_VALUE(bool, status)
-
-  void play(const Ts &...x) override {
-    auto status = this->status_.value(x...);
-
-    this->parent_->set_heater(status);
-  }
-};
-
 }  // namespace esphome::htu21d
diff --git a/esphome/components/htu21d/sensor.py b/esphome/components/htu21d/sensor.py
index 86dca77725..08888c17e5 100644
--- a/esphome/components/htu21d/sensor.py
+++ b/esphome/components/htu21d/sensor.py
@@ -17,8 +17,6 @@ from esphome.const import (
     UNIT_EMPTY,
     UNIT_PERCENT,
 )
-from esphome.core import ID
-from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
@@ -27,8 +25,6 @@ htu21d_ns = cg.esphome_ns.namespace("htu21d")
 HTU21DComponent = htu21d_ns.class_(
     "HTU21DComponent", cg.PollingComponent, i2c.I2CDevice
 )
-SetHeaterLevelAction = htu21d_ns.class_("SetHeaterLevelAction", automation.Action)
-SetHeaterAction = htu21d_ns.class_("SetHeaterAction", automation.Action)
 HTU21DSensorModels = htu21d_ns.enum("HTU21DSensorModels")
 
 MODELS = {
@@ -86,9 +82,8 @@ async def to_code(config: ConfigType) -> None:
     cg.add(var.set_sensor_model(config[CONF_MODEL]))
 
 
-@automation.register_action(
+automation.register_apply_action(
     "htu21d.set_heater_level",
-    SetHeaterLevelAction,
     cv.maybe_simple_value(
         {
             cv.GenerateID(): cv.use_id(HTU21DComponent),
@@ -96,24 +91,11 @@ async def to_code(config: ConfigType) -> None:
         },
         key=CONF_LEVEL,
     ),
-    synchronous=True,
+    automation.ApplyField(CONF_LEVEL, "set_heater_level", cg.uint8),
 )
-async def set_heater_level_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
-    var = cg.new_Pvariable(action_id, template_arg)
-    await cg.register_parented(var, config[CONF_ID])
-    level_ = await cg.templatable(config[CONF_LEVEL], args, cg.uint8)
-    cg.add(var.set_level(level_))
-    return var
 
-
-@automation.register_action(
+automation.register_apply_action(
     "htu21d.set_heater",
-    SetHeaterAction,
     cv.maybe_simple_value(
         {
             cv.GenerateID(): cv.use_id(HTU21DComponent),
@@ -121,16 +103,5 @@ async def set_heater_level_to_code(
         },
         key=CONF_STATUS,
     ),
-    synchronous=True,
+    automation.ApplyField(CONF_STATUS, "set_heater", cg.bool_),
 )
-async def set_heater_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
-    var = cg.new_Pvariable(action_id, template_arg)
-    await cg.register_parented(var, config[CONF_ID])
-    status_ = await cg.templatable(config[CONF_STATUS], args, cg.bool_)
-    cg.add(var.set_status(status_))
-    return var