Merge remote-tracking branch 'origin/dev' into HEAD

# Conflicts:
#	tests/component_tests/light/config/dim_relative_actions.yaml
#	tests/component_tests/light/test_dim_relative_codegen.py

CODEOWNERS

@@ -741,7 +741,7 @@ esphome/components/web_server_idf/* @dentra
 esphome/components/weikai/* @DrCoolZic
 esphome/components/weikai_i2c/* @DrCoolZic
 esphome/components/weikai_spi/* @DrCoolZic
-esphome/components/whirlpool/* @arpena @glmnet @Rodrigoah
+esphome/components/whirlpool/* @arpena @glmnet
 esphome/components/whynter/* @aeonsablaze
 esphome/components/wiegand/* @ssieb
 esphome/components/wireguard/* @droscy @lhoracek @thomas0bernard

esphome/components/ethernet/ethernet_component.h

@@ -7,8 +7,6 @@
 #include "esphome/core/automation.h"
 #include "esphome/components/network/ip_address.h"
 
-#include <atomic>
-
 #ifdef USE_ETHERNET
 
 #ifdef USE_ESP32
@@ -368,9 +366,6 @@ class EthernetComponent final : public Component {
 
 #ifdef USE_ETHERNET_IP_STATE_LISTENERS
   StaticVector<EthernetIPStateListener *, ESPHOME_ETHERNET_IP_STATE_LISTENERS> ip_state_listeners_;
-#ifdef USE_ESP32
-  std::atomic<uint8_t> ip_state_pending_{0};
-#endif
 #endif
 
 #ifdef USE_ETHERNET_CONNECT_TRIGGER

esphome/components/ethernet/ethernet_component_esp32.cpp

@@ -129,14 +129,6 @@ void EthernetComponent::log_error_and_mark_failed_(esp_err_t err, const char *me
 void EthernetComponent::loop() {
   const uint32_t now = App.get_loop_component_start_time();
 
-#ifdef USE_ETHERNET_IP_STATE_LISTENERS
-  // The IP events arrive on the event task; the listeners publish states, so notify them here
-  if (this->ip_state_pending_.load(std::memory_order_acquire) != 0) {
-    this->ip_state_pending_.store(0, std::memory_order_relaxed);
-    this->notify_ip_state_listeners_();
-  }
-#endif
-
   switch (this->state_) {
     case EthernetComponentState::STOPPED:
       if (this->started_) {
@@ -778,8 +770,7 @@ void EthernetComponent::eth_event_handler(void *arg, esp_event_base_t event_base
       event_name = "ETH connected";
       // For static IP configurations, GOT_IP event may not fire, so notify IP listeners here
 #if defined(USE_ETHERNET_IP_STATE_LISTENERS) && defined(USE_ETHERNET_MANUAL_IP)
-      global_eth_component->ip_state_pending_.store(1, std::memory_order_release);
-      global_eth_component->enable_loop_soon_any_context();
+      global_eth_component->notify_ip_state_listeners_();
 #endif
 #if USE_NETWORK_IPV6
       // Start SLAAC on link-up, not after the DHCPv4 lease. This also restores the
@@ -807,9 +798,6 @@ void EthernetComponent::got_ip_event_handler(void *arg, esp_event_base_t event_b
   const esp_netif_ip_info_t *ip_info = &event->ip_info;
   ESP_LOGV(TAG, "[Ethernet event] ETH Got IP " IPSTR, IP2STR(&ip_info->ip));
   global_eth_component->got_ipv4_address_ = true;
-#ifdef USE_ETHERNET_IP_STATE_LISTENERS
-  global_eth_component->ip_state_pending_.store(1, std::memory_order_release);
-#endif
 #if USE_NETWORK_IPV6 && (USE_NETWORK_MIN_IPV6_ADDR_COUNT > 0)
   global_eth_component->connected_ = global_eth_component->ipv6_count_ >= USE_NETWORK_MIN_IPV6_ADDR_COUNT;
   global_eth_component->enable_loop_soon_any_context();  // Enable loop when connection state changes
@@ -817,6 +805,9 @@ void EthernetComponent::got_ip_event_handler(void *arg, esp_event_base_t event_b
   global_eth_component->connected_ = true;
   global_eth_component->enable_loop_soon_any_context();  // Enable loop when connection state changes
 #endif /* USE_NETWORK_IPV6 */
+#ifdef USE_ETHERNET_IP_STATE_LISTENERS
+  global_eth_component->notify_ip_state_listeners_();
+#endif
 }
 
 #if USE_NETWORK_IPV6
@@ -828,9 +819,6 @@ void EthernetComponent::got_ip6_event_handler(void *arg, esp_event_base_t event_
   // after a link flap fires another event for the same address.
   struct esp_ip6_addr if_ip6s[CONFIG_LWIP_IPV6_NUM_ADDRESSES];
   global_eth_component->ipv6_count_ = esp_netif_get_all_ip6(global_eth_component->eth_netif_, if_ip6s);
-#ifdef USE_ETHERNET_IP_STATE_LISTENERS
-  global_eth_component->ip_state_pending_.store(1, std::memory_order_release);
-#endif
 #if (USE_NETWORK_MIN_IPV6_ADDR_COUNT > 0)
   global_eth_component->connected_ =
       global_eth_component->got_ipv4_address_ && (global_eth_component->ipv6_count_ >= USE_NETWORK_MIN_IPV6_ADDR_COUNT);
@@ -839,6 +827,9 @@ void EthernetComponent::got_ip6_event_handler(void *arg, esp_event_base_t event_
   global_eth_component->connected_ = global_eth_component->got_ipv4_address_;
   global_eth_component->enable_loop_soon_any_context();  // Enable loop when connection state changes
 #endif
+#ifdef USE_ETHERNET_IP_STATE_LISTENERS
+  global_eth_component->notify_ip_state_listeners_();
+#endif
 }
 #endif /* USE_NETWORK_IPV6 */
 

esphome/components/light/automation.cpp

@@ -5,6 +5,39 @@ namespace esphome::light {
 
 ESPHOME_LOG_TAG(TAG, "light.automation");
 
+bool dim_relative(LightState *state, LightCall &call, float relative_brightness, float min_brightness,
+                  float max_brightness, LimitMode limit_mode) {
+  float cur;
+  state->remote_values.as_brightness(&cur);
+  if ((limit_mode == LimitMode::DO_NOTHING) && ((cur < min_brightness) || (cur > max_brightness))) {
+    return false;
+  }
+  float new_brightness = clamp(cur + relative_brightness, min_brightness, max_brightness);
+  call.set_state(new_brightness != 0.0f);
+  call.set_brightness(new_brightness);
+  return true;
+}
+
+void cycle_effect(LightState *state, bool forward, bool include_none) {
+  size_t count = state->get_effect_count();
+  if (count == 0) {
+    return;
+  }
+  uint32_t current = state->get_current_effect_index();
+  uint32_t next;
+  if (include_none) {
+    uint32_t total = static_cast<uint32_t>(count) + 1;
+    next = forward ? (current + 1) % total : (current + total - 1) % total;
+  } else if (forward) {
+    next = (current % static_cast<uint32_t>(count)) + 1;
+  } else {
+    next = (current <= 1) ? static_cast<uint32_t>(count) : current - 1;
+  }
+  auto call = state->turn_on();
+  call.set_effect(next);
+  call.perform();
+}
+
 void addressableset_warn_about_scale(const char *field) {
   ESP_LOGW(TAG, "Lambda for parameter %s of light.addressable_set should return values in range 0-1 instead of 0-255.",
            field);

esphome/components/light/automation.h

@@ -8,94 +8,13 @@ namespace esphome::light {
 
 enum class LimitMode { CLAMP, DO_NOTHING };
 
-template<bool HasTransitionLength, typename... Ts> class DimRelativeAction final : public Action<Ts...> {
- public:
-  explicit DimRelativeAction(LightState *parent) : parent_(parent) {}
+/// Set the state and brightness of a light.dim_relative call on `state`. Returns false, and the call must not be
+/// performed, when `limit_mode` is DO_NOTHING and the current brightness is outside the limits.
+bool dim_relative(LightState *state, LightCall &call, float relative_brightness, float min_brightness = 0.0f,
+                  float max_brightness = 1.0f, LimitMode limit_mode = LimitMode::CLAMP);
 
-  TEMPLATABLE_VALUE(float, relative_brightness)
-
-  template<typename V>
-  void set_transition_length(V value)
-    requires(HasTransitionLength)
-  {
-    this->transition_length_ = value;
-  }
-
-  void play(const Ts &...x) override {
-    auto call = this->parent_->make_call();
-    float rel = this->relative_brightness_.value(x...);
-    float cur;
-    this->parent_->remote_values.as_brightness(&cur);
-    if ((limit_mode_ == LimitMode::DO_NOTHING) && ((cur < min_brightness_) || (cur > max_brightness_))) {
-      return;
-    }
-    float new_brightness = clamp(cur + rel, min_brightness_, max_brightness_);
-    call.set_state(new_brightness != 0.0f);
-    call.set_brightness(new_brightness);
-
-    if constexpr (HasTransitionLength) {
-      call.set_transition_length(this->transition_length_.optional_value(x...));
-    }
-    call.perform();
-  }
-
-  void set_min_max_brightness(float min, float max) {
-    this->min_brightness_ = min;
-    this->max_brightness_ = max;
-  }
-
-  void set_limit_mode(LimitMode limit_mode) { this->limit_mode_ = limit_mode; }
-
- protected:
-  LightState *parent_;
-  float min_brightness_{0.0};
-  float max_brightness_{1.0};
-  LimitMode limit_mode_{LimitMode::CLAMP};
-  struct NoTransition {};
-  [[no_unique_address]] std::conditional_t<HasTransitionLength, TemplatableFn<uint32_t, Ts...>, NoTransition>
-      transition_length_{};
-};
-
-// Cycle through the light's configured effects. `Forward` selects direction
-// at compile time so the chosen branch is the only one that gets instantiated
-// per action site. `include_none` is runtime so a single set of templates
-// covers both the "wrap through None" and "skip None" variants.
-template<bool Forward, typename... Ts> class LightEffectCycleAction final : public Action<Ts...> {
- public:
-  explicit LightEffectCycleAction(LightState *parent) : parent_(parent) {}
-
-  void set_include_none(bool include_none) { this->include_none_ = include_none; }
-
-  void play(const Ts &...) override {
-    size_t count = this->parent_->get_effect_count();
-    if (count == 0) {
-      return;
-    }
-    uint32_t current = this->parent_->get_current_effect_index();
-    uint32_t next;
-    if (this->include_none_) {
-      uint32_t total = static_cast<uint32_t>(count) + 1;
-      if constexpr (Forward) {
-        next = (current + 1) % total;
-      } else {
-        next = (current + total - 1) % total;
-      }
-    } else {
-      if constexpr (Forward) {
-        next = (current % static_cast<uint32_t>(count)) + 1;
-      } else {
-        next = (current <= 1) ? static_cast<uint32_t>(count) : current - 1;
-      }
-    }
-    auto call = this->parent_->turn_on();
-    call.set_effect(next);
-    call.perform();
-  }
-
- protected:
-  LightState *parent_;
-  bool include_none_{false};
-};
+/// Turn on the next or previous configured effect; with `include_none`, "None" is part of the cycle.
+void cycle_effect(LightState *state, bool forward, bool include_none);
 
 class LightTurnOnTrigger final : public Trigger<>, public LightRemoteValuesListener {
  public:

esphome/components/light/automation.py

@@ -1,4 +1,5 @@
 from collections.abc import Callable
+from functools import partial
 import logging
 from typing import Any, NamedTuple
 
@@ -32,7 +33,7 @@ from esphome.const import (
     CONF_WHITE,
 )
 from esphome.core import CORE, ID, EsphomeError, Lambda
-from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.cpp_generator import MockObj, SafeExpType, TemplateArgsType
 import esphome.final_validate as fv
 from esphome.schema_extractors import SCHEMA_EXTRACT, schema_extractor
 from esphome.types import ConfigType
@@ -43,9 +44,8 @@ from .types import (
     AddressableLightState,
     AddressableSet,
     ColorMode,
-    DimRelativeAction,
-    LightEffectCycleAction,
     LightState,
+    light_ns,
 )
 
 _LOGGER = logging.getLogger(__name__)
@@ -340,47 +340,29 @@ LIGHT_EFFECT_CYCLE_ACTION_SCHEMA = automation.maybe_simple_id(
 )
 
 
-@automation.register_action(
-    "light.effect.next",
-    LightEffectCycleAction,
-    LIGHT_EFFECT_CYCLE_ACTION_SCHEMA,
-    synchronous=True,
-)
-async def light_effect_next_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
-    return await _light_effect_cycle_to_code(config, action_id, template_arg, True)
-
-
-@automation.register_action(
-    "light.effect.previous",
-    LightEffectCycleAction,
-    LIGHT_EFFECT_CYCLE_ACTION_SCHEMA,
-    synchronous=True,
-)
-async def light_effect_previous_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
-    return await _light_effect_cycle_to_code(config, action_id, template_arg, False)
-
-
 async def _light_effect_cycle_to_code(
     config: ConfigType,
     action_id: ID,
     template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
     forward: bool,
 ) -> MockObj:
-    paren = await cg.get_variable(config[CONF_ID])
-    cycle_template_arg = cg.TemplateArguments(forward, *template_arg)
-    var = cg.new_Pvariable(action_id, cycle_template_arg, paren)
-    cg.add(var.set_include_none(config[CONF_INCLUDE_NONE]))
-    return var
+    light = automation.parent_ref(await cg.get_variable(config[CONF_ID]))
+    return automation.apply_statements_action(
+        action_id,
+        template_arg,
+        args,
+        [f"{light_ns.cycle_effect(light, forward, config[CONF_INCLUDE_NONE])};"],
+    )
+
+
+for _name, _forward in (("light.effect.next", True), ("light.effect.previous", False)):
+    automation.register_action(
+        _name,
+        automation.ApplyAction,
+        LIGHT_EFFECT_CYCLE_ACTION_SCHEMA,
+        synchronous=True,
+    )(partial(_light_effect_cycle_to_code, forward=_forward))
 
 
 CONF_RELATIVE_BRIGHTNESS = "relative_brightness"
@@ -406,30 +388,52 @@ LIGHT_DIM_RELATIVE_ACTION_SCHEMA = cv.Schema(
 )
 
 
+async def _called_with_args(
+    value: Any, args: TemplateArgsType, type_: SafeExpType
+) -> SafeExpType:
+    """A constant, or the user's lambda called with the trigger's by-value args (never reduced)."""
+    if not isinstance(value, Lambda):
+        return value
+    return automation.immediate_lambda_call(
+        await cg.process_lambda(value, args, return_type=type_)
+    )
+
+
 @automation.register_action(
     "light.dim_relative",
-    DimRelativeAction,
+    automation.ApplyAction,
     LIGHT_DIM_RELATIVE_ACTION_SCHEMA,
     synchronous=True,
 )
-async def light_dim_relative_to_code(config, action_id, template_arg, args):
-    paren = await cg.get_variable(config[CONF_ID])
-    has_transition_length = CONF_TRANSITION_LENGTH in config
-    dim_template_arg = cg.TemplateArguments(has_transition_length, *template_arg)
-    var = cg.new_Pvariable(action_id, dim_template_arg, paren)
-    templ = await cg.templatable(config[CONF_RELATIVE_BRIGHTNESS], args, cg.float_)
-    cg.add(var.set_relative_brightness(templ))
-    if has_transition_length:
-        templ = await cg.templatable(config[CONF_TRANSITION_LENGTH], args, cg.uint32)
-        cg.add(var.set_transition_length(templ))
-    if conf := config.get(CONF_BRIGHTNESS_LIMITS):
-        cg.add(
-            var.set_min_max_brightness(
-                conf[CONF_MIN_BRIGHTNESS], conf[CONF_MAX_BRIGHTNESS]
-            )
-        )
-        cg.add(var.set_limit_mode(conf[CONF_LIMIT_MODE]))
-    return var
+async def light_dim_relative_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
+    light = automation.parent_ref(await cg.get_variable(config[CONF_ID]))
+    call = MockObj("esphome__call", ".")
+    dim_args = [
+        light,
+        call,
+        await _called_with_args(config[CONF_RELATIVE_BRIGHTNESS], args, cg.float_),
+    ]
+    if limits := config.get(CONF_BRIGHTNESS_LIMITS):
+        dim_args += [
+            limits[CONF_MIN_BRIGHTNESS],
+            limits[CONF_MAX_BRIGHTNESS],
+            limits[CONF_LIMIT_MODE],
+        ]
+    # The transition length is only read once the limits allow the call
+    statements = [
+        f"auto {call} = {light}->make_call();",
+        f"if ({light_ns.dim_relative(*dim_args)}) {{",
+    ]
+    if (transition := config.get(CONF_TRANSITION_LENGTH)) is not None:
+        transition = await _called_with_args(transition, args, cg.uint32)
+        statements.append(f"  {call.set_transition_length(transition)};")
+    statements += [f"  {call.perform()};", "}"]
+    return automation.apply_statements_action(action_id, template_arg, args, statements)
 
 
 LIGHT_ADDRESSABLE_SET_ACTION_SCHEMA = cv.Schema(

esphome/components/light/types.py

@@ -40,8 +40,6 @@ LimitMode = light_ns.enum("LimitMode", is_class=True)
 LIMIT_MODES = LimitMode.options("CLAMP", "DO_NOTHING")
 
 # Actions
-LightEffectCycleAction = light_ns.class_("LightEffectCycleAction", automation.Action)
-DimRelativeAction = light_ns.class_("DimRelativeAction", automation.Action)
 AddressableSet = light_ns.class_("AddressableSet", automation.Action)
 
 # Triggers

esphome/components/whirlpool/climate.py

@@ -5,15 +5,13 @@ from esphome.const import CONF_MODEL
 from esphome.types import ConfigType
 
 AUTO_LOAD = ["climate_ir"]
-CODEOWNERS = ["@glmnet", "@arpena", "@Rodrigoah"]
+CODEOWNERS = ["@glmnet", "@arpena"]
 
 whirlpool_ns = cg.esphome_ns.namespace("whirlpool")
 WhirlpoolClimate = whirlpool_ns.class_("WhirlpoolClimate", climate_ir.ClimateIR)
 
 Model = whirlpool_ns.enum("Model")
-MODELS = Model.options(
-    "DG11J1-3A", "DG11J1-91", "HISENSE_ARG", "HITACHI_HCRA31NEWH", prefix="MODEL_"
-)
+MODELS = Model.options("DG11J1-3A", "DG11J1-91", "HISENSE_ARG", prefix="MODEL_")
 
 CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(WhirlpoolClimate).extend(
     {
@@ -28,5 +26,3 @@ async def to_code(config: ConfigType) -> None:
     # cv.enum keeps the YAML key as a str subclass; the MockObj value cannot be compared
     if config[CONF_MODEL] == "HISENSE_ARG":
         cg.add_define("USE_WHIRLPOOL_HISENSE_ARG")
-    elif config[CONF_MODEL] == "HITACHI_HCRA31NEWH":
-        cg.add_define("USE_WHIRLPOOL_HITACHI_HCRA31NEWH")

esphome/components/whirlpool/whirlpool.cpp

@@ -2,8 +2,6 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
-#include <algorithm>
-
 namespace esphome::whirlpool {
 
 ESPHOME_LOG_TAG(TAG, "whirlpool.climate");
@@ -46,17 +44,6 @@ static constexpr uint8_t HISENSE_ARG_POWER_TOGGLE = 0x01;   // byte 15
 static constexpr uint8_t HISENSE_ARG_SETTINGS_ONLY = 0x02;  // byte 15
 static constexpr uint8_t HISENSE_ARG_FIXED_TEMP_STEP = 7;   // auto and fan-only send 23 C
 
-// Hitachi HCRA31NEWH model: power is a state in every frame
-static constexpr uint8_t HITACHI_BYTE10 = 0x20;      // byte 10
-static constexpr uint8_t HITACHI_COOL = 0x02;        // byte 15
-static constexpr uint8_t HITACHI_OFF = 0x01;         // byte 15
-static constexpr uint8_t HITACHI_BYTE18_ON = 0x38;   // byte 18
-static constexpr uint8_t HITACHI_BYTE18_OFF = 0x28;  // byte 18
-static constexpr uint8_t HITACHI_BYTE19 = 0x08;      // byte 19
-
-// Header, 21 bytes of 8 bits, two dividers and the footer mark
-static constexpr uint32_t WHIRLPOOL_FRAME_TIMINGS = 2 + WHIRLPOOL_STATE_LENGTH * 16 + 2 * 2 + 1;
-
 WhirlpoolClimate::WhirlpoolClimate()
     : climate_ir::ClimateIR(
           WHIRLPOOL_DG11J1_3A_TEMP_MIN, WHIRLPOOL_DG11J1_3A_TEMP_MAX, 1.0f, true, true,
@@ -68,19 +55,19 @@ void WhirlpoolClimate::transmit_state() {
   this->last_transmit_time_ = millis();  // setting the time of the last transmission.
   uint8_t remote_state[WHIRLPOOL_STATE_LENGTH];
   memset(remote_state, 0, sizeof(remote_state));
-  put_be16(remote_state, this->remote_id_());
+  remote_state[0] = 0x83;
+  remote_state[1] = 0x06;
   remote_state[6] = 0x80;
-  remote_state[18] = 0x08;
+  remote_state[18] = 0x08;  // the same on every supported model
 
-  const bool powered_on = this->mode != climate::CLIMATE_MODE_OFF;
-  // Hitachi sends power as a state instead of a toggle
-  const bool power_toggle = !this->is_hitachi_hcra31newh_() && powered_on != this->powered_on_assumed;
+  auto powered_on = this->mode != climate::CLIMATE_MODE_OFF;
+  const bool power_toggle = powered_on != this->powered_on_assumed;
   if (power_toggle) {
     // Set power toggle command
     remote_state[2] = 4;
     remote_state[15] = 1;
+    this->powered_on_assumed = powered_on;
   }
-  this->powered_on_assumed = powered_on;
   switch (this->mode) {
     case climate::CLIMATE_MODE_HEAT_COOL:
       // set fan auto
@@ -106,10 +93,6 @@ void WhirlpoolClimate::transmit_state() {
       remote_state[15] = 6;
       break;
     case climate::CLIMATE_MODE_OFF:
-      // These remotes keep the cool code in the power-off frame
-      if (this->is_hisense_arg_() || this->is_hitachi_hcra31newh_())
-        remote_state[3] = WHIRLPOOL_COOL;
-      break;
     default:
       break;
   }
@@ -119,7 +102,6 @@ void WhirlpoolClimate::transmit_state() {
   // Temperature
   auto temp = (uint8_t) roundf(clamp(this->target_temperature, this->temperature_min_(), this->temperature_max_()));
   const auto temp_step = (uint8_t) (temp - this->temperature_min_());
-  this->target_temperature = temp;  // publish what the unit was sent
   if (hisense_arg && this->fixed_temp_mode_()) {
     remote_state[3] |= HISENSE_ARG_FIXED_TEMP_STEP << 4;
   } else {
@@ -149,6 +131,7 @@ void WhirlpoolClimate::transmit_state() {
       remote_state[2] |= WHIRLPOOL_SWING_MASK;
       remote_state[8] = WHIRLPOOL_SWING_BYTE8;
     }
+    this->encode_hisense_arg_(remote_state, power_toggle, temp_step);
   } else if (this->send_swing_cmd_) {
     if (this->swing_mode == climate::CLIMATE_SWING_VERTICAL || this->swing_mode == climate::CLIMATE_SWING_OFF) {
       remote_state[2] |= WHIRLPOOL_SWING_MASK;
@@ -156,11 +139,6 @@ void WhirlpoolClimate::transmit_state() {
     }
   }
 
-  if (hisense_arg)
-    this->encode_hisense_arg_(remote_state, power_toggle, temp_step);
-  if (this->is_hitachi_hcra31newh_())
-    this->encode_hitachi_hcra31newh_(remote_state);
-
   // Checksum
   remote_state[13] = xor_bytes(&remote_state[2], 11, remote_state[13]);
   remote_state[20] = xor_bytes(&remote_state[14], 6, remote_state[20]);
@@ -170,7 +148,6 @@ void WhirlpoolClimate::transmit_state() {
   // Send code
   auto transmit = this->transmitter_->transmit();
   auto *data = transmit.get_data();
-  data->reserve(WHIRLPOOL_FRAME_TIMINGS);
 
   data->set_carrier_frequency(38000);
 
@@ -203,6 +180,10 @@ void WhirlpoolClimate::encode_hisense_arg_(uint8_t *remote_state, bool power_tog
   remote_state[15] = power_toggle ? HISENSE_ARG_POWER_TOGGLE : HISENSE_ARG_SETTINGS_ONLY;
 
   switch (this->mode) {
+    case climate::CLIMATE_MODE_OFF:
+      // The remote keeps the cool code in the power-off frame
+      remote_state[3] = (remote_state[3] & 0xF0) | WHIRLPOOL_COOL;
+      break;
     case climate::CLIMATE_MODE_DRY:
       // The unit runs these fan speeds itself; the user's choice is kept for the next mode change
       remote_state[2] &= ~WHIRLPOOL_FAN_MASK;
@@ -231,27 +212,6 @@ void WhirlpoolClimate::encode_hisense_arg_(uint8_t *remote_state, bool power_tog
 #endif
 }
 
-void WhirlpoolClimate::encode_hitachi_hcra31newh_(uint8_t *remote_state) const {
-#ifdef USE_WHIRLPOOL_HITACHI_HCRA31NEWH
-  remote_state[10] = HITACHI_BYTE10;
-  remote_state[18] = HITACHI_BYTE18_ON;
-  remote_state[19] = HITACHI_BYTE19;
-  // The unit takes the whole state from every frame: only the off frame carries the power bit
-  switch (this->mode) {
-    case climate::CLIMATE_MODE_COOL:
-      remote_state[15] = HITACHI_COOL;
-      break;
-    case climate::CLIMATE_MODE_OFF:
-      remote_state[2] |= WHIRLPOOL_POWER;
-      remote_state[15] = HITACHI_OFF;
-      remote_state[18] = HITACHI_BYTE18_OFF;
-      break;
-    default:
-      break;
-  }
-#endif
-}
-
 bool WhirlpoolClimate::on_receive(remote_base::RemoteReceiveData data) {
   // Check if the esp isn't currently transmitting.
   if (millis() - this->last_transmit_time_ < 500) {
@@ -274,8 +234,7 @@ bool WhirlpoolClimate::on_receive(remote_base::RemoteReceiveData data) {
       if (!data.expect_item(WHIRLPOOL_BIT_MARK, WHIRLPOOL_GAP))
         return false;
     }
-    // The Hitachi remote always sends all 21 bytes; byte 18 holds its power state
-    if (i == WHIRLPOOL_SECOND_DIVIDER && !data.is_valid() && !this->is_hitachi_hcra31newh_()) {
+    if (i == WHIRLPOOL_SECOND_DIVIDER && !data.is_valid()) {
       // Remote control only sent 14 bytes, nothing more to read, not even the footer
       ESP_LOGV(TAG, "Remote control only sent %d bytes", i);
       skip_footer = true;
@@ -302,18 +261,13 @@ bool WhirlpoolClimate::on_receive(remote_base::RemoteReceiveData data) {
   ESP_LOGV_HEX(TAG, remote_state, WHIRLPOOL_STATE_LENGTH, WHIRLPOOL_STATE_LENGTH, "Received: %s");
 
   // verify header remote code
-  if (encode_uint16(remote_state[0], remote_state[1]) != this->remote_id_())
+  if (remote_state[0] != 0x83 || remote_state[1] != 0x06)
     return false;
 
   // powr on/off button
   ESP_LOGV(TAG, "Power: %02X", (remote_state[2] & WHIRLPOOL_POWER));
 
-  if (this->is_hitachi_hcra31newh_()) {
-    // Power is a state: byte 18 says whether the unit is off
-    this->powered_on_assumed = remote_state[18] != HITACHI_BYTE18_OFF;
-    if (!this->powered_on_assumed)
-      this->mode = climate::CLIMATE_MODE_OFF;
-  } else if ((remote_state[2] & WHIRLPOOL_POWER) == WHIRLPOOL_POWER) {
+  if ((remote_state[2] & WHIRLPOOL_POWER) == WHIRLPOOL_POWER) {
     auto powered_on = this->mode != climate::CLIMATE_MODE_OFF;
 
     if (powered_on) {
@@ -355,7 +309,7 @@ bool WhirlpoolClimate::on_receive(remote_base::RemoteReceiveData data) {
     int temp = remote_state[3] & 0xF0;
     ESP_LOGVV(TAG, "Temperature Raw: %02X", temp);
     temp = (uint8_t) temp >> 4;
-    temp = std::min(temp + static_cast<int>(this->temperature_min_()), static_cast<int>(this->temperature_max_()));
+    temp += static_cast<int>(this->temperature_min_());
     ESP_LOGVV(TAG, "Temperature Climate: %u", temp);
     this->target_temperature = temp;
   }

esphome/components/whirlpool/whirlpool.h

@@ -6,10 +6,9 @@ namespace esphome::whirlpool {
 
 /// Simple enum to represent models.
 enum Model {
-  MODEL_DG11J1_3A = 0,           /// Temperature range is from 18 to 32
-  MODEL_DG11J1_91 = 1,           /// Temperature range is from 16 to 30
-  MODEL_HISENSE_ARG = 2,         /// Hisense/BGH (Argentina), 16 to 30
-  MODEL_HITACHI_HCRA31NEWH = 3,  /// Hitachi with the HCRA31NEWH remote, 16 to 30
+  MODEL_DG11J1_3A = 0,    /// Temperature range is from 18 to 32
+  MODEL_DG11J1_91 = 1,    /// Temperature range is from 16 to 30
+  MODEL_HISENSE_ARG = 2,  /// Hisense/BGH (Argentina), 16 to 30
 };
 
 // Temperature
@@ -30,9 +29,7 @@ class WhirlpoolClimate final : public climate_ir::ClimateIR {
 
   /// Override control to change settings of the climate device.
   void control(const climate::ClimateCall &call) override {
-    // The toggle remotes flip swing on every press, so only send one when the mode really changes
-    auto swing = call.get_swing_mode();
-    this->send_swing_cmd_ = swing.has_value() && *swing != this->swing_mode;
+    send_swing_cmd_ = call.get_swing_mode().has_value();
     climate_ir::ClimateIR::control(call);
   }
 
@@ -58,22 +55,10 @@ class WhirlpoolClimate final : public climate_ir::ClimateIR {
     return false;
 #endif
   }
-  /// False when the model is compiled out, so the compiler drops the Hitachi branches.
-  bool is_hitachi_hcra31newh_() const {
-#ifdef USE_WHIRLPOOL_HITACHI_HCRA31NEWH
-    return this->model_ == MODEL_HITACHI_HCRA31NEWH;
-#else
-    return false;
-#endif
-  }
-  /// The remote ID sent in bytes 0 and 1.
-  uint16_t remote_id_() const { return this->is_hitachi_hcra31newh_() ? 0xA959 : 0x8306; }
   /// Modes in which the Hisense ARG model sends a fixed temperature.
   bool fixed_temp_mode_() const;
   /// Add the Hisense ARG bytes on top of the common whirlpool frame.
   void encode_hisense_arg_(uint8_t *remote_state, bool power_toggle, uint8_t temp_step) const;
-  /// Add the Hitachi HCRA31NEWH bytes on top of the common whirlpool frame.
-  void encode_hitachi_hcra31newh_(uint8_t *remote_state) const;
   /// Set the time of the last transmission.
   uint32_t last_transmit_time_{};
 

esphome/components/wifi/wifi_component.h

@@ -563,7 +563,7 @@ class WiFiComponent final : public Component {
   // (In most use cases you won't need these)
   /// Setup WiFi interface.
   void setup() override;
-#if defined(USE_ESP32) || defined(USE_LN882X) || defined(USE_BK72XX)
+#if defined(USE_LN882X) || defined(USE_BK72XX)
   void on_powerdown() override;
 #endif
   void start();

esphome/components/wifi/wifi_component_esp_idf.cpp

@@ -1635,21 +1635,6 @@ bool WiFiComponent::wifi_dpp_start_listen_() {
 void WiFiComponent::wifi_dpp_stop_listen_() { esp_supp_dpp_stop_listen(); }
 #endif
 
-void WiFiComponent::on_powerdown() {
-  // Leave the AP before esp_restart() or deep sleep stops Wi-Fi. esp_wifi_stop() while associated
-  // makes the ESP32 retransmit its Disassociation up to the retry limit although the AP ACKs it
-  // (32 copies with protected management frames), which some APs handle badly.
-  // Upstream bug: https://github.com/espressif/esp-idf/issues/19443 - remove this once it is fixed
-  // in the ESP-IDF versions we support.
-  // Ask the driver: s_sta_connected lags until the main loop has handled the connect event.
-  wifi_ap_record_t ap_info;
-  if (esp_wifi_sta_get_ap_info(&ap_info) != ESP_OK)
-    return;
-  ESP_LOGD(TAG, "Disconnecting before powerdown");
-  esp_wifi_disconnect();
-  delay(100);  // NOLINT: once per reboot or deep sleep, lets the disassociation go out
-}
-
 bool WiFiComponent::wifi_disconnect_() { return esp_wifi_disconnect(); }
 
 bssid_t WiFiComponent::wifi_bssid() {

esphome/core/application.cpp

@@ -294,8 +294,6 @@ void Application::reboot() {
   for (auto &component : std::ranges::reverse_view(this->components_)) {
     component->on_shutdown();
   }
-  // No teardown on a forced reboot, but still power hardware down (Wi-Fi leaves the AP)
-  this->run_powerdown_hooks();
   arch_restart();
 }
 void Application::safe_reboot() {

esphome/core/component.h

@@ -185,12 +185,10 @@ class Component {
    */
   virtual bool teardown() { return true; }
 
-  /** Called last before a reboot or deep sleep to power down hardware.
+  /** Called after teardown is complete to power down hardware.
    *
-   * On a safe shutdown this is called after all components have finished their teardown process,
+   * This is called after all components have finished their teardown process,
    * making it safe to power down hardware like ethernet PHY.
-   * On a forced reboot (Application::reboot()) it is called right after on_shutdown() with no
-   * teardown, so implementations must not assume teardown() has run.
    */
   virtual void on_powerdown() {}
 

esphome/core/defines.h

@@ -387,7 +387,6 @@
 #define USE_WATER_HEATER
 #define USE_WATER_HEATER_VISUAL_OVERRIDES
 #define USE_WHIRLPOOL_HISENSE_ARG
-#define USE_WHIRLPOOL_HITACHI_HCRA31NEWH
 #define USE_ZWAVE_PROXY
 
 // Feature flags which do not work for zephyr

tests/component_tests/light/config/dim_relative_actions.yaml

@@ -47,3 +47,14 @@ script:
       - light.effect.previous:
           id: dim_light
           include_none: true
+  - id: dim_skip_then_dim
+    then:
+      - light.dim_relative:
+          id: dim_light
+          relative_brightness: 10%
+          brightness_limits:
+            min_brightness: 90%
+            limit_mode: DO_NOTHING
+      - light.dim_relative:
+          id: dim_light
+          relative_brightness: -5%

tests/component_tests/light/test_dim_relative_codegen.py

@@ -2,6 +2,7 @@
 
 from collections.abc import Callable
 from pathlib import Path
+import re
 
 import pytest
 
@@ -18,28 +19,28 @@ def main_cpp(
 
 
 def test_dim_relative_without_transition_or_limits(main_cpp: str) -> None:
-    """No transition length and no limits: the defaults apply."""
+    """No transition length and no limits: the helper's default limits apply."""
     assert (
-        "new(light_dimrelativeaction_id) light::DimRelativeAction<false>(dim_light);\n"
-        "light_dimrelativeaction_id->set_relative_brightness([]() -> float {\n"
-        "    return 0.1f;\n"
-        "});\n"
-        "new(automation_id) Automation<>(dim_plain);\n"
+        "static void esphome__applyaction_id__fn() {\n"
+        "  auto esphome__call = ::dim_light->make_call();\n"
+        "  if (light::dim_relative(::dim_light, esphome__call, 0.1f)) {\n"
+        "    esphome__call.perform();\n"
+        "  }\n"
+        "}\n"
     ) in main_cpp
 
 
 def test_dim_relative_with_transition_and_limits(main_cpp: str) -> None:
-    """A transition length, brightness limits and limit mode are all set."""
+    """The transition length is only set once the limits allow the call."""
     assert (
-        "new(light_dimrelativeaction_id_2) light::DimRelativeAction<true>(dim_light);\n"
-        "light_dimrelativeaction_id_2->set_relative_brightness([]() -> float {\n"
-        "    return -0.05f;\n"
-        "});\n"
-        "light_dimrelativeaction_id_2->set_transition_length([]() -> uint32_t {\n"
-        "    return 250;\n"
-        "});\n"
-        "light_dimrelativeaction_id_2->set_min_max_brightness(0.2f, 0.9f);\n"
-        "light_dimrelativeaction_id_2->set_limit_mode(light::LimitMode::DO_NOTHING);\n"
+        "static void esphome__applyaction_id_2__fn() {\n"
+        "  auto esphome__call = ::dim_light->make_call();\n"
+        "  if (light::dim_relative(::dim_light, esphome__call, -0.05f, 0.2f, 0.9f, "
+        "light::LimitMode::DO_NOTHING)) {\n"
+        "    esphome__call.set_transition_length(250);\n"
+        "    esphome__call.perform();\n"
+        "  }\n"
+        "}\n"
     ) in main_cpp
 
 
@@ -50,22 +51,49 @@ def test_dim_relative_with_transition_and_limits(main_cpp: str) -> None:
 def test_dim_relative_lambdas_take_args_by_value(
     main_cpp: str, return_type: str, body: str
 ) -> None:
-    """The user's lambdas get the script parameter by value, so they may modify it."""
+    """The user's lambdas get the script parameter by value, so they may modify it.
+
+    They are called rather than reduced, so even a single return modifies only its own copy.
+    """
+    assert (
+        "static void esphome__applyaction_id_3__fn(const std::remove_cvref_t<float> & step) {"
+        in main_cpp
+    )
     head = f"[](float step) -> {return_type} {{\n"
     start = main_cpp.index(head)
-    assert f"    {body}\n" in main_cpp[start : main_cpp.index("});", start)]
+    assert f"      {body}\n" in main_cpp[start : main_cpp.index("}(step)", start)]
 
 
 def test_effect_cycle(main_cpp: str) -> None:
-    """The direction is a template argument and include_none is always set."""
+    """Both actions call the shared helper, merged into one function."""
     assert (
-        "new(light_lighteffectcycleaction_id) light::LightEffectCycleAction<true>(dim_light);\n"
-        "light_lighteffectcycleaction_id->set_include_none(false);\n"
-        "new(light_lighteffectcycleaction_id_2) light::LightEffectCycleAction<false>(dim_light);\n"
-        "light_lighteffectcycleaction_id_2->set_include_none(true);\n"
+        "  {\n"
+        "  light::cycle_effect(::dim_light, true, false);\n"
+        "  }\n"
+        "  if (!esphome__running)\n"
+        "    return;\n"
+        "  {\n"
+        "  light::cycle_effect(::dim_light, false, true);\n"
+        "  }\n"
     ) in main_cpp
 
 
+def test_dim_relative_limit_does_not_skip_merged_actions(main_cpp: str) -> None:
+    """The limit check is an if block, so an action merged after it still runs."""
+    fn = re.search(
+        r"Automation<>\(dim_skip_then_dim\);\nnew\(\w+\) ApplyRunAction<(\w+)>",
+        main_cpp,
+    )
+    assert fn is not None
+    start = main_cpp.index(
+        f"static void {fn.group(1)}(const int & esphome__running) {{"
+    )
+    body = main_cpp[start : main_cpp.index("\n}\n", start)]
+    assert body.count("light::dim_relative(") == 2
+    # The only return is the stop check between the two actions
+    assert body.count("return;") == 1
+
+
 @pytest.mark.parametrize("action", ["light.effect.next", "light.effect.previous"])
 def test_effect_cycle_rejects_light_without_effects(
     action: str, tmp_path: Path, capsys: pytest.CaptureFixture[str]

tests/components/ethernet_info/test.esp32-idf.yaml

@@ -2,7 +2,3 @@ packages:
   i2c: !include ../../test_build_components/common/i2c/esp32-idf.yaml
 
 <<: !include common.yaml
-
-# IPv6 with an IP sensor: compiles the IPv6 event handler's listener notification
-network:
-  enable_ipv6: true

tests/components/whirlpool/__init__.py

@@ -10,8 +10,7 @@ def override_manifest(manifest: ComponentManifestOverride) -> None:
     manifest.auto_load = ["climate_ir", "climate"]
 
     async def to_code_testing(config: ConfigType) -> None:
-        # Compiles in the Hisense ARG and Hitachi models, which climate.py adds only when configured
+        # Compiles in the Hisense ARG model, which climate.py adds only when it is configured
         cg.add_define("USE_WHIRLPOOL_HISENSE_ARG")
-        cg.add_define("USE_WHIRLPOOL_HITACHI_HCRA31NEWH")
 
     manifest.to_code = to_code_testing

tests/components/whirlpool/common.yaml

@@ -8,8 +8,3 @@ climate:
     model: HISENSE_ARG
     transmitter_id: xmitr
     receiver_id: rcvr
-  - platform: whirlpool
-    name: Whirlpool Hitachi HCRA31NEWH Climate
-    model: HITACHI_HCRA31NEWH
-    transmitter_id: xmitr
-    receiver_id: rcvr

tests/components/whirlpool/whirlpool_tests.cpp

@@ -252,9 +252,6 @@ TEST(WhirlpoolHisenseArg, SwingIsSentOnEveryTransmit) {
 
 TEST(WhirlpoolDG11J13A, SwingIsSentOnlyWhenItChanges) {
   Fixture f(MODEL_DG11J1_3A);
-  f.command(climate::CLIMATE_MODE_COOL, 24, climate::CLIMATE_FAN_LOW, climate::CLIMATE_SWING_OFF);
-  EXPECT_EQ(f.last_frame()[2] & 0x80, 0) << "swing is already off";
-
   f.command(climate::CLIMATE_MODE_COOL, 24, climate::CLIMATE_FAN_LOW, climate::CLIMATE_SWING_VERTICAL);
   Frame frame = f.last_frame();
   EXPECT_EQ(frame[2] & 0x80, 0x80);
@@ -264,9 +261,6 @@ TEST(WhirlpoolDG11J13A, SwingIsSentOnlyWhenItChanges) {
   frame = f.last_frame();
   EXPECT_EQ(frame[2] & 0x80, 0);
   EXPECT_EQ(frame[8], 0x00);
-
-  f.command(climate::CLIMATE_MODE_COOL, 25, climate::CLIMATE_FAN_LOW, climate::CLIMATE_SWING_VERTICAL);
-  EXPECT_EQ(f.last_frame()[2] & 0x80, 0) << "swing is already vertical";
 }
 
 // Cool 24 C (step 8), fan low, powered on assumed
@@ -391,90 +385,4 @@ TEST(WhirlpoolHisenseArg, EveryTransmitHasValidChecksums) {
   }
 }
 
-// Cool 24 C (step 8), fan low, unit on
-static Frame hitachi_cool_frame() {
-  return with_checksums({0xA9, 0x59, 0x03, 0x82, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x20,
-                         0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x38, 0x08, 0x00});
-}
-
-// The off frame: power bit, cool code, byte 15 0x01 and byte 18 0x28
-static Frame hitachi_off_frame() {
-  return with_checksums({0xA9, 0x59, 0x07, 0x82, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x20,
-                         0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x28, 0x08, 0x00});
-}
-
-TEST(WhirlpoolHitachiHCRA31NEWH, CoolAndOffMatchKnownFrames) {
-  Fixture f(MODEL_HITACHI_HCRA31NEWH);
-  f.command(climate::CLIMATE_MODE_COOL, 24, climate::CLIMATE_FAN_LOW);
-  // Turning on sends the full state with no power bit
-  expect_frame(f.last_frame(), hitachi_cool_frame());
-
-  f.command(climate::CLIMATE_MODE_OFF, 24, climate::CLIMATE_FAN_LOW);
-  expect_frame(f.last_frame(), hitachi_off_frame());
-
-  // A second off command still sends the power bit
-  f.command(climate::CLIMATE_MODE_OFF, 24, climate::CLIMATE_FAN_LOW);
-  EXPECT_EQ(f.last_frame()[2] & 0x04, 0x04);
-
-  f.command(climate::CLIMATE_MODE_HEAT, 24, climate::CLIMATE_FAN_LOW);
-  const Frame frame = f.last_frame();
-  EXPECT_EQ(frame[2] & 0x04, 0);
-  EXPECT_EQ(frame[3], 0x80);
-  EXPECT_EQ(frame[15], 0x06);
-  EXPECT_EQ(frame[18], 0x38);
-}
-
-TEST(WhirlpoolHitachiHCRA31NEWH, ReceivePowerIsAState) {
-  Fixture f(MODEL_HITACHI_HCRA31NEWH);
-  ASSERT_EQ(f.climate.mode, climate::CLIMATE_MODE_OFF);
-
-  // An on frame restores the mode even though it has no power bit
-  EXPECT_TRUE(receive(f.climate, hitachi_cool_frame()));
-  EXPECT_EQ(f.climate.mode, climate::CLIMATE_MODE_COOL);
-  EXPECT_FLOAT_EQ(f.climate.target_temperature, 24);
-  EXPECT_EQ(f.climate.fan_mode, climate::CLIMATE_FAN_LOW);
-  // The same frame again keeps it on
-  EXPECT_TRUE(receive(f.climate, hitachi_cool_frame()));
-  EXPECT_EQ(f.climate.mode, climate::CLIMATE_MODE_COOL);
-
-  EXPECT_TRUE(receive(f.climate, hitachi_off_frame()));
-  EXPECT_EQ(f.climate.mode, climate::CLIMATE_MODE_OFF);
-  // A repeated off frame does not toggle
-  EXPECT_TRUE(receive(f.climate, hitachi_off_frame()));
-  EXPECT_EQ(f.climate.mode, climate::CLIMATE_MODE_OFF);
-}
-
-TEST(WhirlpoolHitachiHCRA31NEWH, ReceiveChecksRemoteId) {
-  Fixture hitachi(MODEL_HITACHI_HCRA31NEWH);
-  EXPECT_FALSE(receive(hitachi.climate, hisense_cool_frame()));
-  Fixture whirlpool(MODEL_DG11J1_91);
-  EXPECT_FALSE(receive(whirlpool.climate, hitachi_cool_frame()));
-}
-
-TEST(WhirlpoolHitachiHCRA31NEWH, ReceivedTemperatureIsClamped) {
-  Fixture f(MODEL_HITACHI_HCRA31NEWH);
-  Frame frame = hitachi_cool_frame();
-  frame[3] = 0xF2;  // step 15 would be 31 C
-  EXPECT_TRUE(receive(f.climate, with_checksums(frame)));
-  EXPECT_FLOAT_EQ(f.climate.target_temperature, 30);
-}
-
-TEST(WhirlpoolDG11J13A, TargetIsClampedAndRoundedToWhatWasSent) {
-  Fixture f(MODEL_DG11J1_3A);
-  f.command(climate::CLIMATE_MODE_COOL, 35, climate::CLIMATE_FAN_LOW);
-  EXPECT_FLOAT_EQ(f.climate.target_temperature, 32);
-  f.command(climate::CLIMATE_MODE_COOL, 24.4f, climate::CLIMATE_FAN_LOW);
-  EXPECT_FLOAT_EQ(f.climate.target_temperature, 24);
-}
-
-TEST(WhirlpoolHitachiHCRA31NEWH, ReceiveRejectsShortFrame) {
-  Fixture f(MODEL_HITACHI_HCRA31NEWH);
-  remote_base::RawTimings raw = waveform(hitachi_cool_frame());
-  // Cut after the second divider: 14 bytes, no footer
-  raw.resize(2 + 14 * 16 + 2 * 2);
-  remote_base::RemoteReceiveData data(raw, 25, remote_base::TOLERANCE_MODE_PERCENTAGE);
-  EXPECT_FALSE(static_cast<remote_base::RemoteReceiverListener &>(f.climate).on_receive(data));
-  EXPECT_EQ(f.climate.mode, climate::CLIMATE_MODE_OFF);
-}
-
 }  // namespace esphome::whirlpool::testing

tests/integration/fixtures/external_components/reboot_hook_recorder/__init__.py

@@ -1,23 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_NAME
-from esphome.types import ConfigType
-
-CODEOWNERS = ["@esphome/tests"]
-MULTI_CONF = True
-
-reboot_hook_recorder_ns = cg.esphome_ns.namespace("reboot_hook_recorder")
-RebootHookRecorder = reboot_hook_recorder_ns.class_("RebootHookRecorder", cg.Component)
-
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(RebootHookRecorder),
-        cv.Required(CONF_NAME): cv.string,
-    }
-).extend(cv.COMPONENT_SCHEMA)
-
-
-async def to_code(config: ConfigType) -> None:
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    cg.add(var.set_name(config[CONF_NAME]))

tests/integration/fixtures/external_components/reboot_hook_recorder/reboot_hook_recorder.cpp

@@ -1,10 +0,0 @@
-#include "reboot_hook_recorder.h"
-#include "esphome/core/log.h"
-
-namespace esphome::reboot_hook_recorder {
-
-ESPHOME_LOG_TAG(TAG, "reboot_hook_recorder");
-
-void RebootHookRecorder::record_(const char *hook) { ESP_LOGI(TAG, "HOOK %s %s", this->name_, hook); }
-
-}  // namespace esphome::reboot_hook_recorder

tests/integration/fixtures/external_components/reboot_hook_recorder/reboot_hook_recorder.h

@@ -1,33 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-
-namespace esphome::reboot_hook_recorder {
-
-/// Logs every shutdown lifecycle hook it receives, so a test can check their order.
-class RebootHookRecorder : public Component {
- public:
-  void set_name(const char *name) { this->name_ = name; }
-
-  void on_safe_shutdown() override { this->record_("on_safe_shutdown"); }
-  void on_shutdown() override { this->record_("on_shutdown"); }
-  // Needs a second call to finish, like a component waiting for a connection to close
-  bool teardown() override {
-    if (++this->teardown_calls_ < 2) {
-      this->record_("teardown_pending");
-      return false;
-    }
-    if (this->teardown_calls_ == 2)
-      this->record_("teardown_done");
-    return true;
-  }
-  void on_powerdown() override { this->record_("on_powerdown"); }
-
- protected:
-  void record_(const char *hook);
-
-  const char *name_{""};
-  uint8_t teardown_calls_{0};
-};
-
-}  // namespace esphome::reboot_hook_recorder

tests/integration/fixtures/light_dim_relative_action.yaml

@@ -29,7 +29,7 @@ button:
           id: test_light
           brightness: 50%
 
-  # Test 1: dim_relative without transition_length (HasTransitionLength=false)
+  # Test 1: dim_relative without transition_length
   - platform: template
     id: btn_dim_up
     name: "Dim Up"
@@ -38,7 +38,7 @@ button:
           id: test_light
           relative_brightness: 25%
 
-  # Test 2: dim_relative with transition_length (HasTransitionLength=true)
+  # Test 2: dim_relative with transition_length
   - platform: template
     id: btn_dim_down
     name: "Dim Down"

tests/integration/fixtures/reboot_hook_order_forced.yaml

@@ -1,19 +0,0 @@
-esphome:
-  name: reboot-hooks-forced
-host:
-logger:
-  level: DEBUG
-api:
-  # Reboot once the test has connected, so that it sees every hook
-  on_client_connected:
-    - delay: 100ms
-    - lambda: App.reboot();
-
-external_components:
-  - source:
-      type: local
-      path: EXTERNAL_COMPONENT_PATH
-
-reboot_hook_recorder:
-  - name: first
-  - name: second

tests/integration/fixtures/reboot_hook_order_safe.yaml

@@ -1,19 +0,0 @@
-esphome:
-  name: reboot-hooks-safe
-host:
-logger:
-  level: DEBUG
-api:
-  # Reboot once the test has connected, so that it sees every hook
-  on_client_connected:
-    - delay: 100ms
-    - lambda: App.safe_reboot();
-
-external_components:
-  - source:
-      type: local
-      path: EXTERNAL_COMPONENT_PATH
-
-reboot_hook_recorder:
-  - name: first
-  - name: second

tests/integration/test_light_dim_relative_action.py

@@ -1,8 +1,4 @@
-"""Integration test for light::DimRelativeAction.
-
-Tests both DimRelativeAction<HasTransitionLength=false> and
-DimRelativeAction<HasTransitionLength=true> instantiations.
-"""
+"""Integration test for light.dim_relative, with and without a transition length and limits."""
 
 from __future__ import annotations
 

tests/integration/test_reboot_hook_order.py

@@ -1,80 +0,0 @@
-"""Test the order of the shutdown lifecycle hooks on a forced and on a safe reboot."""
-
-import re
-
-import pytest
-
-from .log_utils import LineWaiter
-from .types import APIClientConnectedFactory, RunCompiledFunction
-from .wait_utils import wait_or_fail
-
-HOOK_PATTERN = re.compile(r"HOOK (\w+) (\w+)")
-# Hooks run in reverse component order, so "first" gets each hook last.
-LAST_HOOK = "HOOK first on_powerdown"
-
-
-async def _record_reboot_hooks(
-    yaml_config: str,
-    run_compiled: RunCompiledFunction,
-    api_client_connected: APIClientConnectedFactory,
-) -> list[tuple[str, str]]:
-    """Connect, which makes the device reboot, and return its (component, hook) calls in order."""
-    waiter = LineWaiter()
-    hooks: list[tuple[str, str]] = []
-
-    def on_line(line: str) -> None:
-        if match := HOOK_PATTERN.search(line):
-            hooks.append((match[1], match[2]))
-        waiter.callback(line)
-
-    async with (
-        run_compiled(yaml_config, line_callback=on_line),
-        api_client_connected(),
-    ):
-        await wait_or_fail(
-            waiter.wait_for(LAST_HOOK),
-            5.0,
-            "Device did not run the powerdown hooks",
-            hooks=hooks,
-        )
-    return hooks
-
-
-@pytest.mark.asyncio
-async def test_reboot_hook_order_forced(
-    yaml_config: str,
-    run_compiled: RunCompiledFunction,
-    api_client_connected: APIClientConnectedFactory,
-) -> None:
-    """A forced reboot runs on_shutdown then on_powerdown, with no safe shutdown or teardown."""
-    hooks = await _record_reboot_hooks(yaml_config, run_compiled, api_client_connected)
-
-    assert hooks == [
-        ("second", "on_shutdown"),
-        ("first", "on_shutdown"),
-        ("second", "on_powerdown"),
-        ("first", "on_powerdown"),
-    ]
-
-
-@pytest.mark.asyncio
-async def test_reboot_hook_order_safe(
-    yaml_config: str,
-    run_compiled: RunCompiledFunction,
-    api_client_connected: APIClientConnectedFactory,
-) -> None:
-    """A safe reboot powers down only after every component has finished its teardown."""
-    hooks = await _record_reboot_hooks(yaml_config, run_compiled, api_client_connected)
-
-    assert hooks == [
-        ("second", "on_safe_shutdown"),
-        ("first", "on_safe_shutdown"),
-        ("second", "on_shutdown"),
-        ("first", "on_shutdown"),
-        ("second", "teardown_pending"),
-        ("first", "teardown_pending"),
-        ("second", "teardown_done"),
-        ("first", "teardown_done"),
-        ("second", "on_powerdown"),
-        ("first", "on_powerdown"),
-    ]