From 76abf2200cb297e1b89abaf44d8997f047848d95 Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Tue, 21 May 2024 20:08:53 -0500
Subject: [PATCH 01/29] Uncouple safe_mode from OTA (#6759)

---
 CODEOWNERS                                    |   2 +-
 esphome/components/esphome/ota/__init__.py    |  30 ++---
 .../components/esphome/ota/ota_esphome.cpp    |  98 +-------------
 esphome/components/esphome/ota/ota_esphome.h  |  27 +---
 esphome/components/ota/__init__.py            |   4 +-
 esphome/components/safe_mode/__init__.py      |  53 +++++++-
 .../components/safe_mode/button/__init__.py   |  13 +-
 .../safe_mode/button/safe_mode_button.cpp     |   6 +-
 .../safe_mode/button/safe_mode_button.h       |   6 +-
 esphome/components/safe_mode/safe_mode.cpp    | 125 ++++++++++++++++++
 esphome/components/safe_mode/safe_mode.h      |  44 ++++++
 .../components/safe_mode/switch/__init__.py   |  13 +-
 .../safe_mode/switch/safe_mode_switch.cpp     |   9 +-
 .../safe_mode/switch/safe_mode_switch.h       |   6 +-
 esphome/cpp_helpers.py                        |  17 +--
 tests/components/ota/common.yaml              |   3 -
 tests/components/safe_mode/common.yaml        |   6 +-
 tests/test1.yaml                              |   7 +-
 tests/test2.yaml                              |   4 +-
 tests/test3.yaml                              |   6 +-
 tests/test4.yaml                              |   3 +-
 21 files changed, 282 insertions(+), 200 deletions(-)
 create mode 100644 esphome/components/safe_mode/safe_mode.cpp
 create mode 100644 esphome/components/safe_mode/safe_mode.h

diff --git a/CODEOWNERS b/CODEOWNERS
index dc6c8caa87..22e581275b 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -306,7 +306,7 @@ esphome/components/rp2040_pwm/* @jesserockz
 esphome/components/rpi_dpi_rgb/* @clydebarrow
 esphome/components/rtl87xx/* @kuba2k2
 esphome/components/rtttl/* @glmnet
-esphome/components/safe_mode/* @jsuanet @paulmonigatti
+esphome/components/safe_mode/* @jsuanet @kbx81 @paulmonigatti
 esphome/components/scd4x/* @martgras @sjtrny
 esphome/components/script/* @esphome/core
 esphome/components/sdm_meter/* @jesserockz @polyfaces
diff --git a/esphome/components/esphome/ota/__init__.py b/esphome/components/esphome/ota/__init__.py
index abe9323b53..c5903974c2 100644
--- a/esphome/components/esphome/ota/__init__.py
+++ b/esphome/components/esphome/ota/__init__.py
@@ -1,19 +1,16 @@
-from esphome.cpp_generator import RawExpression
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components.ota import BASE_OTA_SCHEMA, ota_to_code, OTAComponent
 from esphome.const import (
     CONF_ID,
     CONF_NUM_ATTEMPTS,
-    CONF_OTA,
     CONF_PASSWORD,
     CONF_PORT,
     CONF_REBOOT_TIMEOUT,
     CONF_SAFE_MODE,
     CONF_VERSION,
-    KEY_PAST_SAFE_MODE,
 )
-from esphome.core import CORE, coroutine_with_priority
+from esphome.core import coroutine_with_priority
 
 
 CODEOWNERS = ["@esphome/core"]
@@ -28,7 +25,6 @@ CONFIG_SCHEMA = (
     cv.Schema(
         {
             cv.GenerateID(): cv.declare_id(ESPHomeOTAComponent),
-            cv.Optional(CONF_SAFE_MODE, default=True): cv.boolean,
             cv.Optional(CONF_VERSION, default=2): cv.one_of(1, 2, int=True),
             cv.SplitDefault(
                 CONF_PORT,
@@ -39,10 +35,15 @@ CONFIG_SCHEMA = (
                 rtl87xx=8892,
             ): cv.port,
             cv.Optional(CONF_PASSWORD): cv.string,
-            cv.Optional(
-                CONF_REBOOT_TIMEOUT, default="5min"
-            ): cv.positive_time_period_milliseconds,
-            cv.Optional(CONF_NUM_ATTEMPTS, default="10"): cv.positive_not_null_int,
+            cv.Optional(CONF_NUM_ATTEMPTS): cv.invalid(
+                f"'{CONF_SAFE_MODE}' (and its related configuration variables) has moved from 'ota' to its own component. See https://esphome.io/components/safe_mode"
+            ),
+            cv.Optional(CONF_REBOOT_TIMEOUT): cv.invalid(
+                f"'{CONF_SAFE_MODE}' (and its related configuration variables) has moved from 'ota' to its own component. See https://esphome.io/components/safe_mode"
+            ),
+            cv.Optional(CONF_SAFE_MODE): cv.invalid(
+                f"'{CONF_SAFE_MODE}' (and its related configuration variables) has moved from 'ota' to its own component. See https://esphome.io/components/safe_mode"
+            ),
         }
     )
     .extend(BASE_OTA_SCHEMA)
@@ -50,10 +51,8 @@ CONFIG_SCHEMA = (
 )
 
 
-@coroutine_with_priority(50.0)
+@coroutine_with_priority(52.0)
 async def to_code(config):
-    CORE.data[CONF_OTA] = {}
-
     var = cg.new_Pvariable(config[CONF_ID])
     await ota_to_code(var, config)
     cg.add(var.set_port(config[CONF_PORT]))
@@ -63,10 +62,3 @@ async def to_code(config):
     cg.add_define("USE_OTA_VERSION", config[CONF_VERSION])
 
     await cg.register_component(var, config)
-
-    if config[CONF_SAFE_MODE]:
-        condition = var.should_enter_safe_mode(
-            config[CONF_NUM_ATTEMPTS], config[CONF_REBOOT_TIMEOUT]
-        )
-        cg.add(RawExpression(f"if ({condition}) return"))
-        CORE.data[CONF_OTA][KEY_PAST_SAFE_MODE] = True
diff --git a/esphome/components/esphome/ota/ota_esphome.cpp b/esphome/components/esphome/ota/ota_esphome.cpp
index f2f1cfc6a8..9d5044aaeb 100644
--- a/esphome/components/esphome/ota/ota_esphome.cpp
+++ b/esphome/components/esphome/ota/ota_esphome.cpp
@@ -78,23 +78,9 @@ void ESPHomeOTAComponent::dump_config() {
     ESP_LOGCONFIG(TAG, "  Password configured");
   }
 #endif
-  if (this->has_safe_mode_ && this->safe_mode_rtc_value_ > 1 &&
-      this->safe_mode_rtc_value_ != ESPHomeOTAComponent::ENTER_SAFE_MODE_MAGIC) {
-    ESP_LOGW(TAG, "Last reset occurred too quickly; safe mode will be invoked in %" PRIu32 " restarts",
-             this->safe_mode_num_attempts_ - this->safe_mode_rtc_value_);
-  }
 }
 
-void ESPHomeOTAComponent::loop() {
-  this->handle_();
-
-  if (this->has_safe_mode_ && (millis() - this->safe_mode_start_time_) > this->safe_mode_enable_time_) {
-    this->has_safe_mode_ = false;
-    // successful boot, reset counter
-    ESP_LOGI(TAG, "Boot seems successful; resetting boot loop counter");
-    this->clean_rtc();
-  }
-}
+void ESPHomeOTAComponent::loop() { this->handle_(); }
 
 static const uint8_t FEATURE_SUPPORTS_COMPRESSION = 0x01;
 
@@ -423,86 +409,4 @@ bool ESPHomeOTAComponent::writeall_(const uint8_t *buf, size_t len) {
 float ESPHomeOTAComponent::get_setup_priority() const { return setup_priority::AFTER_WIFI; }
 uint16_t ESPHomeOTAComponent::get_port() const { return this->port_; }
 void ESPHomeOTAComponent::set_port(uint16_t port) { this->port_ = port; }
-
-void ESPHomeOTAComponent::set_safe_mode_pending(const bool &pending) {
-  if (!this->has_safe_mode_)
-    return;
-
-  uint32_t current_rtc = this->read_rtc_();
-
-  if (pending && current_rtc != ESPHomeOTAComponent::ENTER_SAFE_MODE_MAGIC) {
-    ESP_LOGI(TAG, "Device will enter safe mode on next boot");
-    this->write_rtc_(ESPHomeOTAComponent::ENTER_SAFE_MODE_MAGIC);
-  }
-
-  if (!pending && current_rtc == ESPHomeOTAComponent::ENTER_SAFE_MODE_MAGIC) {
-    ESP_LOGI(TAG, "Safe mode pending has been cleared");
-    this->clean_rtc();
-  }
-}
-bool ESPHomeOTAComponent::get_safe_mode_pending() {
-  return this->has_safe_mode_ && this->read_rtc_() == ESPHomeOTAComponent::ENTER_SAFE_MODE_MAGIC;
-}
-
-bool ESPHomeOTAComponent::should_enter_safe_mode(uint8_t num_attempts, uint32_t enable_time) {
-  this->has_safe_mode_ = true;
-  this->safe_mode_start_time_ = millis();
-  this->safe_mode_enable_time_ = enable_time;
-  this->safe_mode_num_attempts_ = num_attempts;
-  this->rtc_ = global_preferences->make_preference<uint32_t>(233825507UL, false);
-  this->safe_mode_rtc_value_ = this->read_rtc_();
-
-  bool is_manual_safe_mode = this->safe_mode_rtc_value_ == ESPHomeOTAComponent::ENTER_SAFE_MODE_MAGIC;
-
-  if (is_manual_safe_mode) {
-    ESP_LOGI(TAG, "Safe mode has been entered manually");
-  } else {
-    ESP_LOGCONFIG(TAG, "There have been %" PRIu32 " suspected unsuccessful boot attempts", this->safe_mode_rtc_value_);
-  }
-
-  if (this->safe_mode_rtc_value_ >= num_attempts || is_manual_safe_mode) {
-    this->clean_rtc();
-
-    if (!is_manual_safe_mode) {
-      ESP_LOGE(TAG, "Boot loop detected. Proceeding to safe mode");
-    }
-
-    this->status_set_error();
-    this->set_timeout(enable_time, []() {
-      ESP_LOGE(TAG, "No OTA attempt made, restarting");
-      App.reboot();
-    });
-
-    // Delay here to allow power to stabilise before Wi-Fi/Ethernet is initialised.
-    delay(300);  // NOLINT
-    App.setup();
-
-    ESP_LOGI(TAG, "Waiting for OTA attempt");
-
-    return true;
-  } else {
-    // increment counter
-    this->write_rtc_(this->safe_mode_rtc_value_ + 1);
-    return false;
-  }
-}
-
-void ESPHomeOTAComponent::write_rtc_(uint32_t val) {
-  this->rtc_.save(&val);
-  global_preferences->sync();
-}
-
-uint32_t ESPHomeOTAComponent::read_rtc_() {
-  uint32_t val;
-  if (!this->rtc_.load(&val))
-    return 0;
-  return val;
-}
-
-void ESPHomeOTAComponent::clean_rtc() { this->write_rtc_(0); }
-
-void ESPHomeOTAComponent::on_safe_shutdown() {
-  if (this->has_safe_mode_ && this->read_rtc_() != ESPHomeOTAComponent::ENTER_SAFE_MODE_MAGIC)
-    this->clean_rtc();
-}
 }  // namespace esphome
diff --git a/esphome/components/esphome/ota/ota_esphome.h b/esphome/components/esphome/ota/ota_esphome.h
index e8f36f05ca..42629b4346 100644
--- a/esphome/components/esphome/ota/ota_esphome.h
+++ b/esphome/components/esphome/ota/ota_esphome.h
@@ -15,17 +15,9 @@ class ESPHomeOTAComponent : public ota::OTAComponent {
   void set_auth_password(const std::string &password) { password_ = password; }
 #endif  // USE_OTA_PASSWORD
 
-  /// Manually set the port OTA should listen on.
+  /// Manually set the port OTA should listen on
   void set_port(uint16_t port);
 
-  bool should_enter_safe_mode(uint8_t num_attempts, uint32_t enable_time);
-
-  /// Set to true if the next startup will enter safe mode
-  void set_safe_mode_pending(const bool &pending);
-  bool get_safe_mode_pending();
-
-  // ========== INTERNAL METHODS ==========
-  // (In most use cases you won't need these)
   void setup() override;
   void dump_config() override;
   float get_setup_priority() const override;
@@ -33,14 +25,7 @@ class ESPHomeOTAComponent : public ota::OTAComponent {
 
   uint16_t get_port() const;
 
-  void clean_rtc();
-
-  void on_safe_shutdown() override;
-
  protected:
-  void write_rtc_(uint32_t val);
-  uint32_t read_rtc_();
-
   void handle_();
   bool readall_(uint8_t *buf, size_t len);
   bool writeall_(const uint8_t *buf, size_t len);
@@ -53,16 +38,6 @@ class ESPHomeOTAComponent : public ota::OTAComponent {
 
   std::unique_ptr<socket::Socket> server_;
   std::unique_ptr<socket::Socket> client_;
-
-  bool has_safe_mode_{false};              ///< stores whether safe mode can be enabled
-  uint32_t safe_mode_start_time_;          ///< stores when safe mode was enabled
-  uint32_t safe_mode_enable_time_{60000};  ///< The time safe mode should be on for
-  uint32_t safe_mode_rtc_value_;
-  uint8_t safe_mode_num_attempts_;
-  ESPPreferenceObject rtc_;
-
-  static const uint32_t ENTER_SAFE_MODE_MAGIC =
-      0x5afe5afe;  ///< a magic number to indicate that safe mode should be entered on next boot
 };
 
 }  // namespace esphome
diff --git a/esphome/components/ota/__init__.py b/esphome/components/ota/__init__.py
index 3d2956931c..4e447bfb2d 100644
--- a/esphome/components/ota/__init__.py
+++ b/esphome/components/ota/__init__.py
@@ -6,7 +6,7 @@ from esphome.core import CORE, coroutine_with_priority
 from esphome.const import CONF_ESPHOME, CONF_OTA, CONF_PLATFORM, CONF_TRIGGER_ID
 
 CODEOWNERS = ["@esphome/core"]
-AUTO_LOAD = ["md5"]
+AUTO_LOAD = ["md5", "safe_mode"]
 
 IS_PLATFORM_COMPONENT = True
 
@@ -76,7 +76,7 @@ BASE_OTA_SCHEMA = cv.Schema(
 )
 
 
-@coroutine_with_priority(51.0)
+@coroutine_with_priority(54.0)
 async def to_code(config):
     cg.add_define("USE_OTA")
 
diff --git a/esphome/components/safe_mode/__init__.py b/esphome/components/safe_mode/__init__.py
index ab884bfee4..7f227d7dd1 100644
--- a/esphome/components/safe_mode/__init__.py
+++ b/esphome/components/safe_mode/__init__.py
@@ -1,5 +1,56 @@
+from esphome.cpp_generator import RawExpression
 import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.const import (
+    CONF_DISABLED,
+    CONF_ID,
+    CONF_NUM_ATTEMPTS,
+    CONF_REBOOT_TIMEOUT,
+    CONF_SAFE_MODE,
+    KEY_PAST_SAFE_MODE,
+)
+from esphome.core import CORE, coroutine_with_priority
 
-CODEOWNERS = ["@paulmonigatti", "@jsuanet"]
+
+CODEOWNERS = ["@paulmonigatti", "@jsuanet", "@kbx81"]
 
 safe_mode_ns = cg.esphome_ns.namespace("safe_mode")
+SafeModeComponent = safe_mode_ns.class_("SafeModeComponent", cg.Component)
+
+
+def _remove_id_if_disabled(value):
+    value = value.copy()
+    if value[CONF_DISABLED]:
+        value.pop(CONF_ID)
+    return value
+
+
+CONFIG_SCHEMA = cv.All(
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(SafeModeComponent),
+            cv.Optional(CONF_DISABLED, default=False): cv.boolean,
+            cv.Optional(CONF_NUM_ATTEMPTS, default="10"): cv.positive_not_null_int,
+            cv.Optional(
+                CONF_REBOOT_TIMEOUT, default="5min"
+            ): cv.positive_time_period_milliseconds,
+        }
+    ).extend(cv.COMPONENT_SCHEMA),
+    _remove_id_if_disabled,
+)
+
+
+@coroutine_with_priority(50.0)
+async def to_code(config):
+    if config[CONF_DISABLED]:
+        return
+
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+
+    condition = var.should_enter_safe_mode(
+        config[CONF_NUM_ATTEMPTS], config[CONF_REBOOT_TIMEOUT]
+    )
+    cg.add(RawExpression(f"if ({condition}) return"))
+    CORE.data[CONF_SAFE_MODE] = {}
+    CORE.data[CONF_SAFE_MODE][KEY_PAST_SAFE_MODE] = True
diff --git a/esphome/components/safe_mode/button/__init__.py b/esphome/components/safe_mode/button/__init__.py
index bd51d2e038..5662db8f7e 100644
--- a/esphome/components/safe_mode/button/__init__.py
+++ b/esphome/components/safe_mode/button/__init__.py
@@ -1,16 +1,15 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import button
-from esphome.components.esphome.ota import ESPHomeOTAComponent
 from esphome.const import (
-    CONF_ESPHOME,
+    CONF_SAFE_MODE,
     DEVICE_CLASS_RESTART,
     ENTITY_CATEGORY_CONFIG,
     ICON_RESTART_ALERT,
 )
-from .. import safe_mode_ns
+from .. import safe_mode_ns, SafeModeComponent
 
-DEPENDENCIES = ["ota.esphome"]
+DEPENDENCIES = ["safe_mode"]
 
 SafeModeButton = safe_mode_ns.class_("SafeModeButton", button.Button, cg.Component)
 
@@ -21,7 +20,7 @@ CONFIG_SCHEMA = (
         entity_category=ENTITY_CATEGORY_CONFIG,
         icon=ICON_RESTART_ALERT,
     )
-    .extend({cv.GenerateID(CONF_ESPHOME): cv.use_id(ESPHomeOTAComponent)})
+    .extend({cv.GenerateID(CONF_SAFE_MODE): cv.use_id(SafeModeComponent)})
     .extend(cv.COMPONENT_SCHEMA)
 )
 
@@ -30,5 +29,5 @@ async def to_code(config):
     var = await button.new_button(config)
     await cg.register_component(var, config)
 
-    ota = await cg.get_variable(config[CONF_ESPHOME])
-    cg.add(var.set_ota(ota))
+    safe_mode_component = await cg.get_variable(config[CONF_SAFE_MODE])
+    cg.add(var.set_safe_mode(safe_mode_component))
diff --git a/esphome/components/safe_mode/button/safe_mode_button.cpp b/esphome/components/safe_mode/button/safe_mode_button.cpp
index d513b79c12..261688807a 100644
--- a/esphome/components/safe_mode/button/safe_mode_button.cpp
+++ b/esphome/components/safe_mode/button/safe_mode_button.cpp
@@ -8,11 +8,13 @@ namespace safe_mode {
 
 static const char *const TAG = "safe_mode.button";
 
-void SafeModeButton::set_ota(esphome::ESPHomeOTAComponent *ota) { this->ota_ = ota; }
+void SafeModeButton::set_safe_mode(SafeModeComponent *safe_mode_component) {
+  this->safe_mode_component_ = safe_mode_component;
+}
 
 void SafeModeButton::press_action() {
   ESP_LOGI(TAG, "Restarting device in safe mode...");
-  this->ota_->set_safe_mode_pending(true);
+  this->safe_mode_component_->set_safe_mode_pending(true);
 
   // Let MQTT settle a bit
   delay(100);  // NOLINT
diff --git a/esphome/components/safe_mode/button/safe_mode_button.h b/esphome/components/safe_mode/button/safe_mode_button.h
index a306735b7f..fea0955abb 100644
--- a/esphome/components/safe_mode/button/safe_mode_button.h
+++ b/esphome/components/safe_mode/button/safe_mode_button.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "esphome/components/button/button.h"
-#include "esphome/components/esphome/ota/ota_esphome.h"
+#include "esphome/components/safe_mode/safe_mode.h"
 #include "esphome/core/component.h"
 
 namespace esphome {
@@ -10,10 +10,10 @@ namespace safe_mode {
 class SafeModeButton : public button::Button, public Component {
  public:
   void dump_config() override;
-  void set_ota(esphome::ESPHomeOTAComponent *ota);
+  void set_safe_mode(SafeModeComponent *safe_mode_component);
 
  protected:
-  esphome::ESPHomeOTAComponent *ota_;
+  SafeModeComponent *safe_mode_component_;
   void press_action() override;
 };
 
diff --git a/esphome/components/safe_mode/safe_mode.cpp b/esphome/components/safe_mode/safe_mode.cpp
new file mode 100644
index 0000000000..06772ae1e0
--- /dev/null
+++ b/esphome/components/safe_mode/safe_mode.cpp
@@ -0,0 +1,125 @@
+#include "safe_mode.h"
+
+#include "esphome/core/application.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/log.h"
+#include "esphome/core/util.h"
+
+#include <cerrno>
+#include <cinttypes>
+#include <cstdio>
+
+namespace esphome {
+namespace safe_mode {
+
+static const char *const TAG = "safe_mode";
+
+void SafeModeComponent::dump_config() {
+  ESP_LOGCONFIG(TAG, "Safe Mode:");
+  ESP_LOGCONFIG(TAG, "  Invoke after %u boot attempts", this->safe_mode_num_attempts_);
+  ESP_LOGCONFIG(TAG, "  Remain in safe mode for %" PRIu32 " seconds",
+                this->safe_mode_enable_time_ / 1000);  // because milliseconds
+
+  if (this->safe_mode_rtc_value_ > 1 && this->safe_mode_rtc_value_ != SafeModeComponent::ENTER_SAFE_MODE_MAGIC) {
+    auto remaining_restarts = this->safe_mode_num_attempts_ - this->safe_mode_rtc_value_;
+    if (remaining_restarts) {
+      ESP_LOGW(TAG, "Last reset occurred too quickly; safe mode will be invoked in %" PRIu32 " restarts",
+               remaining_restarts);
+    } else {
+      ESP_LOGW(TAG, "SAFE MODE IS ACTIVE");
+    }
+  }
+}
+
+float SafeModeComponent::get_setup_priority() const { return setup_priority::AFTER_WIFI; }
+
+void SafeModeComponent::loop() {
+  if (!this->boot_successful_ && (millis() - this->safe_mode_start_time_) > this->safe_mode_enable_time_) {
+    // successful boot, reset counter
+    ESP_LOGI(TAG, "Boot seems successful; resetting boot loop counter");
+    this->clean_rtc();
+    this->boot_successful_ = true;
+  }
+}
+
+void SafeModeComponent::set_safe_mode_pending(const bool &pending) {
+  uint32_t current_rtc = this->read_rtc_();
+
+  if (pending && current_rtc != SafeModeComponent::ENTER_SAFE_MODE_MAGIC) {
+    ESP_LOGI(TAG, "Device will enter safe mode on next boot");
+    this->write_rtc_(SafeModeComponent::ENTER_SAFE_MODE_MAGIC);
+  }
+
+  if (!pending && current_rtc == SafeModeComponent::ENTER_SAFE_MODE_MAGIC) {
+    ESP_LOGI(TAG, "Safe mode pending has been cleared");
+    this->clean_rtc();
+  }
+}
+
+bool SafeModeComponent::get_safe_mode_pending() {
+  return this->read_rtc_() == SafeModeComponent::ENTER_SAFE_MODE_MAGIC;
+}
+
+bool SafeModeComponent::should_enter_safe_mode(uint8_t num_attempts, uint32_t enable_time) {
+  this->safe_mode_start_time_ = millis();
+  this->safe_mode_enable_time_ = enable_time;
+  this->safe_mode_num_attempts_ = num_attempts;
+  this->rtc_ = global_preferences->make_preference<uint32_t>(233825507UL, false);
+  this->safe_mode_rtc_value_ = this->read_rtc_();
+
+  bool is_manual_safe_mode = this->safe_mode_rtc_value_ == SafeModeComponent::ENTER_SAFE_MODE_MAGIC;
+
+  if (is_manual_safe_mode) {
+    ESP_LOGI(TAG, "Safe mode invoked manually");
+  } else {
+    ESP_LOGCONFIG(TAG, "There have been %" PRIu32 " suspected unsuccessful boot attempts", this->safe_mode_rtc_value_);
+  }
+
+  if (this->safe_mode_rtc_value_ >= num_attempts || is_manual_safe_mode) {
+    this->clean_rtc();
+
+    if (!is_manual_safe_mode) {
+      ESP_LOGE(TAG, "Boot loop detected. Proceeding to safe mode");
+    }
+
+    this->status_set_error();
+    this->set_timeout(enable_time, []() {
+      ESP_LOGW(TAG, "Safe mode enable time has elapsed -- restarting");
+      App.reboot();
+    });
+
+    // Delay here to allow power to stabilize before Wi-Fi/Ethernet is initialised
+    delay(300);  // NOLINT
+    App.setup();
+
+    ESP_LOGW(TAG, "SAFE MODE IS ACTIVE");
+
+    return true;
+  } else {
+    // increment counter
+    this->write_rtc_(this->safe_mode_rtc_value_ + 1);
+    return false;
+  }
+}
+
+void SafeModeComponent::write_rtc_(uint32_t val) {
+  this->rtc_.save(&val);
+  global_preferences->sync();
+}
+
+uint32_t SafeModeComponent::read_rtc_() {
+  uint32_t val;
+  if (!this->rtc_.load(&val))
+    return 0;
+  return val;
+}
+
+void SafeModeComponent::clean_rtc() { this->write_rtc_(0); }
+
+void SafeModeComponent::on_safe_shutdown() {
+  if (this->read_rtc_() != SafeModeComponent::ENTER_SAFE_MODE_MAGIC)
+    this->clean_rtc();
+}
+
+}  // namespace safe_mode
+}  // namespace esphome
diff --git a/esphome/components/safe_mode/safe_mode.h b/esphome/components/safe_mode/safe_mode.h
new file mode 100644
index 0000000000..6c7450a6ff
--- /dev/null
+++ b/esphome/components/safe_mode/safe_mode.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/defines.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/preferences.h"
+
+namespace esphome {
+namespace safe_mode {
+
+/// SafeModeComponent provides a safe way to recover from repeated boot failures
+class SafeModeComponent : public Component {
+ public:
+  bool should_enter_safe_mode(uint8_t num_attempts, uint32_t enable_time);
+
+  /// Set to true if the next startup will enter safe mode
+  void set_safe_mode_pending(const bool &pending);
+  bool get_safe_mode_pending();
+
+  void dump_config() override;
+  float get_setup_priority() const override;
+  void loop() override;
+
+  void clean_rtc();
+
+  void on_safe_shutdown() override;
+
+ protected:
+  void write_rtc_(uint32_t val);
+  uint32_t read_rtc_();
+
+  bool boot_successful_{false};            ///< set to true after boot is considered successful
+  uint32_t safe_mode_start_time_;          ///< stores when safe mode was enabled
+  uint32_t safe_mode_enable_time_{60000};  ///< The time safe mode should remain active for
+  uint32_t safe_mode_rtc_value_;
+  uint8_t safe_mode_num_attempts_;
+  ESPPreferenceObject rtc_;
+
+  static const uint32_t ENTER_SAFE_MODE_MAGIC =
+      0x5afe5afe;  ///< a magic number to indicate that safe mode should be entered on next boot
+};
+
+}  // namespace safe_mode
+}  // namespace esphome
diff --git a/esphome/components/safe_mode/switch/__init__.py b/esphome/components/safe_mode/switch/__init__.py
index 0f8e500482..7271358149 100644
--- a/esphome/components/safe_mode/switch/__init__.py
+++ b/esphome/components/safe_mode/switch/__init__.py
@@ -1,15 +1,14 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import switch
-from esphome.components.esphome.ota import ESPHomeOTAComponent
 from esphome.const import (
-    CONF_ESPHOME,
+    CONF_SAFE_MODE,
     ENTITY_CATEGORY_CONFIG,
     ICON_RESTART_ALERT,
 )
-from .. import safe_mode_ns
+from .. import safe_mode_ns, SafeModeComponent
 
-DEPENDENCIES = ["ota.esphome"]
+DEPENDENCIES = ["safe_mode"]
 
 SafeModeSwitch = safe_mode_ns.class_("SafeModeSwitch", switch.Switch, cg.Component)
 
@@ -20,7 +19,7 @@ CONFIG_SCHEMA = (
         entity_category=ENTITY_CATEGORY_CONFIG,
         icon=ICON_RESTART_ALERT,
     )
-    .extend({cv.GenerateID(CONF_ESPHOME): cv.use_id(ESPHomeOTAComponent)})
+    .extend({cv.GenerateID(CONF_SAFE_MODE): cv.use_id(SafeModeComponent)})
     .extend(cv.COMPONENT_SCHEMA)
 )
 
@@ -29,5 +28,5 @@ async def to_code(config):
     var = await switch.new_switch(config)
     await cg.register_component(var, config)
 
-    ota = await cg.get_variable(config[CONF_ESPHOME])
-    cg.add(var.set_ota(ota))
+    safe_mode_component = await cg.get_variable(config[CONF_SAFE_MODE])
+    cg.add(var.set_safe_mode(safe_mode_component))
diff --git a/esphome/components/safe_mode/switch/safe_mode_switch.cpp b/esphome/components/safe_mode/switch/safe_mode_switch.cpp
index 71408df140..13b35ed210 100644
--- a/esphome/components/safe_mode/switch/safe_mode_switch.cpp
+++ b/esphome/components/safe_mode/switch/safe_mode_switch.cpp
@@ -6,9 +6,11 @@
 namespace esphome {
 namespace safe_mode {
 
-static const char *const TAG = "safe_mode_switch";
+static const char *const TAG = "safe_mode.switch";
 
-void SafeModeSwitch::set_ota(esphome::ESPHomeOTAComponent *ota) { this->ota_ = ota; }
+void SafeModeSwitch::set_safe_mode(SafeModeComponent *safe_mode_component) {
+  this->safe_mode_component_ = safe_mode_component;
+}
 
 void SafeModeSwitch::write_state(bool state) {
   // Acknowledge
@@ -16,13 +18,14 @@ void SafeModeSwitch::write_state(bool state) {
 
   if (state) {
     ESP_LOGI(TAG, "Restarting device in safe mode...");
-    this->ota_->set_safe_mode_pending(true);
+    this->safe_mode_component_->set_safe_mode_pending(true);
 
     // Let MQTT settle a bit
     delay(100);  // NOLINT
     App.safe_reboot();
   }
 }
+
 void SafeModeSwitch::dump_config() { LOG_SWITCH("", "Safe Mode Switch", this); }
 
 }  // namespace safe_mode
diff --git a/esphome/components/safe_mode/switch/safe_mode_switch.h b/esphome/components/safe_mode/switch/safe_mode_switch.h
index 5bd15a44de..24e660c803 100644
--- a/esphome/components/safe_mode/switch/safe_mode_switch.h
+++ b/esphome/components/safe_mode/switch/safe_mode_switch.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "esphome/components/esphome/ota/ota_esphome.h"
+#include "esphome/components/safe_mode/safe_mode.h"
 #include "esphome/components/switch/switch.h"
 #include "esphome/core/component.h"
 
@@ -10,10 +10,10 @@ namespace safe_mode {
 class SafeModeSwitch : public switch_::Switch, public Component {
  public:
   void dump_config() override;
-  void set_ota(esphome::ESPHomeOTAComponent *ota);
+  void set_safe_mode(SafeModeComponent *safe_mode_component);
 
  protected:
-  esphome::ESPHomeOTAComponent *ota_;
+  SafeModeComponent *safe_mode_component_;
   void write_state(bool state) override;
 };
 
diff --git a/esphome/cpp_helpers.py b/esphome/cpp_helpers.py
index ce494e5d9d..825224bb9d 100644
--- a/esphome/cpp_helpers.py
+++ b/esphome/cpp_helpers.py
@@ -3,12 +3,9 @@ import logging
 from esphome.const import (
     CONF_DISABLED_BY_DEFAULT,
     CONF_ENTITY_CATEGORY,
-    CONF_ESPHOME,
     CONF_ICON,
     CONF_INTERNAL,
     CONF_NAME,
-    CONF_OTA,
-    CONF_PLATFORM,
     CONF_SAFE_MODE,
     CONF_SETUP_PRIORITY,
     CONF_TYPE_ID,
@@ -141,22 +138,12 @@ async def build_registry_list(registry, config):
 
 
 async def past_safe_mode():
-    ota_conf = {}
-    for ota_item in CORE.config.get(CONF_OTA, []):
-        if ota_item[CONF_PLATFORM] == CONF_ESPHOME:
-            ota_conf = ota_item
-            break
-
-    if not ota_conf:
-        return
-
-    safe_mode_enabled = ota_conf[CONF_SAFE_MODE]
-    if not safe_mode_enabled:
+    if CONF_SAFE_MODE not in CORE.config:
         return
 
     def _safe_mode_generator():
         while True:
-            if CORE.data.get(CONF_OTA, {}).get(KEY_PAST_SAFE_MODE, False):
+            if CORE.data.get(CONF_SAFE_MODE, {}).get(KEY_PAST_SAFE_MODE, False):
                 return
             yield
 
diff --git a/tests/components/ota/common.yaml b/tests/components/ota/common.yaml
index 4910e2d891..1433dada1f 100644
--- a/tests/components/ota/common.yaml
+++ b/tests/components/ota/common.yaml
@@ -4,11 +4,8 @@ wifi:
 
 ota:
   - platform: esphome
-    safe_mode: true
     password: "superlongpasswordthatnoonewillknow"
     port: 3286
-    reboot_timeout: 2min
-    num_attempts: 5
     on_begin:
       then:
         - logger.log: "OTA start"
diff --git a/tests/components/safe_mode/common.yaml b/tests/components/safe_mode/common.yaml
index 1dfc516254..9c1d1ad3f9 100644
--- a/tests/components/safe_mode/common.yaml
+++ b/tests/components/safe_mode/common.yaml
@@ -2,9 +2,9 @@ wifi:
   ssid: MySSID
   password: password1
 
-ota:
-  - platform: esphome
-    safe_mode: true
+safe_mode:
+  num_attempts: 3
+  reboot_timeout: 2min
 
 button:
   - platform: safe_mode
diff --git a/tests/test1.yaml b/tests/test1.yaml
index dc46b55c44..2a20a1bb45 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -264,13 +264,14 @@ uart:
     parity: EVEN
     baud_rate: 9600
 
+safe_mode:
+  num_attempts: 3
+  reboot_timeout: 2min
+
 ota:
   - platform: esphome
-    safe_mode: true
     password: "superlongpasswordthatnoonewillknow"
     port: 3286
-    reboot_timeout: 2min
-    num_attempts: 5
     on_state_change:
       then:
         lambda: >-
diff --git a/tests/test2.yaml b/tests/test2.yaml
index 54ff4807a3..92977697c1 100644
--- a/tests/test2.yaml
+++ b/tests/test2.yaml
@@ -79,11 +79,11 @@ uart:
     sequence:
       - lambda: UARTDebug::log_hex(direction, bytes, ':');
 
+safe_mode:
+
 ota:
   - platform: esphome
-    safe_mode: true
     port: 3286
-    num_attempts: 15
 
 logger:
   level: DEBUG
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 7554d4bcb2..d10413b142 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -327,11 +327,13 @@ modbus:
 vbus:
   uart_id: uart_4
 
+safe_mode:
+  num_attempts: 5
+  reboot_timeout: 10min
+
 ota:
   - platform: esphome
-    safe_mode: true
     port: 3286
-    reboot_timeout: 15min
 
 logger:
   hardware_uart: UART1
diff --git a/tests/test4.yaml b/tests/test4.yaml
index 86beee81c6..c9e8a27317 100644
--- a/tests/test4.yaml
+++ b/tests/test4.yaml
@@ -102,9 +102,10 @@ uart:
     baud_rate: 1200
     parity: EVEN
 
+safe_mode:
+
 ota:
   - platform: esphome
-    safe_mode: true
     port: 3286
 
 logger:

From 1ca7c2d7ddc44f8debe288a98fbca3e40796f5cf Mon Sep 17 00:00:00 2001
From: Jeroen van Oort <jvanoort@simplexis.nl>
Date: Wed, 22 May 2024 06:17:32 +0200
Subject: [PATCH 02/29] Add support for acting as Modbus server (#4874)

Co-authored-by: Jeroen van Oort <jeroen.vanoort@webparking.nl>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/modbus/__init__.py         | 35 ++++++++++++
 esphome/components/modbus/modbus.cpp          | 27 ++++++---
 esphome/components/modbus/modbus.h            |  9 +++
 .../components/modbus_controller/__init__.py  | 52 +++++++++++++++--
 .../modbus_controller/modbus_controller.cpp   | 57 +++++++++++++++++--
 .../modbus_controller/modbus_controller.h     | 22 +++++++
 .../modbus_controller/test.esp32.yaml         | 22 ++++++-
 7 files changed, 203 insertions(+), 21 deletions(-)

diff --git a/esphome/components/modbus/__init__.py b/esphome/components/modbus/__init__.py
index 6fea7033f2..ae0c818c28 100644
--- a/esphome/components/modbus/__init__.py
+++ b/esphome/components/modbus/__init__.py
@@ -1,5 +1,9 @@
+from __future__ import annotations
+from typing import Literal
+
 import esphome.codegen as cg
 import esphome.config_validation as cv
+import esphome.final_validate as fv
 from esphome.cpp_helpers import gpio_pin_expression
 from esphome.components import uart
 from esphome.const import (
@@ -17,13 +21,21 @@ Modbus = modbus_ns.class_("Modbus", cg.Component, uart.UARTDevice)
 ModbusDevice = modbus_ns.class_("ModbusDevice")
 MULTI_CONF = True
 
+CONF_ROLE = "role"
 CONF_MODBUS_ID = "modbus_id"
 CONF_SEND_WAIT_TIME = "send_wait_time"
 
+ModbusRole = modbus_ns.enum("ModbusRole")
+MODBUS_ROLES = {
+    "client": ModbusRole.CLIENT,
+    "server": ModbusRole.SERVER,
+}
+
 CONFIG_SCHEMA = (
     cv.Schema(
         {
             cv.GenerateID(): cv.declare_id(Modbus),
+            cv.Optional(CONF_ROLE, default="client"): cv.enum(MODBUS_ROLES),
             cv.Optional(CONF_FLOW_CONTROL_PIN): pins.gpio_output_pin_schema,
             cv.Optional(
                 CONF_SEND_WAIT_TIME, default="250ms"
@@ -43,6 +55,7 @@ async def to_code(config):
 
     await uart.register_uart_device(var, config)
 
+    cg.add(var.set_role(config[CONF_ROLE]))
     if CONF_FLOW_CONTROL_PIN in config:
         pin = await gpio_pin_expression(config[CONF_FLOW_CONTROL_PIN])
         cg.add(var.set_flow_control_pin(pin))
@@ -62,6 +75,28 @@ def modbus_device_schema(default_address):
     return cv.Schema(schema)
 
 
+def final_validate_modbus_device(
+    name: str, *, role: Literal["server", "client"] | None = None
+):
+    def validate_role(value):
+        assert role in MODBUS_ROLES
+        if value != role:
+            raise cv.Invalid(f"Component {name} requires role to be {role}")
+        return value
+
+    def validate_hub(hub_config):
+        hub_schema = {}
+        if role is not None:
+            hub_schema[cv.Required(CONF_ROLE)] = validate_role
+
+        return cv.Schema(hub_schema, extra=cv.ALLOW_EXTRA)(hub_config)
+
+    return cv.Schema(
+        {cv.Required(CONF_MODBUS_ID): fv.id_declaration_match_schema(validate_hub)},
+        extra=cv.ALLOW_EXTRA,
+    )
+
+
 async def register_modbus_device(var, config):
     parent = await cg.get_variable(config[CONF_MODBUS_ID])
     cg.add(var.set_parent(parent))
diff --git a/esphome/components/modbus/modbus.cpp b/esphome/components/modbus/modbus.cpp
index 137fb0b26b..f8dd4c18b9 100644
--- a/esphome/components/modbus/modbus.cpp
+++ b/esphome/components/modbus/modbus.cpp
@@ -77,7 +77,13 @@ bool Modbus::parse_modbus_byte_(uint8_t byte) {
     ESP_LOGD(TAG, "Modbus user-defined function %02X found", function_code);
 
   } else {
-    // the response for write command mirrors the requests and data startes at offset 2 instead of 3 for read commands
+    // data starts at 2 and length is 4 for read registers commands
+    if (this->role == ModbusRole::SERVER && (function_code == 0x3 || function_code == 0x4)) {
+      data_offset = 2;
+      data_len = 4;
+    }
+
+    // the response for write command mirrors the requests and data starts at offset 2 instead of 3 for read commands
     if (function_code == 0x5 || function_code == 0x06 || function_code == 0xF || function_code == 0x10) {
       data_offset = 2;
       data_len = 4;
@@ -123,6 +129,9 @@ bool Modbus::parse_modbus_byte_(uint8_t byte) {
           // Ignore modbus exception not related to a pending command
           ESP_LOGD(TAG, "Ignoring Modbus error - not expecting a response");
         }
+      } else if (this->role == ModbusRole::SERVER && (function_code == 0x3 || function_code == 0x4)) {
+        device->on_modbus_read_registers(function_code, uint16_t(data[1]) | (uint16_t(data[0]) << 8),
+                                         uint16_t(data[3]) | (uint16_t(data[2]) << 8));
       } else {
         device->on_modbus_data(data);
       }
@@ -164,16 +173,18 @@ void Modbus::send(uint8_t address, uint8_t function_code, uint16_t start_address
   std::vector<uint8_t> data;
   data.push_back(address);
   data.push_back(function_code);
-  data.push_back(start_address >> 8);
-  data.push_back(start_address >> 0);
-  if (function_code != 0x5 && function_code != 0x6) {
-    data.push_back(number_of_entities >> 8);
-    data.push_back(number_of_entities >> 0);
+  if (this->role == ModbusRole::CLIENT) {
+    data.push_back(start_address >> 8);
+    data.push_back(start_address >> 0);
+    if (function_code != 0x5 && function_code != 0x6) {
+      data.push_back(number_of_entities >> 8);
+      data.push_back(number_of_entities >> 0);
+    }
   }
 
   if (payload != nullptr) {
-    if (function_code == 0xF || function_code == 0x10) {  // Write multiple
-      data.push_back(payload_len);                        // Byte count is required for write
+    if (this->role == ModbusRole::SERVER || function_code == 0xF || function_code == 0x10) {  // Write multiple
+      data.push_back(payload_len);  // Byte count is required for write
     } else {
       payload_len = 2;  // Write single register or coil
     }
diff --git a/esphome/components/modbus/modbus.h b/esphome/components/modbus/modbus.h
index dd8732c6e9..4a78ed4aab 100644
--- a/esphome/components/modbus/modbus.h
+++ b/esphome/components/modbus/modbus.h
@@ -8,6 +8,11 @@
 namespace esphome {
 namespace modbus {
 
+enum ModbusRole {
+  CLIENT,
+  SERVER,
+};
+
 class ModbusDevice;
 
 class Modbus : public uart::UARTDevice, public Component {
@@ -27,11 +32,14 @@ class Modbus : public uart::UARTDevice, public Component {
   void send(uint8_t address, uint8_t function_code, uint16_t start_address, uint16_t number_of_entities,
             uint8_t payload_len = 0, const uint8_t *payload = nullptr);
   void send_raw(const std::vector<uint8_t> &payload);
+  void set_role(ModbusRole role) { this->role = role; }
   void set_flow_control_pin(GPIOPin *flow_control_pin) { this->flow_control_pin_ = flow_control_pin; }
   uint8_t waiting_for_response{0};
   void set_send_wait_time(uint16_t time_in_ms) { send_wait_time_ = time_in_ms; }
   void set_disable_crc(bool disable_crc) { disable_crc_ = disable_crc; }
 
+  ModbusRole role;
+
  protected:
   GPIOPin *flow_control_pin_{nullptr};
 
@@ -50,6 +58,7 @@ class ModbusDevice {
   void set_address(uint8_t address) { address_ = address; }
   virtual void on_modbus_data(const std::vector<uint8_t> &data) = 0;
   virtual void on_modbus_error(uint8_t function_code, uint8_t exception_code) {}
+  virtual void on_modbus_read_registers(uint8_t function_code, uint16_t start_address, uint16_t number_of_registers){};
   void send(uint8_t function, uint16_t start_address, uint16_t number_of_entities, uint8_t payload_len = 0,
             const uint8_t *payload = nullptr) {
     this->parent_->send(this->address_, function, start_address, number_of_entities, payload_len, payload);
diff --git a/esphome/components/modbus_controller/__init__.py b/esphome/components/modbus_controller/__init__.py
index 8703771c3a..b8ab48fcc6 100644
--- a/esphome/components/modbus_controller/__init__.py
+++ b/esphome/components/modbus_controller/__init__.py
@@ -23,6 +23,8 @@ CODEOWNERS = ["@martgras"]
 
 AUTO_LOAD = ["modbus"]
 
+CONF_READ_LAMBDA = "read_lambda"
+CONF_SERVER_REGISTERS = "server_registers"
 MULTI_CONF = True
 
 modbus_controller_ns = cg.esphome_ns.namespace("modbus_controller")
@@ -31,6 +33,7 @@ ModbusController = modbus_controller_ns.class_(
 )
 
 SensorItem = modbus_controller_ns.struct("SensorItem")
+ServerRegister = modbus_controller_ns.struct("ServerRegister")
 
 ModbusFunctionCode_ns = modbus_controller_ns.namespace("ModbusFunctionCode")
 ModbusFunctionCode = ModbusFunctionCode_ns.enum("ModbusFunctionCode")
@@ -94,10 +97,18 @@ TYPE_REGISTER_MAP = {
     "FP32_R": 2,
 }
 
-MULTI_CONF = True
-
 _LOGGER = logging.getLogger(__name__)
 
+ModbusServerRegisterSchema = cv.Schema(
+    {
+        cv.GenerateID(): cv.declare_id(ServerRegister),
+        cv.Required(CONF_ADDRESS): cv.positive_int,
+        cv.Optional(CONF_VALUE_TYPE, default="U_WORD"): cv.enum(SENSOR_VALUE_TYPE),
+        cv.Required(CONF_READ_LAMBDA): cv.returning_lambda,
+    }
+)
+
+
 CONFIG_SCHEMA = cv.All(
     cv.Schema(
         {
@@ -106,6 +117,9 @@ CONFIG_SCHEMA = cv.All(
                 CONF_COMMAND_THROTTLE, default="0ms"
             ): cv.positive_time_period_milliseconds,
             cv.Optional(CONF_OFFLINE_SKIP_UPDATES, default=0): cv.positive_int,
+            cv.Optional(
+                CONF_SERVER_REGISTERS,
+            ): cv.ensure_list(ModbusServerRegisterSchema),
         }
     )
     .extend(cv.polling_component_schema("60s"))
@@ -154,6 +168,17 @@ def validate_modbus_register(config):
     return config
 
 
+def _final_validate(config):
+    if CONF_SERVER_REGISTERS in config:
+        return modbus.final_validate_modbus_device("modbus_controller", role="server")(
+            config
+        )
+    return config
+
+
+FINAL_VALIDATE_SCHEMA = _final_validate
+
+
 def modbus_calc_properties(config):
     byte_offset = 0
     reg_count = 0
@@ -183,7 +208,7 @@ def modbus_calc_properties(config):
 
 
 async def add_modbus_base_properties(
-    var, config, sensor_type, lamdba_param_type=cg.float_, lamdba_return_type=float
+    var, config, sensor_type, lambda_param_type=cg.float_, lambda_return_type=float
 ):
     if CONF_CUSTOM_COMMAND in config:
         cg.add(var.set_custom_data(config[CONF_CUSTOM_COMMAND]))
@@ -196,13 +221,13 @@ async def add_modbus_base_properties(
             config[CONF_LAMBDA],
             [
                 (sensor_type.operator("ptr"), "item"),
-                (lamdba_param_type, "x"),
+                (lambda_param_type, "x"),
                 (
                     cg.std_vector.template(cg.uint8).operator("const").operator("ref"),
                     "data",
                 ),
             ],
-            return_type=cg.optional.template(lamdba_return_type),
+            return_type=cg.optional.template(lambda_return_type),
         )
         cg.add(var.set_template(template_))
 
@@ -211,6 +236,23 @@ async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_command_throttle(config[CONF_COMMAND_THROTTLE]))
     cg.add(var.set_offline_skip_updates(config[CONF_OFFLINE_SKIP_UPDATES]))
+    if CONF_SERVER_REGISTERS in config:
+        for server_register in config[CONF_SERVER_REGISTERS]:
+            cg.add(
+                var.add_server_register(
+                    cg.new_Pvariable(
+                        server_register[CONF_ID],
+                        server_register[CONF_ADDRESS],
+                        server_register[CONF_VALUE_TYPE],
+                        TYPE_REGISTER_MAP[server_register[CONF_VALUE_TYPE]],
+                        await cg.process_lambda(
+                            server_register[CONF_READ_LAMBDA],
+                            [],
+                            return_type=cg.float_,
+                        ),
+                    )
+                )
+            )
     await register_modbus_device(var, config)
 
 
diff --git a/esphome/components/modbus_controller/modbus_controller.cpp b/esphome/components/modbus_controller/modbus_controller.cpp
index 7565dc5e1b..9f73988b03 100644
--- a/esphome/components/modbus_controller/modbus_controller.cpp
+++ b/esphome/components/modbus_controller/modbus_controller.cpp
@@ -7,10 +7,7 @@ namespace modbus_controller {
 
 static const char *const TAG = "modbus_controller";
 
-void ModbusController::setup() {
-  // Modbus::setup();
-  this->create_register_ranges_();
-}
+void ModbusController::setup() { this->create_register_ranges_(); }
 
 /*
  To work with the existing modbus class and avoid polling for responses a command queue is used.
@@ -102,6 +99,51 @@ void ModbusController::on_modbus_error(uint8_t function_code, uint8_t exception_
   }
 }
 
+void ModbusController::on_modbus_read_registers(uint8_t function_code, uint16_t start_address,
+                                                uint16_t number_of_registers) {
+  ESP_LOGD(TAG,
+           "Received read holding/input registers for device 0x%X. FC: 0x%X. Start address: 0x%X. Number of registers: "
+           "0x%X.",
+           this->address_, function_code, start_address, number_of_registers);
+
+  std::vector<uint16_t> sixteen_bit_response;
+  for (uint16_t current_address = start_address; current_address < start_address + number_of_registers;) {
+    bool found = false;
+    for (auto *server_register : this->server_registers_) {
+      if (server_register->address == current_address) {
+        float value = server_register->read_lambda();
+
+        ESP_LOGD(TAG, "Matched register. Address: 0x%02X. Value type: %zu. Register count: %u. Value: %0.1f.",
+                 server_register->address, static_cast<uint8_t>(server_register->value_type),
+                 server_register->register_count, value);
+        number_to_payload(sixteen_bit_response, value, server_register->value_type);
+        current_address += server_register->register_count;
+        found = true;
+        break;
+      }
+    }
+
+    if (!found) {
+      ESP_LOGW(TAG, "Could not match any register to address %02X. Sending exception response.", current_address);
+      std::vector<uint8_t> error_response;
+      error_response.push_back(this->address_);
+      error_response.push_back(0x81);
+      error_response.push_back(0x02);
+      this->send_raw(error_response);
+      return;
+    }
+  }
+
+  std::vector<uint8_t> response;
+  for (auto v : sixteen_bit_response) {
+    auto decoded_value = decode_value(v);
+    response.push_back(decoded_value[0]);
+    response.push_back(decoded_value[1]);
+  }
+
+  this->send(function_code, start_address, number_of_registers, response.size(), response.data());
+}
+
 SensorSet ModbusController::find_sensors_(ModbusRegisterType register_type, uint16_t start_address) const {
   auto reg_it = find_if(begin(register_ranges_), end(register_ranges_), [=](RegisterRange const &r) {
     return (r.start_address == start_address && r.register_type == register_type);
@@ -190,7 +232,7 @@ void ModbusController::update() {
 // walk through the sensors and determine the register ranges to read
 size_t ModbusController::create_register_ranges_() {
   register_ranges_.clear();
-  if (sensorset_.empty()) {
+  if (this->parent_->role == modbus::ModbusRole::CLIENT && sensorset_.empty()) {
     ESP_LOGW(TAG, "No sensors registered");
     return 0;
   }
@@ -309,6 +351,11 @@ void ModbusController::dump_config() {
     ESP_LOGCONFIG(TAG, "  Range type=%zu start=0x%X count=%d skip_updates=%d", static_cast<uint8_t>(it.register_type),
                   it.start_address, it.register_count, it.skip_updates);
   }
+  ESP_LOGCONFIG(TAG, "server registers");
+  for (auto &r : server_registers_) {
+    ESP_LOGCONFIG(TAG, "  Address=0x%02X value_type=%zu register_count=%u", r->address,
+                  static_cast<uint8_t>(r->value_type), r->register_count);
+  }
 #endif
 }
 
diff --git a/esphome/components/modbus_controller/modbus_controller.h b/esphome/components/modbus_controller/modbus_controller.h
index a389375523..9b7d59c93f 100644
--- a/esphome/components/modbus_controller/modbus_controller.h
+++ b/esphome/components/modbus_controller/modbus_controller.h
@@ -8,6 +8,7 @@
 #include <list>
 #include <queue>
 #include <set>
+#include <utility>
 #include <vector>
 
 namespace esphome {
@@ -251,6 +252,21 @@ class SensorItem {
   bool force_new_range{false};
 };
 
+class ServerRegister {
+ public:
+  ServerRegister(uint16_t address, SensorValueType value_type, uint8_t register_count,
+                 std::function<float()> read_lambda) {
+    this->address = address;
+    this->value_type = value_type;
+    this->register_count = register_count;
+    this->read_lambda = std::move(read_lambda);
+  }
+  uint16_t address;
+  SensorValueType value_type;
+  uint8_t register_count;
+  std::function<float()> read_lambda;
+};
+
 // ModbusController::create_register_ranges_ tries to optimize register range
 // for this the sensors must be ordered by register_type, start_address and bitmask
 class SensorItemsComparator {
@@ -418,10 +434,14 @@ class ModbusController : public PollingComponent, public modbus::ModbusDevice {
   void queue_command(const ModbusCommandItem &command);
   /// Registers a sensor with the controller. Called by esphomes code generator
   void add_sensor_item(SensorItem *item) { sensorset_.insert(item); }
+  /// Registers a server register with the controller. Called by esphomes code generator
+  void add_server_register(ServerRegister *server_register) { server_registers_.push_back(server_register); }
   /// called when a modbus response was parsed without errors
   void on_modbus_data(const std::vector<uint8_t> &data) override;
   /// called when a modbus error response was received
   void on_modbus_error(uint8_t function_code, uint8_t exception_code) override;
+  /// called when a modbus request (function code 3 or 4) was parsed without errors
+  void on_modbus_read_registers(uint8_t function_code, uint16_t start_address, uint16_t number_of_registers) final;
   /// default delegate called by process_modbus_data when a response has retrieved from the incoming queue
   void on_register_data(ModbusRegisterType register_type, uint16_t start_address, const std::vector<uint8_t> &data);
   /// default delegate called by process_modbus_data when a response for a write response has retrieved from the
@@ -452,6 +472,8 @@ class ModbusController : public PollingComponent, public modbus::ModbusDevice {
   void dump_sensors_();
   /// Collection of all sensors for this component
   SensorSet sensorset_;
+  /// Collection of all server registers for this component
+  std::vector<ServerRegister *> server_registers_;
   /// Continuous range of modbus registers
   std::vector<RegisterRange> register_ranges_;
   /// Hold the pending requests to be sent
diff --git a/tests/components/modbus_controller/test.esp32.yaml b/tests/components/modbus_controller/test.esp32.yaml
index c5fe3fd057..3e022b10ab 100644
--- a/tests/components/modbus_controller/test.esp32.yaml
+++ b/tests/components/modbus_controller/test.esp32.yaml
@@ -1,14 +1,30 @@
 uart:
-  - id: uart_modbus
+  - id: uart_modbus_client
     tx_pin: 17
     rx_pin: 16
     baud_rate: 9600
+  - id: uart_modbus_server
+    tx_pin: 1
+    rx_pin: 3
+    baud_rate: 9600
 
 modbus:
-  id: mod_bus1
-  flow_control_pin: 15
+  - id: mod_bus1
+    uart_id: uart_modbus_client
+    flow_control_pin: 15
+  - id: mod_bus2
+    uart_id: uart_modbus_server
+    role: server
 
 modbus_controller:
   - id: modbus_controller1
     address: 0x2
     modbus_id: mod_bus1
+  - id: modbus_controller2
+    address: 0x2
+    modbus_id: mod_bus2
+    server_registers:
+      - address: 0x0000
+        value_type: S_DWORD_R
+        read_lambda: |-
+          return 42.3;

From 9a6fde21ee2fa4049e8c12760b8a12cf49cf4c94 Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Wed, 22 May 2024 14:43:13 -0500
Subject: [PATCH 03/29] Add on_safe_mode trigger (#6790)

---
 esphome/components/safe_mode/__init__.py   | 14 ++++++++++++++
 esphome/components/safe_mode/automation.h  | 17 +++++++++++++++++
 esphome/components/safe_mode/safe_mode.cpp |  2 ++
 esphome/components/safe_mode/safe_mode.h   |  5 +++++
 tests/components/safe_mode/common.yaml     |  2 ++
 5 files changed, 40 insertions(+)
 create mode 100644 esphome/components/safe_mode/automation.h

diff --git a/esphome/components/safe_mode/__init__.py b/esphome/components/safe_mode/__init__.py
index 7f227d7dd1..92b285e279 100644
--- a/esphome/components/safe_mode/__init__.py
+++ b/esphome/components/safe_mode/__init__.py
@@ -7,15 +7,20 @@ from esphome.const import (
     CONF_NUM_ATTEMPTS,
     CONF_REBOOT_TIMEOUT,
     CONF_SAFE_MODE,
+    CONF_TRIGGER_ID,
     KEY_PAST_SAFE_MODE,
 )
 from esphome.core import CORE, coroutine_with_priority
+from esphome import automation
 
 
 CODEOWNERS = ["@paulmonigatti", "@jsuanet", "@kbx81"]
 
+CONF_ON_SAFE_MODE = "on_safe_mode"
+
 safe_mode_ns = cg.esphome_ns.namespace("safe_mode")
 SafeModeComponent = safe_mode_ns.class_("SafeModeComponent", cg.Component)
+SafeModeTrigger = safe_mode_ns.class_("SafeModeTrigger", automation.Trigger.template())
 
 
 def _remove_id_if_disabled(value):
@@ -34,6 +39,11 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(
                 CONF_REBOOT_TIMEOUT, default="5min"
             ): cv.positive_time_period_milliseconds,
+            cv.Optional(CONF_ON_SAFE_MODE): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(SafeModeTrigger),
+                }
+            ),
         }
     ).extend(cv.COMPONENT_SCHEMA),
     _remove_id_if_disabled,
@@ -48,6 +58,10 @@ async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
+    for conf in config.get(CONF_ON_SAFE_MODE, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
+
     condition = var.should_enter_safe_mode(
         config[CONF_NUM_ATTEMPTS], config[CONF_REBOOT_TIMEOUT]
     )
diff --git a/esphome/components/safe_mode/automation.h b/esphome/components/safe_mode/automation.h
new file mode 100644
index 0000000000..d1388449ee
--- /dev/null
+++ b/esphome/components/safe_mode/automation.h
@@ -0,0 +1,17 @@
+#pragma once
+#include "safe_mode.h"
+
+#include "esphome/core/automation.h"
+
+namespace esphome {
+namespace safe_mode {
+
+class SafeModeTrigger : public Trigger<> {
+ public:
+  explicit SafeModeTrigger(SafeModeComponent *parent) {
+    parent->add_on_safe_mode_callback([this, parent]() { trigger(); });
+  }
+};
+
+}  // namespace safe_mode
+}  // namespace esphome
diff --git a/esphome/components/safe_mode/safe_mode.cpp b/esphome/components/safe_mode/safe_mode.cpp
index 06772ae1e0..6934dcb9d9 100644
--- a/esphome/components/safe_mode/safe_mode.cpp
+++ b/esphome/components/safe_mode/safe_mode.cpp
@@ -94,6 +94,8 @@ bool SafeModeComponent::should_enter_safe_mode(uint8_t num_attempts, uint32_t en
 
     ESP_LOGW(TAG, "SAFE MODE IS ACTIVE");
 
+    this->safe_mode_callback_.call();
+
     return true;
   } else {
     // increment counter
diff --git a/esphome/components/safe_mode/safe_mode.h b/esphome/components/safe_mode/safe_mode.h
index 6c7450a6ff..0ec3c29529 100644
--- a/esphome/components/safe_mode/safe_mode.h
+++ b/esphome/components/safe_mode/safe_mode.h
@@ -25,6 +25,10 @@ class SafeModeComponent : public Component {
 
   void on_safe_shutdown() override;
 
+  void add_on_safe_mode_callback(std::function<void()> &&callback) {
+    this->safe_mode_callback_.add(std::move(callback));
+  }
+
  protected:
   void write_rtc_(uint32_t val);
   uint32_t read_rtc_();
@@ -35,6 +39,7 @@ class SafeModeComponent : public Component {
   uint32_t safe_mode_rtc_value_;
   uint8_t safe_mode_num_attempts_;
   ESPPreferenceObject rtc_;
+  CallbackManager<void()> safe_mode_callback_{};
 
   static const uint32_t ENTER_SAFE_MODE_MAGIC =
       0x5afe5afe;  ///< a magic number to indicate that safe mode should be entered on next boot
diff --git a/tests/components/safe_mode/common.yaml b/tests/components/safe_mode/common.yaml
index 9c1d1ad3f9..ce8bf2f0cf 100644
--- a/tests/components/safe_mode/common.yaml
+++ b/tests/components/safe_mode/common.yaml
@@ -5,6 +5,8 @@ wifi:
 safe_mode:
   num_attempts: 3
   reboot_timeout: 2min
+  on_safe_mode:
+    - logger.log: Time for safe mode
 
 button:
   - platform: safe_mode

From 7f9383c83b1a4758b3950bf91333222d4ba40ca3 Mon Sep 17 00:00:00 2001
From: Penny Wood <Swamp-Ig@users.noreply.github.com>
Date: Thu, 23 May 2024 05:31:56 +0800
Subject: [PATCH 04/29] [sx1509] Output open drain pin mode (#6788)

---
 esphome/components/sx1509/__init__.py         |  4 ++
 esphome/components/sx1509/sx1509.cpp          | 56 ++++++++++++++-----
 .../components/sx1509/test.esp32-c3-idf.yaml  | 18 ++++++
 tests/components/sx1509/test.esp32-c3.yaml    | 18 ++++++
 tests/components/sx1509/test.esp32-idf.yaml   | 18 ++++++
 tests/components/sx1509/test.esp32.yaml       | 18 ++++++
 tests/components/sx1509/test.esp8266.yaml     | 18 ++++++
 tests/components/sx1509/test.rp2040.yaml      | 18 ++++++
 8 files changed, 155 insertions(+), 13 deletions(-)

diff --git a/esphome/components/sx1509/__init__.py b/esphome/components/sx1509/__init__.py
index faef940125..e4f79dc2bc 100644
--- a/esphome/components/sx1509/__init__.py
+++ b/esphome/components/sx1509/__init__.py
@@ -11,6 +11,7 @@ from esphome.const import (
     CONF_OUTPUT,
     CONF_PULLDOWN,
     CONF_PULLUP,
+    CONF_OPEN_DRAIN,
 )
 
 CONF_KEYPAD = "keypad"
@@ -79,6 +80,8 @@ def validate_mode(value):
         raise cv.Invalid("Pulldown only available with input")
     if value[CONF_PULLUP] and value[CONF_PULLDOWN]:
         raise cv.Invalid("Can only have one of pullup or pulldown")
+    if value[CONF_OPEN_DRAIN] and not value[CONF_OUTPUT]:
+        raise cv.Invalid("Open drain available only with output")
     return value
 
 
@@ -94,6 +97,7 @@ SX1509_PIN_SCHEMA = cv.All(
                 cv.Optional(CONF_PULLUP, default=False): cv.boolean,
                 cv.Optional(CONF_PULLDOWN, default=False): cv.boolean,
                 cv.Optional(CONF_OUTPUT, default=False): cv.boolean,
+                cv.Optional(CONF_OPEN_DRAIN, default=False): cv.boolean,
             },
             validate_mode,
         ),
diff --git a/esphome/components/sx1509/sx1509.cpp b/esphome/components/sx1509/sx1509.cpp
index ee90e0e410..855a90bacd 100644
--- a/esphome/components/sx1509/sx1509.cpp
+++ b/esphome/components/sx1509/sx1509.cpp
@@ -86,33 +86,63 @@ void SX1509Component::digital_write(uint8_t pin, bool bit_value) {
 }
 
 void SX1509Component::pin_mode(uint8_t pin, gpio::Flags flags) {
+  ESP_LOGI(TAG, "Configuring pin %u with flags %x", pin, flags);
+
+  uint16_t temp_word = 0;
+
   this->read_byte_16(REG_DIR_B, &this->ddr_mask_);
-  if (flags == gpio::FLAG_OUTPUT) {
+  if (flags & gpio::FLAG_OUTPUT) {
+    // Always disable input buffer
+    this->read_byte_16(REG_INPUT_DISABLE_B, &temp_word);
+    temp_word |= (1 << pin);
+    this->write_byte_16(REG_INPUT_DISABLE_B, temp_word);
+
+    if (flags & gpio::FLAG_OPEN_DRAIN) {
+      // Pullup must be disabled for open drain mode
+      this->read_byte_16(REG_PULL_UP_B, &temp_word);
+      temp_word &= ~(1 << pin);
+      this->write_byte_16(REG_PULL_UP_B, temp_word);
+      this->read_byte_16(REG_OPEN_DRAIN_B, &temp_word);
+      temp_word |= (1 << pin);
+      this->write_byte_16(REG_OPEN_DRAIN_B, temp_word);
+      ESP_LOGD(TAG, "Open drain output mode set for %u", pin);
+    } else {
+      ESP_LOGD(TAG, "Output Mode for %u", pin);
+    }
+
+    // Set direction to output
     this->ddr_mask_ &= ~(1 << pin);
+    this->write_byte_16(REG_DIR_B, this->ddr_mask_);
   } else {
-    this->ddr_mask_ |= (1 << pin);
+    ESP_LOGD(TAG, "Input Mode for %u", pin);
 
-    uint16_t temp_pullup;
-    this->read_byte_16(REG_PULL_UP_B, &temp_pullup);
-    uint16_t temp_pulldown;
-    this->read_byte_16(REG_PULL_DOWN_B, &temp_pulldown);
+    // Always enable input buffer
+    this->read_byte_16(REG_INPUT_DISABLE_B, &temp_word);
+    temp_word &= ~(1 << pin);
+    this->write_byte_16(REG_INPUT_DISABLE_B, temp_word);
 
+    // Pullup
+    this->read_byte_16(REG_PULL_UP_B, &temp_word);
     if (flags & gpio::FLAG_PULLUP) {
-      temp_pullup |= (1 << pin);
+      temp_word |= (1 << pin);
     } else {
-      temp_pullup &= ~(1 << pin);
+      temp_word &= ~(1 << pin);
     }
+    this->write_byte_16(REG_PULL_UP_B, temp_word);
 
+    // Pulldown
+    this->read_byte_16(REG_PULL_DOWN_B, &temp_word);
     if (flags & gpio::FLAG_PULLDOWN) {
-      temp_pulldown |= (1 << pin);
+      temp_word |= (1 << pin);
     } else {
-      temp_pulldown &= ~(1 << pin);
+      temp_word &= ~(1 << pin);
     }
+    this->write_byte_16(REG_PULL_DOWN_B, temp_word);
 
-    this->write_byte_16(REG_PULL_UP_B, temp_pullup);
-    this->write_byte_16(REG_PULL_DOWN_B, temp_pulldown);
+    // Set direction to input
+    this->ddr_mask_ |= (1 << pin);
+    this->write_byte_16(REG_DIR_B, this->ddr_mask_);
   }
-  this->write_byte_16(REG_DIR_B, this->ddr_mask_);
 }
 
 void SX1509Component::setup_led_driver(uint8_t pin) {
diff --git a/tests/components/sx1509/test.esp32-c3-idf.yaml b/tests/components/sx1509/test.esp32-c3-idf.yaml
index ced849b3df..0397812880 100644
--- a/tests/components/sx1509/test.esp32-c3-idf.yaml
+++ b/tests/components/sx1509/test.esp32-c3-idf.yaml
@@ -13,3 +13,21 @@ binary_sensor:
     pin:
       sx1509: sx1509_hub
       number: 3
+
+switch:
+  - platform: gpio
+    name: GPIO SX1509 Test Out Open Drain
+    pin:
+      sx1509: sx1509_hub
+      number: 0
+      mode:
+        output: true
+        open_drain: true
+
+  - platform: gpio
+    name: GPIO SX1509 Test Out Standard
+    pin:
+      sx1509: sx1509_hub
+      number: 1
+      mode:
+        output: true
diff --git a/tests/components/sx1509/test.esp32-c3.yaml b/tests/components/sx1509/test.esp32-c3.yaml
index ced849b3df..0397812880 100644
--- a/tests/components/sx1509/test.esp32-c3.yaml
+++ b/tests/components/sx1509/test.esp32-c3.yaml
@@ -13,3 +13,21 @@ binary_sensor:
     pin:
       sx1509: sx1509_hub
       number: 3
+
+switch:
+  - platform: gpio
+    name: GPIO SX1509 Test Out Open Drain
+    pin:
+      sx1509: sx1509_hub
+      number: 0
+      mode:
+        output: true
+        open_drain: true
+
+  - platform: gpio
+    name: GPIO SX1509 Test Out Standard
+    pin:
+      sx1509: sx1509_hub
+      number: 1
+      mode:
+        output: true
diff --git a/tests/components/sx1509/test.esp32-idf.yaml b/tests/components/sx1509/test.esp32-idf.yaml
index 1698f2abc4..aa1d161a43 100644
--- a/tests/components/sx1509/test.esp32-idf.yaml
+++ b/tests/components/sx1509/test.esp32-idf.yaml
@@ -13,3 +13,21 @@ binary_sensor:
     pin:
       sx1509: sx1509_hub
       number: 3
+
+switch:
+  - platform: gpio
+    name: GPIO SX1509 Test Out Open Drain
+    pin:
+      sx1509: sx1509_hub
+      number: 0
+      mode:
+        output: true
+        open_drain: true
+
+  - platform: gpio
+    name: GPIO SX1509 Test Out Standard
+    pin:
+      sx1509: sx1509_hub
+      number: 1
+      mode:
+        output: true
diff --git a/tests/components/sx1509/test.esp32.yaml b/tests/components/sx1509/test.esp32.yaml
index 1698f2abc4..aa1d161a43 100644
--- a/tests/components/sx1509/test.esp32.yaml
+++ b/tests/components/sx1509/test.esp32.yaml
@@ -13,3 +13,21 @@ binary_sensor:
     pin:
       sx1509: sx1509_hub
       number: 3
+
+switch:
+  - platform: gpio
+    name: GPIO SX1509 Test Out Open Drain
+    pin:
+      sx1509: sx1509_hub
+      number: 0
+      mode:
+        output: true
+        open_drain: true
+
+  - platform: gpio
+    name: GPIO SX1509 Test Out Standard
+    pin:
+      sx1509: sx1509_hub
+      number: 1
+      mode:
+        output: true
diff --git a/tests/components/sx1509/test.esp8266.yaml b/tests/components/sx1509/test.esp8266.yaml
index ced849b3df..0397812880 100644
--- a/tests/components/sx1509/test.esp8266.yaml
+++ b/tests/components/sx1509/test.esp8266.yaml
@@ -13,3 +13,21 @@ binary_sensor:
     pin:
       sx1509: sx1509_hub
       number: 3
+
+switch:
+  - platform: gpio
+    name: GPIO SX1509 Test Out Open Drain
+    pin:
+      sx1509: sx1509_hub
+      number: 0
+      mode:
+        output: true
+        open_drain: true
+
+  - platform: gpio
+    name: GPIO SX1509 Test Out Standard
+    pin:
+      sx1509: sx1509_hub
+      number: 1
+      mode:
+        output: true
diff --git a/tests/components/sx1509/test.rp2040.yaml b/tests/components/sx1509/test.rp2040.yaml
index ced849b3df..0397812880 100644
--- a/tests/components/sx1509/test.rp2040.yaml
+++ b/tests/components/sx1509/test.rp2040.yaml
@@ -13,3 +13,21 @@ binary_sensor:
     pin:
       sx1509: sx1509_hub
       number: 3
+
+switch:
+  - platform: gpio
+    name: GPIO SX1509 Test Out Open Drain
+    pin:
+      sx1509: sx1509_hub
+      number: 0
+      mode:
+        output: true
+        open_drain: true
+
+  - platform: gpio
+    name: GPIO SX1509 Test Out Standard
+    pin:
+      sx1509: sx1509_hub
+      number: 1
+      mode:
+        output: true

From 4ab7a5d964c5a2d956e873292ef061d21d8ddf66 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 23 May 2024 17:04:33 +1200
Subject: [PATCH 05/29] [ledc] Change some logging lines from debug to verbose
 (#6796)

---
 esphome/components/ledc/ledc_output.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/ledc/ledc_output.cpp b/esphome/components/ledc/ledc_output.cpp
index 0533143d37..1040ac25b6 100644
--- a/esphome/components/ledc/ledc_output.cpp
+++ b/esphome/components/ledc/ledc_output.cpp
@@ -52,12 +52,12 @@ float ledc_min_frequency_for_bit_depth(uint8_t bit_depth, bool low_frequency) {
 }
 
 optional<uint8_t> ledc_bit_depth_for_frequency(float frequency) {
-  ESP_LOGD(TAG, "Calculating resolution bit-depth for frequency %f", frequency);
+  ESP_LOGV(TAG, "Calculating resolution bit-depth for frequency %f", frequency);
   for (int i = MAX_RES_BITS; i >= 1; i--) {
     const float min_frequency = ledc_min_frequency_for_bit_depth(i, (frequency < 100));
     const float max_frequency = ledc_max_frequency_for_bit_depth(i);
     if (min_frequency <= frequency && frequency <= max_frequency) {
-      ESP_LOGD(TAG, "Resolution calculated as %d", i);
+      ESP_LOGV(TAG, "Resolution calculated as %d", i);
       return i;
     }
   }

From aed0593793d8595d3e32737ffe77805dd02e1f95 Mon Sep 17 00:00:00 2001
From: Pavlo Dudnytskyi <paveldudn@gmail.com>
Date: Thu, 23 May 2024 23:07:39 +0200
Subject: [PATCH 06/29] [haier] ``text_sensor`` and ``button`` platforms
 (#6780)

---
 CODEOWNERS                                    |   4 +
 esphome/components/haier/automation.h         |   4 +-
 .../haier/binary_sensor/__init__.py           |   1 +
 esphome/components/haier/button/__init__.py   |  41 ++++++
 .../components/haier/button/self_cleaning.cpp |   9 ++
 .../components/haier/button/self_cleaning.h   |  18 +++
 .../haier/button/steri_cleaning.cpp           |   9 ++
 .../components/haier/button/steri_cleaning.h  |  18 +++
 esphome/components/haier/climate.py           |   7 +-
 esphome/components/haier/haier_base.cpp       |   3 +-
 esphome/components/haier/haier_base.h         |   3 +-
 esphome/components/haier/hon_climate.cpp      | 130 +++++++++++-------
 esphome/components/haier/hon_climate.h        |  59 ++++----
 esphome/components/haier/hon_packet.h         |   5 +-
 esphome/components/haier/sensor/__init__.py   |   1 +
 .../components/haier/text_sensor/__init__.py  |  54 ++++++++
 platformio.ini                                |   2 +-
 tests/components/haier/test.esp32-c3-idf.yaml |  18 +++
 tests/components/haier/test.esp32-c3.yaml     |  18 +++
 tests/components/haier/test.esp32-idf.yaml    |  18 +++
 tests/components/haier/test.esp32.yaml        |  18 +++
 tests/components/haier/test.esp8266.yaml      |  18 +++
 tests/components/haier/test.rp2040.yaml       |  18 +++
 23 files changed, 396 insertions(+), 80 deletions(-)
 create mode 100644 esphome/components/haier/button/__init__.py
 create mode 100644 esphome/components/haier/button/self_cleaning.cpp
 create mode 100644 esphome/components/haier/button/self_cleaning.h
 create mode 100644 esphome/components/haier/button/steri_cleaning.cpp
 create mode 100644 esphome/components/haier/button/steri_cleaning.h
 create mode 100644 esphome/components/haier/text_sensor/__init__.py

diff --git a/CODEOWNERS b/CODEOWNERS
index 22e581275b..e099ca42ac 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -152,6 +152,10 @@ esphome/components/grove_tb6612fng/* @max246
 esphome/components/growatt_solar/* @leeuwte
 esphome/components/gt911/* @clydebarrow @jesserockz
 esphome/components/haier/* @paveldn
+esphome/components/haier/binary_sensor/* @paveldn
+esphome/components/haier/button/* @paveldn
+esphome/components/haier/sensor/* @paveldn
+esphome/components/haier/text_sensor/* @paveldn
 esphome/components/havells_solar/* @sourabhjaiswal
 esphome/components/hbridge/fan/* @WeekendWarrior
 esphome/components/hbridge/light/* @DotNetDann
diff --git a/esphome/components/haier/automation.h b/esphome/components/haier/automation.h
index 84e4554db8..55df7ecc1d 100644
--- a/esphome/components/haier/automation.h
+++ b/esphome/components/haier/automation.h
@@ -46,7 +46,7 @@ template<typename... Ts> class BeeperOffAction : public Action<Ts...> {
 template<typename... Ts> class VerticalAirflowAction : public Action<Ts...> {
  public:
   VerticalAirflowAction(HonClimate *parent) : parent_(parent) {}
-  TEMPLATABLE_VALUE(AirflowVerticalDirection, direction)
+  TEMPLATABLE_VALUE(hon_protocol::VerticalSwingMode, direction)
   void play(Ts... x) { this->parent_->set_vertical_airflow(this->direction_.value(x...)); }
 
  protected:
@@ -56,7 +56,7 @@ template<typename... Ts> class VerticalAirflowAction : public Action<Ts...> {
 template<typename... Ts> class HorizontalAirflowAction : public Action<Ts...> {
  public:
   HorizontalAirflowAction(HonClimate *parent) : parent_(parent) {}
-  TEMPLATABLE_VALUE(AirflowHorizontalDirection, direction)
+  TEMPLATABLE_VALUE(hon_protocol::HorizontalSwingMode, direction)
   void play(Ts... x) { this->parent_->set_horizontal_airflow(this->direction_.value(x...)); }
 
  protected:
diff --git a/esphome/components/haier/binary_sensor/__init__.py b/esphome/components/haier/binary_sensor/__init__.py
index 4f72560a7b..8e9d5ec578 100644
--- a/esphome/components/haier/binary_sensor/__init__.py
+++ b/esphome/components/haier/binary_sensor/__init__.py
@@ -11,6 +11,7 @@ from ..climate import (
     HonClimate,
 )
 
+CODEOWNERS = ["@paveldn"]
 BinarySensorTypeEnum = HonClimate.enum("SubBinarySensorType", True)
 
 # Haier sensors
diff --git a/esphome/components/haier/button/__init__.py b/esphome/components/haier/button/__init__.py
new file mode 100644
index 0000000000..efe6180aaf
--- /dev/null
+++ b/esphome/components/haier/button/__init__.py
@@ -0,0 +1,41 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import button
+from ..climate import (
+    CONF_HAIER_ID,
+    HonClimate,
+    haier_ns,
+)
+
+CODEOWNERS = ["@paveldn"]
+SelfCleaningButton = haier_ns.class_("SelfCleaningButton", button.Button)
+SteriCleaningButton = haier_ns.class_("SteriCleaningButton", button.Button)
+
+
+# Haier buttons
+CONF_SELF_CLEANING = "self_cleaning"
+CONF_STERI_CLEANING = "steri_cleaning"
+
+# Additional icons
+ICON_SPRAY_BOTTLE = "mdi:spray-bottle"
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.Required(CONF_HAIER_ID): cv.use_id(HonClimate),
+        cv.Optional(CONF_SELF_CLEANING): button.button_schema(
+            SelfCleaningButton,
+            icon=ICON_SPRAY_BOTTLE,
+        ),
+        cv.Optional(CONF_STERI_CLEANING): button.button_schema(
+            SteriCleaningButton,
+            icon=ICON_SPRAY_BOTTLE,
+        ),
+    }
+)
+
+
+async def to_code(config):
+    for button_type in [CONF_SELF_CLEANING, CONF_STERI_CLEANING]:
+        if conf := config.get(button_type):
+            btn = await button.new_button(conf)
+            await cg.register_parented(btn, config[CONF_HAIER_ID])
diff --git a/esphome/components/haier/button/self_cleaning.cpp b/esphome/components/haier/button/self_cleaning.cpp
new file mode 100644
index 0000000000..128726036e
--- /dev/null
+++ b/esphome/components/haier/button/self_cleaning.cpp
@@ -0,0 +1,9 @@
+#include "self_cleaning.h"
+
+namespace esphome {
+namespace haier {
+
+void SelfCleaningButton::press_action() { this->parent_->start_self_cleaning(); }
+
+}  // namespace haier
+}  // namespace esphome
diff --git a/esphome/components/haier/button/self_cleaning.h b/esphome/components/haier/button/self_cleaning.h
new file mode 100644
index 0000000000..308fb70f06
--- /dev/null
+++ b/esphome/components/haier/button/self_cleaning.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "esphome/components/button/button.h"
+#include "../hon_climate.h"
+
+namespace esphome {
+namespace haier {
+
+class SelfCleaningButton : public button::Button, public Parented<HonClimate> {
+ public:
+  SelfCleaningButton() = default;
+
+ protected:
+  void press_action() override;
+};
+
+}  // namespace haier
+}  // namespace esphome
diff --git a/esphome/components/haier/button/steri_cleaning.cpp b/esphome/components/haier/button/steri_cleaning.cpp
new file mode 100644
index 0000000000..02b723f1a4
--- /dev/null
+++ b/esphome/components/haier/button/steri_cleaning.cpp
@@ -0,0 +1,9 @@
+#include "steri_cleaning.h"
+
+namespace esphome {
+namespace haier {
+
+void SteriCleaningButton::press_action() { this->parent_->start_steri_cleaning(); }
+
+}  // namespace haier
+}  // namespace esphome
diff --git a/esphome/components/haier/button/steri_cleaning.h b/esphome/components/haier/button/steri_cleaning.h
new file mode 100644
index 0000000000..6cad313fb3
--- /dev/null
+++ b/esphome/components/haier/button/steri_cleaning.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "esphome/components/button/button.h"
+#include "../hon_climate.h"
+
+namespace esphome {
+namespace haier {
+
+class SteriCleaningButton : public button::Button, public Parented<HonClimate> {
+ public:
+  SteriCleaningButton() = default;
+
+ protected:
+  void press_action() override;
+};
+
+}  // namespace haier
+}  // namespace esphome
diff --git a/esphome/components/haier/climate.py b/esphome/components/haier/climate.py
index b16244fd90..1562708a4f 100644
--- a/esphome/components/haier/climate.py
+++ b/esphome/components/haier/climate.py
@@ -55,6 +55,7 @@ PROTOCOL_HON = "HON"
 PROTOCOL_SMARTAIR2 = "SMARTAIR2"
 
 haier_ns = cg.esphome_ns.namespace("haier")
+hon_protocol_ns = haier_ns.namespace("hon_protocol")
 HaierClimateBase = haier_ns.class_(
     "HaierClimateBase", uart.UARTDevice, climate.Climate, cg.Component
 )
@@ -63,7 +64,7 @@ Smartair2Climate = haier_ns.class_("Smartair2Climate", HaierClimateBase)
 
 CONF_HAIER_ID = "haier_id"
 
-AirflowVerticalDirection = haier_ns.enum("AirflowVerticalDirection", True)
+AirflowVerticalDirection = hon_protocol_ns.enum("VerticalSwingMode", True)
 AIRFLOW_VERTICAL_DIRECTION_OPTIONS = {
     "HEALTH_UP": AirflowVerticalDirection.HEALTH_UP,
     "MAX_UP": AirflowVerticalDirection.MAX_UP,
@@ -73,7 +74,7 @@ AIRFLOW_VERTICAL_DIRECTION_OPTIONS = {
     "HEALTH_DOWN": AirflowVerticalDirection.HEALTH_DOWN,
 }
 
-AirflowHorizontalDirection = haier_ns.enum("AirflowHorizontalDirection", True)
+AirflowHorizontalDirection = hon_protocol_ns.enum("HorizontalSwingMode", True)
 AIRFLOW_HORIZONTAL_DIRECTION_OPTIONS = {
     "MAX_LEFT": AirflowHorizontalDirection.MAX_LEFT,
     "LEFT": AirflowHorizontalDirection.LEFT,
@@ -483,4 +484,4 @@ async def to_code(config):
             trigger, [(cg.uint8, "code"), (cg.const_char_ptr, "message")], conf
         )
     # https://github.com/paveldn/HaierProtocol
-    cg.add_library("pavlodn/HaierProtocol", "0.9.25")
+    cg.add_library("pavlodn/HaierProtocol", "0.9.28")
diff --git a/esphome/components/haier/haier_base.cpp b/esphome/components/haier/haier_base.cpp
index a3f68bb081..1fca3dfb85 100644
--- a/esphome/components/haier/haier_base.cpp
+++ b/esphome/components/haier/haier_base.cpp
@@ -234,6 +234,7 @@ void HaierClimateBase::setup() {
   this->haier_protocol_.set_default_timeout_handler(
       std::bind(&esphome::haier::HaierClimateBase::timeout_default_handler_, this, std::placeholders::_1));
   this->set_handlers();
+  this->initialization();
 }
 
 void HaierClimateBase::dump_config() {
@@ -326,7 +327,7 @@ ClimateTraits HaierClimateBase::traits() { return traits_; }
 
 void HaierClimateBase::control(const ClimateCall &call) {
   ESP_LOGD("Control", "Control call");
-  if (this->protocol_phase_ < ProtocolPhases::IDLE) {
+  if (!this->valid_connection()) {
     ESP_LOGW(TAG, "Can't send control packet, first poll answer not received");
     return;  // cancel the control, we cant do it without a poll answer.
   }
diff --git a/esphome/components/haier/haier_base.h b/esphome/components/haier/haier_base.h
index 504c841e5f..f261a106a2 100644
--- a/esphome/components/haier/haier_base.h
+++ b/esphome/components/haier/haier_base.h
@@ -44,7 +44,7 @@ class HaierClimateBase : public esphome::Component,
   void set_supported_modes(const std::set<esphome::climate::ClimateMode> &modes);
   void set_supported_swing_modes(const std::set<esphome::climate::ClimateSwingMode> &modes);
   void set_supported_presets(const std::set<esphome::climate::ClimatePreset> &presets);
-  bool valid_connection() { return this->protocol_phase_ >= ProtocolPhases::IDLE; };
+  bool valid_connection() const { return this->protocol_phase_ >= ProtocolPhases::IDLE; };
   size_t available() noexcept override { return esphome::uart::UARTDevice::available(); };
   size_t read_array(uint8_t *data, size_t len) noexcept override {
     return esphome::uart::UARTDevice::read_array(data, len) ? len : 0;
@@ -80,6 +80,7 @@ class HaierClimateBase : public esphome::Component,
   virtual void process_phase(std::chrono::steady_clock::time_point now) = 0;
   virtual haier_protocol::HaierMessage get_control_message() = 0;
   virtual haier_protocol::HaierMessage get_power_message(bool state) = 0;
+  virtual void initialization(){};
   virtual bool prepare_pending_action();
   virtual void process_protocol_reset();
   esphome::climate::ClimateTraits traits() override;
diff --git a/esphome/components/haier/hon_climate.cpp b/esphome/components/haier/hon_climate.cpp
index 9933cb4c8f..903f7964da 100644
--- a/esphome/components/haier/hon_climate.cpp
+++ b/esphome/components/haier/hon_climate.cpp
@@ -19,38 +19,6 @@ constexpr uint8_t CONTROL_MESSAGE_RETRIES = 5;
 constexpr std::chrono::milliseconds CONTROL_MESSAGE_RETRIES_INTERVAL = std::chrono::milliseconds(500);
 constexpr size_t ALARM_STATUS_REQUEST_INTERVAL_MS = 600000;
 
-hon_protocol::VerticalSwingMode get_vertical_swing_mode(AirflowVerticalDirection direction) {
-  switch (direction) {
-    case AirflowVerticalDirection::HEALTH_UP:
-      return hon_protocol::VerticalSwingMode::HEALTH_UP;
-    case AirflowVerticalDirection::MAX_UP:
-      return hon_protocol::VerticalSwingMode::MAX_UP;
-    case AirflowVerticalDirection::UP:
-      return hon_protocol::VerticalSwingMode::UP;
-    case AirflowVerticalDirection::DOWN:
-      return hon_protocol::VerticalSwingMode::DOWN;
-    case AirflowVerticalDirection::HEALTH_DOWN:
-      return hon_protocol::VerticalSwingMode::HEALTH_DOWN;
-    default:
-      return hon_protocol::VerticalSwingMode::CENTER;
-  }
-}
-
-hon_protocol::HorizontalSwingMode get_horizontal_swing_mode(AirflowHorizontalDirection direction) {
-  switch (direction) {
-    case AirflowHorizontalDirection::MAX_LEFT:
-      return hon_protocol::HorizontalSwingMode::MAX_LEFT;
-    case AirflowHorizontalDirection::LEFT:
-      return hon_protocol::HorizontalSwingMode::LEFT;
-    case AirflowHorizontalDirection::RIGHT:
-      return hon_protocol::HorizontalSwingMode::RIGHT;
-    case AirflowHorizontalDirection::MAX_RIGHT:
-      return hon_protocol::HorizontalSwingMode::MAX_RIGHT;
-    default:
-      return hon_protocol::HorizontalSwingMode::CENTER;
-  }
-}
-
 HonClimate::HonClimate()
     : cleaning_status_(CleaningState::NO_CLEANING), got_valid_outdoor_temp_(false), active_alarms_{0x00, 0x00, 0x00,
                                                                                                    0x00, 0x00, 0x00,
@@ -66,17 +34,21 @@ void HonClimate::set_beeper_state(bool state) { this->beeper_status_ = state; }
 
 bool HonClimate::get_beeper_state() const { return this->beeper_status_; }
 
-AirflowVerticalDirection HonClimate::get_vertical_airflow() const { return this->vertical_direction_; };
+esphome::optional<hon_protocol::VerticalSwingMode> HonClimate::get_vertical_airflow() const {
+  return this->current_vertical_swing_;
+};
 
-void HonClimate::set_vertical_airflow(AirflowVerticalDirection direction) {
-  this->vertical_direction_ = direction;
+void HonClimate::set_vertical_airflow(hon_protocol::VerticalSwingMode direction) {
+  this->pending_vertical_direction_ = direction;
   this->force_send_control_ = true;
 }
 
-AirflowHorizontalDirection HonClimate::get_horizontal_airflow() const { return this->horizontal_direction_; }
+esphome::optional<hon_protocol::HorizontalSwingMode> HonClimate::get_horizontal_airflow() const {
+  return this->current_horizontal_swing_;
+}
 
-void HonClimate::set_horizontal_airflow(AirflowHorizontalDirection direction) {
-  this->horizontal_direction_ = direction;
+void HonClimate::set_horizontal_airflow(hon_protocol::HorizontalSwingMode direction) {
+  this->pending_horizontal_direction_ = direction;
   this->force_send_control_ = true;
 }
 
@@ -148,6 +120,11 @@ haier_protocol::HandlerError HonClimate::get_device_version_answer_handler_(haie
     this->hvac_hardware_info_.value().hardware_version_ = std::string(tmp);
     strncpy(tmp, answr->device_name, 8);
     this->hvac_hardware_info_.value().device_name_ = std::string(tmp);
+#ifdef USE_TEXT_SENSOR
+    this->update_sub_text_sensor_(SubTextSensorType::APPLIANCE_NAME, this->hvac_hardware_info_.value().device_name_);
+    this->update_sub_text_sensor_(SubTextSensorType::PROTOCOL_VERSION,
+                                  this->hvac_hardware_info_.value().protocol_version_);
+#endif
     this->hvac_hardware_info_.value().functions_[0] = (answr->functions[1] & 0x01) != 0;  // interactive mode support
     this->hvac_hardware_info_.value().functions_[1] =
         (answr->functions[1] & 0x02) != 0;  // controller-device mode support
@@ -488,6 +465,19 @@ haier_protocol::HaierMessage HonClimate::get_power_message(bool state) {
   }
 }
 
+void HonClimate::initialization() {
+  constexpr uint32_t restore_settings_version = 0xE834D8DCUL;
+  this->rtc_ = global_preferences->make_preference<HonSettings>(this->get_object_id_hash() ^ restore_settings_version);
+  HonSettings recovered;
+  if (this->rtc_.load(&recovered)) {
+    this->settings_ = recovered;
+  } else {
+    this->settings_ = {hon_protocol::VerticalSwingMode::CENTER, hon_protocol::HorizontalSwingMode::CENTER};
+  }
+  this->current_vertical_swing_ = this->settings_.last_vertiacal_swing;
+  this->current_horizontal_swing_ = this->settings_.last_horizontal_swing;
+}
+
 haier_protocol::HaierMessage HonClimate::get_control_message() {
   uint8_t control_out_buffer[sizeof(hon_protocol::HaierPacketControl)];
   memcpy(control_out_buffer, this->last_status_message_.get(), sizeof(hon_protocol::HaierPacketControl));
@@ -560,16 +550,16 @@ haier_protocol::HaierMessage HonClimate::get_control_message() {
     if (climate_control.swing_mode.has_value()) {
       switch (climate_control.swing_mode.value()) {
         case CLIMATE_SWING_OFF:
-          out_data->horizontal_swing_mode = (uint8_t) get_horizontal_swing_mode(this->horizontal_direction_);
-          out_data->vertical_swing_mode = (uint8_t) get_vertical_swing_mode(this->vertical_direction_);
+          out_data->horizontal_swing_mode = (uint8_t) this->settings_.last_horizontal_swing;
+          out_data->vertical_swing_mode = (uint8_t) this->settings_.last_vertiacal_swing;
           break;
         case CLIMATE_SWING_VERTICAL:
-          out_data->horizontal_swing_mode = (uint8_t) get_horizontal_swing_mode(this->horizontal_direction_);
+          out_data->horizontal_swing_mode = (uint8_t) this->settings_.last_horizontal_swing;
           out_data->vertical_swing_mode = (uint8_t) hon_protocol::VerticalSwingMode::AUTO;
           break;
         case CLIMATE_SWING_HORIZONTAL:
           out_data->horizontal_swing_mode = (uint8_t) hon_protocol::HorizontalSwingMode::AUTO;
-          out_data->vertical_swing_mode = (uint8_t) get_vertical_swing_mode(this->vertical_direction_);
+          out_data->vertical_swing_mode = (uint8_t) this->settings_.last_vertiacal_swing;
           break;
         case CLIMATE_SWING_BOTH:
           out_data->horizontal_swing_mode = (uint8_t) hon_protocol::HorizontalSwingMode::AUTO;
@@ -631,11 +621,14 @@ haier_protocol::HaierMessage HonClimate::get_control_message() {
           break;
       }
     }
-  } else {
-    if (out_data->vertical_swing_mode != (uint8_t) hon_protocol::VerticalSwingMode::AUTO)
-      out_data->vertical_swing_mode = (uint8_t) get_vertical_swing_mode(this->vertical_direction_);
-    if (out_data->horizontal_swing_mode != (uint8_t) hon_protocol::HorizontalSwingMode::AUTO)
-      out_data->horizontal_swing_mode = (uint8_t) get_horizontal_swing_mode(this->horizontal_direction_);
+  }
+  if (this->pending_vertical_direction_.has_value()) {
+    out_data->vertical_swing_mode = (uint8_t) this->pending_vertical_direction_.value();
+    this->pending_vertical_direction_.reset();
+  }
+  if (this->pending_horizontal_direction_.has_value()) {
+    out_data->horizontal_swing_mode = (uint8_t) this->pending_horizontal_direction_.value();
+    this->pending_horizontal_direction_.reset();
   }
   out_data->beeper_status = ((!this->beeper_status_) || (!has_hvac_settings)) ? 1 : 0;
   control_out_buffer[4] = 0;  // This byte should be cleared before setting values
@@ -737,6 +730,33 @@ void HonClimate::update_sub_binary_sensor_(SubBinarySensorType type, uint8_t val
 }
 #endif  // USE_BINARY_SENSOR
 
+#ifdef USE_TEXT_SENSOR
+void HonClimate::set_sub_text_sensor(SubTextSensorType type, text_sensor::TextSensor *sens) {
+  this->sub_text_sensors_[(size_t) type] = sens;
+  switch (type) {
+    case SubTextSensorType::APPLIANCE_NAME:
+      if (this->hvac_hardware_info_.has_value())
+        sens->publish_state(this->hvac_hardware_info_.value().device_name_);
+      break;
+    case SubTextSensorType::PROTOCOL_VERSION:
+      if (this->hvac_hardware_info_.has_value())
+        sens->publish_state(this->hvac_hardware_info_.value().protocol_version_);
+      break;
+    case SubTextSensorType::CLEANING_STATUS:
+      sens->publish_state(this->get_cleaning_status_text());
+      break;
+    default:
+      break;
+  }
+}
+
+void HonClimate::update_sub_text_sensor_(SubTextSensorType type, const std::string &value) {
+  size_t index = (size_t) type;
+  if (this->sub_text_sensors_[index] != nullptr)
+    this->sub_text_sensors_[index]->publish_state(value);
+}
+#endif  // USE_TEXT_SENSOR
+
 haier_protocol::HandlerError HonClimate::process_status_message_(const uint8_t *packet_buffer, uint8_t size) {
   size_t expected_size = 2 + sizeof(hon_protocol::HaierPacketControl) + sizeof(hon_protocol::HaierPacketSensors) +
                          this->extra_control_packet_bytes_;
@@ -896,6 +916,9 @@ haier_protocol::HandlerError HonClimate::process_status_message_(const uint8_t *
             PendingAction({ActionRequest::TURN_POWER_OFF, esphome::optional<haier_protocol::HaierMessage>()});
       }
       this->cleaning_status_ = new_cleaning;
+#ifdef USE_TEXT_SENSOR
+      this->update_sub_text_sensor_(SubTextSensorType::CLEANING_STATUS, this->get_cleaning_status_text());
+#endif  // USE_TEXT_SENSOR
     }
   }
   {
@@ -941,6 +964,19 @@ haier_protocol::HandlerError HonClimate::process_status_message_(const uint8_t *
         this->swing_mode = CLIMATE_SWING_OFF;
       }
     }
+    // Saving last known non auto mode for vertical and horizontal swing
+    this->current_vertical_swing_ = (hon_protocol::VerticalSwingMode) packet.control.vertical_swing_mode;
+    this->current_horizontal_swing_ = (hon_protocol::HorizontalSwingMode) packet.control.horizontal_swing_mode;
+    bool save_settings = ((this->current_vertical_swing_.value() != hon_protocol::VerticalSwingMode::AUTO) &&
+                          (this->current_vertical_swing_.value() != hon_protocol::VerticalSwingMode::AUTO_SPECIAL) &&
+                          (this->current_vertical_swing_.value() != this->settings_.last_vertiacal_swing)) ||
+                         ((this->current_horizontal_swing_.value() != hon_protocol::HorizontalSwingMode::AUTO) &&
+                          (this->current_horizontal_swing_.value() != this->settings_.last_horizontal_swing));
+    if (save_settings) {
+      this->settings_.last_vertiacal_swing = this->current_vertical_swing_.value();
+      this->settings_.last_horizontal_swing = this->current_horizontal_swing_.value();
+      this->rtc_.save(&this->settings_);
+    }
     should_publish = should_publish || (old_swing_mode != this->swing_mode);
   }
   this->last_valid_status_timestamp_ = std::chrono::steady_clock::now();
diff --git a/esphome/components/haier/hon_climate.h b/esphome/components/haier/hon_climate.h
index c4fae20a98..7b4fcee6b9 100644
--- a/esphome/components/haier/hon_climate.h
+++ b/esphome/components/haier/hon_climate.h
@@ -7,29 +7,16 @@
 #ifdef USE_BINARY_SENSOR
 #include "esphome/components/binary_sensor/binary_sensor.h"
 #endif
+#ifdef USE_TEXT_SENSOR
+#include "esphome/components/text_sensor/text_sensor.h"
+#endif
 #include "esphome/core/automation.h"
 #include "haier_base.h"
+#include "hon_packet.h"
 
 namespace esphome {
 namespace haier {
 
-enum class AirflowVerticalDirection : uint8_t {
-  HEALTH_UP = 0,
-  MAX_UP = 1,
-  UP = 2,
-  CENTER = 3,
-  DOWN = 4,
-  HEALTH_DOWN = 5,
-};
-
-enum class AirflowHorizontalDirection : uint8_t {
-  MAX_LEFT = 0,
-  LEFT = 1,
-  CENTER = 2,
-  RIGHT = 3,
-  MAX_RIGHT = 4,
-};
-
 enum class CleaningState : uint8_t {
   NO_CLEANING = 0,
   SELF_CLEAN = 1,
@@ -38,6 +25,11 @@ enum class CleaningState : uint8_t {
 
 enum class HonControlMethod { MONITOR_ONLY = 0, SET_GROUP_PARAMETERS, SET_SINGLE_PARAMETER };
 
+struct HonSettings {
+  hon_protocol::VerticalSwingMode last_vertiacal_swing;
+  hon_protocol::HorizontalSwingMode last_horizontal_swing;
+};
+
 class HonClimate : public HaierClimateBase {
 #ifdef USE_SENSOR
  public:
@@ -80,6 +72,20 @@ class HonClimate : public HaierClimateBase {
  protected:
   void update_sub_binary_sensor_(SubBinarySensorType type, uint8_t value);
   binary_sensor::BinarySensor *sub_binary_sensors_[(size_t) SubBinarySensorType::SUB_BINARY_SENSOR_TYPE_COUNT]{nullptr};
+#endif
+#ifdef USE_TEXT_SENSOR
+ public:
+  enum class SubTextSensorType {
+    CLEANING_STATUS = 0,
+    PROTOCOL_VERSION,
+    APPLIANCE_NAME,
+    SUB_TEXT_SENSOR_TYPE_COUNT,
+  };
+  void set_sub_text_sensor(SubTextSensorType type, text_sensor::TextSensor *sens);
+
+ protected:
+  void update_sub_text_sensor_(SubTextSensorType type, const std::string &value);
+  text_sensor::TextSensor *sub_text_sensors_[(size_t) SubTextSensorType::SUB_TEXT_SENSOR_TYPE_COUNT]{nullptr};
 #endif
  public:
   HonClimate();
@@ -89,10 +95,10 @@ class HonClimate : public HaierClimateBase {
   void dump_config() override;
   void set_beeper_state(bool state);
   bool get_beeper_state() const;
-  AirflowVerticalDirection get_vertical_airflow() const;
-  void set_vertical_airflow(AirflowVerticalDirection direction);
-  AirflowHorizontalDirection get_horizontal_airflow() const;
-  void set_horizontal_airflow(AirflowHorizontalDirection direction);
+  esphome::optional<hon_protocol::VerticalSwingMode> get_vertical_airflow() const;
+  void set_vertical_airflow(hon_protocol::VerticalSwingMode direction);
+  esphome::optional<hon_protocol::HorizontalSwingMode> get_horizontal_airflow() const;
+  void set_horizontal_airflow(hon_protocol::HorizontalSwingMode direction);
   std::string get_cleaning_status_text() const;
   CleaningState get_cleaning_status() const;
   void start_self_cleaning();
@@ -108,6 +114,7 @@ class HonClimate : public HaierClimateBase {
   void process_phase(std::chrono::steady_clock::time_point now) override;
   haier_protocol::HaierMessage get_control_message() override;
   haier_protocol::HaierMessage get_power_message(bool state) override;
+  void initialization() override;
   bool prepare_pending_action() override;
   void process_protocol_reset() override;
   bool should_get_big_data_();
@@ -147,9 +154,9 @@ class HonClimate : public HaierClimateBase {
   bool beeper_status_;
   CleaningState cleaning_status_;
   bool got_valid_outdoor_temp_;
-  AirflowVerticalDirection vertical_direction_;
-  AirflowHorizontalDirection horizontal_direction_;
-  esphome::optional<HardwareInfo> hvac_hardware_info_;
+  esphome::optional<hon_protocol::VerticalSwingMode> pending_vertical_direction_{};
+  esphome::optional<hon_protocol::HorizontalSwingMode> pending_horizontal_direction_{};
+  esphome::optional<HardwareInfo> hvac_hardware_info_{};
   uint8_t active_alarms_[8];
   int extra_control_packet_bytes_;
   HonControlMethod control_method_;
@@ -159,6 +166,10 @@ class HonClimate : public HaierClimateBase {
   float active_alarm_count_{NAN};
   std::chrono::steady_clock::time_point last_alarm_request_;
   int big_data_sensors_{0};
+  esphome::optional<hon_protocol::VerticalSwingMode> current_vertical_swing_{};
+  esphome::optional<hon_protocol::HorizontalSwingMode> current_horizontal_swing_{};
+  HonSettings settings_;
+  ESPPreferenceObject rtc_;
 };
 
 class HaierAlarmStartTrigger : public Trigger<uint8_t, const char *> {
diff --git a/esphome/components/haier/hon_packet.h b/esphome/components/haier/hon_packet.h
index bbca7bb653..a03ac2831f 100644
--- a/esphome/components/haier/hon_packet.h
+++ b/esphome/components/haier/hon_packet.h
@@ -13,7 +13,10 @@ enum class VerticalSwingMode : uint8_t {
   UP = 0x04,
   CENTER = 0x06,
   DOWN = 0x08,
-  AUTO = 0x0C
+  MAX_DOWN = 0x0A,
+  AUTO = 0x0C,
+  // Auto for special modes
+  AUTO_SPECIAL = 0x0E
 };
 
 enum class HorizontalSwingMode : uint8_t {
diff --git a/esphome/components/haier/sensor/__init__.py b/esphome/components/haier/sensor/__init__.py
index 01f997baa5..b2717631e0 100644
--- a/esphome/components/haier/sensor/__init__.py
+++ b/esphome/components/haier/sensor/__init__.py
@@ -31,6 +31,7 @@ from ..climate import (
     HonClimate,
 )
 
+CODEOWNERS = ["@paveldn"]
 SensorTypeEnum = HonClimate.enum("SubSensorType", True)
 
 # Haier sensors
diff --git a/esphome/components/haier/text_sensor/__init__.py b/esphome/components/haier/text_sensor/__init__.py
new file mode 100644
index 0000000000..528b70d83e
--- /dev/null
+++ b/esphome/components/haier/text_sensor/__init__.py
@@ -0,0 +1,54 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import text_sensor
+from esphome.const import (
+    ENTITY_CATEGORY_DIAGNOSTIC,
+    ENTITY_CATEGORY_NONE,
+)
+from ..climate import (
+    CONF_HAIER_ID,
+    HonClimate,
+)
+
+CODEOWNERS = ["@paveldn"]
+TextSensorTypeEnum = HonClimate.enum("SubTextSensorType", True)
+
+# Haier text sensors
+CONF_CLEANING_STATUS = "cleaning_status"
+CONF_PROTOCOL_VERSION = "protocol_version"
+CONF_APPLIANCE_NAME = "appliance_name"
+
+# Additional icons
+ICON_SPRAY_BOTTLE = "mdi:spray-bottle"
+ICON_TEXT_BOX = "mdi:text-box-outline"
+
+TEXT_SENSOR_TYPES = {
+    CONF_CLEANING_STATUS: text_sensor.text_sensor_schema(
+        icon=ICON_SPRAY_BOTTLE,
+        entity_category=ENTITY_CATEGORY_NONE,
+    ),
+    CONF_PROTOCOL_VERSION: text_sensor.text_sensor_schema(
+        icon=ICON_TEXT_BOX,
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+    ),
+    CONF_APPLIANCE_NAME: text_sensor.text_sensor_schema(
+        icon=ICON_TEXT_BOX,
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+    ),
+}
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.Required(CONF_HAIER_ID): cv.use_id(HonClimate),
+    }
+).extend({cv.Optional(type): schema for type, schema in TEXT_SENSOR_TYPES.items()})
+
+
+async def to_code(config):
+    paren = await cg.get_variable(config[CONF_HAIER_ID])
+
+    for type, _ in TEXT_SENSOR_TYPES.items():
+        if conf := config.get(type):
+            sens = await text_sensor.new_text_sensor(conf)
+            text_sensor_type = getattr(TextSensorTypeEnum, type.upper())
+            cg.add(paren.set_sub_text_sensor(text_sensor_type, sens))
diff --git a/platformio.ini b/platformio.ini
index d342b32b02..65c742cf91 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -39,7 +39,7 @@ lib_deps =
     bblanchon/ArduinoJson@6.18.5           ; json
     wjtje/qr-code-generator-library@1.7.0  ; qr_code
     functionpointer/arduino-MLX90393@1.0.0 ; mlx90393
-    pavlodn/HaierProtocol@0.9.25           ; haier
+    pavlodn/HaierProtocol@0.9.28           ; haier
     ; This is using the repository until a new release is published to PlatformIO
     https://github.com/Sensirion/arduino-gas-index-algorithm.git#3.2.1 ; Sensirion Gas Index Algorithm Arduino Library
 build_flags =
diff --git a/tests/components/haier/test.esp32-c3-idf.yaml b/tests/components/haier/test.esp32-c3-idf.yaml
index 72cfb781a7..fed573bd1d 100644
--- a/tests/components/haier/test.esp32-c3-idf.yaml
+++ b/tests/components/haier/test.esp32-c3-idf.yaml
@@ -93,3 +93,21 @@ binary_sensor:
       name: Haier Indoor Fan Status
     outdoor_fan_status:
       name: Haier Outdoor Fan Status
+
+button:
+  - platform: haier
+    haier_id: haier_ac
+    self_cleaning:
+      name: Haier start self cleaning
+    steri_cleaning:
+      name: Haier start 56°C steri-cleaning
+
+text_sensor:
+  - platform: haier
+    haier_id: haier_ac
+    appliance_name:
+      name: Haier appliance name
+    cleaning_status:
+      name: Haier cleaning status
+    protocol_version:
+      name: Haier protocol version
diff --git a/tests/components/haier/test.esp32-c3.yaml b/tests/components/haier/test.esp32-c3.yaml
index 72cfb781a7..fed573bd1d 100644
--- a/tests/components/haier/test.esp32-c3.yaml
+++ b/tests/components/haier/test.esp32-c3.yaml
@@ -93,3 +93,21 @@ binary_sensor:
       name: Haier Indoor Fan Status
     outdoor_fan_status:
       name: Haier Outdoor Fan Status
+
+button:
+  - platform: haier
+    haier_id: haier_ac
+    self_cleaning:
+      name: Haier start self cleaning
+    steri_cleaning:
+      name: Haier start 56°C steri-cleaning
+
+text_sensor:
+  - platform: haier
+    haier_id: haier_ac
+    appliance_name:
+      name: Haier appliance name
+    cleaning_status:
+      name: Haier cleaning status
+    protocol_version:
+      name: Haier protocol version
diff --git a/tests/components/haier/test.esp32-idf.yaml b/tests/components/haier/test.esp32-idf.yaml
index d3eeb04d65..efff532d25 100644
--- a/tests/components/haier/test.esp32-idf.yaml
+++ b/tests/components/haier/test.esp32-idf.yaml
@@ -93,3 +93,21 @@ binary_sensor:
       name: Haier Indoor Fan Status
     outdoor_fan_status:
       name: Haier Outdoor Fan Status
+
+button:
+  - platform: haier
+    haier_id: haier_ac
+    self_cleaning:
+      name: Haier start self cleaning
+    steri_cleaning:
+      name: Haier start 56°C steri-cleaning
+
+text_sensor:
+  - platform: haier
+    haier_id: haier_ac
+    appliance_name:
+      name: Haier appliance name
+    cleaning_status:
+      name: Haier cleaning status
+    protocol_version:
+      name: Haier protocol version
diff --git a/tests/components/haier/test.esp32.yaml b/tests/components/haier/test.esp32.yaml
index d3eeb04d65..efff532d25 100644
--- a/tests/components/haier/test.esp32.yaml
+++ b/tests/components/haier/test.esp32.yaml
@@ -93,3 +93,21 @@ binary_sensor:
       name: Haier Indoor Fan Status
     outdoor_fan_status:
       name: Haier Outdoor Fan Status
+
+button:
+  - platform: haier
+    haier_id: haier_ac
+    self_cleaning:
+      name: Haier start self cleaning
+    steri_cleaning:
+      name: Haier start 56°C steri-cleaning
+
+text_sensor:
+  - platform: haier
+    haier_id: haier_ac
+    appliance_name:
+      name: Haier appliance name
+    cleaning_status:
+      name: Haier cleaning status
+    protocol_version:
+      name: Haier protocol version
diff --git a/tests/components/haier/test.esp8266.yaml b/tests/components/haier/test.esp8266.yaml
index 72cfb781a7..fed573bd1d 100644
--- a/tests/components/haier/test.esp8266.yaml
+++ b/tests/components/haier/test.esp8266.yaml
@@ -93,3 +93,21 @@ binary_sensor:
       name: Haier Indoor Fan Status
     outdoor_fan_status:
       name: Haier Outdoor Fan Status
+
+button:
+  - platform: haier
+    haier_id: haier_ac
+    self_cleaning:
+      name: Haier start self cleaning
+    steri_cleaning:
+      name: Haier start 56°C steri-cleaning
+
+text_sensor:
+  - platform: haier
+    haier_id: haier_ac
+    appliance_name:
+      name: Haier appliance name
+    cleaning_status:
+      name: Haier cleaning status
+    protocol_version:
+      name: Haier protocol version
diff --git a/tests/components/haier/test.rp2040.yaml b/tests/components/haier/test.rp2040.yaml
index 72cfb781a7..fed573bd1d 100644
--- a/tests/components/haier/test.rp2040.yaml
+++ b/tests/components/haier/test.rp2040.yaml
@@ -93,3 +93,21 @@ binary_sensor:
       name: Haier Indoor Fan Status
     outdoor_fan_status:
       name: Haier Outdoor Fan Status
+
+button:
+  - platform: haier
+    haier_id: haier_ac
+    self_cleaning:
+      name: Haier start self cleaning
+    steri_cleaning:
+      name: Haier start 56°C steri-cleaning
+
+text_sensor:
+  - platform: haier
+    haier_id: haier_ac
+    appliance_name:
+      name: Haier appliance name
+    cleaning_status:
+      name: Haier cleaning status
+    protocol_version:
+      name: Haier protocol version

From c2d67659f3a2bca35cc5ca97708470c9e9f46fd5 Mon Sep 17 00:00:00 2001
From: polyfloyd <polyfloyd@users.noreply.github.com>
Date: Thu, 23 May 2024 23:08:28 +0200
Subject: [PATCH 07/29] mpr121: Add GPIO support (#6776)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/mpr121/__init__.py         | 88 ++++++++++++++++++-
 .../__init__.py}                              |  7 +-
 .../binary_sensor/mpr121_binary_sensor.cpp    | 20 +++++
 .../binary_sensor/mpr121_binary_sensor.h      | 26 ++++++
 esphome/components/mpr121/mpr121.cpp          | 87 ++++++++++++++++--
 esphome/components/mpr121/mpr121.h            | 68 ++++++++++----
 tests/components/mpr121/common.yaml           | 41 +++++++++
 .../components/mpr121/test.esp32-c3-idf.yaml  | 29 +-----
 tests/components/mpr121/test.esp32-c3.yaml    | 29 +-----
 tests/components/mpr121/test.esp32-idf.yaml   | 29 +-----
 tests/components/mpr121/test.esp32.yaml       | 29 +-----
 tests/components/mpr121/test.esp8266.yaml     | 29 +-----
 tests/components/mpr121/test.rp2040.yaml      | 29 +-----
 tests/test3.1.yaml                            | 27 ------
 14 files changed, 332 insertions(+), 206 deletions(-)
 rename esphome/components/mpr121/{binary_sensor.py => binary_sensor/__init__.py} (82%)
 create mode 100644 esphome/components/mpr121/binary_sensor/mpr121_binary_sensor.cpp
 create mode 100644 esphome/components/mpr121/binary_sensor/mpr121_binary_sensor.h
 create mode 100644 tests/components/mpr121/common.yaml

diff --git a/esphome/components/mpr121/__init__.py b/esphome/components/mpr121/__init__.py
index dabfb47ad6..1f8e804e88 100644
--- a/esphome/components/mpr121/__init__.py
+++ b/esphome/components/mpr121/__init__.py
@@ -1,19 +1,32 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
+import esphome.final_validate as fv
+from esphome import pins
 from esphome.components import i2c
-from esphome.const import CONF_ID
+from esphome.const import (
+    CONF_BINARY_SENSOR,
+    CONF_CHANNEL,
+    CONF_ID,
+    CONF_INPUT,
+    CONF_INVERTED,
+    CONF_MODE,
+    CONF_NUMBER,
+    CONF_OUTPUT,
+)
 
 CONF_TOUCH_THRESHOLD = "touch_threshold"
 CONF_RELEASE_THRESHOLD = "release_threshold"
 CONF_TOUCH_DEBOUNCE = "touch_debounce"
 CONF_RELEASE_DEBOUNCE = "release_debounce"
+CONF_MAX_TOUCH_CHANNEL = "max_touch_channel"
+CONF_MPR121 = "mpr121"
+CONF_MPR121_ID = "mpr121_id"
 
 DEPENDENCIES = ["i2c"]
-AUTO_LOAD = ["binary_sensor"]
 
 mpr121_ns = cg.esphome_ns.namespace("mpr121")
-CONF_MPR121_ID = "mpr121_id"
 MPR121Component = mpr121_ns.class_("MPR121Component", cg.Component, i2c.I2CDevice)
+MPR121GPIOPin = mpr121_ns.class_("MPR121GPIOPin", cg.GPIOPin)
 
 MULTI_CONF = True
 CONFIG_SCHEMA = (
@@ -28,6 +41,7 @@ CONFIG_SCHEMA = (
             cv.Optional(CONF_RELEASE_THRESHOLD, default=0x06): cv.int_range(
                 min=0x05, max=0x30
             ),
+            cv.Optional(CONF_MAX_TOUCH_CHANNEL): cv.int_range(min=3, max=11),
         }
     )
     .extend(cv.COMPONENT_SCHEMA)
@@ -35,11 +49,79 @@ CONFIG_SCHEMA = (
 )
 
 
+def _final_validate(config):
+    fconf = fv.full_config.get()
+    max_touch_channel = 3
+    if (binary_sensors := fconf.get(CONF_BINARY_SENSOR)) is not None:
+        for binary_sensor in binary_sensors:
+            if binary_sensor.get(CONF_MPR121_ID) == config[CONF_ID]:
+                max_touch_channel = max(max_touch_channel, binary_sensor[CONF_CHANNEL])
+    if max_touch_channel_in_config := config.get(CONF_MAX_TOUCH_CHANNEL):
+        if max_touch_channel != max_touch_channel_in_config:
+            raise cv.Invalid(
+                "Max touch channel must equal the highest binary sensor channel or be removed for auto calculation",
+                path=[CONF_MAX_TOUCH_CHANNEL],
+            )
+    path = fconf.get_path_for_id(config[CONF_ID])[:-1]
+    this_config = fconf.get_config_for_path(path)
+    this_config[CONF_MAX_TOUCH_CHANNEL] = max_touch_channel
+
+
+FINAL_VALIDATE_SCHEMA = _final_validate
+
+
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_touch_debounce(config[CONF_TOUCH_DEBOUNCE]))
     cg.add(var.set_release_debounce(config[CONF_RELEASE_DEBOUNCE]))
     cg.add(var.set_touch_threshold(config[CONF_TOUCH_THRESHOLD]))
     cg.add(var.set_release_threshold(config[CONF_RELEASE_THRESHOLD]))
+    cg.add(var.set_max_touch_channel(config[CONF_MAX_TOUCH_CHANNEL]))
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
+
+
+def validate_mode(value):
+    if bool(value[CONF_INPUT]) == bool(value[CONF_OUTPUT]):
+        raise cv.Invalid("Mode must be either input or output")
+    return value
+
+
+# https://www.nxp.com/docs/en/data-sheet/MPR121.pdf, page 4
+#
+# Among the 12 electrode inputs, 8 inputs are designed as multifunctional pins. When these pins are
+# not configured as electrodes, they may be used to drive LEDs or used for general purpose input or
+# output.
+MPR121_GPIO_PIN_SCHEMA = pins.gpio_base_schema(
+    MPR121GPIOPin,
+    cv.int_range(min=4, max=11),
+    modes=[CONF_INPUT, CONF_OUTPUT],
+    mode_validator=validate_mode,
+).extend(
+    {
+        cv.Required(CONF_MPR121): cv.use_id(MPR121Component),
+    }
+)
+
+
+def mpr121_pin_final_validate(pin_config, parent_config):
+    if pin_config[CONF_NUMBER] <= parent_config[CONF_MAX_TOUCH_CHANNEL]:
+        raise cv.Invalid(
+            "Pin number must be higher than the max touch channel of the MPR121 component",
+        )
+
+
+@pins.PIN_SCHEMA_REGISTRY.register(
+    CONF_MPR121, MPR121_GPIO_PIN_SCHEMA, mpr121_pin_final_validate
+)
+async def mpr121_gpio_pin_to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    parent = await cg.get_variable(config[CONF_MPR121])
+
+    cg.add(var.set_parent(parent))
+
+    num = config[CONF_NUMBER]
+    cg.add(var.set_pin(num))
+    cg.add(var.set_inverted(config[CONF_INVERTED]))
+    cg.add(var.set_flags(pins.gpio_flags_expr(config[CONF_MODE])))
+    return var
diff --git a/esphome/components/mpr121/binary_sensor.py b/esphome/components/mpr121/binary_sensor/__init__.py
similarity index 82%
rename from esphome/components/mpr121/binary_sensor.py
rename to esphome/components/mpr121/binary_sensor/__init__.py
index 131fbcfc5b..292c631c37 100644
--- a/esphome/components/mpr121/binary_sensor.py
+++ b/esphome/components/mpr121/binary_sensor/__init__.py
@@ -2,7 +2,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import binary_sensor
 from esphome.const import CONF_CHANNEL
-from . import (
+from .. import (
     mpr121_ns,
     MPR121Component,
     CONF_MPR121_ID,
@@ -11,9 +11,9 @@ from . import (
 )
 
 DEPENDENCIES = ["mpr121"]
-MPR121Channel = mpr121_ns.class_("MPR121Channel", binary_sensor.BinarySensor)
+MPR121BinarySensor = mpr121_ns.class_("MPR121BinarySensor", binary_sensor.BinarySensor)
 
-CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(MPR121Channel).extend(
+CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(MPR121BinarySensor).extend(
     {
         cv.GenerateID(CONF_MPR121_ID): cv.use_id(MPR121Component),
         cv.Required(CONF_CHANNEL): cv.int_range(min=0, max=11),
@@ -27,6 +27,7 @@ async def to_code(config):
     var = await binary_sensor.new_binary_sensor(config)
     hub = await cg.get_variable(config[CONF_MPR121_ID])
     cg.add(var.set_channel(config[CONF_CHANNEL]))
+    cg.register_parented(var, hub)
 
     if CONF_TOUCH_THRESHOLD in config:
         cg.add(var.set_touch_threshold(config[CONF_TOUCH_THRESHOLD]))
diff --git a/esphome/components/mpr121/binary_sensor/mpr121_binary_sensor.cpp b/esphome/components/mpr121/binary_sensor/mpr121_binary_sensor.cpp
new file mode 100644
index 0000000000..dce0e73b9a
--- /dev/null
+++ b/esphome/components/mpr121/binary_sensor/mpr121_binary_sensor.cpp
@@ -0,0 +1,20 @@
+#include "mpr121_binary_sensor.h"
+
+namespace esphome {
+namespace mpr121 {
+
+void MPR121BinarySensor::setup() {
+  uint8_t touch_threshold = this->touch_threshold_.value_or(this->parent_->get_touch_threshold());
+  this->parent_->write_byte(MPR121_TOUCHTH_0 + 2 * this->channel_, touch_threshold);
+
+  uint8_t release_threshold = this->release_threshold_.value_or(this->parent_->get_release_threshold());
+  this->parent_->write_byte(MPR121_RELEASETH_0 + 2 * this->channel_, release_threshold);
+}
+
+void MPR121BinarySensor::process(uint16_t data) {
+  bool new_state = data & (1 << this->channel_);
+  this->publish_state(new_state);
+}
+
+}  // namespace mpr121
+}  // namespace esphome
diff --git a/esphome/components/mpr121/binary_sensor/mpr121_binary_sensor.h b/esphome/components/mpr121/binary_sensor/mpr121_binary_sensor.h
new file mode 100644
index 0000000000..577ba82893
--- /dev/null
+++ b/esphome/components/mpr121/binary_sensor/mpr121_binary_sensor.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include "esphome/components/binary_sensor/binary_sensor.h"
+
+#include "../mpr121.h"
+
+namespace esphome {
+namespace mpr121 {
+
+class MPR121BinarySensor : public binary_sensor::BinarySensor, public MPR121Channel, public Parented<MPR121Component> {
+ public:
+  void set_channel(uint8_t channel) { this->channel_ = channel; }
+  void set_touch_threshold(uint8_t touch_threshold) { this->touch_threshold_ = touch_threshold; };
+  void set_release_threshold(uint8_t release_threshold) { this->release_threshold_ = release_threshold; };
+
+  void setup() override;
+  void process(uint16_t data) override;
+
+ protected:
+  uint8_t channel_{0};
+  optional<uint8_t> touch_threshold_{};
+  optional<uint8_t> release_threshold_{};
+};
+
+}  // namespace mpr121
+}  // namespace esphome
diff --git a/esphome/components/mpr121/mpr121.cpp b/esphome/components/mpr121/mpr121.cpp
index 7ba3da7b4d..de364c59ff 100644
--- a/esphome/components/mpr121/mpr121.cpp
+++ b/esphome/components/mpr121/mpr121.cpp
@@ -1,6 +1,9 @@
 #include "mpr121.h"
-#include "esphome/core/log.h"
+
+#include <cstdint>
+
 #include "esphome/core/hal.h"
+#include "esphome/core/log.h"
 
 namespace esphome {
 namespace mpr121 {
@@ -20,10 +23,7 @@ void MPR121Component::setup() {
 
   // set touch sensitivity for all 12 channels
   for (auto *channel : this->channels_) {
-    this->write_byte(MPR121_TOUCHTH_0 + 2 * channel->channel_,
-                     channel->touch_threshold_.value_or(this->touch_threshold_));
-    this->write_byte(MPR121_RELEASETH_0 + 2 * channel->channel_,
-                     channel->release_threshold_.value_or(this->release_threshold_));
+    channel->setup();
   }
   this->write_byte(MPR121_MHDR, 0x01);
   this->write_byte(MPR121_NHDR, 0x01);
@@ -44,8 +44,15 @@ void MPR121Component::setup() {
   this->write_byte(MPR121_CONFIG1, 0x10);
   // 0.5uS encoding, 1ms period
   this->write_byte(MPR121_CONFIG2, 0x20);
-  // start with first 5 bits of baseline tracking
-  this->write_byte(MPR121_ECR, 0x8F);
+
+  // Write the Electrode Configuration Register
+  // * Highest 2 bits is "Calibration Lock", which we set to a value corresponding to 5 bits.
+  // * The 2 bits below is "Proximity Enable" and are left at 0.
+  // * The 4 least significant bits control how many electrodes are enabled. Electrodes are enabled
+  //   as a range, starting at 0 up to the highest channel index used.
+  this->write_byte(MPR121_ECR, 0x80 | (this->max_touch_channel_ + 1));
+
+  this->flush_gpio_();
 }
 
 void MPR121Component::set_touch_debounce(uint8_t debounce) {
@@ -86,6 +93,72 @@ void MPR121Component::loop() {
 
   for (auto *channel : this->channels_)
     channel->process(val);
+
+  this->read_byte(MPR121_GPIODATA, &this->gpio_input_);
+}
+
+bool MPR121Component::digital_read(uint8_t ionum) { return (this->gpio_input_ & (1 << ionum)) != 0; }
+
+void MPR121Component::digital_write(uint8_t ionum, bool value) {
+  if (value) {
+    this->gpio_output_ |= (1 << ionum);
+  } else {
+    this->gpio_output_ &= ~(1 << ionum);
+  }
+  this->flush_gpio_();
+}
+
+void MPR121Component::pin_mode(uint8_t ionum, gpio::Flags flags) {
+  this->gpio_enable_ |= (1 << ionum);
+  if (flags & gpio::FLAG_INPUT) {
+    this->gpio_direction_ &= ~(1 << ionum);
+  } else if (flags & gpio::FLAG_OUTPUT) {
+    this->gpio_direction_ |= 1 << ionum;
+  }
+  this->flush_gpio_();
+}
+
+bool MPR121Component::flush_gpio_() {
+  if (this->is_failed()) {
+    return false;
+  }
+
+  // TODO: The CTL registers can configure internal pullup/pulldown resistors.
+  this->write_byte(MPR121_GPIOCTL0, 0x00);
+  this->write_byte(MPR121_GPIOCTL1, 0x00);
+  this->write_byte(MPR121_GPIOEN, this->gpio_enable_);
+  this->write_byte(MPR121_GPIODIR, this->gpio_direction_);
+
+  if (!this->write_byte(MPR121_GPIODATA, this->gpio_output_)) {
+    this->status_set_warning();
+    return false;
+  }
+
+  this->status_clear_warning();
+  return true;
+}
+
+void MPR121GPIOPin::setup() { this->pin_mode(this->flags_); }
+
+void MPR121GPIOPin::pin_mode(gpio::Flags flags) {
+  assert(this->pin_ >= 4);
+  this->parent_->pin_mode(this->pin_ - 4, flags);
+}
+
+bool MPR121GPIOPin::digital_read() {
+  assert(this->pin_ >= 4);
+  return this->parent_->digital_read(this->pin_ - 4) != this->inverted_;
+}
+
+void MPR121GPIOPin::digital_write(bool value) {
+  assert(this->pin_ >= 4);
+  this->parent_->digital_write(this->pin_ - 4, value != this->inverted_);
+}
+
+std::string MPR121GPIOPin::dump_summary() const {
+  char buffer[32];
+  snprintf(buffer, sizeof(buffer), "ELE%u on MPR121", this->pin_);
+  return buffer;
 }
 
 }  // namespace mpr121
diff --git a/esphome/components/mpr121/mpr121.h b/esphome/components/mpr121/mpr121.h
index 8b7735fa28..f2dc2fe9c9 100644
--- a/esphome/components/mpr121/mpr121.h
+++ b/esphome/components/mpr121/mpr121.h
@@ -1,8 +1,10 @@
 #pragma once
 
 #include "esphome/core/component.h"
+#include "esphome/core/defines.h"
+#include "esphome/core/hal.h"
+
 #include "esphome/components/i2c/i2c.h"
-#include "esphome/components/binary_sensor/binary_sensor.h"
 
 #include <vector>
 
@@ -39,6 +41,9 @@ enum {
   MPR121_UPLIMIT = 0x7D,
   MPR121_LOWLIMIT = 0x7E,
   MPR121_TARGETLIMIT = 0x7F,
+  MPR121_GPIOCTL0 = 0x73,
+  MPR121_GPIOCTL1 = 0x74,
+  MPR121_GPIODATA = 0x75,
   MPR121_GPIODIR = 0x76,
   MPR121_GPIOEN = 0x77,
   MPR121_GPIOSET = 0x78,
@@ -47,19 +52,10 @@ enum {
   MPR121_SOFTRESET = 0x80,
 };
 
-class MPR121Channel : public binary_sensor::BinarySensor {
-  friend class MPR121Component;
-
+class MPR121Channel {
  public:
-  void set_channel(uint8_t channel) { channel_ = channel; }
-  void process(uint16_t data) { this->publish_state(static_cast<bool>(data & (1 << this->channel_))); }
-  void set_touch_threshold(uint8_t touch_threshold) { this->touch_threshold_ = touch_threshold; };
-  void set_release_threshold(uint8_t release_threshold) { this->release_threshold_ = release_threshold; };
-
- protected:
-  uint8_t channel_{0};
-  optional<uint8_t> touch_threshold_{};
-  optional<uint8_t> release_threshold_{};
+  virtual void setup() = 0;
+  virtual void process(uint16_t data) = 0;
 };
 
 class MPR121Component : public Component, public i2c::I2CDevice {
@@ -69,23 +65,63 @@ class MPR121Component : public Component, public i2c::I2CDevice {
   void set_release_debounce(uint8_t debounce);
   void set_touch_threshold(uint8_t touch_threshold) { this->touch_threshold_ = touch_threshold; };
   void set_release_threshold(uint8_t release_threshold) { this->release_threshold_ = release_threshold; };
-  uint8_t get_touch_threshold() { return this->touch_threshold_; };
-  uint8_t get_release_threshold() { return this->release_threshold_; };
+  uint8_t get_touch_threshold() const { return this->touch_threshold_; };
+  uint8_t get_release_threshold() const { return this->release_threshold_; };
   void setup() override;
   void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::DATA; }
+  float get_setup_priority() const override { return setup_priority::IO; }
   void loop() override;
 
+  void set_max_touch_channel(uint8_t max_touch_channel) { this->max_touch_channel_ = max_touch_channel; }
+
+  // GPIO helper functions.
+  bool digital_read(uint8_t ionum);
+  void digital_write(uint8_t ionum, bool value);
+  void pin_mode(uint8_t ionum, gpio::Flags flags);
+
  protected:
   std::vector<MPR121Channel *> channels_{};
   uint8_t debounce_{0};
   uint8_t touch_threshold_{};
   uint8_t release_threshold_{};
+  uint8_t max_touch_channel_{3};
   enum ErrorCode {
     NONE = 0,
     COMMUNICATION_FAILED,
     WRONG_CHIP_STATE,
   } error_code_{NONE};
+
+  bool flush_gpio_();
+
+  /// The enable mask - zero means high Z, 1 means GPIO usage
+  uint8_t gpio_enable_{0x00};
+  /// Mask for the pin mode - 1 means output, 0 means input
+  uint8_t gpio_direction_{0x00};
+  /// The mask to write as output state - 1 means HIGH, 0 means LOW
+  uint8_t gpio_output_{0x00};
+  /// The mask to read as input state - 1 means HIGH, 0 means LOW
+  uint8_t gpio_input_{0x00};
+};
+
+/// Helper class to expose a MPR121 pin as an internal input GPIO pin.
+class MPR121GPIOPin : public GPIOPin {
+ public:
+  void setup() override;
+  void pin_mode(gpio::Flags flags) override;
+  bool digital_read() override;
+  void digital_write(bool value) override;
+  std::string dump_summary() const override;
+
+  void set_parent(MPR121Component *parent) { this->parent_ = parent; }
+  void set_pin(uint8_t pin) { this->pin_ = pin; }
+  void set_inverted(bool inverted) { this->inverted_ = inverted; }
+  void set_flags(gpio::Flags flags) { this->flags_ = flags; }
+
+ protected:
+  MPR121Component *parent_;
+  uint8_t pin_;
+  bool inverted_;
+  gpio::Flags flags_;
 };
 
 }  // namespace mpr121
diff --git a/tests/components/mpr121/common.yaml b/tests/components/mpr121/common.yaml
new file mode 100644
index 0000000000..fcf61b57f3
--- /dev/null
+++ b/tests/components/mpr121/common.yaml
@@ -0,0 +1,41 @@
+i2c:
+  - id: i2c_mpr121
+    scl: ${i2c_scl}
+    sda: ${i2c_sda}
+
+mpr121:
+  id: mpr121_first
+  address: 0x5A
+
+binary_sensor:
+  - platform: mpr121
+    id: touchkey0
+    name: touchkey0
+    channel: 0
+  - platform: mpr121
+    id: bin1
+    name: touchkey1
+    channel: 1
+  - platform: mpr121
+    id: bin2
+    name: touchkey2
+    channel: 2
+  - platform: mpr121
+    id: bin3
+    name: touchkey3
+    channel: 6
+
+output:
+  - platform: gpio
+    id: gpio1
+    pin:
+      mpr121: mpr121_first
+      number: 7
+      mode: OUTPUT
+  - platform: gpio
+    id: gpio2
+    pin:
+      mpr121: mpr121_first
+      number: 11
+      mode: OUTPUT
+      inverted: true
diff --git a/tests/components/mpr121/test.esp32-c3-idf.yaml b/tests/components/mpr121/test.esp32-c3-idf.yaml
index 517e092560..d7ae0d5161 100644
--- a/tests/components/mpr121/test.esp32-c3-idf.yaml
+++ b/tests/components/mpr121/test.esp32-c3-idf.yaml
@@ -1,26 +1,5 @@
-i2c:
-  - id: i2c_mpr121
-    scl: 5
-    sda: 4
+substitutions:
+  i2c_scl: GPIO5
+  i2c_sda: GPIO4
 
-mpr121:
-  id: mpr121_first
-  address: 0x5A
-
-binary_sensor:
-  - platform: mpr121
-    id: touchkey0
-    name: touchkey0
-    channel: 0
-  - platform: mpr121
-    id: bin1
-    name: touchkey1
-    channel: 1
-  - platform: mpr121
-    id: bin2
-    name: touchkey2
-    channel: 2
-  - platform: mpr121
-    id: bin3
-    name: touchkey3
-    channel: 3
+<<: !include common.yaml
diff --git a/tests/components/mpr121/test.esp32-c3.yaml b/tests/components/mpr121/test.esp32-c3.yaml
index 517e092560..d7ae0d5161 100644
--- a/tests/components/mpr121/test.esp32-c3.yaml
+++ b/tests/components/mpr121/test.esp32-c3.yaml
@@ -1,26 +1,5 @@
-i2c:
-  - id: i2c_mpr121
-    scl: 5
-    sda: 4
+substitutions:
+  i2c_scl: GPIO5
+  i2c_sda: GPIO4
 
-mpr121:
-  id: mpr121_first
-  address: 0x5A
-
-binary_sensor:
-  - platform: mpr121
-    id: touchkey0
-    name: touchkey0
-    channel: 0
-  - platform: mpr121
-    id: bin1
-    name: touchkey1
-    channel: 1
-  - platform: mpr121
-    id: bin2
-    name: touchkey2
-    channel: 2
-  - platform: mpr121
-    id: bin3
-    name: touchkey3
-    channel: 3
+<<: !include common.yaml
diff --git a/tests/components/mpr121/test.esp32-idf.yaml b/tests/components/mpr121/test.esp32-idf.yaml
index 96996fd8ee..1037d5d35b 100644
--- a/tests/components/mpr121/test.esp32-idf.yaml
+++ b/tests/components/mpr121/test.esp32-idf.yaml
@@ -1,26 +1,5 @@
-i2c:
-  - id: i2c_mpr121
-    scl: 16
-    sda: 17
+substitutions:
+  i2c_scl: GPIO16
+  i2c_sda: GPIO17
 
-mpr121:
-  id: mpr121_first
-  address: 0x5A
-
-binary_sensor:
-  - platform: mpr121
-    id: touchkey0
-    name: touchkey0
-    channel: 0
-  - platform: mpr121
-    id: bin1
-    name: touchkey1
-    channel: 1
-  - platform: mpr121
-    id: bin2
-    name: touchkey2
-    channel: 2
-  - platform: mpr121
-    id: bin3
-    name: touchkey3
-    channel: 3
+<<: !include common.yaml
diff --git a/tests/components/mpr121/test.esp32.yaml b/tests/components/mpr121/test.esp32.yaml
index 96996fd8ee..1037d5d35b 100644
--- a/tests/components/mpr121/test.esp32.yaml
+++ b/tests/components/mpr121/test.esp32.yaml
@@ -1,26 +1,5 @@
-i2c:
-  - id: i2c_mpr121
-    scl: 16
-    sda: 17
+substitutions:
+  i2c_scl: GPIO16
+  i2c_sda: GPIO17
 
-mpr121:
-  id: mpr121_first
-  address: 0x5A
-
-binary_sensor:
-  - platform: mpr121
-    id: touchkey0
-    name: touchkey0
-    channel: 0
-  - platform: mpr121
-    id: bin1
-    name: touchkey1
-    channel: 1
-  - platform: mpr121
-    id: bin2
-    name: touchkey2
-    channel: 2
-  - platform: mpr121
-    id: bin3
-    name: touchkey3
-    channel: 3
+<<: !include common.yaml
diff --git a/tests/components/mpr121/test.esp8266.yaml b/tests/components/mpr121/test.esp8266.yaml
index 517e092560..d7ae0d5161 100644
--- a/tests/components/mpr121/test.esp8266.yaml
+++ b/tests/components/mpr121/test.esp8266.yaml
@@ -1,26 +1,5 @@
-i2c:
-  - id: i2c_mpr121
-    scl: 5
-    sda: 4
+substitutions:
+  i2c_scl: GPIO5
+  i2c_sda: GPIO4
 
-mpr121:
-  id: mpr121_first
-  address: 0x5A
-
-binary_sensor:
-  - platform: mpr121
-    id: touchkey0
-    name: touchkey0
-    channel: 0
-  - platform: mpr121
-    id: bin1
-    name: touchkey1
-    channel: 1
-  - platform: mpr121
-    id: bin2
-    name: touchkey2
-    channel: 2
-  - platform: mpr121
-    id: bin3
-    name: touchkey3
-    channel: 3
+<<: !include common.yaml
diff --git a/tests/components/mpr121/test.rp2040.yaml b/tests/components/mpr121/test.rp2040.yaml
index 517e092560..d7ae0d5161 100644
--- a/tests/components/mpr121/test.rp2040.yaml
+++ b/tests/components/mpr121/test.rp2040.yaml
@@ -1,26 +1,5 @@
-i2c:
-  - id: i2c_mpr121
-    scl: 5
-    sda: 4
+substitutions:
+  i2c_scl: GPIO5
+  i2c_sda: GPIO4
 
-mpr121:
-  id: mpr121_first
-  address: 0x5A
-
-binary_sensor:
-  - platform: mpr121
-    id: touchkey0
-    name: touchkey0
-    channel: 0
-  - platform: mpr121
-    id: bin1
-    name: touchkey1
-    channel: 1
-  - platform: mpr121
-    id: bin2
-    name: touchkey2
-    channel: 2
-  - platform: mpr121
-    id: bin3
-    name: touchkey3
-    channel: 3
+<<: !include common.yaml
diff --git a/tests/test3.1.yaml b/tests/test3.1.yaml
index a7d8dcb3f4..018a4d94f3 100644
--- a/tests/test3.1.yaml
+++ b/tests/test3.1.yaml
@@ -344,10 +344,6 @@ apds9960:
   address: 0x20
   update_interval: 60s
 
-mpr121:
-  id: mpr121_first
-  address: 0x5A
-
 binary_sensor:
   - platform: apds9960
     direction: up
@@ -371,25 +367,6 @@ binary_sensor:
     direction: right
     name: APDS9960 Right
 
-  - platform: mpr121
-    id: touchkey0
-    channel: 0
-    name: touchkey0
-  - platform: mpr121
-    channel: 1
-    name: touchkey1
-    id: bin1
-  - platform: mpr121
-    channel: 2
-    name: touchkey2
-    id: bin2
-  - platform: mpr121
-    channel: 3
-    name: touchkey3
-    id: bin3
-    on_press:
-      then:
-        - switch.toggle: mpr121_toggle
   - platform: ttp229_lsf
     channel: 1
     name: TTP229 LSF Test
@@ -443,10 +420,6 @@ grove_tb6612fng:
   address: 0x14
 
 switch:
-  - platform: template
-    name: mpr121_toggle
-    id: mpr121_toggle
-    optimistic: true
   - platform: gpio
     id: gpio_switch1
     pin:

From 9d03f472335be2c696547c8484421dba8252f145 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Thu, 23 May 2024 23:11:34 +0200
Subject: [PATCH 08/29] [nextion] Add basic functions to Intelligent series
 (#6791)

---
 esphome/components/nextion/nextion.h          | 67 +++++++++++++++++++
 .../components/nextion/nextion_commands.cpp   | 20 +++++-
 2 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/esphome/components/nextion/nextion.h b/esphome/components/nextion/nextion.h
index dfa74f644d..4546baa4d8 100644
--- a/esphome/components/nextion/nextion.h
+++ b/esphome/components/nextion/nextion.h
@@ -952,6 +952,73 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
    */
   bool set_protocol_reparse_mode(bool active_mode);
 
+  // ======== Nextion Intelligent Series ========
+
+  /**
+   * Set the video id of a component.
+   * @param component The component name.
+   * @param vid_id The video ID.
+   *
+   * Example:
+   * ```cpp
+   * it.set_component_vid("textview", 1);
+   * ```
+   *
+   * This will change the video id of the component `textview`.
+   *
+   * Note: Requires Nextion Intelligent series display.
+   */
+  void set_component_vid(const char *component, uint8_t vid_id);
+
+  /**
+   * Set the drag availability of a component.
+   * @param component The component name.
+   * @param drag False: Drag not available, True: Drag available.
+   *
+   * Example:
+   * ```cpp
+   * it.set_component_drag("textview", true);
+   * ```
+   *
+   * This will enable drag to the component `textview`.
+   *
+   * Note: Requires Nextion Intelligent series display.
+   */
+  void set_component_drag(const char *component, bool drag);
+
+  /**
+   * Set the opaqueness (fading) of a component.
+   * @param component The component name.
+   * @param aph An integer between 0 and 127 related to the opaqueness/fading level.
+   *
+   * Example:
+   * ```cpp
+   * it.set_component_aph("textview", 64);
+   * ```
+   *
+   * This will set the opaqueness level of the component `textview` to 64.
+   *
+   * Note: Requires Nextion Intelligent series display.
+   */
+  void set_component_aph(const char *component, uint8_t aph);
+
+  /**
+   * Set the position of a component.
+   * @param component The component name.
+   * @param x The new X (horizontal) coordinate for the component.
+   * @param y The new Y (vertical) coordinate for the component.
+   *
+   * Example:
+   * ```cpp
+   * it.set_component_aph("textview", 64, 35);
+   * ```
+   *
+   * This will move the component `textview` to the column 64 of row 35 of the display.
+   *
+   * Note: Requires Nextion Intelligent series display.
+   */
+  void set_component_position(const char *component, uint32_t x, uint32_t y);
+
   // ========== INTERNAL METHODS ==========
   // (In most use cases you won't need these)
   void register_touch_component(NextionComponentBase *obj) { this->touch_.push_back(obj); }
diff --git a/esphome/components/nextion/nextion_commands.cpp b/esphome/components/nextion/nextion_commands.cpp
index fdd6c74d99..398e9dd502 100644
--- a/esphome/components/nextion/nextion_commands.cpp
+++ b/esphome/components/nextion/nextion_commands.cpp
@@ -148,7 +148,25 @@ void Nextion::set_component_pic(const char *component, uint8_t pic_id) {
 }
 
 void Nextion::set_component_picc(const char *component, uint8_t pic_id) {
-  this->add_no_result_to_queue_with_printf_("set_component_pic", "%s.picc=%" PRIu8, component, pic_id);
+  this->add_no_result_to_queue_with_printf_("set_component_picc", "%s.picc=%" PRIu8, component, pic_id);
+}
+
+// Set video
+void Nextion::set_component_vid(const char *component, uint8_t vid_id) {
+  this->add_no_result_to_queue_with_printf_("set_component_vid", "%s.vid=%" PRIu8, component, vid_id);
+}
+
+void Nextion::set_component_drag(const char *component, bool drag) {
+  this->add_no_result_to_queue_with_printf_("set_component_drag", "%s.drag=%i", component, drag ? 1 : 0);
+}
+
+void Nextion::set_component_aph(const char *component, uint8_t aph) {
+  this->add_no_result_to_queue_with_printf_("set_component_aph", "%s.aph=%" PRIu8, component, aph);
+}
+
+void Nextion::set_component_position(const char *component, uint32_t x, uint32_t y) {
+  this->add_no_result_to_queue_with_printf_("set_component_position_x", "%s.x=%" PRIu32, component, x);
+  this->add_no_result_to_queue_with_printf_("set_component_position_y", "%s.y=%" PRIu32, component, y);
 }
 
 void Nextion::set_component_text_printf(const char *component, const char *format, ...) {

From 863bee28d9649f3179b75b3a5ebb833d9c7232a5 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Sat, 25 May 2024 07:42:24 +1200
Subject: [PATCH 09/29] [voice_assistant] Don't allocate buffers until starting
 the microphone for the first time (#6800)

---
 .../voice_assistant/voice_assistant.cpp       | 96 +++++++++++++++----
 .../voice_assistant/voice_assistant.h         |  4 +
 2 files changed, 83 insertions(+), 17 deletions(-)

diff --git a/esphome/components/voice_assistant/voice_assistant.cpp b/esphome/components/voice_assistant/voice_assistant.cpp
index 109e52f8eb..59ba39c527 100644
--- a/esphome/components/voice_assistant/voice_assistant.cpp
+++ b/esphome/components/voice_assistant/voice_assistant.cpp
@@ -71,6 +71,12 @@ void VoiceAssistant::setup() {
   ESP_LOGCONFIG(TAG, "Setting up Voice Assistant...");
 
   global_voice_assistant = this;
+}
+
+bool VoiceAssistant::allocate_buffers_() {
+  if (this->send_buffer_ != nullptr) {
+    return true;  // Already allocated
+  }
 
 #ifdef USE_SPEAKER
   if (this->speaker_ != nullptr) {
@@ -78,8 +84,7 @@ void VoiceAssistant::setup() {
     this->speaker_buffer_ = speaker_allocator.allocate(SPEAKER_BUFFER_SIZE);
     if (this->speaker_buffer_ == nullptr) {
       ESP_LOGW(TAG, "Could not allocate speaker buffer");
-      this->mark_failed();
-      return;
+      return false;
     }
   }
 #endif
@@ -88,8 +93,7 @@ void VoiceAssistant::setup() {
   this->input_buffer_ = allocator.allocate(INPUT_BUFFER_SIZE);
   if (this->input_buffer_ == nullptr) {
     ESP_LOGW(TAG, "Could not allocate input buffer");
-    this->mark_failed();
-    return;
+    return false;
   }
 
 #ifdef USE_ESP_ADF
@@ -99,17 +103,71 @@ void VoiceAssistant::setup() {
   this->ring_buffer_ = RingBuffer::create(BUFFER_SIZE * sizeof(int16_t));
   if (this->ring_buffer_ == nullptr) {
     ESP_LOGW(TAG, "Could not allocate ring buffer");
-    this->mark_failed();
-    return;
+    return false;
   }
 
   ExternalRAMAllocator<uint8_t> send_allocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);
   this->send_buffer_ = send_allocator.allocate(SEND_BUFFER_SIZE);
   if (send_buffer_ == nullptr) {
     ESP_LOGW(TAG, "Could not allocate send buffer");
-    this->mark_failed();
-    return;
+    return false;
   }
+
+  return true;
+}
+
+void VoiceAssistant::clear_buffers_() {
+  if (this->send_buffer_ != nullptr) {
+    memset(this->send_buffer_, 0, SEND_BUFFER_SIZE);
+  }
+
+  if (this->input_buffer_ != nullptr) {
+    memset(this->input_buffer_, 0, INPUT_BUFFER_SIZE * sizeof(int16_t));
+  }
+
+  if (this->ring_buffer_ != nullptr) {
+    this->ring_buffer_->reset();
+  }
+
+#ifdef USE_SPEAKER
+  if (this->speaker_buffer_ != nullptr) {
+    memset(this->speaker_buffer_, 0, SPEAKER_BUFFER_SIZE);
+
+    this->speaker_buffer_size_ = 0;
+    this->speaker_buffer_index_ = 0;
+    this->speaker_bytes_received_ = 0;
+  }
+#endif
+}
+
+void VoiceAssistant::deallocate_buffers_() {
+  ExternalRAMAllocator<uint8_t> send_deallocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);
+  send_deallocator.deallocate(this->send_buffer_, SEND_BUFFER_SIZE);
+  this->send_buffer_ = nullptr;
+
+  if (this->ring_buffer_ != nullptr) {
+    this->ring_buffer_.reset();
+    this->ring_buffer_ = nullptr;
+  }
+
+#ifdef USE_ESP_ADF
+  if (this->vad_instance_ != nullptr) {
+    vad_destroy(this->vad_instance_);
+    this->vad_instance_ = nullptr;
+  }
+#endif
+
+  ExternalRAMAllocator<int16_t> input_deallocator(ExternalRAMAllocator<int16_t>::ALLOW_FAILURE);
+  input_deallocator.deallocate(this->input_buffer_, INPUT_BUFFER_SIZE);
+  this->input_buffer_ = nullptr;
+
+#ifdef USE_SPEAKER
+  if (this->speaker_buffer_ != nullptr) {
+    ExternalRAMAllocator<uint8_t> speaker_deallocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);
+    speaker_deallocator.deallocate(this->speaker_buffer_, SPEAKER_BUFFER_SIZE);
+    this->speaker_buffer_ = nullptr;
+  }
+#endif
 }
 
 int VoiceAssistant::read_microphone_() {
@@ -138,14 +196,13 @@ void VoiceAssistant::loop() {
     }
     this->continuous_ = false;
     this->signal_stop_();
+    this->clear_buffers_();
     return;
   }
   switch (this->state_) {
     case State::IDLE: {
       if (this->continuous_ && this->desired_state_ == State::IDLE) {
         this->idle_trigger_->trigger();
-
-        this->ring_buffer_->reset();
 #ifdef USE_ESP_ADF
         if (this->use_wake_word_) {
           this->set_state_(State::START_MICROPHONE, State::WAIT_FOR_VAD);
@@ -161,8 +218,15 @@ void VoiceAssistant::loop() {
     }
     case State::START_MICROPHONE: {
       ESP_LOGD(TAG, "Starting Microphone");
-      memset(this->send_buffer_, 0, SEND_BUFFER_SIZE);
-      memset(this->input_buffer_, 0, INPUT_BUFFER_SIZE * sizeof(int16_t));
+      if (!this->allocate_buffers_()) {
+        this->status_set_error("Failed to allocate buffers");
+        return;
+      }
+      if (this->status_has_error()) {
+        this->status_clear_error();
+      }
+      this->clear_buffers_();
+
       this->mic_->start();
       this->high_freq_.start();
       this->set_state_(State::STARTING_MICROPHONE);
@@ -343,10 +407,9 @@ void VoiceAssistant::loop() {
         this->speaker_->stop();
         this->cancel_timeout("speaker-timeout");
         this->cancel_timeout("playing");
-        this->speaker_buffer_size_ = 0;
-        this->speaker_buffer_index_ = 0;
-        this->speaker_bytes_received_ = 0;
-        memset(this->speaker_buffer_, 0, SPEAKER_BUFFER_SIZE);
+
+        this->clear_buffers_();
+
         this->wait_for_stream_end_ = false;
         this->stream_ended_ = false;
 
@@ -507,7 +570,6 @@ void VoiceAssistant::request_start(bool continuous, bool silence_detection) {
   if (this->state_ == State::IDLE) {
     this->continuous_ = continuous;
     this->silence_detection_ = silence_detection;
-    this->ring_buffer_->reset();
 #ifdef USE_ESP_ADF
     if (this->use_wake_word_) {
       this->set_state_(State::START_MICROPHONE, State::WAIT_FOR_VAD);
diff --git a/esphome/components/voice_assistant/voice_assistant.h b/esphome/components/voice_assistant/voice_assistant.h
index 1c0ea12f4f..17141365d4 100644
--- a/esphome/components/voice_assistant/voice_assistant.h
+++ b/esphome/components/voice_assistant/voice_assistant.h
@@ -151,6 +151,10 @@ class VoiceAssistant : public Component {
   void set_wake_word(const std::string &wake_word) { this->wake_word_ = wake_word; }
 
  protected:
+  bool allocate_buffers_();
+  void clear_buffers_();
+  void deallocate_buffers_();
+
   int read_microphone_();
   void set_state_(State state);
   void set_state_(State state, State desired_state);

From 04db724295e4e5a537e1532b426a9c64bc19a7aa Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Sat, 25 May 2024 07:42:24 +1200
Subject: [PATCH 10/29] [voice_assistant] Don't allocate buffers until starting
 the microphone for the first time (#6800)

---
 .../voice_assistant/voice_assistant.cpp       | 96 +++++++++++++++----
 .../voice_assistant/voice_assistant.h         |  4 +
 2 files changed, 83 insertions(+), 17 deletions(-)

diff --git a/esphome/components/voice_assistant/voice_assistant.cpp b/esphome/components/voice_assistant/voice_assistant.cpp
index 109e52f8eb..59ba39c527 100644
--- a/esphome/components/voice_assistant/voice_assistant.cpp
+++ b/esphome/components/voice_assistant/voice_assistant.cpp
@@ -71,6 +71,12 @@ void VoiceAssistant::setup() {
   ESP_LOGCONFIG(TAG, "Setting up Voice Assistant...");
 
   global_voice_assistant = this;
+}
+
+bool VoiceAssistant::allocate_buffers_() {
+  if (this->send_buffer_ != nullptr) {
+    return true;  // Already allocated
+  }
 
 #ifdef USE_SPEAKER
   if (this->speaker_ != nullptr) {
@@ -78,8 +84,7 @@ void VoiceAssistant::setup() {
     this->speaker_buffer_ = speaker_allocator.allocate(SPEAKER_BUFFER_SIZE);
     if (this->speaker_buffer_ == nullptr) {
       ESP_LOGW(TAG, "Could not allocate speaker buffer");
-      this->mark_failed();
-      return;
+      return false;
     }
   }
 #endif
@@ -88,8 +93,7 @@ void VoiceAssistant::setup() {
   this->input_buffer_ = allocator.allocate(INPUT_BUFFER_SIZE);
   if (this->input_buffer_ == nullptr) {
     ESP_LOGW(TAG, "Could not allocate input buffer");
-    this->mark_failed();
-    return;
+    return false;
   }
 
 #ifdef USE_ESP_ADF
@@ -99,17 +103,71 @@ void VoiceAssistant::setup() {
   this->ring_buffer_ = RingBuffer::create(BUFFER_SIZE * sizeof(int16_t));
   if (this->ring_buffer_ == nullptr) {
     ESP_LOGW(TAG, "Could not allocate ring buffer");
-    this->mark_failed();
-    return;
+    return false;
   }
 
   ExternalRAMAllocator<uint8_t> send_allocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);
   this->send_buffer_ = send_allocator.allocate(SEND_BUFFER_SIZE);
   if (send_buffer_ == nullptr) {
     ESP_LOGW(TAG, "Could not allocate send buffer");
-    this->mark_failed();
-    return;
+    return false;
   }
+
+  return true;
+}
+
+void VoiceAssistant::clear_buffers_() {
+  if (this->send_buffer_ != nullptr) {
+    memset(this->send_buffer_, 0, SEND_BUFFER_SIZE);
+  }
+
+  if (this->input_buffer_ != nullptr) {
+    memset(this->input_buffer_, 0, INPUT_BUFFER_SIZE * sizeof(int16_t));
+  }
+
+  if (this->ring_buffer_ != nullptr) {
+    this->ring_buffer_->reset();
+  }
+
+#ifdef USE_SPEAKER
+  if (this->speaker_buffer_ != nullptr) {
+    memset(this->speaker_buffer_, 0, SPEAKER_BUFFER_SIZE);
+
+    this->speaker_buffer_size_ = 0;
+    this->speaker_buffer_index_ = 0;
+    this->speaker_bytes_received_ = 0;
+  }
+#endif
+}
+
+void VoiceAssistant::deallocate_buffers_() {
+  ExternalRAMAllocator<uint8_t> send_deallocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);
+  send_deallocator.deallocate(this->send_buffer_, SEND_BUFFER_SIZE);
+  this->send_buffer_ = nullptr;
+
+  if (this->ring_buffer_ != nullptr) {
+    this->ring_buffer_.reset();
+    this->ring_buffer_ = nullptr;
+  }
+
+#ifdef USE_ESP_ADF
+  if (this->vad_instance_ != nullptr) {
+    vad_destroy(this->vad_instance_);
+    this->vad_instance_ = nullptr;
+  }
+#endif
+
+  ExternalRAMAllocator<int16_t> input_deallocator(ExternalRAMAllocator<int16_t>::ALLOW_FAILURE);
+  input_deallocator.deallocate(this->input_buffer_, INPUT_BUFFER_SIZE);
+  this->input_buffer_ = nullptr;
+
+#ifdef USE_SPEAKER
+  if (this->speaker_buffer_ != nullptr) {
+    ExternalRAMAllocator<uint8_t> speaker_deallocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);
+    speaker_deallocator.deallocate(this->speaker_buffer_, SPEAKER_BUFFER_SIZE);
+    this->speaker_buffer_ = nullptr;
+  }
+#endif
 }
 
 int VoiceAssistant::read_microphone_() {
@@ -138,14 +196,13 @@ void VoiceAssistant::loop() {
     }
     this->continuous_ = false;
     this->signal_stop_();
+    this->clear_buffers_();
     return;
   }
   switch (this->state_) {
     case State::IDLE: {
       if (this->continuous_ && this->desired_state_ == State::IDLE) {
         this->idle_trigger_->trigger();
-
-        this->ring_buffer_->reset();
 #ifdef USE_ESP_ADF
         if (this->use_wake_word_) {
           this->set_state_(State::START_MICROPHONE, State::WAIT_FOR_VAD);
@@ -161,8 +218,15 @@ void VoiceAssistant::loop() {
     }
     case State::START_MICROPHONE: {
       ESP_LOGD(TAG, "Starting Microphone");
-      memset(this->send_buffer_, 0, SEND_BUFFER_SIZE);
-      memset(this->input_buffer_, 0, INPUT_BUFFER_SIZE * sizeof(int16_t));
+      if (!this->allocate_buffers_()) {
+        this->status_set_error("Failed to allocate buffers");
+        return;
+      }
+      if (this->status_has_error()) {
+        this->status_clear_error();
+      }
+      this->clear_buffers_();
+
       this->mic_->start();
       this->high_freq_.start();
       this->set_state_(State::STARTING_MICROPHONE);
@@ -343,10 +407,9 @@ void VoiceAssistant::loop() {
         this->speaker_->stop();
         this->cancel_timeout("speaker-timeout");
         this->cancel_timeout("playing");
-        this->speaker_buffer_size_ = 0;
-        this->speaker_buffer_index_ = 0;
-        this->speaker_bytes_received_ = 0;
-        memset(this->speaker_buffer_, 0, SPEAKER_BUFFER_SIZE);
+
+        this->clear_buffers_();
+
         this->wait_for_stream_end_ = false;
         this->stream_ended_ = false;
 
@@ -507,7 +570,6 @@ void VoiceAssistant::request_start(bool continuous, bool silence_detection) {
   if (this->state_ == State::IDLE) {
     this->continuous_ = continuous;
     this->silence_detection_ = silence_detection;
-    this->ring_buffer_->reset();
 #ifdef USE_ESP_ADF
     if (this->use_wake_word_) {
       this->set_state_(State::START_MICROPHONE, State::WAIT_FOR_VAD);
diff --git a/esphome/components/voice_assistant/voice_assistant.h b/esphome/components/voice_assistant/voice_assistant.h
index 1c0ea12f4f..17141365d4 100644
--- a/esphome/components/voice_assistant/voice_assistant.h
+++ b/esphome/components/voice_assistant/voice_assistant.h
@@ -151,6 +151,10 @@ class VoiceAssistant : public Component {
   void set_wake_word(const std::string &wake_word) { this->wake_word_ = wake_word; }
 
  protected:
+  bool allocate_buffers_();
+  void clear_buffers_();
+  void deallocate_buffers_();
+
   int read_microphone_();
   void set_state_(State state);
   void set_state_(State state, State desired_state);

From af755380b7e8f8b90cfd1f45c9dcbf09bb94c101 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Sat, 25 May 2024 08:14:39 +1200
Subject: [PATCH 11/29] Bump version to 2024.5.3

---
 esphome/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/const.py b/esphome/const.py
index 48b8aa8656..0c53287909 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2024.5.2"
+__version__ = "2024.5.3"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 VALID_SUBSTITUTIONS_CHARACTERS = (

From 6d341ce4e7f41c09d723f9663e61e0c0dd51d159 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 27 May 2024 07:15:05 +1200
Subject: [PATCH 12/29] [web_server_base] Bump ESPAsyncWebServer-esphome to
 3.2.2 (#6797)

Co-authored-by: Samuel Sieb <samuel-github@sieb.net>
---
 esphome/components/web_server_base/__init__.py | 2 +-
 platformio.ini                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/web_server_base/__init__.py b/esphome/components/web_server_base/__init__.py
index 1970b5a0c5..4f894619b0 100644
--- a/esphome/components/web_server_base/__init__.py
+++ b/esphome/components/web_server_base/__init__.py
@@ -37,4 +37,4 @@ async def to_code(config):
             cg.add_library("FS", None)
             cg.add_library("Update", None)
         # https://github.com/esphome/ESPAsyncWebServer/blob/master/library.json
-        cg.add_library("esphome/ESPAsyncWebServer-esphome", "3.2.0")
+        cg.add_library("esphome/ESPAsyncWebServer-esphome", "3.2.2")
diff --git a/platformio.ini b/platformio.ini
index 65c742cf91..fd0ae7c6d8 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -58,7 +58,7 @@ lib_deps =
     SPI                                                   ; spi (Arduino built-in)
     Wire                                                  ; i2c (Arduino built-int)
     heman/AsyncMqttClient-esphome@1.0.0                   ; mqtt
-    esphome/ESPAsyncWebServer-esphome@3.2.0               ; web_server_base
+    esphome/ESPAsyncWebServer-esphome@3.2.2               ; web_server_base
     fastled/FastLED@3.3.2                                 ; fastled_base
     mikalhart/TinyGPSPlus@1.0.2                           ; gps
     freekode/TM1651@1.0.1                                 ; tm1651

From 4125b48b86a4da0ba27704ab11f2033a8275540c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C5=A1o=20Domadenik?= <saso.doma@gmail.com>
Date: Sun, 26 May 2024 21:23:00 +0200
Subject: [PATCH 13/29] Fix incorrect naming of the AdaFruit MagTag display.
 (#6810)

---
 esphome/components/waveshare_epaper/display.py       |  4 ++--
 .../components/waveshare_epaper/waveshare_epaper.cpp | 12 ++++++------
 .../components/waveshare_epaper/waveshare_epaper.h   |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/esphome/components/waveshare_epaper/display.py b/esphome/components/waveshare_epaper/display.py
index bba60efc0a..9ad948e915 100644
--- a/esphome/components/waveshare_epaper/display.py
+++ b/esphome/components/waveshare_epaper/display.py
@@ -48,7 +48,7 @@ WaveshareEPaper2P9InBV3 = waveshare_epaper_ns.class_(
 WaveshareEPaper2P9InV2R2 = waveshare_epaper_ns.class_(
     "WaveshareEPaper2P9InV2R2", WaveshareEPaper
 )
-GDEY029T94 = waveshare_epaper_ns.class_("GDEY029T94", WaveshareEPaper)
+GDEW029T5 = waveshare_epaper_ns.class_("GDEW029T5", WaveshareEPaper)
 WaveshareEPaper2P9InDKE = waveshare_epaper_ns.class_(
     "WaveshareEPaper2P9InDKE", WaveshareEPaper
 )
@@ -110,7 +110,7 @@ MODELS = {
     "2.13in-ttgo-b74": ("a", WaveshareEPaperTypeAModel.TTGO_EPAPER_2_13_IN_B74),
     "2.90in": ("a", WaveshareEPaperTypeAModel.WAVESHARE_EPAPER_2_9_IN),
     "2.90inv2": ("a", WaveshareEPaperTypeAModel.WAVESHARE_EPAPER_2_9_IN_V2),
-    "gdey029t94": ("c", GDEY029T94),
+    "gdew029t5": ("c", GDEW029T5),
     "2.70in": ("b", WaveshareEPaper2P7In),
     "2.70in-b": ("b", WaveshareEPaper2P7InB),
     "2.70in-bv2": ("b", WaveshareEPaper2P7InBV2),
diff --git a/esphome/components/waveshare_epaper/waveshare_epaper.cpp b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
index 7224aa44ed..5428f4ec80 100644
--- a/esphome/components/waveshare_epaper/waveshare_epaper.cpp
+++ b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
@@ -1514,7 +1514,7 @@ void WaveshareEPaper2P9InV2R2::set_full_update_every(uint32_t full_update_every)
 //  - https://github.com/adafruit/Adafruit_EPD/blob/master/src/panels/ThinkInk_290_Grayscale4_T5.h
 // ========================================================
 
-void GDEY029T94::initialize() {
+void GDEW029T5::initialize() {
   // from https://www.waveshare.com/w/upload/b/bb/2.9inch-e-paper-b-specification.pdf, page 37
   // EPD hardware init start
   this->reset_();
@@ -1560,7 +1560,7 @@ void GDEY029T94::initialize() {
 
   // EPD hardware init end
 }
-void HOT GDEY029T94::display() {
+void HOT GDEW029T5::display() {
   // COMMAND DATA START TRANSMISSION 2 (B/W only)
   this->command(0x13);
   delay(2);
@@ -1580,11 +1580,11 @@ void HOT GDEY029T94::display() {
   // NOTE: power off < deep sleep
   this->command(0x02);
 }
-int GDEY029T94::get_width_internal() { return 128; }
-int GDEY029T94::get_height_internal() { return 296; }
-void GDEY029T94::dump_config() {
+int GDEW029T5::get_width_internal() { return 128; }
+int GDEW029T5::get_height_internal() { return 296; }
+void GDEW029T5::dump_config() {
   LOG_DISPLAY("", "Waveshare E-Paper (Good Display)", this);
-  ESP_LOGCONFIG(TAG, "  Model: 2.9in Greyscale GDEY029T94");
+  ESP_LOGCONFIG(TAG, "  Model: 2.9in Greyscale GDEW029T5");
   LOG_PIN("  Reset Pin: ", this->reset_pin_);
   LOG_PIN("  DC Pin: ", this->dc_pin_);
   LOG_PIN("  Busy Pin: ", this->busy_pin_);
diff --git a/esphome/components/waveshare_epaper/waveshare_epaper.h b/esphome/components/waveshare_epaper/waveshare_epaper.h
index 3c4470c30c..4a5844ae88 100644
--- a/esphome/components/waveshare_epaper/waveshare_epaper.h
+++ b/esphome/components/waveshare_epaper/waveshare_epaper.h
@@ -227,7 +227,7 @@ class WaveshareEPaper2P7InBV2 : public WaveshareEPaperBWR {
   int get_height_internal() override;
 };
 
-class GDEY029T94 : public WaveshareEPaper {
+class GDEW029T5 : public WaveshareEPaper {
  public:
   void initialize() override;
 

From 17c6bf57cdcdffe00af8578ec1c4fd3e00e6d451 Mon Sep 17 00:00:00 2001
From: august huber <gus@pbx.org>
Date: Sun, 26 May 2024 15:40:38 -0400
Subject: [PATCH 14/29] [tuya] add support for extended services (#6808)

---
 esphome/components/tuya/tuya.cpp | 24 ++++++++++++++++++++++++
 esphome/components/tuya/tuya.h   |  7 +++++++
 2 files changed, 31 insertions(+)

diff --git a/esphome/components/tuya/tuya.cpp b/esphome/components/tuya/tuya.cpp
index 1cc9681d09..402953bb3b 100644
--- a/esphome/components/tuya/tuya.cpp
+++ b/esphome/components/tuya/tuya.cpp
@@ -269,6 +269,30 @@ void Tuya::handle_command_(uint8_t command, uint8_t version, const uint8_t *buff
       ESP_LOGV(TAG, "Network status requested, reported as %i", wifi_status);
       break;
     }
+    case TuyaCommandType::EXTENDED_SERVICES: {
+      uint8_t subcommand = buffer[0];
+      switch ((TuyaExtendedServicesCommandType) subcommand) {
+        case TuyaExtendedServicesCommandType::RESET_NOTIFICATION: {
+          this->send_command_(
+              TuyaCommand{.cmd = TuyaCommandType::EXTENDED_SERVICES,
+                          .payload = std::vector<uint8_t>{
+                              static_cast<uint8_t>(TuyaExtendedServicesCommandType::RESET_NOTIFICATION), 0x00}});
+          ESP_LOGV(TAG, "Reset status notification enabled");
+          break;
+        }
+        case TuyaExtendedServicesCommandType::MODULE_RESET: {
+          ESP_LOGE(TAG, "EXTENDED_SERVICES::MODULE_RESET is not handled");
+          break;
+        }
+        case TuyaExtendedServicesCommandType::UPDATE_IN_PROGRESS: {
+          ESP_LOGE(TAG, "EXTENDED_SERVICES::UPDATE_IN_PROGRESS is not handled");
+          break;
+        }
+        default:
+          ESP_LOGE(TAG, "Invalid extended services subcommand (0x%02X) received", subcommand);
+      }
+      break;
+    }
     default:
       ESP_LOGE(TAG, "Invalid command (0x%02X) received", command);
   }
diff --git a/esphome/components/tuya/tuya.h b/esphome/components/tuya/tuya.h
index 7dc405e3dd..6db417d474 100644
--- a/esphome/components/tuya/tuya.h
+++ b/esphome/components/tuya/tuya.h
@@ -60,6 +60,13 @@ enum class TuyaCommandType : uint8_t {
   WIFI_RSSI = 0x24,
   VACUUM_MAP_UPLOAD = 0x28,
   GET_NETWORK_STATUS = 0x2B,
+  EXTENDED_SERVICES = 0x34,
+};
+
+enum class TuyaExtendedServicesCommandType : uint8_t {
+  RESET_NOTIFICATION = 0x04,
+  MODULE_RESET = 0x05,
+  UPDATE_IN_PROGRESS = 0x0A,
 };
 
 enum class TuyaInitState : uint8_t {

From e285196709771e22a42b2eb0c69add723d546ca5 Mon Sep 17 00:00:00 2001
From: august huber <gus@pbx.org>
Date: Sun, 26 May 2024 15:41:29 -0400
Subject: [PATCH 15/29] fix libretiny regression from #6715 (#6806)

---
 esphome/components/debug/debug_libretiny.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/debug/debug_libretiny.cpp b/esphome/components/debug/debug_libretiny.cpp
index 725cd870ca..c3418cf96c 100644
--- a/esphome/components/debug/debug_libretiny.cpp
+++ b/esphome/components/debug/debug_libretiny.cpp
@@ -12,7 +12,7 @@ std::string DebugComponent::get_reset_reason_() { return lt_get_reboot_reason_na
 uint32_t DebugComponent::get_free_heap_() { return lt_heap_get_free(); }
 
 void DebugComponent::get_device_info_(std::string &device_info) {
-  reset_reason = get_reset_reason_();
+  str::string reset_reason = get_reset_reason_();
   ESP_LOGD(TAG, "LibreTiny Version: %s", lt_get_version());
   ESP_LOGD(TAG, "Chip: %s (%04x) @ %u MHz", lt_cpu_get_model_name(), lt_cpu_get_model(), lt_cpu_get_freq_mhz());
   ESP_LOGD(TAG, "Chip ID: 0x%06X", lt_cpu_get_mac_id());

From 6e4fd428e72ec5fb4d04802de1d0f8c65f1c961d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Poczkodi?= <gabest11@gmail.com>
Date: Mon, 27 May 2024 22:19:22 +0200
Subject: [PATCH 16/29] [helpers] Move Base64 string to cpp (#6819)

---
 esphome/core/helpers.cpp | 4 ++++
 esphome/core/helpers.h   | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/esphome/core/helpers.cpp b/esphome/core/helpers.cpp
index fdc0eed774..dee771d4e9 100644
--- a/esphome/core/helpers.cpp
+++ b/esphome/core/helpers.cpp
@@ -433,6 +433,10 @@ int8_t step_to_accuracy_decimals(float step) {
   return str.length() - dot_pos - 1;
 }
 
+static const std::string BASE64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                                        "abcdefghijklmnopqrstuvwxyz"
+                                        "0123456789+/";
+
 static inline bool is_base64(char c) { return (isalnum(c) || (c == '+') || (c == '/')); }
 
 std::string base64_encode(const std::vector<uint8_t> &buf) { return base64_encode(buf.data(), buf.size()); }
diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h
index 809e7d6767..4af840f77b 100644
--- a/esphome/core/helpers.h
+++ b/esphome/core/helpers.h
@@ -435,10 +435,6 @@ std::string value_accuracy_to_string(float value, int8_t accuracy_decimals);
 /// Derive accuracy in decimals from an increment step.
 int8_t step_to_accuracy_decimals(float step);
 
-static const std::string BASE64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                                        "abcdefghijklmnopqrstuvwxyz"
-                                        "0123456789+/";
-
 std::string base64_encode(const uint8_t *buf, size_t buf_len);
 std::string base64_encode(const std::vector<uint8_t> &buf);
 

From 54b51269ab465fb4f8f849f1f52b6b42977635c8 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 27 May 2024 07:15:05 +1200
Subject: [PATCH 17/29] [web_server_base] Bump ESPAsyncWebServer-esphome to
 3.2.2 (#6797)

Co-authored-by: Samuel Sieb <samuel-github@sieb.net>
---
 esphome/components/web_server_base/__init__.py | 2 +-
 platformio.ini                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/web_server_base/__init__.py b/esphome/components/web_server_base/__init__.py
index 1970b5a0c5..4f894619b0 100644
--- a/esphome/components/web_server_base/__init__.py
+++ b/esphome/components/web_server_base/__init__.py
@@ -37,4 +37,4 @@ async def to_code(config):
             cg.add_library("FS", None)
             cg.add_library("Update", None)
         # https://github.com/esphome/ESPAsyncWebServer/blob/master/library.json
-        cg.add_library("esphome/ESPAsyncWebServer-esphome", "3.2.0")
+        cg.add_library("esphome/ESPAsyncWebServer-esphome", "3.2.2")
diff --git a/platformio.ini b/platformio.ini
index d342b32b02..67a631dda8 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -58,7 +58,7 @@ lib_deps =
     SPI                                                   ; spi (Arduino built-in)
     Wire                                                  ; i2c (Arduino built-int)
     heman/AsyncMqttClient-esphome@1.0.0                   ; mqtt
-    esphome/ESPAsyncWebServer-esphome@3.2.0               ; web_server_base
+    esphome/ESPAsyncWebServer-esphome@3.2.2               ; web_server_base
     fastled/FastLED@3.3.2                                 ; fastled_base
     mikalhart/TinyGPSPlus@1.0.2                           ; gps
     freekode/TM1651@1.0.1                                 ; tm1651

From f07479419c30e3ae89fcdefff254601dbdedd36f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Poczkodi?= <gabest11@gmail.com>
Date: Mon, 27 May 2024 22:19:22 +0200
Subject: [PATCH 18/29] [helpers] Move Base64 string to cpp (#6819)

---
 esphome/core/helpers.cpp | 4 ++++
 esphome/core/helpers.h   | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/esphome/core/helpers.cpp b/esphome/core/helpers.cpp
index fdc0eed774..dee771d4e9 100644
--- a/esphome/core/helpers.cpp
+++ b/esphome/core/helpers.cpp
@@ -433,6 +433,10 @@ int8_t step_to_accuracy_decimals(float step) {
   return str.length() - dot_pos - 1;
 }
 
+static const std::string BASE64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                                        "abcdefghijklmnopqrstuvwxyz"
+                                        "0123456789+/";
+
 static inline bool is_base64(char c) { return (isalnum(c) || (c == '+') || (c == '/')); }
 
 std::string base64_encode(const std::vector<uint8_t> &buf) { return base64_encode(buf.data(), buf.size()); }
diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h
index 809e7d6767..4af840f77b 100644
--- a/esphome/core/helpers.h
+++ b/esphome/core/helpers.h
@@ -435,10 +435,6 @@ std::string value_accuracy_to_string(float value, int8_t accuracy_decimals);
 /// Derive accuracy in decimals from an increment step.
 int8_t step_to_accuracy_decimals(float step);
 
-static const std::string BASE64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                                        "abcdefghijklmnopqrstuvwxyz"
-                                        "0123456789+/";
-
 std::string base64_encode(const uint8_t *buf, size_t buf_len);
 std::string base64_encode(const std::vector<uint8_t> &buf);
 

From 4cd4b168b44e073c3e874ba625cc10b3bb7c9bae Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 28 May 2024 08:29:19 +1200
Subject: [PATCH 19/29] Bump version to 2024.5.4

---
 esphome/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/const.py b/esphome/const.py
index 0c53287909..ad5858dcf3 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2024.5.3"
+__version__ = "2024.5.4"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 VALID_SUBSTITUTIONS_CHARACTERS = (

From 497cf8742f495918ed368eafdeafe72d53c5b9e2 Mon Sep 17 00:00:00 2001
From: pimdo <38102897+pimdo@users.noreply.github.com>
Date: Tue, 28 May 2024 02:42:59 +0100
Subject: [PATCH 20/29] Make i2s_audio compatible with  IDF 5+ (#6534)

* Update i2s_audio.cpp

Replace usage of I2S_NUM_MAX with I2S_NUM_1

* Update i2s_audio_microphone.cpp

Replace I2S_MCLK_MULTIPLE_DEFAULT with I2S_MCLK_MULTIPLE_256

* Update i2s_audio_speaker.cpp

Replace I2S_MCLK_MULTIPLE_DEFAULT with I2S_MCLK_MULTIPLE_256

* Update voice_assistant.cpp

Fix  msg.event_type format

* check SOC_I2S_NUM for c3

* use I2S_NUM_AUTO

* Update i2s_audio.cpp

* Couple tweaks

* Why did they take away I2S_NUM_MAX

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

---------

Co-authored-by: Keith Burzinski <kbx81x@gmail.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/i2s_audio/i2s_audio.cpp                   | 4 ++++
 .../components/i2s_audio/microphone/i2s_audio_microphone.cpp | 2 +-
 esphome/components/i2s_audio/speaker/i2s_audio_speaker.cpp   | 2 +-
 esphome/components/voice_assistant/voice_assistant.cpp       | 5 +++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/esphome/components/i2s_audio/i2s_audio.cpp b/esphome/components/i2s_audio/i2s_audio.cpp
index c1a608c064..ad73b383fe 100644
--- a/esphome/components/i2s_audio/i2s_audio.cpp
+++ b/esphome/components/i2s_audio/i2s_audio.cpp
@@ -9,6 +9,10 @@ namespace i2s_audio {
 
 static const char *const TAG = "i2s_audio";
 
+#if defined(USE_ESP_IDF) && (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() {
   static i2s_port_t next_port_num = I2S_NUM_0;
 
diff --git a/esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp b/esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp
index 1475df0975..a672348d85 100644
--- a/esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp
+++ b/esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp
@@ -57,7 +57,7 @@ void I2SAudioMicrophone::start_() {
       .use_apll = this->use_apll_,
       .tx_desc_auto_clear = false,
       .fixed_mclk = 0,
-      .mclk_multiple = I2S_MCLK_MULTIPLE_DEFAULT,
+      .mclk_multiple = I2S_MCLK_MULTIPLE_256,
       .bits_per_chan = I2S_BITS_PER_CHAN_DEFAULT,
   };
 
diff --git a/esphome/components/i2s_audio/speaker/i2s_audio_speaker.cpp b/esphome/components/i2s_audio/speaker/i2s_audio_speaker.cpp
index 95e63035fe..69536742cb 100644
--- a/esphome/components/i2s_audio/speaker/i2s_audio_speaker.cpp
+++ b/esphome/components/i2s_audio/speaker/i2s_audio_speaker.cpp
@@ -51,7 +51,7 @@ void I2SAudioSpeaker::player_task(void *params) {
       .use_apll = false,
       .tx_desc_auto_clear = true,
       .fixed_mclk = I2S_PIN_NO_CHANGE,
-      .mclk_multiple = I2S_MCLK_MULTIPLE_DEFAULT,
+      .mclk_multiple = I2S_MCLK_MULTIPLE_256,
       .bits_per_chan = I2S_BITS_PER_CHAN_DEFAULT,
   };
 #if SOC_I2S_SUPPORTS_DAC
diff --git a/esphome/components/voice_assistant/voice_assistant.cpp b/esphome/components/voice_assistant/voice_assistant.cpp
index 59ba39c527..712a0ab137 100644
--- a/esphome/components/voice_assistant/voice_assistant.cpp
+++ b/esphome/components/voice_assistant/voice_assistant.cpp
@@ -4,6 +4,7 @@
 
 #include "esphome/core/log.h"
 
+#include <cinttypes>
 #include <cstdio>
 
 namespace esphome {
@@ -622,7 +623,7 @@ void VoiceAssistant::signal_stop_() {
 }
 
 void VoiceAssistant::on_event(const api::VoiceAssistantEventResponse &msg) {
-  ESP_LOGD(TAG, "Event Type: %d", msg.event_type);
+  ESP_LOGD(TAG, "Event Type: %" PRId32, msg.event_type);
   switch (msg.event_type) {
     case api::enums::VOICE_ASSISTANT_RUN_START:
       ESP_LOGD(TAG, "Assist Pipeline running");
@@ -785,7 +786,7 @@ void VoiceAssistant::on_event(const api::VoiceAssistantEventResponse &msg) {
       this->defer([this]() { this->stt_vad_end_trigger_->trigger(); });
       break;
     default:
-      ESP_LOGD(TAG, "Unhandled event type: %d", msg.event_type);
+      ESP_LOGD(TAG, "Unhandled event type: %" PRId32, msg.event_type);
       break;
   }
 }

From db6f6f0cb7d1df10ac10b37e6dac46a0747406b7 Mon Sep 17 00:00:00 2001
From: DAVe3283 <DAVe3283@gmail.com>
Date: Tue, 28 May 2024 13:40:34 -0600
Subject: [PATCH 21/29] Fix compile errors on ESP32-C6 with latest ESP-IDF
 (#6822)

* Use <cinttypes> PRI macros to fix ESP32-C6 compile

* Fix compile error on latest ESP-IDF framework & platform
---
 esphome/components/ade7880/ade7880.cpp        | 23 +++++++-------
 .../components/ade7953_base/ade7953_base.cpp  |  3 +-
 .../fingerprint_grow/fingerprint_grow.cpp     | 14 ++++-----
 esphome/components/he60r/he60r.cpp            |  3 +-
 esphome/components/mhz19/mhz19.cpp            |  5 +--
 .../remote_base/abbwelcome_protocol.h         |  4 ++-
 .../remote_base/byronsx_protocol.cpp          | 22 +++++++------
 .../remote_base/drayton_protocol.cpp          | 17 +++++-----
 .../remote_base/keeloq_protocol.cpp           | 31 ++++++++++---------
 .../uart/uart_component_esp_idf.cpp           |  2 +-
 esphome/components/xgzp68xx/xgzp68xx.cpp      |  5 +--
 11 files changed, 73 insertions(+), 56 deletions(-)

diff --git a/esphome/components/ade7880/ade7880.cpp b/esphome/components/ade7880/ade7880.cpp
index 31b72d51a6..a03f1227f1 100644
--- a/esphome/components/ade7880/ade7880.cpp
+++ b/esphome/components/ade7880/ade7880.cpp
@@ -10,6 +10,7 @@
 #include "ade7880.h"
 #include "ade7880_registers.h"
 #include "esphome/core/log.h"
+#include <cinttypes>
 
 namespace esphome {
 namespace ade7880 {
@@ -156,7 +157,7 @@ void ADE7880::update() {
     });
   }
 
-  ESP_LOGD(TAG, "update took %u ms", millis() - start);
+  ESP_LOGD(TAG, "update took %" PRIu32 " ms", millis() - start);
 }
 
 void ADE7880::dump_config() {
@@ -176,9 +177,9 @@ void ADE7880::dump_config() {
     LOG_SENSOR("    ", "Forward Active Energy", this->channel_a_->forward_active_energy);
     LOG_SENSOR("    ", "Reverse Active Energy", this->channel_a_->reverse_active_energy);
     ESP_LOGCONFIG(TAG, "    Calibration:");
-    ESP_LOGCONFIG(TAG, "     Current: %u", this->channel_a_->current_gain_calibration);
-    ESP_LOGCONFIG(TAG, "     Voltage: %d", this->channel_a_->voltage_gain_calibration);
-    ESP_LOGCONFIG(TAG, "     Power: %d", this->channel_a_->power_gain_calibration);
+    ESP_LOGCONFIG(TAG, "     Current: %" PRId32, this->channel_a_->current_gain_calibration);
+    ESP_LOGCONFIG(TAG, "     Voltage: %" PRId32, this->channel_a_->voltage_gain_calibration);
+    ESP_LOGCONFIG(TAG, "     Power: %" PRId32, this->channel_a_->power_gain_calibration);
     ESP_LOGCONFIG(TAG, "     Phase Angle: %u", this->channel_a_->phase_angle_calibration);
   }
 
@@ -192,9 +193,9 @@ void ADE7880::dump_config() {
     LOG_SENSOR("    ", "Forward Active Energy", this->channel_b_->forward_active_energy);
     LOG_SENSOR("    ", "Reverse Active Energy", this->channel_b_->reverse_active_energy);
     ESP_LOGCONFIG(TAG, "    Calibration:");
-    ESP_LOGCONFIG(TAG, "     Current: %u", this->channel_b_->current_gain_calibration);
-    ESP_LOGCONFIG(TAG, "     Voltage: %d", this->channel_b_->voltage_gain_calibration);
-    ESP_LOGCONFIG(TAG, "     Power: %d", this->channel_b_->power_gain_calibration);
+    ESP_LOGCONFIG(TAG, "     Current: %" PRId32, this->channel_b_->current_gain_calibration);
+    ESP_LOGCONFIG(TAG, "     Voltage: %" PRId32, this->channel_b_->voltage_gain_calibration);
+    ESP_LOGCONFIG(TAG, "     Power: %" PRId32, this->channel_b_->power_gain_calibration);
     ESP_LOGCONFIG(TAG, "     Phase Angle: %u", this->channel_b_->phase_angle_calibration);
   }
 
@@ -208,9 +209,9 @@ void ADE7880::dump_config() {
     LOG_SENSOR("    ", "Forward Active Energy", this->channel_c_->forward_active_energy);
     LOG_SENSOR("    ", "Reverse Active Energy", this->channel_c_->reverse_active_energy);
     ESP_LOGCONFIG(TAG, "    Calibration:");
-    ESP_LOGCONFIG(TAG, "     Current: %u", this->channel_c_->current_gain_calibration);
-    ESP_LOGCONFIG(TAG, "     Voltage: %d", this->channel_c_->voltage_gain_calibration);
-    ESP_LOGCONFIG(TAG, "     Power: %d", this->channel_c_->power_gain_calibration);
+    ESP_LOGCONFIG(TAG, "     Current: %" PRId32, this->channel_c_->current_gain_calibration);
+    ESP_LOGCONFIG(TAG, "     Voltage: %" PRId32, this->channel_c_->voltage_gain_calibration);
+    ESP_LOGCONFIG(TAG, "     Power: %" PRId32, this->channel_c_->power_gain_calibration);
     ESP_LOGCONFIG(TAG, "     Phase Angle: %u", this->channel_c_->phase_angle_calibration);
   }
 
@@ -218,7 +219,7 @@ void ADE7880::dump_config() {
     ESP_LOGCONFIG(TAG, "  Neutral:");
     LOG_SENSOR("    ", "Current", this->channel_n_->current);
     ESP_LOGCONFIG(TAG, "    Calibration:");
-    ESP_LOGCONFIG(TAG, "     Current: %u", this->channel_n_->current_gain_calibration);
+    ESP_LOGCONFIG(TAG, "     Current: %" PRId32, this->channel_n_->current_gain_calibration);
   }
 
   LOG_I2C_DEVICE(this);
diff --git a/esphome/components/ade7953_base/ade7953_base.cpp b/esphome/components/ade7953_base/ade7953_base.cpp
index 862f5567a8..79161c5676 100644
--- a/esphome/components/ade7953_base/ade7953_base.cpp
+++ b/esphome/components/ade7953_base/ade7953_base.cpp
@@ -1,5 +1,6 @@
 #include "ade7953_base.h"
 #include "esphome/core/log.h"
+#include <cinttypes>
 
 namespace esphome {
 namespace ade7953_base {
@@ -105,7 +106,7 @@ void ADE7953::update() {
     this->last_update_ = now;
     // prevent DIV/0
     pf = ADE_WATTSEC_POWER_FACTOR * (diff < 10 ? 10 : diff) / 1000;
-    ESP_LOGVV(TAG, "ADE7953::update() diff=%d pf=%f", diff, pf);
+    ESP_LOGVV(TAG, "ADE7953::update() diff=%" PRIu32 " pf=%f", diff, pf);
   }
 
   // Apparent power
diff --git a/esphome/components/fingerprint_grow/fingerprint_grow.cpp b/esphome/components/fingerprint_grow/fingerprint_grow.cpp
index bd0817350a..8f58db9159 100644
--- a/esphome/components/fingerprint_grow/fingerprint_grow.cpp
+++ b/esphome/components/fingerprint_grow/fingerprint_grow.cpp
@@ -541,34 +541,34 @@ void FingerprintGrowComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "  Sensor Power Pin: %s",
                 this->has_power_pin_ ? this->sensor_power_pin_->dump_summary().c_str() : "None");
   if (this->idle_period_to_sleep_ms_ < UINT32_MAX) {
-    ESP_LOGCONFIG(TAG, "  Idle Period to Sleep: %u ms", this->idle_period_to_sleep_ms_);
+    ESP_LOGCONFIG(TAG, "  Idle Period to Sleep: %" PRIu32 " ms", this->idle_period_to_sleep_ms_);
   } else {
     ESP_LOGCONFIG(TAG, "  Idle Period to Sleep: Never");
   }
   LOG_UPDATE_INTERVAL(this);
   if (this->fingerprint_count_sensor_) {
     LOG_SENSOR("  ", "Fingerprint Count", this->fingerprint_count_sensor_);
-    ESP_LOGCONFIG(TAG, "    Current Value: %d", (uint16_t) this->fingerprint_count_sensor_->get_state());
+    ESP_LOGCONFIG(TAG, "    Current Value: %u", (uint16_t) this->fingerprint_count_sensor_->get_state());
   }
   if (this->status_sensor_) {
     LOG_SENSOR("  ", "Status", this->status_sensor_);
-    ESP_LOGCONFIG(TAG, "    Current Value: %d", (uint8_t) this->status_sensor_->get_state());
+    ESP_LOGCONFIG(TAG, "    Current Value: %u", (uint8_t) this->status_sensor_->get_state());
   }
   if (this->capacity_sensor_) {
     LOG_SENSOR("  ", "Capacity", this->capacity_sensor_);
-    ESP_LOGCONFIG(TAG, "    Current Value: %d", (uint16_t) this->capacity_sensor_->get_state());
+    ESP_LOGCONFIG(TAG, "    Current Value: %u", (uint16_t) this->capacity_sensor_->get_state());
   }
   if (this->security_level_sensor_) {
     LOG_SENSOR("  ", "Security Level", this->security_level_sensor_);
-    ESP_LOGCONFIG(TAG, "    Current Value: %d", (uint8_t) this->security_level_sensor_->get_state());
+    ESP_LOGCONFIG(TAG, "    Current Value: %u", (uint8_t) this->security_level_sensor_->get_state());
   }
   if (this->last_finger_id_sensor_) {
     LOG_SENSOR("  ", "Last Finger ID", this->last_finger_id_sensor_);
-    ESP_LOGCONFIG(TAG, "    Current Value: %d", (uint32_t) this->last_finger_id_sensor_->get_state());
+    ESP_LOGCONFIG(TAG, "    Current Value: %" PRIu32, (uint32_t) this->last_finger_id_sensor_->get_state());
   }
   if (this->last_confidence_sensor_) {
     LOG_SENSOR("  ", "Last Confidence", this->last_confidence_sensor_);
-    ESP_LOGCONFIG(TAG, "    Current Value: %d", (uint32_t) this->last_confidence_sensor_->get_state());
+    ESP_LOGCONFIG(TAG, "    Current Value: %" PRIu32, (uint32_t) this->last_confidence_sensor_->get_state());
   }
 }
 
diff --git a/esphome/components/he60r/he60r.cpp b/esphome/components/he60r/he60r.cpp
index d6e6122b1b..96ad1f04be 100644
--- a/esphome/components/he60r/he60r.cpp
+++ b/esphome/components/he60r/he60r.cpp
@@ -1,6 +1,7 @@
 #include "he60r.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/log.h"
+#include <cinttypes>
 
 namespace esphome {
 namespace he60r {
@@ -127,7 +128,7 @@ void HE60rCover::update_() {
   if (toggles_needed_ != 0) {
     if ((this->counter_++ & 0x3) == 0) {
       toggles_needed_--;
-      ESP_LOGD(TAG, "Writing byte 0x30, still needed=%d", toggles_needed_);
+      ESP_LOGD(TAG, "Writing byte 0x30, still needed=%" PRIu32, toggles_needed_);
       this->write_byte(TOGGLE_BYTE);
     } else {
       this->write_byte(QUERY_BYTE);
diff --git a/esphome/components/mhz19/mhz19.cpp b/esphome/components/mhz19/mhz19.cpp
index 019f6cee51..574aee1bd5 100644
--- a/esphome/components/mhz19/mhz19.cpp
+++ b/esphome/components/mhz19/mhz19.cpp
@@ -1,5 +1,6 @@
 #include "mhz19.h"
 #include "esphome/core/log.h"
+#include <cinttypes>
 
 namespace esphome {
 namespace mhz19 {
@@ -32,7 +33,7 @@ void MHZ19Component::update() {
   uint32_t now_ms = millis();
   uint32_t warmup_ms = this->warmup_seconds_ * 1000;
   if (now_ms < warmup_ms) {
-    ESP_LOGW(TAG, "MHZ19 warming up, %ds left", (warmup_ms - now_ms) / 1000);
+    ESP_LOGW(TAG, "MHZ19 warming up, %" PRIu32 " s left", (warmup_ms - now_ms) / 1000);
     this->status_set_warning();
     return;
   }
@@ -110,7 +111,7 @@ void MHZ19Component::dump_config() {
     ESP_LOGCONFIG(TAG, "  Automatic baseline calibration disabled on boot");
   }
 
-  ESP_LOGCONFIG(TAG, "  Warmup seconds: %ds", this->warmup_seconds_);
+  ESP_LOGCONFIG(TAG, "  Warmup time: %" PRIu32 " s", this->warmup_seconds_);
 }
 
 }  // namespace mhz19
diff --git a/esphome/components/remote_base/abbwelcome_protocol.h b/esphome/components/remote_base/abbwelcome_protocol.h
index 0493993926..f2d0f5b547 100644
--- a/esphome/components/remote_base/abbwelcome_protocol.h
+++ b/esphome/components/remote_base/abbwelcome_protocol.h
@@ -4,6 +4,7 @@
 #include "esphome/core/helpers.h"
 #include "remote_base.h"
 #include <array>
+#include <cinttypes>
 #include <utility>
 #include <vector>
 
@@ -144,7 +145,8 @@ class ABBWelcomeData {
   std::string to_string(uint8_t max_print_bytes = 255) const {
     std::string info;
     if (this->is_valid()) {
-      info = str_sprintf(this->get_three_byte_address() ? "[%06X %s %06X] Type: %02X" : "[%04X %s %04X] Type: %02X",
+      info = str_sprintf(this->get_three_byte_address() ? "[%06" PRIX32 " %s %06" PRIX32 "] Type: %02X"
+                                                        : "[%04" PRIX32 " %s %04" PRIX32 "] Type: %02X",
                          this->get_source_address(), this->get_retransmission() ? "»" : ">",
                          this->get_destination_address(), this->get_message_type());
       if (this->get_data_size())
diff --git a/esphome/components/remote_base/byronsx_protocol.cpp b/esphome/components/remote_base/byronsx_protocol.cpp
index 3096283b30..2d4c60ff8b 100644
--- a/esphome/components/remote_base/byronsx_protocol.cpp
+++ b/esphome/components/remote_base/byronsx_protocol.cpp
@@ -1,5 +1,6 @@
 #include "byronsx_protocol.h"
 #include "esphome/core/log.h"
+#include <cinttypes>
 
 namespace esphome {
 namespace remote_base {
@@ -57,7 +58,7 @@ void ByronSXProtocol::encode(RemoteTransmitData *dst, const ByronSXData &data) {
   out_data <<= NBITS_COMMAND;
   out_data |= data.command;
 
-  ESP_LOGV(TAG, "Send ByronSX: out_data %03x", out_data);
+  ESP_LOGV(TAG, "Send ByronSX: out_data %03" PRIx32, out_data);
 
   // Initial Mark start bit
   dst->mark(1 * BIT_TIME_US);
@@ -90,13 +91,16 @@ optional<ByronSXData> ByronSXProtocol::decode(RemoteReceiveData src) {
     return {};
   }
 
-  ESP_LOGVV(TAG, "%3d: %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d", src.size(), src.peek(0),
-            src.peek(1), src.peek(2), src.peek(3), src.peek(4), src.peek(5), src.peek(6), src.peek(7), src.peek(8),
-            src.peek(9), src.peek(10), src.peek(11), src.peek(12), src.peek(13), src.peek(14), src.peek(15),
-            src.peek(16), src.peek(17), src.peek(18), src.peek(19));
+  ESP_LOGVV(TAG,
+            "%3" PRId32 ": %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32
+            " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32
+            " %" PRId32 " %" PRId32 " %" PRId32,
+            src.size(), src.peek(0), src.peek(1), src.peek(2), src.peek(3), src.peek(4), src.peek(5), src.peek(6),
+            src.peek(7), src.peek(8), src.peek(9), src.peek(10), src.peek(11), src.peek(12), src.peek(13), src.peek(14),
+            src.peek(15), src.peek(16), src.peek(17), src.peek(18), src.peek(19));
 
-  ESP_LOGVV(TAG, "     %d %d %d %d %d %d", src.peek(20), src.peek(21), src.peek(22), src.peek(23), src.peek(24),
-            src.peek(25));
+  ESP_LOGVV(TAG, "     %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32, src.peek(20),
+            src.peek(21), src.peek(22), src.peek(23), src.peek(24), src.peek(25));
 
   // Read data bits
   uint32_t out_data = 0;
@@ -107,10 +111,10 @@ optional<ByronSXData> ByronSXProtocol::decode(RemoteReceiveData src) {
     } else if (src.expect_space(BIT_TIME_US) && src.expect_mark(2 * BIT_TIME_US)) {
       out_data |= 0 << bit;
     } else {
-      ESP_LOGV(TAG, "Decode ByronSX: Fail 2, %2d %08x", bit, out_data);
+      ESP_LOGV(TAG, "Decode ByronSX: Fail 2, %2d %08" PRIx32, bit, out_data);
       return {};
     }
-    ESP_LOGVV(TAG, "Decode ByronSX: Data, %2d %08x", bit, out_data);
+    ESP_LOGVV(TAG, "Decode ByronSX: Data, %2d %08" PRIx32, bit, out_data);
   }
 
   // last bit followed by a long space
diff --git a/esphome/components/remote_base/drayton_protocol.cpp b/esphome/components/remote_base/drayton_protocol.cpp
index acfb7a0f16..73c0fb116c 100644
--- a/esphome/components/remote_base/drayton_protocol.cpp
+++ b/esphome/components/remote_base/drayton_protocol.cpp
@@ -151,12 +151,12 @@ optional<DraytonData> DraytonProtocol::decode(RemoteReceiveData src) {
 
     // Look for sync pulse, after. If sucessful index points to space of sync symbol
     while (src.size() - src.get_index() >= MIN_RX_SRC) {
-      ESP_LOGVV(TAG, "Decode Drayton: sync search %d, %" PRId32 " %" PRId32, src.size() - src.get_index(), src.peek(),
-                src.peek(1));
+      ESP_LOGVV(TAG, "Decode Drayton: sync search %" PRIu32 ", %" PRId32 " %" PRId32, src.size() - src.get_index(),
+                src.peek(), src.peek(1));
       if (src.peek_mark(2 * BIT_TIME_US) &&
           (src.peek_space(2 * BIT_TIME_US, 1) || src.peek_space(3 * BIT_TIME_US, 1))) {
         src.advance(1);
-        ESP_LOGVV(TAG, "Decode Drayton: Found SYNC, - %d", src.get_index());
+        ESP_LOGVV(TAG, "Decode Drayton: Found SYNC, - %" PRIu32, src.get_index());
         break;
       } else {
         src.advance(2);
@@ -174,14 +174,16 @@ optional<DraytonData> DraytonProtocol::decode(RemoteReceiveData src) {
     // Checks next bit to leave index pointing correctly
     uint32_t out_data = 0;
     uint8_t bit = NDATABITS - 1;
-    ESP_LOGVV(TAG, "Decode Drayton: first bit %d  %" PRId32 ", %" PRId32, src.peek(0), src.peek(1), src.peek(2));
+    ESP_LOGVV(TAG, "Decode Drayton: first bit %" PRId32 "  %" PRId32 ", %" PRId32, src.peek(0), src.peek(1),
+              src.peek(2));
     if (src.expect_space(3 * BIT_TIME_US) && (src.expect_mark(BIT_TIME_US) || src.peek_mark(2 * BIT_TIME_US))) {
       out_data |= 0 << bit;
     } else if (src.expect_space(2 * BIT_TIME_US) && src.expect_mark(BIT_TIME_US) &&
                (src.expect_space(BIT_TIME_US) || src.peek_space(2 * BIT_TIME_US))) {
       out_data |= 1 << bit;
     } else {
-      ESP_LOGV(TAG, "Decode Drayton: Fail 2, - %d %d %d", src.peek(-1), src.peek(0), src.peek(1));
+      ESP_LOGV(TAG, "Decode Drayton: Fail 2, - %" PRId32 " %" PRId32 " %" PRId32, src.peek(-1), src.peek(0),
+               src.peek(1));
       continue;
     }
 
@@ -202,7 +204,8 @@ optional<DraytonData> DraytonProtocol::decode(RemoteReceiveData src) {
     }
 
     if (bit > 0) {
-      ESP_LOGVV(TAG, "Decode Drayton: Fail 3, %d %" PRId32 " %" PRId32, src.peek(-1), src.peek(0), src.peek(1));
+      ESP_LOGVV(TAG, "Decode Drayton: Fail 3, %" PRId32 " %" PRId32 " %" PRId32, src.peek(-1), src.peek(0),
+                src.peek(1));
       continue;
     }
 
@@ -214,7 +217,7 @@ optional<DraytonData> DraytonProtocol::decode(RemoteReceiveData src) {
       continue;
     }
 
-    ESP_LOGV(TAG, "Decode Drayton: Data, %2d %08x", bit, out_data);
+    ESP_LOGV(TAG, "Decode Drayton: Data, %2d %08" PRIx32, bit, out_data);
 
     out.channel = (uint8_t) (out_data & 0x1F);
     out_data >>= NBITS_CHANNEL;
diff --git a/esphome/components/remote_base/keeloq_protocol.cpp b/esphome/components/remote_base/keeloq_protocol.cpp
index 09d9ea4f53..72540c37f1 100644
--- a/esphome/components/remote_base/keeloq_protocol.cpp
+++ b/esphome/components/remote_base/keeloq_protocol.cpp
@@ -52,7 +52,7 @@ void KeeloqProtocol::encode(RemoteTransmitData *dst, const KeeloqData &data) {
   // Encrypted field
   out_data = data.encrypted;
 
-  ESP_LOGV(TAG, "Send Keeloq: Encrypted data %04x", out_data);
+  ESP_LOGV(TAG, "Send Keeloq: Encrypted data %04" PRIx32, out_data);
 
   for (uint32_t mask = 1, cnt = 0; cnt < NBITS_ENCRYPTED_DATA; cnt++, mask <<= 1) {
     if (out_data & mask) {
@@ -68,7 +68,7 @@ void KeeloqProtocol::encode(RemoteTransmitData *dst, const KeeloqData &data) {
   out_data = (data.command & 0x0f);
   out_data <<= NBITS_SERIAL;
   out_data |= data.address;
-  ESP_LOGV(TAG, "Send Keeloq: Fixed data %04x", out_data);
+  ESP_LOGV(TAG, "Send Keeloq: Fixed data %04" PRIx32, out_data);
 
   for (uint32_t mask = 1, cnt = 0; cnt < (NBITS_FIXED_DATA - 2); cnt++, mask <<= 1) {
     if (out_data & mask) {
@@ -111,21 +111,24 @@ optional<KeeloqData> KeeloqProtocol::decode(RemoteReceiveData src) {
     return {};
   }
 
-  ESP_LOGVV(TAG, "%2d: %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d", src.size(), src.peek(0),
-            src.peek(1), src.peek(2), src.peek(3), src.peek(4), src.peek(5), src.peek(6), src.peek(7), src.peek(8),
-            src.peek(9), src.peek(10), src.peek(11), src.peek(12), src.peek(13), src.peek(14), src.peek(15),
-            src.peek(16), src.peek(17), src.peek(18), src.peek(19));
+  ESP_LOGVV(TAG,
+            "%2" PRId32 ": %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32
+            " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32
+            " %" PRId32 " %" PRId32 " %" PRId32,
+            src.size(), src.peek(0), src.peek(1), src.peek(2), src.peek(3), src.peek(4), src.peek(5), src.peek(6),
+            src.peek(7), src.peek(8), src.peek(9), src.peek(10), src.peek(11), src.peek(12), src.peek(13), src.peek(14),
+            src.peek(15), src.peek(16), src.peek(17), src.peek(18), src.peek(19));
 
   // Check preamble bits
   int8_t bit = NBITS_PREAMBLE - 1;
   while (--bit >= 0) {
     if (!src.expect_mark(BIT_TIME_US) || !src.expect_space(BIT_TIME_US)) {
-      ESP_LOGV(TAG, "Decode KeeLoq: Fail 1, %d %d", bit + 1, src.peek());
+      ESP_LOGV(TAG, "Decode KeeLoq: Fail 1, %d %" PRId32, bit + 1, src.peek());
       return {};
     }
   }
   if (!src.expect_mark(BIT_TIME_US) || !src.expect_space(10 * BIT_TIME_US)) {
-    ESP_LOGV(TAG, "Decode KeeLoq: Fail 1, %d %d", bit + 1, src.peek());
+    ESP_LOGV(TAG, "Decode KeeLoq: Fail 1, %d %" PRId32, bit + 1, src.peek());
     return {};
   }
 
@@ -137,11 +140,11 @@ optional<KeeloqData> KeeloqProtocol::decode(RemoteReceiveData src) {
     } else if (src.expect_mark(BIT_TIME_US) && src.expect_space(2 * BIT_TIME_US)) {
       out_data |= 1 << bit;
     } else {
-      ESP_LOGV(TAG, "Decode KeeLoq: Fail 2, %d %d", src.get_index(), src.peek());
+      ESP_LOGV(TAG, "Decode KeeLoq: Fail 2, %" PRIu32 " %" PRId32, src.get_index(), src.peek());
       return {};
     }
   }
-  ESP_LOGVV(TAG, "Decode KeeLoq: Data, %d %08x", bit, out_data);
+  ESP_LOGVV(TAG, "Decode KeeLoq: Data, %d %08" PRIx32, bit, out_data);
   out.encrypted = out_data;
 
   // Read Serial Number and Button Status
@@ -152,11 +155,11 @@ optional<KeeloqData> KeeloqProtocol::decode(RemoteReceiveData src) {
     } else if (src.expect_mark(BIT_TIME_US) && src.expect_space(2 * BIT_TIME_US)) {
       out_data |= 1 << bit;
     } else {
-      ESP_LOGV(TAG, "Decode KeeLoq: Fail 3, %d %d", src.get_index(), src.peek());
+      ESP_LOGV(TAG, "Decode KeeLoq: Fail 3, %" PRIu32 " %" PRId32, src.get_index(), src.peek());
       return {};
     }
   }
-  ESP_LOGVV(TAG, "Decode KeeLoq: Data, %2d %08x", bit, out_data);
+  ESP_LOGVV(TAG, "Decode KeeLoq: Data, %2d %08" PRIx32, bit, out_data);
   out.command = (out_data >> 28) & 0xf;
   out.address = out_data & 0xfffffff;
 
@@ -166,7 +169,7 @@ optional<KeeloqData> KeeloqProtocol::decode(RemoteReceiveData src) {
   } else if (src.expect_mark(BIT_TIME_US) && src.expect_space(2 * BIT_TIME_US)) {
     out.vlow = true;
   } else {
-    ESP_LOGV(TAG, "Decode KeeLoq: Fail 4, %08x", src.peek());
+    ESP_LOGV(TAG, "Decode KeeLoq: Fail 4, %" PRId32, src.peek());
     return {};
   }
 
@@ -176,7 +179,7 @@ optional<KeeloqData> KeeloqProtocol::decode(RemoteReceiveData src) {
   } else if (src.expect_mark(BIT_TIME_US) && src.peek_space_at_least(2 * BIT_TIME_US)) {
     out.repeat = true;
   } else {
-    ESP_LOGV(TAG, "Decode KeeLoq: Fail 5, %08x", src.peek());
+    ESP_LOGV(TAG, "Decode KeeLoq: Fail 5, %" PRId32, src.peek());
     return {};
   }
 
diff --git a/esphome/components/uart/uart_component_esp_idf.cpp b/esphome/components/uart/uart_component_esp_idf.cpp
index 2dd6ab105f..c66753b0c4 100644
--- a/esphome/components/uart/uart_component_esp_idf.cpp
+++ b/esphome/components/uart/uart_component_esp_idf.cpp
@@ -69,7 +69,7 @@ void IDFUARTComponent::setup() {
     this->mark_failed();
     return;
   }
-  this->uart_num_ = next_uart_num++;
+  this->uart_num_ = static_cast<uart_port_t>(next_uart_num++);
   ESP_LOGCONFIG(TAG, "Setting up UART %u...", this->uart_num_);
 
   this->lock_ = xSemaphoreCreateMutex();
diff --git a/esphome/components/xgzp68xx/xgzp68xx.cpp b/esphome/components/xgzp68xx/xgzp68xx.cpp
index ea3583c3c5..dff00fb696 100644
--- a/esphome/components/xgzp68xx/xgzp68xx.cpp
+++ b/esphome/components/xgzp68xx/xgzp68xx.cpp
@@ -3,6 +3,7 @@
 #include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
 #include "esphome/components/i2c/i2c.h"
+#include <cinttypes>
 
 namespace esphome {
 namespace xgzp68xx {
@@ -37,8 +38,8 @@ void XGZP68XXComponent::update() {
     temperature_raw = encode_uint16(data[3], data[4]);
 
     // Convert the pressure data to hPa
-    ESP_LOGV(TAG, "Got raw pressure=%d, raw temperature=%d ", pressure_raw, temperature_raw);
-    ESP_LOGV(TAG, "K value is %d ", this->k_value_);
+    ESP_LOGV(TAG, "Got raw pressure=%" PRIu32 ", raw temperature=%u", pressure_raw, temperature_raw);
+    ESP_LOGV(TAG, "K value is %u", this->k_value_);
 
     // The most significant bit of both pressure and temperature will be 1 to indicate a negative value.
     // This is directly from the datasheet, and the calculations below will handle this.

From 06996def725aececb406739857f59873f72271ca Mon Sep 17 00:00:00 2001
From: DAVe3283 <DAVe3283@gmail.com>
Date: Tue, 28 May 2024 14:44:47 -0600
Subject: [PATCH 22/29] Use uint8_t instead of uint32_t for 8-bit values on
 mitsubishi (#6824)

This solves some printf formatting issues on ESP-IDF and saves RAM on all platforms.
---
 esphome/components/mitsubishi/mitsubishi.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/esphome/components/mitsubishi/mitsubishi.cpp b/esphome/components/mitsubishi/mitsubishi.cpp
index 081c24a050..fd57adc586 100644
--- a/esphome/components/mitsubishi/mitsubishi.cpp
+++ b/esphome/components/mitsubishi/mitsubishi.cpp
@@ -6,7 +6,7 @@ namespace mitsubishi {
 
 static const char *const TAG = "mitsubishi.climate";
 
-const uint32_t MITSUBISHI_OFF = 0x00;
+const uint8_t MITSUBISHI_OFF = 0x00;
 
 const uint8_t MITSUBISHI_MODE_AUTO = 0x20;
 const uint8_t MITSUBISHI_MODE_COOL = 0x18;
@@ -109,8 +109,8 @@ void MitsubishiClimate::transmit_state() {
   // Byte 15: HVAC specfic, i.e. POWERFUL, SMART SET, PLASMA, always 0x00
   // Byte 16: Constant 0x00
   // Byte 17: Checksum: SUM[Byte0...Byte16]
-  uint32_t remote_state[18] = {0x23, 0xCB, 0x26, 0x01, 0x00, 0x20, 0x08, 0x00, 0x00,
-                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+  uint8_t remote_state[18] = {0x23, 0xCB, 0x26, 0x01, 0x00, 0x20, 0x08, 0x00, 0x00,
+                              0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
   switch (this->mode) {
     case climate::CLIMATE_MODE_HEAT:
@@ -249,7 +249,7 @@ void MitsubishiClimate::transmit_state() {
 
   data->set_carrier_frequency(38000);
   // repeat twice
-  for (uint16_t r = 0; r < 2; r++) {
+  for (uint8_t r = 0; r < 2; r++) {
     // Header
     data->mark(MITSUBISHI_HEADER_MARK);
     data->space(MITSUBISHI_HEADER_SPACE);

From 2b691ad5adde275544f1e7896463083a84f028af Mon Sep 17 00:00:00 2001
From: Frederik <5511687+fightforlife@users.noreply.github.com>
Date: Wed, 29 May 2024 00:02:45 +0200
Subject: [PATCH 23/29] Make SPI Ethernet (W5500) compatible with ESP-IDF v5
 (#6778)

* change MAC PHY init order according to IDF examples

* add idfv5 specific w5500 config init

* esp_mac.h needs to be included directly starting with idf5

* Header fix

* Couple tweaks

---------

Co-authored-by: Keith Burzinski <kbx81x@gmail.com>
---
 esphome/components/ethernet/ethernet_component.cpp | 8 ++++++--
 esphome/components/ethernet/ethernet_component.h   | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp
index 3af462d593..2a4e5cbad3 100644
--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -98,11 +98,15 @@ void EthernetComponent::setup() {
       .post_cb = nullptr,
   };
 
+#if USE_ESP_IDF && (ESP_IDF_VERSION_MAJOR >= 5)
+  eth_w5500_config_t w5500_config = ETH_W5500_DEFAULT_CONFIG(host, &devcfg);
+#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");
 
   eth_w5500_config_t w5500_config = ETH_W5500_DEFAULT_CONFIG(spi_handle);
+#endif
   w5500_config.int_gpio_num = this->interrupt_pin_;
   phy_config.phy_addr = this->phy_addr_spi_;
   phy_config.reset_gpio_num = this->reset_pin_;
@@ -614,14 +618,14 @@ void EthernetComponent::rtl8201_set_rmii_mode_(esp_eth_mac_t *mac) {
 
   err = mac->read_phy_reg(mac, this->phy_addr_, RTL8201_RMSR_REG_ADDR, &(phy_rmii_mode));
   ESPHL_ERROR_CHECK(err, "Read PHY RMSR Register failed");
-  ESP_LOGV(TAG, "Hardware default RTL8201 RMII Mode Register is: 0x%04X", phy_rmii_mode);
+  ESP_LOGV(TAG, "Hardware default RTL8201 RMII Mode Register is: 0x%04" PRIX32, phy_rmii_mode);
 
   err = mac->write_phy_reg(mac, this->phy_addr_, RTL8201_RMSR_REG_ADDR, 0x1FFA);
   ESPHL_ERROR_CHECK(err, "Setting Register 16 RMII Mode Setting failed");
 
   err = mac->read_phy_reg(mac, this->phy_addr_, RTL8201_RMSR_REG_ADDR, &(phy_rmii_mode));
   ESPHL_ERROR_CHECK(err, "Read PHY RMSR Register failed");
-  ESP_LOGV(TAG, "Setting RTL8201 RMII Mode Register to: 0x%04X", phy_rmii_mode);
+  ESP_LOGV(TAG, "Setting RTL8201 RMII Mode Register to: 0x%04" PRIX32, phy_rmii_mode);
 
   err = mac->write_phy_reg(mac, this->phy_addr_, 0x1f, 0x0);
   ESPHL_ERROR_CHECK(err, "Setting Page 0 failed");
diff --git a/esphome/components/ethernet/ethernet_component.h b/esphome/components/ethernet/ethernet_component.h
index 6276885fd1..3705e3e06a 100644
--- a/esphome/components/ethernet/ethernet_component.h
+++ b/esphome/components/ethernet/ethernet_component.h
@@ -10,6 +10,7 @@
 #include "esp_eth.h"
 #include "esp_eth_mac.h"
 #include "esp_netif.h"
+#include "esp_mac.h"
 
 namespace esphome {
 namespace ethernet {

From ec3164f80058c43ea21d7bc5c7f62bdf7679703f Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Wed, 29 May 2024 14:36:49 +1000
Subject: [PATCH 24/29] [wake_on_lan] Make component platform independent
 (#6815)

---
 CODEOWNERS                                    |  2 +-
 .../components/socket/lwip_raw_tcp_impl.cpp   |  3 +-
 esphome/components/wake_on_lan/__init__.py    |  2 +-
 esphome/components/wake_on_lan/button.py      | 34 +++++----
 .../components/wake_on_lan/wake_on_lan.cpp    | 70 +++++++++++++------
 esphome/components/wake_on_lan/wake_on_lan.h  | 15 ++--
 .../wake_on_lan/test.esp32-c3-idf.yaml        |  1 +
 .../wake_on_lan/test.esp32-idf.yaml           |  1 +
 8 files changed, 84 insertions(+), 44 deletions(-)
 create mode 100644 tests/components/wake_on_lan/test.esp32-c3-idf.yaml
 create mode 100644 tests/components/wake_on_lan/test.esp32-idf.yaml

diff --git a/CODEOWNERS b/CODEOWNERS
index e099ca42ac..8b6143859a 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -414,7 +414,7 @@ esphome/components/veml3235/* @kbx81
 esphome/components/veml7700/* @latonita
 esphome/components/version/* @esphome/core
 esphome/components/voice_assistant/* @jesserockz
-esphome/components/wake_on_lan/* @willwill2will54
+esphome/components/wake_on_lan/* @clydebarrow @willwill2will54
 esphome/components/waveshare_epaper/* @clydebarrow
 esphome/components/web_server_base/* @OttoWinter
 esphome/components/web_server_idf/* @dentra
diff --git a/esphome/components/socket/lwip_raw_tcp_impl.cpp b/esphome/components/socket/lwip_raw_tcp_impl.cpp
index bd59b81caa..1d998902ff 100644
--- a/esphome/components/socket/lwip_raw_tcp_impl.cpp
+++ b/esphome/components/socket/lwip_raw_tcp_impl.cpp
@@ -469,7 +469,8 @@ class LWIPRawImpl : public Socket {
   }
   ssize_t sendto(const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen) override {
     // return ::sendto(fd_, buf, len, flags, to, tolen);
-    return 0;
+    errno = ENOSYS;
+    return -1;
   }
   int setblocking(bool blocking) override {
     if (pcb_ == nullptr) {
diff --git a/esphome/components/wake_on_lan/__init__.py b/esphome/components/wake_on_lan/__init__.py
index 3548fb02f4..90539e5d3c 100644
--- a/esphome/components/wake_on_lan/__init__.py
+++ b/esphome/components/wake_on_lan/__init__.py
@@ -1 +1 @@
-CODEOWNERS = ["@willwill2will54"]
+CODEOWNERS = ["@willwill2will54", "@clydebarrow"]
diff --git a/esphome/components/wake_on_lan/button.py b/esphome/components/wake_on_lan/button.py
index 778ea60cfa..b09e87e811 100644
--- a/esphome/components/wake_on_lan/button.py
+++ b/esphome/components/wake_on_lan/button.py
@@ -2,6 +2,16 @@ import esphome.codegen as cg
 from esphome.components import button
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.core import CORE
+
+DEPENDENCIES = ["network"]
+
+
+def AUTO_LOAD():
+    if CORE.is_esp8266 or CORE.is_rp2040:
+        return []
+    return ["socket"]
+
 
 CONF_TARGET_MAC_ADDRESS = "target_mac_address"
 
@@ -9,25 +19,19 @@ wake_on_lan_ns = cg.esphome_ns.namespace("wake_on_lan")
 
 WakeOnLanButton = wake_on_lan_ns.class_("WakeOnLanButton", button.Button, cg.Component)
 
-DEPENDENCIES = ["network"]
-
-CONFIG_SCHEMA = cv.All(
+CONFIG_SCHEMA = (
     button.button_schema(WakeOnLanButton)
     .extend(cv.COMPONENT_SCHEMA)
     .extend(
-        cv.Schema(
-            {
-                cv.Required(CONF_TARGET_MAC_ADDRESS): cv.mac_address,
-            }
-        ),
-    ),
-    cv.only_with_arduino,
+        {
+            cv.Required(CONF_TARGET_MAC_ADDRESS): cv.mac_address,
+        }
+    )
 )
 
 
-def to_code(config):
+async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
-
-    yield cg.add(var.set_macaddr(*config[CONF_TARGET_MAC_ADDRESS].parts))
-    yield cg.register_component(var, config)
-    yield button.register_button(var, config)
+    cg.add(var.set_macaddr(*config[CONF_TARGET_MAC_ADDRESS].parts))
+    await cg.register_component(var, config)
+    await button.register_button(var, config)
diff --git a/esphome/components/wake_on_lan/wake_on_lan.cpp b/esphome/components/wake_on_lan/wake_on_lan.cpp
index f414bf6c71..080e1bbac8 100644
--- a/esphome/components/wake_on_lan/wake_on_lan.cpp
+++ b/esphome/components/wake_on_lan/wake_on_lan.cpp
@@ -1,5 +1,3 @@
-#ifdef USE_ARDUINO
-
 #include "wake_on_lan.h"
 #include "esphome/core/log.h"
 #include "esphome/components/network/ip_address.h"
@@ -22,40 +20,68 @@ void WakeOnLanButton::set_macaddr(uint8_t a, uint8_t b, uint8_t c, uint8_t d, ui
 
 void WakeOnLanButton::dump_config() {
   LOG_BUTTON("", "Wake-on-LAN Button", this);
-  ESP_LOGCONFIG(TAG, "  Target MAC address: %02X:%02X:%02X:%02X:%02X:%02X", macaddr_[0], macaddr_[1], macaddr_[2],
-                macaddr_[3], macaddr_[4], macaddr_[5]);
+  ESP_LOGCONFIG(TAG, "  Target MAC address: %02X:%02X:%02X:%02X:%02X:%02X", this->macaddr_[0], this->macaddr_[1],
+                this->macaddr_[2], this->macaddr_[3], this->macaddr_[4], this->macaddr_[5]);
 }
 
 void WakeOnLanButton::press_action() {
+  if (!network::is_connected()) {
+    ESP_LOGW(TAG, "Network not connected");
+    return;
+  }
   ESP_LOGI(TAG, "Sending Wake-on-LAN Packet...");
-  bool begin_status = false;
-  bool end_status = false;
+#if defined(USE_SOCKET_IMPL_BSD_SOCKETS) || defined(USE_SOCKET_IMPL_LWIP_SOCKETS)
+  struct sockaddr_storage saddr {};
+  auto addr_len =
+      socket::set_sockaddr(reinterpret_cast<sockaddr *>(&saddr), sizeof(saddr), "255.255.255.255", this->port_);
+  uint8_t buffer[6 + sizeof this->macaddr_ * 16];
+  memcpy(buffer, PREFIX, sizeof(PREFIX));
+  for (size_t i = 0; i != 16; i++) {
+    memcpy(buffer + i * sizeof(this->macaddr_) + sizeof(PREFIX), this->macaddr_, sizeof(this->macaddr_));
+  }
+  if (this->broadcast_socket_->sendto(buffer, sizeof(buffer), 0, reinterpret_cast<const sockaddr *>(&saddr),
+                                      addr_len) <= 0)
+    ESP_LOGW(TAG, "sendto() error %d", errno);
+#else
   IPAddress broadcast = IPAddress(255, 255, 255, 255);
-#ifdef USE_ESP8266
   for (auto ip : esphome::network::get_ip_addresses()) {
     if (ip.is_ip4()) {
-      begin_status = this->udp_client_.beginPacketMulticast(broadcast, 9, ip, 128);
-      break;
+      if (this->udp_client_.beginPacketMulticast(broadcast, 9, ip, 128) != 0) {
+        this->udp_client_.write(PREFIX, 6);
+        for (size_t i = 0; i < 16; i++) {
+          this->udp_client_.write(macaddr_, 6);
+        }
+        if (this->udp_client_.endPacket() != 0)
+          return;
+        ESP_LOGW(TAG, "WOL broadcast failed");
+        return;
+      }
     }
   }
+  ESP_LOGW(TAG, "No ip4 addresses to broadcast to");
 #endif
-#ifdef USE_ESP32
-  begin_status = this->udp_client_.beginPacket(broadcast, 9);
-#endif
+}
 
-  if (begin_status) {
-    this->udp_client_.write(PREFIX, 6);
-    for (size_t i = 0; i < 16; i++) {
-      this->udp_client_.write(macaddr_, 6);
-    }
-    end_status = this->udp_client_.endPacket();
+void WakeOnLanButton::setup() {
+#if defined(USE_SOCKET_IMPL_BSD_SOCKETS) || defined(USE_SOCKET_IMPL_LWIP_SOCKETS)
+  this->broadcast_socket_ = socket::socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
+  if (this->broadcast_socket_ == nullptr) {
+    this->mark_failed();
+    this->status_set_error("Could not create socket");
+    return;
   }
-  if (!begin_status || end_status) {
-    ESP_LOGE(TAG, "Sending Wake-on-LAN Packet Failed!");
+  int enable = 1;
+  auto err = this->broadcast_socket_->setsockopt(SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int));
+  if (err != 0) {
+    this->status_set_warning("Socket unable to set reuseaddr");
+    // we can still continue
   }
+  err = this->broadcast_socket_->setsockopt(SOL_SOCKET, SO_BROADCAST, &enable, sizeof(int));
+  if (err != 0) {
+    this->status_set_warning("Socket unable to set broadcast");
+  }
+#endif
 }
 
 }  // namespace wake_on_lan
 }  // namespace esphome
-
-#endif
diff --git a/esphome/components/wake_on_lan/wake_on_lan.h b/esphome/components/wake_on_lan/wake_on_lan.h
index 72f900e3fa..42cb3a9268 100644
--- a/esphome/components/wake_on_lan/wake_on_lan.h
+++ b/esphome/components/wake_on_lan/wake_on_lan.h
@@ -1,10 +1,12 @@
 #pragma once
 
-#ifdef USE_ARDUINO
-
 #include "esphome/components/button/button.h"
 #include "esphome/core/component.h"
+#if defined(USE_SOCKET_IMPL_BSD_SOCKETS) || defined(USE_SOCKET_IMPL_LWIP_SOCKETS)
+#include "esphome/components/socket/socket.h"
+#else
 #include "WiFiUdp.h"
+#endif
 
 namespace esphome {
 namespace wake_on_lan {
@@ -14,14 +16,19 @@ class WakeOnLanButton : public button::Button, public Component {
   void set_macaddr(uint8_t a, uint8_t b, uint8_t c, uint8_t d, uint8_t e, uint8_t f);
 
   void dump_config() override;
+  void setup() override;
+  float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
 
  protected:
+#if defined(USE_SOCKET_IMPL_BSD_SOCKETS) || defined(USE_SOCKET_IMPL_LWIP_SOCKETS)
+  std::unique_ptr<socket::Socket> broadcast_socket_{};
+#else
   WiFiUDP udp_client_{};
+#endif
   void press_action() override;
+  uint16_t port_{9};
   uint8_t macaddr_[6];
 };
 
 }  // namespace wake_on_lan
 }  // namespace esphome
-
-#endif
diff --git a/tests/components/wake_on_lan/test.esp32-c3-idf.yaml b/tests/components/wake_on_lan/test.esp32-c3-idf.yaml
new file mode 100644
index 0000000000..dade44d145
--- /dev/null
+++ b/tests/components/wake_on_lan/test.esp32-c3-idf.yaml
@@ -0,0 +1 @@
+<<: !include common.yaml
diff --git a/tests/components/wake_on_lan/test.esp32-idf.yaml b/tests/components/wake_on_lan/test.esp32-idf.yaml
new file mode 100644
index 0000000000..dade44d145
--- /dev/null
+++ b/tests/components/wake_on_lan/test.esp32-idf.yaml
@@ -0,0 +1 @@
+<<: !include common.yaml

From bff24e297774d7f79deea30c9cdaed4bc23e47d4 Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Wed, 29 May 2024 00:05:19 -0500
Subject: [PATCH 25/29] Fix a bunch of components for IDF 5 compatibility and
 #6802 (#6805)

---
 esphome/components/ade7880/ade7880.cpp        |  1 +
 .../components/ade7953_base/ade7953_base.cpp  |  1 +
 esphome/components/ags10/ags10.cpp            |  4 +-
 .../components/ct_clamp/ct_clamp_sensor.cpp   |  5 ++-
 .../fingerprint_grow/fingerprint_grow.cpp     |  2 +-
 esphome/components/he60r/he60r.cpp            |  7 ++--
 esphome/components/htu31d/htu31d.cpp          |  4 +-
 .../components/ina2xx_base/ina2xx_base.cpp    |  8 ++--
 esphome/components/jsn_sr04t/jsn_sr04t.cpp    |  4 +-
 esphome/components/mhz19/mhz19.cpp            |  1 +
 .../micro_wake_word/micro_wake_word.cpp       |  3 +-
 .../remote_base/byronsx_protocol.cpp          |  1 +
 .../remote_base/drayton_protocol.cpp          |  2 +
 esphome/components/sonoff_d1/sonoff_d1.cpp    |  3 +-
 esphome/components/weikai/weikai.cpp          |  4 +-
 esphome/components/wl_134/wl_134.cpp          |  4 +-
 esphome/components/xgzp68xx/xgzp68xx.cpp      |  1 +
 .../remote_receiver/esp32-common.yaml         | 40 +++++++++----------
 18 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/esphome/components/ade7880/ade7880.cpp b/esphome/components/ade7880/ade7880.cpp
index a03f1227f1..4a45b3b321 100644
--- a/esphome/components/ade7880/ade7880.cpp
+++ b/esphome/components/ade7880/ade7880.cpp
@@ -10,6 +10,7 @@
 #include "ade7880.h"
 #include "ade7880_registers.h"
 #include "esphome/core/log.h"
+
 #include <cinttypes>
 
 namespace esphome {
diff --git a/esphome/components/ade7953_base/ade7953_base.cpp b/esphome/components/ade7953_base/ade7953_base.cpp
index 79161c5676..2511b4e04c 100644
--- a/esphome/components/ade7953_base/ade7953_base.cpp
+++ b/esphome/components/ade7953_base/ade7953_base.cpp
@@ -1,5 +1,6 @@
 #include "ade7953_base.h"
 #include "esphome/core/log.h"
+
 #include <cinttypes>
 
 namespace esphome {
diff --git a/esphome/components/ags10/ags10.cpp b/esphome/components/ags10/ags10.cpp
index dfaa00e2e9..422380da83 100644
--- a/esphome/components/ags10/ags10.cpp
+++ b/esphome/components/ags10/ags10.cpp
@@ -1,5 +1,7 @@
 #include "ags10.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace ags10 {
 static const char *const TAG = "ags10";
@@ -35,7 +37,7 @@ void AGS10Component::setup() {
 
   auto resistance = this->read_resistance_();
   if (resistance) {
-    ESP_LOGD(TAG, "AGS10 Sensor Resistance: 0x%08X", *resistance);
+    ESP_LOGD(TAG, "AGS10 Sensor Resistance: 0x%08" PRIX32, *resistance);
     if (this->resistance_ != nullptr) {
       this->resistance_->publish_state(*resistance);
     }
diff --git a/esphome/components/ct_clamp/ct_clamp_sensor.cpp b/esphome/components/ct_clamp/ct_clamp_sensor.cpp
index d555befcde..0aa0258a9b 100644
--- a/esphome/components/ct_clamp/ct_clamp_sensor.cpp
+++ b/esphome/components/ct_clamp/ct_clamp_sensor.cpp
@@ -1,6 +1,7 @@
 #include "ct_clamp_sensor.h"
 
 #include "esphome/core/log.h"
+#include <cinttypes>
 #include <cmath>
 
 namespace esphome {
@@ -37,8 +38,8 @@ void CTClampSensor::update() {
     float rms_ac = 0;
     if (rms_ac_squared > 0)
       rms_ac = std::sqrt(rms_ac_squared);
-    ESP_LOGD(TAG, "'%s' - Raw AC Value: %.3fA after %d different samples (%d SPS)", this->name_.c_str(), rms_ac,
-             this->num_samples_, 1000 * this->num_samples_ / this->sample_duration_);
+    ESP_LOGD(TAG, "'%s' - Raw AC Value: %.3fA after %" PRIu32 " different samples (%" PRIu32 " SPS)",
+             this->name_.c_str(), rms_ac, this->num_samples_, 1000 * this->num_samples_ / this->sample_duration_);
     this->publish_state(rms_ac);
   });
 
diff --git a/esphome/components/fingerprint_grow/fingerprint_grow.cpp b/esphome/components/fingerprint_grow/fingerprint_grow.cpp
index 8f58db9159..c2cab368c9 100644
--- a/esphome/components/fingerprint_grow/fingerprint_grow.cpp
+++ b/esphome/components/fingerprint_grow/fingerprint_grow.cpp
@@ -377,7 +377,7 @@ uint8_t FingerprintGrowComponent::transfer_(std::vector<uint8_t> *p_data_buffer)
   this->write((uint8_t) (wire_length >> 8));
   this->write((uint8_t) (wire_length & 0xFF));
 
-  uint16_t sum = ((wire_length) >> 8) + ((wire_length) &0xFF) + COMMAND;
+  uint16_t sum = (wire_length >> 8) + (wire_length & 0xFF) + COMMAND;
   for (auto data : *p_data_buffer) {
     this->write(data);
     sum += data;
diff --git a/esphome/components/he60r/he60r.cpp b/esphome/components/he60r/he60r.cpp
index 96ad1f04be..05f3f528a5 100644
--- a/esphome/components/he60r/he60r.cpp
+++ b/esphome/components/he60r/he60r.cpp
@@ -1,6 +1,7 @@
 #include "he60r.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/log.h"
+
 #include <cinttypes>
 
 namespace esphome {
@@ -125,10 +126,10 @@ void HE60rCover::process_rx_(uint8_t data) {
 }
 
 void HE60rCover::update_() {
-  if (toggles_needed_ != 0) {
+  if (this->toggles_needed_ != 0) {
     if ((this->counter_++ & 0x3) == 0) {
-      toggles_needed_--;
-      ESP_LOGD(TAG, "Writing byte 0x30, still needed=%" PRIu32, toggles_needed_);
+      this->toggles_needed_--;
+      ESP_LOGD(TAG, "Writing byte 0x30, still needed=%" PRIu32, this->toggles_needed_);
       this->write_byte(TOGGLE_BYTE);
     } else {
       this->write_byte(QUERY_BYTE);
diff --git a/esphome/components/htu31d/htu31d.cpp b/esphome/components/htu31d/htu31d.cpp
index 928250a5b2..bf4689d837 100644
--- a/esphome/components/htu31d/htu31d.cpp
+++ b/esphome/components/htu31d/htu31d.cpp
@@ -12,6 +12,8 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace htu31d {
 
@@ -204,7 +206,7 @@ uint32_t HTU31DComponent::read_serial_num_() {
     return 0;
   }
 
-  ESP_LOGD(TAG, "Found serial: 0x%X", serial);
+  ESP_LOGD(TAG, "Found serial: 0x%" PRIX32, serial);
 
   return serial;
 }
diff --git a/esphome/components/ina2xx_base/ina2xx_base.cpp b/esphome/components/ina2xx_base/ina2xx_base.cpp
index 5d947d0537..924bf91e5e 100644
--- a/esphome/components/ina2xx_base/ina2xx_base.cpp
+++ b/esphome/components/ina2xx_base/ina2xx_base.cpp
@@ -483,7 +483,7 @@ bool INA2XX::read_power_w_(float &power_out) {
   uint64_t power_reading{0};
   auto ret = this->read_unsigned_((uint8_t) RegisterMap::REG_POWER, 3, power_reading);
 
-  ESP_LOGV(TAG, "read_power_w_ ret=%s, reading_lsb=%d", OKFAILED(ret), (uint32_t) power_reading);
+  ESP_LOGV(TAG, "read_power_w_ ret=%s, reading_lsb=%" PRIu32, OKFAILED(ret), (uint32_t) power_reading);
   if (ret) {
     power_out = this->cfg_.power_coeff * this->current_lsb_ * (float) power_reading;
   }
@@ -503,8 +503,8 @@ bool INA2XX::read_energy_(double &joules_out, double &watt_hours_out) {
   uint64_t previous_energy = this->energy_overflows_count_ * (((uint64_t) 1) << 40);
   auto ret = this->read_unsigned_((uint8_t) RegisterMap::REG_ENERGY, 5, joules_reading);
 
-  ESP_LOGV(TAG, "read_energy_j_ ret=%s, reading_lsb=0x%" PRIX64 ", current_lsb=%f, overflow_cnt=%d", OKFAILED(ret),
-           joules_reading, this->current_lsb_, this->energy_overflows_count_);
+  ESP_LOGV(TAG, "read_energy_j_ ret=%s, reading_lsb=0x%" PRIX64 ", current_lsb=%f, overflow_cnt=%" PRIu32,
+           OKFAILED(ret), joules_reading, this->current_lsb_, this->energy_overflows_count_);
   if (ret) {
     joules_out = this->cfg_.energy_coeff * this->current_lsb_ * (double) joules_reading + (double) previous_energy;
     watt_hours_out = joules_out / 3600.0;
@@ -528,7 +528,7 @@ bool INA2XX::read_charge_(double &coulombs_out, double &amp_hours_out) {
   auto ret = this->read_unsigned_((uint8_t) RegisterMap::REG_CHARGE, 5, raw);
   coulombs_reading = this->two_complement_(raw, 40);
 
-  ESP_LOGV(TAG, "read_charge_c_ ret=%d, curr_charge=%f + 39-bit overflow_cnt=%d", ret, coulombs_reading,
+  ESP_LOGV(TAG, "read_charge_c_ ret=%d, curr_charge=%f + 39-bit overflow_cnt=%" PRIu32, ret, coulombs_reading,
            this->charge_overflows_count_);
   if (ret) {
     coulombs_out = this->current_lsb_ * (double) coulombs_reading + (double) previous_charge;
diff --git a/esphome/components/jsn_sr04t/jsn_sr04t.cpp b/esphome/components/jsn_sr04t/jsn_sr04t.cpp
index 70e21a137d..b96bf8f762 100644
--- a/esphome/components/jsn_sr04t/jsn_sr04t.cpp
+++ b/esphome/components/jsn_sr04t/jsn_sr04t.cpp
@@ -2,8 +2,6 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
-#include <cinttypes>
-
 // Very basic support for JSN_SR04T V3.0 distance sensor in mode 2
 
 namespace esphome {
@@ -38,7 +36,7 @@ void Jsnsr04tComponent::check_buffer_() {
     uint16_t distance = encode_uint16(this->buffer_[1], this->buffer_[2]);
     if (distance > 250) {
       float meters = distance / 1000.0f;
-      ESP_LOGV(TAG, "Distance from sensor: %" PRIu32 "mm, %.3fm", distance, meters);
+      ESP_LOGV(TAG, "Distance from sensor: %umm, %.3fm", distance, meters);
       this->publish_state(meters);
     } else {
       ESP_LOGW(TAG, "Invalid data read from sensor: %s", format_hex_pretty(this->buffer_).c_str());
diff --git a/esphome/components/mhz19/mhz19.cpp b/esphome/components/mhz19/mhz19.cpp
index 574aee1bd5..c3c8120362 100644
--- a/esphome/components/mhz19/mhz19.cpp
+++ b/esphome/components/mhz19/mhz19.cpp
@@ -1,5 +1,6 @@
 #include "mhz19.h"
 #include "esphome/core/log.h"
+
 #include <cinttypes>
 
 namespace esphome {
diff --git a/esphome/components/micro_wake_word/micro_wake_word.cpp b/esphome/components/micro_wake_word/micro_wake_word.cpp
index f637f8b2bb..5a89708127 100644
--- a/esphome/components/micro_wake_word/micro_wake_word.cpp
+++ b/esphome/components/micro_wake_word/micro_wake_word.cpp
@@ -20,6 +20,7 @@
 #include <tensorflow/lite/micro/micro_interpreter.h>
 #include <tensorflow/lite/micro/micro_mutable_op_resolver.h>
 
+#include <cinttypes>
 #include <cmath>
 
 namespace esphome {
@@ -316,7 +317,7 @@ float MicroWakeWord::perform_streaming_inference_() {
     return false;
   }
 
-  ESP_LOGV(TAG, "Streaming Inference Latency=%u ms", (millis() - prior_invoke));
+  ESP_LOGV(TAG, "Streaming Inference Latency=%" PRIu32 " ms", (millis() - prior_invoke));
 
   TfLiteTensor *output = this->streaming_interpreter_->output(0);
 
diff --git a/esphome/components/remote_base/byronsx_protocol.cpp b/esphome/components/remote_base/byronsx_protocol.cpp
index 2d4c60ff8b..6bfa4b7ff9 100644
--- a/esphome/components/remote_base/byronsx_protocol.cpp
+++ b/esphome/components/remote_base/byronsx_protocol.cpp
@@ -1,5 +1,6 @@
 #include "byronsx_protocol.h"
 #include "esphome/core/log.h"
+
 #include <cinttypes>
 
 namespace esphome {
diff --git a/esphome/components/remote_base/drayton_protocol.cpp b/esphome/components/remote_base/drayton_protocol.cpp
index 73c0fb116c..da2e985af0 100644
--- a/esphome/components/remote_base/drayton_protocol.cpp
+++ b/esphome/components/remote_base/drayton_protocol.cpp
@@ -1,6 +1,8 @@
 #include "drayton_protocol.h"
 #include "esphome/core/log.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace remote_base {
 
diff --git a/esphome/components/sonoff_d1/sonoff_d1.cpp b/esphome/components/sonoff_d1/sonoff_d1.cpp
index 6ae80296fd..e70ec7b70d 100644
--- a/esphome/components/sonoff_d1/sonoff_d1.cpp
+++ b/esphome/components/sonoff_d1/sonoff_d1.cpp
@@ -128,7 +128,8 @@ bool SonoffD1Output::read_ack_(const uint8_t *cmd, const size_t len) {
   // Expected acknowledgement from rf chip
   uint8_t ref_buffer[7] = {0xAA, 0x55, cmd[2], cmd[3], 0x00, 0x00, 0x00};
   uint8_t buffer[sizeof(ref_buffer)] = {0};
-  uint32_t pos = 0, buf_len = sizeof(ref_buffer);
+  uint32_t pos = 0;
+  size_t buf_len = sizeof(ref_buffer);
 
   // Update the reference checksum
   this->populate_checksum_(ref_buffer, sizeof(ref_buffer));
diff --git a/esphome/components/weikai/weikai.cpp b/esphome/components/weikai/weikai.cpp
index a04bc0a574..00bce9bcff 100644
--- a/esphome/components/weikai/weikai.cpp
+++ b/esphome/components/weikai/weikai.cpp
@@ -375,8 +375,8 @@ void WeikaiChannel::set_baudrate_() {
   this->parent_->page1_ = false;  // switch back to page 0
   this->reg(WKREG_SPAGE) = 0;
 
-  ESP_LOGV(TAG, "    Crystal=%d baudrate=%d => registers [%d %d %d]", this->parent_->crystal_, this->baud_rate_,
-           baud_high, baud_low, baud_dec);
+  ESP_LOGV(TAG, "    Crystal=%" PRId32 " baudrate=%" PRId32 " => registers [%d %d %d]", this->parent_->crystal_,
+           this->baud_rate_, baud_high, baud_low, baud_dec);
 }
 
 inline bool WeikaiChannel::tx_fifo_is_not_empty_() { return this->reg(WKREG_FSR) & FSR_TFDAT; }
diff --git a/esphome/components/wl_134/wl_134.cpp b/esphome/components/wl_134/wl_134.cpp
index 3ffa0c63ce..403f8bd1b3 100644
--- a/esphome/components/wl_134/wl_134.cpp
+++ b/esphome/components/wl_134/wl_134.cpp
@@ -1,6 +1,8 @@
 #include "wl_134.h"
 #include "esphome/core/log.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace wl_134 {
 
@@ -71,7 +73,7 @@ Wl134Component::Rfid134Error Wl134Component::read_packet_() {
   ESP_LOGV(TAG, "isData:    %s", reading.isData ? "true" : "false");
   ESP_LOGV(TAG, "isAnimal:  %s", reading.isAnimal ? "true" : "false");
   ESP_LOGV(TAG, "Reserved0: %d", reading.reserved0);
-  ESP_LOGV(TAG, "Reserved1: %d", reading.reserved1);
+  ESP_LOGV(TAG, "Reserved1: %" PRId32, reading.reserved1);
 
   char buf[20];
   sprintf(buf, "%03d%012lld", reading.country, reading.id);
diff --git a/esphome/components/xgzp68xx/xgzp68xx.cpp b/esphome/components/xgzp68xx/xgzp68xx.cpp
index dff00fb696..ad6217845d 100644
--- a/esphome/components/xgzp68xx/xgzp68xx.cpp
+++ b/esphome/components/xgzp68xx/xgzp68xx.cpp
@@ -3,6 +3,7 @@
 #include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
 #include "esphome/components/i2c/i2c.h"
+
 #include <cinttypes>
 
 namespace esphome {
diff --git a/tests/components/remote_receiver/esp32-common.yaml b/tests/components/remote_receiver/esp32-common.yaml
index c3987f8cd9..7e5d2cce32 100644
--- a/tests/components/remote_receiver/esp32-common.yaml
+++ b/tests/components/remote_receiver/esp32-common.yaml
@@ -32,8 +32,8 @@ remote_receiver:
   on_coolix:
     then:
       - logger.log:
-          format: "on_coolix: %u %u"
-          args: ["x.first", "x.second"]
+          format: "on_coolix: %lu %lu"
+          args: ["long(x.first)", "long(x.second)"]
   on_dish:
     then:
       - logger.log:
@@ -52,13 +52,13 @@ remote_receiver:
   on_jvc:
     then:
       - logger.log:
-          format: "on_jvc: %u"
-          args: ["x.data"]
+          format: "on_jvc: %lu"
+          args: ["long(x.data)"]
   on_keeloq:
     then:
       - logger.log:
-          format: "on_keeloq: %u %u %u"
-          args: ["x.encrypted", "x.address", "x.command"]
+          format: "on_keeloq: %lu %lu %u"
+          args: ["long(x.encrypted)", "long(x.address)", "x.command"]
   on_haier:
     then:
       - logger.log:
@@ -67,13 +67,13 @@ remote_receiver:
   on_lg:
     then:
       - logger.log:
-          format: "on_lg: %u %u"
-          args: ["x.data", "x.nbits"]
+          format: "on_lg: %lu %u"
+          args: ["long(x.data)", "x.nbits"]
   on_magiquest:
     then:
       - logger.log:
-          format: "on_magiquest: %u %u"
-          args: ["x.magnitude", "x.wand_id"]
+          format: "on_magiquest: %u %lu"
+          args: ["x.magnitude", "long(x.wand_id)"]
   on_midea:
     then:
       - logger.log:
@@ -87,13 +87,13 @@ remote_receiver:
   on_nexa:
     then:
       - logger.log:
-          format: "on_nexa: %u %u %u %u %u"
-          args: ["x.device", "x.group", "x.state", "x.channel", "x.level"]
+          format: "on_nexa: %lu %u %u %u %u"
+          args: ["long(x.device)", "x.group", "x.state", "x.channel", "x.level"]
   on_panasonic:
     then:
       - logger.log:
-          format: "on_panasonic: %u %u"
-          args: ["x.address", "x.command"]
+          format: "on_panasonic: %u %lu"
+          args: ["x.address", "long(x.command)"]
   on_pioneer:
     then:
       - logger.log:
@@ -107,8 +107,8 @@ remote_receiver:
   on_raw:
     then:
       - logger.log:
-          format: "on_raw: %u"
-          args: ["x.front()"]
+          format: "on_raw: %lu"
+          args: ["long(x.front())"]
   on_rc5:
     then:
       - logger.log:
@@ -132,13 +132,13 @@ remote_receiver:
   on_samsung36:
     then:
       - logger.log:
-          format: "on_samsung36: %u %u"
-          args: ["x.address", "x.command"]
+          format: "on_samsung36: %u %lu"
+          args: ["x.address", "long(x.command)"]
   on_sony:
     then:
       - logger.log:
-          format: "on_sony: %u %u"
-          args: ["x.data", "x.nbits"]
+          format: "on_sony: %lu %u"
+          args: ["long(x.data)", "x.nbits"]
   on_toshiba_ac:
     then:
       - logger.log:

From 60433c5e645690f358be94c2e3136aecfd84fa59 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 May 2024 17:09:13 +1200
Subject: [PATCH 26/29] Bump docker/login-action from 3.1.0 to 3.2.0 (#6823)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/release.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 47dc217bf7..563d485b6a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -96,12 +96,12 @@ jobs:
         uses: docker/setup-qemu-action@v3.0.0
 
       - name: Log in to docker hub
-        uses: docker/login-action@v3.1.0
+        uses: docker/login-action@v3.2.0
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Log in to the GitHub container registry
-        uses: docker/login-action@v3.1.0
+        uses: docker/login-action@v3.2.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -188,13 +188,13 @@ jobs:
 
       - name: Log in to docker hub
         if: matrix.registry == 'dockerhub'
-        uses: docker/login-action@v3.1.0
+        uses: docker/login-action@v3.2.0
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Log in to the GitHub container registry
         if: matrix.registry == 'ghcr'
-        uses: docker/login-action@v3.1.0
+        uses: docker/login-action@v3.2.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

From 6d5d382f3db98e2a9997fed9e62811f91bad06f0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 May 2024 17:10:47 +1200
Subject: [PATCH 27/29] Bump pytest-cov from 4.1.0 to 5.0.0 (#6580)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements_test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements_test.txt b/requirements_test.txt
index ae833841ca..0052e7545c 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -6,7 +6,7 @@ pre-commit
 
 # Unit tests
 pytest==8.2.0
-pytest-cov==4.1.0
+pytest-cov==5.0.0
 pytest-mock==3.14.0
 pytest-asyncio==0.23.6
 asyncmock==0.4.2

From 439fd9471863e4bf12cdc5e11b098ab0b7b96874 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 May 2024 17:11:02 +1200
Subject: [PATCH 28/29] Bump peter-evans/create-pull-request from 6.0.4 to
 6.0.5 (#6635)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/sync-device-classes.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sync-device-classes.yml b/.github/workflows/sync-device-classes.yml
index 9a8c9d1753..e65e851f3c 100644
--- a/.github/workflows/sync-device-classes.yml
+++ b/.github/workflows/sync-device-classes.yml
@@ -36,7 +36,7 @@ jobs:
           python ./script/sync-device_class.py
 
       - name: Commit changes
-        uses: peter-evans/create-pull-request@v6.0.4
+        uses: peter-evans/create-pull-request@v6.0.5
         with:
           commit-message: "Synchronise Device Classes from Home Assistant"
           committer: esphomebot <esphome@nabucasa.com>

From 5ae32e81c360a73f7ebe14d330d6e9d58eac324a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 May 2024 17:11:34 +1200
Subject: [PATCH 29/29] Bump black from 24.4.0 to 24.4.2 (#6646)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 .pre-commit-config.yaml | 2 +-
 requirements_test.txt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 418716e4f4..74acfa1c1d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,7 +3,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 24.2.0
+    rev: 24.4.2
     hooks:
       - id: black
         args:
diff --git a/requirements_test.txt b/requirements_test.txt
index 0052e7545c..94abe1cd76 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,6 +1,6 @@
 pylint==3.1.0
 flake8==7.0.0  # also change in .pre-commit-config.yaml when updating
-black==24.4.0  # also change in .pre-commit-config.yaml when updating
+black==24.4.2  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.15.2  # also change in .pre-commit-config.yaml when updating
 pre-commit