Remove unused return value from read_message and fix ifdef placement in generated API code

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

CODEOWNERS

@@ -248,7 +248,6 @@ esphome/components/libretiny_pwm/* @kuba2k2
 esphome/components/light/* @esphome/core
 esphome/components/lightwaverf/* @max246
 esphome/components/lilygo_t5_47/touchscreen/* @jesserockz
-esphome/components/ln882x/* @lamauny
 esphome/components/lock/* @esphome/core
 esphome/components/logger/* @esphome/core
 esphome/components/logger/select/* @clydebarrow
@@ -333,7 +332,6 @@ esphome/components/pca6416a/* @Mat931
 esphome/components/pca9554/* @clydebarrow @hwstar
 esphome/components/pcf85063/* @brogon
 esphome/components/pcf8563/* @KoenBreeman
-esphome/components/pi4ioe5v6408/* @jesserockz
 esphome/components/pid/* @OttoWinter
 esphome/components/pipsolar/* @andreashergert1984
 esphome/components/pm1006/* @habbie
@@ -498,7 +496,6 @@ esphome/components/voice_assistant/* @jesserockz @kahrendt
 esphome/components/wake_on_lan/* @clydebarrow @willwill2will54
 esphome/components/watchdog/* @oarcher
 esphome/components/waveshare_epaper/* @clydebarrow
-esphome/components/web_server/ota/* @esphome/core
 esphome/components/web_server_base/* @OttoWinter
 esphome/components/web_server_idf/* @dentra
 esphome/components/weikai/* @DrCoolZic

esphome/__main__.py

@@ -34,9 +34,11 @@ from esphome.const import (
     CONF_PORT,
     CONF_SUBSTITUTIONS,
     CONF_TOPIC,
+    PLATFORM_BK72XX,
     PLATFORM_ESP32,
     PLATFORM_ESP8266,
     PLATFORM_RP2040,
+    PLATFORM_RTL87XX,
     SECRETS_FILES,
 )
 from esphome.core import CORE, EsphomeError, coroutine
@@ -352,7 +354,7 @@ def upload_program(config, args, host):
         if CORE.target_platform in (PLATFORM_RP2040):
             return upload_using_platformio(config, args.device)
 
-        if CORE.is_libretiny:
+        if CORE.target_platform in (PLATFORM_BK72XX, PLATFORM_RTL87XX):
             return upload_using_platformio(config, host)
 
         return 1  # Unknown target platform
@@ -458,13 +460,6 @@ def command_vscode(args):
 
 
 def command_compile(args, config):
-    # Set memory analysis options in config
-    if args.analyze_memory:
-        config.setdefault(CONF_ESPHOME, {})["analyze_memory"] = True
-
-    if args.memory_report:
-        config.setdefault(CONF_ESPHOME, {})["memory_report_file"] = args.memory_report
-
     exit_code = write_cpp(config)
     if exit_code != 0:
         return exit_code
@@ -844,17 +839,6 @@ def parse_args(argv):
         help="Only generate source code, do not compile.",
         action="store_true",
     )
-    parser_compile.add_argument(
-        "--analyze-memory",
-        help="Analyze and display memory usage by component after compilation.",
-        action="store_true",
-    )
-    parser_compile.add_argument(
-        "--memory-report",
-        help="Save memory analysis report to a file (supports .json or .txt).",
-        type=str,
-        metavar="FILE",
-    )
 
     parser_upload = subparsers.add_parser(
         "upload",

esphome/components/adc/adc_sensor.h

@@ -15,7 +15,8 @@ namespace adc {
 
 #ifdef USE_ESP32
 // clang-format off
-#if (ESP_IDF_VERSION_MAJOR == 5 && \
+#if (ESP_IDF_VERSION_MAJOR == 4 && ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 7)) || \
+    (ESP_IDF_VERSION_MAJOR == 5 && \
      ((ESP_IDF_VERSION_MINOR == 0 && ESP_IDF_VERSION_PATCH >= 5) || \
       (ESP_IDF_VERSION_MINOR == 1 && ESP_IDF_VERSION_PATCH >= 3) || \
       (ESP_IDF_VERSION_MINOR >= 2)) \
@@ -27,24 +28,19 @@ static const adc_atten_t ADC_ATTEN_DB_12_COMPAT = ADC_ATTEN_DB_11;
 #endif
 #endif  // USE_ESP32
 
-enum class SamplingMode : uint8_t {
-  AVG = 0,
-  MIN = 1,
-  MAX = 2,
-};
-
+enum class SamplingMode : uint8_t { AVG = 0, MIN = 1, MAX = 2 };
 const LogString *sampling_mode_to_str(SamplingMode mode);
 
 class Aggregator {
  public:
-  Aggregator(SamplingMode mode);
   void add_sample(uint32_t value);
   uint32_t aggregate();
+  Aggregator(SamplingMode mode);
 
  protected:
+  SamplingMode mode_{SamplingMode::AVG};
   uint32_t aggr_{0};
   uint32_t samples_{0};
-  SamplingMode mode_{SamplingMode::AVG};
 };
 
 class ADCSensor : public sensor::Sensor, public PollingComponent, public voltage_sampler::VoltageSampler {
@@ -85,9 +81,9 @@ class ADCSensor : public sensor::Sensor, public PollingComponent, public voltage
 #endif  // USE_RP2040
 
  protected:
-  uint8_t sample_count_{1};
-  bool output_raw_{false};
   InternalGPIOPin *pin_;
+  bool output_raw_{false};
+  uint8_t sample_count_{1};
   SamplingMode sampling_mode_{SamplingMode::AVG};
 
 #ifdef USE_RP2040
@@ -99,7 +95,11 @@ class ADCSensor : public sensor::Sensor, public PollingComponent, public voltage
   adc1_channel_t channel1_{ADC1_CHANNEL_MAX};
   adc2_channel_t channel2_{ADC2_CHANNEL_MAX};
   bool autorange_{false};
+#if ESP_IDF_VERSION_MAJOR >= 5
   esp_adc_cal_characteristics_t cal_characteristics_[SOC_ADC_ATTEN_NUM] = {};
+#else
+  esp_adc_cal_characteristics_t cal_characteristics_[ADC_ATTEN_MAX] = {};
+#endif  // ESP_IDF_VERSION_MAJOR
 #endif  // USE_ESP32
 };
 

esphome/components/adc/adc_sensor_common.cpp

@@ -61,7 +61,7 @@ uint32_t Aggregator::aggregate() {
 
 void ADCSensor::update() {
   float value_v = this->sample();
-  ESP_LOGV(TAG, "'%s': Voltage=%.4fV", this->get_name().c_str(), value_v);
+  ESP_LOGV(TAG, "'%s': Got voltage=%.4fV", this->get_name().c_str(), value_v);
   this->publish_state(value_v);
 }
 

esphome/components/adc/adc_sensor_esp32.cpp

@@ -55,40 +55,32 @@ void ADCSensor::setup() {
 }
 
 void ADCSensor::dump_config() {
-  static const char *const ATTEN_AUTO_STR = "auto";
-  static const char *const ATTEN_0DB_STR = "0 db";
-  static const char *const ATTEN_2_5DB_STR = "2.5 db";
-  static const char *const ATTEN_6DB_STR = "6 db";
-  static const char *const ATTEN_12DB_STR = "12 db";
-  const char *atten_str = ATTEN_AUTO_STR;
-
   LOG_SENSOR("", "ADC Sensor", this);
   LOG_PIN("  Pin: ", this->pin_);
-
-  if (!this->autorange_) {
+  if (this->autorange_) {
+    ESP_LOGCONFIG(TAG, "  Attenuation: auto");
+  } else {
     switch (this->attenuation_) {
       case ADC_ATTEN_DB_0:
-        atten_str = ATTEN_0DB_STR;
+        ESP_LOGCONFIG(TAG, "  Attenuation: 0db");
         break;
       case ADC_ATTEN_DB_2_5:
-        atten_str = ATTEN_2_5DB_STR;
+        ESP_LOGCONFIG(TAG, "  Attenuation: 2.5db");
         break;
       case ADC_ATTEN_DB_6:
-        atten_str = ATTEN_6DB_STR;
+        ESP_LOGCONFIG(TAG, "  Attenuation: 6db");
         break;
       case ADC_ATTEN_DB_12_COMPAT:
-        atten_str = ATTEN_12DB_STR;
+        ESP_LOGCONFIG(TAG, "  Attenuation: 12db");
         break;
       default:  // This is to satisfy the unused ADC_ATTEN_MAX
         break;
     }
   }
-
   ESP_LOGCONFIG(TAG,
-                "  Attenuation: %s\n"
                 "  Samples: %i\n"
                 "  Sampling mode: %s",
-                atten_str, this->sample_count_, LOG_STR_ARG(sampling_mode_to_str(this->sampling_mode_)));
+                this->sample_count_, LOG_STR_ARG(sampling_mode_to_str(this->sampling_mode_)));
   LOG_UPDATE_INTERVAL(this);
 }
 

esphome/components/ade7880/ade7880.h

@@ -85,6 +85,8 @@ class ADE7880 : public i2c::I2CDevice, public PollingComponent {
 
   void dump_config() override;
 
+  float get_setup_priority() const override { return setup_priority::DATA; }
+
  protected:
   ADE7880Store store_{};
   InternalGPIOPin *irq0_pin_{nullptr};

esphome/components/ads1115/ads1115.h

@@ -49,6 +49,7 @@ class ADS1115Component : public Component, public i2c::I2CDevice {
   void setup() override;
   void dump_config() override;
   /// HARDWARE_LATE setup priority
+  float get_setup_priority() const override { return setup_priority::DATA; }
   void set_continuous_mode(bool continuous_mode) { continuous_mode_ = continuous_mode; }
 
   /// Helper method to request a measurement from a sensor.

esphome/components/ads1118/ads1118.h

@@ -34,6 +34,7 @@ class ADS1118 : public Component,
   ADS1118() = default;
   void setup() override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
   /// Helper method to request a measurement from a sensor.
   float request_measurement(ADS1118Multiplexer multiplexer, ADS1118Gain gain, bool temperature_mode);
 

esphome/components/ags10/ags10.h

@@ -31,6 +31,8 @@ class AGS10Component : public PollingComponent, public i2c::I2CDevice {
 
   void dump_config() override;
 
+  float get_setup_priority() const override { return setup_priority::DATA; }
+
   /**
    * Modifies target address of AGS10.
    *

esphome/components/aic3204/aic3204.h

@@ -66,6 +66,7 @@ class AIC3204 : public audio_dac::AudioDac, public Component, public i2c::I2CDev
  public:
   void setup() override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
   bool set_mute_off() override;
   bool set_mute_on() override;

esphome/components/alpha3/alpha3.h

@@ -41,6 +41,7 @@ class Alpha3 : public esphome::ble_client::BLEClientNode, public PollingComponen
   void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                            esp_ble_gattc_cb_param_t *param) override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
   void set_flow_sensor(sensor::Sensor *sensor) { this->flow_sensor_ = sensor; }
   void set_head_sensor(sensor::Sensor *sensor) { this->head_sensor_ = sensor; }
   void set_power_sensor(sensor::Sensor *sensor) { this->power_sensor_ = sensor; }

esphome/components/am43/cover/am43_cover.h

@@ -22,6 +22,7 @@ class Am43Component : public cover::Cover, public esphome::ble_client::BLEClient
   void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                            esp_ble_gattc_cb_param_t *param) override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
   cover::CoverTraits get_traits() override;
   void set_pin(uint16_t pin) { this->pin_ = pin; }
   void set_invert_position(bool invert_position) { this->invert_position_ = invert_position; }

esphome/components/am43/sensor/am43_sensor.h

@@ -22,6 +22,7 @@ class Am43 : public esphome::ble_client::BLEClientNode, public PollingComponent
   void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                            esp_ble_gattc_cb_param_t *param) override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
   void set_battery(sensor::Sensor *battery) { battery_ = battery; }
   void set_illuminance(sensor::Sensor *illuminance) { illuminance_ = illuminance; }
 

esphome/components/analog_threshold/analog_threshold_binary_sensor.h

@@ -12,6 +12,8 @@ class AnalogThresholdBinarySensor : public Component, public binary_sensor::Bina
   void dump_config() override;
   void setup() override;
 
+  float get_setup_priority() const override { return setup_priority::DATA; }
+
   void set_sensor(sensor::Sensor *analog_sensor);
   template<typename T> void set_upper_threshold(T upper_threshold) { this->upper_threshold_ = upper_threshold; }
   template<typename T> void set_lower_threshold(T lower_threshold) { this->lower_threshold_ = lower_threshold; }

esphome/components/anova/anova.h

@@ -26,6 +26,7 @@ class Anova : public climate::Climate, public esphome::ble_client::BLEClientNode
   void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                            esp_ble_gattc_cb_param_t *param) override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
   climate::ClimateTraits traits() override {
     auto traits = climate::ClimateTraits();
     traits.set_supports_current_temperature(true);

esphome/components/api/__init__.py

@@ -110,10 +110,9 @@ CONFIG_SCHEMA = cv.All(
             ): ACTIONS_SCHEMA,
             cv.Exclusive(CONF_ACTIONS, group_of_exclusion=CONF_ACTIONS): ACTIONS_SCHEMA,
             cv.Optional(CONF_ENCRYPTION): _encryption_schema,
-            cv.Optional(CONF_BATCH_DELAY, default="100ms"): cv.All(
-                cv.positive_time_period_milliseconds,
-                cv.Range(max=cv.TimePeriod(milliseconds=65535)),
-            ),
+            cv.Optional(
+                CONF_BATCH_DELAY, default="100ms"
+            ): cv.positive_time_period_milliseconds,
             cv.Optional(CONF_ON_CLIENT_CONNECTED): automation.validate_automation(
                 single=True
             ),
@@ -136,26 +135,23 @@ async def to_code(config):
     cg.add(var.set_reboot_timeout(config[CONF_REBOOT_TIMEOUT]))
     cg.add(var.set_batch_delay(config[CONF_BATCH_DELAY]))
 
-    if actions := config.get(CONF_ACTIONS, []):
-        cg.add_define("USE_API_YAML_SERVICES")
-        for conf in actions:
-            template_args = []
-            func_args = []
-            service_arg_names = []
-            for name, var_ in conf[CONF_VARIABLES].items():
-                native = SERVICE_ARG_NATIVE_TYPES[var_]
-                template_args.append(native)
-                func_args.append((native, name))
-                service_arg_names.append(name)
-            templ = cg.TemplateArguments(*template_args)
-            trigger = cg.new_Pvariable(
-                conf[CONF_TRIGGER_ID], templ, conf[CONF_ACTION], service_arg_names
-            )
-            cg.add(var.register_user_service(trigger))
-            await automation.build_automation(trigger, func_args, conf)
+    for conf in config.get(CONF_ACTIONS, []):
+        template_args = []
+        func_args = []
+        service_arg_names = []
+        for name, var_ in conf[CONF_VARIABLES].items():
+            native = SERVICE_ARG_NATIVE_TYPES[var_]
+            template_args.append(native)
+            func_args.append((native, name))
+            service_arg_names.append(name)
+        templ = cg.TemplateArguments(*template_args)
+        trigger = cg.new_Pvariable(
+            conf[CONF_TRIGGER_ID], templ, conf[CONF_ACTION], service_arg_names
+        )
+        cg.add(var.register_user_service(trigger))
+        await automation.build_automation(trigger, func_args, conf)
 
     if CONF_ON_CLIENT_CONNECTED in config:
-        cg.add_define("USE_API_CLIENT_CONNECTED_TRIGGER")
         await automation.build_automation(
             var.get_client_connected_trigger(),
             [(cg.std_string, "client_info"), (cg.std_string, "client_address")],
@@ -163,7 +159,6 @@ async def to_code(config):
         )
 
     if CONF_ON_CLIENT_DISCONNECTED in config:
-        cg.add_define("USE_API_CLIENT_DISCONNECTED_TRIGGER")
         await automation.build_automation(
             var.get_client_disconnected_trigger(),
             [(cg.std_string, "client_info"), (cg.std_string, "client_address")],
@@ -182,7 +177,11 @@ async def to_code(config):
             # and plaintext disabled. Only a factory reset can remove it.
             cg.add_define("USE_API_PLAINTEXT")
         cg.add_define("USE_API_NOISE")
-        cg.add_library("esphome/noise-c", "0.1.10")
+        cg.add_library(
+            None,
+            None,
+            "https://github.com/esphome/noise-c.git#libsodium_update",
+        )
     else:
         cg.add_define("USE_API_PLAINTEXT")
 

esphome/components/api/api_connection.cpp

@@ -1511,9 +1511,7 @@ ConnectResponse APIConnection::connect(const ConnectRequest &msg) {
   if (correct) {
     ESP_LOGD(TAG, "%s connected", this->get_client_combined_info().c_str());
     this->flags_.connection_state = static_cast<uint8_t>(ConnectionState::AUTHENTICATED);
-#ifdef USE_API_CLIENT_CONNECTED_TRIGGER
     this->parent_->get_client_connected_trigger()->trigger(this->client_info_, this->client_peername_);
-#endif
 #ifdef USE_HOMEASSISTANT_TIME
     if (homeassistant::global_homeassistant_time != nullptr) {
       this->send_time_request();
@@ -1537,8 +1535,6 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
   resp.manufacturer = "Raspberry Pi";
 #elif defined(USE_BK72XX)
   resp.manufacturer = "Beken";
-#elif defined(USE_LN882X)
-  resp.manufacturer = "Lightning";
 #elif defined(USE_RTL87XX)
   resp.manufacturer = "Realtek";
 #elif defined(USE_HOST)
@@ -1687,9 +1683,7 @@ void APIConnection::DeferredBatch::add_item(EntityBase *entity, MessageCreator c
   // O(n) but optimized for RAM and not performance.
   for (auto &item : items) {
     if (item.entity == entity && item.message_type == message_type) {
-      // Clean up old creator before replacing
-      item.creator.cleanup(message_type);
-      // Move assign the new creator
+      // Update the existing item with the new creator
       item.creator = std::move(creator);
       return;
     }
@@ -1732,11 +1726,11 @@ void APIConnection::process_batch_() {
     return;
   }
 
-  size_t num_items = this->deferred_batch_.size();
+  size_t num_items = this->deferred_batch_.items.size();
 
   // Fast path for single message - allocate exact size needed
   if (num_items == 1) {
-    const auto &item = this->deferred_batch_[0];
+    const auto &item = this->deferred_batch_.items[0];
 
     // Let the creator calculate size and encode if it fits
     uint16_t payload_size =
@@ -1766,8 +1760,7 @@ void APIConnection::process_batch_() {
 
   // Pre-calculate exact buffer size needed based on message types
   uint32_t total_estimated_size = 0;
-  for (size_t i = 0; i < this->deferred_batch_.size(); i++) {
-    const auto &item = this->deferred_batch_[i];
+  for (const auto &item : this->deferred_batch_.items) {
     total_estimated_size += get_estimated_message_size(item.message_type);
   }
 
@@ -1788,8 +1781,7 @@ void APIConnection::process_batch_() {
   uint32_t current_offset = 0;
 
   // Process items and encode directly to buffer
-  for (size_t i = 0; i < this->deferred_batch_.size(); i++) {
-    const auto &item = this->deferred_batch_[i];
+  for (const auto &item : this->deferred_batch_.items) {
     // Try to encode message
     // The creator will calculate overhead to determine if the message fits
     uint16_t payload_size = item.creator(item.entity, this, remaining_size, false, item.message_type);
@@ -1844,15 +1836,17 @@ void APIConnection::process_batch_() {
   // Log messages after send attempt for VV debugging
   // It's safe to use the buffer for logging at this point regardless of send result
   for (size_t i = 0; i < items_processed; i++) {
-    const auto &item = this->deferred_batch_[i];
+    const auto &item = this->deferred_batch_.items[i];
     this->log_batch_item_(item);
   }
 #endif
 
   // Handle remaining items more efficiently
-  if (items_processed < this->deferred_batch_.size()) {
-    // Remove processed items from the beginning with proper cleanup
-    this->deferred_batch_.remove_front(items_processed);
+  if (items_processed < this->deferred_batch_.items.size()) {
+    // Remove processed items from the beginning
+    this->deferred_batch_.items.erase(this->deferred_batch_.items.begin(),
+                                      this->deferred_batch_.items.begin() + items_processed);
+
     // Reschedule for remaining items
     this->schedule_batch_();
   } else {
@@ -1863,16 +1857,23 @@ void APIConnection::process_batch_() {
 
 uint16_t APIConnection::MessageCreator::operator()(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                                    bool is_single, uint16_t message_type) const {
+  if (has_tagged_string_ptr_()) {
+    // Handle string-based messages
+    switch (message_type) {
 #ifdef USE_EVENT
-  // Special case: EventResponse uses string pointer
-  if (message_type == EventResponse::MESSAGE_TYPE) {
-    auto *e = static_cast<event::Event *>(entity);
-    return APIConnection::try_send_event_response(e, *data_.string_ptr, conn, remaining_size, is_single);
-  }
+      case EventResponse::MESSAGE_TYPE: {
+        auto *e = static_cast<event::Event *>(entity);
+        return APIConnection::try_send_event_response(e, *get_string_ptr_(), conn, remaining_size, is_single);
+      }
 #endif
-
-  // All other message types use function pointers
-  return data_.function_ptr(entity, conn, remaining_size, is_single);
+      default:
+        // Should not happen, return 0 to indicate no message
+        return 0;
+    }
+  } else {
+    // Function pointer case
+    return data_.ptr(entity, conn, remaining_size, is_single);
+  }
 }
 
 uint16_t APIConnection::try_send_list_info_done(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,

esphome/components/api/api_connection.h

@@ -451,53 +451,96 @@ class APIConnection : public APIServerConnection {
   // Function pointer type for message encoding
   using MessageCreatorPtr = uint16_t (*)(EntityBase *, APIConnection *, uint32_t remaining_size, bool is_single);
 
+  // Optimized MessageCreator class using tagged pointer
   class MessageCreator {
+    // Ensure pointer alignment allows LSB tagging
+    static_assert(alignof(std::string *) > 1, "String pointer alignment must be > 1 for LSB tagging");
+
    public:
     // Constructor for function pointer
-    MessageCreator(MessageCreatorPtr ptr) { data_.function_ptr = ptr; }
+    MessageCreator(MessageCreatorPtr ptr) {
+      // Function pointers are always aligned, so LSB is 0
+      data_.ptr = ptr;
+    }
 
     // Constructor for string state capture
-    explicit MessageCreator(const std::string &str_value) { data_.string_ptr = new std::string(str_value); }
+    explicit MessageCreator(const std::string &str_value) {
+      // Allocate string and tag the pointer
+      auto *str = new std::string(str_value);
+      // Set LSB to 1 to indicate string pointer
+      data_.tagged = reinterpret_cast<uintptr_t>(str) | 1;
+    }
 
-    // No destructor - cleanup must be called explicitly with message_type
+    // Destructor
+    ~MessageCreator() {
+      if (has_tagged_string_ptr_()) {
+        delete get_string_ptr_();
+      }
+    }
 
-    // Delete copy operations - MessageCreator should only be moved
-    MessageCreator(const MessageCreator &other) = delete;
-    MessageCreator &operator=(const MessageCreator &other) = delete;
+    // Copy constructor
+    MessageCreator(const MessageCreator &other) {
+      if (other.has_tagged_string_ptr_()) {
+        auto *str = new std::string(*other.get_string_ptr_());
+        data_.tagged = reinterpret_cast<uintptr_t>(str) | 1;
+      } else {
+        data_ = other.data_;
+      }
+    }
 
     // Move constructor
-    MessageCreator(MessageCreator &&other) noexcept : data_(other.data_) { other.data_.function_ptr = nullptr; }
+    MessageCreator(MessageCreator &&other) noexcept : data_(other.data_) { other.data_.ptr = nullptr; }
 
-    // Move assignment
-    MessageCreator &operator=(MessageCreator &&other) noexcept {
+    // Assignment operators (needed for batch deduplication)
+    MessageCreator &operator=(const MessageCreator &other) {
       if (this != &other) {
-        // IMPORTANT: Caller must ensure cleanup() was called if this contains a string!
-        // In our usage, this happens in add_item() deduplication and vector::erase()
-        data_ = other.data_;
-        other.data_.function_ptr = nullptr;
+        // Clean up current string data if needed
+        if (has_tagged_string_ptr_()) {
+          delete get_string_ptr_();
+        }
+        // Copy new data
+        if (other.has_tagged_string_ptr_()) {
+          auto *str = new std::string(*other.get_string_ptr_());
+          data_.tagged = reinterpret_cast<uintptr_t>(str) | 1;
+        } else {
+          data_ = other.data_;
+        }
       }
       return *this;
     }
 
-    // Call operator - uses message_type to determine union type
+    MessageCreator &operator=(MessageCreator &&other) noexcept {
+      if (this != &other) {
+        // Clean up current string data if needed
+        if (has_tagged_string_ptr_()) {
+          delete get_string_ptr_();
+        }
+        // Move data
+        data_ = other.data_;
+        // Reset other to safe state
+        other.data_.ptr = nullptr;
+      }
+      return *this;
+    }
+
+    // Call operator - now accepts message_type as parameter
     uint16_t operator()(EntityBase *entity, APIConnection *conn, uint32_t remaining_size, bool is_single,
                         uint16_t message_type) const;
 
-    // Manual cleanup method - must be called before destruction for string types
-    void cleanup(uint16_t message_type) {
-#ifdef USE_EVENT
-      if (message_type == EventResponse::MESSAGE_TYPE && data_.string_ptr != nullptr) {
-        delete data_.string_ptr;
-        data_.string_ptr = nullptr;
-      }
-#endif
+   private:
+    // Check if this contains a string pointer
+    bool has_tagged_string_ptr_() const { return (data_.tagged & 1) != 0; }
+
+    // Get the actual string pointer (clears the tag bit)
+    std::string *get_string_ptr_() const {
+      // NOLINTNEXTLINE(performance-no-int-to-ptr)
+      return reinterpret_cast<std::string *>(data_.tagged & ~uintptr_t(1));
     }
 
-   private:
-    union Data {
-      MessageCreatorPtr function_ptr;
-      std::string *string_ptr;
-    } data_;  // 4 bytes on 32-bit, 8 bytes on 64-bit - same as before
+    union {
+      MessageCreatorPtr ptr;
+      uintptr_t tagged;
+    } data_;  // 4 bytes on 32-bit
   };
 
   // Generic batching mechanism for both state updates and entity info
@@ -515,46 +558,20 @@ class APIConnection : public APIServerConnection {
     std::vector<BatchItem> items;
     uint32_t batch_start_time{0};
 
-   private:
-    // Helper to cleanup items from the beginning
-    void cleanup_items_(size_t count) {
-      for (size_t i = 0; i < count; i++) {
-        items[i].creator.cleanup(items[i].message_type);
-      }
-    }
-
-   public:
     DeferredBatch() {
       // Pre-allocate capacity for typical batch sizes to avoid reallocation
       items.reserve(8);
     }
 
-    ~DeferredBatch() {
-      // Ensure cleanup of any remaining items
-      clear();
-    }
-
     // Add item to the batch
     void add_item(EntityBase *entity, MessageCreator creator, uint16_t message_type);
     // Add item to the front of the batch (for high priority messages like ping)
     void add_item_front(EntityBase *entity, MessageCreator creator, uint16_t message_type);
-
-    // Clear all items with proper cleanup
     void clear() {
-      cleanup_items_(items.size());
       items.clear();
       batch_start_time = 0;
     }
-
-    // Remove processed items from the front with proper cleanup
-    void remove_front(size_t count) {
-      cleanup_items_(count);
-      items.erase(items.begin(), items.begin() + count);
-    }
-
     bool empty() const { return items.empty(); }
-    size_t size() const { return items.size(); }
-    const BatchItem &operator[](size_t index) const { return items[index]; }
   };
 
   // DeferredBatch here (16 bytes, 4-byte aligned)

esphome/components/api/api_pb2.cpp

@@ -3,7 +3,6 @@
 #include "api_pb2.h"
 #include "api_pb2_size.h"
 #include "esphome/core/log.h"
-#include "esphome/core/helpers.h"
 
 #include <cinttypes>
 
@@ -3511,7 +3510,7 @@ void SubscribeLogsResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  message: ");
-  out.append(format_hex_pretty(this->message));
+  out.append("'").append(this->message).append("'");
   out.append("\n");
 
   out.append("  send_failed: ");
@@ -3539,7 +3538,7 @@ void NoiseEncryptionSetKeyRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("NoiseEncryptionSetKeyRequest {\n");
   out.append("  key: ");
-  out.append(format_hex_pretty(this->key));
+  out.append("'").append(this->key).append("'");
   out.append("\n");
   out.append("}");
 }
@@ -4285,7 +4284,7 @@ void CameraImageResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  data: ");
-  out.append(format_hex_pretty(this->data));
+  out.append("'").append(this->data).append("'");
   out.append("\n");
 
   out.append("  done: ");
@@ -6812,7 +6811,7 @@ void BluetoothServiceData::dump_to(std::string &out) const {
   }
 
   out.append("  data: ");
-  out.append(format_hex_pretty(this->data));
+  out.append("'").append(this->data).append("'");
   out.append("\n");
   out.append("}");
 }
@@ -6895,7 +6894,7 @@ void BluetoothLEAdvertisementResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  name: ");
-  out.append(format_hex_pretty(this->name));
+  out.append("'").append(this->name).append("'");
   out.append("\n");
 
   out.append("  rssi: ");
@@ -6988,7 +6987,7 @@ void BluetoothLERawAdvertisement::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  data: ");
-  out.append(format_hex_pretty(this->data));
+  out.append("'").append(this->data).append("'");
   out.append("\n");
   out.append("}");
 }
@@ -7515,7 +7514,7 @@ void BluetoothGATTReadResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  data: ");
-  out.append(format_hex_pretty(this->data));
+  out.append("'").append(this->data).append("'");
   out.append("\n");
   out.append("}");
 }
@@ -7579,7 +7578,7 @@ void BluetoothGATTWriteRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  data: ");
-  out.append(format_hex_pretty(this->data));
+  out.append("'").append(this->data).append("'");
   out.append("\n");
   out.append("}");
 }
@@ -7671,7 +7670,7 @@ void BluetoothGATTWriteDescriptorRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  data: ");
-  out.append(format_hex_pretty(this->data));
+  out.append("'").append(this->data).append("'");
   out.append("\n");
   out.append("}");
 }
@@ -7773,7 +7772,7 @@ void BluetoothGATTNotifyDataResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  data: ");
-  out.append(format_hex_pretty(this->data));
+  out.append("'").append(this->data).append("'");
   out.append("\n");
   out.append("}");
 }
@@ -8493,7 +8492,7 @@ void VoiceAssistantAudio::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("VoiceAssistantAudio {\n");
   out.append("  data: ");
-  out.append(format_hex_pretty(this->data));
+  out.append("'").append(this->data).append("'");
   out.append("\n");
 
   out.append("  end: ");

esphome/components/api/api_pb2_size.h

@@ -316,13 +316,15 @@ class ProtoSize {
   /**
    * @brief Calculates and adds the size of a nested message field to the total message size
    *
-   * This version takes a ProtoMessage object, calculates its size internally,
+   * This templated version directly takes a message object, calculates its size internally,
    * and updates the total_size reference. This eliminates the need for a temporary variable
    * at the call site.
    *
+   * @tparam MessageType The type of the nested message (inferred from parameter)
    * @param message The nested message object
    */
-  static inline void add_message_object(uint32_t &total_size, uint32_t field_id_size, const ProtoMessage &message,
+  template<typename MessageType>
+  static inline void add_message_object(uint32_t &total_size, uint32_t field_id_size, const MessageType &message,
                                         bool force = false) {
     uint32_t nested_size = 0;
     message.calculate_size(nested_size);

esphome/components/api/api_server.cpp

@@ -184,9 +184,7 @@ void APIServer::loop() {
     }
 
     // Rare case: handle disconnection
-#ifdef USE_API_CLIENT_DISCONNECTED_TRIGGER
     this->client_disconnected_trigger_->trigger(client->client_info_, client->client_peername_);
-#endif
     ESP_LOGV(TAG, "Remove connection %s", client->client_info_.c_str());
 
     // Swap with the last element and pop (avoids expensive vector shifts)
@@ -433,7 +431,7 @@ void APIServer::set_port(uint16_t port) { this->port_ = port; }
 
 void APIServer::set_password(const std::string &password) { this->password_ = password; }
 
-void APIServer::set_batch_delay(uint16_t batch_delay) { this->batch_delay_ = batch_delay; }
+void APIServer::set_batch_delay(uint32_t batch_delay) { this->batch_delay_ = batch_delay; }
 
 void APIServer::send_homeassistant_service_call(const HomeassistantServiceResponse &call) {
   for (auto &client : this->clients_) {

esphome/components/api/api_server.h

@@ -40,8 +40,8 @@ class APIServer : public Component, public Controller {
   void set_port(uint16_t port);
   void set_password(const std::string &password);
   void set_reboot_timeout(uint32_t reboot_timeout);
-  void set_batch_delay(uint16_t batch_delay);
-  uint16_t get_batch_delay() const { return batch_delay_; }
+  void set_batch_delay(uint32_t batch_delay);
+  uint32_t get_batch_delay() const { return batch_delay_; }
 
   // Get reference to shared buffer for API connections
   std::vector<uint8_t> &get_shared_buffer_ref() { return shared_write_buffer_; }
@@ -105,18 +105,7 @@ class APIServer : public Component, public Controller {
   void on_media_player_update(media_player::MediaPlayer *obj) override;
 #endif
   void send_homeassistant_service_call(const HomeassistantServiceResponse &call);
-  void register_user_service(UserServiceDescriptor *descriptor) {
-#ifdef USE_API_YAML_SERVICES
-    // Vector is pre-allocated when services are defined in YAML
-    this->user_services_.push_back(descriptor);
-#else
-    // Lazy allocate vector on first use for CustomAPIDevice
-    if (!this->user_services_) {
-      this->user_services_ = std::make_unique<std::vector<UserServiceDescriptor *>>();
-    }
-    this->user_services_->push_back(descriptor);
-#endif
-  }
+  void register_user_service(UserServiceDescriptor *descriptor) { this->user_services_.push_back(descriptor); }
 #ifdef USE_HOMEASSISTANT_TIME
   void request_time();
 #endif
@@ -145,58 +134,35 @@ class APIServer : public Component, public Controller {
   void get_home_assistant_state(std::string entity_id, optional<std::string> attribute,
                                 std::function<void(std::string)> f);
   const std::vector<HomeAssistantStateSubscription> &get_state_subs() const;
-  const std::vector<UserServiceDescriptor *> &get_user_services() const {
-#ifdef USE_API_YAML_SERVICES
-    return this->user_services_;
-#else
-    static const std::vector<UserServiceDescriptor *> EMPTY;
-    return this->user_services_ ? *this->user_services_ : EMPTY;
-#endif
-  }
+  const std::vector<UserServiceDescriptor *> &get_user_services() const { return this->user_services_; }
 
-#ifdef USE_API_CLIENT_CONNECTED_TRIGGER
   Trigger<std::string, std::string> *get_client_connected_trigger() const { return this->client_connected_trigger_; }
-#endif
-#ifdef USE_API_CLIENT_DISCONNECTED_TRIGGER
   Trigger<std::string, std::string> *get_client_disconnected_trigger() const {
     return this->client_disconnected_trigger_;
   }
-#endif
 
  protected:
   void schedule_reboot_timeout_();
   // Pointers and pointer-like types first (4 bytes each)
   std::unique_ptr<socket::Socket> socket_ = nullptr;
-#ifdef USE_API_CLIENT_CONNECTED_TRIGGER
   Trigger<std::string, std::string> *client_connected_trigger_ = new Trigger<std::string, std::string>();
-#endif
-#ifdef USE_API_CLIENT_DISCONNECTED_TRIGGER
   Trigger<std::string, std::string> *client_disconnected_trigger_ = new Trigger<std::string, std::string>();
-#endif
 
   // 4-byte aligned types
   uint32_t reboot_timeout_{300000};
+  uint32_t batch_delay_{100};
 
   // Vectors and strings (12 bytes each on 32-bit)
   std::vector<std::unique_ptr<APIConnection>> clients_;
   std::string password_;
   std::vector<uint8_t> shared_write_buffer_;  // Shared proto write buffer for all connections
   std::vector<HomeAssistantStateSubscription> state_subs_;
-#ifdef USE_API_YAML_SERVICES
-  // When services are defined in YAML, we know at compile time that services will be registered
   std::vector<UserServiceDescriptor *> user_services_;
-#else
-  // Services can still be registered at runtime by CustomAPIDevice components even when not
-  // defined in YAML. Using unique_ptr allows lazy allocation, saving 12 bytes in the common
-  // case where no services (YAML or custom) are used.
-  std::unique_ptr<std::vector<UserServiceDescriptor *>> user_services_;
-#endif
 
   // Group smaller types together
   uint16_t port_{6053};
-  uint16_t batch_delay_{100};
   bool shutting_down_ = false;
-  // 5 bytes used, 3 bytes padding
+  // 3 bytes used, 1 byte padding
 
 #ifdef USE_API_NOISE
   std::shared_ptr<APINoiseContext> noise_ctx_ = std::make_shared<APINoiseContext>();

esphome/components/api/client.py

@@ -35,8 +35,8 @@ async def async_run_logs(config: dict[str, Any], address: str) -> None:
     port: int = int(conf[CONF_PORT])
     password: str = conf[CONF_PASSWORD]
     noise_psk: str | None = None
-    if (encryption := conf.get(CONF_ENCRYPTION)) and (key := encryption.get(CONF_KEY)):
-        noise_psk = key
+    if CONF_ENCRYPTION in conf:
+        noise_psk = conf[CONF_ENCRYPTION][CONF_KEY]
     _LOGGER.info("Starting log output from %s using esphome API", address)
     cli = APIClient(
         address,

esphome/components/api/list_entities.cpp

@@ -9,85 +9,155 @@
 namespace esphome {
 namespace api {
 
-// Generate entity handler implementations using macros
 #ifdef USE_BINARY_SENSOR
-LIST_ENTITIES_HANDLER(binary_sensor, binary_sensor::BinarySensor, ListEntitiesBinarySensorResponse)
+bool ListEntitiesIterator::on_binary_sensor(binary_sensor::BinarySensor *binary_sensor) {
+  return this->client_->schedule_message_(binary_sensor, &APIConnection::try_send_binary_sensor_info,
+                                          ListEntitiesBinarySensorResponse::MESSAGE_TYPE);
+}
 #endif
 #ifdef USE_COVER
-LIST_ENTITIES_HANDLER(cover, cover::Cover, ListEntitiesCoverResponse)
+bool ListEntitiesIterator::on_cover(cover::Cover *cover) {
+  return this->client_->schedule_message_(cover, &APIConnection::try_send_cover_info,
+                                          ListEntitiesCoverResponse::MESSAGE_TYPE);
+}
 #endif
 #ifdef USE_FAN
-LIST_ENTITIES_HANDLER(fan, fan::Fan, ListEntitiesFanResponse)
+bool ListEntitiesIterator::on_fan(fan::Fan *fan) {
+  return this->client_->schedule_message_(fan, &APIConnection::try_send_fan_info,
+                                          ListEntitiesFanResponse::MESSAGE_TYPE);
+}
 #endif
 #ifdef USE_LIGHT
-LIST_ENTITIES_HANDLER(light, light::LightState, ListEntitiesLightResponse)
+bool ListEntitiesIterator::on_light(light::LightState *light) {
+  return this->client_->schedule_message_(light, &APIConnection::try_send_light_info,
+                                          ListEntitiesLightResponse::MESSAGE_TYPE);
+}
 #endif
 #ifdef USE_SENSOR
-LIST_ENTITIES_HANDLER(sensor, sensor::Sensor, ListEntitiesSensorResponse)
+bool ListEntitiesIterator::on_sensor(sensor::Sensor *sensor) {
+  return this->client_->schedule_message_(sensor, &APIConnection::try_send_sensor_info,
+                                          ListEntitiesSensorResponse::MESSAGE_TYPE);
+}
 #endif
 #ifdef USE_SWITCH
-LIST_ENTITIES_HANDLER(switch, switch_::Switch, ListEntitiesSwitchResponse)
+bool ListEntitiesIterator::on_switch(switch_::Switch *a_switch) {
+  return this->client_->schedule_message_(a_switch, &APIConnection::try_send_switch_info,
+                                          ListEntitiesSwitchResponse::MESSAGE_TYPE);
+}
 #endif
 #ifdef USE_BUTTON
-LIST_ENTITIES_HANDLER(button, button::Button, ListEntitiesButtonResponse)
+bool ListEntitiesIterator::on_button(button::Button *button) {
+  return this->client_->schedule_message_(button, &APIConnection::try_send_button_info,
+                                          ListEntitiesButtonResponse::MESSAGE_TYPE);
+}
 #endif
 #ifdef USE_TEXT_SENSOR
-LIST_ENTITIES_HANDLER(text_sensor, text_sensor::TextSensor, ListEntitiesTextSensorResponse)
+bool ListEntitiesIterator::on_text_sensor(text_sensor::TextSensor *text_sensor) {
+  return this->client_->schedule_message_(text_sensor, &APIConnection::try_send_text_sensor_info,
+                                          ListEntitiesTextSensorResponse::MESSAGE_TYPE);
+}
 #endif
 #ifdef USE_LOCK
-LIST_ENTITIES_HANDLER(lock, lock::Lock, ListEntitiesLockResponse)
+bool ListEntitiesIterator::on_lock(lock::Lock *a_lock) {
+  return this->client_->schedule_message_(a_lock, &APIConnection::try_send_lock_info,
+                                          ListEntitiesLockResponse::MESSAGE_TYPE);
+}
 #endif
 #ifdef USE_VALVE
-LIST_ENTITIES_HANDLER(valve, valve::Valve, ListEntitiesValveResponse)
-#endif
-#ifdef USE_ESP32_CAMERA
-LIST_ENTITIES_HANDLER(camera, esp32_camera::ESP32Camera, ListEntitiesCameraResponse)
-#endif
-#ifdef USE_CLIMATE
-LIST_ENTITIES_HANDLER(climate, climate::Climate, ListEntitiesClimateResponse)
-#endif
-#ifdef USE_NUMBER
-LIST_ENTITIES_HANDLER(number, number::Number, ListEntitiesNumberResponse)
-#endif
-#ifdef USE_DATETIME_DATE
-LIST_ENTITIES_HANDLER(date, datetime::DateEntity, ListEntitiesDateResponse)
-#endif
-#ifdef USE_DATETIME_TIME
-LIST_ENTITIES_HANDLER(time, datetime::TimeEntity, ListEntitiesTimeResponse)
-#endif
-#ifdef USE_DATETIME_DATETIME
-LIST_ENTITIES_HANDLER(datetime, datetime::DateTimeEntity, ListEntitiesDateTimeResponse)
-#endif
-#ifdef USE_TEXT
-LIST_ENTITIES_HANDLER(text, text::Text, ListEntitiesTextResponse)
-#endif
-#ifdef USE_SELECT
-LIST_ENTITIES_HANDLER(select, select::Select, ListEntitiesSelectResponse)
-#endif
-#ifdef USE_MEDIA_PLAYER
-LIST_ENTITIES_HANDLER(media_player, media_player::MediaPlayer, ListEntitiesMediaPlayerResponse)
-#endif
-#ifdef USE_ALARM_CONTROL_PANEL
-LIST_ENTITIES_HANDLER(alarm_control_panel, alarm_control_panel::AlarmControlPanel,
-                      ListEntitiesAlarmControlPanelResponse)
-#endif
-#ifdef USE_EVENT
-LIST_ENTITIES_HANDLER(event, event::Event, ListEntitiesEventResponse)
-#endif
-#ifdef USE_UPDATE
-LIST_ENTITIES_HANDLER(update, update::UpdateEntity, ListEntitiesUpdateResponse)
+bool ListEntitiesIterator::on_valve(valve::Valve *valve) {
+  return this->client_->schedule_message_(valve, &APIConnection::try_send_valve_info,
+                                          ListEntitiesValveResponse::MESSAGE_TYPE);
+}
 #endif
 
-// Special cases that don't follow the pattern
 bool ListEntitiesIterator::on_end() { return this->client_->send_list_info_done(); }
-
 ListEntitiesIterator::ListEntitiesIterator(APIConnection *client) : client_(client) {}
-
 bool ListEntitiesIterator::on_service(UserServiceDescriptor *service) {
   auto resp = service->encode_list_service_response();
   return this->client_->send_message(resp);
 }
 
+#ifdef USE_ESP32_CAMERA
+bool ListEntitiesIterator::on_camera(esp32_camera::ESP32Camera *camera) {
+  return this->client_->schedule_message_(camera, &APIConnection::try_send_camera_info,
+                                          ListEntitiesCameraResponse::MESSAGE_TYPE);
+}
+#endif
+
+#ifdef USE_CLIMATE
+bool ListEntitiesIterator::on_climate(climate::Climate *climate) {
+  return this->client_->schedule_message_(climate, &APIConnection::try_send_climate_info,
+                                          ListEntitiesClimateResponse::MESSAGE_TYPE);
+}
+#endif
+
+#ifdef USE_NUMBER
+bool ListEntitiesIterator::on_number(number::Number *number) {
+  return this->client_->schedule_message_(number, &APIConnection::try_send_number_info,
+                                          ListEntitiesNumberResponse::MESSAGE_TYPE);
+}
+#endif
+
+#ifdef USE_DATETIME_DATE
+bool ListEntitiesIterator::on_date(datetime::DateEntity *date) {
+  return this->client_->schedule_message_(date, &APIConnection::try_send_date_info,
+                                          ListEntitiesDateResponse::MESSAGE_TYPE);
+}
+#endif
+
+#ifdef USE_DATETIME_TIME
+bool ListEntitiesIterator::on_time(datetime::TimeEntity *time) {
+  return this->client_->schedule_message_(time, &APIConnection::try_send_time_info,
+                                          ListEntitiesTimeResponse::MESSAGE_TYPE);
+}
+#endif
+
+#ifdef USE_DATETIME_DATETIME
+bool ListEntitiesIterator::on_datetime(datetime::DateTimeEntity *datetime) {
+  return this->client_->schedule_message_(datetime, &APIConnection::try_send_datetime_info,
+                                          ListEntitiesDateTimeResponse::MESSAGE_TYPE);
+}
+#endif
+
+#ifdef USE_TEXT
+bool ListEntitiesIterator::on_text(text::Text *text) {
+  return this->client_->schedule_message_(text, &APIConnection::try_send_text_info,
+                                          ListEntitiesTextResponse::MESSAGE_TYPE);
+}
+#endif
+
+#ifdef USE_SELECT
+bool ListEntitiesIterator::on_select(select::Select *select) {
+  return this->client_->schedule_message_(select, &APIConnection::try_send_select_info,
+                                          ListEntitiesSelectResponse::MESSAGE_TYPE);
+}
+#endif
+
+#ifdef USE_MEDIA_PLAYER
+bool ListEntitiesIterator::on_media_player(media_player::MediaPlayer *media_player) {
+  return this->client_->schedule_message_(media_player, &APIConnection::try_send_media_player_info,
+                                          ListEntitiesMediaPlayerResponse::MESSAGE_TYPE);
+}
+#endif
+#ifdef USE_ALARM_CONTROL_PANEL
+bool ListEntitiesIterator::on_alarm_control_panel(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel) {
+  return this->client_->schedule_message_(a_alarm_control_panel, &APIConnection::try_send_alarm_control_panel_info,
+                                          ListEntitiesAlarmControlPanelResponse::MESSAGE_TYPE);
+}
+#endif
+#ifdef USE_EVENT
+bool ListEntitiesIterator::on_event(event::Event *event) {
+  return this->client_->schedule_message_(event, &APIConnection::try_send_event_info,
+                                          ListEntitiesEventResponse::MESSAGE_TYPE);
+}
+#endif
+#ifdef USE_UPDATE
+bool ListEntitiesIterator::on_update(update::UpdateEntity *update) {
+  return this->client_->schedule_message_(update, &APIConnection::try_send_update_info,
+                                          ListEntitiesUpdateResponse::MESSAGE_TYPE);
+}
+#endif
+
 }  // namespace api
 }  // namespace esphome
 #endif

esphome/components/api/list_entities.h

@@ -9,83 +9,75 @@ namespace api {
 
 class APIConnection;
 
-// Macro for generating ListEntitiesIterator handlers
-// Calls schedule_message_ with try_send_*_info
-#define LIST_ENTITIES_HANDLER(entity_type, EntityClass, ResponseType) \
-  bool ListEntitiesIterator::on_##entity_type(EntityClass *entity) { /* NOLINT(bugprone-macro-parentheses) */ \
-    return this->client_->schedule_message_(entity, &APIConnection::try_send_##entity_type##_info, \
-                                            ResponseType::MESSAGE_TYPE); \
-  }
-
 class ListEntitiesIterator : public ComponentIterator {
  public:
   ListEntitiesIterator(APIConnection *client);
 #ifdef USE_BINARY_SENSOR
-  bool on_binary_sensor(binary_sensor::BinarySensor *entity) override;
+  bool on_binary_sensor(binary_sensor::BinarySensor *binary_sensor) override;
 #endif
 #ifdef USE_COVER
-  bool on_cover(cover::Cover *entity) override;
+  bool on_cover(cover::Cover *cover) override;
 #endif
 #ifdef USE_FAN
-  bool on_fan(fan::Fan *entity) override;
+  bool on_fan(fan::Fan *fan) override;
 #endif
 #ifdef USE_LIGHT
-  bool on_light(light::LightState *entity) override;
+  bool on_light(light::LightState *light) override;
 #endif
 #ifdef USE_SENSOR
-  bool on_sensor(sensor::Sensor *entity) override;
+  bool on_sensor(sensor::Sensor *sensor) override;
 #endif
 #ifdef USE_SWITCH
-  bool on_switch(switch_::Switch *entity) override;
+  bool on_switch(switch_::Switch *a_switch) override;
 #endif
 #ifdef USE_BUTTON
-  bool on_button(button::Button *entity) override;
+  bool on_button(button::Button *button) override;
 #endif
 #ifdef USE_TEXT_SENSOR
-  bool on_text_sensor(text_sensor::TextSensor *entity) override;
+  bool on_text_sensor(text_sensor::TextSensor *text_sensor) override;
 #endif
   bool on_service(UserServiceDescriptor *service) override;
 #ifdef USE_ESP32_CAMERA
-  bool on_camera(esp32_camera::ESP32Camera *entity) override;
+  bool on_camera(esp32_camera::ESP32Camera *camera) override;
 #endif
 #ifdef USE_CLIMATE
-  bool on_climate(climate::Climate *entity) override;
+  bool on_climate(climate::Climate *climate) override;
 #endif
 #ifdef USE_NUMBER
-  bool on_number(number::Number *entity) override;
+  bool on_number(number::Number *number) override;
 #endif
 #ifdef USE_DATETIME_DATE
-  bool on_date(datetime::DateEntity *entity) override;
+  bool on_date(datetime::DateEntity *date) override;
 #endif
 #ifdef USE_DATETIME_TIME
-  bool on_time(datetime::TimeEntity *entity) override;
+  bool on_time(datetime::TimeEntity *time) override;
 #endif
 #ifdef USE_DATETIME_DATETIME
-  bool on_datetime(datetime::DateTimeEntity *entity) override;
+  bool on_datetime(datetime::DateTimeEntity *datetime) override;
 #endif
 #ifdef USE_TEXT
-  bool on_text(text::Text *entity) override;
+  bool on_text(text::Text *text) override;
 #endif
 #ifdef USE_SELECT
-  bool on_select(select::Select *entity) override;
+  bool on_select(select::Select *select) override;
 #endif
 #ifdef USE_LOCK
-  bool on_lock(lock::Lock *entity) override;
+  bool on_lock(lock::Lock *a_lock) override;
 #endif
 #ifdef USE_VALVE
-  bool on_valve(valve::Valve *entity) override;
+  bool on_valve(valve::Valve *valve) override;
 #endif
 #ifdef USE_MEDIA_PLAYER
-  bool on_media_player(media_player::MediaPlayer *entity) override;
+  bool on_media_player(media_player::MediaPlayer *media_player) override;
 #endif
 #ifdef USE_ALARM_CONTROL_PANEL
-  bool on_alarm_control_panel(alarm_control_panel::AlarmControlPanel *entity) override;
+  bool on_alarm_control_panel(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel) override;
 #endif
 #ifdef USE_EVENT
-  bool on_event(event::Event *entity) override;
+  bool on_event(event::Event *event) override;
 #endif
 #ifdef USE_UPDATE
-  bool on_update(update::UpdateEntity *entity) override;
+  bool on_update(update::UpdateEntity *update) override;
 #endif
   bool on_end() override;
   bool completed() { return this->state_ == IteratorState::NONE; }

esphome/components/api/proto.h

@@ -364,7 +364,7 @@ class ProtoService {
    */
   virtual ProtoWriteBuffer create_buffer(uint32_t reserve_size) = 0;
   virtual bool send_buffer(ProtoWriteBuffer buffer, uint16_t message_type) = 0;
-  virtual void read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) = 0;
+  virtual bool read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) = 0;
 
   // Optimized method that pre-allocates buffer based on message size
   bool send_message_(const ProtoMessage &msg, uint16_t message_type) {

esphome/components/api/subscribe_state.cpp

@@ -6,67 +6,73 @@
 namespace esphome {
 namespace api {
 
-// Generate entity handler implementations using macros
 #ifdef USE_BINARY_SENSOR
-INITIAL_STATE_HANDLER(binary_sensor, binary_sensor::BinarySensor)
+bool InitialStateIterator::on_binary_sensor(binary_sensor::BinarySensor *binary_sensor) {
+  return this->client_->send_binary_sensor_state(binary_sensor);
+}
 #endif
 #ifdef USE_COVER
-INITIAL_STATE_HANDLER(cover, cover::Cover)
+bool InitialStateIterator::on_cover(cover::Cover *cover) { return this->client_->send_cover_state(cover); }
 #endif
 #ifdef USE_FAN
-INITIAL_STATE_HANDLER(fan, fan::Fan)
+bool InitialStateIterator::on_fan(fan::Fan *fan) { return this->client_->send_fan_state(fan); }
 #endif
 #ifdef USE_LIGHT
-INITIAL_STATE_HANDLER(light, light::LightState)
+bool InitialStateIterator::on_light(light::LightState *light) { return this->client_->send_light_state(light); }
 #endif
 #ifdef USE_SENSOR
-INITIAL_STATE_HANDLER(sensor, sensor::Sensor)
+bool InitialStateIterator::on_sensor(sensor::Sensor *sensor) { return this->client_->send_sensor_state(sensor); }
 #endif
 #ifdef USE_SWITCH
-INITIAL_STATE_HANDLER(switch, switch_::Switch)
+bool InitialStateIterator::on_switch(switch_::Switch *a_switch) { return this->client_->send_switch_state(a_switch); }
 #endif
 #ifdef USE_TEXT_SENSOR
-INITIAL_STATE_HANDLER(text_sensor, text_sensor::TextSensor)
+bool InitialStateIterator::on_text_sensor(text_sensor::TextSensor *text_sensor) {
+  return this->client_->send_text_sensor_state(text_sensor);
+}
 #endif
 #ifdef USE_CLIMATE
-INITIAL_STATE_HANDLER(climate, climate::Climate)
+bool InitialStateIterator::on_climate(climate::Climate *climate) { return this->client_->send_climate_state(climate); }
 #endif
 #ifdef USE_NUMBER
-INITIAL_STATE_HANDLER(number, number::Number)
+bool InitialStateIterator::on_number(number::Number *number) { return this->client_->send_number_state(number); }
 #endif
 #ifdef USE_DATETIME_DATE
-INITIAL_STATE_HANDLER(date, datetime::DateEntity)
+bool InitialStateIterator::on_date(datetime::DateEntity *date) { return this->client_->send_date_state(date); }
 #endif
 #ifdef USE_DATETIME_TIME
-INITIAL_STATE_HANDLER(time, datetime::TimeEntity)
+bool InitialStateIterator::on_time(datetime::TimeEntity *time) { return this->client_->send_time_state(time); }
 #endif
 #ifdef USE_DATETIME_DATETIME
-INITIAL_STATE_HANDLER(datetime, datetime::DateTimeEntity)
+bool InitialStateIterator::on_datetime(datetime::DateTimeEntity *datetime) {
+  return this->client_->send_datetime_state(datetime);
+}
 #endif
 #ifdef USE_TEXT
-INITIAL_STATE_HANDLER(text, text::Text)
+bool InitialStateIterator::on_text(text::Text *text) { return this->client_->send_text_state(text); }
 #endif
 #ifdef USE_SELECT
-INITIAL_STATE_HANDLER(select, select::Select)
+bool InitialStateIterator::on_select(select::Select *select) { return this->client_->send_select_state(select); }
 #endif
 #ifdef USE_LOCK
-INITIAL_STATE_HANDLER(lock, lock::Lock)
+bool InitialStateIterator::on_lock(lock::Lock *a_lock) { return this->client_->send_lock_state(a_lock); }
 #endif
 #ifdef USE_VALVE
-INITIAL_STATE_HANDLER(valve, valve::Valve)
+bool InitialStateIterator::on_valve(valve::Valve *valve) { return this->client_->send_valve_state(valve); }
 #endif
 #ifdef USE_MEDIA_PLAYER
-INITIAL_STATE_HANDLER(media_player, media_player::MediaPlayer)
+bool InitialStateIterator::on_media_player(media_player::MediaPlayer *media_player) {
+  return this->client_->send_media_player_state(media_player);
+}
 #endif
 #ifdef USE_ALARM_CONTROL_PANEL
-INITIAL_STATE_HANDLER(alarm_control_panel, alarm_control_panel::AlarmControlPanel)
+bool InitialStateIterator::on_alarm_control_panel(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel) {
+  return this->client_->send_alarm_control_panel_state(a_alarm_control_panel);
+}
 #endif
 #ifdef USE_UPDATE
-INITIAL_STATE_HANDLER(update, update::UpdateEntity)
+bool InitialStateIterator::on_update(update::UpdateEntity *update) { return this->client_->send_update_state(update); }
 #endif
-
-// Special cases (button and event) are already defined inline in subscribe_state.h
-
 InitialStateIterator::InitialStateIterator(APIConnection *client) : client_(client) {}
 
 }  // namespace api

esphome/components/api/subscribe_state.h

@@ -10,78 +10,71 @@ namespace api {
 
 class APIConnection;
 
-// Macro for generating InitialStateIterator handlers
-// Calls send_*_state
-#define INITIAL_STATE_HANDLER(entity_type, EntityClass) \
-  bool InitialStateIterator::on_##entity_type(EntityClass *entity) { /* NOLINT(bugprone-macro-parentheses) */ \
-    return this->client_->send_##entity_type##_state(entity); \
-  }
-
 class InitialStateIterator : public ComponentIterator {
  public:
   InitialStateIterator(APIConnection *client);
 #ifdef USE_BINARY_SENSOR
-  bool on_binary_sensor(binary_sensor::BinarySensor *entity) override;
+  bool on_binary_sensor(binary_sensor::BinarySensor *binary_sensor) override;
 #endif
 #ifdef USE_COVER
-  bool on_cover(cover::Cover *entity) override;
+  bool on_cover(cover::Cover *cover) override;
 #endif
 #ifdef USE_FAN
-  bool on_fan(fan::Fan *entity) override;
+  bool on_fan(fan::Fan *fan) override;
 #endif
 #ifdef USE_LIGHT
-  bool on_light(light::LightState *entity) override;
+  bool on_light(light::LightState *light) override;
 #endif
 #ifdef USE_SENSOR
-  bool on_sensor(sensor::Sensor *entity) override;
+  bool on_sensor(sensor::Sensor *sensor) override;
 #endif
 #ifdef USE_SWITCH
-  bool on_switch(switch_::Switch *entity) override;
+  bool on_switch(switch_::Switch *a_switch) override;
 #endif
 #ifdef USE_BUTTON
   bool on_button(button::Button *button) override { return true; };
 #endif
 #ifdef USE_TEXT_SENSOR
-  bool on_text_sensor(text_sensor::TextSensor *entity) override;
+  bool on_text_sensor(text_sensor::TextSensor *text_sensor) override;
 #endif
 #ifdef USE_CLIMATE
-  bool on_climate(climate::Climate *entity) override;
+  bool on_climate(climate::Climate *climate) override;
 #endif
 #ifdef USE_NUMBER
-  bool on_number(number::Number *entity) override;
+  bool on_number(number::Number *number) override;
 #endif
 #ifdef USE_DATETIME_DATE
-  bool on_date(datetime::DateEntity *entity) override;
+  bool on_date(datetime::DateEntity *date) override;
 #endif
 #ifdef USE_DATETIME_TIME
-  bool on_time(datetime::TimeEntity *entity) override;
+  bool on_time(datetime::TimeEntity *time) override;
 #endif
 #ifdef USE_DATETIME_DATETIME
-  bool on_datetime(datetime::DateTimeEntity *entity) override;
+  bool on_datetime(datetime::DateTimeEntity *datetime) override;
 #endif
 #ifdef USE_TEXT
-  bool on_text(text::Text *entity) override;
+  bool on_text(text::Text *text) override;
 #endif
 #ifdef USE_SELECT
-  bool on_select(select::Select *entity) override;
+  bool on_select(select::Select *select) override;
 #endif
 #ifdef USE_LOCK
-  bool on_lock(lock::Lock *entity) override;
+  bool on_lock(lock::Lock *a_lock) override;
 #endif
 #ifdef USE_VALVE
-  bool on_valve(valve::Valve *entity) override;
+  bool on_valve(valve::Valve *valve) override;
 #endif
 #ifdef USE_MEDIA_PLAYER
-  bool on_media_player(media_player::MediaPlayer *entity) override;
+  bool on_media_player(media_player::MediaPlayer *media_player) override;
 #endif
 #ifdef USE_ALARM_CONTROL_PANEL
-  bool on_alarm_control_panel(alarm_control_panel::AlarmControlPanel *entity) override;
+  bool on_alarm_control_panel(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel) override;
 #endif
 #ifdef USE_EVENT
   bool on_event(event::Event *event) override { return true; };
 #endif
 #ifdef USE_UPDATE
-  bool on_update(update::UpdateEntity *entity) override;
+  bool on_update(update::UpdateEntity *update) override;
 #endif
   bool completed() { return this->state_ == IteratorState::NONE; }
 

esphome/components/as5600/as5600.h

@@ -50,6 +50,7 @@ class AS5600Component : public Component, public i2c::I2CDevice {
   void setup() override;
   void dump_config() override;
   /// HARDWARE_LATE setup priority
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
   // configuration setters
   void set_dir_pin(InternalGPIOPin *pin) { this->dir_pin_ = pin; }

esphome/components/async_tcp/__init__.py

@@ -5,7 +5,6 @@ from esphome.const import (
     PLATFORM_BK72XX,
     PLATFORM_ESP32,
     PLATFORM_ESP8266,
-    PLATFORM_LN882X,
     PLATFORM_RTL87XX,
 )
 from esphome.core import CORE, coroutine_with_priority
@@ -15,15 +14,7 @@ CODEOWNERS = ["@OttoWinter"]
 CONFIG_SCHEMA = cv.All(
     cv.Schema({}),
     cv.only_with_arduino,
-    cv.only_on(
-        [
-            PLATFORM_ESP32,
-            PLATFORM_ESP8266,
-            PLATFORM_BK72XX,
-            PLATFORM_LN882X,
-            PLATFORM_RTL87XX,
-        ]
-    ),
+    cv.only_on([PLATFORM_ESP32, PLATFORM_ESP8266, PLATFORM_BK72XX, PLATFORM_RTL87XX]),
 )
 
 

esphome/components/atc_mithermometer/atc_mithermometer.h

@@ -25,6 +25,7 @@ class ATCMiThermometer : public Component, public esp32_ble_tracker::ESPBTDevice
 
   bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
   void set_temperature(sensor::Sensor *temperature) { temperature_ = temperature; }
   void set_humidity(sensor::Sensor *humidity) { humidity_ = humidity; }
   void set_battery_level(sensor::Sensor *battery_level) { battery_level_ = battery_level; }

esphome/components/b_parasite/b_parasite.h

@@ -16,6 +16,7 @@ class BParasite : public Component, public esp32_ble_tracker::ESPBTDeviceListene
 
   bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
   void set_battery_voltage(sensor::Sensor *battery_voltage) { battery_voltage_ = battery_voltage; }
   void set_temperature(sensor::Sensor *temperature) { temperature_ = temperature; }

esphome/components/ble_client/output/ble_binary_output.h

@@ -16,6 +16,7 @@ class BLEBinaryOutput : public output::BinaryOutput, public BLEClientNode, publi
  public:
   void dump_config() override;
   void loop() override {}
+  float get_setup_priority() const override { return setup_priority::DATA; }
   void set_service_uuid16(uint16_t uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_uint16(uuid); }
   void set_service_uuid32(uint32_t uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_uint32(uuid); }
   void set_service_uuid128(uint8_t *uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }

esphome/components/ble_client/sensor/ble_rssi_sensor.h

@@ -18,6 +18,7 @@ class BLEClientRSSISensor : public sensor::Sensor, public PollingComponent, publ
   void loop() override;
   void update() override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
   void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) override;
 

esphome/components/ble_client/sensor/ble_sensor.h

@@ -24,6 +24,7 @@ class BLESensor : public sensor::Sensor, public PollingComponent, public BLEClie
   void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                            esp_ble_gattc_cb_param_t *param) override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
   void set_service_uuid16(uint16_t uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_uint16(uuid); }
   void set_service_uuid32(uint32_t uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_uint32(uuid); }
   void set_service_uuid128(uint8_t *uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }

esphome/components/ble_client/switch/ble_switch.h

@@ -19,6 +19,7 @@ class BLEClientSwitch : public switch_::Switch, public Component, public BLEClie
   void loop() override {}
   void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                            esp_ble_gattc_cb_param_t *param) override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
  protected:
   void write_state(bool state) override;

esphome/components/ble_client/text_sensor/ble_text_sensor.h

@@ -20,6 +20,7 @@ class BLETextSensor : public text_sensor::TextSensor, public PollingComponent, p
   void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                            esp_ble_gattc_cb_param_t *param) override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
   void set_service_uuid16(uint16_t uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_uint16(uuid); }
   void set_service_uuid32(uint32_t uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_uint32(uuid); }
   void set_service_uuid128(uint8_t *uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }

esphome/components/ble_presence/ble_presence_device.h

@@ -105,6 +105,7 @@ class BLEPresenceDevice : public binary_sensor::BinarySensorInitiallyOff,
       this->set_found_(false);
   }
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
  protected:
   void set_found_(bool state) {

esphome/components/ble_rssi/ble_rssi_sensor.h

@@ -99,6 +99,7 @@ class BLERSSISensor : public sensor::Sensor, public esp32_ble_tracker::ESPBTDevi
     return false;
   }
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
  protected:
   enum MatchType { MATCH_BY_MAC_ADDRESS, MATCH_BY_IRK, MATCH_BY_SERVICE_UUID, MATCH_BY_IBEACON_UUID };

esphome/components/ble_scanner/ble_scanner.h

@@ -29,6 +29,7 @@ class BLEScanner : public text_sensor::TextSensor, public esp32_ble_tracker::ESP
     return true;
   }
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 };
 
 }  // namespace ble_scanner

esphome/components/bmp581/bmp581.h

@@ -61,6 +61,8 @@ enum IIRFilter {
 
 class BMP581Component : public PollingComponent, public i2c::I2CDevice {
  public:
+  float get_setup_priority() const override { return setup_priority::DATA; }
+
   void dump_config() override;
 
   void setup() override;

esphome/components/cap1188/cap1188.h

@@ -46,6 +46,7 @@ class CAP1188Component : public Component, public i2c::I2CDevice {
   void set_reset_pin(GPIOPin *reset_pin) { this->reset_pin_ = reset_pin; }
   void setup() override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
   void loop() override;
 
  protected:

esphome/components/captive_portal/__init__.py

@@ -7,12 +7,11 @@ from esphome.const import (
     PLATFORM_BK72XX,
     PLATFORM_ESP32,
     PLATFORM_ESP8266,
-    PLATFORM_LN882X,
     PLATFORM_RTL87XX,
 )
 from esphome.core import CORE, coroutine_with_priority
 
-AUTO_LOAD = ["web_server_base", "ota.web_server"]
+AUTO_LOAD = ["web_server_base"]
 DEPENDENCIES = ["wifi"]
 CODEOWNERS = ["@OttoWinter"]
 
@@ -28,15 +27,7 @@ CONFIG_SCHEMA = cv.All(
             ),
         }
     ).extend(cv.COMPONENT_SCHEMA),
-    cv.only_on(
-        [
-            PLATFORM_ESP32,
-            PLATFORM_ESP8266,
-            PLATFORM_BK72XX,
-            PLATFORM_LN882X,
-            PLATFORM_RTL87XX,
-        ]
-    ),
+    cv.only_on([PLATFORM_ESP32, PLATFORM_ESP8266, PLATFORM_BK72XX, PLATFORM_RTL87XX]),
 )
 
 

esphome/components/captive_portal/captive_portal.cpp

@@ -47,6 +47,7 @@ void CaptivePortal::start() {
   this->base_->init();
   if (!this->initialized_) {
     this->base_->add_handler(this);
+    this->base_->add_ota_handler();
   }
 
 #ifdef USE_ARDUINO

esphome/components/ccs811/ccs811.h

@@ -25,6 +25,8 @@ class CCS811Component : public PollingComponent, public i2c::I2CDevice {
 
   void dump_config() override;
 
+  float get_setup_priority() const override { return setup_priority::DATA; }
+
  protected:
   optional<uint8_t> read_status_() { return this->read_byte(0x00); }
   bool status_has_error_() { return this->read_status_().value_or(1) & 1; }

esphome/components/copy/binary_sensor/copy_binary_sensor.h

@@ -11,6 +11,7 @@ class CopyBinarySensor : public binary_sensor::BinarySensor, public Component {
   void set_source(binary_sensor::BinarySensor *source) { source_ = source; }
   void setup() override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
  protected:
   binary_sensor::BinarySensor *source_;

esphome/components/copy/button/copy_button.h

@@ -10,6 +10,7 @@ class CopyButton : public button::Button, public Component {
  public:
   void set_source(button::Button *source) { source_ = source; }
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
  protected:
   void press_action() override;

esphome/components/copy/cover/copy_cover.h

@@ -11,6 +11,7 @@ class CopyCover : public cover::Cover, public Component {
   void set_source(cover::Cover *source) { source_ = source; }
   void setup() override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
   cover::CoverTraits get_traits() override;
 

esphome/components/copy/fan/copy_fan.h

@@ -11,6 +11,7 @@ class CopyFan : public fan::Fan, public Component {
   void set_source(fan::Fan *source) { source_ = source; }
   void setup() override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
   fan::FanTraits get_traits() override;
 

esphome/components/copy/lock/copy_lock.h

@@ -11,6 +11,7 @@ class CopyLock : public lock::Lock, public Component {
   void set_source(lock::Lock *source) { source_ = source; }
   void setup() override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
  protected:
   void control(const lock::LockCall &call) override;

esphome/components/copy/number/copy_number.h

@@ -11,6 +11,7 @@ class CopyNumber : public number::Number, public Component {
   void set_source(number::Number *source) { source_ = source; }
   void setup() override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
  protected:
   void control(float value) override;

esphome/components/copy/select/copy_select.h

@@ -11,6 +11,7 @@ class CopySelect : public select::Select, public Component {
   void set_source(select::Select *source) { source_ = source; }
   void setup() override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
  protected:
   void control(const std::string &value) override;

esphome/components/copy/sensor/copy_sensor.h

@@ -11,6 +11,7 @@ class CopySensor : public sensor::Sensor, public Component {
   void set_source(sensor::Sensor *source) { source_ = source; }
   void setup() override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
  protected:
   sensor::Sensor *source_;

esphome/components/copy/switch/copy_switch.h

@@ -11,6 +11,7 @@ class CopySwitch : public switch_::Switch, public Component {
   void set_source(switch_::Switch *source) { source_ = source; }
   void setup() override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
  protected:
   void write_state(bool state) override;

esphome/components/copy/text/copy_text.h

@@ -11,6 +11,7 @@ class CopyText : public text::Text, public Component {
   void set_source(text::Text *source) { source_ = source; }
   void setup() override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
  protected:
   void control(const std::string &value) override;

esphome/components/copy/text_sensor/copy_text_sensor.h

@@ -11,6 +11,7 @@ class CopyTextSensor : public text_sensor::TextSensor, public Component {
   void set_source(text_sensor::TextSensor *source) { source_ = source; }
   void setup() override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
  protected:
   text_sensor::TextSensor *source_;

esphome/components/cs5460a/cs5460a.h

@@ -77,6 +77,7 @@ class CS5460AComponent : public Component,
 
   void setup() override;
   void loop() override {}
+  float get_setup_priority() const override { return setup_priority::DATA; }
   void dump_config() override;
 
  protected:

esphome/components/duty_time/duty_time_sensor.h

@@ -19,6 +19,7 @@ class DutyTimeSensor : public sensor::Sensor, public PollingComponent {
   void update() override;
   void loop() override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
   void start();
   void stop();

esphome/components/ens160_base/ens160_base.h

@@ -18,6 +18,7 @@ class ENS160Component : public PollingComponent, public sensor::Sensor {
   void setup() override;
   void update() override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
  protected:
   void send_env_data_();

esphome/components/es7210/es7210.h

@@ -25,6 +25,7 @@ class ES7210 : public audio_adc::AudioAdc, public Component, public i2c::I2CDevi
    */
  public:
   void setup() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
   void dump_config() override;
 
   void set_bits_per_sample(ES7210BitsPerSample bits_per_sample) { this->bits_per_sample_ = bits_per_sample; }

esphome/components/es7243e/es7243e.h

@@ -14,6 +14,7 @@ class ES7243E : public audio_adc::AudioAdc, public Component, public i2c::I2CDev
    */
  public:
   void setup() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
   void dump_config() override;
 
   bool set_mic_gain(float mic_gain) override;

esphome/components/es8156/es8156.h

@@ -14,6 +14,7 @@ class ES8156 : public audio_dac::AudioDac, public Component, public i2c::I2CDevi
   /////////////////////////
 
   void setup() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
   void dump_config() override;
 
   ////////////////////////

esphome/components/es8311/es8311.h

@@ -50,6 +50,7 @@ class ES8311 : public audio_dac::AudioDac, public Component, public i2c::I2CDevi
   /////////////////////////
 
   void setup() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
   void dump_config() override;
 
   ////////////////////////

esphome/components/es8388/es8388.h

@@ -38,6 +38,7 @@ class ES8388 : public audio_dac::AudioDac, public Component, public i2c::I2CDevi
   /////////////////////////
 
   void setup() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
   void dump_config() override;
 
   ////////////////////////

esphome/components/esp32/__init__.py

@@ -411,8 +411,8 @@ def _esp_idf_check_versions(value):
         version = cv.Version.parse(cv.version_number(value[CONF_VERSION]))
         source = value.get(CONF_SOURCE, None)
 
-    if version < cv.Version(5, 0, 0):
-        raise cv.Invalid("Only ESP-IDF 5.0+ is supported.")
+    if version < cv.Version(4, 0, 0):
+        raise cv.Invalid("Only ESP-IDF 4.0+ is supported.")
 
     # flag this for later *before* we set value[CONF_PLATFORM_VERSION] below
     has_platform_ver = CONF_PLATFORM_VERSION in value
@@ -422,15 +422,20 @@ def _esp_idf_check_versions(value):
     )
 
     if (
-        is_platformio := _platform_is_platformio(value[CONF_PLATFORM_VERSION])
-    ) and version not in SUPPORTED_PLATFORMIO_ESP_IDF_5X:
+        (is_platformio := _platform_is_platformio(value[CONF_PLATFORM_VERSION]))
+        and version.major >= 5
+        and version not in SUPPORTED_PLATFORMIO_ESP_IDF_5X
+    ):
         raise cv.Invalid(
             f"ESP-IDF {str(version)} not supported by platformio/espressif32"
         )
 
     if (
-        version in SUPPORTED_PLATFORMIO_ESP_IDF_5X
-        and version not in SUPPORTED_PIOARDUINO_ESP_IDF_5X
+        version.major < 5
+        or (
+            version in SUPPORTED_PLATFORMIO_ESP_IDF_5X
+            and version not in SUPPORTED_PIOARDUINO_ESP_IDF_5X
+        )
     ) and not has_platform_ver:
         raise cv.Invalid(
             f"ESP-IDF {value[CONF_VERSION]} may be supported by platformio/espressif32; please specify '{CONF_PLATFORM_VERSION}'"
@@ -796,9 +801,14 @@ async def to_code(config):
 
         if advanced.get(CONF_IGNORE_EFUSE_MAC_CRC):
             add_idf_sdkconfig_option("CONFIG_ESP_MAC_IGNORE_MAC_CRC_ERROR", True)
-            add_idf_sdkconfig_option(
-                "CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE", False
-            )
+            if (framework_ver.major, framework_ver.minor) >= (4, 4):
+                add_idf_sdkconfig_option(
+                    "CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE", False
+                )
+            else:
+                add_idf_sdkconfig_option(
+                    "CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE", False
+                )
         if advanced.get(CONF_ENABLE_IDF_EXPERIMENTAL_FEATURES):
             _LOGGER.warning(
                 "Using experimental features in ESP-IDF may result in unexpected failures."

esphome/components/esp32/core.cpp

@@ -56,7 +56,11 @@ void arch_init() {
 void IRAM_ATTR HOT arch_feed_wdt() { esp_task_wdt_reset(); }
 
 uint8_t progmem_read_byte(const uint8_t *addr) { return *addr; }
+#if ESP_IDF_VERSION_MAJOR >= 5
 uint32_t arch_get_cpu_cycle_count() { return esp_cpu_get_cycle_count(); }
+#else
+uint32_t arch_get_cpu_cycle_count() { return cpu_hal_get_cycle_count(); }
+#endif
 uint32_t arch_get_cpu_freq_hz() {
   uint32_t freq = 0;
 #ifdef USE_ESP_IDF

esphome/components/esp32_ble_tracker/__init__.py

@@ -29,6 +29,8 @@ from esphome.const import (
     CONF_ON_BLE_SERVICE_DATA_ADVERTISE,
     CONF_SERVICE_UUID,
     CONF_TRIGGER_ID,
+    KEY_CORE,
+    KEY_FRAMEWORK_VERSION,
 )
 from esphome.core import CORE
 
@@ -321,7 +323,10 @@ async def to_code(config):
         # https://github.com/espressif/esp-idf/issues/2503
         # Match arduino CONFIG_BTU_TASK_STACK_SIZE
         # https://github.com/espressif/arduino-esp32/blob/fd72cf46ad6fc1a6de99c1d83ba8eba17d80a4ee/tools/sdk/esp32/sdkconfig#L1866
-        add_idf_sdkconfig_option("CONFIG_BT_BTU_TASK_STACK_SIZE", 8192)
+        if CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] >= cv.Version(4, 4, 6):
+            add_idf_sdkconfig_option("CONFIG_BT_BTU_TASK_STACK_SIZE", 8192)
+        else:
+            add_idf_sdkconfig_option("CONFIG_BTU_TASK_STACK_SIZE", 8192)
         add_idf_sdkconfig_option("CONFIG_BT_ACL_CONNECTIONS", 9)
         add_idf_sdkconfig_option(
             "CONFIG_BTDM_CTRL_BLE_MAX_CONN", config[CONF_MAX_CONNECTIONS]
@@ -330,7 +335,8 @@ async def to_code(config):
         # max notifications in 5.x, setting CONFIG_BT_ACL_CONNECTIONS
         # is enough in 4.x
         # https://github.com/esphome/issues/issues/6808
-        add_idf_sdkconfig_option("CONFIG_BT_GATTC_NOTIF_REG_MAX", 9)
+        if CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] >= cv.Version(5, 0, 0):
+            add_idf_sdkconfig_option("CONFIG_BT_GATTC_NOTIF_REG_MAX", 9)
 
     cg.add_define("USE_OTA_STATE_CALLBACK")  # To be notified when an OTA update starts
     cg.add_define("USE_ESP32_BLE_CLIENT")

esphome/components/esp32_rmt_led_strip/led_strip.cpp

@@ -21,43 +21,6 @@ static const uint32_t RMT_CLK_FREQ = 80000000;
 static const uint8_t RMT_CLK_DIV = 2;
 #endif
 
-static const size_t RMT_SYMBOLS_PER_BYTE = 8;
-
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
-static size_t IRAM_ATTR HOT encoder_callback(const void *data, size_t size, size_t symbols_written, size_t symbols_free,
-                                             rmt_symbol_word_t *symbols, bool *done, void *arg) {
-  auto *params = static_cast<LedParams *>(arg);
-  const auto *bytes = static_cast<const uint8_t *>(data);
-  size_t index = symbols_written / RMT_SYMBOLS_PER_BYTE;
-
-  // convert byte to symbols
-  if (index < size) {
-    if (symbols_free < RMT_SYMBOLS_PER_BYTE) {
-      return 0;
-    }
-    for (int32_t i = 0; i < RMT_SYMBOLS_PER_BYTE; i++) {
-      if (bytes[index] & (1 << (7 - i))) {
-        symbols[i] = params->bit1;
-      } else {
-        symbols[i] = params->bit0;
-      }
-    }
-    if ((index + 1) >= size && params->reset.duration0 == 0 && params->reset.duration1 == 0) {
-      *done = true;
-    }
-    return RMT_SYMBOLS_PER_BYTE;
-  }
-
-  // send reset
-  if (symbols_free < 1) {
-    return 0;
-  }
-  symbols[0] = params->reset;
-  *done = true;
-  return 1;
-}
-#endif
-
 void ESP32RMTLEDStripLightOutput::setup() {
   ESP_LOGCONFIG(TAG, "Running setup");
 
@@ -79,15 +42,10 @@ void ESP32RMTLEDStripLightOutput::setup() {
     return;
   }
 
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
-  // copy of the led buffer
-  this->rmt_buf_ = allocator.allocate(buffer_size);
-#else
   RAMAllocator<rmt_symbol_word_t> rmt_allocator(this->use_psram_ ? 0 : RAMAllocator<rmt_symbol_word_t>::ALLOC_INTERNAL);
 
   // 8 bits per byte, 1 rmt_symbol_word_t per bit + 1 rmt_symbol_word_t for reset
   this->rmt_buf_ = rmt_allocator.allocate(buffer_size * 8 + 1);
-#endif
 
   rmt_tx_channel_config_t channel;
   memset(&channel, 0, sizeof(channel));
@@ -107,18 +65,6 @@ void ESP32RMTLEDStripLightOutput::setup() {
     return;
   }
 
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
-  rmt_simple_encoder_config_t encoder;
-  memset(&encoder, 0, sizeof(encoder));
-  encoder.callback = encoder_callback;
-  encoder.arg = &this->params_;
-  encoder.min_chunk_size = 8;
-  if (rmt_new_simple_encoder(&encoder, &this->encoder_) != ESP_OK) {
-    ESP_LOGE(TAG, "Encoder creation failed");
-    this->mark_failed();
-    return;
-  }
-#else
   rmt_copy_encoder_config_t encoder;
   memset(&encoder, 0, sizeof(encoder));
   if (rmt_new_copy_encoder(&encoder, &this->encoder_) != ESP_OK) {
@@ -126,7 +72,6 @@ void ESP32RMTLEDStripLightOutput::setup() {
     this->mark_failed();
     return;
   }
-#endif
 
   if (rmt_enable(this->channel_) != ESP_OK) {
     ESP_LOGE(TAG, "Enabling channel failed");
@@ -140,20 +85,20 @@ void ESP32RMTLEDStripLightOutput::set_led_params(uint32_t bit0_high, uint32_t bi
   float ratio = (float) RMT_CLK_FREQ / RMT_CLK_DIV / 1e09f;
 
   // 0-bit
-  this->params_.bit0.duration0 = (uint32_t) (ratio * bit0_high);
-  this->params_.bit0.level0 = 1;
-  this->params_.bit0.duration1 = (uint32_t) (ratio * bit0_low);
-  this->params_.bit0.level1 = 0;
+  this->bit0_.duration0 = (uint32_t) (ratio * bit0_high);
+  this->bit0_.level0 = 1;
+  this->bit0_.duration1 = (uint32_t) (ratio * bit0_low);
+  this->bit0_.level1 = 0;
   // 1-bit
-  this->params_.bit1.duration0 = (uint32_t) (ratio * bit1_high);
-  this->params_.bit1.level0 = 1;
-  this->params_.bit1.duration1 = (uint32_t) (ratio * bit1_low);
-  this->params_.bit1.level1 = 0;
+  this->bit1_.duration0 = (uint32_t) (ratio * bit1_high);
+  this->bit1_.level0 = 1;
+  this->bit1_.duration1 = (uint32_t) (ratio * bit1_low);
+  this->bit1_.level1 = 0;
   // reset
-  this->params_.reset.duration0 = (uint32_t) (ratio * reset_time_high);
-  this->params_.reset.level0 = 1;
-  this->params_.reset.duration1 = (uint32_t) (ratio * reset_time_low);
-  this->params_.reset.level1 = 0;
+  this->reset_.duration0 = (uint32_t) (ratio * reset_time_high);
+  this->reset_.level0 = 1;
+  this->reset_.duration1 = (uint32_t) (ratio * reset_time_low);
+  this->reset_.level1 = 0;
 }
 
 void ESP32RMTLEDStripLightOutput::write_state(light::LightState *state) {
@@ -177,9 +122,6 @@ void ESP32RMTLEDStripLightOutput::write_state(light::LightState *state) {
   }
   delayMicroseconds(50);
 
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
-  memcpy(this->rmt_buf_, this->buf_, this->get_buffer_size_());
-#else
   size_t buffer_size = this->get_buffer_size_();
 
   size_t size = 0;
@@ -189,7 +131,7 @@ void ESP32RMTLEDStripLightOutput::write_state(light::LightState *state) {
   while (size < buffer_size) {
     uint8_t b = *psrc;
     for (int i = 0; i < 8; i++) {
-      pdest->val = b & (1 << (7 - i)) ? this->params_.bit1.val : this->params_.bit0.val;
+      pdest->val = b & (1 << (7 - i)) ? this->bit1_.val : this->bit0_.val;
       pdest++;
       len++;
     }
@@ -197,20 +139,17 @@ void ESP32RMTLEDStripLightOutput::write_state(light::LightState *state) {
     psrc++;
   }
 
-  if (this->params_.reset.duration0 > 0 || this->params_.reset.duration1 > 0) {
-    pdest->val = this->params_.reset.val;
+  if (this->reset_.duration0 > 0 || this->reset_.duration1 > 0) {
+    pdest->val = this->reset_.val;
     pdest++;
     len++;
   }
-#endif
 
   rmt_transmit_config_t config;
   memset(&config, 0, sizeof(config));
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
-  error = rmt_transmit(this->channel_, this->encoder_, this->rmt_buf_, this->get_buffer_size_(), &config);
-#else
+  config.loop_count = 0;
+  config.flags.eot_level = 0;
   error = rmt_transmit(this->channel_, this->encoder_, this->rmt_buf_, len * sizeof(rmt_symbol_word_t), &config);
-#endif
   if (error != ESP_OK) {
     ESP_LOGE(TAG, "RMT TX error");
     this->status_set_warning();

esphome/components/esp32_rmt_led_strip/led_strip.h

@@ -25,12 +25,6 @@ enum RGBOrder : uint8_t {
   ORDER_BRG,
 };
 
-struct LedParams {
-  rmt_symbol_word_t bit0;
-  rmt_symbol_word_t bit1;
-  rmt_symbol_word_t reset;
-};
-
 class ESP32RMTLEDStripLightOutput : public light::AddressableLight {
  public:
   void setup() override;
@@ -78,15 +72,12 @@ class ESP32RMTLEDStripLightOutput : public light::AddressableLight {
 
   uint8_t *buf_{nullptr};
   uint8_t *effect_data_{nullptr};
-  LedParams params_;
   rmt_channel_handle_t channel_{nullptr};
   rmt_encoder_handle_t encoder_{nullptr};
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
-  uint8_t *rmt_buf_{nullptr};
-#else
   rmt_symbol_word_t *rmt_buf_{nullptr};
-#endif
+  rmt_symbol_word_t bit0_, bit1_, reset_;
   uint32_t rmt_symbols_{48};
+
   uint8_t pin_;
   uint16_t num_leds_;
   bool is_rgbw_{false};

esphome/components/esp32_touch/esp32_touch.cpp

@@ -0,0 +1,355 @@
+#ifdef USE_ESP32
+
+#include "esp32_touch.h"
+#include "esphome/core/application.h"
+#include "esphome/core/log.h"
+#include "esphome/core/hal.h"
+
+#include <cinttypes>
+
+namespace esphome {
+namespace esp32_touch {
+
+static const char *const TAG = "esp32_touch";
+
+void ESP32TouchComponent::setup() {
+  ESP_LOGCONFIG(TAG, "Running setup");
+  touch_pad_init();
+// set up and enable/start filtering based on ESP32 variant
+#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
+  if (this->filter_configured_()) {
+    touch_filter_config_t filter_info = {
+        .mode = this->filter_mode_,
+        .debounce_cnt = this->debounce_count_,
+        .noise_thr = this->noise_threshold_,
+        .jitter_step = this->jitter_step_,
+        .smh_lvl = this->smooth_level_,
+    };
+    touch_pad_filter_set_config(&filter_info);
+    touch_pad_filter_enable();
+  }
+
+  if (this->denoise_configured_()) {
+    touch_pad_denoise_t denoise = {
+        .grade = this->grade_,
+        .cap_level = this->cap_level_,
+    };
+    touch_pad_denoise_set_config(&denoise);
+    touch_pad_denoise_enable();
+  }
+
+  if (this->waterproof_configured_()) {
+    touch_pad_waterproof_t waterproof = {
+        .guard_ring_pad = this->waterproof_guard_ring_pad_,
+        .shield_driver = this->waterproof_shield_driver_,
+    };
+    touch_pad_waterproof_set_config(&waterproof);
+    touch_pad_waterproof_enable();
+  }
+#else
+  if (this->iir_filter_enabled_()) {
+    touch_pad_filter_start(this->iir_filter_);
+  }
+#endif
+
+#if ESP_IDF_VERSION_MAJOR >= 5 && defined(USE_ESP32_VARIANT_ESP32)
+  touch_pad_set_measurement_clock_cycles(this->meas_cycle_);
+  touch_pad_set_measurement_interval(this->sleep_cycle_);
+#else
+  touch_pad_set_meas_time(this->sleep_cycle_, this->meas_cycle_);
+#endif
+  touch_pad_set_voltage(this->high_voltage_reference_, this->low_voltage_reference_, this->voltage_attenuation_);
+
+  for (auto *child : this->children_) {
+#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
+    touch_pad_config(child->get_touch_pad());
+#else
+    // Disable interrupt threshold
+    touch_pad_config(child->get_touch_pad(), 0);
+#endif
+  }
+#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
+  touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER);
+  touch_pad_fsm_start();
+#endif
+}
+
+void ESP32TouchComponent::dump_config() {
+  ESP_LOGCONFIG(TAG,
+                "Config for ESP32 Touch Hub:\n"
+                "  Meas cycle: %.2fms\n"
+                "  Sleep cycle: %.2fms",
+                this->meas_cycle_ / (8000000.0f / 1000.0f), this->sleep_cycle_ / (150000.0f / 1000.0f));
+
+  const char *lv_s;
+  switch (this->low_voltage_reference_) {
+    case TOUCH_LVOLT_0V5:
+      lv_s = "0.5V";
+      break;
+    case TOUCH_LVOLT_0V6:
+      lv_s = "0.6V";
+      break;
+    case TOUCH_LVOLT_0V7:
+      lv_s = "0.7V";
+      break;
+    case TOUCH_LVOLT_0V8:
+      lv_s = "0.8V";
+      break;
+    default:
+      lv_s = "UNKNOWN";
+      break;
+  }
+  ESP_LOGCONFIG(TAG, "  Low Voltage Reference: %s", lv_s);
+
+  const char *hv_s;
+  switch (this->high_voltage_reference_) {
+    case TOUCH_HVOLT_2V4:
+      hv_s = "2.4V";
+      break;
+    case TOUCH_HVOLT_2V5:
+      hv_s = "2.5V";
+      break;
+    case TOUCH_HVOLT_2V6:
+      hv_s = "2.6V";
+      break;
+    case TOUCH_HVOLT_2V7:
+      hv_s = "2.7V";
+      break;
+    default:
+      hv_s = "UNKNOWN";
+      break;
+  }
+  ESP_LOGCONFIG(TAG, "  High Voltage Reference: %s", hv_s);
+
+  const char *atten_s;
+  switch (this->voltage_attenuation_) {
+    case TOUCH_HVOLT_ATTEN_1V5:
+      atten_s = "1.5V";
+      break;
+    case TOUCH_HVOLT_ATTEN_1V:
+      atten_s = "1V";
+      break;
+    case TOUCH_HVOLT_ATTEN_0V5:
+      atten_s = "0.5V";
+      break;
+    case TOUCH_HVOLT_ATTEN_0V:
+      atten_s = "0V";
+      break;
+    default:
+      atten_s = "UNKNOWN";
+      break;
+  }
+  ESP_LOGCONFIG(TAG, "  Voltage Attenuation: %s", atten_s);
+
+#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
+  if (this->filter_configured_()) {
+    const char *filter_mode_s;
+    switch (this->filter_mode_) {
+      case TOUCH_PAD_FILTER_IIR_4:
+        filter_mode_s = "IIR_4";
+        break;
+      case TOUCH_PAD_FILTER_IIR_8:
+        filter_mode_s = "IIR_8";
+        break;
+      case TOUCH_PAD_FILTER_IIR_16:
+        filter_mode_s = "IIR_16";
+        break;
+      case TOUCH_PAD_FILTER_IIR_32:
+        filter_mode_s = "IIR_32";
+        break;
+      case TOUCH_PAD_FILTER_IIR_64:
+        filter_mode_s = "IIR_64";
+        break;
+      case TOUCH_PAD_FILTER_IIR_128:
+        filter_mode_s = "IIR_128";
+        break;
+      case TOUCH_PAD_FILTER_IIR_256:
+        filter_mode_s = "IIR_256";
+        break;
+      case TOUCH_PAD_FILTER_JITTER:
+        filter_mode_s = "JITTER";
+        break;
+      default:
+        filter_mode_s = "UNKNOWN";
+        break;
+    }
+    ESP_LOGCONFIG(TAG,
+                  "  Filter mode: %s\n"
+                  "  Debounce count: %" PRIu32 "\n"
+                  "  Noise threshold coefficient: %" PRIu32 "\n"
+                  "  Jitter filter step size: %" PRIu32,
+                  filter_mode_s, this->debounce_count_, this->noise_threshold_, this->jitter_step_);
+    const char *smooth_level_s;
+    switch (this->smooth_level_) {
+      case TOUCH_PAD_SMOOTH_OFF:
+        smooth_level_s = "OFF";
+        break;
+      case TOUCH_PAD_SMOOTH_IIR_2:
+        smooth_level_s = "IIR_2";
+        break;
+      case TOUCH_PAD_SMOOTH_IIR_4:
+        smooth_level_s = "IIR_4";
+        break;
+      case TOUCH_PAD_SMOOTH_IIR_8:
+        smooth_level_s = "IIR_8";
+        break;
+      default:
+        smooth_level_s = "UNKNOWN";
+        break;
+    }
+    ESP_LOGCONFIG(TAG, "  Smooth level: %s", smooth_level_s);
+  }
+
+  if (this->denoise_configured_()) {
+    const char *grade_s;
+    switch (this->grade_) {
+      case TOUCH_PAD_DENOISE_BIT12:
+        grade_s = "BIT12";
+        break;
+      case TOUCH_PAD_DENOISE_BIT10:
+        grade_s = "BIT10";
+        break;
+      case TOUCH_PAD_DENOISE_BIT8:
+        grade_s = "BIT8";
+        break;
+      case TOUCH_PAD_DENOISE_BIT4:
+        grade_s = "BIT4";
+        break;
+      default:
+        grade_s = "UNKNOWN";
+        break;
+    }
+    ESP_LOGCONFIG(TAG, "  Denoise grade: %s", grade_s);
+
+    const char *cap_level_s;
+    switch (this->cap_level_) {
+      case TOUCH_PAD_DENOISE_CAP_L0:
+        cap_level_s = "L0";
+        break;
+      case TOUCH_PAD_DENOISE_CAP_L1:
+        cap_level_s = "L1";
+        break;
+      case TOUCH_PAD_DENOISE_CAP_L2:
+        cap_level_s = "L2";
+        break;
+      case TOUCH_PAD_DENOISE_CAP_L3:
+        cap_level_s = "L3";
+        break;
+      case TOUCH_PAD_DENOISE_CAP_L4:
+        cap_level_s = "L4";
+        break;
+      case TOUCH_PAD_DENOISE_CAP_L5:
+        cap_level_s = "L5";
+        break;
+      case TOUCH_PAD_DENOISE_CAP_L6:
+        cap_level_s = "L6";
+        break;
+      case TOUCH_PAD_DENOISE_CAP_L7:
+        cap_level_s = "L7";
+        break;
+      default:
+        cap_level_s = "UNKNOWN";
+        break;
+    }
+    ESP_LOGCONFIG(TAG, "  Denoise capacitance level: %s", cap_level_s);
+  }
+#else
+  if (this->iir_filter_enabled_()) {
+    ESP_LOGCONFIG(TAG, "    IIR Filter: %" PRIu32 "ms", this->iir_filter_);
+  } else {
+    ESP_LOGCONFIG(TAG, "  IIR Filter DISABLED");
+  }
+#endif
+
+  if (this->setup_mode_) {
+    ESP_LOGCONFIG(TAG, "  Setup Mode ENABLED");
+  }
+
+  for (auto *child : this->children_) {
+    LOG_BINARY_SENSOR("  ", "Touch Pad", child);
+    ESP_LOGCONFIG(TAG, "    Pad: T%" PRIu32, (uint32_t) child->get_touch_pad());
+    ESP_LOGCONFIG(TAG, "    Threshold: %" PRIu32, child->get_threshold());
+  }
+}
+
+uint32_t ESP32TouchComponent::component_touch_pad_read(touch_pad_t tp) {
+#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
+  uint32_t value = 0;
+  if (this->filter_configured_()) {
+    touch_pad_filter_read_smooth(tp, &value);
+  } else {
+    touch_pad_read_raw_data(tp, &value);
+  }
+#else
+  uint16_t value = 0;
+  if (this->iir_filter_enabled_()) {
+    touch_pad_read_filtered(tp, &value);
+  } else {
+    touch_pad_read(tp, &value);
+  }
+#endif
+  return value;
+}
+
+void ESP32TouchComponent::loop() {
+  const uint32_t now = App.get_loop_component_start_time();
+  bool should_print = this->setup_mode_ && now - this->setup_mode_last_log_print_ > 250;
+  for (auto *child : this->children_) {
+    child->value_ = this->component_touch_pad_read(child->get_touch_pad());
+#if !(defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3))
+    child->publish_state(child->value_ < child->get_threshold());
+#else
+    child->publish_state(child->value_ > child->get_threshold());
+#endif
+
+    if (should_print) {
+      ESP_LOGD(TAG, "Touch Pad '%s' (T%" PRIu32 "): %" PRIu32, child->get_name().c_str(),
+               (uint32_t) child->get_touch_pad(), child->value_);
+    }
+
+    App.feed_wdt();
+  }
+
+  if (should_print) {
+    // Avoid spamming logs
+    this->setup_mode_last_log_print_ = now;
+  }
+}
+
+void ESP32TouchComponent::on_shutdown() {
+  bool is_wakeup_source = false;
+
+#if !(defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3))
+  if (this->iir_filter_enabled_()) {
+    touch_pad_filter_stop();
+    touch_pad_filter_delete();
+  }
+#endif
+
+  for (auto *child : this->children_) {
+    if (child->get_wakeup_threshold() != 0) {
+      if (!is_wakeup_source) {
+        is_wakeup_source = true;
+        // Touch sensor FSM mode must be 'TOUCH_FSM_MODE_TIMER' to use it to wake-up.
+        touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER);
+      }
+
+#if !(defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3))
+      // No filter available when using as wake-up source.
+      touch_pad_config(child->get_touch_pad(), child->get_wakeup_threshold());
+#endif
+    }
+  }
+
+  if (!is_wakeup_source) {
+    touch_pad_deinit();
+  }
+}
+
+ESP32TouchBinarySensor::ESP32TouchBinarySensor(touch_pad_t touch_pad, uint32_t threshold, uint32_t wakeup_threshold)
+    : touch_pad_(touch_pad), threshold_(threshold), wakeup_threshold_(wakeup_threshold) {}
+
+}  // namespace esp32_touch
+}  // namespace esphome
+
+#endif

esphome/components/esp32_touch/esp32_touch.h

@@ -9,26 +9,10 @@
 #include <vector>
 
 #include <driver/touch_sensor.h>
-#include <freertos/FreeRTOS.h>
-#include <freertos/queue.h>
 
 namespace esphome {
 namespace esp32_touch {
 
-// IMPORTANT: Touch detection logic differs between ESP32 variants:
-// - ESP32 v1 (original): Touch detected when value < threshold (capacitance increase causes value decrease)
-// - ESP32-S2/S3 v2: Touch detected when value > threshold (capacitance increase causes value increase)
-// This inversion is due to different hardware implementations between chip generations.
-//
-// INTERRUPT BEHAVIOR:
-// - ESP32 v1: Interrupts fire when ANY pad is touched and continue while touched.
-//   Releases are detected by timeout since hardware doesn't generate release interrupts.
-// - ESP32-S2/S3 v2: Hardware supports both touch and release interrupts, but release
-//   interrupts are unreliable and sometimes don't fire. We now only use touch interrupts
-//   and detect releases via timeout, similar to v1.
-
-static const uint32_t SETUP_MODE_LOG_INTERVAL_MS = 250;
-
 class ESP32TouchBinarySensor;
 
 class ESP32TouchComponent : public Component {
@@ -47,14 +31,6 @@ class ESP32TouchComponent : public Component {
   void set_voltage_attenuation(touch_volt_atten_t voltage_attenuation) {
     this->voltage_attenuation_ = voltage_attenuation;
   }
-
-  void setup() override;
-  void dump_config() override;
-  void loop() override;
-  float get_setup_priority() const override { return setup_priority::DATA; }
-
-  void on_shutdown() override;
-
 #if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
   void set_filter_mode(touch_filter_mode_t filter_mode) { this->filter_mode_ = filter_mode; }
   void set_debounce_count(uint32_t debounce_count) { this->debounce_count_ = debounce_count; }
@@ -71,101 +47,17 @@ class ESP32TouchComponent : public Component {
   void set_iir_filter(uint32_t iir_filter) { this->iir_filter_ = iir_filter; }
 #endif
 
- protected:
-  // Common helper methods
-  void dump_config_base_();
-  void dump_config_sensors_();
-  bool create_touch_queue_();
-  void cleanup_touch_queue_();
-  void configure_wakeup_pads_();
+  uint32_t component_touch_pad_read(touch_pad_t tp);
 
-  // Helper methods for loop() logic
-  void process_setup_mode_logging_(uint32_t now);
-  bool should_check_for_releases_(uint32_t now);
-  void publish_initial_state_if_needed_(ESP32TouchBinarySensor *child, uint32_t now);
-  void check_and_disable_loop_if_all_released_(size_t pads_off);
-  void calculate_release_timeout_();
+  void setup() override;
+  void dump_config() override;
+  void loop() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
-  // Common members
-  std::vector<ESP32TouchBinarySensor *> children_;
-  bool setup_mode_{false};
-  uint32_t setup_mode_last_log_print_{0};
-  uint32_t last_release_check_{0};
-  uint32_t release_timeout_ms_{1500};
-  uint32_t release_check_interval_ms_{50};
-  bool initial_state_published_[TOUCH_PAD_MAX] = {false};
-
-  // Common configuration parameters
-  uint16_t sleep_cycle_{4095};
-  uint16_t meas_cycle_{65535};
-  touch_low_volt_t low_voltage_reference_{TOUCH_LVOLT_0V5};
-  touch_high_volt_t high_voltage_reference_{TOUCH_HVOLT_2V7};
-  touch_volt_atten_t voltage_attenuation_{TOUCH_HVOLT_ATTEN_0V};
-
-  // Common constants
-  static constexpr uint32_t MINIMUM_RELEASE_TIME_MS = 100;
-
-  // ==================== PLATFORM SPECIFIC ====================
-
-#ifdef USE_ESP32_VARIANT_ESP32
-  // ESP32 v1 specific
-
-  static void touch_isr_handler(void *arg);
-  QueueHandle_t touch_queue_{nullptr};
-
- private:
-  // Touch event structure for ESP32 v1
-  // Contains touch pad info, value, and touch state for queue communication
-  struct TouchPadEventV1 {
-    touch_pad_t pad;
-    uint32_t value;
-    bool is_touched;
-  };
+  void on_shutdown() override;
 
  protected:
-  // Design note: last_touch_time_ does not require synchronization primitives because:
-  // 1. ESP32 guarantees atomic 32-bit aligned reads/writes
-  // 2. ISR only writes timestamps, main loop only reads
-  // 3. Timing tolerance allows for occasional stale reads (50ms check interval)
-  // 4. Queue operations provide implicit memory barriers
-  // Using atomic/critical sections would add overhead without meaningful benefit
-  uint32_t last_touch_time_[TOUCH_PAD_MAX] = {0};
-  uint32_t iir_filter_{0};
-
-  bool iir_filter_enabled_() const { return this->iir_filter_ > 0; }
-
-#elif defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
-  // ESP32-S2/S3 v2 specific
-  static void touch_isr_handler(void *arg);
-  QueueHandle_t touch_queue_{nullptr};
-
- private:
-  // Touch event structure for ESP32 v2 (S2/S3)
-  // Contains touch pad and interrupt mask for queue communication
-  struct TouchPadEventV2 {
-    touch_pad_t pad;
-    uint32_t intr_mask;
-  };
-
-  // Track last touch time for timeout-based release detection
-  uint32_t last_touch_time_[TOUCH_PAD_MAX] = {0};
-
- protected:
-  // Filter configuration
-  touch_filter_mode_t filter_mode_{TOUCH_PAD_FILTER_MAX};
-  uint32_t debounce_count_{0};
-  uint32_t noise_threshold_{0};
-  uint32_t jitter_step_{0};
-  touch_smooth_mode_t smooth_level_{TOUCH_PAD_SMOOTH_MAX};
-
-  // Denoise configuration
-  touch_pad_denoise_grade_t grade_{TOUCH_PAD_DENOISE_MAX};
-  touch_pad_denoise_cap_t cap_level_{TOUCH_PAD_DENOISE_CAP_MAX};
-
-  // Waterproof configuration
-  touch_pad_t waterproof_guard_ring_pad_{TOUCH_PAD_MAX};
-  touch_pad_shield_driver_t waterproof_shield_driver_{TOUCH_PAD_SHIELD_DRV_MAX};
-
+#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
   bool filter_configured_() const {
     return (this->filter_mode_ != TOUCH_PAD_FILTER_MAX) && (this->smooth_level_ != TOUCH_PAD_SMOOTH_MAX);
   }
@@ -176,78 +68,43 @@ class ESP32TouchComponent : public Component {
     return (this->waterproof_guard_ring_pad_ != TOUCH_PAD_MAX) &&
            (this->waterproof_shield_driver_ != TOUCH_PAD_SHIELD_DRV_MAX);
   }
-
-  // Helper method to read touch values - non-blocking operation
-  // Returns the current touch pad value using either filtered or raw reading
-  // based on the filter configuration
-  uint32_t read_touch_value(touch_pad_t pad) const;
-
-  // Helper to update touch state with a known state
-  void update_touch_state_(ESP32TouchBinarySensor *child, bool is_touched);
-
-  // Helper to read touch value and update state for a given child
-  bool check_and_update_touch_state_(ESP32TouchBinarySensor *child);
+#else
+  bool iir_filter_enabled_() const { return this->iir_filter_ > 0; }
 #endif
 
-  // Helper functions for dump_config - common to both implementations
-  static const char *get_low_voltage_reference_str(touch_low_volt_t ref) {
-    switch (ref) {
-      case TOUCH_LVOLT_0V5:
-        return "0.5V";
-      case TOUCH_LVOLT_0V6:
-        return "0.6V";
-      case TOUCH_LVOLT_0V7:
-        return "0.7V";
-      case TOUCH_LVOLT_0V8:
-        return "0.8V";
-      default:
-        return "UNKNOWN";
-    }
-  }
-
-  static const char *get_high_voltage_reference_str(touch_high_volt_t ref) {
-    switch (ref) {
-      case TOUCH_HVOLT_2V4:
-        return "2.4V";
-      case TOUCH_HVOLT_2V5:
-        return "2.5V";
-      case TOUCH_HVOLT_2V6:
-        return "2.6V";
-      case TOUCH_HVOLT_2V7:
-        return "2.7V";
-      default:
-        return "UNKNOWN";
-    }
-  }
-
-  static const char *get_voltage_attenuation_str(touch_volt_atten_t atten) {
-    switch (atten) {
-      case TOUCH_HVOLT_ATTEN_1V5:
-        return "1.5V";
-      case TOUCH_HVOLT_ATTEN_1V:
-        return "1V";
-      case TOUCH_HVOLT_ATTEN_0V5:
-        return "0.5V";
-      case TOUCH_HVOLT_ATTEN_0V:
-        return "0V";
-      default:
-        return "UNKNOWN";
-    }
-  }
+  std::vector<ESP32TouchBinarySensor *> children_;
+  bool setup_mode_{false};
+  uint32_t setup_mode_last_log_print_{0};
+  // common parameters
+  uint16_t sleep_cycle_{4095};
+  uint16_t meas_cycle_{65535};
+  touch_low_volt_t low_voltage_reference_{TOUCH_LVOLT_0V5};
+  touch_high_volt_t high_voltage_reference_{TOUCH_HVOLT_2V7};
+  touch_volt_atten_t voltage_attenuation_{TOUCH_HVOLT_ATTEN_0V};
+#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
+  touch_filter_mode_t filter_mode_{TOUCH_PAD_FILTER_MAX};
+  uint32_t debounce_count_{0};
+  uint32_t noise_threshold_{0};
+  uint32_t jitter_step_{0};
+  touch_smooth_mode_t smooth_level_{TOUCH_PAD_SMOOTH_MAX};
+  touch_pad_denoise_grade_t grade_{TOUCH_PAD_DENOISE_MAX};
+  touch_pad_denoise_cap_t cap_level_{TOUCH_PAD_DENOISE_CAP_MAX};
+  touch_pad_t waterproof_guard_ring_pad_{TOUCH_PAD_MAX};
+  touch_pad_shield_driver_t waterproof_shield_driver_{TOUCH_PAD_SHIELD_DRV_MAX};
+#else
+  uint32_t iir_filter_{0};
+#endif
 };
 
 /// Simple helper class to expose a touch pad value as a binary sensor.
 class ESP32TouchBinarySensor : public binary_sensor::BinarySensor {
  public:
-  ESP32TouchBinarySensor(touch_pad_t touch_pad, uint32_t threshold, uint32_t wakeup_threshold)
-      : touch_pad_(touch_pad), threshold_(threshold), wakeup_threshold_(wakeup_threshold) {}
+  ESP32TouchBinarySensor(touch_pad_t touch_pad, uint32_t threshold, uint32_t wakeup_threshold);
 
   touch_pad_t get_touch_pad() const { return this->touch_pad_; }
   uint32_t get_threshold() const { return this->threshold_; }
   void set_threshold(uint32_t threshold) { this->threshold_ = threshold; }
-#ifdef USE_ESP32_VARIANT_ESP32
   uint32_t get_value() const { return this->value_; }
-#endif
   uint32_t get_wakeup_threshold() const { return this->wakeup_threshold_; }
 
  protected:
@@ -255,10 +112,7 @@ class ESP32TouchBinarySensor : public binary_sensor::BinarySensor {
 
   touch_pad_t touch_pad_{TOUCH_PAD_MAX};
   uint32_t threshold_{0};
-#ifdef USE_ESP32_VARIANT_ESP32
   uint32_t value_{0};
-#endif
-  bool last_state_{false};
   const uint32_t wakeup_threshold_{0};
 };
 

esphome/components/esp32_touch/esp32_touch_common.cpp

@@ -1,159 +0,0 @@
-#ifdef USE_ESP32
-
-#include "esp32_touch.h"
-#include "esphome/core/log.h"
-#include <cinttypes>
-
-#include "soc/rtc.h"
-
-namespace esphome {
-namespace esp32_touch {
-
-static const char *const TAG = "esp32_touch";
-
-void ESP32TouchComponent::dump_config_base_() {
-  const char *lv_s = get_low_voltage_reference_str(this->low_voltage_reference_);
-  const char *hv_s = get_high_voltage_reference_str(this->high_voltage_reference_);
-  const char *atten_s = get_voltage_attenuation_str(this->voltage_attenuation_);
-
-  ESP_LOGCONFIG(TAG,
-                "Config for ESP32 Touch Hub:\n"
-                "  Meas cycle: %.2fms\n"
-                "  Sleep cycle: %.2fms\n"
-                "  Low Voltage Reference: %s\n"
-                "  High Voltage Reference: %s\n"
-                "  Voltage Attenuation: %s",
-                this->meas_cycle_ / (8000000.0f / 1000.0f), this->sleep_cycle_ / (150000.0f / 1000.0f), lv_s, hv_s,
-                atten_s);
-}
-
-void ESP32TouchComponent::dump_config_sensors_() {
-  for (auto *child : this->children_) {
-    LOG_BINARY_SENSOR("  ", "Touch Pad", child);
-    ESP_LOGCONFIG(TAG, "    Pad: T%" PRIu32, (uint32_t) child->get_touch_pad());
-    ESP_LOGCONFIG(TAG, "    Threshold: %" PRIu32, child->get_threshold());
-  }
-}
-
-bool ESP32TouchComponent::create_touch_queue_() {
-  // Queue size calculation: children * 4 allows for burst scenarios where ISR
-  // fires multiple times before main loop processes.
-  size_t queue_size = this->children_.size() * 4;
-  if (queue_size < 8)
-    queue_size = 8;
-
-#ifdef USE_ESP32_VARIANT_ESP32
-  this->touch_queue_ = xQueueCreate(queue_size, sizeof(TouchPadEventV1));
-#else
-  this->touch_queue_ = xQueueCreate(queue_size, sizeof(TouchPadEventV2));
-#endif
-
-  if (this->touch_queue_ == nullptr) {
-    ESP_LOGE(TAG, "Failed to create touch event queue of size %" PRIu32, (uint32_t) queue_size);
-    this->mark_failed();
-    return false;
-  }
-  return true;
-}
-
-void ESP32TouchComponent::cleanup_touch_queue_() {
-  if (this->touch_queue_) {
-    vQueueDelete(this->touch_queue_);
-    this->touch_queue_ = nullptr;
-  }
-}
-
-void ESP32TouchComponent::configure_wakeup_pads_() {
-  bool is_wakeup_source = false;
-
-  // Check if any pad is configured for wakeup
-  for (auto *child : this->children_) {
-    if (child->get_wakeup_threshold() != 0) {
-      is_wakeup_source = true;
-
-#ifdef USE_ESP32_VARIANT_ESP32
-      // ESP32 v1: No filter available when using as wake-up source.
-      touch_pad_config(child->get_touch_pad(), child->get_wakeup_threshold());
-#else
-      // ESP32-S2/S3 v2: Set threshold for wakeup
-      touch_pad_set_thresh(child->get_touch_pad(), child->get_wakeup_threshold());
-#endif
-    }
-  }
-
-  if (!is_wakeup_source) {
-    // If no pad is configured for wakeup, deinitialize touch pad
-    touch_pad_deinit();
-  }
-}
-
-void ESP32TouchComponent::process_setup_mode_logging_(uint32_t now) {
-  if (this->setup_mode_ && now - this->setup_mode_last_log_print_ > SETUP_MODE_LOG_INTERVAL_MS) {
-    for (auto *child : this->children_) {
-#ifdef USE_ESP32_VARIANT_ESP32
-      ESP_LOGD(TAG, "Touch Pad '%s' (T%" PRIu32 "): %" PRIu32, child->get_name().c_str(),
-               (uint32_t) child->get_touch_pad(), child->value_);
-#else
-      // Read the value being used for touch detection
-      uint32_t value = this->read_touch_value(child->get_touch_pad());
-      ESP_LOGD(TAG, "Touch Pad '%s' (T%d): %d", child->get_name().c_str(), child->get_touch_pad(), value);
-#endif
-    }
-    this->setup_mode_last_log_print_ = now;
-  }
-}
-
-bool ESP32TouchComponent::should_check_for_releases_(uint32_t now) {
-  if (now - this->last_release_check_ < this->release_check_interval_ms_) {
-    return false;
-  }
-  this->last_release_check_ = now;
-  return true;
-}
-
-void ESP32TouchComponent::publish_initial_state_if_needed_(ESP32TouchBinarySensor *child, uint32_t now) {
-  touch_pad_t pad = child->get_touch_pad();
-  if (!this->initial_state_published_[pad]) {
-    // Check if enough time has passed since startup
-    if (now > this->release_timeout_ms_) {
-      child->publish_initial_state(false);
-      this->initial_state_published_[pad] = true;
-      ESP_LOGV(TAG, "Touch Pad '%s' state: OFF (initial)", child->get_name().c_str());
-    }
-  }
-}
-
-void ESP32TouchComponent::check_and_disable_loop_if_all_released_(size_t pads_off) {
-  // Disable the loop to save CPU cycles when all pads are off and not in setup mode.
-  if (pads_off == this->children_.size() && !this->setup_mode_) {
-    this->disable_loop();
-  }
-}
-
-void ESP32TouchComponent::calculate_release_timeout_() {
-  // Calculate release timeout based on sleep cycle
-  // Design note: Hardware limitation - interrupts only fire reliably on touch (not release)
-  // We must use timeout-based detection for release events
-  // Formula: 3 sleep cycles converted to ms, with MINIMUM_RELEASE_TIME_MS minimum
-  // Per ESP-IDF docs: t_sleep = sleep_cycle / SOC_CLK_RC_SLOW_FREQ_APPROX
-
-  uint32_t rtc_freq = rtc_clk_slow_freq_get_hz();
-
-  // Calculate timeout as 3 sleep cycles
-  this->release_timeout_ms_ = (this->sleep_cycle_ * 1000 * 3) / rtc_freq;
-
-  if (this->release_timeout_ms_ < MINIMUM_RELEASE_TIME_MS) {
-    this->release_timeout_ms_ = MINIMUM_RELEASE_TIME_MS;
-  }
-
-  // Check for releases at 1/4 the timeout interval
-  // Since hardware doesn't generate reliable release interrupts, we must poll
-  // for releases in the main loop. Checking at 1/4 the timeout interval provides
-  // a good balance between responsiveness and efficiency.
-  this->release_check_interval_ms_ = this->release_timeout_ms_ / 4;
-}
-
-}  // namespace esp32_touch
-}  // namespace esphome
-
-#endif  // USE_ESP32

esphome/components/esp32_touch/esp32_touch_v1.cpp

@@ -1,240 +0,0 @@
-#ifdef USE_ESP32_VARIANT_ESP32
-
-#include "esp32_touch.h"
-#include "esphome/core/application.h"
-#include "esphome/core/log.h"
-#include "esphome/core/hal.h"
-
-#include <algorithm>
-#include <cinttypes>
-
-// Include HAL for ISR-safe touch reading
-#include "hal/touch_sensor_ll.h"
-
-namespace esphome {
-namespace esp32_touch {
-
-static const char *const TAG = "esp32_touch";
-
-void ESP32TouchComponent::setup() {
-  // Create queue for touch events
-  // Queue size calculation: children * 4 allows for burst scenarios where ISR
-  // fires multiple times before main loop processes. This is important because
-  // ESP32 v1 scans all pads on each interrupt, potentially sending multiple events.
-  if (!this->create_touch_queue_()) {
-    return;
-  }
-
-  touch_pad_init();
-  touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER);
-
-  // Set up IIR filter if enabled
-  if (this->iir_filter_enabled_()) {
-    touch_pad_filter_start(this->iir_filter_);
-  }
-
-  // Configure measurement parameters
-#if ESP_IDF_VERSION_MAJOR >= 5
-  touch_pad_set_measurement_clock_cycles(this->meas_cycle_);
-  touch_pad_set_measurement_interval(this->sleep_cycle_);
-#else
-  touch_pad_set_meas_time(this->sleep_cycle_, this->meas_cycle_);
-#endif
-  touch_pad_set_voltage(this->high_voltage_reference_, this->low_voltage_reference_, this->voltage_attenuation_);
-
-  // Configure each touch pad
-  for (auto *child : this->children_) {
-    touch_pad_config(child->get_touch_pad(), child->get_threshold());
-  }
-
-  // Register ISR handler
-  esp_err_t err = touch_pad_isr_register(touch_isr_handler, this);
-  if (err != ESP_OK) {
-    ESP_LOGE(TAG, "Failed to register touch ISR: %s", esp_err_to_name(err));
-    this->cleanup_touch_queue_();
-    this->mark_failed();
-    return;
-  }
-
-  // Calculate release timeout based on sleep cycle
-  this->calculate_release_timeout_();
-
-  // Enable touch pad interrupt
-  touch_pad_intr_enable();
-}
-
-void ESP32TouchComponent::dump_config() {
-  this->dump_config_base_();
-
-  if (this->iir_filter_enabled_()) {
-    ESP_LOGCONFIG(TAG, "    IIR Filter: %" PRIu32 "ms", this->iir_filter_);
-  } else {
-    ESP_LOGCONFIG(TAG, "  IIR Filter DISABLED");
-  }
-
-  if (this->setup_mode_) {
-    ESP_LOGCONFIG(TAG, "  Setup Mode ENABLED");
-  }
-
-  this->dump_config_sensors_();
-}
-
-void ESP32TouchComponent::loop() {
-  const uint32_t now = App.get_loop_component_start_time();
-
-  // Print debug info for all pads in setup mode
-  this->process_setup_mode_logging_(now);
-
-  // Process any queued touch events from interrupts
-  // Note: Events are only sent by ISR for pads that were measured in that cycle (value != 0)
-  // This is more efficient than sending all pad states every interrupt
-  TouchPadEventV1 event;
-  while (xQueueReceive(this->touch_queue_, &event, 0) == pdTRUE) {
-    // Find the corresponding sensor - O(n) search is acceptable since events are infrequent
-    for (auto *child : this->children_) {
-      if (child->get_touch_pad() != event.pad) {
-        continue;
-      }
-
-      // Found matching pad - process it
-      child->value_ = event.value;
-
-      // The interrupt gives us the touch state directly
-      bool new_state = event.is_touched;
-
-      // Track when we last saw this pad as touched
-      if (new_state) {
-        this->last_touch_time_[event.pad] = now;
-      }
-
-      // Only publish if state changed - this filters out repeated events
-      if (new_state != child->last_state_) {
-        child->last_state_ = new_state;
-        child->publish_state(new_state);
-        // Original ESP32: ISR only fires when touched, release is detected by timeout
-        // Note: ESP32 v1 uses inverted logic - touched when value < threshold
-        ESP_LOGV(TAG, "Touch Pad '%s' state: ON (value: %" PRIu32 " < threshold: %" PRIu32 ")",
-                 child->get_name().c_str(), event.value, child->get_threshold());
-      }
-      break;  // Exit inner loop after processing matching pad
-    }
-  }
-
-  // Check for released pads periodically
-  if (!this->should_check_for_releases_(now)) {
-    return;
-  }
-
-  size_t pads_off = 0;
-  for (auto *child : this->children_) {
-    touch_pad_t pad = child->get_touch_pad();
-
-    // Handle initial state publication after startup
-    this->publish_initial_state_if_needed_(child, now);
-
-    if (child->last_state_) {
-      // Pad is currently in touched state - check for release timeout
-      // Using subtraction handles 32-bit rollover correctly
-      uint32_t time_diff = now - this->last_touch_time_[pad];
-
-      // Check if we haven't seen this pad recently
-      if (time_diff > this->release_timeout_ms_) {
-        // Haven't seen this pad recently, assume it's released
-        child->last_state_ = false;
-        child->publish_state(false);
-        ESP_LOGV(TAG, "Touch Pad '%s' state: OFF (timeout)", child->get_name().c_str());
-        pads_off++;
-      }
-    } else {
-      // Pad is already off
-      pads_off++;
-    }
-  }
-
-  // Disable the loop to save CPU cycles when all pads are off and not in setup mode.
-  // The loop will be re-enabled by the ISR when any touch pad is touched.
-  // v1 hardware limitations require us to check all pads are off because:
-  // - v1 only generates interrupts on touch events (not releases)
-  // - We must poll for release timeouts in the main loop
-  // - We can only safely disable when no pads need timeout monitoring
-  this->check_and_disable_loop_if_all_released_(pads_off);
-}
-
-void ESP32TouchComponent::on_shutdown() {
-  touch_pad_intr_disable();
-  touch_pad_isr_deregister(touch_isr_handler, this);
-  this->cleanup_touch_queue_();
-
-  if (this->iir_filter_enabled_()) {
-    touch_pad_filter_stop();
-    touch_pad_filter_delete();
-  }
-
-  // Configure wakeup pads if any are set
-  this->configure_wakeup_pads_();
-}
-
-void IRAM_ATTR ESP32TouchComponent::touch_isr_handler(void *arg) {
-  ESP32TouchComponent *component = static_cast<ESP32TouchComponent *>(arg);
-
-  touch_pad_clear_status();
-
-  // INTERRUPT BEHAVIOR: On ESP32 v1 hardware, the interrupt fires when ANY configured
-  // touch pad detects a touch (value goes below threshold). The hardware does NOT
-  // generate interrupts on release - only on touch events.
-  // The interrupt will continue to fire periodically (based on sleep_cycle) as long
-  // as any pad remains touched. This allows us to detect both new touches and
-  // continued touches, but releases must be detected by timeout in the main loop.
-
-  // Process all configured pads to check their current state
-  // Note: ESP32 v1 doesn't tell us which specific pad triggered the interrupt,
-  // so we must scan all configured pads to find which ones were touched
-  for (auto *child : component->children_) {
-    touch_pad_t pad = child->get_touch_pad();
-
-    // Read current value using ISR-safe API
-    uint32_t value;
-    if (component->iir_filter_enabled_()) {
-      uint16_t temp_value = 0;
-      touch_pad_read_filtered(pad, &temp_value);
-      value = temp_value;
-    } else {
-      // Use low-level HAL function when filter is not enabled
-      value = touch_ll_read_raw_data(pad);
-    }
-
-    // Skip pads with 0 value - they haven't been measured in this cycle
-    // This is important: not all pads are measured every interrupt cycle,
-    // only those that the hardware has updated
-    if (value == 0) {
-      continue;
-    }
-
-    // IMPORTANT: ESP32 v1 touch detection logic - INVERTED compared to v2!
-    // ESP32 v1: Touch is detected when capacitance INCREASES, causing the measured value to DECREASE
-    // Therefore: touched = (value < threshold)
-    // This is opposite to ESP32-S2/S3 v2 where touched = (value > threshold)
-    bool is_touched = value < child->get_threshold();
-
-    // Always send the current state - the main loop will filter for changes
-    // We send both touched and untouched states because the ISR doesn't
-    // track previous state (to keep ISR fast and simple)
-    TouchPadEventV1 event;
-    event.pad = pad;
-    event.value = value;
-    event.is_touched = is_touched;
-
-    // Send to queue from ISR - non-blocking, drops if queue full
-    BaseType_t x_higher_priority_task_woken = pdFALSE;
-    xQueueSendFromISR(component->touch_queue_, &event, &x_higher_priority_task_woken);
-    component->enable_loop_soon_any_context();
-    if (x_higher_priority_task_woken) {
-      portYIELD_FROM_ISR();
-    }
-  }
-}
-
-}  // namespace esp32_touch
-}  // namespace esphome
-
-#endif  // USE_ESP32_VARIANT_ESP32

esphome/components/esp32_touch/esp32_touch_v2.cpp

@@ -1,398 +0,0 @@
-#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
-
-#include "esp32_touch.h"
-#include "esphome/core/application.h"
-#include "esphome/core/log.h"
-#include "esphome/core/hal.h"
-
-namespace esphome {
-namespace esp32_touch {
-
-static const char *const TAG = "esp32_touch";
-
-// Helper to update touch state with a known state
-void ESP32TouchComponent::update_touch_state_(ESP32TouchBinarySensor *child, bool is_touched) {
-  // Always update timer when touched
-  if (is_touched) {
-    this->last_touch_time_[child->get_touch_pad()] = App.get_loop_component_start_time();
-  }
-
-  if (child->last_state_ != is_touched) {
-    // Read value for logging
-    uint32_t value = this->read_touch_value(child->get_touch_pad());
-
-    child->last_state_ = is_touched;
-    child->publish_state(is_touched);
-    if (is_touched) {
-      // ESP32-S2/S3 v2: touched when value > threshold
-      ESP_LOGV(TAG, "Touch Pad '%s' state: ON (value: %" PRIu32 " > threshold: %" PRIu32 ")", child->get_name().c_str(),
-               value, child->get_threshold());
-    } else {
-      ESP_LOGV(TAG, "Touch Pad '%s' state: OFF", child->get_name().c_str());
-    }
-  }
-}
-
-// Helper to read touch value and update state for a given child (used for timeout events)
-bool ESP32TouchComponent::check_and_update_touch_state_(ESP32TouchBinarySensor *child) {
-  // Read current touch value
-  uint32_t value = this->read_touch_value(child->get_touch_pad());
-
-  // ESP32-S2/S3 v2: Touch is detected when value > threshold
-  bool is_touched = value > child->get_threshold();
-
-  this->update_touch_state_(child, is_touched);
-  return is_touched;
-}
-
-void ESP32TouchComponent::setup() {
-  // Create queue for touch events first
-  if (!this->create_touch_queue_()) {
-    return;
-  }
-
-  // Initialize touch pad peripheral
-  esp_err_t init_err = touch_pad_init();
-  if (init_err != ESP_OK) {
-    ESP_LOGE(TAG, "Failed to initialize touch pad: %s", esp_err_to_name(init_err));
-    this->mark_failed();
-    return;
-  }
-
-  // Configure each touch pad first
-  for (auto *child : this->children_) {
-    esp_err_t config_err = touch_pad_config(child->get_touch_pad());
-    if (config_err != ESP_OK) {
-      ESP_LOGE(TAG, "Failed to configure touch pad %d: %s", child->get_touch_pad(), esp_err_to_name(config_err));
-    }
-  }
-
-  // Set up filtering if configured
-  if (this->filter_configured_()) {
-    touch_filter_config_t filter_info = {
-        .mode = this->filter_mode_,
-        .debounce_cnt = this->debounce_count_,
-        .noise_thr = this->noise_threshold_,
-        .jitter_step = this->jitter_step_,
-        .smh_lvl = this->smooth_level_,
-    };
-    touch_pad_filter_set_config(&filter_info);
-    touch_pad_filter_enable();
-  }
-
-  if (this->denoise_configured_()) {
-    touch_pad_denoise_t denoise = {
-        .grade = this->grade_,
-        .cap_level = this->cap_level_,
-    };
-    touch_pad_denoise_set_config(&denoise);
-    touch_pad_denoise_enable();
-  }
-
-  if (this->waterproof_configured_()) {
-    touch_pad_waterproof_t waterproof = {
-        .guard_ring_pad = this->waterproof_guard_ring_pad_,
-        .shield_driver = this->waterproof_shield_driver_,
-    };
-    touch_pad_waterproof_set_config(&waterproof);
-    touch_pad_waterproof_enable();
-  }
-
-  // Configure measurement parameters
-  touch_pad_set_voltage(this->high_voltage_reference_, this->low_voltage_reference_, this->voltage_attenuation_);
-  // ESP32-S2/S3 always use the older API
-  touch_pad_set_meas_time(this->sleep_cycle_, this->meas_cycle_);
-
-  // Configure timeout if needed
-  touch_pad_timeout_set(true, TOUCH_PAD_THRESHOLD_MAX);
-
-  // Register ISR handler with interrupt mask
-  esp_err_t err =
-      touch_pad_isr_register(touch_isr_handler, this, static_cast<touch_pad_intr_mask_t>(TOUCH_PAD_INTR_MASK_ALL));
-  if (err != ESP_OK) {
-    ESP_LOGE(TAG, "Failed to register touch ISR: %s", esp_err_to_name(err));
-    this->cleanup_touch_queue_();
-    this->mark_failed();
-    return;
-  }
-
-  // Set thresholds for each pad BEFORE starting FSM
-  for (auto *child : this->children_) {
-    if (child->get_threshold() != 0) {
-      touch_pad_set_thresh(child->get_touch_pad(), child->get_threshold());
-    }
-  }
-
-  // Enable interrupts - only ACTIVE and TIMEOUT
-  // NOTE: We intentionally don't enable INACTIVE interrupts because they are unreliable
-  // on ESP32-S2/S3 hardware and sometimes don't fire. Instead, we use timeout-based
-  // release detection with the ability to verify the actual state.
-  touch_pad_intr_enable(static_cast<touch_pad_intr_mask_t>(TOUCH_PAD_INTR_MASK_ACTIVE | TOUCH_PAD_INTR_MASK_TIMEOUT));
-
-  // Set FSM mode before starting
-  touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER);
-
-  // Start FSM
-  touch_pad_fsm_start();
-
-  // Calculate release timeout based on sleep cycle
-  this->calculate_release_timeout_();
-}
-
-void ESP32TouchComponent::dump_config() {
-  this->dump_config_base_();
-
-  if (this->filter_configured_()) {
-    const char *filter_mode_s;
-    switch (this->filter_mode_) {
-      case TOUCH_PAD_FILTER_IIR_4:
-        filter_mode_s = "IIR_4";
-        break;
-      case TOUCH_PAD_FILTER_IIR_8:
-        filter_mode_s = "IIR_8";
-        break;
-      case TOUCH_PAD_FILTER_IIR_16:
-        filter_mode_s = "IIR_16";
-        break;
-      case TOUCH_PAD_FILTER_IIR_32:
-        filter_mode_s = "IIR_32";
-        break;
-      case TOUCH_PAD_FILTER_IIR_64:
-        filter_mode_s = "IIR_64";
-        break;
-      case TOUCH_PAD_FILTER_IIR_128:
-        filter_mode_s = "IIR_128";
-        break;
-      case TOUCH_PAD_FILTER_IIR_256:
-        filter_mode_s = "IIR_256";
-        break;
-      case TOUCH_PAD_FILTER_JITTER:
-        filter_mode_s = "JITTER";
-        break;
-      default:
-        filter_mode_s = "UNKNOWN";
-        break;
-    }
-    ESP_LOGCONFIG(TAG,
-                  "  Filter mode: %s\n"
-                  "  Debounce count: %" PRIu32 "\n"
-                  "  Noise threshold coefficient: %" PRIu32 "\n"
-                  "  Jitter filter step size: %" PRIu32,
-                  filter_mode_s, this->debounce_count_, this->noise_threshold_, this->jitter_step_);
-    const char *smooth_level_s;
-    switch (this->smooth_level_) {
-      case TOUCH_PAD_SMOOTH_OFF:
-        smooth_level_s = "OFF";
-        break;
-      case TOUCH_PAD_SMOOTH_IIR_2:
-        smooth_level_s = "IIR_2";
-        break;
-      case TOUCH_PAD_SMOOTH_IIR_4:
-        smooth_level_s = "IIR_4";
-        break;
-      case TOUCH_PAD_SMOOTH_IIR_8:
-        smooth_level_s = "IIR_8";
-        break;
-      default:
-        smooth_level_s = "UNKNOWN";
-        break;
-    }
-    ESP_LOGCONFIG(TAG, "  Smooth level: %s", smooth_level_s);
-  }
-
-  if (this->denoise_configured_()) {
-    const char *grade_s;
-    switch (this->grade_) {
-      case TOUCH_PAD_DENOISE_BIT12:
-        grade_s = "BIT12";
-        break;
-      case TOUCH_PAD_DENOISE_BIT10:
-        grade_s = "BIT10";
-        break;
-      case TOUCH_PAD_DENOISE_BIT8:
-        grade_s = "BIT8";
-        break;
-      case TOUCH_PAD_DENOISE_BIT4:
-        grade_s = "BIT4";
-        break;
-      default:
-        grade_s = "UNKNOWN";
-        break;
-    }
-    ESP_LOGCONFIG(TAG, "  Denoise grade: %s", grade_s);
-
-    const char *cap_level_s;
-    switch (this->cap_level_) {
-      case TOUCH_PAD_DENOISE_CAP_L0:
-        cap_level_s = "L0";
-        break;
-      case TOUCH_PAD_DENOISE_CAP_L1:
-        cap_level_s = "L1";
-        break;
-      case TOUCH_PAD_DENOISE_CAP_L2:
-        cap_level_s = "L2";
-        break;
-      case TOUCH_PAD_DENOISE_CAP_L3:
-        cap_level_s = "L3";
-        break;
-      case TOUCH_PAD_DENOISE_CAP_L4:
-        cap_level_s = "L4";
-        break;
-      case TOUCH_PAD_DENOISE_CAP_L5:
-        cap_level_s = "L5";
-        break;
-      case TOUCH_PAD_DENOISE_CAP_L6:
-        cap_level_s = "L6";
-        break;
-      case TOUCH_PAD_DENOISE_CAP_L7:
-        cap_level_s = "L7";
-        break;
-      default:
-        cap_level_s = "UNKNOWN";
-        break;
-    }
-    ESP_LOGCONFIG(TAG, "  Denoise capacitance level: %s", cap_level_s);
-  }
-
-  if (this->setup_mode_) {
-    ESP_LOGCONFIG(TAG, "  Setup Mode ENABLED");
-  }
-
-  this->dump_config_sensors_();
-}
-
-void ESP32TouchComponent::loop() {
-  const uint32_t now = App.get_loop_component_start_time();
-
-  // V2 TOUCH HANDLING:
-  // Due to unreliable INACTIVE interrupts on ESP32-S2/S3, we use a hybrid approach:
-  // 1. Process ACTIVE interrupts when pads are touched
-  // 2. Use timeout-based release detection (like v1)
-  // 3. But smarter than v1: verify actual state before releasing on timeout
-  //    This prevents false releases if we missed interrupts
-
-  // In setup mode, periodically log all pad values
-  this->process_setup_mode_logging_(now);
-
-  // Process any queued touch events from interrupts
-  TouchPadEventV2 event;
-  while (xQueueReceive(this->touch_queue_, &event, 0) == pdTRUE) {
-    // Handle timeout events
-    if (event.intr_mask & TOUCH_PAD_INTR_MASK_TIMEOUT) {
-      // Resume measurement after timeout
-      touch_pad_timeout_resume();
-      // For timeout events, always check the current state
-    } else if (!(event.intr_mask & TOUCH_PAD_INTR_MASK_ACTIVE)) {
-      // Skip if not an active/timeout event
-      continue;
-    }
-
-    // Find the child for the pad that triggered the interrupt
-    for (auto *child : this->children_) {
-      if (child->get_touch_pad() != event.pad) {
-        continue;
-      }
-
-      if (event.intr_mask & TOUCH_PAD_INTR_MASK_TIMEOUT) {
-        // For timeout events, we need to read the value to determine state
-        this->check_and_update_touch_state_(child);
-      } else if (event.intr_mask & TOUCH_PAD_INTR_MASK_ACTIVE) {
-        // We only get ACTIVE interrupts now, releases are detected by timeout
-        this->update_touch_state_(child, true);  // Always touched for ACTIVE interrupts
-      }
-      break;
-    }
-  }
-
-  // Check for released pads periodically (like v1)
-  if (!this->should_check_for_releases_(now)) {
-    return;
-  }
-
-  size_t pads_off = 0;
-  for (auto *child : this->children_) {
-    touch_pad_t pad = child->get_touch_pad();
-
-    // Handle initial state publication after startup
-    this->publish_initial_state_if_needed_(child, now);
-
-    if (child->last_state_) {
-      // Pad is currently in touched state - check for release timeout
-      // Using subtraction handles 32-bit rollover correctly
-      uint32_t time_diff = now - this->last_touch_time_[pad];
-
-      // Check if we haven't seen this pad recently
-      if (time_diff > this->release_timeout_ms_) {
-        // Haven't seen this pad recently - verify actual state
-        // Unlike v1, v2 hardware allows us to read the current state anytime
-        // This makes v2 smarter: we can verify if it's actually released before
-        // declaring a timeout, preventing false releases if interrupts were missed
-        bool still_touched = this->check_and_update_touch_state_(child);
-
-        if (still_touched) {
-          // Still touched! Timer was reset in update_touch_state_
-          ESP_LOGVV(TAG, "Touch Pad '%s' still touched after %" PRIu32 "ms timeout, resetting timer",
-                    child->get_name().c_str(), this->release_timeout_ms_);
-        } else {
-          // Actually released - already handled by check_and_update_touch_state_
-          pads_off++;
-        }
-      }
-    } else {
-      // Pad is already off
-      pads_off++;
-    }
-  }
-
-  // Disable the loop when all pads are off and not in setup mode (like v1)
-  // We need to keep checking for timeouts, so only disable when all pads are confirmed off
-  this->check_and_disable_loop_if_all_released_(pads_off);
-}
-
-void ESP32TouchComponent::on_shutdown() {
-  // Disable interrupts
-  touch_pad_intr_disable(static_cast<touch_pad_intr_mask_t>(TOUCH_PAD_INTR_MASK_ACTIVE | TOUCH_PAD_INTR_MASK_TIMEOUT));
-  touch_pad_isr_deregister(touch_isr_handler, this);
-  this->cleanup_touch_queue_();
-
-  // Configure wakeup pads if any are set
-  this->configure_wakeup_pads_();
-}
-
-void IRAM_ATTR ESP32TouchComponent::touch_isr_handler(void *arg) {
-  ESP32TouchComponent *component = static_cast<ESP32TouchComponent *>(arg);
-  BaseType_t x_higher_priority_task_woken = pdFALSE;
-
-  // Read interrupt status
-  TouchPadEventV2 event;
-  event.intr_mask = touch_pad_read_intr_status_mask();
-  event.pad = touch_pad_get_current_meas_channel();
-
-  // Send event to queue for processing in main loop
-  xQueueSendFromISR(component->touch_queue_, &event, &x_higher_priority_task_woken);
-  component->enable_loop_soon_any_context();
-
-  if (x_higher_priority_task_woken) {
-    portYIELD_FROM_ISR();
-  }
-}
-
-uint32_t ESP32TouchComponent::read_touch_value(touch_pad_t pad) const {
-  // Unlike ESP32 v1, touch reads on ESP32-S2/S3 v2 are non-blocking operations.
-  // The hardware continuously samples in the background and we can read the
-  // latest value at any time without waiting.
-  uint32_t value = 0;
-  if (this->filter_configured_()) {
-    // Read filtered/smoothed value when filter is enabled
-    touch_pad_filter_read_smooth(pad, &value);
-  } else {
-    // Read raw value when filter is not configured
-    touch_pad_read_raw_data(pad, &value);
-  }
-  return value;
-}
-
-}  // namespace esp32_touch
-}  // namespace esphome
-
-#endif  // USE_ESP32_VARIANT_ESP32S2 || USE_ESP32_VARIANT_ESP32S3

esphome/components/esphome/ota/__init__.py

@@ -100,7 +100,6 @@ CONFIG_SCHEMA = (
                 esp32=3232,
                 rp2040=2040,
                 bk72xx=8892,
-                ln882x=8820,
                 rtl87xx=8892,
             ): cv.port,
             cv.Optional(CONF_PASSWORD): cv.string,

esphome/components/ethernet/__init__.py

@@ -23,10 +23,8 @@ from esphome.const import (
     CONF_INTERRUPT_PIN,
     CONF_MANUAL_IP,
     CONF_MISO_PIN,
-    CONF_MODE,
     CONF_MOSI_PIN,
     CONF_PAGE_ID,
-    CONF_PIN,
     CONF_POLLING_INTERVAL,
     CONF_RESET_PIN,
     CONF_SPI,
@@ -51,7 +49,6 @@ PHYRegister = ethernet_ns.struct("PHYRegister")
 CONF_PHY_ADDR = "phy_addr"
 CONF_MDC_PIN = "mdc_pin"
 CONF_MDIO_PIN = "mdio_pin"
-CONF_CLK = "clk"
 CONF_CLK_MODE = "clk_mode"
 CONF_POWER_PIN = "power_pin"
 CONF_PHY_REGISTERS = "phy_registers"
@@ -69,25 +66,32 @@ ETHERNET_TYPES = {
     "KSZ8081RNA": EthernetType.ETHERNET_TYPE_KSZ8081RNA,
     "W5500": EthernetType.ETHERNET_TYPE_W5500,
     "OPENETH": EthernetType.ETHERNET_TYPE_OPENETH,
-    "DM9051": EthernetType.ETHERNET_TYPE_DM9051,
 }
 
-SPI_ETHERNET_TYPES = ["W5500", "DM9051"]
+SPI_ETHERNET_TYPES = ["W5500"]
 SPI_ETHERNET_DEFAULT_POLLING_INTERVAL = TimePeriodMilliseconds(milliseconds=10)
 
 emac_rmii_clock_mode_t = cg.global_ns.enum("emac_rmii_clock_mode_t")
-
+emac_rmii_clock_gpio_t = cg.global_ns.enum("emac_rmii_clock_gpio_t")
 CLK_MODES = {
-    "CLK_EXT_IN": emac_rmii_clock_mode_t.EMAC_CLK_EXT_IN,
-    "CLK_OUT": emac_rmii_clock_mode_t.EMAC_CLK_OUT,
+    "GPIO0_IN": (
+        emac_rmii_clock_mode_t.EMAC_CLK_EXT_IN,
+        emac_rmii_clock_gpio_t.EMAC_CLK_IN_GPIO,
+    ),
+    "GPIO0_OUT": (
+        emac_rmii_clock_mode_t.EMAC_CLK_OUT,
+        emac_rmii_clock_gpio_t.EMAC_APPL_CLK_OUT_GPIO,
+    ),
+    "GPIO16_OUT": (
+        emac_rmii_clock_mode_t.EMAC_CLK_OUT,
+        emac_rmii_clock_gpio_t.EMAC_CLK_OUT_GPIO,
+    ),
+    "GPIO17_OUT": (
+        emac_rmii_clock_mode_t.EMAC_CLK_OUT,
+        emac_rmii_clock_gpio_t.EMAC_CLK_OUT_180_GPIO,
+    ),
 }
 
-CLK_MODES_DEPRECATED = {
-    "GPIO0_IN": ("CLK_EXT_IN", 0),
-    "GPIO0_OUT": ("CLK_OUT", 0),
-    "GPIO16_OUT": ("CLK_OUT", 16),
-    "GPIO17_OUT": ("CLK_OUT", 17),
-}
 
 MANUAL_IP_SCHEMA = cv.Schema(
     {
@@ -149,18 +153,6 @@ def _validate(config):
                     f"({CORE.target_framework} {CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]}), "
                     f"'{CONF_INTERRUPT_PIN}' is a required option for [ethernet]."
                 )
-    elif config[CONF_TYPE] != "OPENETH":
-        if CONF_CLK_MODE in config:
-            LOGGER.warning(
-                "[ethernet] The 'clk_mode' option is deprecated and will be removed in ESPHome 2026.1. "
-                "Please update your configuration to use 'clk' instead."
-            )
-            mode = CLK_MODES_DEPRECATED[config[CONF_CLK_MODE]]
-            config[CONF_CLK] = CLK_SCHEMA({CONF_MODE: mode[0], CONF_PIN: mode[1]})
-            del config[CONF_CLK_MODE]
-        elif CONF_CLK not in config:
-            raise cv.Invalid("'clk' is a required option for [ethernet].")
-
     return config
 
 
@@ -184,21 +176,14 @@ PHY_REGISTER_SCHEMA = cv.Schema(
         cv.Optional(CONF_PAGE_ID): cv.hex_int,
     }
 )
-CLK_SCHEMA = cv.Schema(
-    {
-        cv.Required(CONF_MODE): cv.enum(CLK_MODES, upper=True, space="_"),
-        cv.Required(CONF_PIN): pins.internal_gpio_pin_number,
-    }
-)
 RMII_SCHEMA = BASE_SCHEMA.extend(
     cv.Schema(
         {
             cv.Required(CONF_MDC_PIN): pins.internal_gpio_output_pin_number,
             cv.Required(CONF_MDIO_PIN): pins.internal_gpio_output_pin_number,
-            cv.Optional(CONF_CLK_MODE): cv.enum(
-                CLK_MODES_DEPRECATED, upper=True, space="_"
+            cv.Optional(CONF_CLK_MODE, default="GPIO0_IN"): cv.enum(
+                CLK_MODES, upper=True, space="_"
             ),
-            cv.Optional(CONF_CLK): CLK_SCHEMA,
             cv.Optional(CONF_PHY_ADDR, default=0): cv.int_range(min=0, max=31),
             cv.Optional(CONF_POWER_PIN): pins.internal_gpio_output_pin_number,
             cv.Optional(CONF_PHY_REGISTERS): cv.ensure_list(PHY_REGISTER_SCHEMA),
@@ -239,7 +224,6 @@ CONFIG_SCHEMA = cv.All(
             "KSZ8081RNA": RMII_SCHEMA,
             "W5500": SPI_SCHEMA,
             "OPENETH": BASE_SCHEMA,
-            "DM9051": SPI_SCHEMA,
         },
         upper=True,
     ),
@@ -294,7 +278,7 @@ async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
-    if config[CONF_TYPE] in SPI_ETHERNET_TYPES:
+    if config[CONF_TYPE] == "W5500":
         cg.add(var.set_clk_pin(config[CONF_CLK_PIN]))
         cg.add(var.set_miso_pin(config[CONF_MISO_PIN]))
         cg.add(var.set_mosi_pin(config[CONF_MOSI_PIN]))
@@ -312,9 +296,7 @@ async def to_code(config):
         cg.add_define("USE_ETHERNET_SPI")
         if CORE.using_esp_idf:
             add_idf_sdkconfig_option("CONFIG_ETH_USE_SPI_ETHERNET", True)
-            add_idf_sdkconfig_option(
-                f"CONFIG_ETH_SPI_ETHERNET_{config[CONF_TYPE]}", True
-            )
+            add_idf_sdkconfig_option("CONFIG_ETH_SPI_ETHERNET_W5500", True)
     elif config[CONF_TYPE] == "OPENETH":
         cg.add_define("USE_ETHERNET_OPENETH")
         add_idf_sdkconfig_option("CONFIG_ETH_USE_OPENETH", True)
@@ -322,8 +304,7 @@ async def to_code(config):
         cg.add(var.set_phy_addr(config[CONF_PHY_ADDR]))
         cg.add(var.set_mdc_pin(config[CONF_MDC_PIN]))
         cg.add(var.set_mdio_pin(config[CONF_MDIO_PIN]))
-        cg.add(var.set_clk_mode(config[CONF_CLK][CONF_MODE]))
-        cg.add(var.set_clk_pin(config[CONF_CLK][CONF_PIN]))
+        cg.add(var.set_clk_mode(*CLK_MODES[config[CONF_CLK_MODE]]))
         if CONF_POWER_PIN in config:
             cg.add(var.set_power_pin(config[CONF_POWER_PIN]))
         for register_value in config.get(CONF_PHY_REGISTERS, []):

esphome/components/ethernet/esp_eth_phy_jl1101.c

@@ -19,7 +19,11 @@
 #include <sys/cdefs.h>
 #include "esp_log.h"
 #include "esp_eth.h"
+#if ESP_IDF_VERSION_MAJOR >= 5
 #include "esp_eth_phy_802_3.h"
+#else
+#include "eth_phy_regs_struct.h"
+#endif
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "driver/gpio.h"
@@ -170,7 +174,11 @@ static esp_err_t jl1101_reset_hw(esp_eth_phy_t *phy) {
   return ESP_OK;
 }
 
+#if ESP_IDF_VERSION_MAJOR >= 5
 static esp_err_t jl1101_negotiate(esp_eth_phy_t *phy, eth_phy_autoneg_cmd_t cmd, bool *nego_state) {
+#else
+static esp_err_t jl1101_negotiate(esp_eth_phy_t *phy) {
+#endif
   phy_jl1101_t *jl1101 = __containerof(phy, phy_jl1101_t, parent);
   esp_eth_mediator_t *eth = jl1101->eth;
   /* in case any link status has changed, let's assume we're in link down status */
@@ -285,7 +293,11 @@ static esp_err_t jl1101_init(esp_eth_phy_t *phy) {
   esp_eth_mediator_t *eth = jl1101->eth;
   // Detect PHY address
   if (jl1101->addr == ESP_ETH_PHY_ADDR_AUTO) {
+#if ESP_IDF_VERSION_MAJOR >= 5
     PHY_CHECK(esp_eth_phy_802_3_detect_phy_addr(eth, &jl1101->addr) == ESP_OK, "Detect PHY address failed", err);
+#else
+    PHY_CHECK(esp_eth_detect_phy_addr(eth, &jl1101->addr) == ESP_OK, "Detect PHY address failed", err);
+#endif
   }
   /* Power on Ethernet PHY */
   PHY_CHECK(jl1101_pwrctl(phy, true) == ESP_OK, "power control failed", err);
@@ -324,7 +336,11 @@ esp_eth_phy_t *esp_eth_phy_new_jl1101(const eth_phy_config_t *config) {
   jl1101->parent.init = jl1101_init;
   jl1101->parent.deinit = jl1101_deinit;
   jl1101->parent.set_mediator = jl1101_set_mediator;
+#if ESP_IDF_VERSION_MAJOR >= 5
   jl1101->parent.autonego_ctrl = jl1101_negotiate;
+#else
+  jl1101->parent.negotiate = jl1101_negotiate;
+#endif
   jl1101->parent.get_link = jl1101_get_link;
   jl1101->parent.pwrctl = jl1101_pwrctl;
   jl1101->parent.get_addr = jl1101_get_addr;

esphome/components/ethernet/ethernet_component.cpp

@@ -17,22 +17,6 @@
 namespace esphome {
 namespace ethernet {
 
-#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 2)
-// work around IDF compile issue on P4 https://github.com/espressif/esp-idf/pull/15637
-#ifdef USE_ESP32_VARIANT_ESP32P4
-#undef ETH_ESP32_EMAC_DEFAULT_CONFIG
-#define ETH_ESP32_EMAC_DEFAULT_CONFIG() \
-  { \
-    .smi_gpio = {.mdc_num = 31, .mdio_num = 52}, .interface = EMAC_DATA_INTERFACE_RMII, \
-    .clock_config = {.rmii = {.clock_mode = EMAC_CLK_EXT_IN, .clock_gpio = (emac_rmii_clock_gpio_t) 50}}, \
-    .dma_burst_len = ETH_DMA_BURST_LEN_32, .intr_priority = 0, \
-    .emac_dataif_gpio = \
-        {.rmii = {.tx_en_num = 49, .txd0_num = 34, .txd1_num = 35, .crs_dv_num = 28, .rxd0_num = 29, .rxd1_num = 30}}, \
-    .clock_config_out_in = {.rmii = {.clock_mode = EMAC_CLK_EXT_IN, .clock_gpio = (emac_rmii_clock_gpio_t) -1}}, \
-  }
-#endif
-#endif
-
 static const char *const TAG = "ethernet";
 
 EthernetComponent *global_eth_component;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
@@ -106,8 +90,8 @@ void EthernetComponent::setup() {
 
 #ifdef USE_ETHERNET_SPI  // Configure SPI interface and Ethernet driver for specific SPI module
   spi_device_interface_config_t devcfg = {
-      .command_bits = 0,
-      .address_bits = 0,
+      .command_bits = 16,  // Actually it's the address phase in W5500 SPI frame
+      .address_bits = 8,   // Actually it's the control phase in W5500 SPI frame
       .dummy_bits = 0,
       .mode = 0,
       .duty_cycle_pos = 0,
@@ -122,49 +106,45 @@ void EthernetComponent::setup() {
       .post_cb = nullptr,
   };
 
-#if CONFIG_ETH_SPI_ETHERNET_W5500
+#if ESP_IDF_VERSION_MAJOR >= 5
   eth_w5500_config_t w5500_config = ETH_W5500_DEFAULT_CONFIG(host, &devcfg);
-#endif
-#if CONFIG_ETH_SPI_ETHERNET_DM9051
-  eth_dm9051_config_t dm9051_config = ETH_DM9051_DEFAULT_CONFIG(host, &devcfg);
-#endif
+#else
+  spi_device_handle_t spi_handle = nullptr;
+  err = spi_bus_add_device(host, &devcfg, &spi_handle);
+  ESPHL_ERROR_CHECK(err, "SPI bus add device error");
 
-#if CONFIG_ETH_SPI_ETHERNET_W5500
+  eth_w5500_config_t w5500_config = ETH_W5500_DEFAULT_CONFIG(spi_handle);
+#endif
   w5500_config.int_gpio_num = this->interrupt_pin_;
 #ifdef USE_ETHERNET_SPI_POLLING_SUPPORT
   w5500_config.poll_period_ms = this->polling_interval_;
 #endif
-#endif
-
-#if CONFIG_ETH_SPI_ETHERNET_DM9051
-  dm9051_config.int_gpio_num = this->interrupt_pin_;
-#ifdef USE_ETHERNET_SPI_POLLING_SUPPORT
-  dm9051_config.poll_period_ms = this->polling_interval_;
-#endif
-#endif
-
   phy_config.phy_addr = this->phy_addr_spi_;
   phy_config.reset_gpio_num = this->reset_pin_;
 
-  esp_eth_mac_t *mac = nullptr;
+  esp_eth_mac_t *mac = esp_eth_mac_new_w5500(&w5500_config, &mac_config);
 #elif defined(USE_ETHERNET_OPENETH)
   esp_eth_mac_t *mac = esp_eth_mac_new_openeth(&mac_config);
 #else
   phy_config.phy_addr = this->phy_addr_;
   phy_config.reset_gpio_num = this->power_pin_;
 
+#if ESP_IDF_VERSION_MAJOR >= 5
   eth_esp32_emac_config_t esp32_emac_config = ETH_ESP32_EMAC_DEFAULT_CONFIG();
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
-  esp32_emac_config.smi_gpio.mdc_num = this->mdc_pin_;
-  esp32_emac_config.smi_gpio.mdio_num = this->mdio_pin_;
-#else
   esp32_emac_config.smi_mdc_gpio_num = this->mdc_pin_;
   esp32_emac_config.smi_mdio_gpio_num = this->mdio_pin_;
-#endif
   esp32_emac_config.clock_config.rmii.clock_mode = this->clk_mode_;
-  esp32_emac_config.clock_config.rmii.clock_gpio = (emac_rmii_clock_gpio_t) this->clk_pin_;
+  esp32_emac_config.clock_config.rmii.clock_gpio = this->clk_gpio_;
 
   esp_eth_mac_t *mac = esp_eth_mac_new_esp32(&esp32_emac_config, &mac_config);
+#else
+  mac_config.smi_mdc_gpio_num = this->mdc_pin_;
+  mac_config.smi_mdio_gpio_num = this->mdio_pin_;
+  mac_config.clock_config.rmii.clock_mode = this->clk_mode_;
+  mac_config.clock_config.rmii.clock_gpio = this->clk_gpio_;
+
+  esp_eth_mac_t *mac = esp_eth_mac_new_esp32(&mac_config);
+#endif
 #endif
 
   switch (this->type_) {
@@ -198,25 +178,19 @@ void EthernetComponent::setup() {
     }
     case ETHERNET_TYPE_KSZ8081:
     case ETHERNET_TYPE_KSZ8081RNA: {
+#if ESP_IDF_VERSION_MAJOR >= 5
       this->phy_ = esp_eth_phy_new_ksz80xx(&phy_config);
+#else
+      this->phy_ = esp_eth_phy_new_ksz8081(&phy_config);
+#endif
       break;
     }
 #endif
 #ifdef USE_ETHERNET_SPI
-#if CONFIG_ETH_SPI_ETHERNET_W5500
     case ETHERNET_TYPE_W5500: {
-      mac = esp_eth_mac_new_w5500(&w5500_config, &mac_config);
       this->phy_ = esp_eth_phy_new_w5500(&phy_config);
       break;
     }
-#endif
-#if CONFIG_ETH_SPI_ETHERNET_DM9051
-    case ETHERNET_TYPE_DM9051: {
-      mac = esp_eth_mac_new_dm9051(&dm9051_config, &mac_config);
-      this->phy_ = esp_eth_phy_new_dm9051(&phy_config);
-      break;
-    }
-#endif
 #endif
     default: {
       this->mark_failed();
@@ -347,10 +321,6 @@ void EthernetComponent::dump_config() {
       eth_type = "OPENETH";
       break;
 
-    case ETHERNET_TYPE_DM9051:
-      eth_type = "DM9051";
-      break;
-
     default:
       eth_type = "Unknown";
       break;
@@ -382,11 +352,10 @@ void EthernetComponent::dump_config() {
     ESP_LOGCONFIG(TAG, "  Power Pin: %u", this->power_pin_);
   }
   ESP_LOGCONFIG(TAG,
-                "  CLK Pin: %u\n"
                 "  MDC Pin: %u\n"
                 "  MDIO Pin: %u\n"
                 "  PHY addr: %u",
-                this->clk_pin_, this->mdc_pin_, this->mdio_pin_, this->phy_addr_);
+                this->mdc_pin_, this->mdio_pin_, this->phy_addr_);
 #endif
   ESP_LOGCONFIG(TAG, "  Type: %s", eth_type);
 }
@@ -607,8 +576,10 @@ void EthernetComponent::set_phy_addr(uint8_t phy_addr) { this->phy_addr_ = phy_a
 void EthernetComponent::set_power_pin(int power_pin) { this->power_pin_ = power_pin; }
 void EthernetComponent::set_mdc_pin(uint8_t mdc_pin) { this->mdc_pin_ = mdc_pin; }
 void EthernetComponent::set_mdio_pin(uint8_t mdio_pin) { this->mdio_pin_ = mdio_pin; }
-void EthernetComponent::set_clk_pin(uint8_t clk_pin) { this->clk_pin_ = clk_pin; }
-void EthernetComponent::set_clk_mode(emac_rmii_clock_mode_t clk_mode) { this->clk_mode_ = clk_mode; }
+void EthernetComponent::set_clk_mode(emac_rmii_clock_mode_t clk_mode, emac_rmii_clock_gpio_t clk_gpio) {
+  this->clk_mode_ = clk_mode;
+  this->clk_gpio_ = clk_gpio;
+}
 void EthernetComponent::add_phy_register(PHYRegister register_value) { this->phy_registers_.push_back(register_value); }
 #endif
 void EthernetComponent::set_type(EthernetType type) { this->type_ = type; }

esphome/components/ethernet/ethernet_component.h

@@ -26,7 +26,6 @@ enum EthernetType : uint8_t {
   ETHERNET_TYPE_KSZ8081RNA,
   ETHERNET_TYPE_W5500,
   ETHERNET_TYPE_OPENETH,
-  ETHERNET_TYPE_DM9051,
 };
 
 struct ManualIP {
@@ -76,8 +75,7 @@ class EthernetComponent : public Component {
   void set_power_pin(int power_pin);
   void set_mdc_pin(uint8_t mdc_pin);
   void set_mdio_pin(uint8_t mdio_pin);
-  void set_clk_pin(uint8_t clk_pin);
-  void set_clk_mode(emac_rmii_clock_mode_t clk_mode);
+  void set_clk_mode(emac_rmii_clock_mode_t clk_mode, emac_rmii_clock_gpio_t clk_gpio);
   void add_phy_register(PHYRegister register_value);
 #endif
   void set_type(EthernetType type);
@@ -124,10 +122,10 @@ class EthernetComponent : public Component {
   // Group all 32-bit members first
   int power_pin_{-1};
   emac_rmii_clock_mode_t clk_mode_{EMAC_CLK_EXT_IN};
+  emac_rmii_clock_gpio_t clk_gpio_{EMAC_CLK_IN_GPIO};
   std::vector<PHYRegister> phy_registers_{};
 
   // Group all 8-bit members together
-  uint8_t clk_pin_{0};
   uint8_t phy_addr_{0};
   uint8_t mdc_pin_{23};
   uint8_t mdio_pin_{18};

esphome/components/ezo/ezo.h

@@ -38,6 +38,7 @@ class EZOSensor : public sensor::Sensor, public PollingComponent, public i2c::I2
   void loop() override;
   void dump_config() override;
   void update() override;
+  float get_setup_priority() const override { return setup_priority::DATA; };
 
   // I2C
   void set_address(uint8_t address);

esphome/components/ezo_pmp/ezo_pmp.h

@@ -23,6 +23,7 @@ namespace ezo_pmp {
 class EzoPMP : public PollingComponent, public i2c::I2CDevice {
  public:
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; };
 
   void loop() override;
   void update() override;

esphome/components/feedback/feedback_cover.h

@@ -16,6 +16,7 @@ class FeedbackCover : public cover::Cover, public Component {
   void setup() override;
   void loop() override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; };
 
   Trigger<> *get_open_trigger() const { return this->open_trigger_; }
   Trigger<> *get_close_trigger() const { return this->close_trigger_; }

esphome/components/fs3000/fs3000.h

@@ -18,6 +18,7 @@ class FS3000Component : public PollingComponent, public i2c::I2CDevice, public s
   void update() override;
 
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
   void set_model(FS3000Model model) { this->model_ = model; }
 

esphome/components/gcja5/gcja5.h

@@ -12,6 +12,7 @@ class GCJA5Component : public Component, public uart::UARTDevice {
  public:
   void dump_config() override;
   void loop() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
   void set_pm_1_0_sensor(sensor::Sensor *pm_1_0) { pm_1_0_sensor_ = pm_1_0; }
   void set_pm_2_5_sensor(sensor::Sensor *pm_2_5) { pm_2_5_sensor_ = pm_2_5; }

esphome/components/gp8403/gp8403.h

@@ -15,6 +15,7 @@ class GP8403 : public Component, public i2c::I2CDevice {
  public:
   void setup() override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
   void set_voltage(gp8403::GP8403Voltage voltage) { this->voltage_ = voltage; }
 

esphome/components/gpio/binary_sensor/__init__.py

@@ -43,4 +43,4 @@ async def to_code(config):
 
     cg.add(var.set_use_interrupt(config[CONF_USE_INTERRUPT]))
     if config[CONF_USE_INTERRUPT]:
-        cg.add(var.set_interrupt_type(config[CONF_INTERRUPT_TYPE]))
+        cg.add(var.set_interrupt_type(INTERRUPT_TYPES[config[CONF_INTERRUPT_TYPE]]))

esphome/components/grove_gas_mc_v2/grove_gas_mc_v2.h

@@ -22,6 +22,8 @@ class GroveGasMultichannelV2Component : public PollingComponent, public i2c::I2C
 
   void dump_config() override;
 
+  float get_setup_priority() const override { return setup_priority::DATA; }
+
  protected:
   enum ErrorCode {
     UNKNOWN,

esphome/components/he60r/he60r.h

@@ -13,6 +13,7 @@ class HE60rCover : public cover::Cover, public Component, public uart::UARTDevic
   void setup() override;
   void loop() override;
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; };
 
   void set_open_duration(uint32_t duration) { this->open_duration_ = duration; }
   void set_close_duration(uint32_t duration) { this->close_duration_ = duration; }

esphome/components/honeywellabp2_i2c/honeywellabp2.h

@@ -18,6 +18,7 @@ class HONEYWELLABP2Sensor : public PollingComponent, public i2c::I2CDevice {
   void set_temperature_sensor(sensor::Sensor *temperature_sensor) { this->temperature_sensor_ = temperature_sensor; };
   void loop() override;
   void update() override;
+  float get_setup_priority() const override { return setup_priority::DATA; };
   void dump_config() override;
 
   void read_sensor_data();

esphome/components/host/__init__.py

@@ -44,4 +44,3 @@ async def to_code(config):
     cg.add_build_flag("-std=gnu++20")
     cg.add_define("ESPHOME_BOARD", "host")
     cg.add_platformio_option("platform", "platformio/native")
-    cg.add_platformio_option("lib_ldf_mode", "off")

esphome/components/http_request/http_request_arduino.cpp

@@ -133,6 +133,7 @@ std::shared_ptr<HttpContainer> HttpRequestArduino::perform(std::string url, std:
       std::string header_value = container->client_.header(i).c_str();
       ESP_LOGD(TAG, "Received response header, name: %s, value: %s", header_name.c_str(), header_value.c_str());
       container->response_headers_[header_name].push_back(header_value);
+      break;
     }
   }
 

esphome/components/http_request/http_request_idf.cpp

@@ -42,6 +42,7 @@ esp_err_t HttpRequestIDF::http_event_handler(esp_http_client_event_t *evt) {
         const std::string header_value = evt->header_value;
         ESP_LOGD(TAG, "Received response header, name: %s, value: %s", header_name.c_str(), header_value.c_str());
         user_data->response_headers[header_name].push_back(header_value);
+        break;
       }
       break;
     }

esphome/components/http_request/update/http_request_update.cpp

@@ -57,7 +57,7 @@ void HttpRequestUpdate::update_task(void *params) {
   RAMAllocator<uint8_t> allocator;
   uint8_t *data = allocator.allocate(container->content_length);
   if (data == nullptr) {
-    std::string msg = str_sprintf("Failed to allocate %zu bytes for manifest", container->content_length);
+    std::string msg = str_sprintf("Failed to allocate %d bytes for manifest", container->content_length);
     this_update->status_set_error(msg.c_str());
     container->end();
     UPDATE_RETURN;

esphome/components/i2c/__init__.py

@@ -9,6 +9,8 @@ from esphome.const import (
     CONF_FREQUENCY,
     CONF_I2C_ID,
     CONF_ID,
+    CONF_INPUT,
+    CONF_OUTPUT,
     CONF_SCAN,
     CONF_SCL,
     CONF_SDA,
@@ -71,15 +73,20 @@ def validate_config(config):
     return config
 
 
+pin_with_input_and_output_support = pins.internal_gpio_pin_number(
+    {CONF_OUTPUT: True, CONF_INPUT: True}
+)
+
+
 CONFIG_SCHEMA = cv.All(
     cv.Schema(
         {
             cv.GenerateID(): _bus_declare_type,
-            cv.Optional(CONF_SDA, default="SDA"): pins.internal_gpio_pin_number,
+            cv.Optional(CONF_SDA, default="SDA"): pin_with_input_and_output_support,
             cv.SplitDefault(CONF_SDA_PULLUP_ENABLED, esp32_idf=True): cv.All(
                 cv.only_with_esp_idf, cv.boolean
             ),
-            cv.Optional(CONF_SCL, default="SCL"): pins.internal_gpio_pin_number,
+            cv.Optional(CONF_SCL, default="SCL"): pin_with_input_and_output_support,
             cv.SplitDefault(CONF_SCL_PULLUP_ENABLED, esp32_idf=True): cv.All(
                 cv.only_with_esp_idf, cv.boolean
             ),

esphome/components/i2c_device/i2c_device.h

@@ -9,6 +9,7 @@ namespace i2c_device {
 class I2CDeviceComponent : public Component, public i2c::I2CDevice {
  public:
   void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
 
  protected:
 };

esphome/components/i2s_audio/__init__.py

@@ -9,7 +9,14 @@ from esphome.components.esp32.const import (
     VARIANT_ESP32S3,
 )
 import esphome.config_validation as cv
-from esphome.const import CONF_BITS_PER_SAMPLE, CONF_CHANNEL, CONF_ID, CONF_SAMPLE_RATE
+from esphome.const import (
+    CONF_BITS_PER_SAMPLE,
+    CONF_CHANNEL,
+    CONF_ID,
+    CONF_SAMPLE_RATE,
+    KEY_CORE,
+    KEY_FRAMEWORK_VERSION,
+)
 from esphome.core import CORE
 from esphome.cpp_generator import MockObjClass
 import esphome.final_validate as fv
@@ -243,7 +250,8 @@ def _final_validate(_):
 
 
 def use_legacy():
-    if CORE.using_esp_idf:
+    framework_version = CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
+    if CORE.using_esp_idf and framework_version >= cv.Version(5, 0, 0):
         if not _use_legacy_driver:
             return False
     return True

esphome/components/i2s_audio/i2s_audio.cpp

@@ -9,11 +9,15 @@ namespace i2s_audio {
 
 static const char *const TAG = "i2s_audio";
 
+#if ESP_IDF_VERSION_MAJOR >= 5
+static const uint8_t I2S_NUM_MAX = SOC_I2S_NUM;  // because IDF 5+ took this away :(
+#endif
+
 void I2SAudioComponent::setup() {
   ESP_LOGCONFIG(TAG, "Running setup");
 
   static i2s_port_t next_port_num = I2S_NUM_0;
-  if (next_port_num >= SOC_I2S_NUM) {
+  if (next_port_num >= I2S_NUM_MAX) {
     ESP_LOGE(TAG, "Too many components");
     this->mark_failed();
     return;

esphome/components/iaqcore/iaqcore.h

@@ -16,6 +16,8 @@ class IAQCore : public PollingComponent, public i2c::I2CDevice {
   void update() override;
   void dump_config() override;
 
+  float get_setup_priority() const override { return setup_priority::DATA; }
+
  protected:
   sensor::Sensor *co2_{nullptr};
   sensor::Sensor *tvoc_{nullptr};

esphome/components/improv_serial/improv_serial_component.cpp

@@ -59,7 +59,11 @@ optional<uint8_t> ImprovSerialComponent::read_byte_() {
       break;
 #if defined(USE_LOGGER_USB_CDC) && defined(CONFIG_ESP_CONSOLE_USB_CDC)
     case logger::UART_SELECTION_USB_CDC:
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
       if (esp_usb_console_available_for_read()) {
+#else
+      if (esp_usb_console_read_available()) {
+#endif
         esp_usb_console_read_buf((char *) &data, 1);
         byte = data;
       }