From e48d02495b65fcef806cbd07da24a928e7e646bc Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Wed, 8 May 2024 21:05:24 +0200
Subject: [PATCH 01/31] [nextion] Replace flags to `USE_ARDUINO` (#6700)

---
 esphome/components/nextion/nextion.h                  | 10 +++++-----
 esphome/components/nextion/nextion_upload_arduino.cpp |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/esphome/components/nextion/nextion.h b/esphome/components/nextion/nextion.h
index 6435e2b4e2..dfa74f644d 100644
--- a/esphome/components/nextion/nextion.h
+++ b/esphome/components/nextion/nextion.h
@@ -12,7 +12,7 @@
 #include "esphome/components/display/display_color_utils.h"
 
 #ifdef USE_NEXTION_TFT_UPLOAD
-#ifdef ARDUINO
+#ifdef USE_ARDUINO
 #ifdef USE_ESP32
 #include <HTTPClient.h>
 #endif  // USE_ESP32
@@ -22,7 +22,7 @@
 #endif  // USE_ESP8266
 #elif defined(USE_ESP_IDF)
 #include <esp_http_client.h>
-#endif  // ARDUINO vs ESP-IDF
+#endif  // ARDUINO vs USE_ESP_IDF
 #endif  // USE_NEXTION_TFT_UPLOAD
 
 namespace esphome {
@@ -987,7 +987,7 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
 
 #ifdef USE_NEXTION_TFT_UPLOAD
   /**
-   * Set the tft file URL. https seems problematic with arduino..
+   * Set the tft file URL. https seems problematic with Arduino..
    */
   void set_tft_url(const std::string &tft_url) { this->tft_url_ = tft_url; }
 
@@ -1190,7 +1190,7 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
   uint32_t original_baud_rate_ = 0;
   bool upload_first_chunk_sent_ = false;
 
-#ifdef ARDUINO
+#ifdef USE_ARDUINO
   /**
    * will request chunk_size chunks from the web server
    * and send each to the nextion
@@ -1208,7 +1208,7 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
    * @return position of last byte transferred, -1 for failure.
    */
   int upload_by_chunks_(esp_http_client_handle_t http_client, uint32_t &range_start);
-#endif  // ARDUINO vs USE_ESP_IDF
+#endif  // USE_ARDUINO vs USE_ESP_IDF
 
   /**
    * Ends the upload process, restart Nextion and, if successful,
diff --git a/esphome/components/nextion/nextion_upload_arduino.cpp b/esphome/components/nextion/nextion_upload_arduino.cpp
index b199db91b7..1187c77c8e 100644
--- a/esphome/components/nextion/nextion_upload_arduino.cpp
+++ b/esphome/components/nextion/nextion_upload_arduino.cpp
@@ -1,7 +1,7 @@
 #include "nextion.h"
 
 #ifdef USE_NEXTION_TFT_UPLOAD
-#ifdef ARDUINO
+#ifdef USE_ARDUINO
 
 #include "esphome/core/application.h"
 #include "esphome/core/defines.h"
@@ -383,5 +383,5 @@ WiFiClient *Nextion::get_wifi_client_() {
 }  // namespace nextion
 }  // namespace esphome
 
-#endif  // ARDUINO
+#endif  // USE_ARDUINO
 #endif  // USE_NEXTION_TFT_UPLOAD

From 487e171443054d1613cdefb573a336c98012f427 Mon Sep 17 00:00:00 2001
From: Mat931 <49403702+Mat931@users.noreply.github.com>
Date: Wed, 8 May 2024 21:58:40 +0000
Subject: [PATCH 02/31] [remote_receiver, remote_transmitter] Improve error
 messages on the ESP32 (#6701)

---
 esphome/components/remote_receiver/remote_receiver.h  |  1 +
 .../remote_receiver/remote_receiver_esp32.cpp         | 11 ++++++++++-
 .../remote_transmitter/remote_transmitter.h           |  1 +
 .../remote_transmitter/remote_transmitter_esp32.cpp   |  9 ++++++++-
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/esphome/components/remote_receiver/remote_receiver.h b/esphome/components/remote_receiver/remote_receiver.h
index a1db671e5c..773f8cf636 100644
--- a/esphome/components/remote_receiver/remote_receiver.h
+++ b/esphome/components/remote_receiver/remote_receiver.h
@@ -58,6 +58,7 @@ class RemoteReceiverComponent : public remote_base::RemoteReceiverBase,
   void decode_rmt_(rmt_item32_t *item, size_t len);
   RingbufHandle_t ringbuf_;
   esp_err_t error_code_{ESP_OK};
+  std::string error_string_{""};
 #endif
 
 #if defined(USE_ESP8266) || defined(USE_LIBRETINY)
diff --git a/esphome/components/remote_receiver/remote_receiver_esp32.cpp b/esphome/components/remote_receiver/remote_receiver_esp32.cpp
index c0bfb0222f..91295871e2 100644
--- a/esphome/components/remote_receiver/remote_receiver_esp32.cpp
+++ b/esphome/components/remote_receiver/remote_receiver_esp32.cpp
@@ -29,6 +29,7 @@ void RemoteReceiverComponent::setup() {
   esp_err_t error = rmt_config(&rmt);
   if (error != ESP_OK) {
     this->error_code_ = error;
+    this->error_string_ = "in rmt_config";
     this->mark_failed();
     return;
   }
@@ -36,18 +37,25 @@ void RemoteReceiverComponent::setup() {
   error = rmt_driver_install(this->channel_, this->buffer_size_, 0);
   if (error != ESP_OK) {
     this->error_code_ = error;
+    if (error == ESP_ERR_INVALID_STATE) {
+      this->error_string_ = str_sprintf("RMT channel %i is already in use by another component", this->channel_);
+    } else {
+      this->error_string_ = "in rmt_driver_install";
+    }
     this->mark_failed();
     return;
   }
   error = rmt_get_ringbuf_handle(this->channel_, &this->ringbuf_);
   if (error != ESP_OK) {
     this->error_code_ = error;
+    this->error_string_ = "in rmt_get_ringbuf_handle";
     this->mark_failed();
     return;
   }
   error = rmt_rx_start(this->channel_, true);
   if (error != ESP_OK) {
     this->error_code_ = error;
+    this->error_string_ = "in rmt_rx_start";
     this->mark_failed();
     return;
   }
@@ -67,7 +75,8 @@ void RemoteReceiverComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "  Filter out pulses shorter than: %" PRIu32 " us", this->filter_us_);
   ESP_LOGCONFIG(TAG, "  Signal is done after %" PRIu32 " us of no changes", this->idle_us_);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Configuring RMT driver failed: %s", esp_err_to_name(this->error_code_));
+    ESP_LOGE(TAG, "Configuring RMT driver failed: %s (%s)", esp_err_to_name(this->error_code_),
+             this->error_string_.c_str());
   }
 }
 
diff --git a/esphome/components/remote_transmitter/remote_transmitter.h b/esphome/components/remote_transmitter/remote_transmitter.h
index e736172cda..b897fa8fab 100644
--- a/esphome/components/remote_transmitter/remote_transmitter.h
+++ b/esphome/components/remote_transmitter/remote_transmitter.h
@@ -53,6 +53,7 @@ class RemoteTransmitterComponent : public remote_base::RemoteTransmitterBase,
   bool initialized_{false};
   std::vector<rmt_item32_t> rmt_temp_;
   esp_err_t error_code_{ESP_OK};
+  std::string error_string_{""};
   bool inverted_{false};
 #endif
   uint8_t carrier_duty_percent_;
diff --git a/esphome/components/remote_transmitter/remote_transmitter_esp32.cpp b/esphome/components/remote_transmitter/remote_transmitter_esp32.cpp
index c3d4d42e4f..eea35019ff 100644
--- a/esphome/components/remote_transmitter/remote_transmitter_esp32.cpp
+++ b/esphome/components/remote_transmitter/remote_transmitter_esp32.cpp
@@ -23,7 +23,8 @@ void RemoteTransmitterComponent::dump_config() {
   }
 
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Configuring RMT driver failed: %s", esp_err_to_name(this->error_code_));
+    ESP_LOGE(TAG, "Configuring RMT driver failed: %s (%s)", esp_err_to_name(this->error_code_),
+             this->error_string_.c_str());
   }
 }
 
@@ -56,6 +57,7 @@ void RemoteTransmitterComponent::configure_rmt_() {
   esp_err_t error = rmt_config(&c);
   if (error != ESP_OK) {
     this->error_code_ = error;
+    this->error_string_ = "in rmt_config";
     this->mark_failed();
     return;
   }
@@ -64,6 +66,11 @@ void RemoteTransmitterComponent::configure_rmt_() {
     error = rmt_driver_install(this->channel_, 0, 0);
     if (error != ESP_OK) {
       this->error_code_ = error;
+      if (error == ESP_ERR_INVALID_STATE) {
+        this->error_string_ = str_sprintf("RMT channel %i is already in use by another component", this->channel_);
+      } else {
+        this->error_string_ = "in rmt_driver_install";
+      }
       this->mark_failed();
       return;
     }

From 72481006e4b8634eb4309092327b082afc099d64 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 9 May 2024 12:25:57 +1200
Subject: [PATCH 03/31] [ethernet] Use constexpr instead of inline define for
 KSZ80XX_PC2R_REG_ADDR (#6705)

---
 esphome/components/ethernet/ethernet_component.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp
index 243135de89..17093ffb3d 100644
--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -1,12 +1,12 @@
 #include "ethernet_component.h"
+#include "esphome/core/application.h"
 #include "esphome/core/log.h"
 #include "esphome/core/util.h"
-#include "esphome/core/application.h"
 
 #ifdef USE_ESP32
 
-#include <cinttypes>
 #include <lwip/dns.h>
+#include <cinttypes>
 #include "esp_event.h"
 
 #ifdef USE_ETHERNET_SPI
@@ -554,9 +554,10 @@ bool EthernetComponent::powerdown() {
 }
 
 #ifndef USE_ETHERNET_SPI
-void EthernetComponent::ksz8081_set_clock_reference_(esp_eth_mac_t *mac) {
-#define KSZ80XX_PC2R_REG_ADDR (0x1F)
 
+constexpr uint8_t KSZ80XX_PC2R_REG_ADDR = 0x1F;
+
+void EthernetComponent::ksz8081_set_clock_reference_(esp_eth_mac_t *mac) {
   esp_err_t err;
 
   uint32_t phy_control_2;
@@ -581,8 +582,6 @@ void EthernetComponent::ksz8081_set_clock_reference_(esp_eth_mac_t *mac) {
     ESPHL_ERROR_CHECK(err, "Read PHY Control 2 failed");
     ESP_LOGVV(TAG, "KSZ8081 PHY Control 2: %s", format_hex_pretty((u_int8_t *) &phy_control_2, 2).c_str());
   }
-
-#undef KSZ80XX_PC2R_REG_ADDR
 }
 #endif
 

From 819be760133e4c13a4ce141737705ae5fcae6292 Mon Sep 17 00:00:00 2001
From: Nate Clark <nate@nateclark.com>
Date: Wed, 8 May 2024 20:47:25 -0400
Subject: [PATCH 04/31] Add PHY register writes to enable external clock on
 Ethernet with RTL8201 (#6704)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 .../ethernet/ethernet_component.cpp           | 44 +++++++++++++++++++
 .../components/ethernet/ethernet_component.h  |  2 +
 2 files changed, 46 insertions(+)

diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp
index 17093ffb3d..3af462d593 100644
--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -184,6 +184,10 @@ void EthernetComponent::setup() {
     // KSZ8081RNA default is incorrect. It expects a 25MHz clock instead of the 50MHz we provide.
     this->ksz8081_set_clock_reference_(mac);
   }
+  if (this->type_ == ETHERNET_TYPE_RTL8201 && this->clk_mode_ == EMAC_CLK_EXT_IN) {
+    // Change in default behavior of RTL8201FI may require register setting to enable external clock
+    this->rtl8201_set_rmii_mode_(mac);
+  }
 #endif
 
   // use ESP internal eth mac
@@ -583,6 +587,46 @@ void EthernetComponent::ksz8081_set_clock_reference_(esp_eth_mac_t *mac) {
     ESP_LOGVV(TAG, "KSZ8081 PHY Control 2: %s", format_hex_pretty((u_int8_t *) &phy_control_2, 2).c_str());
   }
 }
+constexpr uint8_t RTL8201_RMSR_REG_ADDR = 0x10;
+void EthernetComponent::rtl8201_set_rmii_mode_(esp_eth_mac_t *mac) {
+  esp_err_t err;
+  uint32_t phy_rmii_mode;
+  err = mac->write_phy_reg(mac, this->phy_addr_, 0x1f, 0x07);
+  ESPHL_ERROR_CHECK(err, "Setting Page 7 failed");
+
+  /*
+   * RTL8201 RMII Mode Setting Register (RMSR)
+   * Page 7 Register 16
+   *
+   * bit 0      Reserved            0
+   * bit 1      Rg_rmii_rxdsel      1 (default)
+   * bit 2      Rg_rmii_rxdv_sel:   0 (default)
+   * bit 3      RMII Mode:          1 (RMII Mode)
+   * bit 4~7    Rg_rmii_rx_offset:  1111 (default)
+   * bit 8~11   Rg_rmii_tx_offset:  1111 (default)
+   * bit 12     Rg_rmii_clkdir:     1 (Input)
+   * bit 13~15  Reserved            000
+   *
+   * Binary: 0001 1111 1111 1010
+   * Hex: 0x1FFA
+   *
+   */
+
+  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);
+
+  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);
+
+  err = mac->write_phy_reg(mac, this->phy_addr_, 0x1f, 0x0);
+  ESPHL_ERROR_CHECK(err, "Setting Page 0 failed");
+}
+
 #endif
 
 }  // namespace ethernet
diff --git a/esphome/components/ethernet/ethernet_component.h b/esphome/components/ethernet/ethernet_component.h
index daeb5a2029..6276885fd1 100644
--- a/esphome/components/ethernet/ethernet_component.h
+++ b/esphome/components/ethernet/ethernet_component.h
@@ -86,6 +86,8 @@ class EthernetComponent : public Component {
   void dump_connect_params_();
   /// @brief Set `RMII Reference Clock Select` bit for KSZ8081.
   void ksz8081_set_clock_reference_(esp_eth_mac_t *mac);
+  /// @brief Set `RMII Mode Setting Register` for RTL8201.
+  void rtl8201_set_rmii_mode_(esp_eth_mac_t *mac);
 
   std::string use_address_;
 #ifdef USE_ETHERNET_SPI

From 3ec4a66c9efb8258966f22e734fe23e06326d614 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 8 May 2024 20:45:10 -0500
Subject: [PATCH 05/31] Bump recommended ESP-IDF to 4.4.7 (#6703)

---
 esphome/components/esp32/__init__.py | 2 +-
 platformio.ini                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py
index 5d74838daa..8f46567266 100644
--- a/esphome/components/esp32/__init__.py
+++ b/esphome/components/esp32/__init__.py
@@ -227,7 +227,7 @@ ARDUINO_PLATFORM_VERSION = cv.Version(5, 4, 0)
 # The default/recommended esp-idf framework version
 #  - https://github.com/espressif/esp-idf/releases
 #  - https://api.registry.platformio.org/v3/packages/platformio/tool/framework-espidf
-RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION = cv.Version(4, 4, 6)
+RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION = cv.Version(4, 4, 7)
 # The platformio/espressif32 version to use for esp-idf frameworks
 #  - https://github.com/platformio/platform-espressif32/releases
 #  - https://api.registry.platformio.org/v3/packages/platformio/platform/espressif32
diff --git a/platformio.ini b/platformio.ini
index e699057fa3..d342b32b02 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -137,7 +137,7 @@ extra_scripts = post:esphome/components/esp32/post_build.py.script
 extends = common:idf
 platform = platformio/espressif32@5.4.0
 platform_packages =
-    platformio/framework-espidf@~3.40406.0
+    platformio/framework-espidf@~3.40407.0
 
 framework = espidf
 lib_deps =

From 054587c0e48fa4874a99a48f94e89c17ef98ce12 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 8 May 2024 16:17:45 +1200
Subject: [PATCH 06/31] [github] Upgrade to actions/{upload,download}-artifact
 v4 (#6698)

---
 .github/actions/build-image/action.yaml | 16 ----------------
 .github/workflows/release.yml           | 16 +++++++++++++---
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/.github/actions/build-image/action.yaml b/.github/actions/build-image/action.yaml
index 838bc362a1..87ea28fd20 100644
--- a/.github/actions/build-image/action.yaml
+++ b/.github/actions/build-image/action.yaml
@@ -57,14 +57,6 @@ runs:
         digest="${{ steps.build-ghcr.outputs.digest }}"
         touch "/tmp/digests/${{ inputs.target }}/ghcr/${digest#sha256:}"
 
-    - name: Upload ghcr digest
-      uses: actions/upload-artifact@v3.1.3
-      with:
-        name: digests-${{ inputs.target }}-ghcr
-        path: /tmp/digests/${{ inputs.target }}/ghcr/*
-        if-no-files-found: error
-        retention-days: 1
-
     - name: Build and push to dockerhub by digest
       id: build-dockerhub
       uses: docker/build-push-action@v5.3.0
@@ -87,11 +79,3 @@ runs:
         mkdir -p /tmp/digests/${{ inputs.target }}/dockerhub
         digest="${{ steps.build-dockerhub.outputs.digest }}"
         touch "/tmp/digests/${{ inputs.target }}/dockerhub/${digest#sha256:}"
-
-    - name: Upload dockerhub digest
-      uses: actions/upload-artifact@v3.1.3
-      with:
-        name: digests-${{ inputs.target }}-dockerhub
-        path: /tmp/digests/${{ inputs.target }}/dockerhub/*
-        if-no-files-found: error
-        retention-days: 1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6d91d00b85..5002f041e1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -132,6 +132,13 @@ jobs:
           suffix: lint
           version: ${{ needs.init.outputs.tag }}
 
+      - name: Upload digests
+        uses: actions/upload-artifact@v4.3.3
+        with:
+          name: digests-${{ matrix.platform }}
+          path: /tmp/digests
+          retention-days: 1
+
   deploy-manifest:
     name: Publish ESPHome ${{ matrix.image.title }} to ${{ matrix.registry }}
     runs-on: ubuntu-latest
@@ -160,11 +167,14 @@ jobs:
           - dockerhub
     steps:
       - uses: actions/checkout@v4.1.5
+
       - name: Download digests
-        uses: actions/download-artifact@v3.0.2
+        uses: actions/download-artifact@v4.1.7
         with:
-          name: digests-${{ matrix.image.target }}-${{ matrix.registry }}
+          pattern: digests-*
           path: /tmp/digests
+          merge-multiple: true
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3.3.0
 
@@ -195,7 +205,7 @@ jobs:
           done
 
       - name: Create manifest list and push
-        working-directory: /tmp/digests
+        working-directory: /tmp/digests/${{ matrix.image.target }}/${{ matrix.registry }}
         run: |
           docker buildx imagetools create $(jq -Rcnr 'inputs | . / "," | map("-t " + .) | join(" ")' <<< "${{ steps.tags.outputs.tags}}") \
             $(printf '${{ steps.tags.outputs.image }}@sha256:%s ' *)

From 34585a6f15ba05805d3e54c14645b6ebcfaf83e1 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Wed, 8 May 2024 21:05:24 +0200
Subject: [PATCH 07/31] [nextion] Replace flags to `USE_ARDUINO` (#6700)

---
 esphome/components/nextion/nextion.h                  | 10 +++++-----
 esphome/components/nextion/nextion_upload_arduino.cpp |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/esphome/components/nextion/nextion.h b/esphome/components/nextion/nextion.h
index 6435e2b4e2..dfa74f644d 100644
--- a/esphome/components/nextion/nextion.h
+++ b/esphome/components/nextion/nextion.h
@@ -12,7 +12,7 @@
 #include "esphome/components/display/display_color_utils.h"
 
 #ifdef USE_NEXTION_TFT_UPLOAD
-#ifdef ARDUINO
+#ifdef USE_ARDUINO
 #ifdef USE_ESP32
 #include <HTTPClient.h>
 #endif  // USE_ESP32
@@ -22,7 +22,7 @@
 #endif  // USE_ESP8266
 #elif defined(USE_ESP_IDF)
 #include <esp_http_client.h>
-#endif  // ARDUINO vs ESP-IDF
+#endif  // ARDUINO vs USE_ESP_IDF
 #endif  // USE_NEXTION_TFT_UPLOAD
 
 namespace esphome {
@@ -987,7 +987,7 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
 
 #ifdef USE_NEXTION_TFT_UPLOAD
   /**
-   * Set the tft file URL. https seems problematic with arduino..
+   * Set the tft file URL. https seems problematic with Arduino..
    */
   void set_tft_url(const std::string &tft_url) { this->tft_url_ = tft_url; }
 
@@ -1190,7 +1190,7 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
   uint32_t original_baud_rate_ = 0;
   bool upload_first_chunk_sent_ = false;
 
-#ifdef ARDUINO
+#ifdef USE_ARDUINO
   /**
    * will request chunk_size chunks from the web server
    * and send each to the nextion
@@ -1208,7 +1208,7 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
    * @return position of last byte transferred, -1 for failure.
    */
   int upload_by_chunks_(esp_http_client_handle_t http_client, uint32_t &range_start);
-#endif  // ARDUINO vs USE_ESP_IDF
+#endif  // USE_ARDUINO vs USE_ESP_IDF
 
   /**
    * Ends the upload process, restart Nextion and, if successful,
diff --git a/esphome/components/nextion/nextion_upload_arduino.cpp b/esphome/components/nextion/nextion_upload_arduino.cpp
index b199db91b7..1187c77c8e 100644
--- a/esphome/components/nextion/nextion_upload_arduino.cpp
+++ b/esphome/components/nextion/nextion_upload_arduino.cpp
@@ -1,7 +1,7 @@
 #include "nextion.h"
 
 #ifdef USE_NEXTION_TFT_UPLOAD
-#ifdef ARDUINO
+#ifdef USE_ARDUINO
 
 #include "esphome/core/application.h"
 #include "esphome/core/defines.h"
@@ -383,5 +383,5 @@ WiFiClient *Nextion::get_wifi_client_() {
 }  // namespace nextion
 }  // namespace esphome
 
-#endif  // ARDUINO
+#endif  // USE_ARDUINO
 #endif  // USE_NEXTION_TFT_UPLOAD

From 879f404b48e1de4535097e119698ae9861f7294f Mon Sep 17 00:00:00 2001
From: Mat931 <49403702+Mat931@users.noreply.github.com>
Date: Wed, 8 May 2024 21:58:40 +0000
Subject: [PATCH 08/31] [remote_receiver, remote_transmitter] Improve error
 messages on the ESP32 (#6701)

---
 esphome/components/remote_receiver/remote_receiver.h  |  1 +
 .../remote_receiver/remote_receiver_esp32.cpp         | 11 ++++++++++-
 .../remote_transmitter/remote_transmitter.h           |  1 +
 .../remote_transmitter/remote_transmitter_esp32.cpp   |  9 ++++++++-
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/esphome/components/remote_receiver/remote_receiver.h b/esphome/components/remote_receiver/remote_receiver.h
index a1db671e5c..773f8cf636 100644
--- a/esphome/components/remote_receiver/remote_receiver.h
+++ b/esphome/components/remote_receiver/remote_receiver.h
@@ -58,6 +58,7 @@ class RemoteReceiverComponent : public remote_base::RemoteReceiverBase,
   void decode_rmt_(rmt_item32_t *item, size_t len);
   RingbufHandle_t ringbuf_;
   esp_err_t error_code_{ESP_OK};
+  std::string error_string_{""};
 #endif
 
 #if defined(USE_ESP8266) || defined(USE_LIBRETINY)
diff --git a/esphome/components/remote_receiver/remote_receiver_esp32.cpp b/esphome/components/remote_receiver/remote_receiver_esp32.cpp
index c0bfb0222f..91295871e2 100644
--- a/esphome/components/remote_receiver/remote_receiver_esp32.cpp
+++ b/esphome/components/remote_receiver/remote_receiver_esp32.cpp
@@ -29,6 +29,7 @@ void RemoteReceiverComponent::setup() {
   esp_err_t error = rmt_config(&rmt);
   if (error != ESP_OK) {
     this->error_code_ = error;
+    this->error_string_ = "in rmt_config";
     this->mark_failed();
     return;
   }
@@ -36,18 +37,25 @@ void RemoteReceiverComponent::setup() {
   error = rmt_driver_install(this->channel_, this->buffer_size_, 0);
   if (error != ESP_OK) {
     this->error_code_ = error;
+    if (error == ESP_ERR_INVALID_STATE) {
+      this->error_string_ = str_sprintf("RMT channel %i is already in use by another component", this->channel_);
+    } else {
+      this->error_string_ = "in rmt_driver_install";
+    }
     this->mark_failed();
     return;
   }
   error = rmt_get_ringbuf_handle(this->channel_, &this->ringbuf_);
   if (error != ESP_OK) {
     this->error_code_ = error;
+    this->error_string_ = "in rmt_get_ringbuf_handle";
     this->mark_failed();
     return;
   }
   error = rmt_rx_start(this->channel_, true);
   if (error != ESP_OK) {
     this->error_code_ = error;
+    this->error_string_ = "in rmt_rx_start";
     this->mark_failed();
     return;
   }
@@ -67,7 +75,8 @@ void RemoteReceiverComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "  Filter out pulses shorter than: %" PRIu32 " us", this->filter_us_);
   ESP_LOGCONFIG(TAG, "  Signal is done after %" PRIu32 " us of no changes", this->idle_us_);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Configuring RMT driver failed: %s", esp_err_to_name(this->error_code_));
+    ESP_LOGE(TAG, "Configuring RMT driver failed: %s (%s)", esp_err_to_name(this->error_code_),
+             this->error_string_.c_str());
   }
 }
 
diff --git a/esphome/components/remote_transmitter/remote_transmitter.h b/esphome/components/remote_transmitter/remote_transmitter.h
index e736172cda..b897fa8fab 100644
--- a/esphome/components/remote_transmitter/remote_transmitter.h
+++ b/esphome/components/remote_transmitter/remote_transmitter.h
@@ -53,6 +53,7 @@ class RemoteTransmitterComponent : public remote_base::RemoteTransmitterBase,
   bool initialized_{false};
   std::vector<rmt_item32_t> rmt_temp_;
   esp_err_t error_code_{ESP_OK};
+  std::string error_string_{""};
   bool inverted_{false};
 #endif
   uint8_t carrier_duty_percent_;
diff --git a/esphome/components/remote_transmitter/remote_transmitter_esp32.cpp b/esphome/components/remote_transmitter/remote_transmitter_esp32.cpp
index c3d4d42e4f..eea35019ff 100644
--- a/esphome/components/remote_transmitter/remote_transmitter_esp32.cpp
+++ b/esphome/components/remote_transmitter/remote_transmitter_esp32.cpp
@@ -23,7 +23,8 @@ void RemoteTransmitterComponent::dump_config() {
   }
 
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Configuring RMT driver failed: %s", esp_err_to_name(this->error_code_));
+    ESP_LOGE(TAG, "Configuring RMT driver failed: %s (%s)", esp_err_to_name(this->error_code_),
+             this->error_string_.c_str());
   }
 }
 
@@ -56,6 +57,7 @@ void RemoteTransmitterComponent::configure_rmt_() {
   esp_err_t error = rmt_config(&c);
   if (error != ESP_OK) {
     this->error_code_ = error;
+    this->error_string_ = "in rmt_config";
     this->mark_failed();
     return;
   }
@@ -64,6 +66,11 @@ void RemoteTransmitterComponent::configure_rmt_() {
     error = rmt_driver_install(this->channel_, 0, 0);
     if (error != ESP_OK) {
       this->error_code_ = error;
+      if (error == ESP_ERR_INVALID_STATE) {
+        this->error_string_ = str_sprintf("RMT channel %i is already in use by another component", this->channel_);
+      } else {
+        this->error_string_ = "in rmt_driver_install";
+      }
       this->mark_failed();
       return;
     }

From 2fbe80c1f78cc407d79a8d06e4c0c948f013f1ae Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 9 May 2024 12:25:57 +1200
Subject: [PATCH 09/31] [ethernet] Use constexpr instead of inline define for
 KSZ80XX_PC2R_REG_ADDR (#6705)

---
 esphome/components/ethernet/ethernet_component.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp
index 243135de89..17093ffb3d 100644
--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -1,12 +1,12 @@
 #include "ethernet_component.h"
+#include "esphome/core/application.h"
 #include "esphome/core/log.h"
 #include "esphome/core/util.h"
-#include "esphome/core/application.h"
 
 #ifdef USE_ESP32
 
-#include <cinttypes>
 #include <lwip/dns.h>
+#include <cinttypes>
 #include "esp_event.h"
 
 #ifdef USE_ETHERNET_SPI
@@ -554,9 +554,10 @@ bool EthernetComponent::powerdown() {
 }
 
 #ifndef USE_ETHERNET_SPI
-void EthernetComponent::ksz8081_set_clock_reference_(esp_eth_mac_t *mac) {
-#define KSZ80XX_PC2R_REG_ADDR (0x1F)
 
+constexpr uint8_t KSZ80XX_PC2R_REG_ADDR = 0x1F;
+
+void EthernetComponent::ksz8081_set_clock_reference_(esp_eth_mac_t *mac) {
   esp_err_t err;
 
   uint32_t phy_control_2;
@@ -581,8 +582,6 @@ void EthernetComponent::ksz8081_set_clock_reference_(esp_eth_mac_t *mac) {
     ESPHL_ERROR_CHECK(err, "Read PHY Control 2 failed");
     ESP_LOGVV(TAG, "KSZ8081 PHY Control 2: %s", format_hex_pretty((u_int8_t *) &phy_control_2, 2).c_str());
   }
-
-#undef KSZ80XX_PC2R_REG_ADDR
 }
 #endif
 

From ed1344edd24c983196c1f50bc0571eaf0580a472 Mon Sep 17 00:00:00 2001
From: Nate Clark <nate@nateclark.com>
Date: Wed, 8 May 2024 20:47:25 -0400
Subject: [PATCH 10/31] Add PHY register writes to enable external clock on
 Ethernet with RTL8201 (#6704)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 .../ethernet/ethernet_component.cpp           | 44 +++++++++++++++++++
 .../components/ethernet/ethernet_component.h  |  2 +
 2 files changed, 46 insertions(+)

diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp
index 17093ffb3d..3af462d593 100644
--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -184,6 +184,10 @@ void EthernetComponent::setup() {
     // KSZ8081RNA default is incorrect. It expects a 25MHz clock instead of the 50MHz we provide.
     this->ksz8081_set_clock_reference_(mac);
   }
+  if (this->type_ == ETHERNET_TYPE_RTL8201 && this->clk_mode_ == EMAC_CLK_EXT_IN) {
+    // Change in default behavior of RTL8201FI may require register setting to enable external clock
+    this->rtl8201_set_rmii_mode_(mac);
+  }
 #endif
 
   // use ESP internal eth mac
@@ -583,6 +587,46 @@ void EthernetComponent::ksz8081_set_clock_reference_(esp_eth_mac_t *mac) {
     ESP_LOGVV(TAG, "KSZ8081 PHY Control 2: %s", format_hex_pretty((u_int8_t *) &phy_control_2, 2).c_str());
   }
 }
+constexpr uint8_t RTL8201_RMSR_REG_ADDR = 0x10;
+void EthernetComponent::rtl8201_set_rmii_mode_(esp_eth_mac_t *mac) {
+  esp_err_t err;
+  uint32_t phy_rmii_mode;
+  err = mac->write_phy_reg(mac, this->phy_addr_, 0x1f, 0x07);
+  ESPHL_ERROR_CHECK(err, "Setting Page 7 failed");
+
+  /*
+   * RTL8201 RMII Mode Setting Register (RMSR)
+   * Page 7 Register 16
+   *
+   * bit 0      Reserved            0
+   * bit 1      Rg_rmii_rxdsel      1 (default)
+   * bit 2      Rg_rmii_rxdv_sel:   0 (default)
+   * bit 3      RMII Mode:          1 (RMII Mode)
+   * bit 4~7    Rg_rmii_rx_offset:  1111 (default)
+   * bit 8~11   Rg_rmii_tx_offset:  1111 (default)
+   * bit 12     Rg_rmii_clkdir:     1 (Input)
+   * bit 13~15  Reserved            000
+   *
+   * Binary: 0001 1111 1111 1010
+   * Hex: 0x1FFA
+   *
+   */
+
+  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);
+
+  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);
+
+  err = mac->write_phy_reg(mac, this->phy_addr_, 0x1f, 0x0);
+  ESPHL_ERROR_CHECK(err, "Setting Page 0 failed");
+}
+
 #endif
 
 }  // namespace ethernet
diff --git a/esphome/components/ethernet/ethernet_component.h b/esphome/components/ethernet/ethernet_component.h
index daeb5a2029..6276885fd1 100644
--- a/esphome/components/ethernet/ethernet_component.h
+++ b/esphome/components/ethernet/ethernet_component.h
@@ -86,6 +86,8 @@ class EthernetComponent : public Component {
   void dump_connect_params_();
   /// @brief Set `RMII Reference Clock Select` bit for KSZ8081.
   void ksz8081_set_clock_reference_(esp_eth_mac_t *mac);
+  /// @brief Set `RMII Mode Setting Register` for RTL8201.
+  void rtl8201_set_rmii_mode_(esp_eth_mac_t *mac);
 
   std::string use_address_;
 #ifdef USE_ETHERNET_SPI

From 98dc9fde6c6041a491f56d0a9ea67dc12ebab963 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 8 May 2024 20:45:10 -0500
Subject: [PATCH 11/31] Bump recommended ESP-IDF to 4.4.7 (#6703)

---
 esphome/components/esp32/__init__.py | 2 +-
 platformio.ini                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py
index 5d74838daa..8f46567266 100644
--- a/esphome/components/esp32/__init__.py
+++ b/esphome/components/esp32/__init__.py
@@ -227,7 +227,7 @@ ARDUINO_PLATFORM_VERSION = cv.Version(5, 4, 0)
 # The default/recommended esp-idf framework version
 #  - https://github.com/espressif/esp-idf/releases
 #  - https://api.registry.platformio.org/v3/packages/platformio/tool/framework-espidf
-RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION = cv.Version(4, 4, 6)
+RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION = cv.Version(4, 4, 7)
 # The platformio/espressif32 version to use for esp-idf frameworks
 #  - https://github.com/platformio/platform-espressif32/releases
 #  - https://api.registry.platformio.org/v3/packages/platformio/platform/espressif32
diff --git a/platformio.ini b/platformio.ini
index e699057fa3..d342b32b02 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -137,7 +137,7 @@ extra_scripts = post:esphome/components/esp32/post_build.py.script
 extends = common:idf
 platform = platformio/espressif32@5.4.0
 platform_packages =
-    platformio/framework-espidf@~3.40406.0
+    platformio/framework-espidf@~3.40407.0
 
 framework = espidf
 lib_deps =

From 0ca395e8d0c7dc728da6f54c41c627117f74a006 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 9 May 2024 14:45:40 +1200
Subject: [PATCH 12/31] Bump version to 2024.5.0b2

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

diff --git a/esphome/const.py b/esphome/const.py
index 7996a7a24a..46fc5fc20b 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2024.5.0b1"
+__version__ = "2024.5.0b2"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 VALID_SUBSTITUTIONS_CHARACTERS = (

From d0120cefd24dda9f512b3d8124c410179cdda87a Mon Sep 17 00:00:00 2001
From: chbmuc <chb@muc.de>
Date: Thu, 9 May 2024 05:02:43 +0200
Subject: [PATCH 13/31] Add IRK support to ble_rssi (#6422)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 .../ble_presence/ble_presence_device.h        | 49 +------------------
 esphome/components/ble_rssi/ble_rssi_sensor.h | 14 +++++-
 esphome/components/ble_rssi/sensor.py         | 11 ++++-
 .../esp32_ble_tracker/esp32_ble_tracker.cpp   | 36 ++++++++++++++
 .../esp32_ble_tracker/esp32_ble_tracker.h     |  2 +
 tests/components/ble_rssi/common.yaml         |  3 ++
 6 files changed, 65 insertions(+), 50 deletions(-)

diff --git a/esphome/components/ble_presence/ble_presence_device.h b/esphome/components/ble_presence/ble_presence_device.h
index e74c2f4f45..3ed60d1b49 100644
--- a/esphome/components/ble_presence/ble_presence_device.h
+++ b/esphome/components/ble_presence/ble_presence_device.h
@@ -6,16 +6,6 @@
 
 #ifdef USE_ESP32
 
-#ifdef USE_ARDUINO
-#include "mbedtls/aes.h"
-#include "mbedtls/base64.h"
-#endif
-
-#ifdef USE_ESP_IDF
-#define MBEDTLS_AES_ALT
-#include <aes_alt.h>
-#endif
-
 namespace esphome {
 namespace ble_presence {
 
@@ -72,7 +62,7 @@ class BLEPresenceDevice : public binary_sensor::BinarySensorInitiallyOff,
         }
         break;
       case MATCH_BY_IRK:
-        if (resolve_irk_(device.address_uint64(), this->irk_)) {
+        if (device.resolve_irk(this->irk_)) {
           this->set_found_(true);
           return true;
         }
@@ -142,43 +132,6 @@ class BLEPresenceDevice : public binary_sensor::BinarySensorInitiallyOff,
   bool check_ibeacon_minor_{false};
   bool check_minimum_rssi_{false};
 
-  bool resolve_irk_(uint64_t addr64, const uint8_t *irk) {
-    uint8_t ecb_key[16];
-    uint8_t ecb_plaintext[16];
-    uint8_t ecb_ciphertext[16];
-
-    memcpy(&ecb_key, irk, 16);
-    memset(&ecb_plaintext, 0, 16);
-
-    ecb_plaintext[13] = (addr64 >> 40) & 0xff;
-    ecb_plaintext[14] = (addr64 >> 32) & 0xff;
-    ecb_plaintext[15] = (addr64 >> 24) & 0xff;
-
-    mbedtls_aes_context ctx = {0, 0, {0}};
-    mbedtls_aes_init(&ctx);
-
-    if (mbedtls_aes_setkey_enc(&ctx, ecb_key, 128) != 0) {
-      mbedtls_aes_free(&ctx);
-      return false;
-    }
-
-    if (mbedtls_aes_crypt_ecb(&ctx,
-#ifdef USE_ARDUINO
-                              MBEDTLS_AES_ENCRYPT,
-#elif defined(USE_ESP_IDF)
-                              ESP_AES_ENCRYPT,
-#endif
-                              ecb_plaintext, ecb_ciphertext) != 0) {
-      mbedtls_aes_free(&ctx);
-      return false;
-    }
-
-    mbedtls_aes_free(&ctx);
-
-    return ecb_ciphertext[15] == (addr64 & 0xff) && ecb_ciphertext[14] == ((addr64 >> 8) & 0xff) &&
-           ecb_ciphertext[13] == ((addr64 >> 16) & 0xff);
-  }
-
   bool found_{false};
   uint32_t last_seen_{};
   uint32_t timeout_{};
diff --git a/esphome/components/ble_rssi/ble_rssi_sensor.h b/esphome/components/ble_rssi/ble_rssi_sensor.h
index 79aebce7d3..89e4f33aca 100644
--- a/esphome/components/ble_rssi/ble_rssi_sensor.h
+++ b/esphome/components/ble_rssi/ble_rssi_sensor.h
@@ -15,6 +15,10 @@ class BLERSSISensor : public sensor::Sensor, public esp32_ble_tracker::ESPBTDevi
     this->match_by_ = MATCH_BY_MAC_ADDRESS;
     this->address_ = address;
   }
+  void set_irk(uint8_t *irk) {
+    this->match_by_ = MATCH_BY_IRK;
+    this->irk_ = irk;
+  }
   void set_service_uuid16(uint16_t uuid) {
     this->match_by_ = MATCH_BY_SERVICE_UUID;
     this->uuid_ = esp32_ble_tracker::ESPBTUUID::from_uint16(uuid);
@@ -53,6 +57,13 @@ class BLERSSISensor : public sensor::Sensor, public esp32_ble_tracker::ESPBTDevi
           return true;
         }
         break;
+      case MATCH_BY_IRK:
+        if (device.resolve_irk(this->irk_)) {
+          this->publish_state(device.get_rssi());
+          this->found_ = true;
+          return true;
+        }
+        break;
       case MATCH_BY_SERVICE_UUID:
         for (auto uuid : device.get_service_uuids()) {
           if (this->uuid_ == uuid) {
@@ -91,12 +102,13 @@ class BLERSSISensor : public sensor::Sensor, public esp32_ble_tracker::ESPBTDevi
   float get_setup_priority() const override { return setup_priority::DATA; }
 
  protected:
-  enum MatchType { MATCH_BY_MAC_ADDRESS, MATCH_BY_SERVICE_UUID, MATCH_BY_IBEACON_UUID };
+  enum MatchType { MATCH_BY_MAC_ADDRESS, MATCH_BY_IRK, MATCH_BY_SERVICE_UUID, MATCH_BY_IBEACON_UUID };
   MatchType match_by_;
 
   bool found_{false};
 
   uint64_t address_;
+  uint8_t *irk_;
 
   esp32_ble_tracker::ESPBTUUID uuid_;
 
diff --git a/esphome/components/ble_rssi/sensor.py b/esphome/components/ble_rssi/sensor.py
index 4246d311ab..0543eb0578 100644
--- a/esphome/components/ble_rssi/sensor.py
+++ b/esphome/components/ble_rssi/sensor.py
@@ -12,6 +12,8 @@ from esphome.const import (
     UNIT_DECIBEL_MILLIWATT,
 )
 
+CONF_IRK = "irk"
+
 DEPENDENCIES = ["esp32_ble_tracker"]
 
 ble_rssi_ns = cg.esphome_ns.namespace("ble_rssi")
@@ -39,6 +41,7 @@ CONFIG_SCHEMA = cv.All(
     .extend(
         {
             cv.Optional(CONF_MAC_ADDRESS): cv.mac_address,
+            cv.Optional(CONF_IRK): cv.uuid,
             cv.Optional(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
             cv.Optional(CONF_IBEACON_MAJOR): cv.uint16_t,
             cv.Optional(CONF_IBEACON_MINOR): cv.uint16_t,
@@ -47,7 +50,9 @@ CONFIG_SCHEMA = cv.All(
     )
     .extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
     .extend(cv.COMPONENT_SCHEMA),
-    cv.has_exactly_one_key(CONF_MAC_ADDRESS, CONF_SERVICE_UUID, CONF_IBEACON_UUID),
+    cv.has_exactly_one_key(
+        CONF_MAC_ADDRESS, CONF_IRK, CONF_SERVICE_UUID, CONF_IBEACON_UUID
+    ),
     _validate,
 )
 
@@ -60,6 +65,10 @@ async def to_code(config):
     if mac_address := config.get(CONF_MAC_ADDRESS):
         cg.add(var.set_address(mac_address.as_hex))
 
+    if irk := config.get(CONF_IRK):
+        irk = esp32_ble_tracker.as_hex_array(str(irk))
+        cg.add(var.set_irk(irk))
+
     if service_uuid := config.get(CONF_SERVICE_UUID):
         if len(service_uuid) == len(esp32_ble_tracker.bt_uuid16_format):
             cg.add(var.set_service_uuid16(esp32_ble_tracker.as_hex(service_uuid)))
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index a5209c764a..4ae7929ded 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -25,6 +25,9 @@
 #include <esp32-hal-bt.h>
 #endif
 
+#define MBEDTLS_AES_ALT
+#include <aes_alt.h>
+
 // bt_trace.h
 #undef TAG
 
@@ -692,6 +695,39 @@ void ESP32BLETracker::print_bt_device_info(const ESPBTDevice &device) {
   }
 }
 
+bool ESPBTDevice::resolve_irk(const uint8_t *irk) const {
+  uint8_t ecb_key[16];
+  uint8_t ecb_plaintext[16];
+  uint8_t ecb_ciphertext[16];
+
+  uint64_t addr64 = esp32_ble::ble_addr_to_uint64(this->address_);
+
+  memcpy(&ecb_key, irk, 16);
+  memset(&ecb_plaintext, 0, 16);
+
+  ecb_plaintext[13] = (addr64 >> 40) & 0xff;
+  ecb_plaintext[14] = (addr64 >> 32) & 0xff;
+  ecb_plaintext[15] = (addr64 >> 24) & 0xff;
+
+  mbedtls_aes_context ctx = {0, 0, {0}};
+  mbedtls_aes_init(&ctx);
+
+  if (mbedtls_aes_setkey_enc(&ctx, ecb_key, 128) != 0) {
+    mbedtls_aes_free(&ctx);
+    return false;
+  }
+
+  if (mbedtls_aes_crypt_ecb(&ctx, ESP_AES_ENCRYPT, ecb_plaintext, ecb_ciphertext) != 0) {
+    mbedtls_aes_free(&ctx);
+    return false;
+  }
+
+  mbedtls_aes_free(&ctx);
+
+  return ecb_ciphertext[15] == (addr64 & 0xff) && ecb_ciphertext[14] == ((addr64 >> 8) & 0xff) &&
+         ecb_ciphertext[13] == ((addr64 >> 16) & 0xff);
+}
+
 }  // namespace esp32_ble_tracker
 }  // namespace esphome
 
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
index 76dee875c5..3db7a54f6e 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -86,6 +86,8 @@ class ESPBTDevice {
 
   const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &get_scan_result() const { return scan_result_; }
 
+  bool resolve_irk(const uint8_t *irk) const;
+
   optional<ESPBLEiBeacon> get_ibeacon() const {
     for (auto &it : this->manufacturer_datas_) {
       auto res = ESPBLEiBeacon::from_manufacturer_data(it);
diff --git a/tests/components/ble_rssi/common.yaml b/tests/components/ble_rssi/common.yaml
index 52e5b865c6..43bed1d0e7 100644
--- a/tests/components/ble_rssi/common.yaml
+++ b/tests/components/ble_rssi/common.yaml
@@ -16,3 +16,6 @@ sensor:
   - platform: ble_rssi
     service_uuid: 11223344-5566-7788-99aa-bbccddeeff00
     name: BLE Test iBeacon UUID
+  - platform: ble_rssi
+    irk: 1234567890abcdef1234567890abcdef
+    name: "BLE Tracker with Identity Resolving Key"

From afe81184a8ab3a742d52cd25e09c393313277ae7 Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Thu, 9 May 2024 13:08:30 +1000
Subject: [PATCH 14/31] [core] Ensure that a generated ID name is distinct from
 its type. (#6706)

---
 esphome/core/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/esphome/core/__init__.py b/esphome/core/__init__.py
index 58ae23e139..f25891965a 100644
--- a/esphome/core/__init__.py
+++ b/esphome/core/__init__.py
@@ -340,6 +340,8 @@ class ID:
 
         if self.id is None:
             base = str(self.type).replace("::", "_").lower()
+            if base == self.type:
+                base = base + "_id"
             name = "".join(c for c in base if c.isalnum() or c == "_")
             used = set(registered_ids) | set(RESERVED_IDS) | CORE.loaded_integrations
             self.id = ensure_unique_string(name, used)

From 5956bebcb782a7c4adc45cc6f4049effb82137ac Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Thu, 9 May 2024 13:14:31 +1000
Subject: [PATCH 15/31] [color] Fix crash when hex color parses as int, improve
 error reporting. (#6707)

---
 esphome/components/color/__init__.py | 40 +++++++++++++++++++++-------
 tests/components/color/common.yaml   |  9 +++++++
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/esphome/components/color/__init__.py b/esphome/components/color/__init__.py
index 4a55beef38..609d416a0b 100644
--- a/esphome/components/color/__init__.py
+++ b/esphome/components/color/__init__.py
@@ -14,15 +14,41 @@ CONF_HEX = "hex"
 
 
 def hex_color(value):
+    if isinstance(value, int):
+        value = str(value)
+    if not isinstance(value, str):
+        raise cv.Invalid("Invalid value for hex color")
     if len(value) != 6:
-        raise cv.Invalid("Color must have six digits")
+        raise cv.Invalid("Hex color must have six digits")
     try:
-        return (int(value[0:2], 16), int(value[2:4], 16), int(value[4:6], 16))
+        return int(value[0:2], 16), int(value[2:4], 16), int(value[4:6], 16)
     except ValueError as exc:
         raise cv.Invalid("Color must be hexadecimal") from exc
 
 
-CONFIG_SCHEMA = cv.Any(
+components = {
+    CONF_RED,
+    CONF_RED_INT,
+    CONF_GREEN,
+    CONF_GREEN_INT,
+    CONF_BLUE,
+    CONF_BLUE_INT,
+    CONF_WHITE,
+    CONF_WHITE_INT,
+}
+
+
+def validate_color(config):
+    has_components = set(config) & components
+    has_hex = CONF_HEX in config
+    if has_hex and has_components:
+        raise cv.Invalid("Hex color value may not be combined with component values")
+    if not has_hex and not has_components:
+        raise cv.Invalid("Must provide at least one color option")
+    return config
+
+
+CONFIG_SCHEMA = cv.All(
     cv.Schema(
         {
             cv.Required(CONF_ID): cv.declare_id(ColorStruct),
@@ -34,14 +60,10 @@ CONFIG_SCHEMA = cv.Any(
             cv.Exclusive(CONF_BLUE_INT, "blue"): cv.uint8_t,
             cv.Exclusive(CONF_WHITE, "white"): cv.percentage,
             cv.Exclusive(CONF_WHITE_INT, "white"): cv.uint8_t,
+            cv.Optional(CONF_HEX): hex_color,
         }
     ).extend(cv.COMPONENT_SCHEMA),
-    cv.Schema(
-        {
-            cv.Required(CONF_ID): cv.declare_id(ColorStruct),
-            cv.Required(CONF_HEX): hex_color,
-        }
-    ).extend(cv.COMPONENT_SCHEMA),
+    validate_color,
 )
 
 
diff --git a/tests/components/color/common.yaml b/tests/components/color/common.yaml
index 7aa308bb63..88524e6a5f 100644
--- a/tests/components/color/common.yaml
+++ b/tests/components/color/common.yaml
@@ -9,3 +9,12 @@ color:
     blue: 100%
   - id: kbx_green
     hex: "3DEC55"
+  - id: kbx_green_1
+    hex: 3DEC55
+  - id: cps_red
+    hex: 800000
+  - id: cps_green
+    hex: 008000
+  - id: cps_blue
+    hex: 000080
+

From 78d1a50853b6d0cc62927e604f883f9a8fb7574f Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 9 May 2024 21:25:48 +1200
Subject: [PATCH 16/31] [github] Fix digest artifact name (#6710)

---
 .github/workflows/release.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5002f041e1..03ed523e1d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -132,10 +132,16 @@ jobs:
           suffix: lint
           version: ${{ needs.init.outputs.tag }}
 
+      - name: Sanitize platform name
+        id: sanitize
+        run: |
+          echo "${{ matrix.platform }}" | sed 's|/|-|g' > /tmp/platform
+          echo name=$(cat /tmp/platform) >> $GITHUB_OUTPUT
+
       - name: Upload digests
         uses: actions/upload-artifact@v4.3.3
         with:
-          name: digests-${{ matrix.platform }}
+          name: digests-${{ steps.sanitize.outputs.name }}
           path: /tmp/digests
           retention-days: 1
 

From 26048d18ef3a674847d9b14b6f396b57949b7279 Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Thu, 9 May 2024 13:08:30 +1000
Subject: [PATCH 17/31] [core] Ensure that a generated ID name is distinct from
 its type. (#6706)

---
 esphome/core/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/esphome/core/__init__.py b/esphome/core/__init__.py
index 58ae23e139..f25891965a 100644
--- a/esphome/core/__init__.py
+++ b/esphome/core/__init__.py
@@ -340,6 +340,8 @@ class ID:
 
         if self.id is None:
             base = str(self.type).replace("::", "_").lower()
+            if base == self.type:
+                base = base + "_id"
             name = "".join(c for c in base if c.isalnum() or c == "_")
             used = set(registered_ids) | set(RESERVED_IDS) | CORE.loaded_integrations
             self.id = ensure_unique_string(name, used)

From 819bb9f8bc82603e370a3e94bfdb47fbb1bdb9f2 Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Thu, 9 May 2024 13:14:31 +1000
Subject: [PATCH 18/31] [color] Fix crash when hex color parses as int, improve
 error reporting. (#6707)

---
 esphome/components/color/__init__.py | 40 +++++++++++++++++++++-------
 tests/components/color/common.yaml   |  9 +++++++
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/esphome/components/color/__init__.py b/esphome/components/color/__init__.py
index 4a55beef38..609d416a0b 100644
--- a/esphome/components/color/__init__.py
+++ b/esphome/components/color/__init__.py
@@ -14,15 +14,41 @@ CONF_HEX = "hex"
 
 
 def hex_color(value):
+    if isinstance(value, int):
+        value = str(value)
+    if not isinstance(value, str):
+        raise cv.Invalid("Invalid value for hex color")
     if len(value) != 6:
-        raise cv.Invalid("Color must have six digits")
+        raise cv.Invalid("Hex color must have six digits")
     try:
-        return (int(value[0:2], 16), int(value[2:4], 16), int(value[4:6], 16))
+        return int(value[0:2], 16), int(value[2:4], 16), int(value[4:6], 16)
     except ValueError as exc:
         raise cv.Invalid("Color must be hexadecimal") from exc
 
 
-CONFIG_SCHEMA = cv.Any(
+components = {
+    CONF_RED,
+    CONF_RED_INT,
+    CONF_GREEN,
+    CONF_GREEN_INT,
+    CONF_BLUE,
+    CONF_BLUE_INT,
+    CONF_WHITE,
+    CONF_WHITE_INT,
+}
+
+
+def validate_color(config):
+    has_components = set(config) & components
+    has_hex = CONF_HEX in config
+    if has_hex and has_components:
+        raise cv.Invalid("Hex color value may not be combined with component values")
+    if not has_hex and not has_components:
+        raise cv.Invalid("Must provide at least one color option")
+    return config
+
+
+CONFIG_SCHEMA = cv.All(
     cv.Schema(
         {
             cv.Required(CONF_ID): cv.declare_id(ColorStruct),
@@ -34,14 +60,10 @@ CONFIG_SCHEMA = cv.Any(
             cv.Exclusive(CONF_BLUE_INT, "blue"): cv.uint8_t,
             cv.Exclusive(CONF_WHITE, "white"): cv.percentage,
             cv.Exclusive(CONF_WHITE_INT, "white"): cv.uint8_t,
+            cv.Optional(CONF_HEX): hex_color,
         }
     ).extend(cv.COMPONENT_SCHEMA),
-    cv.Schema(
-        {
-            cv.Required(CONF_ID): cv.declare_id(ColorStruct),
-            cv.Required(CONF_HEX): hex_color,
-        }
-    ).extend(cv.COMPONENT_SCHEMA),
+    validate_color,
 )
 
 
diff --git a/tests/components/color/common.yaml b/tests/components/color/common.yaml
index 7aa308bb63..88524e6a5f 100644
--- a/tests/components/color/common.yaml
+++ b/tests/components/color/common.yaml
@@ -9,3 +9,12 @@ color:
     blue: 100%
   - id: kbx_green
     hex: "3DEC55"
+  - id: kbx_green_1
+    hex: 3DEC55
+  - id: cps_red
+    hex: 800000
+  - id: cps_green
+    hex: 008000
+  - id: cps_blue
+    hex: 000080
+

From bd776baf8dfddac65590162f10375604a60e3a07 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 9 May 2024 21:25:48 +1200
Subject: [PATCH 19/31] [github] Fix digest artifact name (#6710)

---
 .github/workflows/release.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5002f041e1..03ed523e1d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -132,10 +132,16 @@ jobs:
           suffix: lint
           version: ${{ needs.init.outputs.tag }}
 
+      - name: Sanitize platform name
+        id: sanitize
+        run: |
+          echo "${{ matrix.platform }}" | sed 's|/|-|g' > /tmp/platform
+          echo name=$(cat /tmp/platform) >> $GITHUB_OUTPUT
+
       - name: Upload digests
         uses: actions/upload-artifact@v4.3.3
         with:
-          name: digests-${{ matrix.platform }}
+          name: digests-${{ steps.sanitize.outputs.name }}
           path: /tmp/digests
           retention-days: 1
 

From 8ae8cd1168bcdac80bb4de76255c6b2894179e07 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 9 May 2024 21:55:34 +1200
Subject: [PATCH 20/31] Bump version to 2024.5.0b3

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

diff --git a/esphome/const.py b/esphome/const.py
index 46fc5fc20b..6e00c1bbe1 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2024.5.0b2"
+__version__ = "2024.5.0b3"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 VALID_SUBSTITUTIONS_CHARACTERS = (

From 8280772b9151e71ef544ee8e849285536ee2bcdb Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 10 May 2024 10:57:47 +1200
Subject: [PATCH 21/31] Add new Error type to skip prepending path (#6716)

---
 esphome/config.py            | 2 ++
 esphome/config_validation.py | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/esphome/config.py b/esphome/config.py
index 36a81f677b..4f340225fe 100644
--- a/esphome/config.py
+++ b/esphome/config.py
@@ -148,6 +148,8 @@ class Config(OrderedDict, fv.FinalValidateConfig):
         path = path or []
         try:
             yield
+        except cv.FinalExternalInvalid as e:
+            self.add_error(e)
         except vol.Invalid as e:
             e.prepend(path)
             self.add_error(e)
diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index 512f1d8f67..5fc72921e1 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -267,6 +267,10 @@ class Required(vol.Required):
         super().__init__(key, msg=msg)
 
 
+class FinalExternalInvalid(Invalid):
+    """Represents an invalid value in the final validation phase where the path should not be prepended."""
+
+
 def check_not_templatable(value):
     if isinstance(value, Lambda):
         raise Invalid("This option is not templatable!")

From ca5050d4a51a6e8dc136a7051d08d4ae3494b038 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 10 May 2024 11:04:32 +1200
Subject: [PATCH 22/31] [github] Only save platformio cache for dev branch
 (#6711)

---
 .github/workflows/ci.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fbebc55676..ba0a8a363c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -364,12 +364,20 @@ jobs:
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           cache-key: ${{ needs.common.outputs.cache-key }}
+
       - name: Cache platformio
+        if: github.ref == 'refs/heads/dev'
         uses: actions/cache@v4.0.2
         with:
           path: ~/.platformio
-          # yamllint disable-line rule:line-length
-          key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}
+          key: platformio-${{ matrix.pio_cache_key }}
+
+      - name: Cache platformio
+        if: github.ref != 'refs/heads/dev'
+        uses: actions/cache/restore@v4.0.2
+        with:
+          path: ~/.platformio
+          key: platformio-${{ matrix.pio_cache_key }}
 
       - name: Install clang-tidy
         run: sudo apt-get install clang-tidy-14

From 47a1710b1ed9da2304d0f17454f0b578d8d1554c Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 10 May 2024 11:55:35 +1200
Subject: [PATCH 23/31] Only cache docker images on dev branch (#6714)

---
 .github/actions/build-image/action.yaml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/actions/build-image/action.yaml b/.github/actions/build-image/action.yaml
index 87ea28fd20..d36bd65bb6 100644
--- a/.github/actions/build-image/action.yaml
+++ b/.github/actions/build-image/action.yaml
@@ -34,6 +34,16 @@ runs:
           echo $l >> $GITHUB_OUTPUT
         done
 
+    # set cache-to only if dev branch
+    - id: cache-to
+      shell: bash
+      run: |-
+        if [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then
+          echo "value=type=gha,mode=max" >> $GITHUB_OUTPUT
+        else
+          echo "value=" >> $GITHUB_OUTPUT
+        fi
+
     - name: Build and push to ghcr by digest
       id: build-ghcr
       uses: docker/build-push-action@v5.3.0
@@ -43,7 +53,7 @@ runs:
         platforms: ${{ inputs.platform }}
         target: ${{ inputs.target }}
         cache-from: type=gha
-        cache-to: type=gha,mode=max
+        cache-to: ${{ steps.cache-to.outputs.value }}
         build-args: |
           BASEIMGTYPE=${{ inputs.baseimg }}
           BUILD_VERSION=${{ inputs.version }}
@@ -66,7 +76,7 @@ runs:
         platforms: ${{ inputs.platform }}
         target: ${{ inputs.target }}
         cache-from: type=gha
-        cache-to: type=gha,mode=max
+        cache-to: ${{ steps.cache-to.outputs.value }}
         build-args: |
           BASEIMGTYPE=${{ inputs.baseimg }}
           BUILD_VERSION=${{ inputs.version }}

From 1a458589041e2df1ba1b8a8ed9e128627b4ea036 Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Mon, 13 May 2024 07:56:55 +1000
Subject: [PATCH 24/31] Add pylint to git pre-commit hooks (#6726)

---
 .pre-commit-config.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6f4bb52104..ce226846e3 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -40,3 +40,10 @@ repos:
     hooks:
       - id: clang-format
         types_or: [c, c++]
+  - repo: local
+    hooks:
+      - id: pylint
+        name: pylint
+        entry: pylint
+        language: system
+        types: [python]

From 61b65e2726485ea4d12fc5f47de1e614236fa182 Mon Sep 17 00:00:00 2001
From: Marcin Krasowski <marcin.krasowski@hotmail.fr>
Date: Mon, 13 May 2024 01:25:41 +0200
Subject: [PATCH 25/31] fix(ltr390): stuck ALS values when configured for
 ALS+UV readings (#6723)

---
 esphome/components/ltr390/ltr390.cpp | 31 ++++++++++++++++++----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/esphome/components/ltr390/ltr390.cpp b/esphome/components/ltr390/ltr390.cpp
index 65c08ab614..4eb1ff2c46 100644
--- a/esphome/components/ltr390/ltr390.cpp
+++ b/esphome/components/ltr390/ltr390.cpp
@@ -8,6 +8,9 @@ namespace ltr390 {
 
 static const char *const TAG = "ltr390";
 
+static const uint8_t LTR390_WAKEUP_TIME = 10;
+static const uint8_t LTR390_SETTLE_TIME = 5;
+
 static const uint8_t LTR390_MAIN_CTRL = 0x00;
 static const uint8_t LTR390_MEAS_RATE = 0x04;
 static const uint8_t LTR390_GAIN = 0x05;
@@ -101,21 +104,27 @@ void LTR390Component::read_mode_(int mode_index) {
 
   std::bitset<8> ctrl = this->reg(LTR390_MAIN_CTRL).get();
   ctrl[LTR390_CTRL_MODE] = mode;
+  ctrl[LTR390_CTRL_EN] = true;
   this->reg(LTR390_MAIN_CTRL) = ctrl.to_ulong();
 
   // After the sensor integration time do the following
-  this->set_timeout(((uint32_t) RESOLUTIONVALUE[this->res_]) * 100, [this, mode_index]() {
-    // Read from the sensor
-    std::get<1>(this->mode_funcs_[mode_index])();
+  this->set_timeout(((uint32_t) RESOLUTIONVALUE[this->res_]) * 100 + LTR390_WAKEUP_TIME + LTR390_SETTLE_TIME,
+                    [this, mode_index]() {
+                      // Read from the sensor
+                      std::get<1>(this->mode_funcs_[mode_index])();
 
-    // If there are more modes to read then begin the next
-    // otherwise stop
-    if (mode_index + 1 < (int) this->mode_funcs_.size()) {
-      this->read_mode_(mode_index + 1);
-    } else {
-      this->reading_ = false;
-    }
-  });
+                      // If there are more modes to read then begin the next
+                      // otherwise stop
+                      if (mode_index + 1 < (int) this->mode_funcs_.size()) {
+                        this->read_mode_(mode_index + 1);
+                      } else {
+                        // put sensor in standby
+                        std::bitset<8> ctrl = this->reg(LTR390_MAIN_CTRL).get();
+                        ctrl[LTR390_CTRL_EN] = false;
+                        this->reg(LTR390_MAIN_CTRL) = ctrl.to_ulong();
+                        this->reading_ = false;
+                      }
+                    });
 }
 
 void LTR390Component::setup() {

From 67ca60e2afa118818a97c12246a1b751b16a2cf4 Mon Sep 17 00:00:00 2001
From: tomaszduda23 <tomaszduda23@gmail.com>
Date: Mon, 13 May 2024 01:54:43 +0200
Subject: [PATCH 26/31] separate debug component for each platform in different
 file (#6715)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/debug/debug_component.cpp | 374 +------------------
 esphome/components/debug/debug_component.h   |   5 +
 esphome/components/debug/debug_esp32.cpp     | 287 ++++++++++++++
 esphome/components/debug/debug_esp8266.cpp   |  94 +++++
 esphome/components/debug/debug_host.cpp      |  18 +
 esphome/components/debug/debug_libretiny.cpp |  44 +++
 esphome/components/debug/debug_rp2040.cpp    |  23 ++
 7 files changed, 479 insertions(+), 366 deletions(-)
 create mode 100644 esphome/components/debug/debug_esp32.cpp
 create mode 100644 esphome/components/debug/debug_esp8266.cpp
 create mode 100644 esphome/components/debug/debug_host.cpp
 create mode 100644 esphome/components/debug/debug_libretiny.cpp
 create mode 100644 esphome/components/debug/debug_rp2040.cpp

diff --git a/esphome/components/debug/debug_component.cpp b/esphome/components/debug/debug_component.cpp
index f22a8a2e5d..cbd4249d92 100644
--- a/esphome/components/debug/debug_component.cpp
+++ b/esphome/components/debug/debug_component.cpp
@@ -8,62 +8,16 @@
 #include <cinttypes>
 #include <climits>
 
-#ifdef USE_ESP32
-
-#include <esp_heap_caps.h>
-#include <esp_system.h>
-
-#include <esp_chip_info.h>
-#if defined(USE_ESP32_VARIANT_ESP32)
-#include <esp32/rom/rtc.h>
-#elif defined(USE_ESP32_VARIANT_ESP32C3)
-#include <esp32c3/rom/rtc.h>
-#elif defined(USE_ESP32_VARIANT_ESP32C6)
-#include <esp32c6/rom/rtc.h>
-#elif defined(USE_ESP32_VARIANT_ESP32S2)
-#include <esp32s2/rom/rtc.h>
-#elif defined(USE_ESP32_VARIANT_ESP32S3)
-#include <esp32s3/rom/rtc.h>
-#endif
-
-#endif  // USE_ESP32
-
-#ifdef USE_ARDUINO
-#ifdef USE_RP2040
-#include <Arduino.h>
-#elif defined(USE_ESP32) || defined(USE_ESP8266)
-#include <Esp.h>
-#endif
-#endif
-
 namespace esphome {
 namespace debug {
 
 static const char *const TAG = "debug";
 
-static uint32_t get_free_heap() {
-#if defined(USE_ESP8266)
-  return ESP.getFreeHeap();  // NOLINT(readability-static-accessed-through-instance)
-#elif defined(USE_ESP32)
-  return heap_caps_get_free_size(MALLOC_CAP_INTERNAL);
-#elif defined(USE_RP2040)
-  return rp2040.getFreeHeap();
-#elif defined(USE_LIBRETINY)
-  return lt_heap_get_free();
-#elif defined(USE_HOST)
-  return INT_MAX;
-#endif
-}
-
 void DebugComponent::dump_config() {
 #ifndef ESPHOME_LOG_HAS_DEBUG
   return;  // Can't log below if debug logging is disabled
 #endif
 
-  std::string device_info;
-  std::string reset_reason;
-  device_info.reserve(256);
-
   ESP_LOGCONFIG(TAG, "Debug component:");
 #ifdef USE_TEXT_SENSOR
   LOG_TEXT_SENSOR("  ", "Device info", this->device_info_);
@@ -76,305 +30,15 @@ void DebugComponent::dump_config() {
 #endif  // defined(USE_ESP8266) && USE_ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
 #endif  // USE_SENSOR
 
+  std::string device_info;
+  device_info.reserve(256);
   ESP_LOGD(TAG, "ESPHome version %s", ESPHOME_VERSION);
   device_info += ESPHOME_VERSION;
 
-  this->free_heap_ = get_free_heap();
+  this->free_heap_ = get_free_heap_();
   ESP_LOGD(TAG, "Free Heap Size: %" PRIu32 " bytes", this->free_heap_);
 
-#if defined(USE_ARDUINO) && (defined(USE_ESP32) || defined(USE_ESP8266))
-  const char *flash_mode;
-  switch (ESP.getFlashChipMode()) {  // NOLINT(readability-static-accessed-through-instance)
-    case FM_QIO:
-      flash_mode = "QIO";
-      break;
-    case FM_QOUT:
-      flash_mode = "QOUT";
-      break;
-    case FM_DIO:
-      flash_mode = "DIO";
-      break;
-    case FM_DOUT:
-      flash_mode = "DOUT";
-      break;
-#ifdef USE_ESP32
-    case FM_FAST_READ:
-      flash_mode = "FAST_READ";
-      break;
-    case FM_SLOW_READ:
-      flash_mode = "SLOW_READ";
-      break;
-#endif
-    default:
-      flash_mode = "UNKNOWN";
-  }
-  ESP_LOGD(TAG, "Flash Chip: Size=%ukB Speed=%uMHz Mode=%s",
-           ESP.getFlashChipSize() / 1024,                                                   // NOLINT
-           ESP.getFlashChipSpeed() / 1000000, flash_mode);                                  // NOLINT
-  device_info += "|Flash: " + to_string(ESP.getFlashChipSize() / 1024) +                    // NOLINT
-                 "kB Speed:" + to_string(ESP.getFlashChipSpeed() / 1000000) + "MHz Mode:";  // NOLINT
-  device_info += flash_mode;
-#endif  // USE_ARDUINO && (USE_ESP32 || USE_ESP8266)
-
-#ifdef USE_ESP32
-  esp_chip_info_t info;
-  esp_chip_info(&info);
-  const char *model;
-#if defined(USE_ESP32_VARIANT_ESP32)
-  model = "ESP32";
-#elif defined(USE_ESP32_VARIANT_ESP32C3)
-  model = "ESP32-C3";
-#elif defined(USE_ESP32_VARIANT_ESP32C6)
-  model = "ESP32-C6";
-#elif defined(USE_ESP32_VARIANT_ESP32S2)
-  model = "ESP32-S2";
-#elif defined(USE_ESP32_VARIANT_ESP32S3)
-  model = "ESP32-S3";
-#elif defined(USE_ESP32_VARIANT_ESP32H2)
-  model = "ESP32-H2";
-#else
-  model = "UNKNOWN";
-#endif
-  std::string features;
-  if (info.features & CHIP_FEATURE_EMB_FLASH) {
-    features += "EMB_FLASH,";
-    info.features &= ~CHIP_FEATURE_EMB_FLASH;
-  }
-  if (info.features & CHIP_FEATURE_WIFI_BGN) {
-    features += "WIFI_BGN,";
-    info.features &= ~CHIP_FEATURE_WIFI_BGN;
-  }
-  if (info.features & CHIP_FEATURE_BLE) {
-    features += "BLE,";
-    info.features &= ~CHIP_FEATURE_BLE;
-  }
-  if (info.features & CHIP_FEATURE_BT) {
-    features += "BT,";
-    info.features &= ~CHIP_FEATURE_BT;
-  }
-  if (info.features & CHIP_FEATURE_EMB_PSRAM) {
-    features += "EMB_PSRAM,";
-    info.features &= ~CHIP_FEATURE_EMB_PSRAM;
-  }
-  if (info.features)
-    features += "Other:" + format_hex(info.features);
-  ESP_LOGD(TAG, "Chip: Model=%s, Features=%s Cores=%u, Revision=%u", model, features.c_str(), info.cores,
-           info.revision);
-  device_info += "|Chip: ";
-  device_info += model;
-  device_info += " Features:";
-  device_info += features;
-  device_info += " Cores:" + to_string(info.cores);
-  device_info += " Revision:" + to_string(info.revision);
-
-  ESP_LOGD(TAG, "ESP-IDF Version: %s", esp_get_idf_version());
-  device_info += "|ESP-IDF: ";
-  device_info += esp_get_idf_version();
-
-  std::string mac = get_mac_address_pretty();
-  ESP_LOGD(TAG, "EFuse MAC: %s", mac.c_str());
-  device_info += "|EFuse MAC: ";
-  device_info += mac;
-
-  switch (rtc_get_reset_reason(0)) {
-    case POWERON_RESET:
-      reset_reason = "Power On Reset";
-      break;
-#if defined(USE_ESP32_VARIANT_ESP32)
-    case SW_RESET:
-#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
-    case RTC_SW_SYS_RESET:
-#endif
-      reset_reason = "Software Reset Digital Core";
-      break;
-#if defined(USE_ESP32_VARIANT_ESP32)
-    case OWDT_RESET:
-      reset_reason = "Watch Dog Reset Digital Core";
-      break;
-#endif
-    case DEEPSLEEP_RESET:
-      reset_reason = "Deep Sleep Reset Digital Core";
-      break;
-#if defined(USE_ESP32_VARIANT_ESP32)
-    case SDIO_RESET:
-      reset_reason = "SLC Module Reset Digital Core";
-      break;
-#endif
-    case TG0WDT_SYS_RESET:
-      reset_reason = "Timer Group 0 Watch Dog Reset Digital Core";
-      break;
-    case TG1WDT_SYS_RESET:
-      reset_reason = "Timer Group 1 Watch Dog Reset Digital Core";
-      break;
-    case RTCWDT_SYS_RESET:
-      reset_reason = "RTC Watch Dog Reset Digital Core";
-      break;
-#if !defined(USE_ESP32_VARIANT_ESP32C6)
-    case INTRUSION_RESET:
-      reset_reason = "Intrusion Reset CPU";
-      break;
-#endif
-#if defined(USE_ESP32_VARIANT_ESP32)
-    case TGWDT_CPU_RESET:
-      reset_reason = "Timer Group Reset CPU";
-      break;
-#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
-    case TG0WDT_CPU_RESET:
-      reset_reason = "Timer Group 0 Reset CPU";
-      break;
-#endif
-#if defined(USE_ESP32_VARIANT_ESP32)
-    case SW_CPU_RESET:
-#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
-    case RTC_SW_CPU_RESET:
-#endif
-      reset_reason = "Software Reset CPU";
-      break;
-    case RTCWDT_CPU_RESET:
-      reset_reason = "RTC Watch Dog Reset CPU";
-      break;
-#if defined(USE_ESP32_VARIANT_ESP32)
-    case EXT_CPU_RESET:
-      reset_reason = "External CPU Reset";
-      break;
-#endif
-    case RTCWDT_BROWN_OUT_RESET:
-      reset_reason = "Voltage Unstable Reset";
-      break;
-    case RTCWDT_RTC_RESET:
-      reset_reason = "RTC Watch Dog Reset Digital Core And RTC Module";
-      break;
-#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
-    case TG1WDT_CPU_RESET:
-      reset_reason = "Timer Group 1 Reset CPU";
-      break;
-    case SUPER_WDT_RESET:
-      reset_reason = "Super Watchdog Reset Digital Core And RTC Module";
-      break;
-    case GLITCH_RTC_RESET:
-      reset_reason = "Glitch Reset Digital Core And RTC Module";
-      break;
-    case EFUSE_RESET:
-      reset_reason = "eFuse Reset Digital Core";
-      break;
-#endif
-#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S3)
-    case USB_UART_CHIP_RESET:
-      reset_reason = "USB UART Reset Digital Core";
-      break;
-    case USB_JTAG_CHIP_RESET:
-      reset_reason = "USB JTAG Reset Digital Core";
-      break;
-    case POWER_GLITCH_RESET:
-      reset_reason = "Power Glitch Reset Digital Core And RTC Module";
-      break;
-#endif
-    default:
-      reset_reason = "Unknown Reset Reason";
-  }
-  ESP_LOGD(TAG, "Reset Reason: %s", reset_reason.c_str());
-  device_info += "|Reset: ";
-  device_info += reset_reason;
-
-  const char *wakeup_reason;
-  switch (rtc_get_wakeup_cause()) {
-    case NO_SLEEP:
-      wakeup_reason = "No Sleep";
-      break;
-    case EXT_EVENT0_TRIG:
-      wakeup_reason = "External Event 0";
-      break;
-    case EXT_EVENT1_TRIG:
-      wakeup_reason = "External Event 1";
-      break;
-    case GPIO_TRIG:
-      wakeup_reason = "GPIO";
-      break;
-    case TIMER_EXPIRE:
-      wakeup_reason = "Wakeup Timer";
-      break;
-    case SDIO_TRIG:
-      wakeup_reason = "SDIO";
-      break;
-    case MAC_TRIG:
-      wakeup_reason = "MAC";
-      break;
-    case UART0_TRIG:
-      wakeup_reason = "UART0";
-      break;
-    case UART1_TRIG:
-      wakeup_reason = "UART1";
-      break;
-    case TOUCH_TRIG:
-      wakeup_reason = "Touch";
-      break;
-    case SAR_TRIG:
-      wakeup_reason = "SAR";
-      break;
-    case BT_TRIG:
-      wakeup_reason = "BT";
-      break;
-    default:
-      wakeup_reason = "Unknown";
-  }
-  ESP_LOGD(TAG, "Wakeup Reason: %s", wakeup_reason);
-  device_info += "|Wakeup: ";
-  device_info += wakeup_reason;
-#endif
-
-#if defined(USE_ESP8266) && !defined(CLANG_TIDY)
-  ESP_LOGD(TAG, "Chip ID: 0x%08X", ESP.getChipId());
-  ESP_LOGD(TAG, "SDK Version: %s", ESP.getSdkVersion());
-  ESP_LOGD(TAG, "Core Version: %s", ESP.getCoreVersion().c_str());
-  ESP_LOGD(TAG, "Boot Version=%u Mode=%u", ESP.getBootVersion(), ESP.getBootMode());
-  ESP_LOGD(TAG, "CPU Frequency: %u", ESP.getCpuFreqMHz());
-  ESP_LOGD(TAG, "Flash Chip ID=0x%08X", ESP.getFlashChipId());
-  ESP_LOGD(TAG, "Reset Reason: %s", ESP.getResetReason().c_str());
-  ESP_LOGD(TAG, "Reset Info: %s", ESP.getResetInfo().c_str());
-
-  device_info += "|Chip: 0x" + format_hex(ESP.getChipId());
-  device_info += "|SDK: ";
-  device_info += ESP.getSdkVersion();
-  device_info += "|Core: ";
-  device_info += ESP.getCoreVersion().c_str();
-  device_info += "|Boot: ";
-  device_info += to_string(ESP.getBootVersion());
-  device_info += "|Mode: " + to_string(ESP.getBootMode());
-  device_info += "|CPU: " + to_string(ESP.getCpuFreqMHz());
-  device_info += "|Flash: 0x" + format_hex(ESP.getFlashChipId());
-  device_info += "|Reset: ";
-  device_info += ESP.getResetReason().c_str();
-  device_info += "|";
-  device_info += ESP.getResetInfo().c_str();
-
-  reset_reason = ESP.getResetReason().c_str();
-#endif
-
-#ifdef USE_RP2040
-  ESP_LOGD(TAG, "CPU Frequency: %u", rp2040.f_cpu());
-  device_info += "CPU Frequency: " + to_string(rp2040.f_cpu());
-#endif  // USE_RP2040
-
-#ifdef USE_LIBRETINY
-  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());
-  ESP_LOGD(TAG, "Board: %s", lt_get_board_code());
-  ESP_LOGD(TAG, "Flash: %u KiB / RAM: %u KiB", lt_flash_get_size() / 1024, lt_ram_get_size() / 1024);
-  ESP_LOGD(TAG, "Reset Reason: %s", lt_get_reboot_reason_name(lt_get_reboot_reason()));
-
-  device_info += "|Version: ";
-  device_info += LT_BANNER_STR + 10;
-  device_info += "|Reset Reason: ";
-  device_info += lt_get_reboot_reason_name(lt_get_reboot_reason());
-  device_info += "|Chip Name: ";
-  device_info += lt_cpu_get_model_name();
-  device_info += "|Chip ID: 0x" + format_hex(lt_cpu_get_mac_id());
-  device_info += "|Flash: " + to_string(lt_flash_get_size() / 1024) + " KiB";
-  device_info += "|RAM: " + to_string(lt_ram_get_size() / 1024) + " KiB";
-
-  reset_reason = lt_get_reboot_reason_name(lt_get_reboot_reason());
-#endif  // USE_LIBRETINY
+  get_device_info_(device_info);
 
 #ifdef USE_TEXT_SENSOR
   if (this->device_info_ != nullptr) {
@@ -383,14 +47,14 @@ void DebugComponent::dump_config() {
     this->device_info_->publish_state(device_info);
   }
   if (this->reset_reason_ != nullptr) {
-    this->reset_reason_->publish_state(reset_reason);
+    this->reset_reason_->publish_state(get_reset_reason_());
   }
 #endif  // USE_TEXT_SENSOR
 }
 
 void DebugComponent::loop() {
   // log when free heap space has halved
-  uint32_t new_free_heap = get_free_heap();
+  uint32_t new_free_heap = get_free_heap_();
   if (new_free_heap < this->free_heap_ / 2) {
     this->free_heap_ = new_free_heap;
     ESP_LOGD(TAG, "Free Heap Size: %" PRIu32 " bytes", this->free_heap_);
@@ -411,38 +75,16 @@ void DebugComponent::loop() {
 void DebugComponent::update() {
 #ifdef USE_SENSOR
   if (this->free_sensor_ != nullptr) {
-    this->free_sensor_->publish_state(get_free_heap());
+    this->free_sensor_->publish_state(get_free_heap_());
   }
 
-  if (this->block_sensor_ != nullptr) {
-#if defined(USE_ESP8266)
-    // NOLINTNEXTLINE(readability-static-accessed-through-instance)
-    this->block_sensor_->publish_state(ESP.getMaxFreeBlockSize());
-#elif defined(USE_ESP32)
-    this->block_sensor_->publish_state(heap_caps_get_largest_free_block(MALLOC_CAP_INTERNAL));
-#elif defined(USE_LIBRETINY)
-    this->block_sensor_->publish_state(lt_heap_get_max_alloc());
-#endif
-  }
-
-#if defined(USE_ESP8266) && USE_ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
-  if (this->fragmentation_sensor_ != nullptr) {
-    // NOLINTNEXTLINE(readability-static-accessed-through-instance)
-    this->fragmentation_sensor_->publish_state(ESP.getHeapFragmentation());
-  }
-#endif
-
   if (this->loop_time_sensor_ != nullptr) {
     this->loop_time_sensor_->publish_state(this->max_loop_time_);
     this->max_loop_time_ = 0;
   }
 
-#ifdef USE_ESP32
-  if (this->psram_sensor_ != nullptr) {
-    this->psram_sensor_->publish_state(heap_caps_get_free_size(MALLOC_CAP_SPIRAM));
-  }
-#endif  // USE_ESP32
 #endif  // USE_SENSOR
+  update_platform_();
 }
 
 float DebugComponent::get_setup_priority() const { return setup_priority::LATE; }
diff --git a/esphome/components/debug/debug_component.h b/esphome/components/debug/debug_component.h
index 93e3ba4857..2b54406603 100644
--- a/esphome/components/debug/debug_component.h
+++ b/esphome/components/debug/debug_component.h
@@ -59,6 +59,11 @@ class DebugComponent : public PollingComponent {
   text_sensor::TextSensor *device_info_{nullptr};
   text_sensor::TextSensor *reset_reason_{nullptr};
 #endif  // USE_TEXT_SENSOR
+
+  std::string get_reset_reason_();
+  uint32_t get_free_heap_();
+  void get_device_info_(std::string &device_info);
+  void update_platform_();
 };
 
 }  // namespace debug
diff --git a/esphome/components/debug/debug_esp32.cpp b/esphome/components/debug/debug_esp32.cpp
new file mode 100644
index 0000000000..cfdfdd2a61
--- /dev/null
+++ b/esphome/components/debug/debug_esp32.cpp
@@ -0,0 +1,287 @@
+#include "debug_component.h"
+#ifdef USE_ESP32
+#include "esphome/core/log.h"
+
+#include <esp_heap_caps.h>
+#include <esp_system.h>
+#include <esp_chip_info.h>
+
+#if defined(USE_ESP32_VARIANT_ESP32)
+#include <esp32/rom/rtc.h>
+#elif defined(USE_ESP32_VARIANT_ESP32C3)
+#include <esp32c3/rom/rtc.h>
+#elif defined(USE_ESP32_VARIANT_ESP32C6)
+#include <esp32c6/rom/rtc.h>
+#elif defined(USE_ESP32_VARIANT_ESP32S2)
+#include <esp32s2/rom/rtc.h>
+#elif defined(USE_ESP32_VARIANT_ESP32S3)
+#include <esp32s3/rom/rtc.h>
+#endif
+#ifdef USE_ARDUINO
+#include <Esp.h>
+#endif
+
+namespace esphome {
+namespace debug {
+
+static const char *const TAG = "debug";
+
+std::string DebugComponent::get_reset_reason_() {
+  std::string reset_reason;
+  switch (rtc_get_reset_reason(0)) {
+    case POWERON_RESET:
+      reset_reason = "Power On Reset";
+      break;
+#if defined(USE_ESP32_VARIANT_ESP32)
+    case SW_RESET:
+#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
+    case RTC_SW_SYS_RESET:
+#endif
+      reset_reason = "Software Reset Digital Core";
+      break;
+#if defined(USE_ESP32_VARIANT_ESP32)
+    case OWDT_RESET:
+      reset_reason = "Watch Dog Reset Digital Core";
+      break;
+#endif
+    case DEEPSLEEP_RESET:
+      reset_reason = "Deep Sleep Reset Digital Core";
+      break;
+#if defined(USE_ESP32_VARIANT_ESP32)
+    case SDIO_RESET:
+      reset_reason = "SLC Module Reset Digital Core";
+      break;
+#endif
+    case TG0WDT_SYS_RESET:
+      reset_reason = "Timer Group 0 Watch Dog Reset Digital Core";
+      break;
+    case TG1WDT_SYS_RESET:
+      reset_reason = "Timer Group 1 Watch Dog Reset Digital Core";
+      break;
+    case RTCWDT_SYS_RESET:
+      reset_reason = "RTC Watch Dog Reset Digital Core";
+      break;
+#if !defined(USE_ESP32_VARIANT_ESP32C6)
+    case INTRUSION_RESET:
+      reset_reason = "Intrusion Reset CPU";
+      break;
+#endif
+#if defined(USE_ESP32_VARIANT_ESP32)
+    case TGWDT_CPU_RESET:
+      reset_reason = "Timer Group Reset CPU";
+      break;
+#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
+    case TG0WDT_CPU_RESET:
+      reset_reason = "Timer Group 0 Reset CPU";
+      break;
+#endif
+#if defined(USE_ESP32_VARIANT_ESP32)
+    case SW_CPU_RESET:
+#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
+    case RTC_SW_CPU_RESET:
+#endif
+      reset_reason = "Software Reset CPU";
+      break;
+    case RTCWDT_CPU_RESET:
+      reset_reason = "RTC Watch Dog Reset CPU";
+      break;
+#if defined(USE_ESP32_VARIANT_ESP32)
+    case EXT_CPU_RESET:
+      reset_reason = "External CPU Reset";
+      break;
+#endif
+    case RTCWDT_BROWN_OUT_RESET:
+      reset_reason = "Voltage Unstable Reset";
+      break;
+    case RTCWDT_RTC_RESET:
+      reset_reason = "RTC Watch Dog Reset Digital Core And RTC Module";
+      break;
+#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
+    case TG1WDT_CPU_RESET:
+      reset_reason = "Timer Group 1 Reset CPU";
+      break;
+    case SUPER_WDT_RESET:
+      reset_reason = "Super Watchdog Reset Digital Core And RTC Module";
+      break;
+    case GLITCH_RTC_RESET:
+      reset_reason = "Glitch Reset Digital Core And RTC Module";
+      break;
+    case EFUSE_RESET:
+      reset_reason = "eFuse Reset Digital Core";
+      break;
+#endif
+#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S3)
+    case USB_UART_CHIP_RESET:
+      reset_reason = "USB UART Reset Digital Core";
+      break;
+    case USB_JTAG_CHIP_RESET:
+      reset_reason = "USB JTAG Reset Digital Core";
+      break;
+    case POWER_GLITCH_RESET:
+      reset_reason = "Power Glitch Reset Digital Core And RTC Module";
+      break;
+#endif
+    default:
+      reset_reason = "Unknown Reset Reason";
+  }
+  ESP_LOGD(TAG, "Reset Reason: %s", reset_reason.c_str());
+  return reset_reason;
+}
+
+uint32_t DebugComponent::get_free_heap_() { return heap_caps_get_free_size(MALLOC_CAP_INTERNAL); }
+
+void DebugComponent::get_device_info_(std::string &device_info) {
+#if defined(USE_ARDUINO)
+  const char *flash_mode;
+  switch (ESP.getFlashChipMode()) {  // NOLINT(readability-static-accessed-through-instance)
+    case FM_QIO:
+      flash_mode = "QIO";
+      break;
+    case FM_QOUT:
+      flash_mode = "QOUT";
+      break;
+    case FM_DIO:
+      flash_mode = "DIO";
+      break;
+    case FM_DOUT:
+      flash_mode = "DOUT";
+      break;
+    case FM_FAST_READ:
+      flash_mode = "FAST_READ";
+      break;
+    case FM_SLOW_READ:
+      flash_mode = "SLOW_READ";
+      break;
+    default:
+      flash_mode = "UNKNOWN";
+  }
+  ESP_LOGD(TAG, "Flash Chip: Size=%ukB Speed=%uMHz Mode=%s",
+           ESP.getFlashChipSize() / 1024,                                                   // NOLINT
+           ESP.getFlashChipSpeed() / 1000000, flash_mode);                                  // NOLINT
+  device_info += "|Flash: " + to_string(ESP.getFlashChipSize() / 1024) +                    // NOLINT
+                 "kB Speed:" + to_string(ESP.getFlashChipSpeed() / 1000000) + "MHz Mode:";  // NOLINT
+  device_info += flash_mode;
+#endif
+
+  esp_chip_info_t info;
+  esp_chip_info(&info);
+  const char *model;
+#if defined(USE_ESP32_VARIANT_ESP32)
+  model = "ESP32";
+#elif defined(USE_ESP32_VARIANT_ESP32C3)
+  model = "ESP32-C3";
+#elif defined(USE_ESP32_VARIANT_ESP32C6)
+  model = "ESP32-C6";
+#elif defined(USE_ESP32_VARIANT_ESP32S2)
+  model = "ESP32-S2";
+#elif defined(USE_ESP32_VARIANT_ESP32S3)
+  model = "ESP32-S3";
+#elif defined(USE_ESP32_VARIANT_ESP32H2)
+  model = "ESP32-H2";
+#else
+  model = "UNKNOWN";
+#endif
+  std::string features;
+  if (info.features & CHIP_FEATURE_EMB_FLASH) {
+    features += "EMB_FLASH,";
+    info.features &= ~CHIP_FEATURE_EMB_FLASH;
+  }
+  if (info.features & CHIP_FEATURE_WIFI_BGN) {
+    features += "WIFI_BGN,";
+    info.features &= ~CHIP_FEATURE_WIFI_BGN;
+  }
+  if (info.features & CHIP_FEATURE_BLE) {
+    features += "BLE,";
+    info.features &= ~CHIP_FEATURE_BLE;
+  }
+  if (info.features & CHIP_FEATURE_BT) {
+    features += "BT,";
+    info.features &= ~CHIP_FEATURE_BT;
+  }
+  if (info.features & CHIP_FEATURE_EMB_PSRAM) {
+    features += "EMB_PSRAM,";
+    info.features &= ~CHIP_FEATURE_EMB_PSRAM;
+  }
+  if (info.features)
+    features += "Other:" + format_hex(info.features);
+  ESP_LOGD(TAG, "Chip: Model=%s, Features=%s Cores=%u, Revision=%u", model, features.c_str(), info.cores,
+           info.revision);
+  device_info += "|Chip: ";
+  device_info += model;
+  device_info += " Features:";
+  device_info += features;
+  device_info += " Cores:" + to_string(info.cores);
+  device_info += " Revision:" + to_string(info.revision);
+
+  ESP_LOGD(TAG, "ESP-IDF Version: %s", esp_get_idf_version());
+  device_info += "|ESP-IDF: ";
+  device_info += esp_get_idf_version();
+
+  std::string mac = get_mac_address_pretty();
+  ESP_LOGD(TAG, "EFuse MAC: %s", mac.c_str());
+  device_info += "|EFuse MAC: ";
+  device_info += mac;
+
+  device_info += "|Reset: ";
+  device_info += get_reset_reason_();
+
+  const char *wakeup_reason;
+  switch (rtc_get_wakeup_cause()) {
+    case NO_SLEEP:
+      wakeup_reason = "No Sleep";
+      break;
+    case EXT_EVENT0_TRIG:
+      wakeup_reason = "External Event 0";
+      break;
+    case EXT_EVENT1_TRIG:
+      wakeup_reason = "External Event 1";
+      break;
+    case GPIO_TRIG:
+      wakeup_reason = "GPIO";
+      break;
+    case TIMER_EXPIRE:
+      wakeup_reason = "Wakeup Timer";
+      break;
+    case SDIO_TRIG:
+      wakeup_reason = "SDIO";
+      break;
+    case MAC_TRIG:
+      wakeup_reason = "MAC";
+      break;
+    case UART0_TRIG:
+      wakeup_reason = "UART0";
+      break;
+    case UART1_TRIG:
+      wakeup_reason = "UART1";
+      break;
+    case TOUCH_TRIG:
+      wakeup_reason = "Touch";
+      break;
+    case SAR_TRIG:
+      wakeup_reason = "SAR";
+      break;
+    case BT_TRIG:
+      wakeup_reason = "BT";
+      break;
+    default:
+      wakeup_reason = "Unknown";
+  }
+  ESP_LOGD(TAG, "Wakeup Reason: %s", wakeup_reason);
+  device_info += "|Wakeup: ";
+  device_info += wakeup_reason;
+}
+
+void DebugComponent::update_platform_() {
+#ifdef USE_SENSOR
+  if (this->block_sensor_ != nullptr) {
+    this->block_sensor_->publish_state(heap_caps_get_largest_free_block(MALLOC_CAP_INTERNAL));
+  }
+  if (this->psram_sensor_ != nullptr) {
+    this->psram_sensor_->publish_state(heap_caps_get_free_size(MALLOC_CAP_SPIRAM));
+  }
+#endif
+}
+
+}  // namespace debug
+}  // namespace esphome
+#endif
diff --git a/esphome/components/debug/debug_esp8266.cpp b/esphome/components/debug/debug_esp8266.cpp
new file mode 100644
index 0000000000..3395d9db12
--- /dev/null
+++ b/esphome/components/debug/debug_esp8266.cpp
@@ -0,0 +1,94 @@
+#include "debug_component.h"
+#ifdef USE_ESP8266
+#include "esphome/core/log.h"
+#include <Esp.h>
+
+namespace esphome {
+namespace debug {
+
+static const char *const TAG = "debug";
+
+std::string DebugComponent::get_reset_reason_() {
+#if !defined(CLANG_TIDY)
+  return ESP.getResetReason().c_str();
+#else
+  return "";
+#endif
+}
+
+uint32_t DebugComponent::get_free_heap_() {
+  return ESP.getFreeHeap();  // NOLINT(readability-static-accessed-through-instance)
+}
+
+void DebugComponent::get_device_info_(std::string &device_info) {
+  const char *flash_mode;
+  switch (ESP.getFlashChipMode()) {  // NOLINT(readability-static-accessed-through-instance)
+    case FM_QIO:
+      flash_mode = "QIO";
+      break;
+    case FM_QOUT:
+      flash_mode = "QOUT";
+      break;
+    case FM_DIO:
+      flash_mode = "DIO";
+      break;
+    case FM_DOUT:
+      flash_mode = "DOUT";
+      break;
+    default:
+      flash_mode = "UNKNOWN";
+  }
+  ESP_LOGD(TAG, "Flash Chip: Size=%ukB Speed=%uMHz Mode=%s",
+           ESP.getFlashChipSize() / 1024,                                                   // NOLINT
+           ESP.getFlashChipSpeed() / 1000000, flash_mode);                                  // NOLINT
+  device_info += "|Flash: " + to_string(ESP.getFlashChipSize() / 1024) +                    // NOLINT
+                 "kB Speed:" + to_string(ESP.getFlashChipSpeed() / 1000000) + "MHz Mode:";  // NOLINT
+  device_info += flash_mode;
+
+#if !defined(CLANG_TIDY)
+  auto reset_reason = get_reset_reason_();
+  ESP_LOGD(TAG, "Chip ID: 0x%08X", ESP.getChipId());
+  ESP_LOGD(TAG, "SDK Version: %s", ESP.getSdkVersion());
+  ESP_LOGD(TAG, "Core Version: %s", ESP.getCoreVersion().c_str());
+  ESP_LOGD(TAG, "Boot Version=%u Mode=%u", ESP.getBootVersion(), ESP.getBootMode());
+  ESP_LOGD(TAG, "CPU Frequency: %u", ESP.getCpuFreqMHz());
+  ESP_LOGD(TAG, "Flash Chip ID=0x%08X", ESP.getFlashChipId());
+  ESP_LOGD(TAG, "Reset Reason: %s", reset_reason.c_str());
+  ESP_LOGD(TAG, "Reset Info: %s", ESP.getResetInfo().c_str());
+
+  device_info += "|Chip: 0x" + format_hex(ESP.getChipId());
+  device_info += "|SDK: ";
+  device_info += ESP.getSdkVersion();
+  device_info += "|Core: ";
+  device_info += ESP.getCoreVersion().c_str();
+  device_info += "|Boot: ";
+  device_info += to_string(ESP.getBootVersion());
+  device_info += "|Mode: " + to_string(ESP.getBootMode());
+  device_info += "|CPU: " + to_string(ESP.getCpuFreqMHz());
+  device_info += "|Flash: 0x" + format_hex(ESP.getFlashChipId());
+  device_info += "|Reset: ";
+  device_info += reset_reason;
+  device_info += "|";
+  device_info += ESP.getResetInfo().c_str();
+#endif
+}
+
+void DebugComponent::update_platform_() {
+#ifdef USE_SENSOR
+  if (this->block_sensor_ != nullptr) {
+    // NOLINTNEXTLINE(readability-static-accessed-through-instance)
+    this->block_sensor_->publish_state(ESP.getMaxFreeBlockSize());
+  }
+#if USE_ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
+  if (this->fragmentation_sensor_ != nullptr) {
+    // NOLINTNEXTLINE(readability-static-accessed-through-instance)
+    this->fragmentation_sensor_->publish_state(ESP.getHeapFragmentation());
+  }
+#endif
+
+#endif
+}
+
+}  // namespace debug
+}  // namespace esphome
+#endif
diff --git a/esphome/components/debug/debug_host.cpp b/esphome/components/debug/debug_host.cpp
new file mode 100644
index 0000000000..09ad34ef88
--- /dev/null
+++ b/esphome/components/debug/debug_host.cpp
@@ -0,0 +1,18 @@
+#include "debug_component.h"
+#ifdef USE_HOST
+#include <climits>
+
+namespace esphome {
+namespace debug {
+
+std::string DebugComponent::get_reset_reason_() { return ""; }
+
+uint32_t DebugComponent::get_free_heap_() { return INT_MAX; }
+
+void DebugComponent::get_device_info_(std::string &device_info) {}
+
+void DebugComponent::update_platform_() {}
+
+}  // namespace debug
+}  // namespace esphome
+#endif
diff --git a/esphome/components/debug/debug_libretiny.cpp b/esphome/components/debug/debug_libretiny.cpp
new file mode 100644
index 0000000000..725cd870ca
--- /dev/null
+++ b/esphome/components/debug/debug_libretiny.cpp
@@ -0,0 +1,44 @@
+#include "debug_component.h"
+#ifdef USE_LIBRETINY
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace debug {
+
+static const char *const TAG = "debug";
+
+std::string DebugComponent::get_reset_reason_() { return lt_get_reboot_reason_name(lt_get_reboot_reason()); }
+
+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_();
+  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());
+  ESP_LOGD(TAG, "Board: %s", lt_get_board_code());
+  ESP_LOGD(TAG, "Flash: %u KiB / RAM: %u KiB", lt_flash_get_size() / 1024, lt_ram_get_size() / 1024);
+  ESP_LOGD(TAG, "Reset Reason: %s", reset_reason.c_str());
+
+  device_info += "|Version: ";
+  device_info += LT_BANNER_STR + 10;
+  device_info += "|Reset Reason: ";
+  device_info += reset_reason;
+  device_info += "|Chip Name: ";
+  device_info += lt_cpu_get_model_name();
+  device_info += "|Chip ID: 0x" + format_hex(lt_cpu_get_mac_id());
+  device_info += "|Flash: " + to_string(lt_flash_get_size() / 1024) + " KiB";
+  device_info += "|RAM: " + to_string(lt_ram_get_size() / 1024) + " KiB";
+}
+
+void DebugComponent::update_platform_() {
+#ifdef USE_SENSOR
+  if (this->block_sensor_ != nullptr) {
+    this->block_sensor_->publish_state(lt_heap_get_max_alloc());
+  }
+#endif
+}
+
+}  // namespace debug
+}  // namespace esphome
+#endif
diff --git a/esphome/components/debug/debug_rp2040.cpp b/esphome/components/debug/debug_rp2040.cpp
new file mode 100644
index 0000000000..497547e30d
--- /dev/null
+++ b/esphome/components/debug/debug_rp2040.cpp
@@ -0,0 +1,23 @@
+#include "debug_component.h"
+#ifdef USE_RP2040
+#include "esphome/core/log.h"
+#include <Arduino.h>
+namespace esphome {
+namespace debug {
+
+static const char *const TAG = "debug";
+
+std::string DebugComponent::get_reset_reason_() { return ""; }
+
+uint32_t DebugComponent::get_free_heap_() { return rp2040.getFreeHeap(); }
+
+void DebugComponent::get_device_info_(std::string &device_info) {
+  ESP_LOGD(TAG, "CPU Frequency: %u", rp2040.f_cpu());
+  device_info += "CPU Frequency: " + to_string(rp2040.f_cpu());
+}
+
+void DebugComponent::update_platform_() {}
+
+}  // namespace debug
+}  // namespace esphome
+#endif

From 13e3920c13ce8af481b0e89d61703e61051a0b0d Mon Sep 17 00:00:00 2001
From: Szewcson <szewcson@gmail.com>
Date: Mon, 13 May 2024 03:36:10 +0200
Subject: [PATCH 27/31] GDK101 support (#4703)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                                  |   1 +
 esphome/components/gdk101/__init__.py       |  32 ++++
 esphome/components/gdk101/binary_sensor.py  |  29 +++
 esphome/components/gdk101/gdk101.cpp        | 189 ++++++++++++++++++++
 esphome/components/gdk101/gdk101.h          |  52 ++++++
 esphome/components/gdk101/sensor.py         |  83 +++++++++
 esphome/const.py                            |   3 +
 tests/components/gdk101/common.yaml         |  28 +++
 tests/components/gdk101/test.esp32-idf.yaml |   5 +
 tests/components/gdk101/test.esp32.yaml     |   5 +
 tests/components/gdk101/test.esp8266.yaml   |   5 +
 tests/components/gdk101/test.rp2040.yaml    |   5 +
 12 files changed, 437 insertions(+)
 create mode 100644 esphome/components/gdk101/__init__.py
 create mode 100644 esphome/components/gdk101/binary_sensor.py
 create mode 100644 esphome/components/gdk101/gdk101.cpp
 create mode 100644 esphome/components/gdk101/gdk101.h
 create mode 100644 esphome/components/gdk101/sensor.py
 create mode 100644 tests/components/gdk101/common.yaml
 create mode 100644 tests/components/gdk101/test.esp32-idf.yaml
 create mode 100644 tests/components/gdk101/test.esp32.yaml
 create mode 100644 tests/components/gdk101/test.esp8266.yaml
 create mode 100644 tests/components/gdk101/test.rp2040.yaml

diff --git a/CODEOWNERS b/CODEOWNERS
index c630db7948..88f875f368 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -135,6 +135,7 @@ esphome/components/fs3000/* @kahrendt
 esphome/components/ft5x06/* @clydebarrow
 esphome/components/ft63x6/* @gpambrozio
 esphome/components/gcja5/* @gcormier
+esphome/components/gdk101/* @Szewcson
 esphome/components/globals/* @esphome/core
 esphome/components/gp8403/* @jesserockz
 esphome/components/gpio/* @esphome/core
diff --git a/esphome/components/gdk101/__init__.py b/esphome/components/gdk101/__init__.py
new file mode 100644
index 0000000000..0d90257964
--- /dev/null
+++ b/esphome/components/gdk101/__init__.py
@@ -0,0 +1,32 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c
+from esphome.const import CONF_ID
+
+CODEOWNERS = ["@Szewcson"]
+
+DEPENDENCIES = ["i2c"]
+MULTI_CONF = True
+
+CONF_GDK101_ID = "gdk101_id"
+
+gdk101_ns = cg.esphome_ns.namespace("gdk101")
+GDK101Component = gdk101_ns.class_(
+    "GDK101Component", cg.PollingComponent, i2c.I2CDevice
+)
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(GDK101Component),
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+    .extend(i2c.i2c_device_schema(0x18))
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/gdk101/binary_sensor.py b/esphome/components/gdk101/binary_sensor.py
new file mode 100644
index 0000000000..2a3d6f07eb
--- /dev/null
+++ b/esphome/components/gdk101/binary_sensor.py
@@ -0,0 +1,29 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import binary_sensor
+from esphome.const import (
+    CONF_VIBRATIONS,
+    DEVICE_CLASS_VIBRATION,
+    ENTITY_CATEGORY_DIAGNOSTIC,
+    ICON_VIBRATE,
+)
+from . import CONF_GDK101_ID, GDK101Component
+
+DEPENDENCIES = ["gdk101"]
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(CONF_GDK101_ID): cv.use_id(GDK101Component),
+        cv.Required(CONF_VIBRATIONS): binary_sensor.binary_sensor_schema(
+            device_class=DEVICE_CLASS_VIBRATION,
+            entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+            icon=ICON_VIBRATE,
+        ),
+    }
+)
+
+
+async def to_code(config):
+    hub = await cg.get_variable(config[CONF_GDK101_ID])
+    var = await binary_sensor.new_binary_sensor(config[CONF_VIBRATIONS])
+    cg.add(hub.set_vibration_binary_sensor(var))
diff --git a/esphome/components/gdk101/gdk101.cpp b/esphome/components/gdk101/gdk101.cpp
new file mode 100644
index 0000000000..93f3c20fa8
--- /dev/null
+++ b/esphome/components/gdk101/gdk101.cpp
@@ -0,0 +1,189 @@
+#include "gdk101.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace gdk101 {
+
+static const char *const TAG = "gdk101";
+static const uint8_t NUMBER_OF_READ_RETRIES = 5;
+
+void GDK101Component::update() {
+  uint8_t data[2];
+  if (!this->read_dose_1m_(data)) {
+    this->status_set_warning("Failed to read dose 1m");
+    return;
+  }
+
+  if (!this->read_dose_10m_(data)) {
+    this->status_set_warning("Failed to read dose 10m");
+    return;
+  }
+
+  if (!this->read_status_(data)) {
+    this->status_set_warning("Failed to read status");
+    return;
+  }
+
+  if (!this->read_measurement_duration_(data)) {
+    this->status_set_warning("Failed to read measurement duration");
+    return;
+  }
+  this->status_clear_warning();
+}
+
+void GDK101Component::setup() {
+  uint8_t data[2];
+  ESP_LOGCONFIG(TAG, "Setting up GDK101...");
+  // first, reset the sensor
+  if (!this->reset_sensor_(data)) {
+    this->status_set_error("Reset failed!");
+    this->mark_failed();
+    return;
+  }
+  // sensor should acknowledge success of the reset procedure
+  if (data[0] != 1) {
+    this->status_set_error("Reset not acknowledged!");
+    this->mark_failed();
+    return;
+  }
+  delay(10);
+  // read firmware version
+  if (!this->read_fw_version_(data)) {
+    this->status_set_error("Failed to read firmware version");
+    this->mark_failed();
+    return;
+  }
+}
+
+void GDK101Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "GDK101:");
+  LOG_I2C_DEVICE(this);
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, "Communication with GDK101 failed!");
+  }
+#ifdef USE_SENSOR
+  LOG_SENSOR("  ", "Firmware Version", this->fw_version_sensor_);
+  LOG_SENSOR("  ", "Average Radaition Dose per 1 minute", this->rad_1m_sensor_);
+  LOG_SENSOR("  ", "Average Radaition Dose per 10 minutes", this->rad_10m_sensor_);
+  LOG_SENSOR("  ", "Status", this->status_sensor_);
+  LOG_SENSOR("  ", "Measurement Duration", this->measurement_duration_sensor_);
+#endif  // USE_SENSOR
+
+#ifdef USE_BINARY_SENSOR
+  LOG_BINARY_SENSOR("  ", "Vibration Status", this->vibration_binary_sensor_);
+#endif  // USE_BINARY_SENSOR
+}
+
+float GDK101Component::get_setup_priority() const { return setup_priority::DATA; }
+
+bool GDK101Component::read_bytes_with_retry_(uint8_t a_register, uint8_t *data, uint8_t len) {
+  uint8_t retry = NUMBER_OF_READ_RETRIES;
+  bool status = false;
+  while (!status && retry) {
+    status = this->read_bytes(a_register, data, len);
+    retry--;
+  }
+  return status;
+}
+
+bool GDK101Component::reset_sensor_(uint8_t *data) {
+  // It looks like reset is not so well designed in that sensor
+  // After sending reset command it looks that sensor start performing reset and is unresponsible during read
+  // after a while we can send another reset command and read "0x01" as confirmation
+  // Documentation not going in to such details unfortunately
+  if (!this->read_bytes_with_retry_(GDK101_REG_RESET, data, 2)) {
+    ESP_LOGE(TAG, "Updating GDK101 failed!");
+    return false;
+  }
+
+  return true;
+}
+
+bool GDK101Component::read_dose_1m_(uint8_t *data) {
+#ifdef USE_SENSOR
+  if (this->rad_1m_sensor_ != nullptr) {
+    if (!this->read_bytes(GDK101_REG_READ_1MIN_AVG, data, 2)) {
+      ESP_LOGE(TAG, "Updating GDK101 failed!");
+      return false;
+    }
+
+    const float dose = data[0] + (data[1] / 100.0f);
+
+    this->rad_1m_sensor_->publish_state(dose);
+  }
+#endif  // USE_SENSOR
+  return true;
+}
+
+bool GDK101Component::read_dose_10m_(uint8_t *data) {
+#ifdef USE_SENSOR
+  if (this->rad_10m_sensor_ != nullptr) {
+    if (!this->read_bytes(GDK101_REG_READ_10MIN_AVG, data, 2)) {
+      ESP_LOGE(TAG, "Updating GDK101 failed!");
+      return false;
+    }
+
+    const float dose = data[0] + (data[1] / 100.0f);
+
+    this->rad_10m_sensor_->publish_state(dose);
+  }
+#endif  // USE_SENSOR
+  return true;
+}
+
+bool GDK101Component::read_status_(uint8_t *data) {
+  if (!this->read_bytes(GDK101_REG_READ_STATUS, data, 2)) {
+    ESP_LOGE(TAG, "Updating GDK101 failed!");
+    return false;
+  }
+
+#ifdef USE_SENSOR
+  if (this->status_sensor_ != nullptr) {
+    this->status_sensor_->publish_state(data[0]);
+  }
+#endif  // USE_SENSOR
+
+#ifdef USE_BINARY_SENSOR
+  if (this->vibration_binary_sensor_ != nullptr) {
+    this->vibration_binary_sensor_->publish_state(data[1]);
+  }
+#endif  // USE_BINARY_SENSOR
+
+  return true;
+}
+
+bool GDK101Component::read_fw_version_(uint8_t *data) {
+#ifdef USE_SENSOR
+  if (this->fw_version_sensor_ != nullptr) {
+    if (!this->read_bytes(GDK101_REG_READ_FIRMWARE, data, 2)) {
+      ESP_LOGE(TAG, "Updating GDK101 failed!");
+      return false;
+    }
+
+    const float fw_version = data[0] + (data[1] / 10.0f);
+
+    this->fw_version_sensor_->publish_state(fw_version);
+  }
+#endif  // USE_SENSOR
+  return true;
+}
+
+bool GDK101Component::read_measurement_duration_(uint8_t *data) {
+#ifdef USE_SENSOR
+  if (this->measurement_duration_sensor_ != nullptr) {
+    if (!this->read_bytes(GDK101_REG_READ_MEASURING_TIME, data, 2)) {
+      ESP_LOGE(TAG, "Updating GDK101 failed!");
+      return false;
+    }
+
+    const float meas_time = (data[0] * 60) + data[1];
+
+    this->measurement_duration_sensor_->publish_state(meas_time);
+  }
+#endif  // USE_SENSOR
+  return true;
+}
+
+}  // namespace gdk101
+}  // namespace esphome
diff --git a/esphome/components/gdk101/gdk101.h b/esphome/components/gdk101/gdk101.h
new file mode 100644
index 0000000000..460e72ac89
--- /dev/null
+++ b/esphome/components/gdk101/gdk101.h
@@ -0,0 +1,52 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/defines.h"
+#ifdef USE_SENSOR
+#include "esphome/components/sensor/sensor.h"
+#endif  // USE_SENSOR
+#ifdef USE_BINARY_SENSOR
+#include "esphome/components/binary_sensor/binary_sensor.h"
+#endif  // USE_BINARY_SENSOR
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace gdk101 {
+
+static const uint8_t GDK101_REG_READ_FIRMWARE = 0xB4;        // Firmware version
+static const uint8_t GDK101_REG_RESET = 0xA0;                // Reset register - reading its value triggers reset
+static const uint8_t GDK101_REG_READ_STATUS = 0xB0;          // Status register
+static const uint8_t GDK101_REG_READ_MEASURING_TIME = 0xB1;  // Mesuring time
+static const uint8_t GDK101_REG_READ_10MIN_AVG = 0xB2;       // Average radiation dose per 10 min
+static const uint8_t GDK101_REG_READ_1MIN_AVG = 0xB3;        // Average radiation dose per 1 min
+
+class GDK101Component : public PollingComponent, public i2c::I2CDevice {
+#ifdef USE_SENSOR
+  SUB_SENSOR(rad_1m)
+  SUB_SENSOR(rad_10m)
+  SUB_SENSOR(status)
+  SUB_SENSOR(fw_version)
+  SUB_SENSOR(measurement_duration)
+#endif  // USE_SENSOR
+#ifdef USE_BINARY_SENSOR
+  SUB_BINARY_SENSOR(vibration)
+#endif  // USE_BINARY_SENSOR
+
+ public:
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override;
+  void update() override;
+
+ protected:
+  bool read_bytes_with_retry_(uint8_t a_register, uint8_t *data, uint8_t len);
+  bool reset_sensor_(uint8_t *data);
+  bool read_dose_1m_(uint8_t *data);
+  bool read_dose_10m_(uint8_t *data);
+  bool read_status_(uint8_t *data);
+  bool read_fw_version_(uint8_t *data);
+  bool read_measurement_duration_(uint8_t *data);
+};
+
+}  // namespace gdk101
+}  // namespace esphome
diff --git a/esphome/components/gdk101/sensor.py b/esphome/components/gdk101/sensor.py
new file mode 100644
index 0000000000..f782264615
--- /dev/null
+++ b/esphome/components/gdk101/sensor.py
@@ -0,0 +1,83 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor
+from esphome.const import (
+    DEVICE_CLASS_DURATION,
+    DEVICE_CLASS_EMPTY,
+    ENTITY_CATEGORY_DIAGNOSTIC,
+    CONF_MEASUREMENT_DURATION,
+    CONF_STATUS,
+    CONF_VERSION,
+    ICON_RADIOACTIVE,
+    ICON_TIMER,
+    STATE_CLASS_MEASUREMENT,
+    STATE_CLASS_TOTAL_INCREASING,
+    UNIT_MICROSILVERTS_PER_HOUR,
+    UNIT_SECOND,
+)
+from . import CONF_GDK101_ID, GDK101Component
+
+CONF_RADIATION_DOSE_PER_1M = "radiation_dose_per_1m"
+CONF_RADIATION_DOSE_PER_10M = "radiation_dose_per_10m"
+
+DEPENDENCIES = ["gdk101"]
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(CONF_GDK101_ID): cv.use_id(GDK101Component),
+        cv.Optional(CONF_RADIATION_DOSE_PER_1M): sensor.sensor_schema(
+            icon=ICON_RADIOACTIVE,
+            unit_of_measurement=UNIT_MICROSILVERTS_PER_HOUR,
+            accuracy_decimals=2,
+            device_class=DEVICE_CLASS_EMPTY,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_RADIATION_DOSE_PER_10M): sensor.sensor_schema(
+            icon=ICON_RADIOACTIVE,
+            unit_of_measurement=UNIT_MICROSILVERTS_PER_HOUR,
+            accuracy_decimals=2,
+            device_class=DEVICE_CLASS_EMPTY,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_VERSION): sensor.sensor_schema(
+            entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+            accuracy_decimals=1,
+        ),
+        cv.Optional(CONF_STATUS): sensor.sensor_schema(
+            entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+            accuracy_decimals=0,
+        ),
+        cv.Optional(CONF_MEASUREMENT_DURATION): sensor.sensor_schema(
+            unit_of_measurement=UNIT_SECOND,
+            icon=ICON_TIMER,
+            accuracy_decimals=0,
+            state_class=STATE_CLASS_TOTAL_INCREASING,
+            device_class=DEVICE_CLASS_DURATION,
+            entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+        ),
+    }
+)
+
+
+async def to_code(config):
+    hub = await cg.get_variable(config[CONF_GDK101_ID])
+
+    if radiation_dose_per_1m := config.get(CONF_RADIATION_DOSE_PER_1M):
+        sens = await sensor.new_sensor(radiation_dose_per_1m)
+        cg.add(hub.set_rad_1m_sensor(sens))
+
+    if radiation_dose_per_10m := config.get(CONF_RADIATION_DOSE_PER_10M):
+        sens = await sensor.new_sensor(radiation_dose_per_10m)
+        cg.add(hub.set_rad_10m_sensor(sens))
+
+    if version_config := config.get(CONF_VERSION):
+        sens = await sensor.new_sensor(version_config)
+        cg.add(hub.set_fw_version_sensor(sens))
+
+    if status_config := config.get(CONF_STATUS):
+        sens = await sensor.new_sensor(status_config)
+        cg.add(hub.set_status_sensor(sens))
+
+    if measurement_duration_config := config.get(CONF_MEASUREMENT_DURATION):
+        sens = await sensor.new_sensor(measurement_duration_config)
+        cg.add(hub.set_measurement_duration_sensor(sens))
diff --git a/esphome/const.py b/esphome/const.py
index dba974610a..542183d3b2 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -884,6 +884,7 @@ CONF_VALUE_FONT = "value_font"
 CONF_VARIABLES = "variables"
 CONF_VARIANT = "variant"
 CONF_VERSION = "version"
+CONF_VIBRATIONS = "vibrations"
 CONF_VISIBLE = "visible"
 CONF_VISUAL = "visual"
 CONF_VOLTAGE = "voltage"
@@ -983,6 +984,7 @@ ICON_SIGNAL_DISTANCE_VARIANT = "mdi:signal"
 ICON_THERMOMETER = "mdi:thermometer"
 ICON_TIMELAPSE = "mdi:timelapse"
 ICON_TIMER = "mdi:timer-outline"
+ICON_VIBRATE = "mdi:vibrate"
 ICON_WATER = "mdi:water"
 ICON_WATER_PERCENT = "mdi:water-percent"
 ICON_WEATHER_SUNSET = "mdi:weather-sunset"
@@ -1024,6 +1026,7 @@ UNIT_METER_PER_SECOND_SQUARED = "m/s²"
 UNIT_MICROGRAMS_PER_CUBIC_METER = "µg/m³"
 UNIT_MICROMETER = "µm"
 UNIT_MICROSIEMENS_PER_CENTIMETER = "µS/cm"
+UNIT_MICROSILVERTS_PER_HOUR = "µSv/h"
 UNIT_MICROTESLA = "µT"
 UNIT_MILLIGRAMS_PER_CUBIC_METER = "mg/m³"
 UNIT_MILLISECOND = "ms"
diff --git a/tests/components/gdk101/common.yaml b/tests/components/gdk101/common.yaml
new file mode 100644
index 0000000000..f886fc415b
--- /dev/null
+++ b/tests/components/gdk101/common.yaml
@@ -0,0 +1,28 @@
+i2c:
+  id: i2c_bus
+  sda: ${i2c_sda}
+  scl: ${i2c_scl}
+
+gdk101:
+  id: my_gdk101
+  i2c_id: i2c_bus
+
+sensor:
+  - platform: gdk101
+    gdk101_id: my_gdk101
+    radiation_dose_per_1m:
+      name: Radiation Dose @ 1 min
+    radiation_dose_per_10m:
+      name: Radiation Dose @ 10 min
+    status:
+      name: Status
+    version:
+      name: FW Version
+    measurement_duration:
+      name: Measuring Time
+
+binary_sensor:
+  - platform: gdk101
+    gdk101_id: my_gdk101
+    vibrations:
+      name: Vibrations
diff --git a/tests/components/gdk101/test.esp32-idf.yaml b/tests/components/gdk101/test.esp32-idf.yaml
new file mode 100644
index 0000000000..1037d5d35b
--- /dev/null
+++ b/tests/components/gdk101/test.esp32-idf.yaml
@@ -0,0 +1,5 @@
+substitutions:
+  i2c_scl: GPIO16
+  i2c_sda: GPIO17
+
+<<: !include common.yaml
diff --git a/tests/components/gdk101/test.esp32.yaml b/tests/components/gdk101/test.esp32.yaml
new file mode 100644
index 0000000000..1037d5d35b
--- /dev/null
+++ b/tests/components/gdk101/test.esp32.yaml
@@ -0,0 +1,5 @@
+substitutions:
+  i2c_scl: GPIO16
+  i2c_sda: GPIO17
+
+<<: !include common.yaml
diff --git a/tests/components/gdk101/test.esp8266.yaml b/tests/components/gdk101/test.esp8266.yaml
new file mode 100644
index 0000000000..d7ae0d5161
--- /dev/null
+++ b/tests/components/gdk101/test.esp8266.yaml
@@ -0,0 +1,5 @@
+substitutions:
+  i2c_scl: GPIO5
+  i2c_sda: GPIO4
+
+<<: !include common.yaml
diff --git a/tests/components/gdk101/test.rp2040.yaml b/tests/components/gdk101/test.rp2040.yaml
new file mode 100644
index 0000000000..d7ae0d5161
--- /dev/null
+++ b/tests/components/gdk101/test.rp2040.yaml
@@ -0,0 +1,5 @@
+substitutions:
+  i2c_scl: GPIO5
+  i2c_sda: GPIO4
+
+<<: !include common.yaml

From dd81c836862be87cdad41902f3847c097d8b0fa5 Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Mon, 13 May 2024 13:21:02 +1000
Subject: [PATCH 28/31] Typing hint and doc fixes (#6729)

---
 esphome/cpp_generator.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/esphome/cpp_generator.py b/esphome/cpp_generator.py
index 04616d97c2..9a4cb2269a 100644
--- a/esphome/cpp_generator.py
+++ b/esphome/cpp_generator.py
@@ -2,7 +2,7 @@ import abc
 import inspect
 import math
 import re
-from collections.abc import Generator, Sequence
+from collections.abc import Sequence
 from typing import Any, Callable, Optional, Union
 
 from esphome.core import (
@@ -477,6 +477,7 @@ def variable(
     :param rhs: The expression to place on the right hand side of the assignment.
     :param type_: Manually define a type for the variable, only use this when it's not possible
       to do so during config validation phase (for example because of template arguments).
+    :param register: If true register the variable with the core
 
     :return: The new variable as a MockObj.
     """
@@ -492,9 +493,7 @@ def variable(
     return obj
 
 
-def with_local_variable(
-    id_: ID, rhs: SafeExpType, callback: Callable[["MockObj"], None], *args
-) -> None:
+def with_local_variable(id_: ID, rhs: SafeExpType, callback: Callable, *args) -> None:
     """Declare a new variable, not pointer type, in the code generation, within a scoped block
     The variable is only usable within the callback
     The callback cannot be async.
@@ -599,6 +598,7 @@ def add_library(name: str, version: Optional[str], repository: Optional[str] = N
 
     :param name: The name of the library (for example 'AsyncTCP')
     :param version: The version of the library, may be None.
+    :param repository: The repository for the library
     """
     CORE.add_library(Library(name, version, repository))
 
@@ -654,7 +654,7 @@ async def process_lambda(
     parameters: list[tuple[SafeExpType, str]],
     capture: str = "=",
     return_type: SafeExpType = None,
-) -> Generator[LambdaExpression, None, None]:
+) -> Union[LambdaExpression, None]:
     """Process the given lambda value into a LambdaExpression.
 
     This is a coroutine because lambdas can depend on other IDs,
@@ -673,7 +673,7 @@ async def process_lambda(
     )
 
     if value is None:
-        return
+        return None
     parts = value.parts[:]
     for i, id in enumerate(value.requires_ids):
         full_id, var = await get_variable_with_full_id(id)
@@ -712,7 +712,7 @@ async def templatable(
     value: Any,
     args: list[tuple[SafeExpType, str]],
     output_type: Optional[SafeExpType],
-    to_exp: Any = None,
+    to_exp: Union[Callable, dict] = None,
 ):
     """Generate code for a templatable config option.
 

From a23d1631e199ac274a1f11d5fbe16ee12fe5b65c Mon Sep 17 00:00:00 2001
From: Jorge-Crespo-Celdran
 <86021690+Jorge-Crespo-Celdran@users.noreply.github.com>
Date: Mon, 13 May 2024 06:04:06 +0200
Subject: [PATCH 29/31] time_based_cover.cpp with manual control fix (#6719)

---
 esphome/components/time_based/time_based_cover.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/esphome/components/time_based/time_based_cover.cpp b/esphome/components/time_based/time_based_cover.cpp
index 50376224a9..e1936d5ee1 100644
--- a/esphome/components/time_based/time_based_cover.cpp
+++ b/esphome/components/time_based/time_based_cover.cpp
@@ -96,6 +96,9 @@ void TimeBasedCover::control(const CoverCall &call) {
       }
     } else {
       auto op = pos < this->position ? COVER_OPERATION_CLOSING : COVER_OPERATION_OPENING;
+      if (this->manual_control_ && (pos == COVER_OPEN || pos == COVER_CLOSED)) {
+        this->position = pos == COVER_CLOSED ? COVER_OPEN : COVER_CLOSED;
+      }
       this->target_position_ = pos;
       this->start_direction_(op);
     }

From 5ee4bf380215d705c19ac4a07fb27a84cbc660db Mon Sep 17 00:00:00 2001
From: Mischa Siekmann <45062894+gnumpi@users.noreply.github.com>
Date: Mon, 13 May 2024 06:05:13 +0200
Subject: [PATCH 30/31] Set FEATURE_API_AUDIO flag also if the speaker
 component is not used (#6712)

---
 esphome/components/voice_assistant/voice_assistant.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/voice_assistant/voice_assistant.h b/esphome/components/voice_assistant/voice_assistant.h
index d6b1502381..1c0ea12f4f 100644
--- a/esphome/components/voice_assistant/voice_assistant.h
+++ b/esphome/components/voice_assistant/voice_assistant.h
@@ -94,10 +94,10 @@ class VoiceAssistant : public Component {
   uint32_t get_feature_flags() const {
     uint32_t flags = 0;
     flags |= VoiceAssistantFeature::FEATURE_VOICE_ASSISTANT;
+    flags |= VoiceAssistantFeature::FEATURE_API_AUDIO;
 #ifdef USE_SPEAKER
     if (this->speaker_ != nullptr) {
       flags |= VoiceAssistantFeature::FEATURE_SPEAKER;
-      flags |= VoiceAssistantFeature::FEATURE_API_AUDIO;
     }
 #endif
     return flags;

From 91007952e2276d09c4f52c1cc7ceabe3138c52eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20BOU=C3=89?= <lboue@users.noreply.github.com>
Date: Mon, 13 May 2024 11:21:06 +0100
Subject: [PATCH 31/31] [CST816] Add support for Hynitron Microelectronics
 CST826 capacitive touch (#6682)

---
 esphome/components/cst816/touchscreen/cst816_touchscreen.cpp | 4 ++++
 esphome/components/cst816/touchscreen/cst816_touchscreen.h   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/esphome/components/cst816/touchscreen/cst816_touchscreen.cpp b/esphome/components/cst816/touchscreen/cst816_touchscreen.cpp
index d2b8cc81f1..9e59810c7e 100644
--- a/esphome/components/cst816/touchscreen/cst816_touchscreen.cpp
+++ b/esphome/components/cst816/touchscreen/cst816_touchscreen.cpp
@@ -15,6 +15,7 @@ void CST816Touchscreen::continue_setup_() {
   }
   switch (this->chip_id_) {
     case CST820_CHIP_ID:
+    case CST826_CHIP_ID:
     case CST716_CHIP_ID:
     case CST816S_CHIP_ID:
     case CST816D_CHIP_ID:
@@ -90,6 +91,9 @@ void CST816Touchscreen::dump_config() {
     case CST820_CHIP_ID:
       name = "CST820";
       break;
+    case CST826_CHIP_ID:
+      name = "CST826";
+      break;
     case CST816S_CHIP_ID:
       name = "CST816S";
       break;
diff --git a/esphome/components/cst816/touchscreen/cst816_touchscreen.h b/esphome/components/cst816/touchscreen/cst816_touchscreen.h
index 0d987f2739..24e664e7ee 100644
--- a/esphome/components/cst816/touchscreen/cst816_touchscreen.h
+++ b/esphome/components/cst816/touchscreen/cst816_touchscreen.h
@@ -24,6 +24,7 @@ static const uint8_t REG_SLEEP = 0xE5;
 static const uint8_t REG_IRQ_CTL = 0xFA;
 static const uint8_t IRQ_EN_MOTION = 0x70;
 
+static const uint8_t CST826_CHIP_ID = 0x11;
 static const uint8_t CST820_CHIP_ID = 0xB7;
 static const uint8_t CST816S_CHIP_ID = 0xB4;
 static const uint8_t CST816D_CHIP_ID = 0xB6;