From c4d1b1317adcabac1c82ede8fd61f40c29fb7a4c Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Fri, 8 Aug 2025 00:55:54 +0200
Subject: [PATCH] [switch] Add `switch.control` automation action (#10105)

Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
---
 esphome/components/switch/__init__.py  | 19 +++++++++++++++++++
 esphome/components/switch/automation.h | 21 +++++++++++++++++++++
 tests/components/switch/common.yaml    |  8 ++++++++
 3 files changed, 48 insertions(+)

diff --git a/esphome/components/switch/__init__.py b/esphome/components/switch/__init__.py
index a595d43445..4668a1458c 100644
--- a/esphome/components/switch/__init__.py
+++ b/esphome/components/switch/__init__.py
@@ -13,6 +13,7 @@ from esphome.const import (
     CONF_ON_TURN_OFF,
     CONF_ON_TURN_ON,
     CONF_RESTORE_MODE,
+    CONF_STATE,
     CONF_TRIGGER_ID,
     CONF_WEB_SERVER,
     DEVICE_CLASS_EMPTY,
@@ -48,6 +49,7 @@ RESTORE_MODES = {
 }
 
 
+ControlAction = switch_ns.class_("ControlAction", automation.Action)
 ToggleAction = switch_ns.class_("ToggleAction", automation.Action)
 TurnOffAction = switch_ns.class_("TurnOffAction", automation.Action)
 TurnOnAction = switch_ns.class_("TurnOnAction", automation.Action)
@@ -177,6 +179,23 @@ SWITCH_ACTION_SCHEMA = maybe_simple_id(
         cv.Required(CONF_ID): cv.use_id(Switch),
     }
 )
+SWITCH_CONTROL_ACTION_SCHEMA = automation.maybe_simple_id(
+    {
+        cv.Required(CONF_ID): cv.use_id(Switch),
+        cv.Required(CONF_STATE): cv.templatable(cv.boolean),
+    }
+)
+
+
+@automation.register_action(
+    "switch.control", ControlAction, SWITCH_CONTROL_ACTION_SCHEMA
+)
+async def switch_control_to_code(config, action_id, template_arg, args):
+    paren = await cg.get_variable(config[CONF_ID])
+    var = cg.new_Pvariable(action_id, template_arg, paren)
+    template_ = await cg.templatable(config[CONF_STATE], args, bool)
+    cg.add(var.set_state(template_))
+    return var
 
 
 @automation.register_action("switch.toggle", ToggleAction, SWITCH_ACTION_SCHEMA)
diff --git a/esphome/components/switch/automation.h b/esphome/components/switch/automation.h
index 579daf4d24..51ac5d7a3a 100644
--- a/esphome/components/switch/automation.h
+++ b/esphome/components/switch/automation.h
@@ -37,6 +37,27 @@ template<typename... Ts> class ToggleAction : public Action<Ts...> {
   Switch *switch_;
 };
 
+template<typename... Ts> class ControlAction : public Action<Ts...> {
+ public:
+  explicit ControlAction(Switch *a_switch) : switch_(a_switch) {}
+
+  TEMPLATABLE_VALUE(bool, state)
+
+  void play(Ts... x) override {
+    auto state = this->state_.optional_value(x...);
+    if (state.has_value()) {
+      if (*state) {
+        this->switch_->turn_on();
+      } else {
+        this->switch_->turn_off();
+      }
+    }
+  }
+
+ protected:
+  Switch *switch_;
+};
+
 template<typename... Ts> class SwitchCondition : public Condition<Ts...> {
  public:
   SwitchCondition(Switch *parent, bool state) : parent_(parent), state_(state) {}
diff --git a/tests/components/switch/common.yaml b/tests/components/switch/common.yaml
index 8d6972f91b..b69e36a1c0 100644
--- a/tests/components/switch/common.yaml
+++ b/tests/components/switch/common.yaml
@@ -9,3 +9,11 @@ switch:
     name: "Template Switch"
     id: the_switch
     optimistic: true
+
+esphome:
+  on_boot:
+    - switch.turn_on: the_switch
+    - switch.turn_off: the_switch
+    - switch.control:
+        id: the_switch
+        state: !lambda return (1 > 2);