esphome 2025.7.5__py3-none-any.whl → 2025.8.0b2__py3-none-any.whl

esphome/components/spi/__init__.py

@@ -1,4 +1,5 @@
 import re
+from typing import Any
 
 from esphome import pins
 import esphome.codegen as cg
@@ -114,9 +115,7 @@ def get_target_platform():
 
 
 def get_target_variant():
-    return (
-        CORE.data[KEY_ESP32][KEY_VARIANT] if KEY_VARIANT in CORE.data[KEY_ESP32] else ""
-    )
+    return CORE.data[KEY_ESP32].get(KEY_VARIANT, "")
 
 
 # Get a list of available hardware interfaces based on target and variant.
@@ -139,6 +138,27 @@ def get_hw_interface_list():
     return []
 
 
+def one_of_interface_validator(additional_values: list[str] | None = None) -> Any:
+    """Helper to create a one_of validator for SPI interfaces.
+
+    This delays evaluation of get_hw_interface_list() until validation time,
+    avoiding access to CORE.data during module import.
+
+    Args:
+        additional_values: List of additional valid values to include
+    """
+    if additional_values is None:
+        additional_values = []
+
+    def validator(value: str) -> str:
+        return cv.one_of(
+            *sum(get_hw_interface_list(), additional_values),
+            lower=True,
+        )(value)
+
+    return cv.All(cv.string, validator)
+
+
 # Given an SPI name, return the index of it in the available list
 def get_spi_index(name):
     for i, ilist in enumerate(get_hw_interface_list()):
@@ -191,9 +211,7 @@ def validate_hw_pins(spi, index=-1):
             return False
         if sdo_pin_no not in pin_set[CONF_MOSI_PIN]:
             return False
-        if sdi_pin_no not in pin_set[CONF_MISO_PIN]:
-            return False
-        return True
+        return sdi_pin_no in pin_set[CONF_MISO_PIN]
     return False
 
 
@@ -274,9 +292,8 @@ SPI_SINGLE_SCHEMA = cv.All(
             cv.Optional(CONF_FORCE_SW): cv.invalid(
                 "force_sw is deprecated - use interface: software"
             ),
-            cv.Optional(CONF_INTERFACE, default="any"): cv.one_of(
-                *sum(get_hw_interface_list(), ["software", "hardware", "any"]),
-                lower=True,
+            cv.Optional(CONF_INTERFACE, default="any"): one_of_interface_validator(
+                ["software", "hardware", "any"]
             ),
             cv.Optional(CONF_DATA_PINS): cv.invalid(
                 "'data_pins' should be used with 'type: quad or octal' only"
@@ -309,10 +326,9 @@ def spi_mode_schema(mode):
                     cv.ensure_list(pins.internal_gpio_output_pin_number),
                     cv.Length(min=pin_count, max=pin_count),
                 ),
-                cv.Optional(CONF_INTERFACE, default="hardware"): cv.one_of(
-                    *sum(get_hw_interface_list(), ["hardware"]),
-                    lower=True,
-                ),
+                cv.Optional(
+                    CONF_INTERFACE, default="hardware"
+                ): one_of_interface_validator(["hardware"]),
                 cv.Optional(CONF_MISO_PIN): cv.invalid(
                     f"'miso_pin' should not be used with {mode} SPI"
                 ),

esphome/components/spi/spi.cpp

@@ -37,8 +37,6 @@ void SPIComponent::unregister_device(SPIClient *device) {
 }
 
 void SPIComponent::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
-
   if (this->sdo_pin_ == nullptr)
     this->sdo_pin_ = NullPin::NULL_PIN;
   if (this->sdi_pin_ == nullptr)

esphome/components/spi_device/spi_device.cpp

@@ -8,10 +8,7 @@ namespace spi_device {
 
 static const char *const TAG = "spi_device";
 
-void SPIDeviceComponent::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
-  this->spi_setup();
-}
+void SPIDeviceComponent::setup() { this->spi_setup(); }
 
 void SPIDeviceComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "SPIDevice");

esphome/components/sprinkler/__init__.py

@@ -130,11 +130,11 @@ def validate_sprinkler(config):
         if (
             CONF_PUMP_SWITCH_OFF_DURING_VALVE_OPEN_DELAY in sprinkler_controller
             and CONF_VALVE_OPEN_DELAY not in sprinkler_controller
+            and sprinkler_controller[CONF_PUMP_SWITCH_OFF_DURING_VALVE_OPEN_DELAY]
         ):
-            if sprinkler_controller[CONF_PUMP_SWITCH_OFF_DURING_VALVE_OPEN_DELAY]:
-                raise cv.Invalid(
-                    f"{CONF_VALVE_OPEN_DELAY} must be defined when {CONF_PUMP_SWITCH_OFF_DURING_VALVE_OPEN_DELAY} is enabled"
-                )
+            raise cv.Invalid(
+                f"{CONF_VALVE_OPEN_DELAY} must be defined when {CONF_PUMP_SWITCH_OFF_DURING_VALVE_OPEN_DELAY} is enabled"
+            )
 
         if (
             CONF_REPEAT in sprinkler_controller

esphome/components/sps30/sps30.cpp

@@ -22,7 +22,6 @@ static const size_t SERIAL_NUMBER_LENGTH = 8;
 static const uint8_t MAX_SKIPPED_DATA_CYCLES_BEFORE_ERROR = 5;
 
 void SPS30Component::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   this->write_command(SPS30_CMD_SOFT_RESET);
   /// Deferred Sensor initialization
   this->set_timeout(500, [this]() {

esphome/components/ssd1306_base/__init__.py

@@ -6,6 +6,8 @@ from esphome.const import (
     CONF_BRIGHTNESS,
     CONF_CONTRAST,
     CONF_EXTERNAL_VCC,
+    CONF_FLIP_X,
+    CONF_FLIP_Y,
     CONF_INVERT,
     CONF_LAMBDA,
     CONF_MODEL,
@@ -18,9 +20,6 @@ ssd1306_base_ns = cg.esphome_ns.namespace("ssd1306_base")
 SSD1306 = ssd1306_base_ns.class_("SSD1306", cg.PollingComponent, display.DisplayBuffer)
 SSD1306Model = ssd1306_base_ns.enum("SSD1306Model")
 
-CONF_FLIP_X = "flip_x"
-CONF_FLIP_Y = "flip_y"
-
 MODELS = {
     "SSD1306_128X32": SSD1306Model.SSD1306_MODEL_128_32,
     "SSD1306_128X64": SSD1306Model.SSD1306_MODEL_128_64,
@@ -43,14 +42,15 @@ SSD1306_MODEL = cv.enum(MODELS, upper=True, space="_")
 
 def _validate(value):
     model = value[CONF_MODEL]
-    if model not in ("SSD1305_128X32", "SSD1305_128X64"):
-        # Contrast is default value (1.0) while brightness is not
-        # Indicates user is using old `brightness` option
-        if value[CONF_BRIGHTNESS] != 1.0 and value[CONF_CONTRAST] == 1.0:
-            raise cv.Invalid(
-                "SSD1306/SH1106 no longer accepts brightness option, "
-                'please use "contrast" instead.'
-            )
+    if (
+        model not in ("SSD1305_128X32", "SSD1305_128X64")
+        and value[CONF_BRIGHTNESS] != 1.0
+        and value[CONF_CONTRAST] == 1.0
+    ):
+        raise cv.Invalid(
+            "SSD1306/SH1106 no longer accepts brightness option, "
+            'please use "contrast" instead.'
+        )
 
     return value
 

esphome/components/ssd1306_base/ssd1306_base.cpp

@@ -176,7 +176,7 @@ void SSD1306::setup() {
   // Disable scrolling mode (0x2E)
   this->command(SSD1306_COMMAND_DEACTIVATE_SCROLL);
 
-  // Contrast and brighrness
+  // Contrast and brightness
   // SSD1306 does not have brightness setting
   set_contrast(this->contrast_);
   if (this->is_ssd1305_())

esphome/components/ssd1306_i2c/ssd1306_i2c.cpp

@@ -7,7 +7,6 @@ namespace ssd1306_i2c {
 static const char *const TAG = "ssd1306_i2c";
 
 void I2CSSD1306::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   this->init_reset_();
 
   auto err = this->write(nullptr, 0);

esphome/components/ssd1306_spi/ssd1306_spi.cpp

@@ -8,7 +8,6 @@ namespace ssd1306_spi {
 static const char *const TAG = "ssd1306_spi";
 
 void SPISSD1306::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   this->spi_setup();
   this->dc_pin_->setup();  // OUTPUT
 

esphome/components/ssd1322_spi/ssd1322_spi.cpp

@@ -8,7 +8,6 @@ namespace ssd1322_spi {
 static const char *const TAG = "ssd1322_spi";
 
 void SPISSD1322::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   this->spi_setup();
   this->dc_pin_->setup();  // OUTPUT
   if (this->cs_)

esphome/components/ssd1325_spi/ssd1325_spi.cpp

@@ -8,7 +8,6 @@ namespace ssd1325_spi {
 static const char *const TAG = "ssd1325_spi";
 
 void SPISSD1325::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   this->spi_setup();
   this->dc_pin_->setup();  // OUTPUT
   if (this->cs_)

esphome/components/ssd1327_i2c/ssd1327_i2c.cpp

@@ -7,7 +7,6 @@ namespace ssd1327_i2c {
 static const char *const TAG = "ssd1327_i2c";
 
 void I2CSSD1327::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   this->init_reset_();
 
   auto err = this->write(nullptr, 0);

esphome/components/ssd1327_spi/ssd1327_spi.cpp

@@ -8,7 +8,6 @@ namespace ssd1327_spi {
 static const char *const TAG = "ssd1327_spi";
 
 void SPISSD1327::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   this->spi_setup();
   this->dc_pin_->setup();  // OUTPUT
   if (this->cs_)

esphome/components/ssd1331_spi/ssd1331_spi.cpp

@@ -8,7 +8,6 @@ namespace ssd1331_spi {
 static const char *const TAG = "ssd1331_spi";
 
 void SPISSD1331::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   this->spi_setup();
   this->dc_pin_->setup();  // OUTPUT
   if (this->cs_)

esphome/components/ssd1351_spi/ssd1351_spi.cpp

@@ -8,7 +8,6 @@ namespace ssd1351_spi {
 static const char *const TAG = "ssd1351_spi";
 
 void SPISSD1351::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   this->spi_setup();
   this->dc_pin_->setup();  // OUTPUT
   if (this->cs_)

esphome/components/st7567_i2c/st7567_i2c.cpp

@@ -7,7 +7,6 @@ namespace st7567_i2c {
 static const char *const TAG = "st7567_i2c";
 
 void I2CST7567::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   this->init_reset_();
 
   auto err = this->write(nullptr, 0);

esphome/components/st7567_spi/st7567_spi.cpp

@@ -7,7 +7,6 @@ namespace st7567_spi {
 static const char *const TAG = "st7567_spi";
 
 void SPIST7567::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   this->spi_setup();
   this->dc_pin_->setup();
   if (this->cs_)

esphome/components/st7701s/display.py

@@ -2,9 +2,17 @@ from esphome import pins
 import esphome.codegen as cg
 from esphome.components import display, spi
 from esphome.components.esp32 import const, only_on_variant
-from esphome.components.rpi_dpi_rgb.display import (
+from esphome.components.mipi import (
+    CONF_DE_PIN,
+    CONF_HSYNC_BACK_PORCH,
+    CONF_HSYNC_FRONT_PORCH,
+    CONF_HSYNC_PULSE_WIDTH,
     CONF_PCLK_FREQUENCY,
     CONF_PCLK_INVERTED,
+    CONF_PCLK_PIN,
+    CONF_VSYNC_BACK_PORCH,
+    CONF_VSYNC_FRONT_PORCH,
+    CONF_VSYNC_PULSE_WIDTH,
 )
 import esphome.config_validation as cv
 from esphome.const import (
@@ -36,16 +44,6 @@ from esphome.core import TimePeriod
 
 from .init_sequences import ST7701S_INITS, cmd
 
-CONF_DE_PIN = "de_pin"
-CONF_PCLK_PIN = "pclk_pin"
-
-CONF_HSYNC_PULSE_WIDTH = "hsync_pulse_width"
-CONF_HSYNC_BACK_PORCH = "hsync_back_porch"
-CONF_HSYNC_FRONT_PORCH = "hsync_front_porch"
-CONF_VSYNC_PULSE_WIDTH = "vsync_pulse_width"
-CONF_VSYNC_BACK_PORCH = "vsync_back_porch"
-CONF_VSYNC_FRONT_PORCH = "vsync_front_porch"
-
 DEPENDENCIES = ["spi", "esp32"]
 
 st7701s_ns = cg.esphome_ns.namespace("st7701s")
@@ -191,7 +189,6 @@ async def to_code(config):
     cg.add(var.set_vsync_front_porch(config[CONF_VSYNC_FRONT_PORCH]))
     cg.add(var.set_pclk_inverted(config[CONF_PCLK_INVERTED]))
     cg.add(var.set_pclk_frequency(config[CONF_PCLK_FREQUENCY]))
-    index = 0
     dpins = []
     if CONF_RED in config[CONF_DATA_PINS]:
         red_pins = config[CONF_DATA_PINS][CONF_RED]
@@ -209,10 +206,9 @@ async def to_code(config):
         dpins = dpins[8:16] + dpins[0:8]
     else:
         dpins = config[CONF_DATA_PINS]
-    for pin in dpins:
+    for index, pin in enumerate(dpins):
         data_pin = await cg.gpio_pin_expression(pin)
         cg.add(var.add_data_pin(data_pin, index))
-        index += 1
 
     if dc_pin := config.get(CONF_DC_PIN):
         dc = await cg.gpio_pin_expression(dc_pin)

esphome/components/st7701s/st7701s.cpp

@@ -6,7 +6,6 @@ namespace esphome {
 namespace st7701s {
 
 void ST7701S::setup() {
-  esph_log_config(TAG, "Setting up ST7701S");
   this->spi_setup();
   this->write_init_sequence_();
 
@@ -25,7 +24,6 @@ void ST7701S::setup() {
   config.timings.flags.pclk_active_neg = this->pclk_inverted_;
   config.timings.pclk_hz = this->pclk_frequency_;
   config.clk_src = LCD_CLK_SRC_PLL160M;
-  config.psram_trans_align = 64;
   size_t data_pin_count = sizeof(this->data_pins_) / sizeof(this->data_pins_[0]);
   for (size_t i = 0; i != data_pin_count; i++) {
     config.data_gpio_nums[i] = this->data_pins_[i]->get_pin();
@@ -42,7 +40,6 @@ void ST7701S::setup() {
   if (err != ESP_OK) {
     esph_log_e(TAG, "lcd_new_rgb_panel failed: %s", esp_err_to_name(err));
   }
-  esph_log_config(TAG, "ST7701S setup complete");
 }
 
 void ST7701S::loop() {

esphome/components/st7735/st7735.cpp

@@ -233,7 +233,6 @@ ST7735::ST7735(ST7735Model model, int width, int height, int colstart, int rowst
       height_(height) {}
 
 void ST7735::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   this->spi_setup();
 
   this->dc_pin_->setup();  // OUTPUT

esphome/components/st7789v/st7789v.cpp

@@ -8,7 +8,6 @@ static const char *const TAG = "st7789v";
 static const size_t TEMP_BUFFER_SIZE = 128;
 
 void ST7789V::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
 #ifdef USE_POWER_SUPPLY
   this->power_.request();
   // the PowerSupply component takes care of post turn-on delay

esphome/components/st7920/st7920.cpp

@@ -32,7 +32,6 @@ static const uint8_t LCD_LINE2 = 0x88;
 static const uint8_t LCD_LINE3 = 0x98;
 
 void ST7920::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   this->dump_config();
   this->spi_setup();
   this->init_internal_(this->get_buffer_length_());

esphome/components/status_led/light/status_led_light.cpp

@@ -53,8 +53,6 @@ void StatusLEDLightOutput::write_state(light::LightState *state) {
 }
 
 void StatusLEDLightOutput::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
-
   if (this->pin_ != nullptr) {
     this->pin_->setup();
     this->pin_->digital_write(false);

esphome/components/status_led/status_led.cpp

@@ -11,7 +11,6 @@ StatusLED *global_status_led = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-c
 
 StatusLED::StatusLED(GPIOPin *pin) : pin_(pin) { global_status_led = this; }
 void StatusLED::pre_setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   this->pin_->setup();
   this->pin_->digital_write(false);
 }

esphome/components/stepper/__init__.py

@@ -27,8 +27,7 @@ SetDecelerationAction = stepper_ns.class_("SetDecelerationAction", automation.Ac
 def validate_acceleration(value):
     value = cv.string(value)
     for suffix in ("steps/s^2", "steps/s*s", "steps/s/s", "steps/ss", "steps/(s*s)"):
-        if value.endswith(suffix):
-            value = value[: -len(suffix)]
+        value = value.removesuffix(suffix)
 
     if value == "inf":
         return 1e6
@@ -48,8 +47,7 @@ def validate_acceleration(value):
 def validate_speed(value):
     value = cv.string(value)
     for suffix in ("steps/s", "steps/s"):
-        if value.endswith(suffix):
-            value = value[: -len(suffix)]
+        value = value.removesuffix(suffix)
 
     if value == "inf":
         return 1e6

esphome/components/sts3x/sts3x.cpp

@@ -18,7 +18,6 @@ static const uint16_t STS3X_COMMAND_HEATER_DISABLE = 0x3066;
 static const uint16_t STS3X_COMMAND_FETCH_DATA = 0xE000;
 
 void STS3XComponent::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   if (!this->write_command(STS3X_COMMAND_READ_SERIAL_NUMBER)) {
     this->mark_failed();
     return;

esphome/components/substitutions/__init__.py

@@ -5,13 +5,8 @@ from esphome.config_helpers import Extend, Remove, merge_config
 import esphome.config_validation as cv
 from esphome.const import CONF_SUBSTITUTIONS, VALID_SUBSTITUTIONS_CHARACTERS
 from esphome.yaml_util import ESPHomeDataBase, make_data_base
-from .jinja import (
-    Jinja,
-    JinjaStr,
-    has_jinja,
-    TemplateError,
-    TemplateRuntimeError,
-)
+
+from .jinja import Jinja, JinjaStr, TemplateError, TemplateRuntimeError, has_jinja
 
 CODEOWNERS = ["@esphome/core"]
 _LOGGER = logging.getLogger(__name__)
@@ -54,15 +49,14 @@ def _expand_jinja(value, orig_value, path, jinja, ignore_missing):
         try:
             # Invoke the jinja engine to evaluate the expression.
             value, err = jinja.expand(value)
-            if err is not None:
-                if not ignore_missing and "password" not in path:
-                    _LOGGER.warning(
-                        "Found '%s' (see %s) which looks like an expression,"
-                        " but could not resolve all the variables: %s",
-                        value,
-                        "->".join(str(x) for x in path),
-                        err.message,
-                    )
+            if err is not None and not ignore_missing and "password" not in path:
+                _LOGGER.warning(
+                    "Found '%s' (see %s) which looks like an expression,"
+                    " but could not resolve all the variables: %s",
+                    value,
+                    "->".join(str(x) for x in path),
+                    err.message,
+                )
         except (
             TemplateError,
             TemplateRuntimeError,

esphome/components/substitutions/jinja.py

@@ -1,6 +1,7 @@
 import logging
 import math
 import re
+
 import jinja2 as jinja
 from jinja2.nativetypes import NativeEnvironment
 
@@ -24,6 +25,24 @@ def has_jinja(st):
     return detect_jinja_re.search(st) is not None
 
 
+# SAFE_GLOBAL_FUNCTIONS defines a allowlist of built-in functions that are considered safe to expose
+# in Jinja templates or other sandboxed evaluation contexts. Only functions that do not allow
+# arbitrary code execution, file access, or other security risks are included.
+#
+# The following functions are considered safe:
+#   - ord: Converts a character to its Unicode code point integer.
+#   - chr: Converts an integer to its corresponding Unicode character.
+#   - len: Returns the length of a sequence or collection.
+#
+# These functions were chosen because they are pure, have no side effects, and do not provide access
+# to the file system, environment, or other potentially sensitive resources.
+SAFE_GLOBAL_FUNCTIONS = {
+    "ord": ord,
+    "chr": chr,
+    "len": len,
+}
+
+
 class JinjaStr(str):
     """
     Wraps a string containing an unresolved Jinja expression,
@@ -65,7 +84,11 @@ class Jinja:
         self.env.add_extension("jinja2.ext.do")
         self.env.globals["math"] = math  # Inject entire math module
         self.context_vars = {**context_vars}
-        self.env.globals = {**self.env.globals, **self.context_vars}
+        self.env.globals = {
+            **self.env.globals,
+            **self.context_vars,
+            **SAFE_GLOBAL_FUNCTIONS,
+        }
 
     def expand(self, content_str):
         """

esphome/components/sun/__init__.py

@@ -1,3 +1,4 @@
+import contextlib
 import re
 
 from esphome import automation
@@ -41,12 +42,10 @@ ELEVATION_MAP = {
 
 def elevation(value):
     if isinstance(value, str):
-        try:
+        with contextlib.suppress(cv.Invalid):
             value = ELEVATION_MAP[
                 cv.one_of(*ELEVATION_MAP, lower=True, space="_")(value)
             ]
-        except cv.Invalid:
-            pass
     value = cv.angle(value)
     return cv.float_range(min=-180, max=180)(value)
 

esphome/components/switch/__init__.py

@@ -10,9 +10,11 @@ from esphome.const import (
     CONF_ID,
     CONF_INVERTED,
     CONF_MQTT_ID,
+    CONF_ON_STATE,
     CONF_ON_TURN_OFF,
     CONF_ON_TURN_ON,
     CONF_RESTORE_MODE,
+    CONF_STATE,
     CONF_TRIGGER_ID,
     CONF_WEB_SERVER,
     DEVICE_CLASS_EMPTY,
@@ -48,12 +50,16 @@ 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)
 SwitchPublishAction = switch_ns.class_("SwitchPublishAction", automation.Action)
 
 SwitchCondition = switch_ns.class_("SwitchCondition", Condition)
+SwitchStateTrigger = switch_ns.class_(
+    "SwitchStateTrigger", automation.Trigger.template(bool)
+)
 SwitchTurnOnTrigger = switch_ns.class_(
     "SwitchTurnOnTrigger", automation.Trigger.template()
 )
@@ -75,6 +81,11 @@ _SWITCH_SCHEMA = (
             cv.Optional(CONF_RESTORE_MODE, default="ALWAYS_OFF"): cv.enum(
                 RESTORE_MODES, upper=True, space="_"
             ),
+            cv.Optional(CONF_ON_STATE): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(SwitchStateTrigger),
+                }
+            ),
             cv.Optional(CONF_ON_TURN_ON): automation.validate_automation(
                 {
                     cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(SwitchTurnOnTrigger),
@@ -138,6 +149,9 @@ async def setup_switch_core_(var, config):
 
     if (inverted := config.get(CONF_INVERTED)) is not None:
         cg.add(var.set_inverted(inverted))
+    for conf in config.get(CONF_ON_STATE, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [(bool, "x")], conf)
     for conf in config.get(CONF_ON_TURN_ON, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
         await automation.build_automation(trigger, [], conf)
@@ -177,6 +191,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)
@@ -202,4 +233,3 @@ async def switch_is_off_to_code(config, condition_id, template_arg, args):
 @coroutine_with_priority(100.0)
 async def to_code(config):
     cg.add_global(switch_ns.using)
-    cg.add_define("USE_SWITCH")

esphome/components/switch/automation.h

@@ -37,6 +37,23 @@ 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()) {
+      this->switch_->control(*state);
+    }
+  }
+
+ protected:
+  Switch *switch_;
+};
+
 template<typename... Ts> class SwitchCondition : public Condition<Ts...> {
  public:
   SwitchCondition(Switch *parent, bool state) : parent_(parent), state_(state) {}
@@ -47,6 +64,13 @@ template<typename... Ts> class SwitchCondition : public Condition<Ts...> {
   bool state_;
 };
 
+class SwitchStateTrigger : public Trigger<bool> {
+ public:
+  SwitchStateTrigger(Switch *a_switch) {
+    a_switch->add_on_state_callback([this](bool state) { this->trigger(state); });
+  }
+};
+
 class SwitchTurnOnTrigger : public Trigger<> {
  public:
   SwitchTurnOnTrigger(Switch *a_switch) {