Merge remote-tracking branch 'upstream/dev' into integration

esphome/components/alarm_control_panel/__init__.py

@@ -41,10 +41,6 @@ StateAnyForwarder = alarm_control_panel_ns.class_("StateAnyForwarder")
 StateEnterForwarder = alarm_control_panel_ns.class_("StateEnterForwarder")
 AlarmControlPanelState = alarm_control_panel_ns.enum("AlarmControlPanelState")
 
-PendingAction = alarm_control_panel_ns.class_("PendingAction", automation.Action)
-TriggeredAction = alarm_control_panel_ns.class_("TriggeredAction", automation.Action)
-ChimeAction = alarm_control_panel_ns.class_("ChimeAction", automation.Action)
-ReadyAction = alarm_control_panel_ns.class_("ReadyAction", automation.Action)
 
 AlarmControlPanelCondition = alarm_control_panel_ns.class_(
     "AlarmControlPanelCondition", automation.Condition
@@ -208,36 +204,16 @@ for _name, _arm in (
     )
 
 
-automation.register_simple_action(
-    "alarm_control_panel.pending",
-    PendingAction,
-    ALARM_CONTROL_PANEL_ACTION_SCHEMA,
-    synchronous=True,
-)
-
-
-automation.register_simple_action(
-    "alarm_control_panel.triggered",
-    TriggeredAction,
-    ALARM_CONTROL_PANEL_ACTION_SCHEMA,
-    synchronous=True,
-)
-
-
-automation.register_simple_action(
-    "alarm_control_panel.chime",
-    ChimeAction,
-    ALARM_CONTROL_PANEL_ACTION_SCHEMA,
-    synchronous=True,
-)
-
-
-automation.register_simple_action(
-    "alarm_control_panel.ready",
-    ReadyAction,
-    ALARM_CONTROL_PANEL_ACTION_SCHEMA,
-    synchronous=True,
-)
+for _name, _call in (
+    ("alarm_control_panel.pending", "pending()"),
+    ("alarm_control_panel.triggered", "triggered()"),
+):
+    automation.register_apply_action(
+        _name,
+        ALARM_CONTROL_PANEL_ACTION_SCHEMA,
+        automation.ApplyCall(_call),
+        call="make_call",
+    )
 
 
 automation.register_simple_condition(

esphome/components/alarm_control_panel/automation.h

@@ -27,26 +27,6 @@ static_assert(std::is_trivially_copyable_v<StateAnyForwarder>);
 static_assert(sizeof(StateEnterForwarder<ACP_STATE_TRIGGERED>) <= sizeof(void *));
 static_assert(std::is_trivially_copyable_v<StateEnterForwarder<ACP_STATE_TRIGGERED>>);
 
-template<typename... Ts> class PendingAction final : public Action<Ts...> {
- public:
-  explicit PendingAction(AlarmControlPanel *alarm_control_panel) : alarm_control_panel_(alarm_control_panel) {}
-
-  void play(const Ts &...x) override { this->alarm_control_panel_->make_call().pending().perform(); }
-
- protected:
-  AlarmControlPanel *alarm_control_panel_;
-};
-
-template<typename... Ts> class TriggeredAction final : public Action<Ts...> {
- public:
-  explicit TriggeredAction(AlarmControlPanel *alarm_control_panel) : alarm_control_panel_(alarm_control_panel) {}
-
-  void play(const Ts &...x) override { this->alarm_control_panel_->make_call().triggered().perform(); }
-
- protected:
-  AlarmControlPanel *alarm_control_panel_;
-};
-
 template<typename... Ts> class AlarmControlPanelCondition final : public Condition<Ts...> {
  public:
   AlarmControlPanelCondition(AlarmControlPanel *parent) : parent_(parent) {}

esphome/components/display_menu_base/__init__.py

@@ -55,18 +55,6 @@ MenuItemSwitch = display_menu_base_ns.class_("MenuItemSwitch")
 MenuItemCommand = display_menu_base_ns.class_("MenuItemCommand")
 MenuItemCustom = display_menu_base_ns.class_("MenuItemCustom")
 
-UpAction = display_menu_base_ns.class_("UpAction", automation.Action)
-DownAction = display_menu_base_ns.class_("DownAction", automation.Action)
-LeftAction = display_menu_base_ns.class_("LeftAction", automation.Action)
-RightAction = display_menu_base_ns.class_("RightAction", automation.Action)
-EnterAction = display_menu_base_ns.class_("EnterAction", automation.Action)
-ShowAction = display_menu_base_ns.class_("ShowAction", automation.Action)
-HideAction = display_menu_base_ns.class_("HideAction", automation.Action)
-ShowMainAction = display_menu_base_ns.class_("ShowMainAction", automation.Action)
-
-IsActiveCondition = display_menu_base_ns.class_(
-    "IsActiveCondition", automation.Condition
-)
 
 MenuItemType = display_menu_base_ns.enum("MenuItemType")
 
@@ -294,78 +282,22 @@ MENU_ACTION_SCHEMA = maybe_simple_id(
 )
 
 
-automation.register_simple_action(
-    "display_menu.up",
-    UpAction,
-    MENU_ACTION_SCHEMA,
-    synchronous=True,
-)
+for _name, _call in (
+    ("display_menu.up", "up()"),
+    ("display_menu.down", "down()"),
+    ("display_menu.left", "left()"),
+    ("display_menu.right", "right()"),
+    ("display_menu.enter", "enter()"),
+    ("display_menu.show", "show()"),
+    ("display_menu.hide", "hide()"),
+    ("display_menu.show_main", "show_main()"),
+):
+    automation.register_apply_action(
+        _name, MENU_ACTION_SCHEMA, automation.ApplyCall(_call)
+    )
 
-
-automation.register_simple_action(
-    "display_menu.down",
-    DownAction,
-    MENU_ACTION_SCHEMA,
-    synchronous=True,
-)
-
-
-automation.register_simple_action(
-    "display_menu.left",
-    LeftAction,
-    MENU_ACTION_SCHEMA,
-    synchronous=True,
-)
-
-
-automation.register_simple_action(
-    "display_menu.right",
-    RightAction,
-    MENU_ACTION_SCHEMA,
-    synchronous=True,
-)
-
-
-automation.register_simple_action(
-    "display_menu.enter",
-    EnterAction,
-    MENU_ACTION_SCHEMA,
-    synchronous=True,
-)
-
-
-automation.register_simple_action(
-    "display_menu.show",
-    ShowAction,
-    MENU_ACTION_SCHEMA,
-    synchronous=True,
-)
-
-
-automation.register_simple_action(
-    "display_menu.hide",
-    HideAction,
-    MENU_ACTION_SCHEMA,
-    synchronous=True,
-)
-
-
-automation.register_simple_action(
-    "display_menu.show_main",
-    ShowMainAction,
-    MENU_ACTION_SCHEMA,
-    synchronous=True,
-)
-
-
-automation.register_simple_condition(
-    "display_menu.is_active",
-    IsActiveCondition,
-    automation.maybe_simple_id(
-        {
-            cv.GenerateID(CONF_ID): cv.use_id(DisplayMenuComponent),
-        }
-    ),
+automation.register_apply_condition(
+    "display_menu.is_active", MENU_ACTION_SCHEMA, "is_active()"
 )
 
 

esphome/components/display_menu_base/automation.h

@@ -5,94 +5,6 @@
 
 namespace esphome::display_menu_base {
 
-template<typename... Ts> class UpAction final : public Action<Ts...> {
- public:
-  explicit UpAction(DisplayMenuComponent *menu) : menu_(menu) {}
-
-  void play(const Ts &...x) override { this->menu_->up(); }
-
- protected:
-  DisplayMenuComponent *menu_;
-};
-
-template<typename... Ts> class DownAction final : public Action<Ts...> {
- public:
-  explicit DownAction(DisplayMenuComponent *menu) : menu_(menu) {}
-
-  void play(const Ts &...x) override { this->menu_->down(); }
-
- protected:
-  DisplayMenuComponent *menu_;
-};
-
-template<typename... Ts> class LeftAction final : public Action<Ts...> {
- public:
-  explicit LeftAction(DisplayMenuComponent *menu) : menu_(menu) {}
-
-  void play(const Ts &...x) override { this->menu_->left(); }
-
- protected:
-  DisplayMenuComponent *menu_;
-};
-
-template<typename... Ts> class RightAction final : public Action<Ts...> {
- public:
-  explicit RightAction(DisplayMenuComponent *menu) : menu_(menu) {}
-
-  void play(const Ts &...x) override { this->menu_->right(); }
-
- protected:
-  DisplayMenuComponent *menu_;
-};
-
-template<typename... Ts> class EnterAction final : public Action<Ts...> {
- public:
-  explicit EnterAction(DisplayMenuComponent *menu) : menu_(menu) {}
-
-  void play(const Ts &...x) override { this->menu_->enter(); }
-
- protected:
-  DisplayMenuComponent *menu_;
-};
-
-template<typename... Ts> class ShowAction final : public Action<Ts...> {
- public:
-  explicit ShowAction(DisplayMenuComponent *menu) : menu_(menu) {}
-
-  void play(const Ts &...x) override { this->menu_->show(); }
-
- protected:
-  DisplayMenuComponent *menu_;
-};
-
-template<typename... Ts> class HideAction final : public Action<Ts...> {
- public:
-  explicit HideAction(DisplayMenuComponent *menu) : menu_(menu) {}
-
-  void play(const Ts &...x) override { this->menu_->hide(); }
-
- protected:
-  DisplayMenuComponent *menu_;
-};
-
-template<typename... Ts> class ShowMainAction final : public Action<Ts...> {
- public:
-  explicit ShowMainAction(DisplayMenuComponent *menu) : menu_(menu) {}
-
-  void play(const Ts &...x) override { this->menu_->show_main(); }
-
- protected:
-  DisplayMenuComponent *menu_;
-};
-template<typename... Ts> class IsActiveCondition final : public Condition<Ts...> {
- public:
-  explicit IsActiveCondition(DisplayMenuComponent *menu) : menu_(menu) {}
-  bool check(const Ts &...x) override { return this->menu_->is_active(); }
-
- protected:
-  DisplayMenuComponent *menu_;
-};
-
 class DisplayMenuOnEnterTrigger final : public Trigger<const MenuItem *> {
  public:
   explicit DisplayMenuOnEnterTrigger(MenuItem *parent) : parent_(parent) {

esphome/components/integration/integration_sensor.h

@@ -71,16 +71,4 @@ class IntegrationSensor final : public sensor::Sensor, public Component {
   float last_value_{0.0f};
 };
 
-template<typename... Ts> class ResetAction final : public Action<Ts...>, public Parented<IntegrationSensor> {
- public:
-  void play(const Ts &...x) override { this->parent_->reset(); }
-};
-
-template<typename... Ts> class SetValueAction final : public Action<Ts...>, public Parented<IntegrationSensor> {
- public:
-  TEMPLATABLE_VALUE(float, value)
-
-  void play(const Ts &...x) override { this->parent_->set_value(this->value_.value(x...)); }
-};
-
 }  // namespace esphome::integration

esphome/components/integration/sensor.py

@@ -11,17 +11,13 @@ from esphome.const import (
     CONF_UNIT_OF_MEASUREMENT,
     CONF_VALUE,
 )
-from esphome.core import ID
 from esphome.core.entity_helpers import inherit_property_from
-from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.types import ConfigType
 
 integration_ns = cg.esphome_ns.namespace("integration")
 IntegrationSensor = integration_ns.class_(
     "IntegrationSensor", sensor.Sensor, cg.Component
 )
-ResetAction = integration_ns.class_("ResetAction", automation.Action)
-SetValueAction = integration_ns.class_("SetValueAction", automation.Action)
 
 IntegrationSensorTime = integration_ns.enum("IntegrationSensorTime")
 INTEGRATION_TIMES = {
@@ -106,37 +102,23 @@ async def to_code(config: ConfigType) -> None:
     cg.add(var.set_restore(config[CONF_RESTORE]))
 
 
-automation.register_parented_action(
+automation.register_apply_action(
     "sensor.integration.reset",
-    ResetAction,
     automation.maybe_simple_id(
         {
             cv.Required(CONF_ID): cv.use_id(IntegrationSensor),
         }
     ),
-    synchronous=True,
+    automation.ApplyCall("reset()"),
 )
 
-
-@automation.register_action(
+automation.register_apply_action(
     "sensor.integration.set_value",
-    SetValueAction,
     cv.Schema(
         {
             cv.Required(CONF_ID): cv.use_id(IntegrationSensor),
             cv.Required(CONF_VALUE): cv.templatable(cv.float_),
         }
     ),
-    synchronous=True,
+    automation.ApplyField(CONF_VALUE, "set_value", cg.float_),
 )
-async def sensor_integration_set_value_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])
-    template_ = await cg.templatable(config[CONF_VALUE], args, cg.float_)
-    cg.add(var.set_value(template_))
-    return var

esphome/components/midea/ac_automations.h

@@ -1,66 +0,0 @@
-#pragma once
-
-#if (defined(USE_ARDUINO) && !defined(USE_RP2) && !defined(USE_LIBRETINY)) || defined(USE_ESP_IDF)
-
-#include "esphome/core/automation.h"
-#include "air_conditioner.h"
-
-namespace esphome::midea::ac {
-
-template<typename... Ts> class MideaActionBase : public Action<Ts...> {
- public:
-  void set_parent(AirConditioner *parent) { this->parent_ = parent; }
-
- protected:
-  AirConditioner *parent_;
-};
-
-template<typename... Ts> class FollowMeAction : public MideaActionBase<Ts...> {
-  TEMPLATABLE_VALUE(float, temperature)
-  TEMPLATABLE_VALUE(bool, use_fahrenheit)
-  TEMPLATABLE_VALUE(bool, beeper)
-
-  void play(const Ts &...x) override {
-    this->parent_->do_follow_me(this->temperature_.value(x...), this->use_fahrenheit_.value(x...),
-                                this->beeper_.value(x...));
-  }
-};
-
-template<typename... Ts> class SwingStepAction : public MideaActionBase<Ts...> {
- public:
-  void play(const Ts &...x) override { this->parent_->do_swing_step(); }
-};
-
-template<typename... Ts> class DisplayToggleAction : public MideaActionBase<Ts...> {
- public:
-  void play(const Ts &...x) override { this->parent_->do_display_toggle(); }
-};
-
-template<typename... Ts> class BeeperOnAction : public MideaActionBase<Ts...> {
- public:
-  void play(const Ts &...x) override { this->parent_->do_beeper_on(); }
-};
-
-template<typename... Ts> class BeeperOffAction : public MideaActionBase<Ts...> {
- public:
-  void play(const Ts &...x) override { this->parent_->do_beeper_off(); }
-};
-
-template<typename... Ts> class PowerOnAction : public MideaActionBase<Ts...> {
- public:
-  void play(const Ts &...x) override { this->parent_->do_power_on(); }
-};
-
-template<typename... Ts> class PowerOffAction : public MideaActionBase<Ts...> {
- public:
-  void play(const Ts &...x) override { this->parent_->do_power_off(); }
-};
-
-template<typename... Ts> class PowerToggleAction : public MideaActionBase<Ts...> {
- public:
-  void play(const Ts &...x) override { this->parent_->do_power_toggle(); }
-};
-
-}  // namespace esphome::midea::ac
-
-#endif  // USE_ARDUINO || USE_ESP_IDF

esphome/components/midea/climate.py

@@ -32,7 +32,7 @@ from esphome.const import (
     UNIT_PERCENT,
     UNIT_WATT,
 )
-from esphome.core import CORE, coroutine
+from esphome.core import CORE
 
 CODEOWNERS = ["@dudanov"]
 DEPENDENCIES = ["climate", "uart"]
@@ -53,25 +53,6 @@ def templatize(value):
     return cv.Schema(ret)
 
 
-def register_action(name, type_, schema):
-    validator = templatize(schema).extend(MIDEA_ACTION_BASE_SCHEMA)
-    registerer = automation.register_action(
-        f"midea_ac.{name}", type_, validator, synchronous=True
-    )
-
-    def decorator(func):
-        async def new_func(config, action_id, template_arg, args):
-            ac_ = await cg.get_variable(config[CONF_ID])
-            var = cg.new_Pvariable(action_id, template_arg)
-            cg.add(var.set_parent(ac_))
-            await coroutine(func)(var, config, args)
-            return var
-
-        return registerer(new_func)
-
-    return decorator
-
-
 ALLOWED_CLIMATE_MODES = {
     "HEAT_COOL": ClimateMode.CLIMATE_MODE_HEAT_COOL,
     "COOL": ClimateMode.CLIMATE_MODE_COOL,
@@ -161,16 +142,6 @@ CONFIG_SCHEMA = cv.All(
     ),
 )
 
-# Actions
-FollowMeAction = midea_ac_ns.class_("FollowMeAction", automation.Action)
-DisplayToggleAction = midea_ac_ns.class_("DisplayToggleAction", automation.Action)
-SwingStepAction = midea_ac_ns.class_("SwingStepAction", automation.Action)
-BeeperOnAction = midea_ac_ns.class_("BeeperOnAction", automation.Action)
-BeeperOffAction = midea_ac_ns.class_("BeeperOffAction", automation.Action)
-PowerOnAction = midea_ac_ns.class_("PowerOnAction", automation.Action)
-PowerOffAction = midea_ac_ns.class_("PowerOffAction", automation.Action)
-PowerToggleAction = midea_ac_ns.class_("PowerToggleAction", automation.Action)
-
 MIDEA_ACTION_BASE_SCHEMA = cv.Schema(
     {
         cv.GenerateID(CONF_ID): cv.use_id(AirConditioner),
@@ -187,84 +158,31 @@ MIDEA_FOLLOW_ME_SCHEMA = cv.Schema(
 )
 
 
-@register_action("follow_me", FollowMeAction, MIDEA_FOLLOW_ME_SCHEMA)
-async def follow_me_to_code(var, config, args):
-    template_ = await cg.templatable(config[CONF_BEEPER], args, cg.bool_)
-    cg.add(var.set_beeper(template_))
-    template_ = await cg.templatable(config[CONF_USE_FAHRENHEIT], args, cg.bool_)
-    cg.add(var.set_use_fahrenheit(template_))
-    template_ = await cg.templatable(config[CONF_TEMPERATURE], args, cg.float_)
-    cg.add(var.set_temperature(template_))
-
-
-# Toggle Display action
-@register_action(
-    "display_toggle",
-    DisplayToggleAction,
-    cv.Schema({}),
+automation.register_apply_action(
+    "midea_ac.follow_me",
+    templatize(MIDEA_FOLLOW_ME_SCHEMA).extend(MIDEA_ACTION_BASE_SCHEMA),
+    automation.ApplyCall(
+        "do_follow_me({}, {}, {})",
+        (
+            (CONF_TEMPERATURE, cg.float_),
+            (CONF_USE_FAHRENHEIT, cg.bool_),
+            (CONF_BEEPER, cg.bool_),
+        ),
+    ),
 )
-async def display_toggle_to_code(var, config, args):
-    pass
 
-
-# Swing Step action
-@register_action(
-    "swing_step",
-    SwingStepAction,
-    cv.Schema({}),
-)
-async def swing_step_to_code(var, config, args):
-    pass
-
-
-# Beeper On action
-@register_action(
-    "beeper_on",
-    BeeperOnAction,
-    cv.Schema({}),
-)
-async def beeper_on_to_code(var, config, args):
-    pass
-
-
-# Beeper Off action
-@register_action(
-    "beeper_off",
-    BeeperOffAction,
-    cv.Schema({}),
-)
-async def beeper_off_to_code(var, config, args):
-    pass
-
-
-# Power On action
-@register_action(
-    "power_on",
-    PowerOnAction,
-    cv.Schema({}),
-)
-async def power_on_to_code(var, config, args):
-    pass
-
-
-# Power Off action
-@register_action(
-    "power_off",
-    PowerOffAction,
-    cv.Schema({}),
-)
-async def power_off_to_code(var, config, args):
-    pass
-
-
-# Power Toggle action
-@register_action(
-    "power_toggle",
-    PowerToggleAction,
-    cv.Schema({}),
-)
-async def power_inv_to_code(var, config, args):
-    pass
+for _name, _call in (
+    ("midea_ac.display_toggle", "do_display_toggle()"),
+    ("midea_ac.swing_step", "do_swing_step()"),
+    ("midea_ac.beeper_on", "do_beeper_on()"),
+    ("midea_ac.beeper_off", "do_beeper_off()"),
+    ("midea_ac.power_on", "do_power_on()"),
+    ("midea_ac.power_off", "do_power_off()"),
+    ("midea_ac.power_toggle", "do_power_toggle()"),
+):
+    automation.register_apply_action(
+        _name, MIDEA_ACTION_BASE_SCHEMA, automation.ApplyCall(_call)
+    )
 
 
 FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(

tests/components/alarm_control_panel/common-actions.yaml

@@ -0,0 +1,6 @@
+button:
+  - platform: template
+    name: Alarm Calls
+    on_press:
+      - alarm_control_panel.pending: alarmcontrolpanel1
+      - alarm_control_panel.triggered: alarmcontrolpanel1

tests/components/alarm_control_panel/test-actions.esp8266-ard.yaml

@@ -0,0 +1,3 @@
+packages:
+  alarm_control_panel: !include common.yaml
+  actions: !include common-actions.yaml

tests/components/lcd_menu/common-actions.yaml

@@ -0,0 +1,17 @@
+button:
+  - platform: template
+    name: Menu Actions
+    on_press:
+      - display_menu.show: test_lcd_menu
+      - display_menu.up: test_lcd_menu
+      - display_menu.down: test_lcd_menu
+      - display_menu.left: test_lcd_menu
+      - display_menu.right: test_lcd_menu
+      - display_menu.enter: test_lcd_menu
+      - if:
+          condition:
+            display_menu.is_active: test_lcd_menu
+          then:
+            - display_menu.hide: test_lcd_menu
+          else:
+            - display_menu.show_main: test_lcd_menu

tests/components/lcd_menu/test-actions.esp8266-ard.yaml

@@ -0,0 +1,11 @@
+substitutions:
+  d0_pin: GPIO0
+  d1_pin: GPIO2
+  d2_pin: GPIO14
+  d3_pin: GPIO15
+  enable_pin: GPIO16
+  rs_pin: GPIO5
+
+packages:
+  lcd_menu: !include common.yaml
+  actions: !include common-actions.yaml

tests/components/midea/common-actions.yaml

@@ -0,0 +1,26 @@
+button:
+  - platform: template
+    name: Midea Actions
+    on_press:
+      - midea_ac.follow_me:
+          id: midea_unit
+          temperature: 23.0
+          beeper: true
+      - midea_ac.follow_me:
+          id: midea_unit
+          temperature: !lambda return id(midea_unit).target_temperature + 1.0f;
+          use_fahrenheit: !lambda return false;
+      - midea_ac.display_toggle:
+          id: midea_unit
+      - midea_ac.swing_step:
+          id: midea_unit
+      - midea_ac.beeper_on:
+          id: midea_unit
+      - midea_ac.beeper_off:
+          id: midea_unit
+      - midea_ac.power_on:
+          id: midea_unit
+      - midea_ac.power_off:
+          id: midea_unit
+      - midea_ac.power_toggle:
+          id: midea_unit

tests/components/midea/test-actions.esp8266-ard.yaml

@@ -0,0 +1,9 @@
+packages:
+  remote_transmitter: !include ../../test_build_components/common/remote_transmitter/esp8266-ard.yaml
+  uart: !include ../../test_build_components/common/uart/esp8266-ard.yaml
+  midea: !include common.yaml
+  actions: !include common-actions.yaml
+
+wifi:
+  ssid: MySSID
+  password: password1