Merge remote-tracking branch 'origin/dev' into apply-entities-switch

A local declared at the top ran option_at before a publish placed before
the statement, which changed the call order and grew ld2412 by 16 bytes.

esphome/components/at581x/switch/__init__.py

@@ -4,14 +4,13 @@ import esphome.config_validation as cv
 from esphome.const import DEVICE_CLASS_SWITCH, ICON_WIFI
 from esphome.types import ConfigType
 
-from .. import CONF_AT581X_ID, AT581XComponent, at581x_ns
+from .. import CONF_AT581X_ID, AT581XComponent
 
 DEPENDENCIES = ["at581x"]
 
-RFSwitch = at581x_ns.class_("RFSwitch", switch.Switch)
 
 CONFIG_SCHEMA = switch.switch_schema(
-    RFSwitch,
+    switch.ApplySwitch,
     device_class=DEVICE_CLASS_SWITCH,
     icon=ICON_WIFI,
 ).extend(
@@ -24,7 +23,7 @@ CONFIG_SCHEMA = switch.switch_schema(
 
 
 async def to_code(config: ConfigType) -> None:
-    at581x_component = await cg.get_variable(config[CONF_AT581X_ID])
-    s = await switch.new_switch(config)
-    await cg.register_parented(s, config[CONF_AT581X_ID])
-    cg.add(at581x_component.set_rf_power_switch(s))
+    hub = await cg.get_variable(config[CONF_AT581X_ID])
+    await switch.sub_switches(config, parent=hub).create(
+        config, hub.set_rf_power_switch, apply="set_rf_mode(state)", publish="before"
+    )

esphome/components/at581x/switch/rf_switch.cpp

@@ -1,10 +0,0 @@
-#include "rf_switch.h"
-
-namespace esphome::at581x {
-
-void RFSwitch::write_state(bool state) {
-  this->publish_state(state);
-  this->parent_->set_rf_mode(state);
-}
-
-}  // namespace esphome::at581x

esphome/components/at581x/switch/rf_switch.h

@@ -1,13 +0,0 @@
-#pragma once
-
-#include "esphome/components/switch/switch.h"
-#include "../at581x.h"
-
-namespace esphome::at581x {
-
-class RFSwitch final : public switch_::Switch, public Parented<AT581XComponent> {
- protected:
-  void write_state(bool state) override;
-};
-
-}  // namespace esphome::at581x

esphome/components/ld2410/switch/__init__.py

@@ -11,10 +11,7 @@ from esphome.const import (
 )
 from esphome.types import ConfigType
 
-from .. import CONF_LD2410_ID, LD2410Component, ld2410_ns
-
-BluetoothSwitch = ld2410_ns.class_("BluetoothSwitch", switch.Switch)
-EngineeringModeSwitch = ld2410_ns.class_("EngineeringModeSwitch", switch.Switch)
+from .. import CONF_LD2410_ID, LD2410Component
 
 CONF_ENGINEERING_MODE = "engineering_mode"
 
@@ -22,13 +19,13 @@ CONFIG_SCHEMA = {
     cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase),
     cv.GenerateID(CONF_LD2410_ID): cv.use_id(LD2410Component),
     cv.Optional(CONF_ENGINEERING_MODE): switch.switch_schema(
-        EngineeringModeSwitch,
+        switch.ApplySwitch,
         device_class=DEVICE_CLASS_SWITCH,
         entity_category=ENTITY_CATEGORY_CONFIG,
         icon=ICON_PULSE,
     ),
     cv.Optional(CONF_BLUETOOTH): switch.switch_schema(
-        BluetoothSwitch,
+        switch.ApplySwitch,
         device_class=DEVICE_CLASS_SWITCH,
         entity_category=ENTITY_CATEGORY_CONFIG,
         icon=ICON_BLUETOOTH,
@@ -39,5 +36,15 @@ CONFIG_SCHEMA = {
 async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_LD2410_ID])
     switches = switch.sub_switches(config, parent=hub)
-    await switches(CONF_ENGINEERING_MODE, hub.set_engineering_mode_switch)
-    await switches(CONF_BLUETOOTH, hub.set_bluetooth_switch)
+    await switches(
+        CONF_ENGINEERING_MODE,
+        hub.set_engineering_mode_switch,
+        apply="set_engineering_mode(state)",
+        publish="before",
+    )
+    await switches(
+        CONF_BLUETOOTH,
+        hub.set_bluetooth_switch,
+        apply="set_bluetooth(state)",
+        publish="before",
+    )

esphome/components/ld2410/switch/bluetooth_switch.cpp

@@ -1,10 +0,0 @@
-#include "bluetooth_switch.h"
-
-namespace esphome::ld2410 {
-
-void BluetoothSwitch::write_state(bool state) {
-  this->publish_state(state);
-  this->parent_->set_bluetooth(state);
-}
-
-}  // namespace esphome::ld2410

esphome/components/ld2410/switch/bluetooth_switch.h

@@ -1,16 +0,0 @@
-#pragma once
-
-#include "esphome/components/switch/switch.h"
-#include "../ld2410.h"
-
-namespace esphome::ld2410 {
-
-class BluetoothSwitch final : public switch_::Switch, public Parented<LD2410Component> {
- public:
-  BluetoothSwitch() = default;
-
- protected:
-  void write_state(bool state) override;
-};
-
-}  // namespace esphome::ld2410

esphome/components/ld2410/switch/engineering_mode_switch.cpp

@@ -1,10 +0,0 @@
-#include "engineering_mode_switch.h"
-
-namespace esphome::ld2410 {
-
-void EngineeringModeSwitch::write_state(bool state) {
-  this->publish_state(state);
-  this->parent_->set_engineering_mode(state);
-}
-
-}  // namespace esphome::ld2410

esphome/components/ld2410/switch/engineering_mode_switch.h

@@ -1,16 +0,0 @@
-#pragma once
-
-#include "esphome/components/switch/switch.h"
-#include "../ld2410.h"
-
-namespace esphome::ld2410 {
-
-class EngineeringModeSwitch final : public switch_::Switch, public Parented<LD2410Component> {
- public:
-  EngineeringModeSwitch() = default;
-
- protected:
-  void write_state(bool state) override;
-};
-
-}  // namespace esphome::ld2410

esphome/components/ld2412/switch/__init__.py

@@ -11,10 +11,7 @@ from esphome.const import (
 )
 from esphome.types import ConfigType
 
-from .. import CONF_LD2412_ID, LD2412_ns, LD2412Component
-
-BluetoothSwitch = LD2412_ns.class_("BluetoothSwitch", switch.Switch)
-EngineeringModeSwitch = LD2412_ns.class_("EngineeringModeSwitch", switch.Switch)
+from .. import CONF_LD2412_ID, LD2412Component
 
 CONF_ENGINEERING_MODE = "engineering_mode"
 
@@ -22,13 +19,13 @@ CONFIG_SCHEMA = {
     cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase),
     cv.GenerateID(CONF_LD2412_ID): cv.use_id(LD2412Component),
     cv.Optional(CONF_BLUETOOTH): switch.switch_schema(
-        BluetoothSwitch,
+        switch.ApplySwitch,
         device_class=DEVICE_CLASS_SWITCH,
         entity_category=ENTITY_CATEGORY_CONFIG,
         icon=ICON_BLUETOOTH,
     ),
     cv.Optional(CONF_ENGINEERING_MODE): switch.switch_schema(
-        EngineeringModeSwitch,
+        switch.ApplySwitch,
         device_class=DEVICE_CLASS_SWITCH,
         entity_category=ENTITY_CATEGORY_CONFIG,
         icon=ICON_PULSE,
@@ -39,5 +36,15 @@ CONFIG_SCHEMA = {
 async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_LD2412_ID])
     switches = switch.sub_switches(config, parent=hub)
-    await switches(CONF_BLUETOOTH, hub.set_bluetooth_switch)
-    await switches(CONF_ENGINEERING_MODE, hub.set_engineering_mode_switch)
+    await switches(
+        CONF_BLUETOOTH,
+        hub.set_bluetooth_switch,
+        apply="set_bluetooth(state)",
+        publish="before",
+    )
+    await switches(
+        CONF_ENGINEERING_MODE,
+        hub.set_engineering_mode_switch,
+        apply="set_engineering_mode(state)",
+        publish="before",
+    )

esphome/components/ld2412/switch/bluetooth_switch.cpp

@@ -1,10 +0,0 @@
-#include "bluetooth_switch.h"
-
-namespace esphome::ld2412 {
-
-void BluetoothSwitch::write_state(bool state) {
-  this->publish_state(state);
-  this->parent_->set_bluetooth(state);
-}
-
-}  // namespace esphome::ld2412

esphome/components/ld2412/switch/bluetooth_switch.h

@@ -1,17 +0,0 @@
-#pragma once
-
-#include "esphome/components/switch/switch.h"
-#include "../ld2412.h"
-
-namespace esphome::ld2412 {
-
-class BluetoothSwitch final : public switch_::Switch, public Parented<LD2412Component> {
- public:
-  // User provided, not "= default": `new(p) BluetoothSwitch()` would zero-fill .bss that is already zero.
-  BluetoothSwitch() {}
-
- protected:
-  void write_state(bool state) override;
-};
-
-}  // namespace esphome::ld2412

esphome/components/ld2412/switch/engineering_mode_switch.cpp

@@ -1,10 +0,0 @@
-#include "engineering_mode_switch.h"
-
-namespace esphome::ld2412 {
-
-void EngineeringModeSwitch::write_state(bool state) {
-  this->publish_state(state);
-  this->parent_->set_engineering_mode(state);
-}
-
-}  // namespace esphome::ld2412

esphome/components/ld2412/switch/engineering_mode_switch.h

@@ -1,17 +0,0 @@
-#pragma once
-
-#include "esphome/components/switch/switch.h"
-#include "../ld2412.h"
-
-namespace esphome::ld2412 {
-
-class EngineeringModeSwitch final : public switch_::Switch, public Parented<LD2412Component> {
- public:
-  // User provided, not "= default": `new(p) EngineeringModeSwitch()` would zero-fill .bss that is already zero.
-  EngineeringModeSwitch() {}
-
- protected:
-  void write_state(bool state) override;
-};
-
-}  // namespace esphome::ld2412

esphome/components/ld2450/switch/__init__.py

@@ -11,10 +11,7 @@ from esphome.const import (
 )
 from esphome.types import ConfigType
 
-from .. import CONF_LD2450_ID, LD2450Component, ld2450_ns
-
-BluetoothSwitch = ld2450_ns.class_("BluetoothSwitch", switch.Switch)
-MultiTargetSwitch = ld2450_ns.class_("MultiTargetSwitch", switch.Switch)
+from .. import CONF_LD2450_ID, LD2450Component
 
 CONF_MULTI_TARGET = "multi_target"
 
@@ -22,13 +19,13 @@ CONFIG_SCHEMA = {
     cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase),
     cv.GenerateID(CONF_LD2450_ID): cv.use_id(LD2450Component),
     cv.Optional(CONF_BLUETOOTH): switch.switch_schema(
-        BluetoothSwitch,
+        switch.ApplySwitch,
         device_class=DEVICE_CLASS_SWITCH,
         entity_category=ENTITY_CATEGORY_CONFIG,
         icon=ICON_BLUETOOTH,
     ),
     cv.Optional(CONF_MULTI_TARGET): switch.switch_schema(
-        MultiTargetSwitch,
+        switch.ApplySwitch,
         device_class=DEVICE_CLASS_SWITCH,
         entity_category=ENTITY_CATEGORY_CONFIG,
         icon=ICON_PULSE,
@@ -39,5 +36,15 @@ CONFIG_SCHEMA = {
 async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_LD2450_ID])
     switches = switch.sub_switches(config, parent=hub)
-    await switches(CONF_BLUETOOTH, hub.set_bluetooth_switch)
-    await switches(CONF_MULTI_TARGET, hub.set_multi_target_switch)
+    await switches(
+        CONF_BLUETOOTH,
+        hub.set_bluetooth_switch,
+        apply="set_bluetooth(state)",
+        publish="before",
+    )
+    await switches(
+        CONF_MULTI_TARGET,
+        hub.set_multi_target_switch,
+        apply="set_multi_target(state)",
+        publish="before",
+    )

esphome/components/ld2450/switch/bluetooth_switch.cpp

@@ -1,10 +0,0 @@
-#include "bluetooth_switch.h"
-
-namespace esphome::ld2450 {
-
-void BluetoothSwitch::write_state(bool state) {
-  this->publish_state(state);
-  this->parent_->set_bluetooth(state);
-}
-
-}  // namespace esphome::ld2450

esphome/components/ld2450/switch/bluetooth_switch.h

@@ -1,17 +0,0 @@
-#pragma once
-
-#include "esphome/components/switch/switch.h"
-#include "../ld2450.h"
-
-namespace esphome::ld2450 {
-
-class BluetoothSwitch : public switch_::Switch, public Parented<LD2450Component> {
- public:
-  // User provided, not "= default": `new(p) BluetoothSwitch()` would zero-fill .bss that is already zero.
-  BluetoothSwitch() {}
-
- protected:
-  void write_state(bool state) override;
-};
-
-}  // namespace esphome::ld2450

esphome/components/ld2450/switch/multi_target_switch.cpp

@@ -1,10 +0,0 @@
-#include "multi_target_switch.h"
-
-namespace esphome::ld2450 {
-
-void MultiTargetSwitch::write_state(bool state) {
-  this->publish_state(state);
-  this->parent_->set_multi_target(state);
-}
-
-}  // namespace esphome::ld2450

esphome/components/ld2450/switch/multi_target_switch.h

@@ -1,17 +0,0 @@
-#pragma once
-
-#include "esphome/components/switch/switch.h"
-#include "../ld2450.h"
-
-namespace esphome::ld2450 {
-
-class MultiTargetSwitch : public switch_::Switch, public Parented<LD2450Component> {
- public:
-  // User provided, not "= default": `new(p) MultiTargetSwitch()` would zero-fill .bss that is already zero.
-  MultiTargetSwitch() {}
-
- protected:
-  void write_state(bool state) override;
-};
-
-}  // namespace esphome::ld2450

esphome/components/seeed_mr24hpc1/switch/__init__.py

@@ -4,18 +4,14 @@ import esphome.config_validation as cv
 from esphome.const import DEVICE_CLASS_SWITCH, ENTITY_CATEGORY_CONFIG
 from esphome.types import ConfigType
 
-from .. import CONF_MR24HPC1_ID, MR24HPC1Component, mr24hpc1_ns
-
-UnderlyingOpenFuncSwitch = mr24hpc1_ns.class_(
-    "UnderlyOpenFunctionSwitch", switch.Switch
-)
+from .. import CONF_MR24HPC1_ID, MR24HPC1Component
 
 CONF_UNDERLYING_OPEN_FUNCTION = "underlying_open_function"
 
 CONFIG_SCHEMA = {
     cv.GenerateID(CONF_MR24HPC1_ID): cv.use_id(MR24HPC1Component),
     cv.Optional(CONF_UNDERLYING_OPEN_FUNCTION): switch.switch_schema(
-        UnderlyingOpenFuncSwitch,
+        switch.ApplySwitch,
         device_class=DEVICE_CLASS_SWITCH,
         entity_category=ENTITY_CATEGORY_CONFIG,
         icon="mdi:electric-switch",
@@ -27,5 +23,8 @@ async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_MR24HPC1_ID])
     switches = switch.sub_switches(config, parent=hub)
     await switches(
-        CONF_UNDERLYING_OPEN_FUNCTION, hub.set_underlying_open_function_switch
+        CONF_UNDERLYING_OPEN_FUNCTION,
+        hub.set_underlying_open_function_switch,
+        apply="set_underlying_open_function(state)",
+        publish="before",
     )

esphome/components/seeed_mr24hpc1/switch/underlyFuc_switch.cpp

@@ -1,10 +0,0 @@
-#include "underlyFuc_switch.h"
-
-namespace esphome::seeed_mr24hpc1 {
-
-void UnderlyOpenFunctionSwitch::write_state(bool state) {
-  this->publish_state(state);
-  this->parent_->set_underlying_open_function(state);
-}
-
-}  // namespace esphome::seeed_mr24hpc1

esphome/components/seeed_mr24hpc1/switch/underlyFuc_switch.h

@@ -1,16 +0,0 @@
-#pragma once
-
-#include "esphome/components/switch/switch.h"
-#include "../seeed_mr24hpc1.h"
-
-namespace esphome::seeed_mr24hpc1 {
-
-class UnderlyOpenFunctionSwitch final : public switch_::Switch, public Parented<MR24HPC1Component> {
- public:
-  UnderlyOpenFunctionSwitch() = default;
-
- protected:
-  void write_state(bool state) override;
-};
-
-}  // namespace esphome::seeed_mr24hpc1