From fdd54d74a3ac8893fec8719760698dd3554cb16f Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Sun, 7 Jan 2024 19:39:53 -0800
Subject: [PATCH 01/68] Don't crash with invalid adc pin (#6059)

* Don't crash with invalid adc pin

* lint
---
 esphome/components/adc/__init__.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/esphome/components/adc/__init__.py b/esphome/components/adc/__init__.py
index 952fbdd9b9..87d769fec2 100644
--- a/esphome/components/adc/__init__.py
+++ b/esphome/components/adc/__init__.py
@@ -139,6 +139,9 @@ ESP32_VARIANT_ADC2_PIN_TO_CHANNEL = {
     VARIANT_ESP32C3: {
         5: adc2_channel_t.ADC2_CHANNEL_0,
     },
+    VARIANT_ESP32C2: {},
+    VARIANT_ESP32C6: {},
+    VARIANT_ESP32H2: {},
 }
 
 

From 4202fe65b522f03c8bddbad301381d4685f015fa Mon Sep 17 00:00:00 2001
From: tomaszduda23 <tomaszduda23@gmail.com>
Date: Tue, 9 Jan 2024 00:05:52 +0100
Subject: [PATCH 02/68] fix compilation error for libretiny (#6064)

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

diff --git a/esphome/components/libretiny/__init__.py b/esphome/components/libretiny/__init__.py
index e36c08d522..7dca370eff 100644
--- a/esphome/components/libretiny/__init__.py
+++ b/esphome/components/libretiny/__init__.py
@@ -309,7 +309,7 @@ async def component_to_code(config):
         lt_options["LT_UART_SILENT_ENABLED"] = 0
         lt_options["LT_UART_SILENT_ALL"] = 0
     # set default UART port
-    if uart_port := framework.get(CONF_UART_PORT, None) is not None:
+    if (uart_port := framework.get(CONF_UART_PORT, None)) is not None:
         lt_options["LT_UART_DEFAULT_PORT"] = uart_port
     # add custom options
     lt_options.update(framework[CONF_OPTIONS])

From 14bffaf8a7726ceaa6611fbd101c6dc4549b3b84 Mon Sep 17 00:00:00 2001
From: Ruben van Dijk <15885455+RubenNL@users.noreply.github.com>
Date: Tue, 9 Jan 2024 00:12:28 +0100
Subject: [PATCH 03/68] Add questionmark to default glyphs. (#6053)

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

diff --git a/esphome/components/font/__init__.py b/esphome/components/font/__init__.py
index 22a5f6b2c5..a803c7567b 100644
--- a/esphome/components/font/__init__.py
+++ b/esphome/components/font/__init__.py
@@ -235,7 +235,7 @@ FILE_SCHEMA = cv.Schema(_file_schema)
 
 
 DEFAULT_GLYPHS = (
-    ' !"%()+=,-.:/0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz°'
+    ' !"%()+=,-.:/?0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz°'
 )
 CONF_RAW_GLYPH_ID = "raw_glyph_id"
 

From 696bfe6a87124f7cbde34180b05dc3e60def252f Mon Sep 17 00:00:00 2001
From: functionpointer <suspendfunction@gmail.com>
Date: Tue, 9 Jan 2024 00:26:13 +0100
Subject: [PATCH 04/68] pylontech: Fix parsing error with US2000 (#6061)

---
 esphome/components/pylontech/__init__.py   |  2 +-
 esphome/components/pylontech/pylontech.cpp | 57 +++++++++++++---------
 2 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/esphome/components/pylontech/__init__.py b/esphome/components/pylontech/__init__.py
index 56fac92e89..197f7e7904 100644
--- a/esphome/components/pylontech/__init__.py
+++ b/esphome/components/pylontech/__init__.py
@@ -19,7 +19,7 @@ PylontechComponent = pylontech_ns.class_(
 )
 PylontechBattery = pylontech_ns.class_("PylontechBattery")
 
-CV_NUM_BATTERIES = cv.int_range(1, 6)
+CV_NUM_BATTERIES = cv.int_range(1, 16)
 
 PYLONTECH_COMPONENT_SCHEMA = cv.Schema(
     {
diff --git a/esphome/components/pylontech/pylontech.cpp b/esphome/components/pylontech/pylontech.cpp
index 4bfa876110..b33f4d4874 100644
--- a/esphome/components/pylontech/pylontech.cpp
+++ b/esphome/components/pylontech/pylontech.cpp
@@ -1,5 +1,6 @@
 #include "pylontech.h"
 #include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
 
 namespace esphome {
 namespace pylontech {
@@ -34,26 +35,30 @@ void PylontechComponent::setup() {
 void PylontechComponent::update() { this->write_str("pwr\n"); }
 
 void PylontechComponent::loop() {
-  uint8_t data;
-
-  // pylontech sends a lot of data very suddenly
-  // we need to quickly put it all into our own buffer, otherwise the uart's buffer will overflow
-  while (this->available() > 0) {
-    if (this->read_byte(&data)) {
-      buffer_[buffer_index_write_] += (char) data;
-      if (buffer_[buffer_index_write_].back() == static_cast<char>(ASCII_LF) ||
-          buffer_[buffer_index_write_].length() >= MAX_DATA_LENGTH_BYTES) {
-        // complete line received
-        buffer_index_write_ = (buffer_index_write_ + 1) % NUM_BUFFERS;
+  if (this->available() > 0) {
+    // pylontech sends a lot of data very suddenly
+    // we need to quickly put it all into our own buffer, otherwise the uart's buffer will overflow
+    uint8_t data;
+    int recv = 0;
+    while (this->available() > 0) {
+      if (this->read_byte(&data)) {
+        buffer_[buffer_index_write_] += (char) data;
+        recv++;
+        if (buffer_[buffer_index_write_].back() == static_cast<char>(ASCII_LF) ||
+            buffer_[buffer_index_write_].length() >= MAX_DATA_LENGTH_BYTES) {
+          // complete line received
+          buffer_index_write_ = (buffer_index_write_ + 1) % NUM_BUFFERS;
+        }
       }
     }
-  }
-
-  // only process one line per call of loop() to not block esphome for too long
-  if (buffer_index_read_ != buffer_index_write_) {
-    this->process_line_(buffer_[buffer_index_read_]);
-    buffer_[buffer_index_read_].clear();
-    buffer_index_read_ = (buffer_index_read_ + 1) % NUM_BUFFERS;
+    ESP_LOGV(TAG, "received %d bytes", recv);
+  } else {
+    // only process one line per call of loop() to not block esphome for too long
+    if (buffer_index_read_ != buffer_index_write_) {
+      this->process_line_(buffer_[buffer_index_read_]);
+      buffer_[buffer_index_read_].clear();
+      buffer_index_read_ = (buffer_index_read_ + 1) % NUM_BUFFERS;
+    }
   }
 }
 
@@ -66,10 +71,11 @@ void PylontechComponent::process_line_(std::string &buffer) {
   // clang-format on
 
   PylontechListener::LineContents l{};
-  const int parsed = sscanf(                                                                                  // NOLINT
-      buffer.c_str(), "%d %d %d %d %d %d %d %d %7s %7s %7s %7s %d%% %*d-%*d-%*d %*d:%*d:%*d %*s %*s %d %*s",  // NOLINT
-      &l.bat_num, &l.volt, &l.curr, &l.tempr, &l.tlow, &l.thigh, &l.vlow, &l.vhigh, l.base_st, l.volt_st,     // NOLINT
-      l.curr_st, l.temp_st, &l.coulomb, &l.mostempr);                                                         // NOLINT
+  char mostempr_s[6];
+  const int parsed = sscanf(                                                                                   // NOLINT
+      buffer.c_str(), "%d %d %d %d %d %d %d %d %7s %7s %7s %7s %d%% %*d-%*d-%*d %*d:%*d:%*d %*s %*s %5s %*s",  // NOLINT
+      &l.bat_num, &l.volt, &l.curr, &l.tempr, &l.tlow, &l.thigh, &l.vlow, &l.vhigh, l.base_st, l.volt_st,      // NOLINT
+      l.curr_st, l.temp_st, &l.coulomb, mostempr_s);                                                           // NOLINT
 
   if (l.bat_num <= 0) {
     ESP_LOGD(TAG, "invalid bat_num in line %s", buffer.substr(0, buffer.size() - 2).c_str());
@@ -79,6 +85,13 @@ void PylontechComponent::process_line_(std::string &buffer) {
     ESP_LOGW(TAG, "invalid line: found only %d items in %s", parsed, buffer.substr(0, buffer.size() - 2).c_str());
     return;
   }
+  auto mostempr_parsed = parse_number<int>(mostempr_s);
+  if (mostempr_parsed.has_value()) {
+    l.mostempr = mostempr_parsed.value();
+  } else {
+    l.mostempr = -300;
+    ESP_LOGW(TAG, "bat_num %d: received no mostempr", l.bat_num);
+  }
 
   for (PylontechListener *listener : this->listeners_) {
     listener->on_line_read(&l);

From 9bdb9dc1a37c0a73258c8756b264874dcc90ed75 Mon Sep 17 00:00:00 2001
From: functionpointer <suspendfunction@gmail.com>
Date: Tue, 9 Jan 2024 00:30:37 +0100
Subject: [PATCH 05/68] pylontech: fix voltage_low and voltage_high wrong unit
 (#6060)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: だから <82636574+Dackara@users.noreply.github.com>
---
 esphome/components/pylontech/sensor/__init__.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/esphome/components/pylontech/sensor/__init__.py b/esphome/components/pylontech/sensor/__init__.py
index 0423f3370c..a1477c627f 100644
--- a/esphome/components/pylontech/sensor/__init__.py
+++ b/esphome/components/pylontech/sensor/__init__.py
@@ -59,14 +59,14 @@ TYPES: dict[str, cv.Schema] = {
         device_class=DEVICE_CLASS_TEMPERATURE,
     ),
     CONF_VOLTAGE_LOW: sensor.sensor_schema(
-        unit_of_measurement=UNIT_CELSIUS,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_TEMPERATURE,
+        unit_of_measurement=UNIT_VOLT,
+        accuracy_decimals=3,
+        device_class=DEVICE_CLASS_VOLTAGE,
     ),
     CONF_VOLTAGE_HIGH: sensor.sensor_schema(
-        unit_of_measurement=UNIT_CELSIUS,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_TEMPERATURE,
+        unit_of_measurement=UNIT_VOLT,
+        accuracy_decimals=3,
+        device_class=DEVICE_CLASS_VOLTAGE,
     ),
     CONF_COULOMB: sensor.sensor_schema(
         unit_of_measurement=UNIT_PERCENT,

From 886d1a2d00d77e1a572fdeda6341593c8557c119 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 09:38:50 +0900
Subject: [PATCH 06/68] Bump flake8 from 6.1.0 to 7.0.0 (#6058)

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

diff --git a/requirements_test.txt b/requirements_test.txt
index 401f9cb30f..0348ef6cb2 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,5 +1,5 @@
 pylint==3.0.3
-flake8==6.1.0  # also change in .pre-commit-config.yaml when updating
+flake8==7.0.0  # also change in .pre-commit-config.yaml when updating
 black==23.12.0  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.15.0  # also change in .pre-commit-config.yaml when updating
 pre-commit

From 6061699eff0a651643e03e1130b6b6bd45d2a4e1 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Tue, 9 Jan 2024 01:41:34 +0100
Subject: [PATCH 07/68] Nextion enable upload from https when using esp-idf
 (#6051)

---
 esphome/components/nextion/display.py         |  6 ++++++
 .../components/nextion/nextion_upload_idf.cpp | 20 +++++++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/esphome/components/nextion/display.py b/esphome/components/nextion/display.py
index fd61dfa2be..27f2030f0d 100644
--- a/esphome/components/nextion/display.py
+++ b/esphome/components/nextion/display.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation
 from esphome.components import display, uart
+from esphome.components import esp32
 from esphome.const import (
     CONF_ID,
     CONF_LAMBDA,
@@ -96,6 +97,11 @@ async def to_code(config):
         if CORE.is_esp32 and CORE.using_arduino:
             cg.add_library("WiFiClientSecure", None)
             cg.add_library("HTTPClient", None)
+        elif CORE.is_esp32 and CORE.using_esp_idf:
+            esp32.add_idf_sdkconfig_option("CONFIG_ESP_TLS_INSECURE", True)
+            esp32.add_idf_sdkconfig_option(
+                "CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY", True
+            )
         elif CORE.is_esp8266 and CORE.using_arduino:
             cg.add_library("ESP8266HTTPClient", None)
 
diff --git a/esphome/components/nextion/nextion_upload_idf.cpp b/esphome/components/nextion/nextion_upload_idf.cpp
index 57bb9c45e8..709ff65b12 100644
--- a/esphome/components/nextion/nextion_upload_idf.cpp
+++ b/esphome/components/nextion/nextion_upload_idf.cpp
@@ -24,7 +24,7 @@ int Nextion::upload_range(const std::string &url, int range_start) {
   ESP_LOGVV(TAG, "url: %s", url.c_str());
   uint range_size = this->tft_size_ - range_start;
   ESP_LOGVV(TAG, "tft_size_: %i", this->tft_size_);
-  ESP_LOGV(TAG, "Available heap: %u", esp_get_free_heap_size());
+  ESP_LOGV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
   int range_end = (range_start == 0) ? std::min(this->tft_size_, 16383) : this->tft_size_;
   if (range_size <= 0 or range_end <= range_start) {
     ESP_LOGE(TAG, "Invalid range");
@@ -37,6 +37,8 @@ int Nextion::upload_range(const std::string &url, int range_start) {
   esp_http_client_config_t config = {
       .url = url.c_str(),
       .cert_pem = nullptr,
+      .disable_auto_redirect = false,
+      .max_redirection_count = 10,
   };
   esp_http_client_handle_t client = esp_http_client_init(&config);
 
@@ -44,7 +46,7 @@ int Nextion::upload_range(const std::string &url, int range_start) {
   sprintf(range_header, "bytes=%d-%d", range_start, range_end);
   ESP_LOGV(TAG, "Requesting range: %s", range_header);
   esp_http_client_set_header(client, "Range", range_header);
-  ESP_LOGVV(TAG, "Available heap: %u", esp_get_free_heap_size());
+  ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
 
   ESP_LOGV(TAG, "Opening http connetion");
   esp_err_t err;
@@ -70,13 +72,13 @@ int Nextion::upload_range(const std::string &url, int range_start) {
   std::string recv_string;
   if (buffer == nullptr) {
     ESP_LOGE(TAG, "Failed to allocate memory for buffer");
-    ESP_LOGV(TAG, "Available heap: %u", esp_get_free_heap_size());
+    ESP_LOGV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
   } else {
     ESP_LOGV(TAG, "Memory for buffer allocated successfully");
 
     while (true) {
       App.feed_wdt();
-      ESP_LOGVV(TAG, "Available heap: %u", esp_get_free_heap_size());
+      ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
       int read_len = esp_http_client_read(client, reinterpret_cast<char *>(buffer), 4096);
       ESP_LOGVV(TAG, "Read %d bytes from HTTP client, writing to UART", read_len);
       if (read_len > 0) {
@@ -145,17 +147,19 @@ bool Nextion::upload_tft() {
 
   // Define the configuration for the HTTP client
   ESP_LOGV(TAG, "Establishing connection to HTTP server");
-  ESP_LOGVV(TAG, "Available heap: %u", esp_get_free_heap_size());
+  ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
   esp_http_client_config_t config = {
       .url = this->tft_url_.c_str(),
       .cert_pem = nullptr,
       .method = HTTP_METHOD_HEAD,
       .timeout_ms = 15000,
+      .disable_auto_redirect = false,
+      .max_redirection_count = 10,
   };
 
   // Initialize the HTTP client with the configuration
   ESP_LOGV(TAG, "Initializing HTTP client");
-  ESP_LOGV(TAG, "Available heap: %u", esp_get_free_heap_size());
+  ESP_LOGV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
   esp_http_client_handle_t http = esp_http_client_init(&config);
   if (!http) {
     ESP_LOGE(TAG, "Failed to initialize HTTP client.");
@@ -164,7 +168,7 @@ bool Nextion::upload_tft() {
 
   // Perform the HTTP request
   ESP_LOGV(TAG, "Check if the client could connect");
-  ESP_LOGV(TAG, "Available heap: %u", esp_get_free_heap_size());
+  ESP_LOGV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
   esp_err_t err = esp_http_client_perform(http);
   if (err != ESP_OK) {
     ESP_LOGE(TAG, "HTTP request failed: %s", esp_err_to_name(err));
@@ -256,7 +260,7 @@ bool Nextion::upload_end(bool successful) {
   this->soft_reset();
   vTaskDelay(pdMS_TO_TICKS(1500));  // NOLINT
   if (successful) {
-    ESP_LOGD(TAG, "Restarting esphome");
+    ESP_LOGD(TAG, "Restarting ESPHome");
     esp_restart();  // NOLINT(readability-static-accessed-through-instance)
   }
   return successful;

From e3d146ee44e133d14cf797ab3bea42b7ff72d8c0 Mon Sep 17 00:00:00 2001
From: Robert Paskowitz <rpaskowitz@users.noreply.github.com>
Date: Mon, 8 Jan 2024 16:44:08 -0800
Subject: [PATCH 08/68] Support full (>460 char) dumps of Pronto IR commands
 (#6040)

Co-authored-by: Rob Paskowitz <rob@paskowitz.ca>
---
 .../remote_base/pronto_protocol.cpp           | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/esphome/components/remote_base/pronto_protocol.cpp b/esphome/components/remote_base/pronto_protocol.cpp
index 4b6977e1a2..ccae64449a 100644
--- a/esphome/components/remote_base/pronto_protocol.cpp
+++ b/esphome/components/remote_base/pronto_protocol.cpp
@@ -227,16 +227,17 @@ optional<ProntoData> ProntoProtocol::decode(RemoteReceiveData src) {
 }
 
 void ProntoProtocol::dump(const ProntoData &data) {
-  std::string first, rest;
-  if (data.data.size() < 230) {
-    first = data.data;
-  } else {
-    first = data.data.substr(0, 229);
-    rest = data.data.substr(230);
-  }
-  ESP_LOGI(TAG, "Received Pronto: data=%s", first.c_str());
-  if (!rest.empty()) {
-    ESP_LOGI(TAG, "%s", rest.c_str());
+  std::string rest;
+
+  rest = data.data;
+  ESP_LOGI(TAG, "Received Pronto: data=");
+  while (true) {
+    ESP_LOGI(TAG, "%s", rest.substr(0, 230).c_str());
+    if (rest.size() > 230) {
+      rest = rest.substr(230);
+    } else {
+      break;
+    }
   }
 }
 

From 2bb5343d2787f2d1d120aa81b808944247aa2672 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Tue, 9 Jan 2024 01:45:46 +0100
Subject: [PATCH 09/68] Extends UART change at runtime to ESP8266 (#6019)

---
 esphome/components/uart/uart_component.h      |  4 ++--
 .../uart/uart_component_esp8266.cpp           | 20 +++++++++++++++++--
 .../components/uart/uart_component_esp8266.h  | 15 ++++++++++++++
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/esphome/components/uart/uart_component.h b/esphome/components/uart/uart_component.h
index 6f27f36bcb..a57910c1a1 100644
--- a/esphome/components/uart/uart_component.h
+++ b/esphome/components/uart/uart_component.h
@@ -122,7 +122,7 @@ class UARTComponent {
   // @return Baud rate in bits per second.
   uint32_t get_baud_rate() const { return baud_rate_; }
 
-#ifdef USE_ESP32
+#if defined(USE_ESP8266) || defined(USE_ESP32)
   /**
    * Load the UART settings.
    * @param dump_config If true (default), output the new settings to logs; otherwise, change settings quietly.
@@ -147,7 +147,7 @@ class UARTComponent {
    * This will load the current UART interface with the latest settings (baud_rate, parity, etc).
    */
   virtual void load_settings(){};
-#endif  // USE_ESP32
+#endif  // USE_ESP8266 || USE_ESP32
 
 #ifdef USE_UART_DEBUGGER
   void add_debug_callback(std::function<void(UARTDirection, uint8_t)> &&callback) {
diff --git a/esphome/components/uart/uart_component_esp8266.cpp b/esphome/components/uart/uart_component_esp8266.cpp
index 529108f439..fa8dc3fb17 100644
--- a/esphome/components/uart/uart_component_esp8266.cpp
+++ b/esphome/components/uart/uart_component_esp8266.cpp
@@ -98,10 +98,26 @@ void ESP8266UartComponent::setup() {
   }
 }
 
+void ESP8266UartComponent::load_settings(bool dump_config) {
+  ESP_LOGCONFIG(TAG, "Loading UART bus settings...");
+  if (this->hw_serial_ != nullptr) {
+    SerialConfig config = static_cast<SerialConfig>(get_config());
+    this->hw_serial_->begin(this->baud_rate_, config);
+    this->hw_serial_->setRxBufferSize(this->rx_buffer_size_);
+  } else {
+    this->sw_serial_->setup(this->tx_pin_, this->rx_pin_, this->baud_rate_, this->stop_bits_, this->data_bits_,
+                            this->parity_, this->rx_buffer_size_);
+  }
+  if (dump_config) {
+    ESP_LOGCONFIG(TAG, "UART bus was reloaded.");
+    this->dump_config();
+  }
+}
+
 void ESP8266UartComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "UART Bus:");
-  LOG_PIN("  TX Pin: ", tx_pin_);
-  LOG_PIN("  RX Pin: ", rx_pin_);
+  LOG_PIN("  TX Pin: ", this->tx_pin_);
+  LOG_PIN("  RX Pin: ", this->rx_pin_);
   if (this->rx_pin_ != nullptr) {
     ESP_LOGCONFIG(TAG, "  RX Buffer Size: %u", this->rx_buffer_size_);  // NOLINT
   }
diff --git a/esphome/components/uart/uart_component_esp8266.h b/esphome/components/uart/uart_component_esp8266.h
index eed14f3265..749dd4c61e 100644
--- a/esphome/components/uart/uart_component_esp8266.h
+++ b/esphome/components/uart/uart_component_esp8266.h
@@ -63,6 +63,21 @@ class ESP8266UartComponent : public UARTComponent, public Component {
 
   uint32_t get_config();
 
+  /**
+   * Load the UART with the current settings.
+   * @param dump_config (Optional, default `true`): True for displaying new settings or
+   * false to change it quitely
+   *
+   * Example:
+   * ```cpp
+   * id(uart1).load_settings();
+   * ```
+   *
+   * This will load the current UART interface with the latest settings (baud_rate, parity, etc).
+   */
+  void load_settings(bool dump_config) override;
+  void load_settings() override { this->load_settings(true); }
+
  protected:
   void check_logger_conflict() override;
 

From 869cdf122de7beb9a77618d3fee9e020057eadf1 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Tue, 9 Jan 2024 01:47:48 +0100
Subject: [PATCH 10/68] Nextion draw QR code at runtime (#6027)

---
 esphome/components/nextion/nextion.h          | 44 +++++++++++++++++++
 .../components/nextion/nextion_commands.cpp   | 13 ++++++
 2 files changed, 57 insertions(+)

diff --git a/esphome/components/nextion/nextion.h b/esphome/components/nextion/nextion.h
index 2f52a032c4..eef2c61638 100644
--- a/esphome/components/nextion/nextion.h
+++ b/esphome/components/nextion/nextion.h
@@ -750,6 +750,50 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
    */
   void filled_circle(int center_x, int center_y, int radius, Color color);
 
+  /**
+   * Draws a QR code in the screen
+   * @param x1 The top left x coordinate to start the QR code.
+   * @param y1 The top left y coordinate to start the QR code.
+   * @param content The content of the QR code (as a plain text - Nextion will generate the QR code).
+   * @param size The size (in pixels) for the QR code. Defaults to 200px.
+   * @param background_color The background color to draw with (as rgb565 integer). Defaults to 65535 (white).
+   * @param foreground_color The foreground color to draw with (as rgb565 integer). Defaults to 0 (black).
+   * @param logo_pic The picture id for the logo in the center of the QR code. Defaults to -1 (no logo).
+   * @param border_width The border width (in pixels) for the QR code. Defaults to 8px.
+   *
+   * Example:
+   * ```cpp
+   * it.qrcode(25, 25, "WIFI:S:MySSID;T:WPA;P:MyPassW0rd;;");
+   * ```
+   *
+   * Draws a QR code with a Wi-Fi network credentials starting at the given coordinates (25,25).
+   */
+  void qrcode(int x1, int y1, const char *content, int size = 200, uint16_t background_color = 65535,
+              uint16_t foreground_color = 0, int logo_pic = -1, uint8_t border_width = 8);
+  /**
+   * Draws a QR code in the screen
+   * @param x1 The top left x coordinate to start the QR code.
+   * @param y1 The top left y coordinate to start the QR code.
+   * @param content The content of the QR code (as a plain text - Nextion will generate the QR code).
+   * @param size The size (in pixels) for the QR code. Defaults to 200px.
+   * @param background_color The background color to draw with (as Color). Defaults to 65535 (white).
+   * @param foreground_color The foreground color to draw with (as Color). Defaults to 0 (black).
+   * @param logo_pic The picture id for the logo in the center of the QR code. Defaults to -1 (no logo).
+   * @param border_width The border width (in pixels) for the QR code. Defaults to 8px.
+   *
+   * Example:
+   * ```cpp
+   * auto blue = Color(0, 0, 255);
+   * auto red = Color(255, 0, 0);
+   * it.qrcode(25, 25, "WIFI:S:MySSID;T:WPA;P:MyPassW0rd;;", 150, blue, red);
+   * ```
+   *
+   * Draws a QR code with a Wi-Fi network credentials starting at the given coordinates (25,25) with size of 150px in
+   * red on a blue background.
+   */
+  void qrcode(int x1, int y1, const char *content, int size, Color background_color = Color(255, 255, 255),
+              Color foreground_color = Color(0, 0, 0), int logo_pic = -1, uint8_t border_width = 8);
+
   /** Set the brightness of the backlight.
    *
    * @param brightness The brightness percentage from 0 to 1.0.
diff --git a/esphome/components/nextion/nextion_commands.cpp b/esphome/components/nextion/nextion_commands.cpp
index 8512ea5573..c4849d6050 100644
--- a/esphome/components/nextion/nextion_commands.cpp
+++ b/esphome/components/nextion/nextion_commands.cpp
@@ -294,6 +294,19 @@ void Nextion::filled_circle(int center_x, int center_y, int radius, Color color)
                                             display::ColorUtil::color_to_565(color));
 }
 
+void Nextion::qrcode(int x1, int y1, const char *content, int size, uint16_t background_color,
+                     uint16_t foreground_color, int logo_pic, uint8_t border_width) {
+  this->add_no_result_to_queue_with_printf_("qrcode", "qrcode %d,%d,%d,%d,%d,%d,%d,\"%s\"", x1, y1, size,
+                                            background_color, foreground_color, logo_pic, border_width, content);
+}
+
+void Nextion::qrcode(int x1, int y1, const char *content, int size, Color background_color, Color foreground_color,
+                     int logo_pic, uint8_t border_width) {
+  this->add_no_result_to_queue_with_printf_(
+      "qrcode", "qrcode %d,%d,%d,%d,%d,%d,%d,\"%s\"", x1, y1, size, display::ColorUtil::color_to_565(background_color),
+      display::ColorUtil::color_to_565(foreground_color), logo_pic, border_width, content);
+}
+
 void Nextion::set_nextion_rtc_time(ESPTime time) {
   this->add_no_result_to_queue_with_printf_("rtc0", "rtc0=%u", time.year);
   this->add_no_result_to_queue_with_printf_("rtc1", "rtc1=%u", time.month);

From 79d00ec9136a03dcd86b1714edbeb9cba4d6eb4a Mon Sep 17 00:00:00 2001
From: Dusan Cervenka <Cervenka.dusan@gmail.com>
Date: Tue, 9 Jan 2024 02:07:21 +0100
Subject: [PATCH 11/68] Extend i2s config options (#6056)

---
 esphome/components/i2s_audio/microphone/__init__.py         | 6 ++++++
 .../i2s_audio/microphone/i2s_audio_microphone.cpp           | 4 ++--
 .../components/i2s_audio/microphone/i2s_audio_microphone.h  | 4 ++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/esphome/components/i2s_audio/microphone/__init__.py b/esphome/components/i2s_audio/microphone/__init__.py
index b917da3045..5ee359dc26 100644
--- a/esphome/components/i2s_audio/microphone/__init__.py
+++ b/esphome/components/i2s_audio/microphone/__init__.py
@@ -20,7 +20,9 @@ DEPENDENCIES = ["i2s_audio"]
 CONF_ADC_PIN = "adc_pin"
 CONF_ADC_TYPE = "adc_type"
 CONF_PDM = "pdm"
+CONF_SAMPLE_RATE = "sample_rate"
 CONF_BITS_PER_SAMPLE = "bits_per_sample"
+CONF_USE_APLL = "use_apll"
 
 I2SAudioMicrophone = i2s_audio_ns.class_(
     "I2SAudioMicrophone", I2SAudioIn, microphone.Microphone, cg.Component
@@ -62,9 +64,11 @@ BASE_SCHEMA = microphone.MICROPHONE_SCHEMA.extend(
         cv.GenerateID(): cv.declare_id(I2SAudioMicrophone),
         cv.GenerateID(CONF_I2S_AUDIO_ID): cv.use_id(I2SAudioComponent),
         cv.Optional(CONF_CHANNEL, default="right"): cv.enum(CHANNELS),
+        cv.Optional(CONF_SAMPLE_RATE, default=16000): cv.int_range(min=1),
         cv.Optional(CONF_BITS_PER_SAMPLE, default="32bit"): cv.All(
             _validate_bits, cv.enum(BITS_PER_SAMPLE)
         ),
+        cv.Optional(CONF_USE_APLL, default=False): cv.boolean,
     }
 ).extend(cv.COMPONENT_SCHEMA)
 
@@ -105,6 +109,8 @@ async def to_code(config):
         cg.add(var.set_pdm(config[CONF_PDM]))
 
     cg.add(var.set_channel(config[CONF_CHANNEL]))
+    cg.add(var.set_sample_rate(config[CONF_SAMPLE_RATE]))
     cg.add(var.set_bits_per_sample(config[CONF_BITS_PER_SAMPLE]))
+    cg.add(var.set_use_apll(config[CONF_USE_APLL]))
 
     await microphone.register_microphone(var, config)
diff --git a/esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp b/esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp
index ec2fe258c9..602d537bcb 100644
--- a/esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp
+++ b/esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp
@@ -47,14 +47,14 @@ void I2SAudioMicrophone::start_() {
   }
   i2s_driver_config_t config = {
       .mode = (i2s_mode_t) (I2S_MODE_MASTER | I2S_MODE_RX),
-      .sample_rate = 16000,
+      .sample_rate = this->sample_rate_,
       .bits_per_sample = this->bits_per_sample_,
       .channel_format = this->channel_,
       .communication_format = I2S_COMM_FORMAT_STAND_I2S,
       .intr_alloc_flags = ESP_INTR_FLAG_LEVEL1,
       .dma_buf_count = 4,
       .dma_buf_len = 256,
-      .use_apll = false,
+      .use_apll = this->use_apll_,
       .tx_desc_auto_clear = false,
       .fixed_mclk = 0,
       .mclk_multiple = I2S_MCLK_MULTIPLE_DEFAULT,
diff --git a/esphome/components/i2s_audio/microphone/i2s_audio_microphone.h b/esphome/components/i2s_audio/microphone/i2s_audio_microphone.h
index dc6b70047a..68b9a94fbd 100644
--- a/esphome/components/i2s_audio/microphone/i2s_audio_microphone.h
+++ b/esphome/components/i2s_audio/microphone/i2s_audio_microphone.h
@@ -31,7 +31,9 @@ class I2SAudioMicrophone : public I2SAudioIn, public microphone::Microphone, pub
 #endif
 
   void set_channel(i2s_channel_fmt_t channel) { this->channel_ = channel; }
+  void set_sample_rate(uint32_t sample_rate) { this->sample_rate_ = sample_rate; }
   void set_bits_per_sample(i2s_bits_per_sample_t bits_per_sample) { this->bits_per_sample_ = bits_per_sample; }
+  void set_use_apll(uint32_t use_apll) { this->use_apll_ = use_apll; }
 
  protected:
   void start_();
@@ -45,7 +47,9 @@ class I2SAudioMicrophone : public I2SAudioIn, public microphone::Microphone, pub
 #endif
   bool pdm_{false};
   i2s_channel_fmt_t channel_;
+  uint32_t sample_rate_;
   i2s_bits_per_sample_t bits_per_sample_;
+  bool use_apll_;
 
   HighFrequencyLoopRequester high_freq_;
 };

From 65e6f9cba98803fc75ee035a225213dbf47932cd Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Tue, 9 Jan 2024 12:07:45 +1100
Subject: [PATCH 12/68] Add getter for image data_start (#6036)

---
 esphome/components/image/image.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/components/image/image.h b/esphome/components/image/image.h
index 4e869f5204..5f1f50a134 100644
--- a/esphome/components/image/image.h
+++ b/esphome/components/image/image.h
@@ -37,6 +37,7 @@ class Image : public display::BaseImage {
   Color get_pixel(int x, int y, Color color_on = display::COLOR_ON, Color color_off = display::COLOR_OFF) const;
   int get_width() const override;
   int get_height() const override;
+  const uint8_t *get_data_start() { return this->data_start_; }
   ImageType get_type() const;
 
   void draw(int x, int y, display::Display *display, Color color_on, Color color_off) override;

From d9def0cb3a757750df4bf2c2a73af761bd559a51 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 8 Jan 2024 15:08:50 -1000
Subject: [PATCH 13/68] Bump hypothesis to 6.92.1 (#6011)

---
 requirements_test.txt            | 2 +-
 tests/unit_tests/test_core.py    | 2 +-
 tests/unit_tests/test_helpers.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/requirements_test.txt b/requirements_test.txt
index 0348ef6cb2..9015152794 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -10,4 +10,4 @@ pytest-cov==4.1.0
 pytest-mock==3.12.0
 pytest-asyncio==0.23.2
 asyncmock==0.4.2
-hypothesis==5.49.0
+hypothesis==6.92.1
diff --git a/tests/unit_tests/test_core.py b/tests/unit_tests/test_core.py
index efa9ff5677..2860486efe 100644
--- a/tests/unit_tests/test_core.py
+++ b/tests/unit_tests/test_core.py
@@ -1,7 +1,7 @@
 import pytest
 
 from hypothesis import given
-from hypothesis.provisional import ip_addresses
+from hypothesis.strategies import ip_addresses
 from strategies import mac_addr_strings
 
 from esphome import core, const
diff --git a/tests/unit_tests/test_helpers.py b/tests/unit_tests/test_helpers.py
index fc6bdbcdec..26ebdcf6af 100644
--- a/tests/unit_tests/test_helpers.py
+++ b/tests/unit_tests/test_helpers.py
@@ -1,7 +1,7 @@
 import pytest
 
 from hypothesis import given
-from hypothesis.provisional import ip_addresses
+from hypothesis.strategies import ip_addresses
 
 from esphome import helpers
 

From 2be19c4e458c6e86f9357b241792ba2fd0889d2b Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 8 Jan 2024 15:13:18 -1000
Subject: [PATCH 14/68] Bump recommended ESP32 IDF to 4.4.6 (#6048)

---
 esphome/components/esp32/__init__.py          |  6 +++---
 .../components/esp32_ble_tracker/__init__.py  | 20 ++++++++++++-------
 platformio.ini                                |  2 +-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py
index 5d17633975..50d6d229f9 100644
--- a/esphome/components/esp32/__init__.py
+++ b/esphome/components/esp32/__init__.py
@@ -226,7 +226,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, 5)
+RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION = cv.Version(4, 4, 6)
 # 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
@@ -271,8 +271,8 @@ def _arduino_check_versions(value):
 def _esp_idf_check_versions(value):
     value = value.copy()
     lookups = {
-        "dev": (cv.Version(5, 1, 0), "https://github.com/espressif/esp-idf.git"),
-        "latest": (cv.Version(5, 1, 0), None),
+        "dev": (cv.Version(5, 1, 2), "https://github.com/espressif/esp-idf.git"),
+        "latest": (cv.Version(5, 1, 2), None),
         "recommended": (RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION, None),
     }
 
diff --git a/esphome/components/esp32_ble_tracker/__init__.py b/esphome/components/esp32_ble_tracker/__init__.py
index 2ead59c025..1edeaadbfd 100644
--- a/esphome/components/esp32_ble_tracker/__init__.py
+++ b/esphome/components/esp32_ble_tracker/__init__.py
@@ -1,23 +1,26 @@
 import re
+
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation
+from esphome.components import esp32_ble
+from esphome.components.esp32 import add_idf_sdkconfig_option
 from esphome.const import (
     CONF_ACTIVE,
+    CONF_DURATION,
     CONF_ID,
     CONF_INTERVAL,
-    CONF_DURATION,
-    CONF_TRIGGER_ID,
     CONF_MAC_ADDRESS,
-    CONF_SERVICE_UUID,
     CONF_MANUFACTURER_ID,
     CONF_ON_BLE_ADVERTISE,
-    CONF_ON_BLE_SERVICE_DATA_ADVERTISE,
     CONF_ON_BLE_MANUFACTURER_DATA_ADVERTISE,
+    CONF_ON_BLE_SERVICE_DATA_ADVERTISE,
+    CONF_SERVICE_UUID,
+    CONF_TRIGGER_ID,
+    KEY_CORE,
+    KEY_FRAMEWORK_VERSION,
 )
-from esphome.components import esp32_ble
 from esphome.core import CORE
-from esphome.components.esp32 import add_idf_sdkconfig_option
 
 AUTO_LOAD = ["esp32_ble"]
 DEPENDENCIES = ["esp32"]
@@ -263,7 +266,10 @@ async def to_code(config):
         # https://github.com/espressif/esp-idf/issues/2503
         # Match arduino CONFIG_BTU_TASK_STACK_SIZE
         # https://github.com/espressif/arduino-esp32/blob/fd72cf46ad6fc1a6de99c1d83ba8eba17d80a4ee/tools/sdk/esp32/sdkconfig#L1866
-        add_idf_sdkconfig_option("CONFIG_BTU_TASK_STACK_SIZE", 8192)
+        if CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] >= cv.Version(4, 4, 6):
+            add_idf_sdkconfig_option("CONFIG_BT_BTU_TASK_STACK_SIZE", 8192)
+        else:
+            add_idf_sdkconfig_option("CONFIG_BTU_TASK_STACK_SIZE", 8192)
         add_idf_sdkconfig_option("CONFIG_BT_ACL_CONNECTIONS", 9)
 
     cg.add_define("USE_OTA_STATE_CALLBACK")  # To be notified when an OTA update starts
diff --git a/platformio.ini b/platformio.ini
index 2dfaa79a52..f5f510244c 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -136,7 +136,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.40405.0
+    platformio/framework-espidf@~3.40406.0
 
 framework = espidf
 lib_deps =

From 87301a2e766435f97ece93deb200bc3bd69ed3e7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 15:33:50 -1000
Subject: [PATCH 15/68] Bump pytest from 7.4.3 to 7.4.4 (#6046)

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

diff --git a/requirements_test.txt b/requirements_test.txt
index 9015152794..bf7103f025 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -5,7 +5,7 @@ pyupgrade==3.15.0  # also change in .pre-commit-config.yaml when updating
 pre-commit
 
 # Unit tests
-pytest==7.4.3
+pytest==7.4.4
 pytest-cov==4.1.0
 pytest-mock==3.12.0
 pytest-asyncio==0.23.2

From 6dfdcff66caf3f62de6442f7ecb2f194d1232c11 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 8 Jan 2024 15:35:43 -1000
Subject: [PATCH 16/68] dashboard: refactor ping implementation to be more
 efficient (#6002)

---
 esphome/dashboard/const.py       |  2 +
 esphome/dashboard/core.py        |  5 +-
 esphome/dashboard/dashboard.py   | 99 ++++++++++++++++++++++++++++++++
 esphome/dashboard/dns.py         | 43 ++++++++++++++
 esphome/dashboard/settings.py    | 15 +++++
 esphome/dashboard/status/ping.py | 85 ++++++++++++++++++++++-----
 esphome/dashboard/web_server.py  | 25 ++++++--
 requirements.txt                 |  2 +
 8 files changed, 255 insertions(+), 21 deletions(-)
 create mode 100644 esphome/dashboard/dns.py

diff --git a/esphome/dashboard/const.py b/esphome/dashboard/const.py
index ed2b81d3e8..190d6c4a9a 100644
--- a/esphome/dashboard/const.py
+++ b/esphome/dashboard/const.py
@@ -4,5 +4,7 @@ EVENT_ENTRY_ADDED = "entry_added"
 EVENT_ENTRY_REMOVED = "entry_removed"
 EVENT_ENTRY_UPDATED = "entry_updated"
 EVENT_ENTRY_STATE_CHANGED = "entry_state_changed"
+MAX_EXECUTOR_WORKERS = 48
+
 
 SENTINEL = object()
diff --git a/esphome/dashboard/core.py b/esphome/dashboard/core.py
index ffec9784e8..e22d95fba9 100644
--- a/esphome/dashboard/core.py
+++ b/esphome/dashboard/core.py
@@ -8,6 +8,7 @@ from functools import partial
 from typing import TYPE_CHECKING, Any, Callable
 
 from ..zeroconf import DiscoveredImport
+from .dns import DNSCache
 from .entries import DashboardEntries
 from .settings import DashboardSettings
 
@@ -69,6 +70,7 @@ class ESPHomeDashboard:
         "mqtt_ping_request",
         "mdns_status",
         "settings",
+        "dns_cache",
     )
 
     def __init__(self) -> None:
@@ -81,7 +83,8 @@ class ESPHomeDashboard:
         self.ping_request: asyncio.Event | None = None
         self.mqtt_ping_request = threading.Event()
         self.mdns_status: MDNSStatus | None = None
-        self.settings: DashboardSettings = DashboardSettings()
+        self.settings = DashboardSettings()
+        self.dns_cache = DNSCache()
 
     async def async_setup(self) -> None:
         """Setup the dashboard."""
diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 789b14653c..2be98ab3e4 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -1,11 +1,19 @@
 from __future__ import annotations
 
 import asyncio
+import logging
 import os
 import socket
+import threading
+import traceback
+from asyncio import events
+from concurrent.futures import ThreadPoolExecutor
+from time import monotonic
+from typing import Any
 
 from esphome.storage_json import EsphomeStorageJSON, esphome_storage_path
 
+from .const import MAX_EXECUTOR_WORKERS
 from .core import DASHBOARD
 from .web_server import make_app, start_web_server
 
@@ -14,6 +22,95 @@ ENV_DEV = "ESPHOME_DASHBOARD_DEV"
 settings = DASHBOARD.settings
 
 
+def can_use_pidfd() -> bool:
+    """Check if pidfd_open is available.
+
+    Back ported from cpython 3.12
+    """
+    if not hasattr(os, "pidfd_open"):
+        return False
+    try:
+        pid = os.getpid()
+        os.close(os.pidfd_open(pid, 0))
+    except OSError:
+        # blocked by security policy like SECCOMP
+        return False
+    return True
+
+
+class DashboardEventLoopPolicy(asyncio.DefaultEventLoopPolicy):
+    """Event loop policy for Home Assistant."""
+
+    def __init__(self, debug: bool) -> None:
+        """Init the event loop policy."""
+        super().__init__()
+        self.debug = debug
+        self._watcher: asyncio.AbstractChildWatcher | None = None
+
+    def _init_watcher(self) -> None:
+        """Initialize the watcher for child processes.
+
+        Back ported from cpython 3.12
+        """
+        with events._lock:  # type: ignore[attr-defined] # pylint: disable=protected-access
+            if self._watcher is None:  # pragma: no branch
+                if can_use_pidfd():
+                    self._watcher = asyncio.PidfdChildWatcher()
+                else:
+                    self._watcher = asyncio.ThreadedChildWatcher()
+                if threading.current_thread() is threading.main_thread():
+                    self._watcher.attach_loop(
+                        self._local._loop  # type: ignore[attr-defined] # pylint: disable=protected-access
+                    )
+
+    @property
+    def loop_name(self) -> str:
+        """Return name of the loop."""
+        return self._loop_factory.__name__  # type: ignore[no-any-return,attr-defined]
+
+    def new_event_loop(self) -> asyncio.AbstractEventLoop:
+        """Get the event loop."""
+        loop: asyncio.AbstractEventLoop = super().new_event_loop()
+        loop.set_exception_handler(_async_loop_exception_handler)
+
+        if self.debug:
+            loop.set_debug(True)
+
+        executor = ThreadPoolExecutor(
+            thread_name_prefix="SyncWorker", max_workers=MAX_EXECUTOR_WORKERS
+        )
+        loop.set_default_executor(executor)
+        # bind the built-in time.monotonic directly as loop.time to avoid the
+        # overhead of the additional method call since its the most called loop
+        # method and its roughly 10%+ of all the call time in base_events.py
+        loop.time = monotonic  # type: ignore[method-assign]
+        return loop
+
+
+def _async_loop_exception_handler(_: Any, context: dict[str, Any]) -> None:
+    """Handle all exception inside the core loop."""
+    kwargs = {}
+    if exception := context.get("exception"):
+        kwargs["exc_info"] = (type(exception), exception, exception.__traceback__)
+
+    logger = logging.getLogger(__package__)
+    if source_traceback := context.get("source_traceback"):
+        stack_summary = "".join(traceback.format_list(source_traceback))
+        logger.error(
+            "Error doing job: %s: %s",
+            context["message"],
+            stack_summary,
+            **kwargs,  # type: ignore[arg-type]
+        )
+        return
+
+    logger.error(
+        "Error doing job: %s",
+        context["message"],
+        **kwargs,  # type: ignore[arg-type]
+    )
+
+
 def start_dashboard(args) -> None:
     """Start the dashboard."""
     settings.parse_args(args)
@@ -26,6 +123,8 @@ def start_dashboard(args) -> None:
             storage.save(path)
         settings.cookie_secret = storage.cookie_secret
 
+    asyncio.set_event_loop_policy(DashboardEventLoopPolicy(settings.verbose))
+
     try:
         asyncio.run(async_start(args))
     except KeyboardInterrupt:
diff --git a/esphome/dashboard/dns.py b/esphome/dashboard/dns.py
new file mode 100644
index 0000000000..b78a909220
--- /dev/null
+++ b/esphome/dashboard/dns.py
@@ -0,0 +1,43 @@
+from __future__ import annotations
+
+import asyncio
+import sys
+
+from icmplib import NameLookupError, async_resolve
+
+if sys.version_info >= (3, 11):
+    from asyncio import timeout as async_timeout
+else:
+    from async_timeout import timeout as async_timeout
+
+
+async def _async_resolve_wrapper(hostname: str) -> list[str] | Exception:
+    """Wrap the icmplib async_resolve function."""
+    try:
+        async with async_timeout(2):
+            return await async_resolve(hostname)
+    except (asyncio.TimeoutError, NameLookupError, UnicodeError) as ex:
+        return ex
+
+
+class DNSCache:
+    """DNS cache for the dashboard."""
+
+    def __init__(self, ttl: int | None = 120) -> None:
+        """Initialize the DNSCache."""
+        self._cache: dict[str, tuple[float, list[str] | Exception]] = {}
+        self._ttl = ttl
+
+    async def async_resolve(
+        self, hostname: str, now_monotonic: float
+    ) -> list[str] | Exception:
+        """Resolve a hostname to a list of IP address."""
+        if expire_time_addresses := self._cache.get(hostname):
+            expire_time, addresses = expire_time_addresses
+            if expire_time > now_monotonic:
+                return addresses
+
+        expires = now_monotonic + self._ttl
+        addresses = await _async_resolve_wrapper(hostname)
+        self._cache[hostname] = (expires, addresses)
+        return addresses
diff --git a/esphome/dashboard/settings.py b/esphome/dashboard/settings.py
index 1a5b1620e8..1f05abab4c 100644
--- a/esphome/dashboard/settings.py
+++ b/esphome/dashboard/settings.py
@@ -14,7 +14,19 @@ from .util.password import password_hash
 class DashboardSettings:
     """Settings for the dashboard."""
 
+    __slots__ = (
+        "config_dir",
+        "password_hash",
+        "username",
+        "using_password",
+        "on_ha_addon",
+        "cookie_secret",
+        "absolute_config_dir",
+        "verbose",
+    )
+
     def __init__(self) -> None:
+        """Initialize the dashboard settings."""
         self.config_dir: str = ""
         self.password_hash: str = ""
         self.username: str = ""
@@ -22,8 +34,10 @@ class DashboardSettings:
         self.on_ha_addon: bool = False
         self.cookie_secret: str | None = None
         self.absolute_config_dir: Path | None = None
+        self.verbose: bool = False
 
     def parse_args(self, args: Any) -> None:
+        """Parse the arguments."""
         self.on_ha_addon: bool = args.ha_addon
         password = args.password or os.getenv("PASSWORD") or ""
         if not self.on_ha_addon:
@@ -33,6 +47,7 @@ class DashboardSettings:
             self.password_hash = password_hash(password)
         self.config_dir = args.configuration
         self.absolute_config_dir = Path(self.config_dir).resolve()
+        self.verbose = args.verbose
         CORE.config_path = os.path.join(self.config_dir, ".")
 
     @property
diff --git a/esphome/dashboard/status/ping.py b/esphome/dashboard/status/ping.py
index 989cd1570f..6630f03c9d 100644
--- a/esphome/dashboard/status/ping.py
+++ b/esphome/dashboard/status/ping.py
@@ -1,20 +1,20 @@
 from __future__ import annotations
 
 import asyncio
-import os
+import logging
+import time
 from typing import cast
 
+from icmplib import Host, SocketPermissionError, async_ping
+
+from ..const import MAX_EXECUTOR_WORKERS
 from ..core import DASHBOARD
-from ..entries import DashboardEntry, bool_to_entry_state
+from ..entries import DashboardEntry, EntryState, bool_to_entry_state
 from ..util.itertools import chunked
-from ..util.subprocess import async_system_command_status
 
+_LOGGER = logging.getLogger(__name__)
 
-async def _async_ping_host(host: str) -> bool:
-    """Ping a host."""
-    return await async_system_command_status(
-        ["ping", "-n" if os.name == "nt" else "-c", "1", host]
-    )
+GROUP_SIZE = int(MAX_EXECUTOR_WORKERS / 2)
 
 
 class PingStatus:
@@ -27,6 +27,10 @@ class PingStatus:
         """Run the ping status."""
         dashboard = DASHBOARD
         entries = dashboard.entries
+        privileged = await _can_use_icmp_lib_with_privilege()
+        if privileged is None:
+            _LOGGER.warning("Cannot use icmplib because privileges are insufficient")
+            return
 
         while not dashboard.stop_event.is_set():
             # Only ping if the dashboard is open
@@ -36,15 +40,68 @@ class PingStatus:
             to_ping: list[DashboardEntry] = [
                 entry for entry in current_entries if entry.address is not None
             ]
-            for ping_group in chunked(to_ping, 16):
+
+            # Resolve DNS for all entries
+            entries_with_addresses: dict[DashboardEntry, list[str]] = {}
+            for ping_group in chunked(to_ping, GROUP_SIZE):
                 ping_group = cast(list[DashboardEntry], ping_group)
-                results = await asyncio.gather(
-                    *(_async_ping_host(entry.address) for entry in ping_group),
+                now_monotonic = time.monotonic()
+                dns_results = await asyncio.gather(
+                    *(
+                        dashboard.dns_cache.async_resolve(entry.address, now_monotonic)
+                        for entry in ping_group
+                    ),
                     return_exceptions=True,
                 )
-                for entry, result in zip(ping_group, results):
+
+                for entry, result in zip(ping_group, dns_results):
                     if isinstance(result, Exception):
-                        result = False
+                        entries.async_set_state(entry, EntryState.UNKNOWN)
+                        continue
+                    if isinstance(result, BaseException):
+                        raise result
+                    entries_with_addresses[entry] = result
+
+            # Ping all entries with valid addresses
+            for ping_group in chunked(entries_with_addresses.items(), GROUP_SIZE):
+                entry_addresses = cast(tuple[DashboardEntry, list[str]], ping_group)
+
+                results = await asyncio.gather(
+                    *(
+                        async_ping(addresses[0], privileged=privileged)
+                        for _, addresses in entry_addresses
+                    ),
+                    return_exceptions=True,
+                )
+
+                for entry_addresses, result in zip(entry_addresses, results):
+                    if isinstance(result, Exception):
+                        ping_result = False
                     elif isinstance(result, BaseException):
                         raise result
-                    entries.async_set_state(entry, bool_to_entry_state(result))
+                    else:
+                        host: Host = result
+                        ping_result = host.is_alive
+                    entry, _ = entry_addresses
+                    entries.async_set_state(entry, bool_to_entry_state(ping_result))
+
+
+async def _can_use_icmp_lib_with_privilege() -> None | bool:
+    """Verify we can create a raw socket."""
+    try:
+        await async_ping("127.0.0.1", count=0, timeout=0, privileged=True)
+    except SocketPermissionError:
+        try:
+            await async_ping("127.0.0.1", count=0, timeout=0, privileged=False)
+        except SocketPermissionError:
+            _LOGGER.debug(
+                "Cannot use icmplib because privileges are insufficient to create the"
+                " socket"
+            )
+            return None
+
+        _LOGGER.debug("Using icmplib in privileged=False mode")
+        return False
+
+    _LOGGER.debug("Using icmplib in privileged=True mode")
+    return True
diff --git a/esphome/dashboard/web_server.py b/esphome/dashboard/web_server.py
index 6a80865906..c16461d174 100644
--- a/esphome/dashboard/web_server.py
+++ b/esphome/dashboard/web_server.py
@@ -9,6 +9,7 @@ import hashlib
 import json
 import logging
 import os
+import time
 import secrets
 import shutil
 import subprocess
@@ -302,16 +303,28 @@ class EsphomePortCommandWebSocket(EsphomeCommandWebSocket):
         port = json_message["port"]
         if (
             port == "OTA"  # pylint: disable=too-many-boolean-expressions
-            and (mdns := dashboard.mdns_status)
             and (entry := entries.get(config_file))
             and entry.loaded_integrations
             and "api" in entry.loaded_integrations
-            and (address := await mdns.async_resolve_host(entry.name))
         ):
-            # Use the IP address if available but only
-            # if the API is loaded and the device is online
-            # since MQTT logging will not work otherwise
-            port = address
+            if (mdns := dashboard.mdns_status) and (
+                address := await mdns.async_resolve_host(entry.name)
+            ):
+                # Use the IP address if available but only
+                # if the API is loaded and the device is online
+                # since MQTT logging will not work otherwise
+                port = address
+            elif (
+                entry.address
+                and (
+                    address_list := await dashboard.dns_cache.async_resolve(
+                        entry.address, time.monotonic()
+                    )
+                )
+                and not isinstance(address_list, Exception)
+            ):
+                # If mdns is not available, try to use the DNS cache
+                port = address_list[0]
 
         return [
             *DASHBOARD_COMMAND,
diff --git a/requirements.txt b/requirements.txt
index 115f85de3e..5281b64e66 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,9 @@
+async_timeout==4.0.3; python_version <= "3.10"
 voluptuous==0.14.1
 PyYAML==6.0.1
 paho-mqtt==1.6.1
 colorama==0.4.6
+icmplib==3.0.4
 tornado==6.4
 tzlocal==5.2    # from time
 tzdata>=2021.1  # from time

From 97be209aec830789184df9e2174bee5427a24afd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 16:11:48 -1000
Subject: [PATCH 17/68] Bump pytest-asyncio from 0.23.2 to 0.23.3 (#6047)

---
 requirements_test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements_test.txt b/requirements_test.txt
index bf7103f025..35f48e767f 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -8,6 +8,6 @@ pre-commit
 pytest==7.4.4
 pytest-cov==4.1.0
 pytest-mock==3.12.0
-pytest-asyncio==0.23.2
+pytest-asyncio==0.23.3
 asyncmock==0.4.2
 hypothesis==6.92.1

From aa8a533da6eb35f0ab6ffb64423a6bffe99c2f03 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 16:12:08 -1000
Subject: [PATCH 18/68] Bump black from 23.12.0 to 23.12.1 (#6018)

---
 .pre-commit-config.yaml | 2 +-
 requirements_test.txt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 36ec1894d8..b2f44d088f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,7 +3,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 23.12.0
+    rev: 23.12.1
     hooks:
       - id: black
         args:
diff --git a/requirements_test.txt b/requirements_test.txt
index 35f48e767f..74d66f5b25 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,6 +1,6 @@
 pylint==3.0.3
 flake8==7.0.0  # also change in .pre-commit-config.yaml when updating
-black==23.12.0  # also change in .pre-commit-config.yaml when updating
+black==23.12.1  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.15.0  # also change in .pre-commit-config.yaml when updating
 pre-commit
 

From fcd549e5b6d5a776551acde2e38c59d04535b2b2 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 8 Jan 2024 17:18:13 -1000
Subject: [PATCH 19/68] Run python tests on windows and macos (#6010)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 .github/actions/restore-python/action.yml | 13 +++++--
 .github/workflows/ci.yml                  | 44 +++++++++++++++++++++--
 2 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/.github/actions/restore-python/action.yml b/.github/actions/restore-python/action.yml
index 18a2485dbb..3c1a5e2b04 100644
--- a/.github/actions/restore-python/action.yml
+++ b/.github/actions/restore-python/action.yml
@@ -28,11 +28,20 @@ runs:
         # yamllint disable-line rule:line-length
         key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{ inputs.cache-key }}
     - name: Create Python virtual environment
-      if: steps.cache-venv.outputs.cache-hit != 'true'
+      if: steps.cache-venv.outputs.cache-hit != 'true' && runner.os != 'Windows'
       shell: bash
       run: |
         python -m venv venv
-        . venv/bin/activate
+        source venv/bin/activate
+        python --version
+        pip install -r requirements.txt -r requirements_optional.txt -r requirements_test.txt
+        pip install -e .
+    - name: Create Python virtual environment
+      if: steps.cache-venv.outputs.cache-hit != 'true' && runner.os == 'Windows'
+      shell: bash
+      run: |
+        python -m venv venv
+        ./venv/Scripts/activate
         python --version
         pip install -r requirements.txt -r requirements_optional.txt -r requirements_test.txt
         pip install -e .
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8182f92f94..1ddc49b504 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -166,7 +166,35 @@ jobs:
 
   pytest:
     name: Run pytest
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version:
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12"
+        os:
+          - ubuntu-latest
+          - macOS-latest
+          - windows-latest
+        exclude:
+          # Minimize CI resource usage
+          # by only running the Python version
+          # version used for docker images on Windows and macOS
+          - python-version: "3.12"
+            os: windows-latest
+          - python-version: "3.10"
+            os: windows-latest
+          - python-version: "3.9"
+            os: windows-latest
+          - python-version: "3.12"
+            os: macOS-latest
+          - python-version: "3.10"
+            os: macOS-latest
+          - python-version: "3.9"
+            os: macOS-latest
+    runs-on: ${{ matrix.os }}
     needs:
       - common
     steps:
@@ -175,14 +203,24 @@ jobs:
       - name: Restore Python
         uses: ./.github/actions/restore-python
         with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
+          python-version: ${{ matrix.python-version }}
           cache-key: ${{ needs.common.outputs.cache-key }}
       - name: Register matcher
         run: echo "::add-matcher::.github/workflows/matchers/pytest.json"
       - name: Run pytest
+        if: matrix.os == 'windows-latest'
+        run: |
+          ./venv/Scripts/activate
+          pytest -vv --cov-report=xml --tb=native tests
+      - name: Run pytest
+        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macOS-latest'
         run: |
           . venv/bin/activate
-          pytest -vv --tb=native tests
+          pytest -vv --cov-report=xml --tb=native tests
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   clang-format:
     name: Check clang-format

From 4b783c03723f50df6969e78ef26729b4b05fa70b Mon Sep 17 00:00:00 2001
From: Andrey Bodrov <ap.bodrov@gmail.com>
Date: Wed, 10 Jan 2024 07:31:38 +0300
Subject: [PATCH 20/68] BME280 SPI (#5538)

* bme spi finally

* linter

* CO

* tidy

* lint

* tidy [2]

* tidy[-1]

* final solution

* Update test1.yaml

remove failed test

* Update test1.1.yaml

add test to another file with free GPIO5 pin

* fix spi read bytes

* fix tests

* rename bme280 to bme280_i2c
---
 CODEOWNERS                                    |   2 +
 esphome/components/bme280/sensor.py           | 116 ------------------
 esphome/components/bme280_base/__init__.py    |   1 +
 .../bme280_base.cpp}                          |  68 +++++-----
 .../bme280.h => bme280_base/bme280_base.h}    |  14 ++-
 esphome/components/bme280_base/sensor.py      | 106 ++++++++++++++++
 .../{bme280 => bme280_i2c}/__init__.py        |   0
 esphome/components/bme280_i2c/bme280_i2c.cpp  |  30 +++++
 esphome/components/bme280_i2c/bme280_i2c.h    |  20 +++
 esphome/components/bme280_i2c/sensor.py       |  19 +++
 esphome/components/bme280_spi/__init__.py     |   1 +
 esphome/components/bme280_spi/bme280_spi.cpp  |  66 ++++++++++
 esphome/components/bme280_spi/bme280_spi.h    |  20 +++
 esphome/components/bme280_spi/sensor.py       |  24 ++++
 tests/test1.yaml                              |  17 ++-
 15 files changed, 350 insertions(+), 154 deletions(-)
 delete mode 100644 esphome/components/bme280/sensor.py
 create mode 100644 esphome/components/bme280_base/__init__.py
 rename esphome/components/{bme280/bme280.cpp => bme280_base/bme280_base.cpp} (93%)
 rename esphome/components/{bme280/bme280.h => bme280_base/bme280_base.h} (90%)
 create mode 100644 esphome/components/bme280_base/sensor.py
 rename esphome/components/{bme280 => bme280_i2c}/__init__.py (100%)
 create mode 100644 esphome/components/bme280_i2c/bme280_i2c.cpp
 create mode 100644 esphome/components/bme280_i2c/bme280_i2c.h
 create mode 100644 esphome/components/bme280_i2c/sensor.py
 create mode 100644 esphome/components/bme280_spi/__init__.py
 create mode 100644 esphome/components/bme280_spi/bme280_spi.cpp
 create mode 100644 esphome/components/bme280_spi/bme280_spi.h
 create mode 100644 esphome/components/bme280_spi/sensor.py

diff --git a/CODEOWNERS b/CODEOWNERS
index c655f94a1b..0ff5ce4508 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -54,6 +54,8 @@ esphome/components/bl0940/* @tobias-
 esphome/components/bl0942/* @dbuezas
 esphome/components/ble_client/* @buxtronix @clydebarrow
 esphome/components/bluetooth_proxy/* @jesserockz
+esphome/components/bme280_base/* @esphome/core
+esphome/components/bme280_spi/* @apbodrov
 esphome/components/bme680_bsec/* @trvrnrth
 esphome/components/bmi160/* @flaviut
 esphome/components/bmp3xx/* @martgras
diff --git a/esphome/components/bme280/sensor.py b/esphome/components/bme280/sensor.py
deleted file mode 100644
index 35744a436d..0000000000
--- a/esphome/components/bme280/sensor.py
+++ /dev/null
@@ -1,116 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import i2c, sensor
-from esphome.const import (
-    CONF_HUMIDITY,
-    CONF_ID,
-    CONF_IIR_FILTER,
-    CONF_OVERSAMPLING,
-    CONF_PRESSURE,
-    CONF_TEMPERATURE,
-    DEVICE_CLASS_HUMIDITY,
-    DEVICE_CLASS_PRESSURE,
-    DEVICE_CLASS_TEMPERATURE,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_CELSIUS,
-    UNIT_HECTOPASCAL,
-    UNIT_PERCENT,
-)
-
-DEPENDENCIES = ["i2c"]
-
-bme280_ns = cg.esphome_ns.namespace("bme280")
-BME280Oversampling = bme280_ns.enum("BME280Oversampling")
-OVERSAMPLING_OPTIONS = {
-    "NONE": BME280Oversampling.BME280_OVERSAMPLING_NONE,
-    "1X": BME280Oversampling.BME280_OVERSAMPLING_1X,
-    "2X": BME280Oversampling.BME280_OVERSAMPLING_2X,
-    "4X": BME280Oversampling.BME280_OVERSAMPLING_4X,
-    "8X": BME280Oversampling.BME280_OVERSAMPLING_8X,
-    "16X": BME280Oversampling.BME280_OVERSAMPLING_16X,
-}
-
-BME280IIRFilter = bme280_ns.enum("BME280IIRFilter")
-IIR_FILTER_OPTIONS = {
-    "OFF": BME280IIRFilter.BME280_IIR_FILTER_OFF,
-    "2X": BME280IIRFilter.BME280_IIR_FILTER_2X,
-    "4X": BME280IIRFilter.BME280_IIR_FILTER_4X,
-    "8X": BME280IIRFilter.BME280_IIR_FILTER_8X,
-    "16X": BME280IIRFilter.BME280_IIR_FILTER_16X,
-}
-
-BME280Component = bme280_ns.class_(
-    "BME280Component", cg.PollingComponent, i2c.I2CDevice
-)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(BME280Component),
-            cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_CELSIUS,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_TEMPERATURE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ).extend(
-                {
-                    cv.Optional(CONF_OVERSAMPLING, default="16X"): cv.enum(
-                        OVERSAMPLING_OPTIONS, upper=True
-                    ),
-                }
-            ),
-            cv.Optional(CONF_PRESSURE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_HECTOPASCAL,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_PRESSURE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ).extend(
-                {
-                    cv.Optional(CONF_OVERSAMPLING, default="16X"): cv.enum(
-                        OVERSAMPLING_OPTIONS, upper=True
-                    ),
-                }
-            ),
-            cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(
-                unit_of_measurement=UNIT_PERCENT,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_HUMIDITY,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ).extend(
-                {
-                    cv.Optional(CONF_OVERSAMPLING, default="16X"): cv.enum(
-                        OVERSAMPLING_OPTIONS, upper=True
-                    ),
-                }
-            ),
-            cv.Optional(CONF_IIR_FILTER, default="OFF"): cv.enum(
-                IIR_FILTER_OPTIONS, upper=True
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(i2c.i2c_device_schema(0x77))
-)
-
-
-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)
-
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature_sensor(sens))
-        cg.add(var.set_temperature_oversampling(temperature_config[CONF_OVERSAMPLING]))
-
-    if pressure_config := config.get(CONF_PRESSURE):
-        sens = await sensor.new_sensor(pressure_config)
-        cg.add(var.set_pressure_sensor(sens))
-        cg.add(var.set_pressure_oversampling(pressure_config[CONF_OVERSAMPLING]))
-
-    if humidity_config := config.get(CONF_HUMIDITY):
-        sens = await sensor.new_sensor(humidity_config)
-        cg.add(var.set_humidity_sensor(sens))
-        cg.add(var.set_humidity_oversampling(humidity_config[CONF_OVERSAMPLING]))
-
-    cg.add(var.set_iir_filter(config[CONF_IIR_FILTER]))
diff --git a/esphome/components/bme280_base/__init__.py b/esphome/components/bme280_base/__init__.py
new file mode 100644
index 0000000000..f70ffa9520
--- /dev/null
+++ b/esphome/components/bme280_base/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@esphome/core"]
diff --git a/esphome/components/bme280/bme280.cpp b/esphome/components/bme280_base/bme280_base.cpp
similarity index 93%
rename from esphome/components/bme280/bme280.cpp
rename to esphome/components/bme280_base/bme280_base.cpp
index 786fc01d28..3c6e15cbca 100644
--- a/esphome/components/bme280/bme280.cpp
+++ b/esphome/components/bme280_base/bme280_base.cpp
@@ -1,9 +1,14 @@
-#include "bme280.h"
+#include <cmath>
+#include <cstdint>
+
+#include "bme280_base.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/log.h"
+#include <esphome/components/sensor/sensor.h>
+#include <esphome/core/component.h>
 
 namespace esphome {
-namespace bme280 {
+namespace bme280_base {
 
 static const char *const TAG = "bme280.sensor";
 
@@ -46,7 +51,24 @@ static const uint8_t BME280_STATUS_IM_UPDATE = 0b01;
 
 inline uint16_t combine_bytes(uint8_t msb, uint8_t lsb) { return ((msb & 0xFF) << 8) | (lsb & 0xFF); }
 
-static const char *oversampling_to_str(BME280Oversampling oversampling) {
+const char *iir_filter_to_str(BME280IIRFilter filter) {  // NOLINT
+  switch (filter) {
+    case BME280_IIR_FILTER_OFF:
+      return "OFF";
+    case BME280_IIR_FILTER_2X:
+      return "2x";
+    case BME280_IIR_FILTER_4X:
+      return "4x";
+    case BME280_IIR_FILTER_8X:
+      return "8x";
+    case BME280_IIR_FILTER_16X:
+      return "16x";
+    default:
+      return "UNKNOWN";
+  }
+}
+
+const char *oversampling_to_str(BME280Oversampling oversampling) {  // NOLINT
   switch (oversampling) {
     case BME280_OVERSAMPLING_NONE:
       return "None";
@@ -65,23 +87,6 @@ static const char *oversampling_to_str(BME280Oversampling oversampling) {
   }
 }
 
-static const char *iir_filter_to_str(BME280IIRFilter filter) {
-  switch (filter) {
-    case BME280_IIR_FILTER_OFF:
-      return "OFF";
-    case BME280_IIR_FILTER_2X:
-      return "2x";
-    case BME280_IIR_FILTER_4X:
-      return "4x";
-    case BME280_IIR_FILTER_8X:
-      return "8x";
-    case BME280_IIR_FILTER_16X:
-      return "16x";
-    default:
-      return "UNKNOWN";
-  }
-}
-
 void BME280Component::setup() {
   ESP_LOGCONFIG(TAG, "Setting up BME280...");
   uint8_t chip_id = 0;
@@ -112,7 +117,7 @@ void BME280Component::setup() {
   // Wait until the NVM data has finished loading.
   uint8_t status;
   uint8_t retry = 5;
-  do {
+  do {  // NOLINT
     delay(2);
     if (!this->read_byte(BME280_REGISTER_STATUS, &status)) {
       ESP_LOGW(TAG, "Error reading status register.");
@@ -175,7 +180,6 @@ void BME280Component::setup() {
 }
 void BME280Component::dump_config() {
   ESP_LOGCONFIG(TAG, "BME280:");
-  LOG_I2C_DEVICE(this);
   switch (this->error_code_) {
     case COMMUNICATION_FAILED:
       ESP_LOGE(TAG, "Communication with BME280 failed!");
@@ -226,14 +230,14 @@ void BME280Component::update() {
       return;
     }
     int32_t t_fine = 0;
-    float temperature = this->read_temperature_(data, &t_fine);
+    float const temperature = this->read_temperature_(data, &t_fine);
     if (std::isnan(temperature)) {
       ESP_LOGW(TAG, "Invalid temperature, cannot read pressure & humidity values.");
       this->status_set_warning();
       return;
     }
-    float pressure = this->read_pressure_(data, t_fine);
-    float humidity = this->read_humidity_(data, t_fine);
+    float const pressure = this->read_pressure_(data, t_fine);
+    float const humidity = this->read_humidity_(data, t_fine);
 
     ESP_LOGV(TAG, "Got temperature=%.1f°C pressure=%.1fhPa humidity=%.1f%%", temperature, pressure, humidity);
     if (this->temperature_sensor_ != nullptr)
@@ -257,11 +261,11 @@ float BME280Component::read_temperature_(const uint8_t *data, int32_t *t_fine) {
   const int32_t t2 = this->calibration_.t2;
   const int32_t t3 = this->calibration_.t3;
 
-  int32_t var1 = (((adc >> 3) - (t1 << 1)) * t2) >> 11;
-  int32_t var2 = (((((adc >> 4) - t1) * ((adc >> 4) - t1)) >> 12) * t3) >> 14;
+  int32_t const var1 = (((adc >> 3) - (t1 << 1)) * t2) >> 11;
+  int32_t const var2 = (((((adc >> 4) - t1) * ((adc >> 4) - t1)) >> 12) * t3) >> 14;
   *t_fine = var1 + var2;
 
-  float temperature = (*t_fine * 5 + 128) >> 8;
+  float const temperature = (*t_fine * 5 + 128) >> 8;
   return temperature / 100.0f;
 }
 
@@ -303,11 +307,11 @@ float BME280Component::read_pressure_(const uint8_t *data, int32_t t_fine) {
 }
 
 float BME280Component::read_humidity_(const uint8_t *data, int32_t t_fine) {
-  uint16_t raw_adc = ((data[6] & 0xFF) << 8) | (data[7] & 0xFF);
+  uint16_t const raw_adc = ((data[6] & 0xFF) << 8) | (data[7] & 0xFF);
   if (raw_adc == 0x8000)
     return NAN;
 
-  int32_t adc = raw_adc;
+  int32_t const adc = raw_adc;
 
   const int32_t h1 = this->calibration_.h1;
   const int32_t h2 = this->calibration_.h2;
@@ -325,7 +329,7 @@ float BME280Component::read_humidity_(const uint8_t *data, int32_t t_fine) {
 
   v_x1_u32r = v_x1_u32r < 0 ? 0 : v_x1_u32r;
   v_x1_u32r = v_x1_u32r > 419430400 ? 419430400 : v_x1_u32r;
-  float h = v_x1_u32r >> 12;
+  float const h = v_x1_u32r >> 12;
 
   return h / 1024.0f;
 }
@@ -351,5 +355,5 @@ uint16_t BME280Component::read_u16_le_(uint8_t a_register) {
 }
 int16_t BME280Component::read_s16_le_(uint8_t a_register) { return this->read_u16_le_(a_register); }
 
-}  // namespace bme280
+}  // namespace bme280_base
 }  // namespace esphome
diff --git a/esphome/components/bme280/bme280.h b/esphome/components/bme280_base/bme280_base.h
similarity index 90%
rename from esphome/components/bme280/bme280.h
rename to esphome/components/bme280_base/bme280_base.h
index 50d398c40f..0f55ad0101 100644
--- a/esphome/components/bme280/bme280.h
+++ b/esphome/components/bme280_base/bme280_base.h
@@ -2,10 +2,9 @@
 
 #include "esphome/core/component.h"
 #include "esphome/components/sensor/sensor.h"
-#include "esphome/components/i2c/i2c.h"
 
 namespace esphome {
-namespace bme280 {
+namespace bme280_base {
 
 /// Internal struct storing the calibration values of an BME280.
 struct BME280CalibrationData {
@@ -57,8 +56,8 @@ enum BME280IIRFilter {
   BME280_IIR_FILTER_16X = 0b100,
 };
 
-/// This class implements support for the BME280 Temperature+Pressure+Humidity i2c sensor.
-class BME280Component : public PollingComponent, public i2c::I2CDevice {
+/// This class implements support for the BME280 Temperature+Pressure+Humidity sensor.
+class BME280Component : public PollingComponent {
  public:
   void set_temperature_sensor(sensor::Sensor *temperature_sensor) { temperature_sensor_ = temperature_sensor; }
   void set_pressure_sensor(sensor::Sensor *pressure_sensor) { pressure_sensor_ = pressure_sensor; }
@@ -91,6 +90,11 @@ class BME280Component : public PollingComponent, public i2c::I2CDevice {
   uint16_t read_u16_le_(uint8_t a_register);
   int16_t read_s16_le_(uint8_t a_register);
 
+  virtual bool read_byte(uint8_t a_register, uint8_t *data) = 0;
+  virtual bool write_byte(uint8_t a_register, uint8_t data) = 0;
+  virtual bool read_bytes(uint8_t a_register, uint8_t *data, size_t len) = 0;
+  virtual bool read_byte_16(uint8_t a_register, uint16_t *data) = 0;
+
   BME280CalibrationData calibration_;
   BME280Oversampling temperature_oversampling_{BME280_OVERSAMPLING_16X};
   BME280Oversampling pressure_oversampling_{BME280_OVERSAMPLING_16X};
@@ -106,5 +110,5 @@ class BME280Component : public PollingComponent, public i2c::I2CDevice {
   } error_code_{NONE};
 };
 
-}  // namespace bme280
+}  // namespace bme280_base
 }  // namespace esphome
diff --git a/esphome/components/bme280_base/sensor.py b/esphome/components/bme280_base/sensor.py
new file mode 100644
index 0000000000..3a745ed348
--- /dev/null
+++ b/esphome/components/bme280_base/sensor.py
@@ -0,0 +1,106 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor
+from esphome.const import (
+    CONF_HUMIDITY,
+    CONF_ID,
+    CONF_IIR_FILTER,
+    CONF_OVERSAMPLING,
+    CONF_PRESSURE,
+    CONF_TEMPERATURE,
+    DEVICE_CLASS_HUMIDITY,
+    DEVICE_CLASS_PRESSURE,
+    DEVICE_CLASS_TEMPERATURE,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_CELSIUS,
+    UNIT_HECTOPASCAL,
+    UNIT_PERCENT,
+)
+
+bme280_ns = cg.esphome_ns.namespace("bme280_base")
+BME280Oversampling = bme280_ns.enum("BME280Oversampling")
+OVERSAMPLING_OPTIONS = {
+    "NONE": BME280Oversampling.BME280_OVERSAMPLING_NONE,
+    "1X": BME280Oversampling.BME280_OVERSAMPLING_1X,
+    "2X": BME280Oversampling.BME280_OVERSAMPLING_2X,
+    "4X": BME280Oversampling.BME280_OVERSAMPLING_4X,
+    "8X": BME280Oversampling.BME280_OVERSAMPLING_8X,
+    "16X": BME280Oversampling.BME280_OVERSAMPLING_16X,
+}
+
+BME280IIRFilter = bme280_ns.enum("BME280IIRFilter")
+IIR_FILTER_OPTIONS = {
+    "OFF": BME280IIRFilter.BME280_IIR_FILTER_OFF,
+    "2X": BME280IIRFilter.BME280_IIR_FILTER_2X,
+    "4X": BME280IIRFilter.BME280_IIR_FILTER_4X,
+    "8X": BME280IIRFilter.BME280_IIR_FILTER_8X,
+    "16X": BME280IIRFilter.BME280_IIR_FILTER_16X,
+}
+
+CONFIG_SCHEMA_BASE = cv.Schema(
+    {
+        cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
+            unit_of_measurement=UNIT_CELSIUS,
+            accuracy_decimals=1,
+            device_class=DEVICE_CLASS_TEMPERATURE,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ).extend(
+            {
+                cv.Optional(CONF_OVERSAMPLING, default="16X"): cv.enum(
+                    OVERSAMPLING_OPTIONS, upper=True
+                ),
+            }
+        ),
+        cv.Optional(CONF_PRESSURE): sensor.sensor_schema(
+            unit_of_measurement=UNIT_HECTOPASCAL,
+            accuracy_decimals=1,
+            device_class=DEVICE_CLASS_PRESSURE,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ).extend(
+            {
+                cv.Optional(CONF_OVERSAMPLING, default="16X"): cv.enum(
+                    OVERSAMPLING_OPTIONS, upper=True
+                ),
+            }
+        ),
+        cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(
+            unit_of_measurement=UNIT_PERCENT,
+            accuracy_decimals=1,
+            device_class=DEVICE_CLASS_HUMIDITY,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ).extend(
+            {
+                cv.Optional(CONF_OVERSAMPLING, default="16X"): cv.enum(
+                    OVERSAMPLING_OPTIONS, upper=True
+                ),
+            }
+        ),
+        cv.Optional(CONF_IIR_FILTER, default="OFF"): cv.enum(
+            IIR_FILTER_OPTIONS, upper=True
+        ),
+    }
+).extend(cv.polling_component_schema("60s"))
+
+
+async def to_code(config, func=None):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    if func is not None:
+        await func(var, config)
+
+    if temperature_config := config.get(CONF_TEMPERATURE):
+        sens = await sensor.new_sensor(temperature_config)
+        cg.add(var.set_temperature_sensor(sens))
+        cg.add(var.set_temperature_oversampling(temperature_config[CONF_OVERSAMPLING]))
+
+    if pressure_config := config.get(CONF_PRESSURE):
+        sens = await sensor.new_sensor(pressure_config)
+        cg.add(var.set_pressure_sensor(sens))
+        cg.add(var.set_pressure_oversampling(pressure_config[CONF_OVERSAMPLING]))
+
+    if humidity_config := config.get(CONF_HUMIDITY):
+        sens = await sensor.new_sensor(humidity_config)
+        cg.add(var.set_humidity_sensor(sens))
+        cg.add(var.set_humidity_oversampling(humidity_config[CONF_OVERSAMPLING]))
+
+    cg.add(var.set_iir_filter(config[CONF_IIR_FILTER]))
diff --git a/esphome/components/bme280/__init__.py b/esphome/components/bme280_i2c/__init__.py
similarity index 100%
rename from esphome/components/bme280/__init__.py
rename to esphome/components/bme280_i2c/__init__.py
diff --git a/esphome/components/bme280_i2c/bme280_i2c.cpp b/esphome/components/bme280_i2c/bme280_i2c.cpp
new file mode 100644
index 0000000000..e29675b5b7
--- /dev/null
+++ b/esphome/components/bme280_i2c/bme280_i2c.cpp
@@ -0,0 +1,30 @@
+#include <cstddef>
+#include <cstdint>
+
+#include "bme280_i2c.h"
+#include "esphome/components/i2c/i2c.h"
+#include "../bme280_base/bme280_base.h"
+
+namespace esphome {
+namespace bme280_i2c {
+
+bool BME280I2CComponent::read_byte(uint8_t a_register, uint8_t *data) {
+  return I2CDevice::read_byte(a_register, data);
+};
+bool BME280I2CComponent::write_byte(uint8_t a_register, uint8_t data) {
+  return I2CDevice::write_byte(a_register, data);
+};
+bool BME280I2CComponent::read_bytes(uint8_t a_register, uint8_t *data, size_t len) {
+  return I2CDevice::read_bytes(a_register, data, len);
+};
+bool BME280I2CComponent::read_byte_16(uint8_t a_register, uint16_t *data) {
+  return I2CDevice::read_byte_16(a_register, data);
+};
+
+void BME280I2CComponent::dump_config() {
+  LOG_I2C_DEVICE(this);
+  BME280Component::dump_config();
+}
+
+}  // namespace bme280_i2c
+}  // namespace esphome
diff --git a/esphome/components/bme280_i2c/bme280_i2c.h b/esphome/components/bme280_i2c/bme280_i2c.h
new file mode 100644
index 0000000000..c5e2f7e342
--- /dev/null
+++ b/esphome/components/bme280_i2c/bme280_i2c.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "esphome/components/bme280_base/bme280_base.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace bme280_i2c {
+
+static const char *const TAG = "bme280_i2c.sensor";
+
+class BME280I2CComponent : public esphome::bme280_base::BME280Component, public i2c::I2CDevice {
+  bool read_byte(uint8_t a_register, uint8_t *data) override;
+  bool write_byte(uint8_t a_register, uint8_t data) override;
+  bool read_bytes(uint8_t a_register, uint8_t *data, size_t len) override;
+  bool read_byte_16(uint8_t a_register, uint16_t *data) override;
+  void dump_config() override;
+};
+
+}  // namespace bme280_i2c
+}  // namespace esphome
diff --git a/esphome/components/bme280_i2c/sensor.py b/esphome/components/bme280_i2c/sensor.py
new file mode 100644
index 0000000000..489c52969d
--- /dev/null
+++ b/esphome/components/bme280_i2c/sensor.py
@@ -0,0 +1,19 @@
+import esphome.codegen as cg
+from esphome.components import i2c
+from ..bme280_base.sensor import to_code as to_code_base, cv, CONFIG_SCHEMA_BASE
+
+DEPENDENCIES = ["i2c"]
+AUTO_LOAD = ["bme280_base"]
+
+bme280_ns = cg.esphome_ns.namespace("bme280_i2c")
+BME280I2CComponent = bme280_ns.class_(
+    "BME280I2CComponent", cg.PollingComponent, i2c.I2CDevice
+)
+
+CONFIG_SCHEMA = CONFIG_SCHEMA_BASE.extend(
+    i2c.i2c_device_schema(default_address=0x77)
+).extend({cv.GenerateID(): cv.declare_id(BME280I2CComponent)})
+
+
+async def to_code(config):
+    await to_code_base(config, func=i2c.register_i2c_device)
diff --git a/esphome/components/bme280_spi/__init__.py b/esphome/components/bme280_spi/__init__.py
new file mode 100644
index 0000000000..a1d33e4d7a
--- /dev/null
+++ b/esphome/components/bme280_spi/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@apbodrov"]
diff --git a/esphome/components/bme280_spi/bme280_spi.cpp b/esphome/components/bme280_spi/bme280_spi.cpp
new file mode 100644
index 0000000000..921128c8f5
--- /dev/null
+++ b/esphome/components/bme280_spi/bme280_spi.cpp
@@ -0,0 +1,66 @@
+#include <cstdint>
+#include <cstddef>
+
+#include "bme280_spi.h"
+#include <esphome/components/bme280_base/bme280_base.h>
+
+int set_bit(uint8_t num, int position) {
+  int mask = 1 << position;
+  return num | mask;
+}
+
+int clear_bit(uint8_t num, int position) {
+  int mask = 1 << position;
+  return num & ~mask;
+}
+
+namespace esphome {
+namespace bme280_spi {
+
+void BME280SPIComponent::setup() {
+  this->spi_setup();
+  BME280Component::setup();
+};
+
+// In SPI mode, only 7 bits of the register addresses are used; the MSB of register address is not used
+// and replaced by a read/write bit (RW = ‘0’ for write and RW = ‘1’ for read).
+// Example: address 0xF7 is accessed by using SPI register address 0x77. For write access, the byte
+// 0x77 is transferred, for read access, the byte 0xF7 is transferred.
+// https://www.bosch-sensortec.com/media/boschsensortec/downloads/datasheets/bst-bme280-ds002.pdf
+
+bool BME280SPIComponent::read_byte(uint8_t a_register, uint8_t *data) {
+  this->enable();
+  // cause: *data = this->delegate_->transfer(tmp) doesnt work
+  this->delegate_->transfer(set_bit(a_register, 7));
+  *data = this->delegate_->transfer(0);
+  this->disable();
+  return true;
+}
+
+bool BME280SPIComponent::write_byte(uint8_t a_register, uint8_t data) {
+  this->enable();
+  this->delegate_->transfer(clear_bit(a_register, 7));
+  this->delegate_->transfer(data);
+  this->disable();
+  return true;
+}
+
+bool BME280SPIComponent::read_bytes(uint8_t a_register, uint8_t *data, size_t len) {
+  this->enable();
+  this->delegate_->transfer(set_bit(a_register, 7));
+  this->delegate_->read_array(data, len);
+  this->disable();
+  return true;
+}
+
+bool BME280SPIComponent::read_byte_16(uint8_t a_register, uint16_t *data) {
+  this->enable();
+  this->delegate_->transfer(set_bit(a_register, 7));
+  ((uint8_t *) data)[1] = this->delegate_->transfer(0);
+  ((uint8_t *) data)[0] = this->delegate_->transfer(0);
+  this->disable();
+  return true;
+}
+
+}  // namespace bme280_spi
+}  // namespace esphome
diff --git a/esphome/components/bme280_spi/bme280_spi.h b/esphome/components/bme280_spi/bme280_spi.h
new file mode 100644
index 0000000000..b6b8997fa7
--- /dev/null
+++ b/esphome/components/bme280_spi/bme280_spi.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "esphome/components/bme280_base/bme280_base.h"
+#include "esphome/components/spi/spi.h"
+
+namespace esphome {
+namespace bme280_spi {
+
+class BME280SPIComponent : public esphome::bme280_base::BME280Component,
+                           public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW,
+                                                 spi::CLOCK_PHASE_LEADING, spi::DATA_RATE_200KHZ> {
+  void setup() override;
+  bool read_byte(uint8_t a_register, uint8_t *data) override;
+  bool write_byte(uint8_t a_register, uint8_t data) override;
+  bool read_bytes(uint8_t a_register, uint8_t *data, size_t len) override;
+  bool read_byte_16(uint8_t a_register, uint16_t *data) override;
+};
+
+}  // namespace bme280_spi
+}  // namespace esphome
diff --git a/esphome/components/bme280_spi/sensor.py b/esphome/components/bme280_spi/sensor.py
new file mode 100644
index 0000000000..3cfe1b3cdd
--- /dev/null
+++ b/esphome/components/bme280_spi/sensor.py
@@ -0,0 +1,24 @@
+import esphome.codegen as cg
+from esphome.components import spi
+from esphome.components.bme280_base.sensor import (
+    to_code as to_code_base,
+    cv,
+    CONFIG_SCHEMA_BASE,
+)
+
+DEPENDENCIES = ["spi"]
+AUTO_LOAD = ["bme280_base"]
+
+
+bme280_spi_ns = cg.esphome_ns.namespace("bme280_spi")
+BME280SPIComponent = bme280_spi_ns.class_(
+    "BME280SPIComponent", cg.PollingComponent, spi.SPIDevice
+)
+
+CONFIG_SCHEMA = CONFIG_SCHEMA_BASE.extend(spi.spi_device_schema()).extend(
+    {cv.GenerateID(): cv.declare_id(BME280SPIComponent)}
+)
+
+
+async def to_code(config):
+    await to_code_base(config, func=spi.register_spi_device)
diff --git a/tests/test1.yaml b/tests/test1.yaml
index bc7a94bc5a..3ca6faca8a 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -690,7 +690,7 @@ sensor:
     update_interval: 30s
     mode: low_power
     i2c_id: i2c_bus
-  - platform: bme280
+  - platform: bme280_i2c
     temperature:
       name: Outside Temperature
       oversampling: 16x
@@ -704,6 +704,21 @@ sensor:
     iir_filter: 16x
     update_interval: 15s
     i2c_id: i2c_bus
+  - platform: bme280_spi
+    temperature:
+      name: Outside Temperature
+      oversampling: 16x
+    pressure:
+      name: Outside Pressure
+      oversampling: none
+    humidity:
+      name: Outside Humidity
+      oversampling: 8x
+    cs_pin:
+      allow_other_uses: true
+      number: GPIO23
+    iir_filter: 16x
+    update_interval: 15s
   - platform: bme680
     temperature:
       name: Outside Temperature

From 082d9fcf0e43de4311a2929d9f09b3aa7d92e9e2 Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Wed, 10 Jan 2024 17:05:34 -0600
Subject: [PATCH 21/68] ESP32-C3 USB_CDC fixes (#6069)

---
 esphome/components/logger/__init__.py |  9 ++++++---
 esphome/components/logger/logger.cpp  | 12 ++++--------
 esphome/components/logger/logger.h    |  5 +++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/esphome/components/logger/__init__.py b/esphome/components/logger/__init__.py
index 6cad783db9..fd64c65c77 100644
--- a/esphome/components/logger/__init__.py
+++ b/esphome/components/logger/__init__.py
@@ -84,7 +84,7 @@ UART_SELECTION_ESP32 = {
     VARIANT_ESP32: [UART0, UART1, UART2],
     VARIANT_ESP32S2: [UART0, UART1, USB_CDC],
     VARIANT_ESP32S3: [UART0, UART1, USB_CDC, USB_SERIAL_JTAG],
-    VARIANT_ESP32C3: [UART0, UART1, USB_SERIAL_JTAG],
+    VARIANT_ESP32C3: [UART0, UART1, USB_CDC, USB_SERIAL_JTAG],
     VARIANT_ESP32C2: [UART0, UART1],
     VARIANT_ESP32C6: [UART0, UART1, USB_CDC, USB_SERIAL_JTAG],
     VARIANT_ESP32H2: [UART0, UART1, USB_CDC, USB_SERIAL_JTAG],
@@ -172,9 +172,10 @@ CONFIG_SCHEMA = cv.All(
                 esp8266=UART0,
                 esp32=UART0,
                 esp32_s2=USB_CDC,
-                esp32_s3_idf=USB_SERIAL_JTAG,
-                esp32_c3_idf=USB_SERIAL_JTAG,
                 esp32_s3_arduino=USB_CDC,
+                esp32_s3_idf=USB_SERIAL_JTAG,
+                esp32_c3_arduino=USB_CDC,
+                esp32_c3_idf=USB_SERIAL_JTAG,
                 rp2040=USB_CDC,
                 bk72xx=DEFAULT,
                 rtl87xx=DEFAULT,
@@ -265,6 +266,8 @@ async def to_code(config):
     if CORE.using_arduino:
         if config[CONF_HARDWARE_UART] == USB_CDC:
             cg.add_build_flag("-DARDUINO_USB_CDC_ON_BOOT=1")
+            if CORE.is_esp32 and get_esp32_variant() == VARIANT_ESP32C3:
+                cg.add_build_flag("-DARDUINO_USB_MODE=1")
 
     if CORE.using_esp_idf:
         if config[CONF_HARDWARE_UART] == USB_CDC:
diff --git a/esphome/components/logger/logger.cpp b/esphome/components/logger/logger.cpp
index e0f7e77d2c..d5f5c275eb 100644
--- a/esphome/components/logger/logger.cpp
+++ b/esphome/components/logger/logger.cpp
@@ -272,17 +272,13 @@ void Logger::pre_setup() {
 #endif
 #if defined(USE_ESP32) && \
     (defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3) || defined(USE_ESP32_VARIANT_ESP32C3))
-#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
+#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3) || defined(USE_ESP32_VARIANT_ESP32C3)
       case UART_SELECTION_USB_CDC:
-#endif  // USE_ESP32_VARIANT_ESP32S2 || USE_ESP32_VARIANT_ESP32S3
+#endif  // USE_ESP32_VARIANT_ESP32S2 || USE_ESP32_VARIANT_ESP32S3 || USE_ESP32_VARIANT_ESP32C3
 #if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S3)
       case UART_SELECTION_USB_SERIAL_JTAG:
 #endif  // USE_ESP32_VARIANT_ESP32C3 || USE_ESP32_VARIANT_ESP32S3
-#ifdef USE_ESP32_VARIANT_ESP32C3
-        this->hw_serial_ = &Serial;
-        Serial.begin(this->baud_rate_);
-#endif  // USE_ESP32_VARIANT_ESP32C3
-#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
+#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3) || defined(USE_ESP32_VARIANT_ESP32C3)
 #if ARDUINO_USB_CDC_ON_BOOT
         this->hw_serial_ = &Serial;
         Serial.setTxTimeoutMs(0);  // workaround for 2.0.9 crash when there's no data connection
@@ -291,7 +287,7 @@ void Logger::pre_setup() {
         this->hw_serial_ = &Serial;
         Serial.begin(this->baud_rate_);
 #endif  // ARDUINO_USB_CDC_ON_BOOT
-#endif  // USE_ESP32_VARIANT_ESP32S2 || USE_ESP32_VARIANT_ESP32S3
+#endif  // USE_ESP32_VARIANT_ESP32S2 || USE_ESP32_VARIANT_ESP32S3 || USE_ESP32_VARIANT_ESP32C3
         break;
 #endif  // USE_ESP32 && (USE_ESP32_VARIANT_ESP32S2 || USE_ESP32_VARIANT_ESP32S3 || USE_ESP32_VARIANT_ESP32C3)
 #ifdef USE_RP2040
diff --git a/esphome/components/logger/logger.h b/esphome/components/logger/logger.h
index 68efc056df..c7f0fe4139 100644
--- a/esphome/components/logger/logger.h
+++ b/esphome/components/logger/logger.h
@@ -45,9 +45,10 @@ enum UARTSelection {
   UART_SELECTION_UART2,
 #endif  // !USE_ESP32_VARIANT_ESP32C3 && !USE_ESP32_VARIANT_ESP32C6 && !USE_ESP32_VARIANT_ESP32S2 &&
         // !USE_ESP32_VARIANT_ESP32S3 && !USE_ESP32_VARIANT_ESP32H2
-#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
+#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3) || \
+    (defined(USE_ESP32_VARIANT_ESP32C3) && defined(USE_ARDUINO))
   UART_SELECTION_USB_CDC,
-#endif  // USE_ESP32_VARIANT_ESP32S2 || USE_ESP32_VARIANT_ESP32S3
+#endif  // USE_ESP32_VARIANT_ESP32S2 || USE_ESP32_VARIANT_ESP32S3 || USE_ESP32_VARIANT_ESP32C3
 #if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6) || defined(USE_ESP32_VARIANT_ESP32S3) || \
     defined(USE_ESP32_VARIANT_ESP32H2)
   UART_SELECTION_USB_SERIAL_JTAG,

From d616025fede0b8f2ac7e1ba8010d3467d65019c9 Mon Sep 17 00:00:00 2001
From: Simone Rossetto <simros85@gmail.com>
Date: Thu, 11 Jan 2024 06:09:42 +0100
Subject: [PATCH 22/68] Actions to enable and disable WireGuard connection
 (#5690)

---
 esphome/components/wireguard/__init__.py      | 55 +++++++++++++++++++
 esphome/components/wireguard/binary_sensor.py |  9 +++
 esphome/components/wireguard/wireguard.cpp    | 46 ++++++++++++++--
 esphome/components/wireguard/wireguard.h      | 42 ++++++++++++++
 tests/test10.yaml                             | 25 +++++++++
 5 files changed, 172 insertions(+), 5 deletions(-)

diff --git a/esphome/components/wireguard/__init__.py b/esphome/components/wireguard/__init__.py
index acb5f690ec..b59a6011cd 100644
--- a/esphome/components/wireguard/__init__.py
+++ b/esphome/components/wireguard/__init__.py
@@ -10,6 +10,7 @@ from esphome.const import (
 )
 from esphome.components import time
 from esphome.core import TimePeriod
+from esphome import automation
 
 CONF_NETMASK = "netmask"
 CONF_PRIVATE_KEY = "private_key"
@@ -30,6 +31,16 @@ _WG_KEY_REGEX = re.compile(r"^[A-Za-z0-9+/]{42}[AEIMQUYcgkosw480]=$")
 
 wireguard_ns = cg.esphome_ns.namespace("wireguard")
 Wireguard = wireguard_ns.class_("Wireguard", cg.Component, cg.PollingComponent)
+WireguardPeerOnlineCondition = wireguard_ns.class_(
+    "WireguardPeerOnlineCondition", automation.Condition
+)
+WireguardEnabledCondition = wireguard_ns.class_(
+    "WireguardEnabledCondition", automation.Condition
+)
+WireguardEnableAction = wireguard_ns.class_("WireguardEnableAction", automation.Action)
+WireguardDisableAction = wireguard_ns.class_(
+    "WireguardDisableAction", automation.Action
+)
 
 
 def _wireguard_key(value):
@@ -112,3 +123,47 @@ async def to_code(config):
     cg.add_library("droscy/esp_wireguard", "0.3.2")
 
     await cg.register_component(var, config)
+
+
+@automation.register_condition(
+    "wireguard.peer_online",
+    WireguardPeerOnlineCondition,
+    cv.Schema({cv.GenerateID(): cv.use_id(Wireguard)}),
+)
+async def wireguard_peer_up_to_code(config, condition_id, template_arg, args):
+    var = cg.new_Pvariable(condition_id, template_arg)
+    await cg.register_parented(var, config[CONF_ID])
+    return var
+
+
+@automation.register_condition(
+    "wireguard.enabled",
+    WireguardEnabledCondition,
+    cv.Schema({cv.GenerateID(): cv.use_id(Wireguard)}),
+)
+async def wireguard_enabled_to_code(config, condition_id, template_arg, args):
+    var = cg.new_Pvariable(condition_id, template_arg)
+    await cg.register_parented(var, config[CONF_ID])
+    return var
+
+
+@automation.register_action(
+    "wireguard.enable",
+    WireguardEnableAction,
+    cv.Schema({cv.GenerateID(): cv.use_id(Wireguard)}),
+)
+async def wireguard_enable_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    await cg.register_parented(var, config[CONF_ID])
+    return var
+
+
+@automation.register_action(
+    "wireguard.disable",
+    WireguardDisableAction,
+    cv.Schema({cv.GenerateID(): cv.use_id(Wireguard)}),
+)
+async def wireguard_disable_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    await cg.register_parented(var, config[CONF_ID])
+    return var
diff --git a/esphome/components/wireguard/binary_sensor.py b/esphome/components/wireguard/binary_sensor.py
index 14ff2b0159..bf60aaa1d6 100644
--- a/esphome/components/wireguard/binary_sensor.py
+++ b/esphome/components/wireguard/binary_sensor.py
@@ -4,11 +4,13 @@ from esphome.components import binary_sensor
 from esphome.const import (
     CONF_STATUS,
     DEVICE_CLASS_CONNECTIVITY,
+    ENTITY_CATEGORY_DIAGNOSTIC,
 )
 
 from . import Wireguard
 
 CONF_WIREGUARD_ID = "wireguard_id"
+CONF_ENABLED = "enabled"
 
 DEPENDENCIES = ["wireguard"]
 
@@ -17,6 +19,9 @@ CONFIG_SCHEMA = {
     cv.Optional(CONF_STATUS): binary_sensor.binary_sensor_schema(
         device_class=DEVICE_CLASS_CONNECTIVITY,
     ),
+    cv.Optional(CONF_ENABLED): binary_sensor.binary_sensor_schema(
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+    ),
 }
 
 
@@ -26,3 +31,7 @@ async def to_code(config):
     if status_config := config.get(CONF_STATUS):
         sens = await binary_sensor.new_binary_sensor(status_config)
         cg.add(parent.set_status_sensor(sens))
+
+    if enabled_config := config.get(CONF_ENABLED):
+        sens = await binary_sensor.new_binary_sensor(enabled_config)
+        cg.add(parent.set_enabled_sensor(sens))
diff --git a/esphome/components/wireguard/wireguard.cpp b/esphome/components/wireguard/wireguard.cpp
index f89a5ebbad..cca30d4310 100644
--- a/esphome/components/wireguard/wireguard.cpp
+++ b/esphome/components/wireguard/wireguard.cpp
@@ -48,6 +48,8 @@ void Wireguard::setup() {
   if (this->preshared_key_.length() > 0)
     this->wg_config_.preshared_key = this->preshared_key_.c_str();
 
+  this->publish_enabled_state();
+
   this->wg_initialized_ = esp_wireguard_init(&(this->wg_config_), &(this->wg_ctx_));
 
   if (this->wg_initialized_ == ESP_OK) {
@@ -68,6 +70,10 @@ void Wireguard::setup() {
 }
 
 void Wireguard::loop() {
+  if (!this->enabled_) {
+    return;
+  }
+
   if ((this->wg_initialized_ == ESP_OK) && (this->wg_connected_ == ESP_OK) && (!network::is_connected())) {
     ESP_LOGV(TAG, "local network connection has been lost, stopping WireGuard...");
     this->stop_connection_();
@@ -79,8 +85,9 @@ void Wireguard::update() {
   time_t lhs = this->get_latest_handshake();
   bool lhs_updated = (lhs > this->latest_saved_handshake_);
 
-  ESP_LOGV(TAG, "handshake: latest=%.0f, saved=%.0f, updated=%d", (double) lhs, (double) this->latest_saved_handshake_,
-           (int) lhs_updated);
+  ESP_LOGV(TAG, "enabled=%d, connected=%d, peer_up=%d, handshake: current=%.0f latest=%.0f updated=%d",
+           (int) this->enabled_, (int) (this->wg_connected_ == ESP_OK), (int) peer_up, (double) lhs,
+           (double) this->latest_saved_handshake_, (int) lhs_updated);
 
   if (lhs_updated) {
     this->latest_saved_handshake_ = lhs;
@@ -102,13 +109,13 @@ void Wireguard::update() {
     if (this->wg_peer_offline_time_ == 0) {
       ESP_LOGW(TAG, LOGMSG_PEER_STATUS, LOGMSG_OFFLINE, latest_handshake.c_str());
       this->wg_peer_offline_time_ = millis();
-    } else {
+    } else if (this->enabled_) {
       ESP_LOGD(TAG, LOGMSG_PEER_STATUS, LOGMSG_OFFLINE, latest_handshake.c_str());
       this->start_connection_();
     }
 
     // check reboot timeout every time the peer is down
-    if (this->reboot_timeout_ > 0) {
+    if (this->enabled_ && this->reboot_timeout_ > 0) {
       if (millis() - this->wg_peer_offline_time_ > this->reboot_timeout_) {
         ESP_LOGE(TAG, "WireGuard remote peer is unreachable, rebooting...");
         App.reboot();
@@ -154,7 +161,7 @@ void Wireguard::dump_config() {
 
 void Wireguard::on_shutdown() { this->stop_connection_(); }
 
-bool Wireguard::can_proceed() { return (this->proceed_allowed_ || this->is_peer_up()); }
+bool Wireguard::can_proceed() { return (this->proceed_allowed_ || this->is_peer_up() || !this->enabled_); }
 
 bool Wireguard::is_peer_up() const {
   return (this->wg_initialized_ == ESP_OK) && (this->wg_connected_ == ESP_OK) &&
@@ -187,6 +194,7 @@ void Wireguard::set_srctime(time::RealTimeClock *srctime) { this->srctime_ = src
 
 #ifdef USE_BINARY_SENSOR
 void Wireguard::set_status_sensor(binary_sensor::BinarySensor *sensor) { this->status_sensor_ = sensor; }
+void Wireguard::set_enabled_sensor(binary_sensor::BinarySensor *sensor) { this->enabled_sensor_ = sensor; }
 #endif
 
 #ifdef USE_SENSOR
@@ -199,7 +207,35 @@ void Wireguard::set_address_sensor(text_sensor::TextSensor *sensor) { this->addr
 
 void Wireguard::disable_auto_proceed() { this->proceed_allowed_ = false; }
 
+void Wireguard::enable() {
+  this->enabled_ = true;
+  ESP_LOGI(TAG, "WireGuard enabled");
+  this->publish_enabled_state();
+}
+
+void Wireguard::disable() {
+  this->enabled_ = false;
+  this->defer(std::bind(&Wireguard::stop_connection_, this));  // defer to avoid blocking running loop
+  ESP_LOGI(TAG, "WireGuard disabled");
+  this->publish_enabled_state();
+}
+
+void Wireguard::publish_enabled_state() {
+#ifdef USE_BINARY_SENSOR
+  if (this->enabled_sensor_ != nullptr) {
+    this->enabled_sensor_->publish_state(this->enabled_);
+  }
+#endif
+}
+
+bool Wireguard::is_enabled() { return this->enabled_; }
+
 void Wireguard::start_connection_() {
+  if (!this->enabled_) {
+    ESP_LOGV(TAG, "WireGuard is disabled, cannot start connection");
+    return;
+  }
+
   if (this->wg_initialized_ != ESP_OK) {
     ESP_LOGE(TAG, "cannot start WireGuard, initialization in error with code %d", this->wg_initialized_);
     return;
diff --git a/esphome/components/wireguard/wireguard.h b/esphome/components/wireguard/wireguard.h
index c47d9e6603..7753a8dfc2 100644
--- a/esphome/components/wireguard/wireguard.h
+++ b/esphome/components/wireguard/wireguard.h
@@ -26,6 +26,7 @@
 namespace esphome {
 namespace wireguard {
 
+/// Main Wireguard component class.
 class Wireguard : public PollingComponent {
  public:
   void setup() override;
@@ -53,6 +54,7 @@ class Wireguard : public PollingComponent {
 
 #ifdef USE_BINARY_SENSOR
   void set_status_sensor(binary_sensor::BinarySensor *sensor);
+  void set_enabled_sensor(binary_sensor::BinarySensor *sensor);
 #endif
 
 #ifdef USE_SENSOR
@@ -66,6 +68,18 @@ class Wireguard : public PollingComponent {
   /// Block the setup step until peer is connected.
   void disable_auto_proceed();
 
+  /// Enable the WireGuard component.
+  void enable();
+
+  /// Stop any running connection and disable the WireGuard component.
+  void disable();
+
+  /// Publish the enabled state if the enabled binary sensor is configured.
+  void publish_enabled_state();
+
+  /// Return if the WireGuard component is or is not enabled.
+  bool is_enabled();
+
   bool is_peer_up() const;
   time_t get_latest_handshake() const;
 
@@ -87,6 +101,7 @@ class Wireguard : public PollingComponent {
 
 #ifdef USE_BINARY_SENSOR
   binary_sensor::BinarySensor *status_sensor_ = nullptr;
+  binary_sensor::BinarySensor *enabled_sensor_ = nullptr;
 #endif
 
 #ifdef USE_SENSOR
@@ -100,6 +115,9 @@ class Wireguard : public PollingComponent {
   /// Set to false to block the setup step until peer is connected.
   bool proceed_allowed_ = true;
 
+  /// When false the wireguard link will not be established
+  bool enabled_ = true;
+
   wireguard_config_t wg_config_ = ESP_WIREGUARD_CONFIG_DEFAULT();
   wireguard_ctx_t wg_ctx_ = ESP_WIREGUARD_CONTEXT_DEFAULT();
 
@@ -128,6 +146,30 @@ void resume_wdt();
 /// Strip most part of the key only for secure printing
 std::string mask_key(const std::string &key);
 
+/// Condition to check if remote peer is online.
+template<typename... Ts> class WireguardPeerOnlineCondition : public Condition<Ts...>, public Parented<Wireguard> {
+ public:
+  bool check(Ts... x) override { return this->parent_->is_peer_up(); }
+};
+
+/// Condition to check if Wireguard component is enabled.
+template<typename... Ts> class WireguardEnabledCondition : public Condition<Ts...>, public Parented<Wireguard> {
+ public:
+  bool check(Ts... x) override { return this->parent_->is_enabled(); }
+};
+
+/// Action to enable Wireguard component.
+template<typename... Ts> class WireguardEnableAction : public Action<Ts...>, public Parented<Wireguard> {
+ public:
+  void play(Ts... x) override { this->parent_->enable(); }
+};
+
+/// Action to disable Wireguard component.
+template<typename... Ts> class WireguardDisableAction : public Action<Ts...>, public Parented<Wireguard> {
+ public:
+  void play(Ts... x) override { this->parent_->disable(); }
+};
+
 }  // namespace wireguard
 }  // namespace esphome
 
diff --git a/tests/test10.yaml b/tests/test10.yaml
index dda7601048..7e3a685b36 100644
--- a/tests/test10.yaml
+++ b/tests/test10.yaml
@@ -44,6 +44,8 @@ binary_sensor:
   - platform: wireguard
     status:
       name: 'WireGuard Status'
+    enabled:
+      name: 'WireGuard Enabled'
 
 sensor:
   - platform: wireguard
@@ -54,3 +56,26 @@ text_sensor:
   - platform: wireguard
     address:
       name: 'WireGuard Address'
+
+button:
+  - platform: template
+    name: 'Toggle WireGuard'
+    entity_category: config
+    on_press:
+      - if:
+          condition: wireguard.enabled
+          then:
+            - wireguard.disable:
+          else:
+            - wireguard.enable:
+
+  - platform: template
+    name: 'Log WireGuard status'
+    entity_category: config
+    on_press:
+      - if:
+          condition: wireguard.peer_online
+          then:
+            - logger.log: 'wireguard remote peer is online'
+          else:
+            - logger.log: 'wireguard remote peer is offline'

From 4cc17dac0dff22ef476aa7b98abf17b675749379 Mon Sep 17 00:00:00 2001
From: mrtoy-me <118446898+mrtoy-me@users.noreply.github.com>
Date: Thu, 11 Jan 2024 16:18:22 +1000
Subject: [PATCH 23/68] hydreon_rgxx - fix missing cg.add(var.set_model(...))
 (#6065)

---
 esphome/components/hydreon_rgxx/hydreon_rgxx.cpp | 10 ++++++----
 esphome/components/hydreon_rgxx/sensor.py        |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/esphome/components/hydreon_rgxx/hydreon_rgxx.cpp b/esphome/components/hydreon_rgxx/hydreon_rgxx.cpp
index 58e00ba7a5..c026d7cce6 100644
--- a/esphome/components/hydreon_rgxx/hydreon_rgxx.cpp
+++ b/esphome/components/hydreon_rgxx/hydreon_rgxx.cpp
@@ -17,6 +17,12 @@ void HydreonRGxxComponent::dump_config() {
   if (this->is_failed()) {
     ESP_LOGE(TAG, "Connection with hydreon_rgxx failed!");
   }
+  if (model_ == RG9) {
+    ESP_LOGCONFIG(TAG, "  Model: RG9");
+    ESP_LOGCONFIG(TAG, "  Disable Led: %s", TRUEFALSE(this->disable_led_));
+  } else {
+    ESP_LOGCONFIG(TAG, "  Model: RG15");
+  }
   LOG_UPDATE_INTERVAL(this);
 
   int i = 0;
@@ -25,10 +31,6 @@ void HydreonRGxxComponent::dump_config() {
     LOG_SENSOR("  ", #s, this->sensors_[i - 1]); \
   }
   HYDREON_RGXX_PROTOCOL_LIST(HYDREON_RGXX_LOG_SENSOR, );
-
-  if (this->model_ == RG9) {
-    ESP_LOGCONFIG(TAG, "disable_led: %s", TRUEFALSE(this->disable_led_));
-  }
 }
 
 void HydreonRGxxComponent::setup() {
diff --git a/esphome/components/hydreon_rgxx/sensor.py b/esphome/components/hydreon_rgxx/sensor.py
index 0fc380f959..f9cb316c24 100644
--- a/esphome/components/hydreon_rgxx/sensor.py
+++ b/esphome/components/hydreon_rgxx/sensor.py
@@ -138,6 +138,7 @@ async def to_code(config):
             sens = await sensor.new_sensor(config[conf])
             cg.add(var.set_sensor(sens, i))
 
+    cg.add(var.set_model(config[CONF_MODEL]))
     cg.add(var.set_request_temperature(CONF_TEMPERATURE in config))
 
     if CONF_DISABLE_LED in config:

From 343a8c063e145ecf0d8e32478581a57ff421d50b Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Fri, 12 Jan 2024 01:11:42 -0800
Subject: [PATCH 24/68] fix sen5x negative temperature (#6082)

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

diff --git a/esphome/components/sen5x/sen5x.cpp b/esphome/components/sen5x/sen5x.cpp
index c90880bc9f..0efc961943 100644
--- a/esphome/components/sen5x/sen5x.cpp
+++ b/esphome/components/sen5x/sen5x.cpp
@@ -352,7 +352,7 @@ void SEN5XComponent::update() {
     float humidity = measurements[4] / 100.0;
     if (measurements[4] == 0xFFFF)
       humidity = NAN;
-    float temperature = measurements[5] / 200.0;
+    float temperature = (int16_t) measurements[5] / 200.0;
     if (measurements[5] == 0xFFFF)
       temperature = NAN;
     float voc = measurements[6] / 10.0;

From aa04a3caaf83ae71e4edac681bc9a534ada265be Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Fri, 12 Jan 2024 01:20:08 -0800
Subject: [PATCH 25/68] negative values for all DHT22 variants (#6074)

Co-authored-by: Samuel Sieb <samuel@sieb.net>
---
 esphome/components/dht/dht.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/esphome/components/dht/dht.cpp b/esphome/components/dht/dht.cpp
index c70b227330..07634cafdf 100644
--- a/esphome/components/dht/dht.cpp
+++ b/esphome/components/dht/dht.cpp
@@ -217,8 +217,12 @@ bool HOT IRAM_ATTR DHT::read_sensor_(float *temperature, float *humidity, bool r
     uint16_t raw_humidity = (uint16_t(data[0] & 0xFF) << 8) | (data[1] & 0xFF);
     uint16_t raw_temperature = (uint16_t(data[2] & 0xFF) << 8) | (data[3] & 0xFF);
 
-    if (this->model_ != DHT_MODEL_DHT22_TYPE2 && (raw_temperature & 0x8000) != 0)
-      raw_temperature = ~(raw_temperature & 0x7FFF);
+    if (raw_temperature & 0x8000) {
+      if (!(raw_temperature & 0x4000))
+        raw_temperature = ~(raw_temperature & 0x7FFF);
+    } else if (raw_temperature & 0x800) {
+      raw_temperature |= 0xf000;
+    }
 
     if (raw_temperature == 1 && raw_humidity == 10) {
       if (report_errors) {

From ed2ab9e96287cd4ff6a96b0086cdf0ef9d845446 Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Fri, 12 Jan 2024 01:47:50 -0800
Subject: [PATCH 26/68] fix negative temperature for pmsx003 (#6083)

* fix negative temperature for pmsx003

* Update esphome/components/pmsx003/pmsx003.cpp
---
 esphome/components/pmsx003/pmsx003.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/pmsx003/pmsx003.cpp b/esphome/components/pmsx003/pmsx003.cpp
index 04aba4382b..62488b765c 100644
--- a/esphome/components/pmsx003/pmsx003.cpp
+++ b/esphome/components/pmsx003/pmsx003.cpp
@@ -195,7 +195,7 @@ void PMSX003Component::send_command_(uint8_t cmd, uint16_t data) {
 void PMSX003Component::parse_data_() {
   switch (this->type_) {
     case PMSX003_TYPE_5003ST: {
-      float temperature = this->get_16_bit_uint_(30) / 10.0f;
+      float temperature = (int16_t) this->get_16_bit_uint_(30) / 10.0f;
       float humidity = this->get_16_bit_uint_(32) / 10.0f;
 
       ESP_LOGD(TAG, "Got Temperature: %.1f°C, Humidity: %.1f%%", temperature, humidity);

From d551a2eba2c006758eb97cd3cf4c7110d1c15f50 Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Sat, 13 Jan 2024 02:21:28 -0600
Subject: [PATCH 27/68] Improv Serial -- don't wait for incoming bytes (#6089)

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

diff --git a/esphome/components/improv_serial/improv_serial_component.cpp b/esphome/components/improv_serial/improv_serial_component.cpp
index 600069b781..2318fd43cb 100644
--- a/esphome/components/improv_serial/improv_serial_component.cpp
+++ b/esphome/components/improv_serial/improv_serial_component.cpp
@@ -52,7 +52,7 @@ optional<uint8_t> ImprovSerialComponent::read_byte_() {
         size_t available;
         uart_get_buffered_data_len(this->uart_num_, &available);
         if (available) {
-          uart_read_bytes(this->uart_num_, &data, 1, 20 / portTICK_PERIOD_MS);
+          uart_read_bytes(this->uart_num_, &data, 1, 0);
           byte = data;
         }
       }
@@ -71,7 +71,7 @@ optional<uint8_t> ImprovSerialComponent::read_byte_() {
 #endif  // USE_ESP32_VARIANT_ESP32S2 || USE_ESP32_VARIANT_ESP32S3
 #if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6) || defined(USE_ESP32_VARIANT_ESP32S3)
     case logger::UART_SELECTION_USB_SERIAL_JTAG: {
-      if (usb_serial_jtag_read_bytes((char *) &data, 1, 20 / portTICK_PERIOD_MS)) {
+      if (usb_serial_jtag_read_bytes((char *) &data, 1, 0)) {
         byte = data;
       }
       break;

From 8e83c7dd193083ace6d0faabf81dd60993fe8d5d Mon Sep 17 00:00:00 2001
From: guillempages <guillempages@users.noreply.github.com>
Date: Sat, 13 Jan 2024 22:01:32 +0100
Subject: [PATCH 28/68] Let show_*_page actions depend on "Display" (#6092)

Instead of forcing a DisplayBuffer, let the display page actions use Displays without buffer.
---
 esphome/components/display/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/components/display/__init__.py b/esphome/components/display/__init__.py
index 91f10c5458..992799008a 100644
--- a/esphome/components/display/__init__.py
+++ b/esphome/components/display/__init__.py
@@ -145,7 +145,7 @@ async def display_page_show_to_code(config, action_id, template_arg, args):
     DisplayPageShowNextAction,
     maybe_simple_id(
         {
-            cv.Required(CONF_ID): cv.templatable(cv.use_id(DisplayBuffer)),
+            cv.Required(CONF_ID): cv.templatable(cv.use_id(Display)),
         }
     ),
 )
@@ -159,7 +159,7 @@ async def display_page_show_next_to_code(config, action_id, template_arg, args):
     DisplayPageShowPrevAction,
     maybe_simple_id(
         {
-            cv.Required(CONF_ID): cv.templatable(cv.use_id(DisplayBuffer)),
+            cv.Required(CONF_ID): cv.templatable(cv.use_id(Display)),
         }
     ),
 )
@@ -173,7 +173,7 @@ async def display_page_show_previous_to_code(config, action_id, template_arg, ar
     DisplayIsDisplayingPageCondition,
     cv.maybe_simple_value(
         {
-            cv.GenerateID(CONF_ID): cv.use_id(DisplayBuffer),
+            cv.GenerateID(CONF_ID): cv.use_id(Display),
             cv.Required(CONF_PAGE_ID): cv.use_id(DisplayPage),
         },
         key=CONF_PAGE_ID,

From f567b5d28b8c75340cb64a9237219c09ee9d6c50 Mon Sep 17 00:00:00 2001
From: tomaszduda23 <tomaszduda23@gmail.com>
Date: Mon, 15 Jan 2024 00:01:20 +0100
Subject: [PATCH 29/68] add STATE_CLASS_TOTAL_INCREASING to bl0940 and bl0942
 (#6090)

---
 esphome/components/bl0940/sensor.py | 2 ++
 esphome/components/bl0942/sensor.py | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/esphome/components/bl0940/sensor.py b/esphome/components/bl0940/sensor.py
index 702230e020..a197becef8 100644
--- a/esphome/components/bl0940/sensor.py
+++ b/esphome/components/bl0940/sensor.py
@@ -18,6 +18,7 @@ from esphome.const import (
     UNIT_KILOWATT_HOURS,
     UNIT_VOLT,
     UNIT_WATT,
+    STATE_CLASS_TOTAL_INCREASING,
 )
 
 DEPENDENCIES = ["uart"]
@@ -54,6 +55,7 @@ CONFIG_SCHEMA = (
                 unit_of_measurement=UNIT_KILOWATT_HOURS,
                 accuracy_decimals=0,
                 device_class=DEVICE_CLASS_ENERGY,
+                state_class=STATE_CLASS_TOTAL_INCREASING,
             ),
             cv.Optional(CONF_INTERNAL_TEMPERATURE): sensor.sensor_schema(
                 unit_of_measurement=UNIT_CELSIUS,
diff --git a/esphome/components/bl0942/sensor.py b/esphome/components/bl0942/sensor.py
index 663eea0c4d..9612df6d4c 100644
--- a/esphome/components/bl0942/sensor.py
+++ b/esphome/components/bl0942/sensor.py
@@ -19,6 +19,7 @@ from esphome.const import (
     UNIT_VOLT,
     UNIT_WATT,
     UNIT_HERTZ,
+    STATE_CLASS_TOTAL_INCREASING,
 )
 
 DEPENDENCIES = ["uart"]
@@ -52,6 +53,7 @@ CONFIG_SCHEMA = (
                 unit_of_measurement=UNIT_KILOWATT_HOURS,
                 accuracy_decimals=0,
                 device_class=DEVICE_CLASS_ENERGY,
+                state_class=STATE_CLASS_TOTAL_INCREASING,
             ),
             cv.Optional(CONF_FREQUENCY): sensor.sensor_schema(
                 unit_of_measurement=UNIT_HERTZ,

From 5220c9edf82aad55e1df811260675486ac338fb1 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 14 Jan 2024 13:06:13 -1000
Subject: [PATCH 30/68] Fallback to pure-python loader for better error when
 YAML loading fails (#6081)

---
 esphome/yaml_util.py                          | 113 ++++++++++--------
 .../yaml_util/broken_includetest.yaml         |  18 +++
 .../includes/broken_included.yaml.txt         |   5 +
 tests/unit_tests/test_yaml_util.py            |  11 ++
 4 files changed, 98 insertions(+), 49 deletions(-)
 create mode 100644 tests/unit_tests/fixtures/yaml_util/broken_includetest.yaml
 create mode 100644 tests/unit_tests/fixtures/yaml_util/includes/broken_included.yaml.txt

diff --git a/esphome/yaml_util.py b/esphome/yaml_util.py
index aa9fe45ebb..f5e36b79e7 100644
--- a/esphome/yaml_util.py
+++ b/esphome/yaml_util.py
@@ -1,36 +1,37 @@
+from __future__ import annotations
+
 import fnmatch
 import functools
 import inspect
 import logging
 import math
 import os
-
 import uuid
+from typing import Any
+
 import yaml
 import yaml.constructor
+from yaml import SafeLoader as PurePythonLoader
+
+try:
+    from yaml import CSafeLoader as FastestAvailableSafeLoader
+except ImportError:
+    FastestAvailableSafeLoader = PurePythonLoader
 
 from esphome import core
-from esphome.config_helpers import read_config_file, Extend, Remove
+from esphome.config_helpers import Extend, Remove, read_config_file
 from esphome.core import (
+    CORE,
+    DocumentRange,
     EsphomeError,
     IPAddress,
     Lambda,
     MACAddress,
     TimePeriod,
-    DocumentRange,
-    CORE,
 )
 from esphome.helpers import add_class_to_obj
 from esphome.util import OrderedDict, filter_yaml_files
 
-try:
-    from yaml import CSafeLoader as FastestAvailableSafeLoader
-except ImportError:
-    from yaml import (  # type: ignore[assignment]
-        SafeLoader as FastestAvailableSafeLoader,
-    )
-
-
 _LOGGER = logging.getLogger(__name__)
 
 # Mostly copied from Home Assistant because that code works fine and
@@ -97,7 +98,7 @@ def _add_data_ref(fn):
     return wrapped
 
 
-class ESPHomeLoader(FastestAvailableSafeLoader):
+class ESPHomeLoaderMixin:
     """Loader class that keeps track of line numbers."""
 
     @_add_data_ref
@@ -282,8 +283,8 @@ class ESPHomeLoader(FastestAvailableSafeLoader):
             return file, vars
 
         def substitute_vars(config, vars):
-            from esphome.const import CONF_SUBSTITUTIONS, CONF_DEFAULTS
             from esphome.components import substitutions
+            from esphome.const import CONF_DEFAULTS, CONF_SUBSTITUTIONS
 
             org_subs = None
             result = config
@@ -375,50 +376,64 @@ class ESPHomeLoader(FastestAvailableSafeLoader):
         return Remove(str(node.value))
 
 
-ESPHomeLoader.add_constructor("tag:yaml.org,2002:int", ESPHomeLoader.construct_yaml_int)
-ESPHomeLoader.add_constructor(
-    "tag:yaml.org,2002:float", ESPHomeLoader.construct_yaml_float
-)
-ESPHomeLoader.add_constructor(
-    "tag:yaml.org,2002:binary", ESPHomeLoader.construct_yaml_binary
-)
-ESPHomeLoader.add_constructor(
-    "tag:yaml.org,2002:omap", ESPHomeLoader.construct_yaml_omap
-)
-ESPHomeLoader.add_constructor("tag:yaml.org,2002:str", ESPHomeLoader.construct_yaml_str)
-ESPHomeLoader.add_constructor("tag:yaml.org,2002:seq", ESPHomeLoader.construct_yaml_seq)
-ESPHomeLoader.add_constructor("tag:yaml.org,2002:map", ESPHomeLoader.construct_yaml_map)
-ESPHomeLoader.add_constructor("!env_var", ESPHomeLoader.construct_env_var)
-ESPHomeLoader.add_constructor("!secret", ESPHomeLoader.construct_secret)
-ESPHomeLoader.add_constructor("!include", ESPHomeLoader.construct_include)
-ESPHomeLoader.add_constructor(
-    "!include_dir_list", ESPHomeLoader.construct_include_dir_list
-)
-ESPHomeLoader.add_constructor(
-    "!include_dir_merge_list", ESPHomeLoader.construct_include_dir_merge_list
-)
-ESPHomeLoader.add_constructor(
-    "!include_dir_named", ESPHomeLoader.construct_include_dir_named
-)
-ESPHomeLoader.add_constructor(
-    "!include_dir_merge_named", ESPHomeLoader.construct_include_dir_merge_named
-)
-ESPHomeLoader.add_constructor("!lambda", ESPHomeLoader.construct_lambda)
-ESPHomeLoader.add_constructor("!force", ESPHomeLoader.construct_force)
-ESPHomeLoader.add_constructor("!extend", ESPHomeLoader.construct_extend)
-ESPHomeLoader.add_constructor("!remove", ESPHomeLoader.construct_remove)
+class ESPHomeLoader(ESPHomeLoaderMixin, FastestAvailableSafeLoader):
+    """Loader class that keeps track of line numbers."""
 
 
-def load_yaml(fname, clear_secrets=True):
+class ESPHomePurePythonLoader(ESPHomeLoaderMixin, PurePythonLoader):
+    """Loader class that keeps track of line numbers."""
+
+
+for _loader in (ESPHomeLoader, ESPHomePurePythonLoader):
+    _loader.add_constructor("tag:yaml.org,2002:int", _loader.construct_yaml_int)
+    _loader.add_constructor("tag:yaml.org,2002:float", _loader.construct_yaml_float)
+    _loader.add_constructor("tag:yaml.org,2002:binary", _loader.construct_yaml_binary)
+    _loader.add_constructor("tag:yaml.org,2002:omap", _loader.construct_yaml_omap)
+    _loader.add_constructor("tag:yaml.org,2002:str", _loader.construct_yaml_str)
+    _loader.add_constructor("tag:yaml.org,2002:seq", _loader.construct_yaml_seq)
+    _loader.add_constructor("tag:yaml.org,2002:map", _loader.construct_yaml_map)
+    _loader.add_constructor("!env_var", _loader.construct_env_var)
+    _loader.add_constructor("!secret", _loader.construct_secret)
+    _loader.add_constructor("!include", _loader.construct_include)
+    _loader.add_constructor("!include_dir_list", _loader.construct_include_dir_list)
+    _loader.add_constructor(
+        "!include_dir_merge_list", _loader.construct_include_dir_merge_list
+    )
+    _loader.add_constructor("!include_dir_named", _loader.construct_include_dir_named)
+    _loader.add_constructor(
+        "!include_dir_merge_named", _loader.construct_include_dir_merge_named
+    )
+    _loader.add_constructor("!lambda", _loader.construct_lambda)
+    _loader.add_constructor("!force", _loader.construct_force)
+    _loader.add_constructor("!extend", _loader.construct_extend)
+    _loader.add_constructor("!remove", _loader.construct_remove)
+
+
+def load_yaml(fname: str, clear_secrets: bool = True) -> Any:
     if clear_secrets:
         _SECRET_VALUES.clear()
         _SECRET_CACHE.clear()
     return _load_yaml_internal(fname)
 
 
-def _load_yaml_internal(fname):
+def _load_yaml_internal(fname: str) -> Any:
+    """Load a YAML file."""
     content = read_config_file(fname)
-    loader = ESPHomeLoader(content)
+    try:
+        return _load_yaml_internal_with_type(ESPHomeLoader, fname, content)
+    except EsphomeError:
+        # Loading failed, so we now load with the Python loader which has more
+        # readable exceptions
+        return _load_yaml_internal_with_type(ESPHomePurePythonLoader, fname, content)
+
+
+def _load_yaml_internal_with_type(
+    loader_type: type[ESPHomeLoader] | type[ESPHomePurePythonLoader],
+    fname: str,
+    content: str,
+) -> Any:
+    """Load a YAML file."""
+    loader = loader_type(content)
     loader.name = fname
     try:
         return loader.get_single_data() or OrderedDict()
diff --git a/tests/unit_tests/fixtures/yaml_util/broken_includetest.yaml b/tests/unit_tests/fixtures/yaml_util/broken_includetest.yaml
new file mode 100644
index 0000000000..aaca55b807
--- /dev/null
+++ b/tests/unit_tests/fixtures/yaml_util/broken_includetest.yaml
@@ -0,0 +1,18 @@
+---
+substitutions:
+  name: original
+
+wifi: !include
+  file: includes/broken_included.yaml.txt
+  vars:
+    name: my_custom_ssid
+
+esphome:
+  # should be substituted as 'original',
+  # not overwritten by vars in the !include above
+  name: ${name}
+  name_add_mac_suffix: true
+  platform: esp8266
+  board: !include {file: includes/scalar.yaml, vars: {var1: nodemcu}}
+
+  libraries: !include {file: includes/list.yaml, vars: {var1: Wire}}
diff --git a/tests/unit_tests/fixtures/yaml_util/includes/broken_included.yaml.txt b/tests/unit_tests/fixtures/yaml_util/includes/broken_included.yaml.txt
new file mode 100644
index 0000000000..6e53395c86
--- /dev/null
+++ b/tests/unit_tests/fixtures/yaml_util/includes/broken_included.yaml.txt
@@ -0,0 +1,5 @@
+---
+# yamllint disable-line
+   ssid: ${name}
+# yamllint disable-line
+       fdf: error
diff --git a/tests/unit_tests/test_yaml_util.py b/tests/unit_tests/test_yaml_util.py
index 8ee991f5b3..78b6a2ad84 100644
--- a/tests/unit_tests/test_yaml_util.py
+++ b/tests/unit_tests/test_yaml_util.py
@@ -1,5 +1,6 @@
 from esphome import yaml_util
 from esphome.components import substitutions
+from esphome.core import EsphomeError
 
 
 def test_include_with_vars(fixture_path):
@@ -11,3 +12,13 @@ def test_include_with_vars(fixture_path):
     assert actual["esphome"]["libraries"][0] == "Wire"
     assert actual["esphome"]["board"] == "nodemcu"
     assert actual["wifi"]["ssid"] == "my_custom_ssid"
+
+
+def test_loading_a_broken_yaml_file(fixture_path):
+    """Ensure we fallback to pure python to give good errors."""
+    yaml_file = fixture_path / "yaml_util" / "broken_includetest.yaml"
+
+    try:
+        yaml_util.load_yaml(yaml_file)
+    except EsphomeError as err:
+        assert "broken_included.yaml" in str(err)

From dd2dca4d08593dfddbac7145188a759acbba6423 Mon Sep 17 00:00:00 2001
From: Pieter Frenssen <pieter@frenssen.be>
Date: Mon, 15 Jan 2024 01:48:02 +0200
Subject: [PATCH 31/68] Bump pillow to 10.2.0. (#6091)

---
 esphome/components/font/__init__.py | 8 ++++----
 requirements_optional.txt           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/esphome/components/font/__init__.py b/esphome/components/font/__init__.py
index a803c7567b..5b4682a808 100644
--- a/esphome/components/font/__init__.py
+++ b/esphome/components/font/__init__.py
@@ -67,13 +67,13 @@ def validate_pillow_installed(value):
     except ImportError as err:
         raise cv.Invalid(
             "Please install the pillow python package to use this feature. "
-            '(pip install "pillow==10.1.0")'
+            '(pip install "pillow==10.2.0")'
         ) from err
 
-    if version.parse(PIL.__version__) != version.parse("10.1.0"):
+    if version.parse(PIL.__version__) != version.parse("10.2.0"):
         raise cv.Invalid(
-            "Please update your pillow installation to 10.1.0. "
-            '(pip install "pillow==10.1.0")'
+            "Please update your pillow installation to 10.2.0. "
+            '(pip install "pillow==10.2.0")'
         )
 
     return value
diff --git a/requirements_optional.txt b/requirements_optional.txt
index bc4ea08c92..54494b4585 100644
--- a/requirements_optional.txt
+++ b/requirements_optional.txt
@@ -1,3 +1,3 @@
-pillow==10.1.0
+pillow==10.2.0
 cairosvg==2.7.1
 cryptography==41.0.4

From 8b2d76e8cebca0055b08319076f5cc8d94f25383 Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Sun, 14 Jan 2024 16:05:47 -0800
Subject: [PATCH 32/68] convert cse7766 to non-polling (#6095)

Co-authored-by: Samuel Sieb <samuel@sieb.net>
---
 esphome/components/cse7766/cse7766.cpp | 52 +++++---------------
 esphome/components/cse7766/cse7766.h   | 11 +----
 esphome/components/cse7766/sensor.py   | 66 ++++++++++++--------------
 3 files changed, 44 insertions(+), 85 deletions(-)

diff --git a/esphome/components/cse7766/cse7766.cpp b/esphome/components/cse7766/cse7766.cpp
index 60132fd98f..9c5016c503 100644
--- a/esphome/components/cse7766/cse7766.cpp
+++ b/esphome/components/cse7766/cse7766.cpp
@@ -113,8 +113,9 @@ void CSE7766Component::parse_data_() {
   bool have_voltage = adj & 0x40;
   if (have_voltage) {
     // voltage cycle of serial port outputted is a complete cycle;
-    this->voltage_acc_ += voltage_calib / float(voltage_cycle);
-    this->voltage_counts_ += 1;
+    float voltage = voltage_calib / float(voltage_cycle);
+    if (this->voltage_sensor_ != nullptr)
+      this->voltage_sensor_->publish_state(voltage);
   }
 
   bool have_power = adj & 0x10;
@@ -126,8 +127,8 @@ void CSE7766Component::parse_data_() {
     if (!power_cycle_exceeds_range) {
       power = power_calib / float(power_cycle);
     }
-    this->power_acc_ += power;
-    this->power_counts_ += 1;
+    if (this->power_sensor_ != nullptr)
+      this->power_sensor_->publish_state(power);
 
     uint32_t difference;
     if (this->cf_pulses_last_ == 0) {
@@ -141,7 +142,10 @@ void CSE7766Component::parse_data_() {
     }
     this->cf_pulses_last_ = cf_pulses;
     this->energy_total_ += difference * float(power_calib) / 1000000.0f / 3600.0f;
-    this->energy_total_counts_ += 1;
+    if (this->energy_sensor_ != nullptr)
+      this->energy_sensor_->publish_state(this->energy_total_);
+  } else if ((this->energy_sensor_ != nullptr) && !this->energy_sensor_->has_state()) {
+    this->energy_sensor_->publish_state(0);
   }
 
   if (adj & 0x20) {
@@ -150,42 +154,13 @@ void CSE7766Component::parse_data_() {
     if (have_voltage && !have_power) {
       // Testing has shown that when we have voltage and current but not power, that means the power is 0.
       // We report a power of 0, which in turn means we should report a current of 0.
-      this->power_counts_ += 1;
+      if (this->power_sensor_ != nullptr)
+        this->power_sensor_->publish_state(0);
     } else if (power != 0.0f) {
       current = current_calib / float(current_cycle);
     }
-    this->current_acc_ += current;
-    this->current_counts_ += 1;
-  }
-}
-void CSE7766Component::update() {
-  const auto publish_state = [](const char *name, sensor::Sensor *sensor, float &acc, uint32_t &counts) {
-    if (counts != 0) {
-      const auto avg = acc / counts;
-
-      ESP_LOGV(TAG, "Got %s_acc=%.2f %s_counts=%" PRIu32 " %s=%.1f", name, acc, name, counts, name, avg);
-
-      if (sensor != nullptr) {
-        sensor->publish_state(avg);
-      }
-
-      acc = 0.0f;
-      counts = 0;
-    }
-  };
-
-  publish_state("voltage", this->voltage_sensor_, this->voltage_acc_, this->voltage_counts_);
-  publish_state("current", this->current_sensor_, this->current_acc_, this->current_counts_);
-  publish_state("power", this->power_sensor_, this->power_acc_, this->power_counts_);
-
-  if (this->energy_total_counts_ != 0) {
-    ESP_LOGV(TAG, "Got energy_total=%.2f energy_total_counts=%" PRIu32, this->energy_total_,
-             this->energy_total_counts_);
-
-    if (this->energy_sensor_ != nullptr) {
-      this->energy_sensor_->publish_state(this->energy_total_);
-    }
-    this->energy_total_counts_ = 0;
+    if (this->current_sensor_ != nullptr)
+      this->current_sensor_->publish_state(current);
   }
 }
 
@@ -196,7 +171,6 @@ uint32_t CSE7766Component::get_24_bit_uint_(uint8_t start_index) {
 
 void CSE7766Component::dump_config() {
   ESP_LOGCONFIG(TAG, "CSE7766:");
-  LOG_UPDATE_INTERVAL(this);
   LOG_SENSOR("  ", "Voltage", this->voltage_sensor_);
   LOG_SENSOR("  ", "Current", this->current_sensor_);
   LOG_SENSOR("  ", "Power", this->power_sensor_);
diff --git a/esphome/components/cse7766/cse7766.h b/esphome/components/cse7766/cse7766.h
index 2f30eec09f..3ab8d609bd 100644
--- a/esphome/components/cse7766/cse7766.h
+++ b/esphome/components/cse7766/cse7766.h
@@ -7,7 +7,7 @@
 namespace esphome {
 namespace cse7766 {
 
-class CSE7766Component : public PollingComponent, public uart::UARTDevice {
+class CSE7766Component : public Component, public uart::UARTDevice {
  public:
   void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
   void set_current_sensor(sensor::Sensor *current_sensor) { current_sensor_ = current_sensor; }
@@ -16,7 +16,6 @@ class CSE7766Component : public PollingComponent, public uart::UARTDevice {
 
   void loop() override;
   float get_setup_priority() const override;
-  void update() override;
   void dump_config() override;
 
  protected:
@@ -31,16 +30,8 @@ class CSE7766Component : public PollingComponent, public uart::UARTDevice {
   sensor::Sensor *current_sensor_{nullptr};
   sensor::Sensor *power_sensor_{nullptr};
   sensor::Sensor *energy_sensor_{nullptr};
-  float voltage_acc_{0.0f};
-  float current_acc_{0.0f};
-  float power_acc_{0.0f};
   float energy_total_{0.0f};
   uint32_t cf_pulses_last_{0};
-  uint32_t voltage_counts_{0};
-  uint32_t current_counts_{0};
-  uint32_t power_counts_{0};
-  // Setting this to 1 means it will always publish 0 once at startup
-  uint32_t energy_total_counts_{1};
 };
 
 }  // namespace cse7766
diff --git a/esphome/components/cse7766/sensor.py b/esphome/components/cse7766/sensor.py
index d98b351287..f2750bb4f2 100644
--- a/esphome/components/cse7766/sensor.py
+++ b/esphome/components/cse7766/sensor.py
@@ -22,43 +22,37 @@ from esphome.const import (
 DEPENDENCIES = ["uart"]
 
 cse7766_ns = cg.esphome_ns.namespace("cse7766")
-CSE7766Component = cse7766_ns.class_(
-    "CSE7766Component", cg.PollingComponent, uart.UARTDevice
-)
+CSE7766Component = cse7766_ns.class_("CSE7766Component", cg.Component, uart.UARTDevice)
 
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(CSE7766Component),
-            cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_VOLT,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_VOLTAGE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_CURRENT): sensor.sensor_schema(
-                unit_of_measurement=UNIT_AMPERE,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_CURRENT,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_POWER): sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_POWER,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_ENERGY): sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT_HOURS,
-                accuracy_decimals=3,
-                device_class=DEVICE_CLASS_ENERGY,
-                state_class=STATE_CLASS_TOTAL_INCREASING,
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(uart.UART_DEVICE_SCHEMA)
-)
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.declare_id(CSE7766Component),
+        cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(
+            unit_of_measurement=UNIT_VOLT,
+            accuracy_decimals=1,
+            device_class=DEVICE_CLASS_VOLTAGE,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_CURRENT): sensor.sensor_schema(
+            unit_of_measurement=UNIT_AMPERE,
+            accuracy_decimals=2,
+            device_class=DEVICE_CLASS_CURRENT,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_POWER): sensor.sensor_schema(
+            unit_of_measurement=UNIT_WATT,
+            accuracy_decimals=1,
+            device_class=DEVICE_CLASS_POWER,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_ENERGY): sensor.sensor_schema(
+            unit_of_measurement=UNIT_WATT_HOURS,
+            accuracy_decimals=3,
+            device_class=DEVICE_CLASS_ENERGY,
+            state_class=STATE_CLASS_TOTAL_INCREASING,
+        ),
+    }
+).extend(uart.UART_DEVICE_SCHEMA)
 FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
     "cse7766", baud_rate=4800, require_rx=True
 )

From 83baa24022ef56100dfb6ae2ce02d2bdc0fe0ebe Mon Sep 17 00:00:00 2001
From: NP v/d Spek <github_mail@lumensoft.nl>
Date: Mon, 15 Jan 2024 03:07:06 +0100
Subject: [PATCH 33/68] Use touch state from ft63x6 driver. (#6055)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/ft63x6/ft63x6.cpp | 65 +++++++++++++---------------
 1 file changed, 29 insertions(+), 36 deletions(-)

diff --git a/esphome/components/ft63x6/ft63x6.cpp b/esphome/components/ft63x6/ft63x6.cpp
index b674ded22c..f796f0242a 100644
--- a/esphome/components/ft63x6/ft63x6.cpp
+++ b/esphome/components/ft63x6/ft63x6.cpp
@@ -13,14 +13,14 @@
 namespace esphome {
 namespace ft63x6 {
 
-static const uint8_t FT63X6_ADDR_TOUCH_COUNT = 0x02;
-
-static const uint8_t FT63X6_ADDR_TOUCH1_ID = 0x05;
+static const uint8_t FT63X6_ADDR_TOUCH1_STATE = 0x03;
 static const uint8_t FT63X6_ADDR_TOUCH1_X = 0x03;
+static const uint8_t FT63X6_ADDR_TOUCH1_ID = 0x05;
 static const uint8_t FT63X6_ADDR_TOUCH1_Y = 0x05;
 
-static const uint8_t FT63X6_ADDR_TOUCH2_ID = 0x0B;
+static const uint8_t FT63X6_ADDR_TOUCH2_STATE = 0x09;
 static const uint8_t FT63X6_ADDR_TOUCH2_X = 0x09;
+static const uint8_t FT63X6_ADDR_TOUCH2_ID = 0x0B;
 static const uint8_t FT63X6_ADDR_TOUCH2_Y = 0x0B;
 
 static const char *const TAG = "FT63X6Touchscreen";
@@ -40,26 +40,11 @@ void FT63X6Touchscreen::setup() {
   this->hard_reset_();
 
   // Get touch resolution
-  this->x_raw_max_ = 320;
-  this->y_raw_max_ = 480;
-}
-
-void FT63X6Touchscreen::update_touches() {
-  int touch_count = this->read_touch_count_();
-  if (touch_count == 0) {
-    return;
+  if (this->x_raw_max_ == this->x_raw_min_) {
+    this->x_raw_max_ = 320;
   }
-
-  uint8_t touch_id = this->read_touch_id_(FT63X6_ADDR_TOUCH1_ID);  // id1 = 0 or 1
-  int16_t x = this->read_touch_coordinate_(FT63X6_ADDR_TOUCH1_X);
-  int16_t y = this->read_touch_coordinate_(FT63X6_ADDR_TOUCH1_Y);
-  this->add_raw_touch_position_(touch_id, x, y);
-
-  if (touch_count >= 2) {
-    touch_id = this->read_touch_id_(FT63X6_ADDR_TOUCH2_ID);  // id2 = 0 or 1(~id1 & 0x01)
-    x = this->read_touch_coordinate_(FT63X6_ADDR_TOUCH2_X);
-    y = this->read_touch_coordinate_(FT63X6_ADDR_TOUCH2_Y);
-    this->add_raw_touch_position_(touch_id, x, y);
+  if (this->y_raw_max_ == this->y_raw_min_) {
+    this->y_raw_max_ = 480;
   }
 }
 
@@ -76,23 +61,31 @@ void FT63X6Touchscreen::dump_config() {
   LOG_I2C_DEVICE(this);
   LOG_PIN("  Interrupt Pin: ", this->interrupt_pin_);
   LOG_PIN("  Reset Pin: ", this->reset_pin_);
+  LOG_UPDATE_INTERVAL(this);
 }
 
-uint8_t FT63X6Touchscreen::read_touch_count_() { return this->read_byte_(FT63X6_ADDR_TOUCH_COUNT); }
+void FT63X6Touchscreen::update_touches() {
+  uint8_t data[15];
+  uint16_t touch_id, x, y;
 
-// Touch functions
-uint16_t FT63X6Touchscreen::read_touch_coordinate_(uint8_t coordinate) {
-  uint8_t read_buf[2];
-  read_buf[0] = this->read_byte_(coordinate);
-  read_buf[1] = this->read_byte_(coordinate + 1);
-  return ((read_buf[0] & 0x0f) << 8) | read_buf[1];
-}
-uint8_t FT63X6Touchscreen::read_touch_id_(uint8_t id_address) { return this->read_byte_(id_address) >> 4; }
+  if (!this->read_bytes(0x00, (uint8_t *) data, 15)) {
+    ESP_LOGE(TAG, "Failed to read touch data");
+    this->skip_update_ = true;
+    return;
+  }
 
-uint8_t FT63X6Touchscreen::read_byte_(uint8_t addr) {
-  uint8_t byte = 0;
-  this->read_byte(addr, &byte);
-  return byte;
+  if (((data[FT63X6_ADDR_TOUCH1_STATE] >> 6) & 0x01) == 0) {
+    touch_id = data[FT63X6_ADDR_TOUCH1_ID] >> 4;  // id1 = 0 or 1
+    x = encode_uint16(data[FT63X6_ADDR_TOUCH1_X] & 0x0F, data[FT63X6_ADDR_TOUCH1_X + 1]);
+    y = encode_uint16(data[FT63X6_ADDR_TOUCH1_Y] & 0x0F, data[FT63X6_ADDR_TOUCH1_Y + 1]);
+    this->add_raw_touch_position_(touch_id, x, y);
+  }
+  if (((data[FT63X6_ADDR_TOUCH2_STATE] >> 6) & 0x01) == 0) {
+    touch_id = data[FT63X6_ADDR_TOUCH2_ID] >> 4;  // id1 = 0 or 1
+    x = encode_uint16(data[FT63X6_ADDR_TOUCH2_X] & 0x0F, data[FT63X6_ADDR_TOUCH2_X + 1]);
+    y = encode_uint16(data[FT63X6_ADDR_TOUCH2_Y] & 0x0F, data[FT63X6_ADDR_TOUCH2_Y + 1]);
+    this->add_raw_touch_position_(touch_id, x, y);
+  }
 }
 
 }  // namespace ft63x6

From e39099137d04c1a7d2214cd33614b6b2449e8c79 Mon Sep 17 00:00:00 2001
From: NP v/d Spek <github_mail@lumensoft.nl>
Date: Mon, 15 Jan 2024 03:08:10 +0100
Subject: [PATCH 34/68] update script/setup so it works fine on windows (#6087)

---
 script/setup | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/script/setup b/script/setup
index 9f448cf5c4..f286b4672a 100755
--- a/script/setup
+++ b/script/setup
@@ -4,10 +4,13 @@
 set -e
 
 cd "$(dirname "$0")/.."
-
+location="venv/bin/activate"
 if [ ! -n "$DEVCONTAINER" ] && [ ! -n "$VIRTUAL_ENV" ] && [ ! "$ESPHOME_NO_VENV" ]; then
   python3 -m venv venv
-  source venv/bin/activate
+  if [ -f venv/Scripts/activate ]; then
+    location="venv/Scripts/activate"
+  fi
+  source $location;
 fi
 
 # Avoid unsafe git error when running inside devcontainer
@@ -25,4 +28,4 @@ script/platformio_install_deps.py platformio.ini --libraries --tools --platforms
 
 echo
 echo
-echo "Virtual environment created; source venv/bin/activate to use it"
+echo "Virtual environment created. Run 'source $location' to use it."

From 8cd17986740e6433e6b557965dfb1b7db79cad0c Mon Sep 17 00:00:00 2001
From: NP v/d Spek <github_mail@lumensoft.nl>
Date: Mon, 15 Jan 2024 03:09:35 +0100
Subject: [PATCH 35/68] add Pico-ResTouch-LCD-3.5 (#6078)

---
 esphome/components/ili9xxx/display.py         |  6 +++++
 .../components/ili9xxx/ili9xxx_display.cpp    |  3 +++
 esphome/components/ili9xxx/ili9xxx_display.h  | 10 ++++++++-
 esphome/components/ili9xxx/ili9xxx_init.h     | 22 +++++++++++++++++++
 4 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/esphome/components/ili9xxx/display.py b/esphome/components/ili9xxx/display.py
index b3fe8b2b41..af8141f9fc 100644
--- a/esphome/components/ili9xxx/display.py
+++ b/esphome/components/ili9xxx/display.py
@@ -66,6 +66,7 @@ MODELS = {
     "ST7789V": ili9xxx_ns.class_("ILI9XXXST7789V", ILI9XXXDisplay),
     "S3BOX": ili9xxx_ns.class_("ILI9XXXS3Box", ILI9XXXDisplay),
     "S3BOX_LITE": ili9xxx_ns.class_("ILI9XXXS3BoxLite", ILI9XXXDisplay),
+    "WSPICOLCD": ili9xxx_ns.class_("ILI9XXXWSPICOLCD", ILI9XXXDisplay),
 }
 
 COLOR_ORDERS = {
@@ -78,6 +79,7 @@ COLOR_PALETTE = cv.one_of("NONE", "GRAYSCALE", "IMAGE_ADAPTIVE")
 CONF_LED_PIN = "led_pin"
 CONF_COLOR_PALETTE_IMAGES = "color_palette_images"
 CONF_INVERT_DISPLAY = "invert_display"
+CONF_18BIT_MODE = "18bit_mode"
 
 
 def _validate(config):
@@ -139,6 +141,7 @@ CONFIG_SCHEMA = cv.All(
                 "'invert_display' has been replaced by 'invert_colors'"
             ),
             cv.Optional(CONF_INVERT_COLORS): cv.boolean,
+            cv.Optional(CONF_18BIT_MODE): cv.boolean,
             cv.Optional(CONF_COLOR_ORDER): cv.one_of(*COLOR_ORDERS.keys(), upper=True),
             cv.Exclusive(CONF_ROTATION, CONF_ROTATION): validate_rotation,
             cv.Exclusive(CONF_TRANSFORM, CONF_ROTATION): cv.Schema(
@@ -241,3 +244,6 @@ async def to_code(config):
 
     if CONF_INVERT_COLORS in config:
         cg.add(var.invert_colors(config[CONF_INVERT_COLORS]))
+
+    if CONF_18BIT_MODE in config:
+        cg.add(var.set_18bit_mode(config[CONF_18BIT_MODE]))
diff --git a/esphome/components/ili9xxx/ili9xxx_display.cpp b/esphome/components/ili9xxx/ili9xxx_display.cpp
index ab577b3875..2844856246 100644
--- a/esphome/components/ili9xxx/ili9xxx_display.cpp
+++ b/esphome/components/ili9xxx/ili9xxx_display.cpp
@@ -34,6 +34,9 @@ void ILI9XXXDisplay::setup() {
     mad |= MADCTL_MY;
   this->send_command(ILI9XXX_MADCTL, &mad, 1);
 
+  mad = this->is_18bitdisplay_ ? 0x66 : 0x55;
+  this->send_command(ILI9XXX_PIXFMT, &mad, 1);
+
   this->x_low_ = this->width_;
   this->y_low_ = this->height_;
   this->x_high_ = 0;
diff --git a/esphome/components/ili9xxx/ili9xxx_display.h b/esphome/components/ili9xxx/ili9xxx_display.h
index 590be3e364..c470f1e75d 100644
--- a/esphome/components/ili9xxx/ili9xxx_display.h
+++ b/esphome/components/ili9xxx/ili9xxx_display.h
@@ -53,9 +53,9 @@ class ILI9XXXDisplay : public display::DisplayBuffer,
       addr += num_args;
     }
   }
+  float get_setup_priority() const override;
 
   void set_dc_pin(GPIOPin *dc_pin) { dc_pin_ = dc_pin; }
-  float get_setup_priority() const override;
   void set_reset_pin(GPIOPin *reset) { this->reset_pin_ = reset; }
   void set_palette(const uint8_t *palette) { this->palette_ = palette; }
   void set_buffer_color_mode(ILI9XXXColorMode color_mode) { this->buffer_color_mode_ = color_mode; }
@@ -67,7 +67,10 @@ class ILI9XXXDisplay : public display::DisplayBuffer,
     this->offset_x_ = offset_x;
     this->offset_y_ = offset_y;
   }
+  void set_18bit_mode(bool mode) { this->is_18bitdisplay_ = mode; };
+
   void invert_colors(bool invert);
+
   void command(uint8_t value);
   void data(uint8_t value);
   void send_command(uint8_t command_byte, const uint8_t *data_bytes, uint8_t num_data_bytes);
@@ -209,5 +212,10 @@ class ILI9XXXS3BoxLite : public ILI9XXXDisplay {
   ILI9XXXS3BoxLite() : ILI9XXXDisplay(INITCMD_S3BOXLITE, 320, 240, true) {}
 };
 
+class ILI9XXXWSPICOLCD : public ILI9XXXDisplay {
+ public:
+  ILI9XXXWSPICOLCD() : ILI9XXXDisplay(INITCMD_WSPICOLCD, 320, 480, true) {}
+};
+
 }  // namespace ili9xxx
 }  // namespace esphome
diff --git a/esphome/components/ili9xxx/ili9xxx_init.h b/esphome/components/ili9xxx/ili9xxx_init.h
index a74824052f..0bf1d5761d 100644
--- a/esphome/components/ili9xxx/ili9xxx_init.h
+++ b/esphome/components/ili9xxx/ili9xxx_init.h
@@ -316,6 +316,28 @@ static const uint8_t PROGMEM INITCMD_ST7789V[] = {
   0x00                                   // End of list
 };
 
+static const uint8_t PROGMEM INITCMD_WSPICOLCD[] = {
+ILI9XXX_SLPOUT, 0x80,
+ILI9XXX_PIXFMT, 1, 0x66,
+ILI9XXX_PWCTR1, 2, 0x17, 0x15, // VRH1 VRH2 -ok
+ILI9XXX_PWCTR2, 1, 0x41, // VGH, VGL - ok
+ILI9XXX_PWCTR3, 1, 0x44,
+//ILI9XXX_VMCTR1, 4, 0x00, 0x00, 0x00, 0x00,
+ILI9XXX_VMCTR1, 3, 0x00, 0x12, 0x80, // nVM VCM_REG VCM_REG_EN - not ok?
+ILI9XXX_IFMODE, 1, 0x00, // -ok
+ILI9XXX_FRMCTR1, 1, 0xA0, // Frame rate = 60Hz -- seems to help the background! -ok
+ILI9XXX_INVCTR, 1, 0x02, // Display Inversion Control = 2dot - ok
+ILI9XXX_DFUNCTR, 2, 0x02, 0x02, // Nomal scan -ok
+ILI9XXX_ADJCTL3, 4, 0xA9, 0x51, 0x2C, 0x82, // Adjust Control 3
+ILI9XXX_GMCTRP1,15, 0x00, 0x03, 0x09, 0x08, 0x16, 0x0A, 0x3F, 0x78, 0x4C, 0x09, 0x0A, 0x08, 0x16, 0x1A, 0x0F,
+ILI9XXX_GMCTRN1,15, 0x00, 0x16, 0x19, 0x03, 0x0F, 0x05, 0x32, 0x45, 0x46, 0x04, 0x0E, 0x0D, 0x35, 0x37, 0x0F,
+
+ILI9XXX_INVON, 0x80,
+ILI9XXX_MADCTL, 1, 0x48,
+ILI9XXX_DISPON, 0x80,
+0x00 // End of list
+};
+
 // clang-format on
 }  // namespace ili9xxx
 }  // namespace esphome

From 412c999f1497b2935fedaf27d62d1fd3259c54e7 Mon Sep 17 00:00:00 2001
From: NP v/d Spek <github_mail@lumensoft.nl>
Date: Mon, 15 Jan 2024 07:41:01 +0100
Subject: [PATCH 36/68] Revert "add Pico-ResTouch-LCD-3.5" (#6098)

---
 esphome/components/ili9xxx/display.py         |  6 -----
 .../components/ili9xxx/ili9xxx_display.cpp    |  3 ---
 esphome/components/ili9xxx/ili9xxx_display.h  | 10 +--------
 esphome/components/ili9xxx/ili9xxx_init.h     | 22 -------------------
 4 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/esphome/components/ili9xxx/display.py b/esphome/components/ili9xxx/display.py
index af8141f9fc..b3fe8b2b41 100644
--- a/esphome/components/ili9xxx/display.py
+++ b/esphome/components/ili9xxx/display.py
@@ -66,7 +66,6 @@ MODELS = {
     "ST7789V": ili9xxx_ns.class_("ILI9XXXST7789V", ILI9XXXDisplay),
     "S3BOX": ili9xxx_ns.class_("ILI9XXXS3Box", ILI9XXXDisplay),
     "S3BOX_LITE": ili9xxx_ns.class_("ILI9XXXS3BoxLite", ILI9XXXDisplay),
-    "WSPICOLCD": ili9xxx_ns.class_("ILI9XXXWSPICOLCD", ILI9XXXDisplay),
 }
 
 COLOR_ORDERS = {
@@ -79,7 +78,6 @@ COLOR_PALETTE = cv.one_of("NONE", "GRAYSCALE", "IMAGE_ADAPTIVE")
 CONF_LED_PIN = "led_pin"
 CONF_COLOR_PALETTE_IMAGES = "color_palette_images"
 CONF_INVERT_DISPLAY = "invert_display"
-CONF_18BIT_MODE = "18bit_mode"
 
 
 def _validate(config):
@@ -141,7 +139,6 @@ CONFIG_SCHEMA = cv.All(
                 "'invert_display' has been replaced by 'invert_colors'"
             ),
             cv.Optional(CONF_INVERT_COLORS): cv.boolean,
-            cv.Optional(CONF_18BIT_MODE): cv.boolean,
             cv.Optional(CONF_COLOR_ORDER): cv.one_of(*COLOR_ORDERS.keys(), upper=True),
             cv.Exclusive(CONF_ROTATION, CONF_ROTATION): validate_rotation,
             cv.Exclusive(CONF_TRANSFORM, CONF_ROTATION): cv.Schema(
@@ -244,6 +241,3 @@ async def to_code(config):
 
     if CONF_INVERT_COLORS in config:
         cg.add(var.invert_colors(config[CONF_INVERT_COLORS]))
-
-    if CONF_18BIT_MODE in config:
-        cg.add(var.set_18bit_mode(config[CONF_18BIT_MODE]))
diff --git a/esphome/components/ili9xxx/ili9xxx_display.cpp b/esphome/components/ili9xxx/ili9xxx_display.cpp
index 2844856246..ab577b3875 100644
--- a/esphome/components/ili9xxx/ili9xxx_display.cpp
+++ b/esphome/components/ili9xxx/ili9xxx_display.cpp
@@ -34,9 +34,6 @@ void ILI9XXXDisplay::setup() {
     mad |= MADCTL_MY;
   this->send_command(ILI9XXX_MADCTL, &mad, 1);
 
-  mad = this->is_18bitdisplay_ ? 0x66 : 0x55;
-  this->send_command(ILI9XXX_PIXFMT, &mad, 1);
-
   this->x_low_ = this->width_;
   this->y_low_ = this->height_;
   this->x_high_ = 0;
diff --git a/esphome/components/ili9xxx/ili9xxx_display.h b/esphome/components/ili9xxx/ili9xxx_display.h
index c470f1e75d..590be3e364 100644
--- a/esphome/components/ili9xxx/ili9xxx_display.h
+++ b/esphome/components/ili9xxx/ili9xxx_display.h
@@ -53,9 +53,9 @@ class ILI9XXXDisplay : public display::DisplayBuffer,
       addr += num_args;
     }
   }
-  float get_setup_priority() const override;
 
   void set_dc_pin(GPIOPin *dc_pin) { dc_pin_ = dc_pin; }
+  float get_setup_priority() const override;
   void set_reset_pin(GPIOPin *reset) { this->reset_pin_ = reset; }
   void set_palette(const uint8_t *palette) { this->palette_ = palette; }
   void set_buffer_color_mode(ILI9XXXColorMode color_mode) { this->buffer_color_mode_ = color_mode; }
@@ -67,10 +67,7 @@ class ILI9XXXDisplay : public display::DisplayBuffer,
     this->offset_x_ = offset_x;
     this->offset_y_ = offset_y;
   }
-  void set_18bit_mode(bool mode) { this->is_18bitdisplay_ = mode; };
-
   void invert_colors(bool invert);
-
   void command(uint8_t value);
   void data(uint8_t value);
   void send_command(uint8_t command_byte, const uint8_t *data_bytes, uint8_t num_data_bytes);
@@ -212,10 +209,5 @@ class ILI9XXXS3BoxLite : public ILI9XXXDisplay {
   ILI9XXXS3BoxLite() : ILI9XXXDisplay(INITCMD_S3BOXLITE, 320, 240, true) {}
 };
 
-class ILI9XXXWSPICOLCD : public ILI9XXXDisplay {
- public:
-  ILI9XXXWSPICOLCD() : ILI9XXXDisplay(INITCMD_WSPICOLCD, 320, 480, true) {}
-};
-
 }  // namespace ili9xxx
 }  // namespace esphome
diff --git a/esphome/components/ili9xxx/ili9xxx_init.h b/esphome/components/ili9xxx/ili9xxx_init.h
index 0bf1d5761d..a74824052f 100644
--- a/esphome/components/ili9xxx/ili9xxx_init.h
+++ b/esphome/components/ili9xxx/ili9xxx_init.h
@@ -316,28 +316,6 @@ static const uint8_t PROGMEM INITCMD_ST7789V[] = {
   0x00                                   // End of list
 };
 
-static const uint8_t PROGMEM INITCMD_WSPICOLCD[] = {
-ILI9XXX_SLPOUT, 0x80,
-ILI9XXX_PIXFMT, 1, 0x66,
-ILI9XXX_PWCTR1, 2, 0x17, 0x15, // VRH1 VRH2 -ok
-ILI9XXX_PWCTR2, 1, 0x41, // VGH, VGL - ok
-ILI9XXX_PWCTR3, 1, 0x44,
-//ILI9XXX_VMCTR1, 4, 0x00, 0x00, 0x00, 0x00,
-ILI9XXX_VMCTR1, 3, 0x00, 0x12, 0x80, // nVM VCM_REG VCM_REG_EN - not ok?
-ILI9XXX_IFMODE, 1, 0x00, // -ok
-ILI9XXX_FRMCTR1, 1, 0xA0, // Frame rate = 60Hz -- seems to help the background! -ok
-ILI9XXX_INVCTR, 1, 0x02, // Display Inversion Control = 2dot - ok
-ILI9XXX_DFUNCTR, 2, 0x02, 0x02, // Nomal scan -ok
-ILI9XXX_ADJCTL3, 4, 0xA9, 0x51, 0x2C, 0x82, // Adjust Control 3
-ILI9XXX_GMCTRP1,15, 0x00, 0x03, 0x09, 0x08, 0x16, 0x0A, 0x3F, 0x78, 0x4C, 0x09, 0x0A, 0x08, 0x16, 0x1A, 0x0F,
-ILI9XXX_GMCTRN1,15, 0x00, 0x16, 0x19, 0x03, 0x0F, 0x05, 0x32, 0x45, 0x46, 0x04, 0x0E, 0x0D, 0x35, 0x37, 0x0F,
-
-ILI9XXX_INVON, 0x80,
-ILI9XXX_MADCTL, 1, 0x48,
-ILI9XXX_DISPON, 0x80,
-0x00 // End of list
-};
-
 // clang-format on
 }  // namespace ili9xxx
 }  // namespace esphome

From 87cab92af66ee4340f0cd578f4162eb64533ff27 Mon Sep 17 00:00:00 2001
From: aschmitz <29508+aschmitz@users.noreply.github.com>
Date: Mon, 15 Jan 2024 01:08:19 -0600
Subject: [PATCH 37/68] fix: negative temperatures on PMS5003T sensors (#6100)

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

diff --git a/esphome/components/pmsx003/pmsx003.cpp b/esphome/components/pmsx003/pmsx003.cpp
index 62488b765c..de2b23b8eb 100644
--- a/esphome/components/pmsx003/pmsx003.cpp
+++ b/esphome/components/pmsx003/pmsx003.cpp
@@ -279,7 +279,7 @@ void PMSX003Component::parse_data_() {
       // Note the pm particles 50um & 100um are not returned,
       // as PMS5003T uses those data values for temperature and humidity.
 
-      float temperature = this->get_16_bit_uint_(24) / 10.0f;
+      float temperature = (int16_t) this->get_16_bit_uint_(24) / 10.0f;
       float humidity = this->get_16_bit_uint_(26) / 10.0f;
 
       ESP_LOGD(TAG,

From 72ab1700e71305038d8f8c71f3adb53bed64c526 Mon Sep 17 00:00:00 2001
From: mathieu-mp <mathieu-mp@users.noreply.github.com>
Date: Tue, 16 Jan 2024 07:38:09 +0100
Subject: [PATCH 38/68] Add triangle shapes to display component (#6096)

---
 esphome/components/display/display.cpp | 116 +++++++++++++++++++++++++
 esphome/components/display/display.h   |  15 ++++
 2 files changed, 131 insertions(+)

diff --git a/esphome/components/display/display.cpp b/esphome/components/display/display.cpp
index f32fda4794..0c3631342e 100644
--- a/esphome/components/display/display.cpp
+++ b/esphome/components/display/display.cpp
@@ -141,6 +141,122 @@ void Display::filled_circle(int center_x, int center_y, int radius, Color color)
     }
   } while (dx <= 0);
 }
+void HOT Display::triangle(int x1, int y1, int x2, int y2, int x3, int y3, Color color) {
+  this->line(x1, y1, x2, y2);
+  this->line(x1, y1, x3, y3);
+  this->line(x2, y2, x3, y3);
+}
+void Display::sort_triangle_points_by_y_(int *x1, int *y1, int *x2, int *y2, int *x3, int *y3) {
+  if (*y1 > *y2) {
+    int x_temp = *x1, y_temp = *y1;
+    *x1 = *x2, *y1 = *y2;
+    *x2 = x_temp, *y2 = y_temp;
+  }
+  if (*y1 > *y3) {
+    int x_temp = *x1, y_temp = *y1;
+    *x1 = *x3, *y1 = *y3;
+    *x3 = x_temp, *y3 = y_temp;
+  }
+  if (*y2 > *y3) {
+    int x_temp = *x2, y_temp = *y2;
+    *x2 = *x3, *y2 = *y3;
+    *x3 = x_temp, *y3 = y_temp;
+  }
+}
+void Display::filled_flat_side_triangle_(int x1, int y1, int x2, int y2, int x3, int y3, Color color) {
+  // y2 must be equal to y3 (same horizontal line)
+
+  // Initialize Bresenham's algorithm for side 1
+  int s1_current_x = x1;
+  int s1_current_y = y1;
+  bool s1_axis_swap = false;
+  int s1_dx = abs(x2 - x1);
+  int s1_dy = abs(y2 - y1);
+  int s1_sign_x = ((x2 - x1) >= 0) ? 1 : -1;
+  int s1_sign_y = ((y2 - y1) >= 0) ? 1 : -1;
+  if (s1_dy > s1_dx) {  // swap values
+    int tmp = s1_dx;
+    s1_dx = s1_dy;
+    s1_dy = tmp;
+    s1_axis_swap = true;
+  }
+  int s1_error = 2 * s1_dy - s1_dx;
+
+  // Initialize Bresenham's algorithm for side 2
+  int s2_current_x = x1;
+  int s2_current_y = y1;
+  bool s2_axis_swap = false;
+  int s2_dx = abs(x3 - x1);
+  int s2_dy = abs(y3 - y1);
+  int s2_sign_x = ((x3 - x1) >= 0) ? 1 : -1;
+  int s2_sign_y = ((y3 - y1) >= 0) ? 1 : -1;
+  if (s2_dy > s2_dx) {  // swap values
+    int tmp = s2_dx;
+    s2_dx = s2_dy;
+    s2_dy = tmp;
+    s2_axis_swap = true;
+  }
+  int s2_error = 2 * s2_dy - s2_dx;
+
+  // Iterate on side 1 and allow side 2 to be processed to match the advance of the y-axis.
+  for (int i = 0; i <= s1_dx; i++) {
+    if (s1_current_x <= s2_current_x) {
+      this->horizontal_line(s1_current_x, s1_current_y, s2_current_x - s1_current_x + 1, color);
+    } else {
+      this->horizontal_line(s2_current_x, s2_current_y, s1_current_x - s2_current_x + 1, color);
+    }
+
+    // Bresenham's #1
+    // Side 1 s1_current_x and s1_current_y calculation
+    while (s1_error >= 0) {
+      if (s1_axis_swap) {
+        s1_current_x += s1_sign_x;
+      } else {
+        s1_current_y += s1_sign_y;
+      }
+      s1_error = s1_error - 2 * s1_dx;
+    }
+    if (s1_axis_swap) {
+      s1_current_y += s1_sign_y;
+    } else {
+      s1_current_x += s1_sign_x;
+    }
+    s1_error = s1_error + 2 * s1_dy;
+
+    // Bresenham's #2
+    // Side 2 s2_current_x and s2_current_y calculation
+    while (s2_current_y != s1_current_y) {
+      while (s2_error >= 0) {
+        if (s2_axis_swap) {
+          s2_current_x += s2_sign_x;
+        } else {
+          s2_current_y += s2_sign_y;
+        }
+        s2_error = s2_error - 2 * s2_dx;
+      }
+      if (s2_axis_swap) {
+        s2_current_y += s2_sign_y;
+      } else {
+        s2_current_x += s2_sign_x;
+      }
+      s2_error = s2_error + 2 * s2_dy;
+    }
+  }
+}
+void Display::filled_triangle(int x1, int y1, int x2, int y2, int x3, int y3, Color color) {
+  // Sort the three points by y-coordinate ascending, so [x1,y1] is the topmost point
+  this->sort_triangle_points_by_y_(&x1, &y1, &x2, &y2, &x3, &y3);
+
+  if (y2 == y3) {  // Check for special case of a bottom-flat triangle
+    this->filled_flat_side_triangle_(x1, y1, x2, y2, x3, y3, color);
+  } else if (y1 == y2) {  // Check for special case of a top-flat triangle
+    this->filled_flat_side_triangle_(x3, y3, x1, y1, x2, y2, color);
+  } else {  // General case: split the no-flat-side triangle in a top-flat triangle and bottom-flat triangle
+    int x_temp = (int) (x1 + ((float) (y2 - y1) / (float) (y3 - y1)) * (x3 - x1)), y_temp = y2;
+    this->filled_flat_side_triangle_(x1, y1, x2, y2, x_temp, y_temp, color);
+    this->filled_flat_side_triangle_(x3, y3, x2, y2, x_temp, y_temp, color);
+  }
+}
 
 void Display::print(int x, int y, BaseFont *font, Color color, TextAlign align, const char *text) {
   int x_start, y_start;
diff --git a/esphome/components/display/display.h b/esphome/components/display/display.h
index 2a2a9b80c8..daa5028d6b 100644
--- a/esphome/components/display/display.h
+++ b/esphome/components/display/display.h
@@ -236,6 +236,12 @@ class Display : public PollingComponent {
   /// Fill a circle centered around [center_x,center_y] with the radius radius with the given color.
   void filled_circle(int center_x, int center_y, int radius, Color color = COLOR_ON);
 
+  /// Draw the outline of a triangle contained between the points [x1,y1], [x2,y2] and [x3,y3] with the given color.
+  void triangle(int x1, int y1, int x2, int y2, int x3, int y3, Color color = COLOR_ON);
+
+  /// Fill a triangle contained between the points [x1,y1], [x2,y2] and [x3,y3] with the given color.
+  void filled_triangle(int x1, int y1, int x2, int y2, int x3, int y3, Color color = COLOR_ON);
+
   /** Print `text` with the anchor point at [x,y] with `font`.
    *
    * @param x The x coordinate of the text alignment anchor point.
@@ -532,6 +538,15 @@ class Display : public PollingComponent {
   void do_update_();
   void clear_clipping_();
 
+  /**
+   * This method fills a triangle using only integer variables by using a
+   * modified bresenham algorithm.
+   * It is mandatory that [x2,y2] and [x3,y3] lie on the same horizontal line,
+   * so y2 must be equal to y3.
+   */
+  void filled_flat_side_triangle_(int x1, int y1, int x2, int y2, int x3, int y3, Color color);
+  void sort_triangle_points_by_y_(int *x1, int *y1, int *x2, int *y2, int *x3, int *y3);
+
   DisplayRotation rotation_{DISPLAY_ROTATION_0_DEGREES};
   optional<display_writer_t> writer_{};
   DisplayPage *page_{nullptr};

From 249cd6758879c56b72cc1b165a02cd8df1e551f0 Mon Sep 17 00:00:00 2001
From: alexborro <alexborro@gmail.com>
Date: Tue, 16 Jan 2024 08:38:19 +0100
Subject: [PATCH 39/68] Fingerprint_grow: Trigger on finger scan start and on
 finger scan misplaced (#6003)

---
 .../components/fingerprint_grow/__init__.py   | 32 +++++++++++++
 .../fingerprint_grow/fingerprint_grow.cpp     | 46 +++++++++++++------
 .../fingerprint_grow/fingerprint_grow.h       | 24 ++++++++++
 esphome/const.py                              |  2 +
 tests/test3.yaml                              |  6 +++
 5 files changed, 96 insertions(+), 14 deletions(-)

diff --git a/esphome/components/fingerprint_grow/__init__.py b/esphome/components/fingerprint_grow/__init__.py
index 5249107f17..26a01fc1d2 100644
--- a/esphome/components/fingerprint_grow/__init__.py
+++ b/esphome/components/fingerprint_grow/__init__.py
@@ -13,8 +13,10 @@ from esphome.const import (
     CONF_ON_ENROLLMENT_DONE,
     CONF_ON_ENROLLMENT_FAILED,
     CONF_ON_ENROLLMENT_SCAN,
+    CONF_ON_FINGER_SCAN_START,
     CONF_ON_FINGER_SCAN_MATCHED,
     CONF_ON_FINGER_SCAN_UNMATCHED,
+    CONF_ON_FINGER_SCAN_MISPLACED,
     CONF_ON_FINGER_SCAN_INVALID,
     CONF_PASSWORD,
     CONF_SENSING_PIN,
@@ -35,6 +37,10 @@ FingerprintGrowComponent = fingerprint_grow_ns.class_(
     "FingerprintGrowComponent", cg.PollingComponent, uart.UARTDevice
 )
 
+FingerScanStartTrigger = fingerprint_grow_ns.class_(
+    "FingerScanStartTrigger", automation.Trigger.template()
+)
+
 FingerScanMatchedTrigger = fingerprint_grow_ns.class_(
     "FingerScanMatchedTrigger", automation.Trigger.template(cg.uint16, cg.uint16)
 )
@@ -43,6 +49,10 @@ FingerScanUnmatchedTrigger = fingerprint_grow_ns.class_(
     "FingerScanUnmatchedTrigger", automation.Trigger.template()
 )
 
+FingerScanMisplacedTrigger = fingerprint_grow_ns.class_(
+    "FingerScanMisplacedTrigger", automation.Trigger.template()
+)
+
 FingerScanInvalidTrigger = fingerprint_grow_ns.class_(
     "FingerScanInvalidTrigger", automation.Trigger.template()
 )
@@ -99,6 +109,13 @@ CONFIG_SCHEMA = (
             cv.Optional(CONF_SENSING_PIN): pins.gpio_input_pin_schema,
             cv.Optional(CONF_PASSWORD): cv.uint32_t,
             cv.Optional(CONF_NEW_PASSWORD): cv.uint32_t,
+            cv.Optional(CONF_ON_FINGER_SCAN_START): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                        FingerScanStartTrigger
+                    ),
+                }
+            ),
             cv.Optional(CONF_ON_FINGER_SCAN_MATCHED): automation.validate_automation(
                 {
                     cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
@@ -113,6 +130,13 @@ CONFIG_SCHEMA = (
                     ),
                 }
             ),
+            cv.Optional(CONF_ON_FINGER_SCAN_MISPLACED): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                        FingerScanMisplacedTrigger
+                    ),
+                }
+            ),
             cv.Optional(CONF_ON_FINGER_SCAN_INVALID): automation.validate_automation(
                 {
                     cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
@@ -164,6 +188,10 @@ async def to_code(config):
         sensing_pin = await cg.gpio_pin_expression(config[CONF_SENSING_PIN])
         cg.add(var.set_sensing_pin(sensing_pin))
 
+    for conf in config.get(CONF_ON_FINGER_SCAN_START, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
+
     for conf in config.get(CONF_ON_FINGER_SCAN_MATCHED, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
         await automation.build_automation(
@@ -174,6 +202,10 @@ async def to_code(config):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
         await automation.build_automation(trigger, [], conf)
 
+    for conf in config.get(CONF_ON_FINGER_SCAN_MISPLACED, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
+
     for conf in config.get(CONF_ON_FINGER_SCAN_INVALID, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
         await automation.build_automation(trigger, [], conf)
diff --git a/esphome/components/fingerprint_grow/fingerprint_grow.cpp b/esphome/components/fingerprint_grow/fingerprint_grow.cpp
index 2486e02964..0a46755bd3 100644
--- a/esphome/components/fingerprint_grow/fingerprint_grow.cpp
+++ b/esphome/components/fingerprint_grow/fingerprint_grow.cpp
@@ -15,16 +15,18 @@ void FingerprintGrowComponent::update() {
     return;
   }
 
-  if (this->sensing_pin_ != nullptr) {
+  if (this->has_sensing_pin_) {
     if (this->sensing_pin_->digital_read()) {
       ESP_LOGV(TAG, "No touch sensing");
       this->waiting_removal_ = false;
       return;
+    } else if (!this->waiting_removal_) {
+      this->finger_scan_start_callback_.call();
     }
   }
 
   if (this->waiting_removal_) {
-    if (this->scan_image_(1) == NO_FINGER) {
+    if ((!this->has_sensing_pin_) && (this->scan_image_(1) == NO_FINGER)) {
       ESP_LOGD(TAG, "Finger removed");
       this->waiting_removal_ = false;
     }
@@ -51,6 +53,7 @@ void FingerprintGrowComponent::update() {
 
 void FingerprintGrowComponent::setup() {
   ESP_LOGCONFIG(TAG, "Setting up Grow Fingerprint Reader...");
+  this->has_sensing_pin_ = (this->sensing_pin_ != nullptr);
   if (this->check_password_()) {
     if (this->new_password_ != -1) {
       if (this->set_password_())
@@ -91,7 +94,7 @@ void FingerprintGrowComponent::finish_enrollment(uint8_t result) {
 }
 
 void FingerprintGrowComponent::scan_and_match_() {
-  if (this->sensing_pin_ != nullptr) {
+  if (this->has_sensing_pin_) {
     ESP_LOGD(TAG, "Scan and match");
   } else {
     ESP_LOGV(TAG, "Scan and match");
@@ -122,33 +125,38 @@ void FingerprintGrowComponent::scan_and_match_() {
 }
 
 uint8_t FingerprintGrowComponent::scan_image_(uint8_t buffer) {
-  if (this->sensing_pin_ != nullptr) {
+  if (this->has_sensing_pin_) {
     ESP_LOGD(TAG, "Getting image %d", buffer);
   } else {
     ESP_LOGV(TAG, "Getting image %d", buffer);
   }
   this->data_ = {GET_IMAGE};
-  switch (this->send_command_()) {
+  uint8_t send_result = this->send_command_();
+  switch (send_result) {
     case OK:
       break;
     case NO_FINGER:
-      if (this->sensing_pin_ != nullptr) {
-        ESP_LOGD(TAG, "No finger");
-        this->finger_scan_invalid_callback_.call();
+      if (this->has_sensing_pin_) {
+        this->waiting_removal_ = true;
+        ESP_LOGD(TAG, "Finger Misplaced");
+        this->finger_scan_misplaced_callback_.call();
       } else {
         ESP_LOGV(TAG, "No finger");
       }
-      return this->data_[0];
+      return send_result;
     case IMAGE_FAIL:
       ESP_LOGE(TAG, "Imaging error");
       this->finger_scan_invalid_callback_.call();
+      return send_result;
     default:
-      return this->data_[0];
+      ESP_LOGD(TAG, "Unknown Scan Error: %d", send_result);
+      return send_result;
   }
 
   ESP_LOGD(TAG, "Processing image %d", buffer);
   this->data_ = {IMAGE_2_TZ, buffer};
-  switch (this->send_command_()) {
+  send_result = this->send_command_();
+  switch (send_result) {
     case OK:
       ESP_LOGI(TAG, "Processed image %d", buffer);
       break;
@@ -162,7 +170,7 @@ uint8_t FingerprintGrowComponent::scan_image_(uint8_t buffer) {
       this->finger_scan_invalid_callback_.call();
       break;
   }
-  return this->data_[0];
+  return send_result;
 }
 
 uint8_t FingerprintGrowComponent::save_fingerprint_() {
@@ -225,10 +233,11 @@ bool FingerprintGrowComponent::get_parameters_() {
   ESP_LOGD(TAG, "Getting parameters");
   this->data_ = {READ_SYS_PARAM};
   if (this->send_command_() == OK) {
-    ESP_LOGD(TAG, "Got parameters");
-    if (this->status_sensor_ != nullptr) {
+    ESP_LOGD(TAG, "Got parameters");        // Bear in mind data_[0] is the transfer status,
+    if (this->status_sensor_ != nullptr) {  // the parameters table start at data_[1]
       this->status_sensor_->publish_state(((uint16_t) this->data_[1] << 8) | this->data_[2]);
     }
+    this->system_identifier_code_ = ((uint16_t) this->data_[3] << 8) | this->data_[4];
     this->capacity_ = ((uint16_t) this->data_[5] << 8) | this->data_[6];
     if (this->capacity_sensor_ != nullptr) {
       this->capacity_sensor_->publish_state(this->capacity_);
@@ -430,13 +439,22 @@ uint8_t FingerprintGrowComponent::send_command_() {
 
 void FingerprintGrowComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "GROW_FINGERPRINT_READER:");
+  ESP_LOGCONFIG(TAG, "  System Identifier Code: 0x%.4X", this->system_identifier_code_);
+  ESP_LOGCONFIG(TAG, "  Touch Sensing Pin: %s",
+                this->has_sensing_pin_ ? this->sensing_pin_->dump_summary().c_str() : "None");
   LOG_UPDATE_INTERVAL(this);
   LOG_SENSOR("  ", "Fingerprint Count", this->fingerprint_count_sensor_);
+  ESP_LOGCONFIG(TAG, "    Current Value: %d", (uint16_t) this->fingerprint_count_sensor_->get_state());
   LOG_SENSOR("  ", "Status", this->status_sensor_);
+  ESP_LOGCONFIG(TAG, "    Current Value: %d", (uint8_t) this->status_sensor_->get_state());
   LOG_SENSOR("  ", "Capacity", this->capacity_sensor_);
+  ESP_LOGCONFIG(TAG, "    Current Value: %d", (uint16_t) this->capacity_sensor_->get_state());
   LOG_SENSOR("  ", "Security Level", this->security_level_sensor_);
+  ESP_LOGCONFIG(TAG, "    Current Value: %d", (uint8_t) this->security_level_sensor_->get_state());
   LOG_SENSOR("  ", "Last Finger ID", this->last_finger_id_sensor_);
+  ESP_LOGCONFIG(TAG, "    Current Value: %d", (uint32_t) this->last_finger_id_sensor_->get_state());
   LOG_SENSOR("  ", "Last Confidence", this->last_confidence_sensor_);
+  ESP_LOGCONFIG(TAG, "    Current Value: %d", (uint32_t) this->last_confidence_sensor_->get_state());
 }
 
 }  // namespace fingerprint_grow
diff --git a/esphome/components/fingerprint_grow/fingerprint_grow.h b/esphome/components/fingerprint_grow/fingerprint_grow.h
index 9aad94fc2a..1ab38d9fb5 100644
--- a/esphome/components/fingerprint_grow/fingerprint_grow.h
+++ b/esphome/components/fingerprint_grow/fingerprint_grow.h
@@ -118,12 +118,18 @@ class FingerprintGrowComponent : public PollingComponent, public uart::UARTDevic
   void set_enrolling_binary_sensor(binary_sensor::BinarySensor *enrolling_binary_sensor) {
     this->enrolling_binary_sensor_ = enrolling_binary_sensor;
   }
+  void add_on_finger_scan_start_callback(std::function<void()> callback) {
+    this->finger_scan_start_callback_.add(std::move(callback));
+  }
   void add_on_finger_scan_matched_callback(std::function<void(uint16_t, uint16_t)> callback) {
     this->finger_scan_matched_callback_.add(std::move(callback));
   }
   void add_on_finger_scan_unmatched_callback(std::function<void()> callback) {
     this->finger_scan_unmatched_callback_.add(std::move(callback));
   }
+  void add_on_finger_scan_misplaced_callback(std::function<void()> callback) {
+    this->finger_scan_misplaced_callback_.add(std::move(callback));
+  }
   void add_on_finger_scan_invalid_callback(std::function<void()> callback) {
     this->finger_scan_invalid_callback_.add(std::move(callback));
   }
@@ -166,8 +172,10 @@ class FingerprintGrowComponent : public PollingComponent, public uart::UARTDevic
   uint16_t enrollment_slot_ = ENROLLMENT_SLOT_UNUSED;
   uint8_t enrollment_buffers_ = 5;
   bool waiting_removal_ = false;
+  bool has_sensing_pin_ = false;
   uint32_t last_aura_led_control_ = 0;
   uint16_t last_aura_led_duration_ = 0;
+  uint16_t system_identifier_code_ = 0;
   sensor::Sensor *fingerprint_count_sensor_{nullptr};
   sensor::Sensor *status_sensor_{nullptr};
   sensor::Sensor *capacity_sensor_{nullptr};
@@ -176,13 +184,22 @@ class FingerprintGrowComponent : public PollingComponent, public uart::UARTDevic
   sensor::Sensor *last_confidence_sensor_{nullptr};
   binary_sensor::BinarySensor *enrolling_binary_sensor_{nullptr};
   CallbackManager<void()> finger_scan_invalid_callback_;
+  CallbackManager<void()> finger_scan_start_callback_;
   CallbackManager<void(uint16_t, uint16_t)> finger_scan_matched_callback_;
   CallbackManager<void()> finger_scan_unmatched_callback_;
+  CallbackManager<void()> finger_scan_misplaced_callback_;
   CallbackManager<void(uint8_t, uint16_t)> enrollment_scan_callback_;
   CallbackManager<void(uint16_t)> enrollment_done_callback_;
   CallbackManager<void(uint16_t)> enrollment_failed_callback_;
 };
 
+class FingerScanStartTrigger : public Trigger<> {
+ public:
+  explicit FingerScanStartTrigger(FingerprintGrowComponent *parent) {
+    parent->add_on_finger_scan_start_callback([this]() { this->trigger(); });
+  }
+};
+
 class FingerScanMatchedTrigger : public Trigger<uint16_t, uint16_t> {
  public:
   explicit FingerScanMatchedTrigger(FingerprintGrowComponent *parent) {
@@ -198,6 +215,13 @@ class FingerScanUnmatchedTrigger : public Trigger<> {
   }
 };
 
+class FingerScanMisplacedTrigger : public Trigger<> {
+ public:
+  explicit FingerScanMisplacedTrigger(FingerprintGrowComponent *parent) {
+    parent->add_on_finger_scan_misplaced_callback([this]() { this->trigger(); });
+  }
+};
+
 class FingerScanInvalidTrigger : public Trigger<> {
  public:
   explicit FingerScanInvalidTrigger(FingerprintGrowComponent *parent) {
diff --git a/esphome/const.py b/esphome/const.py
index 7e27254d76..c35adc74ee 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -508,6 +508,8 @@ CONF_ON_ENROLLMENT_FAILED = "on_enrollment_failed"
 CONF_ON_ENROLLMENT_SCAN = "on_enrollment_scan"
 CONF_ON_FINGER_SCAN_INVALID = "on_finger_scan_invalid"
 CONF_ON_FINGER_SCAN_MATCHED = "on_finger_scan_matched"
+CONF_ON_FINGER_SCAN_MISPLACED = "on_finger_scan_misplaced"
+CONF_ON_FINGER_SCAN_START = "on_finger_scan_start"
 CONF_ON_FINGER_SCAN_UNMATCHED = "on_finger_scan_unmatched"
 CONF_ON_JSON_MESSAGE = "on_json_message"
 CONF_ON_LOCK = "on_lock"
diff --git a/tests/test3.yaml b/tests/test3.yaml
index c31eb45fbd..cbd3d15b8a 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -1258,6 +1258,9 @@ fingerprint_grow:
     number: 4
   password: 0x12FE37DC
   new_password: 0xA65B9840
+  on_finger_scan_start:
+    - homeassistant.event:
+        event: esphome.${device_name}_fingerprint_grow_finger_scan_start
   on_finger_scan_invalid:
     - homeassistant.event:
         event: esphome.${device_name}_fingerprint_grow_finger_scan_invalid
@@ -1270,6 +1273,9 @@ fingerprint_grow:
   on_finger_scan_unmatched:
     - homeassistant.event:
         event: esphome.${device_name}_fingerprint_grow_finger_scan_unmatched
+  on_finger_scan_misplaced:
+    - homeassistant.event:
+        event: esphome.${device_name}_fingerprint_grow_finger_scan_misplaced
   on_enrollment_scan:
     - homeassistant.event:
         event: esphome.${device_name}_fingerprint_grow_enrollment_scan

From 26acbbedbf2626eec1232343901a01348369a8ce Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Mon, 15 Jan 2024 23:44:12 -0800
Subject: [PATCH 40/68] Add continuous option to the graph (#6093)

Co-authored-by: Samuel Sieb <samuel@sieb.net>
---
 esphome/components/graph/__init__.py |  4 +++
 esphome/components/graph/graph.cpp   | 37 +++++++++++++++++++++++-----
 esphome/components/graph/graph.h     |  3 +++
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/esphome/components/graph/__init__.py b/esphome/components/graph/__init__.py
index 046f59ca1a..0b83b71fe4 100644
--- a/esphome/components/graph/__init__.py
+++ b/esphome/components/graph/__init__.py
@@ -61,6 +61,7 @@ VALUE_POSITION_TYPE = {
     "BELOW": ValuePositionType.VALUE_POSITION_TYPE_BELOW,
 }
 
+CONF_CONTINUOUS = "continuous"
 
 GRAPH_TRACE_SCHEMA = cv.Schema(
     {
@@ -70,6 +71,7 @@ GRAPH_TRACE_SCHEMA = cv.Schema(
         cv.Optional(CONF_LINE_THICKNESS): cv.positive_int,
         cv.Optional(CONF_LINE_TYPE): cv.enum(LINE_TYPE, upper=True),
         cv.Optional(CONF_COLOR): cv.use_id(color.ColorStruct),
+        cv.Optional(CONF_CONTINUOUS): cv.boolean,
     }
 )
 
@@ -186,6 +188,8 @@ async def to_code(config):
         if CONF_COLOR in trace:
             c = await cg.get_variable(trace[CONF_COLOR])
             cg.add(tr.set_line_color(c))
+        if CONF_CONTINUOUS in trace:
+            cg.add(tr.set_continuous(trace[CONF_CONTINUOUS]))
         cg.add(var.add_trace(tr))
     # Add legend
     if CONF_LEGEND in config:
diff --git a/esphome/components/graph/graph.cpp b/esphome/components/graph/graph.cpp
index 294e16dbb1..0e437a3425 100644
--- a/esphome/components/graph/graph.cpp
+++ b/esphome/components/graph/graph.cpp
@@ -165,17 +165,42 @@ void Graph::draw(Display *buff, uint16_t x_offset, uint16_t y_offset, Color colo
   for (auto *trace : traces_) {
     Color c = trace->get_line_color();
     uint16_t thick = trace->get_line_thickness();
+    bool continuous = trace->get_continuous();
+    bool has_prev = false;
+    bool prev_b = false;
+    int16_t prev_y = 0;
     for (uint32_t i = 0; i < this->width_; i++) {
       float v = (trace->get_tracedata()->get_value(i) - ymin) / yrange;
       if (!std::isnan(v) && (thick > 0)) {
-        int16_t x = this->width_ - 1 - i;
-        uint8_t b = (i % (thick * LineType::PATTERN_LENGTH)) / thick;
-        if (((uint8_t) trace->get_line_type() & (1 << b)) == (1 << b)) {
-          int16_t y = (int16_t) roundf((this->height_ - 1) * (1.0 - v)) - thick / 2;
-          for (uint16_t t = 0; t < thick; t++) {
-            buff->draw_pixel_at(x_offset + x, y_offset + y + t, c);
+        int16_t x = this->width_ - 1 - i + x_offset;
+        uint8_t bit = 1 << ((i % (thick * LineType::PATTERN_LENGTH)) / thick);
+        bool b = (trace->get_line_type() & bit) == bit;
+        if (b) {
+          int16_t y = (int16_t) roundf((this->height_ - 1) * (1.0 - v)) - thick / 2 + y_offset;
+          if (!continuous || !has_prev || !prev_b || (abs(y - prev_y) <= thick)) {
+            for (uint16_t t = 0; t < thick; t++) {
+              buff->draw_pixel_at(x, y + t, c);
+            }
+          } else {
+            int16_t mid_y = (y + prev_y + thick) / 2;
+            if (y > prev_y) {
+              for (uint16_t t = prev_y + thick; t <= mid_y; t++)
+                buff->draw_pixel_at(x + 1, t, c);
+              for (uint16_t t = mid_y + 1; t < y + thick; t++)
+                buff->draw_pixel_at(x, t, c);
+            } else {
+              for (uint16_t t = prev_y - 1; t >= mid_y; t--)
+                buff->draw_pixel_at(x + 1, t, c);
+              for (uint16_t t = mid_y - 1; t >= y; t--)
+                buff->draw_pixel_at(x, t, c);
+            }
           }
+          prev_y = y;
         }
+        prev_b = b;
+        has_prev = true;
+      } else {
+        has_prev = false;
       }
     }
   }
diff --git a/esphome/components/graph/graph.h b/esphome/components/graph/graph.h
index 339a6f6d94..34accb7d3a 100644
--- a/esphome/components/graph/graph.h
+++ b/esphome/components/graph/graph.h
@@ -116,6 +116,8 @@ class GraphTrace {
   void set_line_type(enum LineType val) { this->line_type_ = val; }
   Color get_line_color() { return this->line_color_; }
   void set_line_color(Color val) { this->line_color_ = val; }
+  bool get_continuous() { return this->continuous_; }
+  void set_continuous(bool continuous) { this->continuous_ = continuous; }
   std::string get_name() { return name_; }
   const HistoryData *get_tracedata() { return &data_; }
 
@@ -125,6 +127,7 @@ class GraphTrace {
   uint8_t line_thickness_{3};
   enum LineType line_type_ { LINE_TYPE_SOLID };
   Color line_color_{COLOR_ON};
+  bool continuous_{false};
   HistoryData data_;
 
   friend Graph;

From e35cab018a464c0d39fe7916a2b5de9d7c9487e7 Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Tue, 16 Jan 2024 02:05:13 -0600
Subject: [PATCH 41/68] Add NFC binary sensor platform (#6068)

---
 CODEOWNERS                                    |   2 +-
 esphome/components/nfc/__init__.py            |   5 +-
 .../components/nfc/binary_sensor/__init__.py  |  72 +++++++++++
 .../nfc/binary_sensor/binary_sensor.cpp       | 114 ++++++++++++++++++
 .../nfc/binary_sensor/binary_sensor.h         |  38 ++++++
 esphome/components/nfc/nfc.h                  |  14 +++
 esphome/components/pn7150/__init__.py         |   2 +-
 esphome/components/pn7150/pn7150.cpp          |   6 +
 esphome/components/pn7150/pn7150.h            |   2 +-
 esphome/components/pn7160/__init__.py         |   2 +-
 esphome/components/pn7160/pn7160.cpp          |   6 +
 esphome/components/pn7160/pn7160.h            |   2 +-
 tests/test1.yaml                              |  13 ++
 13 files changed, 271 insertions(+), 7 deletions(-)
 create mode 100644 esphome/components/nfc/binary_sensor/__init__.py
 create mode 100644 esphome/components/nfc/binary_sensor/binary_sensor.cpp
 create mode 100644 esphome/components/nfc/binary_sensor/binary_sensor.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 0ff5ce4508..c497a82eab 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -227,7 +227,7 @@ esphome/components/nextion/binary_sensor/* @senexcrenshaw
 esphome/components/nextion/sensor/* @senexcrenshaw
 esphome/components/nextion/switch/* @senexcrenshaw
 esphome/components/nextion/text_sensor/* @senexcrenshaw
-esphome/components/nfc/* @jesserockz
+esphome/components/nfc/* @jesserockz @kbx81
 esphome/components/noblex/* @AGalfra
 esphome/components/number/* @esphome/core
 esphome/components/ota/* @esphome/core
diff --git a/esphome/components/nfc/__init__.py b/esphome/components/nfc/__init__.py
index c3bbc50bf9..eea1a47b24 100644
--- a/esphome/components/nfc/__init__.py
+++ b/esphome/components/nfc/__init__.py
@@ -1,12 +1,13 @@
 from esphome import automation
 import esphome.codegen as cg
 
-CODEOWNERS = ["@jesserockz"]
+CODEOWNERS = ["@jesserockz", "@kbx81"]
 
 nfc_ns = cg.esphome_ns.namespace("nfc")
 
+Nfcc = nfc_ns.class_("Nfcc")
 NfcTag = nfc_ns.class_("NfcTag")
-
+NfcTagListener = nfc_ns.class_("NfcTagListener")
 NfcOnTagTrigger = nfc_ns.class_(
     "NfcOnTagTrigger", automation.Trigger.template(cg.std_string, NfcTag)
 )
diff --git a/esphome/components/nfc/binary_sensor/__init__.py b/esphome/components/nfc/binary_sensor/__init__.py
new file mode 100644
index 0000000000..21c8298ea8
--- /dev/null
+++ b/esphome/components/nfc/binary_sensor/__init__.py
@@ -0,0 +1,72 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import binary_sensor
+from esphome.const import CONF_UID
+from esphome.core import HexInt
+from .. import nfc_ns, Nfcc, NfcTagListener
+
+DEPENDENCIES = ["nfc"]
+
+CONF_NDEF_CONTAINS = "ndef_contains"
+CONF_NFCC_ID = "nfcc_id"
+CONF_TAG_ID = "tag_id"
+
+NfcTagBinarySensor = nfc_ns.class_(
+    "NfcTagBinarySensor",
+    binary_sensor.BinarySensor,
+    cg.Component,
+    NfcTagListener,
+    cg.Parented.template(Nfcc),
+)
+
+
+def validate_uid(value):
+    value = cv.string_strict(value)
+    for x in value.split("-"):
+        if len(x) != 2:
+            raise cv.Invalid(
+                "Each part (separated by '-') of the UID must be two characters "
+                "long."
+            )
+        try:
+            x = int(x, 16)
+        except ValueError as err:
+            raise cv.Invalid(
+                "Valid characters for parts of a UID are 0123456789ABCDEF."
+            ) from err
+        if x < 0 or x > 255:
+            raise cv.Invalid(
+                "Valid values for UID parts (separated by '-') are 00 to FF"
+            )
+    return value
+
+
+CONFIG_SCHEMA = cv.All(
+    binary_sensor.binary_sensor_schema(NfcTagBinarySensor)
+    .extend(
+        {
+            cv.GenerateID(CONF_NFCC_ID): cv.use_id(Nfcc),
+            cv.Optional(CONF_NDEF_CONTAINS): cv.string,
+            cv.Optional(CONF_TAG_ID): cv.string,
+            cv.Optional(CONF_UID): validate_uid,
+        }
+    )
+    .extend(cv.COMPONENT_SCHEMA),
+    cv.has_exactly_one_key(CONF_NDEF_CONTAINS, CONF_TAG_ID, CONF_UID),
+)
+
+
+async def to_code(config):
+    var = await binary_sensor.new_binary_sensor(config)
+    await cg.register_component(var, config)
+    await cg.register_parented(var, config[CONF_NFCC_ID])
+
+    hub = await cg.get_variable(config[CONF_NFCC_ID])
+    cg.add(hub.register_listener(var))
+    if CONF_NDEF_CONTAINS in config:
+        cg.add(var.set_ndef_match_string(config[CONF_NDEF_CONTAINS]))
+    if CONF_TAG_ID in config:
+        cg.add(var.set_tag_name(config[CONF_TAG_ID]))
+    elif CONF_UID in config:
+        addr = [HexInt(int(x, 16)) for x in config[CONF_UID].split("-")]
+        cg.add(var.set_uid(addr))
diff --git a/esphome/components/nfc/binary_sensor/binary_sensor.cpp b/esphome/components/nfc/binary_sensor/binary_sensor.cpp
new file mode 100644
index 0000000000..8f1f6acd51
--- /dev/null
+++ b/esphome/components/nfc/binary_sensor/binary_sensor.cpp
@@ -0,0 +1,114 @@
+#include "binary_sensor.h"
+#include "../nfc_helpers.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace nfc {
+
+static const char *const TAG = "nfc.binary_sensor";
+
+void NfcTagBinarySensor::setup() {
+  this->parent_->register_listener(this);
+  this->publish_initial_state(false);
+}
+
+void NfcTagBinarySensor::dump_config() {
+  std::string match_str = "name";
+
+  LOG_BINARY_SENSOR("", "NFC Tag Binary Sensor", this);
+  if (!this->match_string_.empty()) {
+    if (!this->match_tag_name_) {
+      match_str = "contains";
+    }
+    ESP_LOGCONFIG(TAG, "  Tag %s: %s", match_str.c_str(), this->match_string_.c_str());
+    return;
+  }
+  if (!this->uid_.empty()) {
+    ESP_LOGCONFIG(TAG, "  Tag UID: %s", format_bytes(this->uid_).c_str());
+  }
+}
+
+void NfcTagBinarySensor::set_ndef_match_string(const std::string &str) {
+  this->match_string_ = str;
+  this->match_tag_name_ = false;
+}
+
+void NfcTagBinarySensor::set_tag_name(const std::string &str) {
+  this->match_string_ = str;
+  this->match_tag_name_ = true;
+}
+
+void NfcTagBinarySensor::set_uid(const std::vector<uint8_t> &uid) { this->uid_ = uid; }
+
+bool NfcTagBinarySensor::tag_match_ndef_string(const std::shared_ptr<NdefMessage> &msg) {
+  for (const auto &record : msg->get_records()) {
+    if (record->get_payload().find(this->match_string_) != std::string::npos) {
+      return true;
+    }
+  }
+  return false;
+}
+
+bool NfcTagBinarySensor::tag_match_tag_name(const std::shared_ptr<NdefMessage> &msg) {
+  for (const auto &record : msg->get_records()) {
+    if (record->get_payload().find(HA_TAG_ID_PREFIX) != std::string::npos) {
+      auto rec_substr = record->get_payload().substr(sizeof(HA_TAG_ID_PREFIX) - 1);
+      if (rec_substr.find(this->match_string_) != std::string::npos) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+bool NfcTagBinarySensor::tag_match_uid(const std::vector<uint8_t> &data) {
+  if (data.size() != this->uid_.size()) {
+    return false;
+  }
+
+  for (size_t i = 0; i < data.size(); i++) {
+    if (data[i] != this->uid_[i]) {
+      return false;
+    }
+  }
+  return true;
+}
+
+void NfcTagBinarySensor::tag_off(NfcTag &tag) {
+  if (!this->match_string_.empty() && tag.has_ndef_message()) {
+    if (this->match_tag_name_) {
+      if (this->tag_match_tag_name(tag.get_ndef_message())) {
+        this->publish_state(false);
+      }
+    } else {
+      if (this->tag_match_ndef_string(tag.get_ndef_message())) {
+        this->publish_state(false);
+      }
+    }
+    return;
+  }
+  if (!this->uid_.empty() && this->tag_match_uid(tag.get_uid())) {
+    this->publish_state(false);
+  }
+}
+
+void NfcTagBinarySensor::tag_on(NfcTag &tag) {
+  if (!this->match_string_.empty() && tag.has_ndef_message()) {
+    if (this->match_tag_name_) {
+      if (this->tag_match_tag_name(tag.get_ndef_message())) {
+        this->publish_state(true);
+      }
+    } else {
+      if (this->tag_match_ndef_string(tag.get_ndef_message())) {
+        this->publish_state(true);
+      }
+    }
+    return;
+  }
+  if (!this->uid_.empty() && this->tag_match_uid(tag.get_uid())) {
+    this->publish_state(true);
+  }
+}
+
+}  // namespace nfc
+}  // namespace esphome
diff --git a/esphome/components/nfc/binary_sensor/binary_sensor.h b/esphome/components/nfc/binary_sensor/binary_sensor.h
new file mode 100644
index 0000000000..cc313c2f2b
--- /dev/null
+++ b/esphome/components/nfc/binary_sensor/binary_sensor.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include "esphome/components/binary_sensor/binary_sensor.h"
+#include "esphome/components/nfc/nfc.h"
+#include "esphome/components/nfc/nfc_tag.h"
+#include "esphome/core/component.h"
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace nfc {
+
+class NfcTagBinarySensor : public binary_sensor::BinarySensor,
+                           public Component,
+                           public NfcTagListener,
+                           public Parented<Nfcc> {
+ public:
+  void setup() override;
+  void dump_config() override;
+
+  void set_ndef_match_string(const std::string &str);
+  void set_tag_name(const std::string &str);
+  void set_uid(const std::vector<uint8_t> &uid);
+
+  bool tag_match_ndef_string(const std::shared_ptr<NdefMessage> &msg);
+  bool tag_match_tag_name(const std::shared_ptr<NdefMessage> &msg);
+  bool tag_match_uid(const std::vector<uint8_t> &data);
+
+  void tag_off(NfcTag &tag) override;
+  void tag_on(NfcTag &tag) override;
+
+ protected:
+  bool match_tag_name_{false};
+  std::string match_string_;
+  std::vector<uint8_t> uid_;
+};
+
+}  // namespace nfc
+}  // namespace esphome
diff --git a/esphome/components/nfc/nfc.h b/esphome/components/nfc/nfc.h
index d4d66f970f..23bfdd8ef0 100644
--- a/esphome/components/nfc/nfc.h
+++ b/esphome/components/nfc/nfc.h
@@ -66,5 +66,19 @@ bool mifare_classic_is_trailer_block(uint8_t block_num);
 
 uint32_t get_mifare_ultralight_buffer_size(uint32_t message_length);
 
+class NfcTagListener {
+ public:
+  virtual void tag_off(NfcTag &tag) {}
+  virtual void tag_on(NfcTag &tag) {}
+};
+
+class Nfcc {
+ public:
+  void register_listener(NfcTagListener *listener) { this->tag_listeners_.push_back(listener); }
+
+ protected:
+  std::vector<NfcTagListener *> tag_listeners_;
+};
+
 }  // namespace nfc
 }  // namespace esphome
diff --git a/esphome/components/pn7150/__init__.py b/esphome/components/pn7150/__init__.py
index 3b80b574e9..a136028011 100644
--- a/esphome/components/pn7150/__init__.py
+++ b/esphome/components/pn7150/__init__.py
@@ -34,7 +34,7 @@ CONF_TAG_TTL = "tag_ttl"
 CONF_VEN_PIN = "ven_pin"
 
 pn7150_ns = cg.esphome_ns.namespace("pn7150")
-PN7150 = pn7150_ns.class_("PN7150", cg.Component)
+PN7150 = pn7150_ns.class_("PN7150", nfc.Nfcc, cg.Component)
 
 EmulationOffAction = pn7150_ns.class_("EmulationOffAction", automation.Action)
 EmulationOnAction = pn7150_ns.class_("EmulationOnAction", automation.Action)
diff --git a/esphome/components/pn7150/pn7150.cpp b/esphome/components/pn7150/pn7150.cpp
index 6703ab6a12..be4d6c1bb7 100644
--- a/esphome/components/pn7150/pn7150.cpp
+++ b/esphome/components/pn7150/pn7150.cpp
@@ -566,6 +566,9 @@ void PN7150::erase_tag_(const uint8_t tag_index) {
     for (auto *trigger : this->triggers_ontagremoved_) {
       trigger->process(this->discovered_endpoint_[tag_index].tag);
     }
+    for (auto *listener : this->tag_listeners_) {
+      listener->tag_off(*this->discovered_endpoint_[tag_index].tag);
+    }
     ESP_LOGI(TAG, "Tag %s removed", nfc::format_uid(this->discovered_endpoint_[tag_index].tag->get_uid()).c_str());
     this->discovered_endpoint_.erase(this->discovered_endpoint_.begin() + tag_index);
   }
@@ -881,6 +884,9 @@ void PN7150::process_rf_intf_activated_oid_(nfc::NciMessage &rx) {  // an endpoi
           for (auto *trigger : this->triggers_ontag_) {
             trigger->process(working_endpoint.tag);
           }
+          for (auto *listener : this->tag_listeners_) {
+            listener->tag_on(*working_endpoint.tag);
+          }
           working_endpoint.trig_called = true;
           break;
         }
diff --git a/esphome/components/pn7150/pn7150.h b/esphome/components/pn7150/pn7150.h
index 4aad4e1720..54038f5085 100644
--- a/esphome/components/pn7150/pn7150.h
+++ b/esphome/components/pn7150/pn7150.h
@@ -142,7 +142,7 @@ struct DiscoveredEndpoint {
   bool trig_called;
 };
 
-class PN7150 : public Component {
+class PN7150 : public nfc::Nfcc, public Component {
  public:
   void setup() override;
   void dump_config() override;
diff --git a/esphome/components/pn7160/__init__.py b/esphome/components/pn7160/__init__.py
index c91ca78b03..1639041b9e 100644
--- a/esphome/components/pn7160/__init__.py
+++ b/esphome/components/pn7160/__init__.py
@@ -36,7 +36,7 @@ CONF_VEN_PIN = "ven_pin"
 CONF_WKUP_REQ_PIN = "wkup_req_pin"
 
 pn7160_ns = cg.esphome_ns.namespace("pn7160")
-PN7160 = pn7160_ns.class_("PN7160", cg.Component)
+PN7160 = pn7160_ns.class_("PN7160", nfc.Nfcc, cg.Component)
 
 EmulationOffAction = pn7160_ns.class_("EmulationOffAction", automation.Action)
 EmulationOnAction = pn7160_ns.class_("EmulationOnAction", automation.Action)
diff --git a/esphome/components/pn7160/pn7160.cpp b/esphome/components/pn7160/pn7160.cpp
index ce5374d1d1..a7d3b38fb7 100644
--- a/esphome/components/pn7160/pn7160.cpp
+++ b/esphome/components/pn7160/pn7160.cpp
@@ -591,6 +591,9 @@ void PN7160::erase_tag_(const uint8_t tag_index) {
     for (auto *trigger : this->triggers_ontagremoved_) {
       trigger->process(this->discovered_endpoint_[tag_index].tag);
     }
+    for (auto *listener : this->tag_listeners_) {
+      listener->tag_off(*this->discovered_endpoint_[tag_index].tag);
+    }
     ESP_LOGI(TAG, "Tag %s removed", nfc::format_uid(this->discovered_endpoint_[tag_index].tag->get_uid()).c_str());
     this->discovered_endpoint_.erase(this->discovered_endpoint_.begin() + tag_index);
   }
@@ -905,6 +908,9 @@ void PN7160::process_rf_intf_activated_oid_(nfc::NciMessage &rx) {  // an endpoi
           for (auto *trigger : this->triggers_ontag_) {
             trigger->process(working_endpoint.tag);
           }
+          for (auto *listener : this->tag_listeners_) {
+            listener->tag_on(*working_endpoint.tag);
+          }
           working_endpoint.trig_called = true;
           break;
         }
diff --git a/esphome/components/pn7160/pn7160.h b/esphome/components/pn7160/pn7160.h
index 2b3cb99453..f2e05ea1d0 100644
--- a/esphome/components/pn7160/pn7160.h
+++ b/esphome/components/pn7160/pn7160.h
@@ -157,7 +157,7 @@ struct DiscoveredEndpoint {
   bool trig_called;
 };
 
-class PN7160 : public Component {
+class PN7160 : public nfc::Nfcc, public Component {
  public:
   void setup() override;
   void dump_config() override;
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 3ca6faca8a..471e2a71a5 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -2028,6 +2028,18 @@ binary_sensor:
   - platform: dfrobot_sen0395
     id: mmwave_detected_uart
     dfrobot_sen0395_id: mmwave
+  - platform: nfc
+    nfcc_id: nfcc_pn7160_i2c
+    ndef_contains: pulse
+    name: MFC Tag 1
+  - platform: nfc
+    nfcc_id: nfcc_pn7160_i2c
+    tag_id: pulse
+    name: MFC Tag 2
+  - platform: nfc
+    nfcc_id: nfcc_pn7160_i2c
+    uid: 59-FC-AB-15
+    name: MFC Tag 3
 
 pca9685:
   frequency: 500
@@ -3453,6 +3465,7 @@ pn532_i2c:
   i2c_id: i2c_bus
 
 pn7150_i2c:
+  id: nfcc_pn7150_i2c
   i2c_id: i2c_bus
   irq_pin:
     allow_other_uses: true

From ea03058ace0d46de52c020b10daa39524bb5670c Mon Sep 17 00:00:00 2001
From: Piotr Majkrzak <piotr@majkrzak.dev>
Date: Tue, 16 Jan 2024 09:10:44 +0100
Subject: [PATCH 42/68] Fix RMT timing clock base (#6101)

---
 esphome/components/esp32_rmt_led_strip/led_strip.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/esphome/components/esp32_rmt_led_strip/led_strip.cpp b/esphome/components/esp32_rmt_led_strip/led_strip.cpp
index df6ee2ce2f..3df4077c96 100644
--- a/esphome/components/esp32_rmt_led_strip/led_strip.cpp
+++ b/esphome/components/esp32_rmt_led_strip/led_strip.cpp
@@ -13,6 +13,8 @@ namespace esp32_rmt_led_strip {
 
 static const char *const TAG = "esp32_rmt_led_strip";
 
+static const uint32_t RMT_CLK_FREQ = 80000000;
+
 static const uint8_t RMT_CLK_DIV = 2;
 
 void ESP32RMTLEDStripLightOutput::setup() {
@@ -65,7 +67,7 @@ void ESP32RMTLEDStripLightOutput::setup() {
 
 void ESP32RMTLEDStripLightOutput::set_led_params(uint32_t bit0_high, uint32_t bit0_low, uint32_t bit1_high,
                                                  uint32_t bit1_low) {
-  float ratio = (float) APB_CLK_FREQ / RMT_CLK_DIV / 1e09f;
+  float ratio = (float) RMT_CLK_FREQ / RMT_CLK_DIV / 1e09f;
 
   // 0-bit
   this->bit0_.duration0 = (uint32_t) (ratio * bit0_high);

From 21337ffc67096d9256b3dd34428953b47c8283bf Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 16 Jan 2024 21:37:57 +1300
Subject: [PATCH 43/68] Create RingBuffer for VoiceAssistant (#6102)

---
 .../voice_assistant/voice_assistant.cpp       | 32 ++++--------
 .../voice_assistant/voice_assistant.h         |  4 +-
 esphome/core/ring_buffer.cpp                  | 49 +++++++++++++++++++
 esphome/core/ring_buffer.h                    | 34 +++++++++++++
 4 files changed, 95 insertions(+), 24 deletions(-)
 create mode 100644 esphome/core/ring_buffer.cpp
 create mode 100644 esphome/core/ring_buffer.h

diff --git a/esphome/components/voice_assistant/voice_assistant.cpp b/esphome/components/voice_assistant/voice_assistant.cpp
index 29fc664342..299e624f5f 100644
--- a/esphome/components/voice_assistant/voice_assistant.cpp
+++ b/esphome/components/voice_assistant/voice_assistant.cpp
@@ -86,14 +86,14 @@ void VoiceAssistant::setup() {
 
 #ifdef USE_ESP_ADF
   this->vad_instance_ = vad_create(VAD_MODE_4);
+#endif
 
-  this->ring_buffer_ = rb_create(BUFFER_SIZE, sizeof(int16_t));
+  this->ring_buffer_ = RingBuffer::create(BUFFER_SIZE * sizeof(int16_t));
   if (this->ring_buffer_ == nullptr) {
     ESP_LOGW(TAG, "Could not allocate ring buffer");
     this->mark_failed();
     return;
   }
-#endif
 
   ExternalRAMAllocator<uint8_t> send_allocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);
   this->send_buffer_ = send_allocator.allocate(SEND_BUFFER_SIZE);
@@ -112,14 +112,8 @@ int VoiceAssistant::read_microphone_() {
       memset(this->input_buffer_, 0, INPUT_BUFFER_SIZE * sizeof(int16_t));
       return 0;
     }
-#ifdef USE_ESP_ADF
     // Write audio into ring buffer
-    int available = rb_bytes_available(this->ring_buffer_);
-    if (available < bytes_read) {
-      rb_read(this->ring_buffer_, nullptr, bytes_read - available, 0);
-    }
-    rb_write(this->ring_buffer_, (char *) this->input_buffer_, bytes_read, 0);
-#endif
+    this->ring_buffer_->write((void *) this->input_buffer_, bytes_read);
   } else {
     ESP_LOGD(TAG, "microphone not running");
   }
@@ -141,9 +135,9 @@ void VoiceAssistant::loop() {
   switch (this->state_) {
     case State::IDLE: {
       if (this->continuous_ && this->desired_state_ == State::IDLE) {
+        this->ring_buffer_->reset();
 #ifdef USE_ESP_ADF
         if (this->use_wake_word_) {
-          rb_reset(this->ring_buffer_);
           this->set_state_(State::START_MICROPHONE, State::WAIT_FOR_VAD);
         } else
 #endif
@@ -236,19 +230,13 @@ void VoiceAssistant::loop() {
       break;  // State changed when udp server port received
     }
     case State::STREAMING_MICROPHONE: {
-      size_t bytes_read = this->read_microphone_();
-#ifdef USE_ESP_ADF
-      if (rb_bytes_filled(this->ring_buffer_) >= SEND_BUFFER_SIZE) {
-        rb_read(this->ring_buffer_, (char *) this->send_buffer_, SEND_BUFFER_SIZE, 0);
+      this->read_microphone_();
+      if (this->ring_buffer_->available() >= SEND_BUFFER_SIZE) {
+        this->ring_buffer_->read((void *) this->send_buffer_, SEND_BUFFER_SIZE, 0);
         this->socket_->sendto(this->send_buffer_, SEND_BUFFER_SIZE, 0, (struct sockaddr *) &this->dest_addr_,
                               sizeof(this->dest_addr_));
       }
-#else
-      if (bytes_read > 0) {
-        this->socket_->sendto(this->input_buffer_, bytes_read, 0, (struct sockaddr *) &this->dest_addr_,
-                              sizeof(this->dest_addr_));
-      }
-#endif
+
       break;
     }
     case State::STOP_MICROPHONE: {
@@ -473,9 +461,9 @@ void VoiceAssistant::request_start(bool continuous, bool silence_detection) {
   if (this->state_ == State::IDLE) {
     this->continuous_ = continuous;
     this->silence_detection_ = silence_detection;
+    this->ring_buffer_->reset();
 #ifdef USE_ESP_ADF
     if (this->use_wake_word_) {
-      rb_reset(this->ring_buffer_);
       this->set_state_(State::START_MICROPHONE, State::WAIT_FOR_VAD);
     } else
 #endif
@@ -618,9 +606,9 @@ void VoiceAssistant::on_event(const api::VoiceAssistantEventResponse &msg) {
     case api::enums::VOICE_ASSISTANT_RUN_END: {
       ESP_LOGD(TAG, "Assist Pipeline ended");
       if (this->state_ == State::STREAMING_MICROPHONE) {
+        this->ring_buffer_->reset();
 #ifdef USE_ESP_ADF
         if (this->use_wake_word_) {
-          rb_reset(this->ring_buffer_);
           // No need to stop the microphone since we didn't use the speaker
           this->set_state_(State::WAIT_FOR_VAD, State::WAITING_FOR_VAD);
         } else
diff --git a/esphome/components/voice_assistant/voice_assistant.h b/esphome/components/voice_assistant/voice_assistant.h
index f9325dff54..d996efe08e 100644
--- a/esphome/components/voice_assistant/voice_assistant.h
+++ b/esphome/components/voice_assistant/voice_assistant.h
@@ -7,6 +7,7 @@
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 #include "esphome/core/helpers.h"
+#include "esphome/core/ring_buffer.h"
 
 #include "esphome/components/api/api_connection.h"
 #include "esphome/components/api/api_pb2.h"
@@ -21,7 +22,6 @@
 
 #ifdef USE_ESP_ADF
 #include <esp_vad.h>
-#include <ringbuf.h>
 #endif
 
 namespace esphome {
@@ -177,10 +177,10 @@ class VoiceAssistant : public Component {
 
 #ifdef USE_ESP_ADF
   vad_handle_t vad_instance_;
-  ringbuf_handle_t ring_buffer_;
   uint8_t vad_threshold_{5};
   uint8_t vad_counter_{0};
 #endif
+  std::unique_ptr<RingBuffer> ring_buffer_;
 
   bool use_wake_word_;
   uint8_t noise_suppression_level_;
diff --git a/esphome/core/ring_buffer.cpp b/esphome/core/ring_buffer.cpp
new file mode 100644
index 0000000000..d9c56d84c5
--- /dev/null
+++ b/esphome/core/ring_buffer.cpp
@@ -0,0 +1,49 @@
+#include "ring_buffer.h"
+
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+#ifdef USE_ESP32
+
+#include "helpers.h"
+
+namespace esphome {
+
+static const char *const TAG = "ring_buffer";
+
+std::unique_ptr<RingBuffer> RingBuffer::create(size_t len) {
+  std::unique_ptr<RingBuffer> rb = make_unique<RingBuffer>();
+
+  ExternalRAMAllocator<uint8_t> allocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);
+  rb->storage_ = allocator.allocate(len);
+  if (rb->storage_ == nullptr) {
+    return nullptr;
+  }
+
+  rb->handle_ = xStreamBufferCreateStatic(len, 0, rb->storage_, &rb->structure_);
+  return rb;
+}
+
+size_t RingBuffer::read(void *data, size_t size, TickType_t ticks_to_wait) {
+  return xStreamBufferReceive(this->handle_, data, size, ticks_to_wait);
+}
+
+size_t RingBuffer::write(void *data, size_t len) {
+  size_t free = this->free();
+  if (free < len) {
+    size_t needed = len - free;
+    uint8_t discard[needed];
+    xStreamBufferReceive(this->handle_, discard, needed, 0);
+  }
+  return xStreamBufferSend(this->handle_, data, len, 0);
+}
+
+size_t RingBuffer::available() const { return xStreamBufferBytesAvailable(this->handle_); }
+
+size_t RingBuffer::free() const { return xStreamBufferSpacesAvailable(this->handle_); }
+
+BaseType_t RingBuffer::reset() { return xStreamBufferReset(this->handle_); }
+
+}  // namespace esphome
+
+#endif
diff --git a/esphome/core/ring_buffer.h b/esphome/core/ring_buffer.h
new file mode 100644
index 0000000000..6c6d04117a
--- /dev/null
+++ b/esphome/core/ring_buffer.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#ifdef USE_ESP32
+
+#include <freertos/FreeRTOS.h>
+#include <freertos/stream_buffer.h>
+
+#include <cinttypes>
+#include <memory>
+
+namespace esphome {
+
+class RingBuffer {
+ public:
+  size_t read(void *data, size_t size, TickType_t ticks_to_wait = 0);
+
+  size_t write(void *data, size_t len);
+
+  size_t available() const;
+  size_t free() const;
+
+  BaseType_t reset();
+
+  static std::unique_ptr<RingBuffer> create(size_t len);
+
+ protected:
+  StreamBufferHandle_t handle_;
+  StaticStreamBuffer_t structure_;
+  uint8_t *storage_;
+};
+
+}  // namespace esphome
+
+#endif

From 385420303758e02a2acc9dd883c1561a51eaaf91 Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Wed, 17 Jan 2024 10:12:31 +1100
Subject: [PATCH 44/68] Socket: Add recvfrom method to receive UDP with source
 address. (#6103)

---
 esphome/components/socket/bsd_sockets_impl.cpp | 7 +++++++
 esphome/components/socket/socket.h             | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/esphome/components/socket/bsd_sockets_impl.cpp b/esphome/components/socket/bsd_sockets_impl.cpp
index 5d44cd7689..6c356106f3 100644
--- a/esphome/components/socket/bsd_sockets_impl.cpp
+++ b/esphome/components/socket/bsd_sockets_impl.cpp
@@ -86,6 +86,13 @@ class BSDSocketImpl : public Socket {
   }
   int listen(int backlog) override { return ::listen(fd_, backlog); }
   ssize_t read(void *buf, size_t len) override { return ::read(fd_, buf, len); }
+  ssize_t recvfrom(void *buf, size_t len, sockaddr *addr, socklen_t *addr_len) override {
+#if defined(USE_ESP32)
+    return ::recvfrom(this->fd_, buf, len, 0, addr, addr_len);
+#else
+    return ::lwip_recvfrom(this->fd_, buf, len, 0, addr, addr_len);
+#endif
+  }
   ssize_t readv(const struct iovec *iov, int iovcnt) override {
 #if defined(USE_ESP32)
     return ::lwip_readv(fd_, iov, iovcnt);
diff --git a/esphome/components/socket/socket.h b/esphome/components/socket/socket.h
index c9b8be88a0..5c12210d15 100644
--- a/esphome/components/socket/socket.h
+++ b/esphome/components/socket/socket.h
@@ -31,6 +31,9 @@ class Socket {
   virtual int setsockopt(int level, int optname, const void *optval, socklen_t optlen) = 0;
   virtual int listen(int backlog) = 0;
   virtual ssize_t read(void *buf, size_t len) = 0;
+#ifdef USE_SOCKET_IMPL_BSD_SOCKETS
+  virtual ssize_t recvfrom(void *buf, size_t len, sockaddr *addr, socklen_t *addr_len) = 0;
+#endif
   virtual ssize_t readv(const struct iovec *iov, int iovcnt) = 0;
   virtual ssize_t write(const void *buf, size_t len) = 0;
   virtual ssize_t writev(const struct iovec *iov, int iovcnt) = 0;

From 596943b683d45bf99b474e92f6dbc97e65a3ae3b Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Wed, 17 Jan 2024 10:23:36 +1100
Subject: [PATCH 45/68] Inkplate6: Fix crash with initial set of greyscale
 (#6038)

---
 esphome/components/inkplate6/inkplate.cpp | 3 +++
 esphome/components/inkplate6/inkplate.h   | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/esphome/components/inkplate6/inkplate.cpp b/esphome/components/inkplate6/inkplate.cpp
index 92a226de87..f4d0fedf83 100644
--- a/esphome/components/inkplate6/inkplate.cpp
+++ b/esphome/components/inkplate6/inkplate.cpp
@@ -55,6 +55,9 @@ void Inkplate6::setup() {
   this->wakeup_pin_->digital_write(false);
 }
 
+/**
+ * Allocate buffers. May be called after setup to re-initialise if e.g. greyscale is changed.
+ */
 void Inkplate6::initialize_() {
   ExternalRAMAllocator<uint8_t> allocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);
   ExternalRAMAllocator<uint32_t> allocator32(ExternalRAMAllocator<uint32_t>::ALLOW_FAILURE);
diff --git a/esphome/components/inkplate6/inkplate.h b/esphome/components/inkplate6/inkplate.h
index 307d9671e6..2946c89e1c 100644
--- a/esphome/components/inkplate6/inkplate.h
+++ b/esphome/components/inkplate6/inkplate.h
@@ -68,8 +68,9 @@ class Inkplate6 : public display::DisplayBuffer, public i2c::I2CDevice {
 
   void set_greyscale(bool greyscale) {
     this->greyscale_ = greyscale;
-    this->initialize_();
     this->block_partial_ = true;
+    if (this->is_ready())
+      this->initialize_();
   }
   void set_partial_updating(bool partial_updating) { this->partial_updating_ = partial_updating; }
   void set_full_update_every(uint32_t full_update_every) { this->full_update_every_ = full_update_every; }

From 0cd232cdf516a04574787843b6af20012f23350a Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Wed, 17 Jan 2024 00:50:53 -0600
Subject: [PATCH 46/68] Add support for VEML3235 lux sensor (#5959)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                               |   1 +
 esphome/components/veml3235/__init__.py  |   0
 esphome/components/veml3235/sensor.py    |  84 +++++++++
 esphome/components/veml3235/veml3235.cpp | 230 +++++++++++++++++++++++
 esphome/components/veml3235/veml3235.h   | 109 +++++++++++
 tests/test1.yaml                         |  10 +
 6 files changed, 434 insertions(+)
 create mode 100644 esphome/components/veml3235/__init__.py
 create mode 100644 esphome/components/veml3235/sensor.py
 create mode 100644 esphome/components/veml3235/veml3235.cpp
 create mode 100644 esphome/components/veml3235/veml3235.h

diff --git a/CODEOWNERS b/CODEOWNERS
index c497a82eab..fea1e6215c 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -362,6 +362,7 @@ esphome/components/ufire_ec/* @pvizeli
 esphome/components/ufire_ise/* @pvizeli
 esphome/components/ultrasonic/* @OttoWinter
 esphome/components/vbus/* @ssieb
+esphome/components/veml3235/* @kbx81
 esphome/components/version/* @esphome/core
 esphome/components/voice_assistant/* @jesserockz
 esphome/components/wake_on_lan/* @willwill2will54
diff --git a/esphome/components/veml3235/__init__.py b/esphome/components/veml3235/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/veml3235/sensor.py b/esphome/components/veml3235/sensor.py
new file mode 100644
index 0000000000..79ba510e41
--- /dev/null
+++ b/esphome/components/veml3235/sensor.py
@@ -0,0 +1,84 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import (
+    CONF_GAIN,
+    CONF_INTEGRATION_TIME,
+    DEVICE_CLASS_ILLUMINANCE,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_LUX,
+)
+
+CODEOWNERS = ["@kbx81"]
+DEPENDENCIES = ["i2c"]
+
+CONF_AUTO_GAIN = "auto_gain"
+CONF_AUTO_GAIN_THRESHOLD_HIGH = "auto_gain_threshold_high"
+CONF_AUTO_GAIN_THRESHOLD_LOW = "auto_gain_threshold_low"
+CONF_DIGITAL_GAIN = "digital_gain"
+
+veml3235_ns = cg.esphome_ns.namespace("veml3235")
+
+VEML3235Sensor = veml3235_ns.class_(
+    "VEML3235Sensor", sensor.Sensor, cg.PollingComponent, i2c.I2CDevice
+)
+VEML3235IntegrationTime = veml3235_ns.enum("VEML3235IntegrationTime")
+VEML3235_INTEGRATION_TIMES = {
+    "50ms": VEML3235IntegrationTime.VEML3235_INTEGRATION_TIME_50MS,
+    "100ms": VEML3235IntegrationTime.VEML3235_INTEGRATION_TIME_100MS,
+    "200ms": VEML3235IntegrationTime.VEML3235_INTEGRATION_TIME_200MS,
+    "400ms": VEML3235IntegrationTime.VEML3235_INTEGRATION_TIME_400MS,
+    "800ms": VEML3235IntegrationTime.VEML3235_INTEGRATION_TIME_800MS,
+}
+VEML3235ComponentDigitalGain = veml3235_ns.enum("VEML3235ComponentDigitalGain")
+DIGITAL_GAINS = {
+    "1X": VEML3235ComponentDigitalGain.VEML3235_DIGITAL_GAIN_1X,
+    "2X": VEML3235ComponentDigitalGain.VEML3235_DIGITAL_GAIN_2X,
+}
+VEML3235ComponentGain = veml3235_ns.enum("VEML3235ComponentGain")
+GAINS = {
+    "1X": VEML3235ComponentGain.VEML3235_GAIN_1X,
+    "2X": VEML3235ComponentGain.VEML3235_GAIN_2X,
+    "4X": VEML3235ComponentGain.VEML3235_GAIN_4X,
+    "AUTO": VEML3235ComponentGain.VEML3235_GAIN_AUTO,
+}
+
+CONFIG_SCHEMA = (
+    sensor.sensor_schema(
+        VEML3235Sensor,
+        unit_of_measurement=UNIT_LUX,
+        accuracy_decimals=1,
+        device_class=DEVICE_CLASS_ILLUMINANCE,
+        state_class=STATE_CLASS_MEASUREMENT,
+    )
+    .extend(
+        {
+            cv.Optional(CONF_DIGITAL_GAIN, default="1X"): cv.enum(
+                DIGITAL_GAINS, upper=True
+            ),
+            cv.Optional(CONF_AUTO_GAIN, default=True): cv.boolean,
+            cv.Optional(CONF_AUTO_GAIN_THRESHOLD_HIGH, default="90%"): cv.percentage,
+            cv.Optional(CONF_AUTO_GAIN_THRESHOLD_LOW, default="20%"): cv.percentage,
+            cv.Optional(CONF_GAIN, default="1X"): cv.enum(GAINS, upper=True),
+            cv.Optional(CONF_INTEGRATION_TIME, default="50ms"): cv.All(
+                cv.positive_time_period_milliseconds,
+                cv.enum(VEML3235_INTEGRATION_TIMES, lower=True),
+            ),
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+    .extend(i2c.i2c_device_schema(0x10))
+)
+
+
+async def to_code(config):
+    var = await sensor.new_sensor(config)
+    await cg.register_component(var, config)
+    await i2c.register_i2c_device(var, config)
+
+    cg.add(var.set_auto_gain(config[CONF_AUTO_GAIN]))
+    cg.add(var.set_auto_gain_threshold_high(config[CONF_AUTO_GAIN_THRESHOLD_HIGH]))
+    cg.add(var.set_auto_gain_threshold_low(config[CONF_AUTO_GAIN_THRESHOLD_LOW]))
+    cg.add(var.set_digital_gain(DIGITAL_GAINS[config[CONF_DIGITAL_GAIN]]))
+    cg.add(var.set_gain(GAINS[config[CONF_GAIN]]))
+    cg.add(var.set_integration_time(config[CONF_INTEGRATION_TIME]))
diff --git a/esphome/components/veml3235/veml3235.cpp b/esphome/components/veml3235/veml3235.cpp
new file mode 100644
index 0000000000..2410bfdda2
--- /dev/null
+++ b/esphome/components/veml3235/veml3235.cpp
@@ -0,0 +1,230 @@
+#include "veml3235.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace veml3235 {
+
+static const char *const TAG = "veml3235.sensor";
+
+void VEML3235Sensor::setup() {
+  uint8_t device_id[] = {0, 0};
+
+  ESP_LOGCONFIG(TAG, "Setting up VEML3235 '%s'...", this->name_.c_str());
+
+  if (!this->refresh_config_reg()) {
+    ESP_LOGE(TAG, "Unable to write configuration");
+    this->mark_failed();
+    return;
+  }
+  if ((this->write(&ID_REG, 1, false) != i2c::ERROR_OK) || !this->read_bytes_raw(device_id, 2)) {
+    ESP_LOGE(TAG, "Unable to read ID");
+    this->mark_failed();
+    return;
+  } else if (device_id[0] != DEVICE_ID) {
+    ESP_LOGE(TAG, "Incorrect device ID - expected 0x%.2x, read 0x%.2x", DEVICE_ID, device_id[0]);
+    this->mark_failed();
+    return;
+  }
+}
+
+bool VEML3235Sensor::refresh_config_reg(bool force_on) {
+  uint16_t data = this->power_on_ || force_on ? 0 : SHUTDOWN_BITS;
+
+  data |= (uint16_t(this->integration_time_ << CONFIG_REG_IT_BIT));
+  data |= (uint16_t(this->digital_gain_ << CONFIG_REG_DG_BIT));
+  data |= (uint16_t(this->gain_ << CONFIG_REG_G_BIT));
+  data |= 0x1;  // mandatory 1 here per RM
+
+  ESP_LOGVV(TAG, "Writing 0x%.4x to register 0x%.2x", data, CONFIG_REG);
+  return this->write_byte_16(CONFIG_REG, data);
+}
+
+float VEML3235Sensor::read_lx_() {
+  if (!this->power_on_) {  // if off, turn on
+    if (!this->refresh_config_reg(true)) {
+      ESP_LOGW(TAG, "Turning on failed");
+      this->status_set_warning();
+      return NAN;
+    }
+    delay(4);  // from RM: a wait time of 4 ms should be observed before the first measurement is picked up, to allow
+               // for a correct start of the signal processor and oscillator
+  }
+
+  uint8_t als_regs[] = {0, 0};
+  if ((this->write(&ALS_REG, 1, false) != i2c::ERROR_OK) || !this->read_bytes_raw(als_regs, 2)) {
+    this->status_set_warning();
+    return NAN;
+  }
+
+  this->status_clear_warning();
+
+  float als_raw_value_multiplier = LUX_MULTIPLIER_BASE;
+  uint16_t als_raw_value = encode_uint16(als_regs[1], als_regs[0]);
+  // determine multiplier value based on gains and integration time
+  if (this->digital_gain_ == VEML3235_DIGITAL_GAIN_1X) {
+    als_raw_value_multiplier *= 2;
+  }
+  switch (this->gain_) {
+    case VEML3235_GAIN_1X:
+      als_raw_value_multiplier *= 4;
+      break;
+    case VEML3235_GAIN_2X:
+      als_raw_value_multiplier *= 2;
+      break;
+    default:
+      break;
+  }
+  switch (this->integration_time_) {
+    case VEML3235_INTEGRATION_TIME_50MS:
+      als_raw_value_multiplier *= 16;
+      break;
+    case VEML3235_INTEGRATION_TIME_100MS:
+      als_raw_value_multiplier *= 8;
+      break;
+    case VEML3235_INTEGRATION_TIME_200MS:
+      als_raw_value_multiplier *= 4;
+      break;
+    case VEML3235_INTEGRATION_TIME_400MS:
+      als_raw_value_multiplier *= 2;
+      break;
+    default:
+      break;
+  }
+  // finally, determine and return the actual lux value
+  float lx = float(als_raw_value) * als_raw_value_multiplier;
+  ESP_LOGVV(TAG, "'%s': ALS raw = %u, multiplier = %.5f", this->get_name().c_str(), als_raw_value,
+            als_raw_value_multiplier);
+  ESP_LOGD(TAG, "'%s': Illuminance = %.4flx", this->get_name().c_str(), lx);
+
+  if (!this->power_on_) {  // turn off if required
+    if (!this->refresh_config_reg()) {
+      ESP_LOGW(TAG, "Turning off failed");
+      this->status_set_warning();
+    }
+  }
+
+  if (this->auto_gain_) {
+    this->adjust_gain_(als_raw_value);
+  }
+
+  return lx;
+}
+
+void VEML3235Sensor::adjust_gain_(const uint16_t als_raw_value) {
+  if ((als_raw_value > UINT16_MAX * this->auto_gain_threshold_low_) &&
+      (als_raw_value < UINT16_MAX * this->auto_gain_threshold_high_)) {
+    return;
+  }
+
+  if (als_raw_value >= UINT16_MAX * 0.9) {  // over-saturated, reset all gains and start over
+    this->digital_gain_ = VEML3235_DIGITAL_GAIN_1X;
+    this->gain_ = VEML3235_GAIN_1X;
+    this->integration_time_ = VEML3235_INTEGRATION_TIME_50MS;
+    this->refresh_config_reg();
+    return;
+  }
+
+  if (this->gain_ != VEML3235_GAIN_4X) {  // increase gain if possible
+    switch (this->gain_) {
+      case VEML3235_GAIN_1X:
+        this->gain_ = VEML3235_GAIN_2X;
+        break;
+      case VEML3235_GAIN_2X:
+        this->gain_ = VEML3235_GAIN_4X;
+        break;
+      default:
+        break;
+    }
+    this->refresh_config_reg();
+    return;
+  }
+  // gain is maxed out; reset it and try to increase digital gain
+  if (this->digital_gain_ != VEML3235_DIGITAL_GAIN_2X) {  // increase digital gain if possible
+    this->digital_gain_ = VEML3235_DIGITAL_GAIN_2X;
+    this->gain_ = VEML3235_GAIN_1X;
+    this->refresh_config_reg();
+    return;
+  }
+  // digital gain is maxed out; reset it and try to increase integration time
+  if (this->integration_time_ != VEML3235_INTEGRATION_TIME_800MS) {  // increase integration time if possible
+    switch (this->integration_time_) {
+      case VEML3235_INTEGRATION_TIME_50MS:
+        this->integration_time_ = VEML3235_INTEGRATION_TIME_100MS;
+        break;
+      case VEML3235_INTEGRATION_TIME_100MS:
+        this->integration_time_ = VEML3235_INTEGRATION_TIME_200MS;
+        break;
+      case VEML3235_INTEGRATION_TIME_200MS:
+        this->integration_time_ = VEML3235_INTEGRATION_TIME_400MS;
+        break;
+      case VEML3235_INTEGRATION_TIME_400MS:
+        this->integration_time_ = VEML3235_INTEGRATION_TIME_800MS;
+        break;
+      default:
+        break;
+    }
+    this->digital_gain_ = VEML3235_DIGITAL_GAIN_1X;
+    this->gain_ = VEML3235_GAIN_1X;
+    this->refresh_config_reg();
+    return;
+  }
+}
+
+void VEML3235Sensor::dump_config() {
+  uint8_t digital_gain = 1;
+  uint8_t gain = 1;
+  uint16_t integration_time = 0;
+
+  if (this->digital_gain_ == VEML3235_DIGITAL_GAIN_2X) {
+    digital_gain = 2;
+  }
+  switch (this->gain_) {
+    case VEML3235_GAIN_2X:
+      gain = 2;
+      break;
+    case VEML3235_GAIN_4X:
+      gain = 4;
+      break;
+    default:
+      break;
+  }
+  switch (this->integration_time_) {
+    case VEML3235_INTEGRATION_TIME_50MS:
+      integration_time = 50;
+      break;
+    case VEML3235_INTEGRATION_TIME_100MS:
+      integration_time = 100;
+      break;
+    case VEML3235_INTEGRATION_TIME_200MS:
+      integration_time = 200;
+      break;
+    case VEML3235_INTEGRATION_TIME_400MS:
+      integration_time = 400;
+      break;
+    case VEML3235_INTEGRATION_TIME_800MS:
+      integration_time = 800;
+      break;
+    default:
+      break;
+  }
+
+  LOG_SENSOR("", "VEML3235", this);
+  LOG_I2C_DEVICE(this);
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, "Communication failed");
+  }
+  LOG_UPDATE_INTERVAL(this);
+  ESP_LOGCONFIG(TAG, "  Auto-gain enabled: %s", YESNO(this->auto_gain_));
+  if (this->auto_gain_) {
+    ESP_LOGCONFIG(TAG, "  Auto-gain upper threshold: %f%%", this->auto_gain_threshold_high_ * 100.0);
+    ESP_LOGCONFIG(TAG, "  Auto-gain lower threshold: %f%%", this->auto_gain_threshold_low_ * 100.0);
+    ESP_LOGCONFIG(TAG, "  Values below will be used as initial values only");
+  }
+  ESP_LOGCONFIG(TAG, "  Digital gain: %uX", digital_gain);
+  ESP_LOGCONFIG(TAG, "  Gain: %uX", gain);
+  ESP_LOGCONFIG(TAG, "  Integration time: %ums", integration_time);
+}
+
+}  // namespace veml3235
+}  // namespace esphome
diff --git a/esphome/components/veml3235/veml3235.h b/esphome/components/veml3235/veml3235.h
new file mode 100644
index 0000000000..2b0d6b23ea
--- /dev/null
+++ b/esphome/components/veml3235/veml3235.h
@@ -0,0 +1,109 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace veml3235 {
+
+// Register IDs/locations
+//
+static const uint8_t CONFIG_REG = 0x00;
+static const uint8_t W_REG = 0x04;
+static const uint8_t ALS_REG = 0x05;
+static const uint8_t ID_REG = 0x09;
+
+// Bit offsets within CONFIG_REG
+//
+static const uint8_t CONFIG_REG_IT_BIT = 12;
+static const uint8_t CONFIG_REG_DG_BIT = 5;
+static const uint8_t CONFIG_REG_G_BIT = 3;
+
+// Other important constants
+//
+static const uint8_t DEVICE_ID = 0x35;
+static const uint16_t SHUTDOWN_BITS = 0x0018;
+
+// Base multiplier value for lux computation
+//
+static const float LUX_MULTIPLIER_BASE = 0.00213;
+
+// Enum for conversion/integration time settings for the VEML3235.
+//
+// Specific values of the enum constants are register values taken from the VEML3235 datasheet.
+// Longer times mean more accurate results, but will take more energy/more time.
+//
+enum VEML3235ComponentIntegrationTime {
+  VEML3235_INTEGRATION_TIME_50MS = 0b000,
+  VEML3235_INTEGRATION_TIME_100MS = 0b001,
+  VEML3235_INTEGRATION_TIME_200MS = 0b010,
+  VEML3235_INTEGRATION_TIME_400MS = 0b011,
+  VEML3235_INTEGRATION_TIME_800MS = 0b100,
+};
+
+// Enum for digital gain settings for the VEML3235.
+// Higher values are better for low light situations, but can increase noise.
+//
+enum VEML3235ComponentDigitalGain {
+  VEML3235_DIGITAL_GAIN_1X = 0b0,
+  VEML3235_DIGITAL_GAIN_2X = 0b1,
+};
+
+// Enum for gain settings for the VEML3235.
+// Higher values are better for low light situations, but can increase noise.
+//
+enum VEML3235ComponentGain {
+  VEML3235_GAIN_1X = 0b00,
+  VEML3235_GAIN_2X = 0b01,
+  VEML3235_GAIN_4X = 0b11,
+};
+
+class VEML3235Sensor : public sensor::Sensor, public PollingComponent, public i2c::I2CDevice {
+ public:
+  void setup() override;
+  void dump_config() override;
+  void update() override { this->publish_state(this->read_lx_()); }
+  float get_setup_priority() const override { return setup_priority::DATA; }
+
+  // Used by ESPHome framework. Does NOT actually set the value on the device.
+  void set_auto_gain(bool auto_gain) { this->auto_gain_ = auto_gain; }
+  void set_auto_gain_threshold_high(float auto_gain_threshold_high) {
+    this->auto_gain_threshold_high_ = auto_gain_threshold_high;
+  }
+  void set_auto_gain_threshold_low(float auto_gain_threshold_low) {
+    this->auto_gain_threshold_low_ = auto_gain_threshold_low;
+  }
+  void set_power_on(bool power_on) { this->power_on_ = power_on; }
+  void set_digital_gain(VEML3235ComponentDigitalGain digital_gain) { this->digital_gain_ = digital_gain; }
+  void set_gain(VEML3235ComponentGain gain) { this->gain_ = gain; }
+  void set_integration_time(VEML3235ComponentIntegrationTime integration_time) {
+    this->integration_time_ = integration_time;
+  }
+
+  bool auto_gain() { return this->auto_gain_; }
+  float auto_gain_threshold_high() { return this->auto_gain_threshold_high_; }
+  float auto_gain_threshold_low() { return this->auto_gain_threshold_low_; }
+  VEML3235ComponentDigitalGain digital_gain() { return this->digital_gain_; }
+  VEML3235ComponentGain gain() { return this->gain_; }
+  VEML3235ComponentIntegrationTime integration_time() { return this->integration_time_; }
+
+  // Updates the configuration register on the device
+  bool refresh_config_reg(bool force_on = false);
+
+ protected:
+  float read_lx_();
+  void adjust_gain_(uint16_t als_raw_value);
+
+  bool auto_gain_{true};
+  bool power_on_{true};
+  float auto_gain_threshold_high_{0.9};
+  float auto_gain_threshold_low_{0.2};
+  VEML3235ComponentDigitalGain digital_gain_{VEML3235_DIGITAL_GAIN_1X};
+  VEML3235ComponentGain gain_{VEML3235_GAIN_1X};
+  VEML3235ComponentIntegrationTime integration_time_{VEML3235_INTEGRATION_TIME_50MS};
+};
+
+}  // namespace veml3235
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 471e2a71a5..afd199d264 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1370,6 +1370,16 @@ sensor:
       name: tsl2591 calculated_lux
       id: tsl2591_cl
     i2c_id: i2c_bus
+  - platform: veml3235
+    id: veml3235_sensor
+    name: VEML3235 Light Sensor
+    i2c_id: i2c_bus
+    auto_gain: true
+    auto_gain_threshold_high: 90%
+    auto_gain_threshold_low: 15%
+    digital_gain: 1X
+    gain: 1X
+    integration_time: 50ms
   - platform: tee501
     name: Office Temperature 3
     address: 0x48

From b606e976e1e90eaaa2637f3eb95592a3a888c04a Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 17 Jan 2024 20:28:46 +1300
Subject: [PATCH 47/68] CV: tidy up Schema wrapper (#6105)

---
 esphome/config_validation.py | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index 8f2e080b46..fa1170fb93 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -2004,15 +2004,19 @@ def suppress_invalid():
         pass
 
 
-GIT_SCHEMA = {
-    Required(CONF_URL): url,
-    Optional(CONF_REF): git_ref,
-    Optional(CONF_USERNAME): string,
-    Optional(CONF_PASSWORD): string,
-}
-LOCAL_SCHEMA = {
-    Required(CONF_PATH): directory,
-}
+GIT_SCHEMA = Schema(
+    {
+        Required(CONF_URL): url,
+        Optional(CONF_REF): git_ref,
+        Optional(CONF_USERNAME): string,
+        Optional(CONF_PASSWORD): string,
+    }
+)
+LOCAL_SCHEMA = Schema(
+    {
+        Required(CONF_PATH): directory,
+    }
+)
 
 
 def validate_source_shorthand(value):
@@ -2053,8 +2057,8 @@ SOURCE_SCHEMA = Any(
     validate_source_shorthand,
     typed_schema(
         {
-            TYPE_GIT: Schema(GIT_SCHEMA),
-            TYPE_LOCAL: Schema(LOCAL_SCHEMA),
+            TYPE_GIT: GIT_SCHEMA,
+            TYPE_LOCAL: LOCAL_SCHEMA,
         }
     ),
 )

From e731a2ffaa62848e43c4723680225392f5217e66 Mon Sep 17 00:00:00 2001
From: h2zero <32826625+h2zero@users.noreply.github.com>
Date: Wed, 17 Jan 2024 16:26:56 -0700
Subject: [PATCH 48/68] Add support X.509 client certificates for MQTT. (#5778)

Co-authored-by: h2zero <powellperalata@gmail.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/mqtt/__init__.py            | 11 +++++++++++
 esphome/components/mqtt/mqtt_backend_esp32.cpp | 10 ++++++++++
 esphome/components/mqtt/mqtt_backend_esp32.h   |  4 ++++
 esphome/components/mqtt/mqtt_client.h          |  2 ++
 esphome/const.py                               |  2 ++
 5 files changed, 29 insertions(+)

diff --git a/esphome/components/mqtt/__init__.py b/esphome/components/mqtt/__init__.py
index baf32097fa..02184c8a39 100644
--- a/esphome/components/mqtt/__init__.py
+++ b/esphome/components/mqtt/__init__.py
@@ -10,6 +10,8 @@ from esphome.const import (
     CONF_BIRTH_MESSAGE,
     CONF_BROKER,
     CONF_CERTIFICATE_AUTHORITY,
+    CONF_CLIENT_CERTIFICATE,
+    CONF_CLIENT_CERTIFICATE_KEY,
     CONF_CLIENT_ID,
     CONF_COMMAND_TOPIC,
     CONF_COMMAND_RETAIN,
@@ -199,6 +201,12 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_CERTIFICATE_AUTHORITY): cv.All(
                 cv.string, cv.only_with_esp_idf
             ),
+            cv.Inclusive(CONF_CLIENT_CERTIFICATE, "cert-key-pair"): cv.All(
+                cv.string, cv.only_on_esp32
+            ),
+            cv.Inclusive(CONF_CLIENT_CERTIFICATE_KEY, "cert-key-pair"): cv.All(
+                cv.string, cv.only_on_esp32
+            ),
             cv.SplitDefault(CONF_SKIP_CERT_CN_CHECK, esp32_idf=False): cv.All(
                 cv.boolean, cv.only_with_esp_idf
             ),
@@ -378,6 +386,9 @@ async def to_code(config):
     if CONF_CERTIFICATE_AUTHORITY in config:
         cg.add(var.set_ca_certificate(config[CONF_CERTIFICATE_AUTHORITY]))
         cg.add(var.set_skip_cert_cn_check(config[CONF_SKIP_CERT_CN_CHECK]))
+        if CONF_CLIENT_CERTIFICATE in config:
+            cg.add(var.set_cl_certificate(config[CONF_CLIENT_CERTIFICATE]))
+            cg.add(var.set_cl_key(config[CONF_CLIENT_CERTIFICATE_KEY]))
 
         # prevent error -0x428e
         # See https://github.com/espressif/esp-idf/issues/139
diff --git a/esphome/components/mqtt/mqtt_backend_esp32.cpp b/esphome/components/mqtt/mqtt_backend_esp32.cpp
index 2d4e6802f2..9c2e487ae7 100644
--- a/esphome/components/mqtt/mqtt_backend_esp32.cpp
+++ b/esphome/components/mqtt/mqtt_backend_esp32.cpp
@@ -45,6 +45,11 @@ bool MQTTBackendESP32::initialize_() {
     mqtt_cfg_.cert_pem = ca_certificate_.value().c_str();
     mqtt_cfg_.skip_cert_common_name_check = skip_cert_cn_check_;
     mqtt_cfg_.transport = MQTT_TRANSPORT_OVER_SSL;
+
+    if (this->cl_certificate_.has_value() && this->cl_key_.has_value()) {
+      mqtt_cfg_.client_cert_pem = this->cl_certificate_.value().c_str();
+      mqtt_cfg_.client_key_pem = this->cl_key_.value().c_str();
+    }
   } else {
     mqtt_cfg_.transport = MQTT_TRANSPORT_OVER_TCP;
   }
@@ -79,6 +84,11 @@ bool MQTTBackendESP32::initialize_() {
     mqtt_cfg_.broker.verification.certificate = ca_certificate_.value().c_str();
     mqtt_cfg_.broker.verification.skip_cert_common_name_check = skip_cert_cn_check_;
     mqtt_cfg_.broker.address.transport = MQTT_TRANSPORT_OVER_SSL;
+
+    if (this->cl_certificate_.has_value() && this->cl_key_.has_value()) {
+      mqtt_cfg_.credentials.authentication.certificate = this->cl_certificate_.value().c_str();
+      mqtt_cfg_.credentials.authentication.key = this->cl_key_.value().c_str();
+    }
   } else {
     mqtt_cfg_.broker.address.transport = MQTT_TRANSPORT_OVER_TCP;
   }
diff --git a/esphome/components/mqtt/mqtt_backend_esp32.h b/esphome/components/mqtt/mqtt_backend_esp32.h
index a4ee96ca59..b1f672da10 100644
--- a/esphome/components/mqtt/mqtt_backend_esp32.h
+++ b/esphome/components/mqtt/mqtt_backend_esp32.h
@@ -124,6 +124,8 @@ class MQTTBackendESP32 final : public MQTTBackend {
   void loop() final;
 
   void set_ca_certificate(const std::string &cert) { ca_certificate_ = cert; }
+  void set_cl_certificate(const std::string &cert) { cl_certificate_ = cert; }
+  void set_cl_key(const std::string &key) { cl_key_ = key; }
   void set_skip_cert_cn_check(bool skip_check) { skip_cert_cn_check_ = skip_check; }
 
  protected:
@@ -154,6 +156,8 @@ class MQTTBackendESP32 final : public MQTTBackend {
   uint16_t keep_alive_;
   bool clean_session_;
   optional<std::string> ca_certificate_;
+  optional<std::string> cl_certificate_;
+  optional<std::string> cl_key_;
   bool skip_cert_cn_check_{false};
 
   // callbacks
diff --git a/esphome/components/mqtt/mqtt_client.h b/esphome/components/mqtt/mqtt_client.h
index bcb44ab4c2..454316aa87 100644
--- a/esphome/components/mqtt/mqtt_client.h
+++ b/esphome/components/mqtt/mqtt_client.h
@@ -146,6 +146,8 @@ class MQTTClientComponent : public Component {
 #endif
 #ifdef USE_ESP32
   void set_ca_certificate(const char *cert) { this->mqtt_backend_.set_ca_certificate(cert); }
+  void set_cl_certificate(const char *cert) { this->mqtt_backend_.set_cl_certificate(cert); }
+  void set_cl_key(const char *key) { this->mqtt_backend_.set_cl_key(key); }
   void set_skip_cert_cn_check(bool skip_check) { this->mqtt_backend_.set_skip_cert_cn_check(skip_check); }
 #endif
   const Availability &get_availability();
diff --git a/esphome/const.py b/esphome/const.py
index c35adc74ee..a95d1d5ac3 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -112,6 +112,8 @@ CONF_CHANNELS = "channels"
 CONF_CHARACTERISTIC_UUID = "characteristic_uuid"
 CONF_CHIPSET = "chipset"
 CONF_CLEAR_IMPEDANCE = "clear_impedance"
+CONF_CLIENT_CERTIFICATE = "client_certificate"
+CONF_CLIENT_CERTIFICATE_KEY = "client_certificate_key"
 CONF_CLIENT_ID = "client_id"
 CONF_CLK_PIN = "clk_pin"
 CONF_CLOCK_PIN = "clock_pin"

From 39bd829236a5dca57f3fc21caf8847b4af89a9c8 Mon Sep 17 00:00:00 2001
From: mathieu-mp <mathieu-mp@users.noreply.github.com>
Date: Thu, 18 Jan 2024 00:40:30 +0100
Subject: [PATCH 49/68] Fix color observation for triangle outline in display
 component (#6107)

---
 esphome/components/display/display.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/components/display/display.cpp b/esphome/components/display/display.cpp
index 0c3631342e..e531c5cf5c 100644
--- a/esphome/components/display/display.cpp
+++ b/esphome/components/display/display.cpp
@@ -142,9 +142,9 @@ void Display::filled_circle(int center_x, int center_y, int radius, Color color)
   } while (dx <= 0);
 }
 void HOT Display::triangle(int x1, int y1, int x2, int y2, int x3, int y3, Color color) {
-  this->line(x1, y1, x2, y2);
-  this->line(x1, y1, x3, y3);
-  this->line(x2, y2, x3, y3);
+  this->line(x1, y1, x2, y2, color);
+  this->line(x1, y1, x3, y3, color);
+  this->line(x2, y2, x3, y3, color);
 }
 void Display::sort_triangle_points_by_y_(int *x1, int *y1, int *x2, int *y2, int *x3, int *y3) {
   if (*y1 > *y2) {

From c9c8d397784ac9f47d64cb15ed46ff9d82ad21f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Leforestier?=
 <Benichou34@users.noreply.github.com>
Date: Thu, 18 Jan 2024 01:56:56 +0100
Subject: [PATCH 50/68] Add support of Honeywell HumidIcon (I2C HIH series)
 Temperature & Humidity sensor (#5730)

---
 CODEOWNERS                                    |  1 +
 .../components/honeywell_hih_i2c/__init__.py  |  2 +
 .../honeywell_hih_i2c/honeywell_hih.cpp       | 97 +++++++++++++++++++
 .../honeywell_hih_i2c/honeywell_hih.h         | 34 +++++++
 .../components/honeywell_hih_i2c/sensor.py    | 56 +++++++++++
 tests/test1.yaml                              |  7 ++
 6 files changed, 197 insertions(+)
 create mode 100644 esphome/components/honeywell_hih_i2c/__init__.py
 create mode 100644 esphome/components/honeywell_hih_i2c/honeywell_hih.cpp
 create mode 100644 esphome/components/honeywell_hih_i2c/honeywell_hih.h
 create mode 100644 esphome/components/honeywell_hih_i2c/sensor.py

diff --git a/CODEOWNERS b/CODEOWNERS
index fea1e6215c..7e87679ad8 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -137,6 +137,7 @@ esphome/components/heatpumpir/* @rob-deutsch
 esphome/components/hitachi_ac424/* @sourabhjaiswal
 esphome/components/hm3301/* @freekode
 esphome/components/homeassistant/* @OttoWinter
+esphome/components/honeywell_hih_i2c/* @Benichou34
 esphome/components/honeywellabp/* @RubyBailey
 esphome/components/honeywellabp2_i2c/* @jpfaff
 esphome/components/host/* @esphome/core
diff --git a/esphome/components/honeywell_hih_i2c/__init__.py b/esphome/components/honeywell_hih_i2c/__init__.py
new file mode 100644
index 0000000000..fbf67230f7
--- /dev/null
+++ b/esphome/components/honeywell_hih_i2c/__init__.py
@@ -0,0 +1,2 @@
+"""Support for Honeywell HumidIcon HIH"""
+CODEOWNERS = ["@Benichou34"]
diff --git a/esphome/components/honeywell_hih_i2c/honeywell_hih.cpp b/esphome/components/honeywell_hih_i2c/honeywell_hih.cpp
new file mode 100644
index 0000000000..64d5ddb541
--- /dev/null
+++ b/esphome/components/honeywell_hih_i2c/honeywell_hih.cpp
@@ -0,0 +1,97 @@
+// Honeywell HumidIcon I2C Sensors
+// https://prod-edam.honeywell.com/content/dam/honeywell-edam/sps/siot/en-us/products/sensors/humidity-with-temperature-sensors/common/documents/sps-siot-i2c-comms-humidicon-tn-009061-2-en-ciid-142171.pdf
+//
+
+#include "honeywell_hih.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace honeywell_hih_i2c {
+
+static const char *const TAG = "honeywell_hih.i2c";
+
+static const uint8_t REQUEST_CMD[1] = {0x00};  // Measurement Request Format
+static const uint16_t MAX_COUNT = 0x3FFE;      // 2^14 - 2
+
+void HoneywellHIComponent::read_sensor_data_() {
+  uint8_t data[4];
+
+  if (this->read(data, sizeof(data)) != i2c::ERROR_OK) {
+    ESP_LOGE(TAG, "Communication with Honeywell HIH failed!");
+    this->mark_failed();
+    return;
+  }
+
+  const uint16_t raw_humidity = (static_cast<uint16_t>(data[0] & 0x3F) << 8) | data[1];
+  float humidity = (static_cast<float>(raw_humidity) / MAX_COUNT) * 100;
+
+  const uint16_t raw_temperature = (static_cast<uint16_t>(data[2]) << 6) | (data[3] >> 2);
+  float temperature = (static_cast<float>(raw_temperature) / MAX_COUNT) * 165 - 40;
+
+  ESP_LOGD(TAG, "Got temperature=%.2f°C humidity=%.2f%%", temperature, humidity);
+  if (this->temperature_sensor_ != nullptr)
+    this->temperature_sensor_->publish_state(temperature);
+  if (this->humidity_sensor_ != nullptr)
+    this->humidity_sensor_->publish_state(humidity);
+}
+
+void HoneywellHIComponent::start_measurement_() {
+  if (this->write(REQUEST_CMD, sizeof(REQUEST_CMD)) != i2c::ERROR_OK) {
+    ESP_LOGE(TAG, "Communication with Honeywell HIH failed!");
+    this->mark_failed();
+    return;
+  }
+
+  this->measurement_running_ = true;
+}
+
+bool HoneywellHIComponent::is_measurement_ready_() {
+  uint8_t data[1];
+
+  if (this->read(data, sizeof(data)) != i2c::ERROR_OK) {
+    ESP_LOGE(TAG, "Communication with Honeywell HIH failed!");
+    this->mark_failed();
+    return false;
+  }
+
+  // Check status bits
+  return ((data[0] & 0xC0) == 0x00);
+}
+
+void HoneywellHIComponent::measurement_timeout_() {
+  ESP_LOGE(TAG, "Honeywell HIH Timeout!");
+  this->measurement_running_ = false;
+  this->mark_failed();
+}
+
+void HoneywellHIComponent::update() {
+  ESP_LOGV(TAG, "Update Honeywell HIH Sensor");
+
+  this->start_measurement_();
+  // The measurement cycle duration is typically 36.65 ms for temperature and humidity readings.
+  this->set_timeout("meas_timeout", 100, [this] { this->measurement_timeout_(); });
+}
+
+void HoneywellHIComponent::loop() {
+  if (this->measurement_running_ && this->is_measurement_ready_()) {
+    this->measurement_running_ = false;
+    this->cancel_timeout("meas_timeout");
+    this->read_sensor_data_();
+  }
+}
+
+void HoneywellHIComponent::dump_config() {
+  ESP_LOGD(TAG, "Honeywell HIH:");
+  LOG_I2C_DEVICE(this);
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, "Communication with Honeywell HIH failed!");
+  }
+  LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
+  LOG_SENSOR("  ", "Humidity", this->humidity_sensor_);
+  LOG_UPDATE_INTERVAL(this);
+}
+
+float HoneywellHIComponent::get_setup_priority() const { return setup_priority::DATA; }
+
+}  // namespace honeywell_hih_i2c
+}  // namespace esphome
diff --git a/esphome/components/honeywell_hih_i2c/honeywell_hih.h b/esphome/components/honeywell_hih_i2c/honeywell_hih.h
new file mode 100644
index 0000000000..4457eab1da
--- /dev/null
+++ b/esphome/components/honeywell_hih_i2c/honeywell_hih.h
@@ -0,0 +1,34 @@
+// Honeywell HumidIcon I2C Sensors
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace honeywell_hih_i2c {
+
+class HoneywellHIComponent : public PollingComponent, public i2c::I2CDevice {
+ public:
+  void dump_config() override;
+  float get_setup_priority() const override;
+  void loop() override;
+  void update() override;
+
+  void set_temperature_sensor(sensor::Sensor *temperature_sensor) { this->temperature_sensor_ = temperature_sensor; }
+  void set_humidity_sensor(sensor::Sensor *humidity_sensor) { this->humidity_sensor_ = humidity_sensor; }
+
+ protected:
+  bool measurement_running_{false};
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
+
+ private:
+  void read_sensor_data_();
+  void start_measurement_();
+  bool is_measurement_ready_();
+  void measurement_timeout_();
+};
+
+}  // namespace honeywell_hih_i2c
+}  // namespace esphome
diff --git a/esphome/components/honeywell_hih_i2c/sensor.py b/esphome/components/honeywell_hih_i2c/sensor.py
new file mode 100644
index 0000000000..f5a6ad2398
--- /dev/null
+++ b/esphome/components/honeywell_hih_i2c/sensor.py
@@ -0,0 +1,56 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import (
+    CONF_HUMIDITY,
+    CONF_ID,
+    CONF_TEMPERATURE,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_CELSIUS,
+    UNIT_PERCENT,
+    DEVICE_CLASS_TEMPERATURE,
+    DEVICE_CLASS_HUMIDITY,
+)
+
+DEPENDENCIES = ["i2c"]
+
+honeywell_hih_ns = cg.esphome_ns.namespace("honeywell_hih_i2c")
+HONEYWELLHIComponent = honeywell_hih_ns.class_(
+    "HoneywellHIComponent", cg.PollingComponent, i2c.I2CDevice
+)
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(HONEYWELLHIComponent),
+            cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
+                unit_of_measurement=UNIT_CELSIUS,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_TEMPERATURE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(
+                unit_of_measurement=UNIT_PERCENT,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_HUMIDITY,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+    .extend(i2c.i2c_device_schema(0x27))
+)
+
+
+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)
+
+    if temperature_config := config.get(CONF_TEMPERATURE):
+        sens = await sensor.new_sensor(temperature_config)
+        cg.add(var.set_temperature_sensor(sens))
+
+    if humidity_config := config.get(CONF_HUMIDITY):
+        sens = await sensor.new_sensor(humidity_config)
+        cg.add(var.set_humidity_sensor(sens))
diff --git a/tests/test1.yaml b/tests/test1.yaml
index afd199d264..038ac9c738 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -863,6 +863,13 @@ sensor:
     oversampling: 8x
     update_interval: 15s
     i2c_id: i2c_bus
+  - platform: honeywell_hih_i2c
+    temperature:
+      name: Living Room Temperature 7
+    humidity:
+      name: Living Room Humidity 7
+    update_interval: 15s
+    i2c_id: i2c_bus
   - platform: honeywellabp
     pressure:
       name: Honeywell pressure

From c6f528583b2b527a4b9a91533d7aacf838c0a984 Mon Sep 17 00:00:00 2001
From: Fabian <Fabian-Schmidt@users.noreply.github.com>
Date: Thu, 18 Jan 2024 08:13:40 +0100
Subject: [PATCH 51/68] Proposal: Test yaml for each component (#5398)

* Test for each component.

* When possible use commandline substitution.

* Add wildcard support.

* end file with new line.

* Move component tests into subfolder.

* Add component test to pipeline.

* Remove trailing whitespace.

* add restore python step.

* Add `. venv/bin/activate` to pipeline.

* step `changed-components` needs `common` step.

* start `list-components-changed.py` different.

* iterate on pipeline stage `list-components`.

* Update `checkout` action.

* Rename test folder from `tests` to `_test`.

* validate file exists.

* Move component test folder.

* extend list-components to include child components.

* File does not end with a newline

* Handle empty list-components matrix.

* list-components also check for changes in tests folder.

* Improve `list-components.py`.

* `*` is a forbidden character for filenames on windows.

---------

Co-authored-by: Your Name <you@example.com>
Co-authored-by: Keith Burzinski <kbx81x@gmail.com>
---
 .github/workflows/ci.yml                      |  57 +++++++
 script/fulltest                               |   1 +
 script/list-components.py                     | 153 ++++++++++++++++++
 script/test_build_components                  |  85 ++++++++++
 tests/components/adc/test.esp32-c3.yaml       |   5 +
 tests/components/adc/test.esp32-idf.yaml      |  11 ++
 tests/components/adc/test.esp32-s2.yaml       |   5 +
 tests/components/adc/test.esp32-s3.yaml       |   5 +
 tests/components/adc/test.esp32.yaml          |  11 ++
 tests/components/adc/test.esp8266.yaml        |   4 +
 tests/components/adc/test.rp2040.yaml         |   4 +
 .../mopeka_std_check/test.esp32.yaml          |  16 ++
 tests/components/template/test.all.yaml       | 127 +++++++++++++++
 .../build_components_base.esp32-ard.yaml      |  20 +++
 .../build_components_base.esp32-c3-ard.yaml   |  20 +++
 .../build_components_base.esp32-c3-idf.yaml   |  20 +++
 .../build_components_base.esp32-idf.yaml      |  20 +++
 .../build_components_base.esp32-s2-ard.yaml   |  21 +++
 .../build_components_base.esp32-s2-idf.yaml   |  21 +++
 .../build_components_base.esp32-s3-ard.yaml   |  21 +++
 .../build_components_base.esp32-s3-idf.yaml   |  21 +++
 .../build_components_base.esp8266.yaml        |  18 +++
 .../build_components_base.rp2040.yaml         |  21 +++
 23 files changed, 687 insertions(+)
 create mode 100755 script/list-components.py
 create mode 100755 script/test_build_components
 create mode 100644 tests/components/adc/test.esp32-c3.yaml
 create mode 100644 tests/components/adc/test.esp32-idf.yaml
 create mode 100644 tests/components/adc/test.esp32-s2.yaml
 create mode 100644 tests/components/adc/test.esp32-s3.yaml
 create mode 100644 tests/components/adc/test.esp32.yaml
 create mode 100644 tests/components/adc/test.esp8266.yaml
 create mode 100644 tests/components/adc/test.rp2040.yaml
 create mode 100644 tests/components/mopeka_std_check/test.esp32.yaml
 create mode 100644 tests/components/template/test.all.yaml
 create mode 100644 tests/test_build_components/build_components_base.esp32-ard.yaml
 create mode 100644 tests/test_build_components/build_components_base.esp32-c3-ard.yaml
 create mode 100644 tests/test_build_components/build_components_base.esp32-c3-idf.yaml
 create mode 100644 tests/test_build_components/build_components_base.esp32-idf.yaml
 create mode 100644 tests/test_build_components/build_components_base.esp32-s2-ard.yaml
 create mode 100644 tests/test_build_components/build_components_base.esp32-s2-idf.yaml
 create mode 100644 tests/test_build_components/build_components_base.esp32-s3-ard.yaml
 create mode 100644 tests/test_build_components/build_components_base.esp32-s3-idf.yaml
 create mode 100644 tests/test_build_components/build_components_base.esp8266.yaml
 create mode 100644 tests/test_build_components/build_components_base.rp2040.yaml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1ddc49b504..2187573709 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -392,6 +392,62 @@ jobs:
         # yamllint disable-line rule:line-length
         if: always()
 
+  list-components:
+    runs-on: ubuntu-latest
+    needs:
+      - common
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v4.1.1
+        with:
+          # Fetch enough history so `git merge-base refs/remotes/origin/dev HEAD` works.
+          fetch-depth: 500
+      - name: Fetch dev branch
+        run: |
+          git -c protocol.version=2 fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +refs/heads/dev*:refs/remotes/origin/dev* +refs/tags/dev*:refs/tags/dev*
+          git merge-base refs/remotes/origin/dev HEAD
+      - name: Restore Python
+        uses: ./.github/actions/restore-python
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+          cache-key: ${{ needs.common.outputs.cache-key }}
+      - name: Find changed components
+        id: set-matrix
+        run: |
+          . venv/bin/activate
+          echo "matrix=$(script/list-components.py --changed | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
+
+  test-build-components:
+    name: Component test ${{ matrix.file }}
+    runs-on: ubuntu-latest
+    needs:
+      - common
+      - list-components
+    if: ${{ needs.list-components.outputs.matrix != '[]' && needs.list-components.outputs.matrix != '' }}
+    strategy:
+      fail-fast: false
+      max-parallel: 2
+      matrix:
+        file: ${{ fromJson(needs.list-components.outputs.matrix) }}
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v4.1.1
+      - name: Restore Python
+        uses: ./.github/actions/restore-python
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+          cache-key: ${{ needs.common.outputs.cache-key }}
+      - name: test_build_components -e config -c ${{ matrix.file }}
+        run: |
+          . venv/bin/activate
+          ./script/test_build_components -e config -c ${{ matrix.file }}
+      - name: test_build_components -e compile -c ${{ matrix.file }}
+        run: |
+          . venv/bin/activate
+          ./script/test_build_components -e compile -c ${{ matrix.file }}
+
   ci-status:
     name: CI Status
     runs-on: ubuntu-latest
@@ -406,6 +462,7 @@ jobs:
       - pyupgrade
       - compile-tests
       - clang-tidy
+      - test-build-components
     if: always()
     steps:
       - name: Success
diff --git a/script/fulltest b/script/fulltest
index a605beebfe..6440401e97 100755
--- a/script/fulltest
+++ b/script/fulltest
@@ -12,3 +12,4 @@ script/lint-cpp
 script/unit_test
 script/component_test
 script/test
+script/test_build_components
diff --git a/script/list-components.py b/script/list-components.py
new file mode 100755
index 0000000000..3e55c0e5f7
--- /dev/null
+++ b/script/list-components.py
@@ -0,0 +1,153 @@
+#!/usr/bin/env python3
+from pathlib import Path
+import sys
+import argparse
+
+from helpers import git_ls_files, changed_files
+from esphome.loader import get_component, get_platform
+from esphome.core import CORE
+from esphome.const import (
+    KEY_CORE,
+    KEY_TARGET_FRAMEWORK,
+    KEY_TARGET_PLATFORM,
+    PLATFORM_ESP32,
+    PLATFORM_ESP8266,
+)
+
+
+def filter_component_files(str):
+    return str.startswith("esphome/components/") | str.startswith("tests/components/")
+
+
+def extract_component_names_array_from_files_array(files):
+    components = []
+    for file in files:
+        file_parts = file.split("/")
+        if len(file_parts) >= 4:
+            component_name = file_parts[2]
+            if component_name not in components:
+                components.append(component_name)
+    return components
+
+
+def add_item_to_components_graph(components_graph, parent, child):
+    if not parent.startswith("__") and parent != child:
+        if parent not in components_graph:
+            components_graph[parent] = []
+        if child not in components_graph[parent]:
+            components_graph[parent].append(child)
+
+
+def create_components_graph():
+    # The root directory of the repo
+    root = Path(__file__).parent.parent
+    components_dir = root / "esphome" / "components"
+    # Fake some directory so that get_component works
+    CORE.config_path = str(root)
+    # Various configuration to capture different outcomes used by `AUTO_LOAD` function.
+    TARGET_CONFIGURATIONS = [
+        {KEY_TARGET_FRAMEWORK: None, KEY_TARGET_PLATFORM: None},
+        {KEY_TARGET_FRAMEWORK: "arduino", KEY_TARGET_PLATFORM: None},
+        {KEY_TARGET_FRAMEWORK: "esp-idf", KEY_TARGET_PLATFORM: None},
+        {KEY_TARGET_FRAMEWORK: None, KEY_TARGET_PLATFORM: PLATFORM_ESP32},
+    ]
+    CORE.data[KEY_CORE] = TARGET_CONFIGURATIONS[0]
+
+    components_graph = {}
+
+    for path in components_dir.iterdir():
+        if not path.is_dir():
+            continue
+        if not (path / "__init__.py").is_file():
+            continue
+        name = path.name
+        comp = get_component(name)
+        if comp is None:
+            print(
+                f"Cannot find component {name}. Make sure current path is pip installed ESPHome"
+            )
+            sys.exit(1)
+
+        for dependency in comp.dependencies:
+            add_item_to_components_graph(components_graph, dependency, name)
+
+        for target_config in TARGET_CONFIGURATIONS:
+            CORE.data[KEY_CORE] = target_config
+            for auto_load in comp.auto_load:
+                add_item_to_components_graph(components_graph, auto_load, name)
+        # restore config
+        CORE.data[KEY_CORE] = TARGET_CONFIGURATIONS[0]
+
+        for platform_path in path.iterdir():
+            platform_name = platform_path.stem
+            platform = get_platform(platform_name, name)
+            if platform is None:
+                continue
+
+            add_item_to_components_graph(components_graph, platform_name, name)
+
+            for dependency in platform.dependencies:
+                add_item_to_components_graph(components_graph, dependency, name)
+
+            for target_config in TARGET_CONFIGURATIONS:
+                CORE.data[KEY_CORE] = target_config
+                for auto_load in platform.auto_load:
+                    add_item_to_components_graph(components_graph, auto_load, name)
+            # restore config
+            CORE.data[KEY_CORE] = TARGET_CONFIGURATIONS[0]
+
+    return components_graph
+
+
+def find_children_of_component(components_graph, component_name, depth=0):
+    if component_name not in components_graph:
+        return []
+
+    children = []
+
+    for child in components_graph[component_name]:
+        children.append(child)
+        if depth < 10:
+            children.extend(
+                find_children_of_component(components_graph, child, depth + 1)
+            )
+    # Remove duplicate values
+    return list(set(children))
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "-c", "--changed", action="store_true", help="Only run on changed files"
+    )
+    args = parser.parse_args()
+
+    files = git_ls_files()
+    files = filter(filter_component_files, files)
+
+    if args.changed:
+        changed = changed_files()
+        files = [f for f in files if f in changed]
+
+    components = extract_component_names_array_from_files_array(files)
+
+    if args.changed:
+        components_graph = create_components_graph()
+
+        all_changed_components = components.copy()
+        for c in components:
+            all_changed_components.extend(
+                find_children_of_component(components_graph, c)
+            )
+        # Remove duplicate values
+        all_changed_components = list(set(all_changed_components))
+
+        for c in sorted(all_changed_components):
+            print(c)
+    else:
+        for c in sorted(components):
+            print(c)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/script/test_build_components b/script/test_build_components
new file mode 100755
index 0000000000..f951ba7545
--- /dev/null
+++ b/script/test_build_components
@@ -0,0 +1,85 @@
+#!/usr/bin/env bash
+
+set -e
+
+# Parse parameter:
+# - `e` - Parameter for `esphome` command. Default `compile`. Common alternative is `config`.
+# - `c` - Component folder name to test. Default `*`.
+esphome_command="compile"
+target_component="*"
+while getopts e:c: flag
+do
+    case $flag in
+        e) esphome_command=${OPTARG};;
+        c) target_component=${OPTARG};;
+        \?) echo "Usage: $0 [-e <config|compile|clean>] [-c <string>]" 1>&2; exit 1;;
+    esac
+done
+
+cd "$(dirname "$0")/.."
+
+if ! [ -d "./tests/test_build_components/build" ]; then
+  mkdir ./tests/test_build_components/build
+fi
+
+start_esphome() {
+  # create dynamic yaml file in `build` folder.
+  # `./tests/test_build_components/build/[target_component].[test_name].[target_platform].yaml`
+  component_test_file="./tests/test_build_components/build/$target_component.$test_name.$target_platform.yaml"
+
+  cp $target_platform_file $component_test_file
+  sed -i "s!\$component_test_file!../../.$f!g" $component_test_file
+
+  # Start esphome process
+  echo "> [$target_component] [$test_name] [$target_platform]"
+  echo "esphome -s component_name $target_component -s test_name $test_name -s target_platform $target_platform $esphome_command $component_test_file"
+  # TODO: Validate escape of Command line substitution value
+  esphome -s component_name $target_component -s test_name $test_name -s target_platform $target_platform $esphome_command $component_test_file
+}
+
+# Find all test yaml files.
+# - `./tests/components/[target_component]/[test_name].[target_platform].yaml`
+# - `./tests/components/[target_component]/[test_name].all.yaml`
+for f in ./tests/components/$target_component/*.*.yaml; do
+  [ -f "$f" ] || continue
+  IFS='/' read -r -a folder_name <<< "$f"
+  target_component="${folder_name[3]}"
+
+  IFS='.' read -r -a file_name <<< "${folder_name[4]}"
+  test_name="${file_name[0]}"
+  target_platform="${file_name[1]}"
+  file_name_parts=${#file_name[@]}
+
+  if [ "$target_platform" = "all" ] || [ $file_name_parts = 2 ]; then
+    # Test has *not* defined a specific target platform. Need to run tests for all possible target platforms.
+    
+    for target_platform_file in ./tests/test_build_components/build_components_base.*.yaml; do
+      IFS='/' read -r -a folder_name <<< "$target_platform_file"
+      IFS='.' read -r -a file_name <<< "${folder_name[3]}"
+      target_platform="${file_name[1]}"
+
+      start_esphome
+    done
+
+  else
+    # Test has defined a specific target platform.
+  
+    # Validate we have a base test yaml for selected platform.
+    # The target_platform is sourced from the following location.
+    # 1. `./tests/test_build_components/build_components_base.[target_platform].yaml`
+    # 2. `./tests/test_build_components/build_components_base.[target_platform]-ard.yaml`
+    target_platform_file="./tests/test_build_components/build_components_base.$target_platform.yaml"
+    if ! [ -f "$target_platform_file" ]; then
+      # Try find arduino test framework as platform.
+      target_platform_ard="$target_platform-ard"
+      target_platform_file="./tests/test_build_components/build_components_base.$target_platform_ard.yaml"
+      if ! [ -f "$target_platform_file" ]; then
+        echo "No base test file [./tests/test_build_components/build_components_base.$target_platform.yaml, ./tests/build_components_base.$target_platform_ard.yaml] for component test [$f] found."
+        exit 1
+      fi
+      target_platform=$target_platform_ard
+    fi
+
+    start_esphome
+  fi
+done
diff --git a/tests/components/adc/test.esp32-c3.yaml b/tests/components/adc/test.esp32-c3.yaml
new file mode 100644
index 0000000000..18e5ab3561
--- /dev/null
+++ b/tests/components/adc/test.esp32-c3.yaml
@@ -0,0 +1,5 @@
+sensor:
+  - platform: adc
+    id: my_sensor
+    pin: 4
+    attenuation: 11db
diff --git a/tests/components/adc/test.esp32-idf.yaml b/tests/components/adc/test.esp32-idf.yaml
new file mode 100644
index 0000000000..923fd0d706
--- /dev/null
+++ b/tests/components/adc/test.esp32-idf.yaml
@@ -0,0 +1,11 @@
+sensor:
+  - platform: adc
+    pin: A0
+    name: Living Room Brightness
+    update_interval: "1:01"
+    attenuation: 2.5db
+    unit_of_measurement: "°C"
+    icon: "mdi:water-percent"
+    accuracy_decimals: 5
+    setup_priority: -100
+    force_update: true
diff --git a/tests/components/adc/test.esp32-s2.yaml b/tests/components/adc/test.esp32-s2.yaml
new file mode 100644
index 0000000000..0119ad5e4d
--- /dev/null
+++ b/tests/components/adc/test.esp32-s2.yaml
@@ -0,0 +1,5 @@
+sensor:
+  - platform: adc
+    id: my_sensor
+    pin: 1
+    attenuation: 11db
diff --git a/tests/components/adc/test.esp32-s3.yaml b/tests/components/adc/test.esp32-s3.yaml
new file mode 100644
index 0000000000..0119ad5e4d
--- /dev/null
+++ b/tests/components/adc/test.esp32-s3.yaml
@@ -0,0 +1,5 @@
+sensor:
+  - platform: adc
+    id: my_sensor
+    pin: 1
+    attenuation: 11db
diff --git a/tests/components/adc/test.esp32.yaml b/tests/components/adc/test.esp32.yaml
new file mode 100644
index 0000000000..923fd0d706
--- /dev/null
+++ b/tests/components/adc/test.esp32.yaml
@@ -0,0 +1,11 @@
+sensor:
+  - platform: adc
+    pin: A0
+    name: Living Room Brightness
+    update_interval: "1:01"
+    attenuation: 2.5db
+    unit_of_measurement: "°C"
+    icon: "mdi:water-percent"
+    accuracy_decimals: 5
+    setup_priority: -100
+    force_update: true
diff --git a/tests/components/adc/test.esp8266.yaml b/tests/components/adc/test.esp8266.yaml
new file mode 100644
index 0000000000..1ef79c7ca1
--- /dev/null
+++ b/tests/components/adc/test.esp8266.yaml
@@ -0,0 +1,4 @@
+sensor:
+  - platform: adc
+    id: my_sensor
+    pin: VCC
diff --git a/tests/components/adc/test.rp2040.yaml b/tests/components/adc/test.rp2040.yaml
new file mode 100644
index 0000000000..200b802a4d
--- /dev/null
+++ b/tests/components/adc/test.rp2040.yaml
@@ -0,0 +1,4 @@
+sensor:
+  - platform: adc
+    pin: VCC
+    name: VSYS
diff --git a/tests/components/mopeka_std_check/test.esp32.yaml b/tests/components/mopeka_std_check/test.esp32.yaml
new file mode 100644
index 0000000000..830adf952f
--- /dev/null
+++ b/tests/components/mopeka_std_check/test.esp32.yaml
@@ -0,0 +1,16 @@
+esp32_ble_tracker:
+
+sensor:
+  # Example using 11kg 100% propane tank.
+  - platform: mopeka_std_check
+    mac_address: D3:75:F2:DC:16:91
+    tank_type: Europe_11kg
+    temperature:
+        name: "Propane test temp"
+    level:
+        name: "Propane test level"
+    distance:
+        name: "Propane test distance"
+    battery_level:
+        name: "Propane test battery level"
+
diff --git a/tests/components/template/test.all.yaml b/tests/components/template/test.all.yaml
new file mode 100644
index 0000000000..ad67b4e6ae
--- /dev/null
+++ b/tests/components/template/test.all.yaml
@@ -0,0 +1,127 @@
+sensor:
+  - platform: template
+    name: "Template Sensor"
+    id: template_sens
+    lambda: |-
+      if (id(some_binary_sensor).state) {
+        return 42.0;
+      } else {
+        return 0.0;
+      }
+    update_interval: 60s
+
+esphome:
+  on_boot:
+    - sensor.template.publish:
+        id: template_sens
+        state: 42.0
+
+    # Templated
+    - sensor.template.publish:
+        id: template_sens
+        state: !lambda 'return 42.0;'
+
+binary_sensor:
+  - platform: template
+    id: some_binary_sensor
+    name: "Garage Door Open"
+    lambda: |-
+      if (id(template_sens).state > 30) {
+        // Garage Door is open.
+        return true;
+      } else {
+        // Garage Door is closed.
+        return false;
+      }
+
+output:
+  - platform: template
+    id: outputsplit
+    type: float
+    write_action:
+      - logger.log: "write_action"
+
+switch:
+  - platform: template
+    name: "Template Switch"
+    lambda: |-
+      if (id(some_binary_sensor).state) {
+        return true;
+      } else {
+        return false;
+      }
+    turn_on_action:
+      - logger.log: "turn_on_action"
+    turn_off_action:
+      - logger.log: "turn_off_action"
+
+button:
+  - platform: template
+    name: "Template Button"
+    on_press:
+      - logger.log: Button Pressed
+
+cover:
+  - platform: template
+    name: "Template Cover"
+    lambda: |-
+      if (id(some_binary_sensor).state) {
+        return COVER_OPEN;
+      } else {
+        return COVER_CLOSED;
+      }
+    open_action:
+      - logger.log: open_action
+    close_action:
+      - logger.log: close_action
+    stop_action:
+      - logger.log: stop_action
+    optimistic: true
+
+number:
+  - platform: template
+    name: "Template number"
+    optimistic: true
+    min_value: 0
+    max_value: 100
+    step: 1
+
+select:
+  - platform: template
+    name: "Template select"
+    optimistic: true
+    options:
+      - one
+      - two
+      - three
+    initial_option: two
+
+lock:
+  - platform: template
+    name: "Template Lock"
+    lambda: |-
+      if (id(some_binary_sensor).state) {
+        return LOCK_STATE_LOCKED;
+      } else {
+        return LOCK_STATE_UNLOCKED;
+      }
+    lock_action:
+      - logger.log: lock_action
+    unlock_action:
+      - logger.log: unlock_action
+    open_action:
+      - logger.log: open_action
+
+text:
+  - platform: template
+    name: "Template text"
+    optimistic: true
+    min_length: 0
+    max_length: 100
+    mode: text
+
+alarm_control_panel:
+  - platform: template
+    name: Alarm Panel
+    codes:
+      - "1234"
diff --git a/tests/test_build_components/build_components_base.esp32-ard.yaml b/tests/test_build_components/build_components_base.esp32-ard.yaml
new file mode 100644
index 0000000000..f460c57298
--- /dev/null
+++ b/tests/test_build_components/build_components_base.esp32-ard.yaml
@@ -0,0 +1,20 @@
+esphome:
+  name: componenttestesp32ard
+  friendly_name: $component_name
+
+esp32:
+  board: nodemcu-32s
+  framework:
+    type: arduino
+
+logger:
+  level: VERY_VERBOSE
+
+packages:
+  component_under_test: !include
+    file: $component_test_file
+    vars:
+      component_name: $component_name
+      test_name: $test_name
+      target_platform: $target_platform
+      component_test_file: $component_test_file
diff --git a/tests/test_build_components/build_components_base.esp32-c3-ard.yaml b/tests/test_build_components/build_components_base.esp32-c3-ard.yaml
new file mode 100644
index 0000000000..8a52e0c916
--- /dev/null
+++ b/tests/test_build_components/build_components_base.esp32-c3-ard.yaml
@@ -0,0 +1,20 @@
+esphome:
+  name: componenttestesp32c3ard
+  friendly_name: $component_name
+
+esp32:
+  board: lolin_c3_mini
+  framework:
+    type: arduino
+
+logger:
+  level: VERY_VERBOSE
+
+packages:
+  component_under_test: !include
+    file: $component_test_file
+    vars:
+      component_name: $component_name
+      test_name: $test_name
+      target_platform: $target_platform
+      component_test_file: $component_test_file
diff --git a/tests/test_build_components/build_components_base.esp32-c3-idf.yaml b/tests/test_build_components/build_components_base.esp32-c3-idf.yaml
new file mode 100644
index 0000000000..6b4b61fe58
--- /dev/null
+++ b/tests/test_build_components/build_components_base.esp32-c3-idf.yaml
@@ -0,0 +1,20 @@
+esphome:
+  name: componenttestesp32c3idf
+  friendly_name: $component_name
+
+esp32:
+  board: lolin_c3_mini
+  framework:
+    type: esp-idf
+
+logger:
+  level: VERY_VERBOSE
+
+packages:
+  component_under_test: !include
+    file: $component_test_file
+    vars:
+      component_name: $component_name
+      test_name: $test_name
+      target_platform: $target_platform
+      component_test_file: $component_test_file
diff --git a/tests/test_build_components/build_components_base.esp32-idf.yaml b/tests/test_build_components/build_components_base.esp32-idf.yaml
new file mode 100644
index 0000000000..ab1bda2a19
--- /dev/null
+++ b/tests/test_build_components/build_components_base.esp32-idf.yaml
@@ -0,0 +1,20 @@
+esphome:
+  name: componenttestesp32idf
+  friendly_name: $component_name
+
+esp32:
+  board: nodemcu-32s
+  framework:
+    type: esp-idf
+
+logger:
+  level: VERY_VERBOSE
+
+packages:
+  component_under_test: !include
+    file: $component_test_file
+    vars:
+      component_name: $component_name
+      test_name: $test_name
+      target_platform: $target_platform
+      component_test_file: $component_test_file
diff --git a/tests/test_build_components/build_components_base.esp32-s2-ard.yaml b/tests/test_build_components/build_components_base.esp32-s2-ard.yaml
new file mode 100644
index 0000000000..ffb912d3d9
--- /dev/null
+++ b/tests/test_build_components/build_components_base.esp32-s2-ard.yaml
@@ -0,0 +1,21 @@
+esphome:
+  name: componenttestesp32s2ard
+  friendly_name: $component_name
+
+esp32:
+  board: esp32-s2-saola-1
+  variant: ESP32S2
+  framework:
+    type: arduino
+
+logger:
+  level: VERY_VERBOSE
+
+packages:
+  component_under_test: !include
+    file: $component_test_file
+    vars:
+      component_name: $component_name
+      test_name: $test_name
+      target_platform: $target_platform
+      component_test_file: $component_test_file
diff --git a/tests/test_build_components/build_components_base.esp32-s2-idf.yaml b/tests/test_build_components/build_components_base.esp32-s2-idf.yaml
new file mode 100644
index 0000000000..4d1378b2b2
--- /dev/null
+++ b/tests/test_build_components/build_components_base.esp32-s2-idf.yaml
@@ -0,0 +1,21 @@
+esphome:
+  name: componenttestesp32s2ard
+  friendly_name: $component_name
+
+esp32:
+  board: esp32-s2-saola-1
+  variant: ESP32S2
+  framework:
+    type: esp-idf
+
+logger:
+  level: VERY_VERBOSE
+
+packages:
+  component_under_test: !include
+    file: $component_test_file
+    vars:
+      component_name: $component_name
+      test_name: $test_name
+      target_platform: $target_platform
+      component_test_file: $component_test_file
diff --git a/tests/test_build_components/build_components_base.esp32-s3-ard.yaml b/tests/test_build_components/build_components_base.esp32-s3-ard.yaml
new file mode 100644
index 0000000000..c850c9665f
--- /dev/null
+++ b/tests/test_build_components/build_components_base.esp32-s3-ard.yaml
@@ -0,0 +1,21 @@
+esphome:
+  name: componenttestesp32s3ard
+  friendly_name: $component_name
+
+esp32:
+  board: esp32s3box
+  variant: ESP32S3
+  framework:
+    type: arduino
+
+logger:
+  level: VERY_VERBOSE
+
+packages:
+  component_under_test: !include
+    file: $component_test_file
+    vars:
+      component_name: $component_name
+      test_name: $test_name
+      target_platform: $target_platform
+      component_test_file: $component_test_file
diff --git a/tests/test_build_components/build_components_base.esp32-s3-idf.yaml b/tests/test_build_components/build_components_base.esp32-s3-idf.yaml
new file mode 100644
index 0000000000..a43a2a6736
--- /dev/null
+++ b/tests/test_build_components/build_components_base.esp32-s3-idf.yaml
@@ -0,0 +1,21 @@
+esphome:
+  name: componenttestesp32s3ard
+  friendly_name: $component_name
+
+esp32:
+  board: esp32s3box
+  variant: ESP32S3
+  framework:
+    type: esp-idf
+
+logger:
+  level: VERY_VERBOSE
+
+packages:
+  component_under_test: !include
+    file: $component_test_file
+    vars:
+      component_name: $component_name
+      test_name: $test_name
+      target_platform: $target_platform
+      component_test_file: $component_test_file
diff --git a/tests/test_build_components/build_components_base.esp8266.yaml b/tests/test_build_components/build_components_base.esp8266.yaml
new file mode 100644
index 0000000000..d7bdc03659
--- /dev/null
+++ b/tests/test_build_components/build_components_base.esp8266.yaml
@@ -0,0 +1,18 @@
+esphome:
+  name: componenttestesp8266
+  friendly_name: $component_name
+
+esp8266:
+  board: d1_mini
+
+logger:
+  level: VERY_VERBOSE
+
+packages:
+  component_under_test: !include
+    file: $component_test_file
+    vars:
+      component_name: $component_name
+      test_name: $test_name
+      target_platform: $target_platform
+      component_test_file: $component_test_file
diff --git a/tests/test_build_components/build_components_base.rp2040.yaml b/tests/test_build_components/build_components_base.rp2040.yaml
new file mode 100644
index 0000000000..a02942ea35
--- /dev/null
+++ b/tests/test_build_components/build_components_base.rp2040.yaml
@@ -0,0 +1,21 @@
+esphome:
+  name: componenttestrp2040
+  friendly_name: $component_name
+
+rp2040:
+  board: rpipicow
+  framework:
+    # Waiting for https://github.com/platformio/platform-raspberrypi/pull/36
+    platform_version: https://github.com/maxgerhardt/platform-raspberrypi.git
+
+logger:
+  level: VERY_VERBOSE
+
+packages:
+  component_under_test: !include
+    file: $component_test_file
+    vars:
+      component_name: $component_name
+      test_name: $test_name
+      target_platform: $target_platform
+      component_test_file: $component_test_file

From e2f2feafdd912f5e249ccb1b47502e4201665cf2 Mon Sep 17 00:00:00 2001
From: Rene Guca <45061891+rguca@users.noreply.github.com>
Date: Thu, 18 Jan 2024 08:30:58 +0100
Subject: [PATCH 52/68] WiFi fast_connect: save/load BSSID and channel for
 faster connect from sleep (#5931)

---
 esphome/components/wifi/wifi_component.cpp | 38 ++++++++++++++++++++++
 esphome/components/wifi/wifi_component.h   |  9 +++++
 2 files changed, 47 insertions(+)

diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index 519489097a..05938d87a2 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -55,6 +55,9 @@ void WiFiComponent::start() {
   uint32_t hash = this->has_sta() ? fnv1_hash(App.get_compilation_time()) : 88491487UL;
 
   this->pref_ = global_preferences->make_preference<wifi::SavedWifiSettings>(hash, true);
+  if (this->fast_connect_) {
+    this->fast_connect_pref_ = global_preferences->make_preference<wifi::SavedWifiFastConnectSettings>(hash, false);
+  }
 
   SavedWifiSettings save{};
   if (this->pref_.load(&save)) {
@@ -78,6 +81,7 @@ void WiFiComponent::start() {
 
     if (this->fast_connect_) {
       this->selected_ap_ = this->sta_[0];
+      this->load_fast_connect_settings_();
       this->start_connecting(this->selected_ap_, false);
     } else {
       this->start_scanning();
@@ -604,6 +608,11 @@ void WiFiComponent::check_connecting_finished() {
 
     this->state_ = WIFI_COMPONENT_STATE_STA_CONNECTED;
     this->num_retried_ = 0;
+
+    if (this->fast_connect_) {
+      this->save_fast_connect_settings_();
+    }
+
     return;
   }
 
@@ -705,6 +714,35 @@ bool WiFiComponent::is_esp32_improv_active_() {
 #endif
 }
 
+void WiFiComponent::load_fast_connect_settings_() {
+  SavedWifiFastConnectSettings fast_connect_save{};
+
+  if (this->fast_connect_pref_.load(&fast_connect_save)) {
+    bssid_t bssid{};
+    std::copy(fast_connect_save.bssid, fast_connect_save.bssid + 6, bssid.begin());
+    this->selected_ap_.set_bssid(bssid);
+    this->selected_ap_.set_channel(fast_connect_save.channel);
+
+    ESP_LOGD(TAG, "Loaded saved fast_connect wifi settings");
+  }
+}
+
+void WiFiComponent::save_fast_connect_settings_() {
+  bssid_t bssid = wifi_bssid();
+  uint8_t channel = wifi_channel_();
+
+  if (bssid != this->selected_ap_.get_bssid() || channel != this->selected_ap_.get_channel()) {
+    SavedWifiFastConnectSettings fast_connect_save{};
+
+    memcpy(fast_connect_save.bssid, bssid.data(), 6);
+    fast_connect_save.channel = channel;
+
+    this->fast_connect_pref_.save(&fast_connect_save);
+
+    ESP_LOGD(TAG, "Saved fast_connect wifi settings");
+  }
+}
+
 void WiFiAP::set_ssid(const std::string &ssid) { this->ssid_ = ssid; }
 void WiFiAP::set_bssid(bssid_t bssid) { this->bssid_ = bssid; }
 void WiFiAP::set_bssid(optional<bssid_t> bssid) { this->bssid_ = bssid; }
diff --git a/esphome/components/wifi/wifi_component.h b/esphome/components/wifi/wifi_component.h
index 6cbdc51caf..be5095105c 100644
--- a/esphome/components/wifi/wifi_component.h
+++ b/esphome/components/wifi/wifi_component.h
@@ -48,6 +48,11 @@ struct SavedWifiSettings {
   char password[65];
 } PACKED;  // NOLINT
 
+struct SavedWifiFastConnectSettings {
+  uint8_t bssid[6];
+  uint8_t channel;
+} PACKED;  // NOLINT
+
 enum WiFiComponentState {
   /** Nothing has been initialized yet. Internal AP, if configured, is disabled at this point. */
   WIFI_COMPONENT_STATE_OFF = 0,
@@ -334,6 +339,9 @@ class WiFiComponent : public Component {
   bool is_captive_portal_active_();
   bool is_esp32_improv_active_();
 
+  void load_fast_connect_settings_();
+  void save_fast_connect_settings_();
+
 #ifdef USE_ESP8266
   static void wifi_event_callback(System_Event_t *event);
   void wifi_scan_done_callback_(void *arg, STATUS status);
@@ -381,6 +389,7 @@ class WiFiComponent : public Component {
   optional<float> output_power_;
   bool passive_scan_{false};
   ESPPreferenceObject pref_;
+  ESPPreferenceObject fast_connect_pref_;
   bool has_saved_wifi_settings_{false};
 #ifdef USE_WIFI_11KV_SUPPORT
   bool btm_{false};

From 45c0d10eb091c8717af55ef4651f22316f0ec4b4 Mon Sep 17 00:00:00 2001
From: "pofilo (vmerat)" <git@pofilo.fr>
Date: Thu, 18 Jan 2024 08:35:20 +0100
Subject: [PATCH 53/68] Fixes Waveshare 7.5in B V2 and V3 (#6079)

---
 esphome/components/waveshare_epaper/waveshare_epaper.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/esphome/components/waveshare_epaper/waveshare_epaper.cpp b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
index 0e9b129988..244b3b1ce2 100644
--- a/esphome/components/waveshare_epaper/waveshare_epaper.cpp
+++ b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
@@ -1443,6 +1443,12 @@ void WaveshareEPaper7P5InBV2::initialize() {
   // COMMAND TCON SETTING
   this->command(0x60);
   this->data(0x22);
+
+  this->command(0x82);
+  this->data(0x08);
+  this->command(0x30);
+  this->data(0x06);
+
   // COMMAND RESOLUTION SETTING
   this->command(0x65);
   this->data(0x00);
@@ -1472,6 +1478,7 @@ void HOT WaveshareEPaper7P5InBV2::display() {
   this->command(0x12);
   delay(100);  // NOLINT
   this->wait_until_idle_();
+  this->deep_sleep();
 }
 int WaveshareEPaper7P5InBV2::get_width_internal() { return 800; }
 int WaveshareEPaper7P5InBV2::get_height_internal() { return 480; }
@@ -1617,7 +1624,7 @@ void HOT WaveshareEPaper7P5InBV3::display() {
   this->command(0x13);  // Start Transmission
   delay(2);
   for (uint32_t i = 0; i < buf_len; i++) {
-    this->data(this->buffer_[i]);
+    this->data(~this->buffer_[i]);
   }
 
   this->command(0x12);  // Display Refresh

From 045836c3fe4e088475c248256f7b2e537cbabe05 Mon Sep 17 00:00:00 2001
From: kahrendt <kahrendt@gmail.com>
Date: Thu, 18 Jan 2024 04:09:49 -0500
Subject: [PATCH 54/68] Add combination sensor and remove absorbed
 kalman_combinator component (#5438)

---
 CODEOWNERS                                    |   2 +-
 esphome/components/combination/__init__.py    |   0
 .../components/combination/combination.cpp    | 262 ++++++++++++++++++
 esphome/components/combination/combination.h  | 141 ++++++++++
 esphome/components/combination/sensor.py      | 176 ++++++++++++
 .../components/kalman_combinator/__init__.py  |   1 -
 .../kalman_combinator/kalman_combinator.cpp   |  82 ------
 .../kalman_combinator/kalman_combinator.h     |  46 ---
 .../components/kalman_combinator/sensor.py    |  92 +-----
 tests/test1.yaml                              |  54 +++-
 10 files changed, 637 insertions(+), 219 deletions(-)
 create mode 100644 esphome/components/combination/__init__.py
 create mode 100644 esphome/components/combination/combination.cpp
 create mode 100644 esphome/components/combination/combination.h
 create mode 100644 esphome/components/combination/sensor.py
 delete mode 100644 esphome/components/kalman_combinator/kalman_combinator.cpp
 delete mode 100644 esphome/components/kalman_combinator/kalman_combinator.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 7e87679ad8..95e3b35f56 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -71,6 +71,7 @@ esphome/components/cd74hc4067/* @asoehlke
 esphome/components/climate/* @esphome/core
 esphome/components/climate_ir/* @glmnet
 esphome/components/color_temperature/* @jesserockz
+esphome/components/combination/* @Cat-Ion @kahrendt
 esphome/components/coolix/* @glmnet
 esphome/components/copy/* @OttoWinter
 esphome/components/cover/* @esphome/core
@@ -161,7 +162,6 @@ esphome/components/integration/* @OttoWinter
 esphome/components/internal_temperature/* @Mat931
 esphome/components/interval/* @esphome/core
 esphome/components/json/* @OttoWinter
-esphome/components/kalman_combinator/* @Cat-Ion
 esphome/components/key_collector/* @ssieb
 esphome/components/key_provider/* @ssieb
 esphome/components/kuntze/* @ssieb
diff --git a/esphome/components/combination/__init__.py b/esphome/components/combination/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/combination/combination.cpp b/esphome/components/combination/combination.cpp
new file mode 100644
index 0000000000..716d270390
--- /dev/null
+++ b/esphome/components/combination/combination.cpp
@@ -0,0 +1,262 @@
+#include "combination.h"
+
+#include "esphome/core/log.h"
+#include "esphome/core/hal.h"
+
+#include <cmath>
+#include <functional>
+#include <vector>
+
+namespace esphome {
+namespace combination {
+
+static const char *const TAG = "combination";
+
+void CombinationComponent::log_config_(const LogString *combo_type) {
+  LOG_SENSOR("", "Combination Sensor:", this);
+  ESP_LOGCONFIG(TAG, "  Combination Type: %s", LOG_STR_ARG(combo_type));
+  this->log_source_sensors();
+}
+
+void CombinationNoParameterComponent::add_source(Sensor *sensor) { this->sensors_.emplace_back(sensor); }
+
+void CombinationOneParameterComponent::add_source(Sensor *sensor, std::function<float(float)> const &stddev) {
+  this->sensor_pairs_.emplace_back(sensor, stddev);
+}
+
+void CombinationOneParameterComponent::add_source(Sensor *sensor, float stddev) {
+  this->add_source(sensor, std::function<float(float)>{[stddev](float x) -> float { return stddev; }});
+}
+
+void CombinationNoParameterComponent::log_source_sensors() {
+  ESP_LOGCONFIG(TAG, "  Source Sensors:");
+  for (const auto &sensor : this->sensors_) {
+    ESP_LOGCONFIG(TAG, "    - %s", sensor->get_name().c_str());
+  }
+}
+
+void CombinationOneParameterComponent::log_source_sensors() {
+  ESP_LOGCONFIG(TAG, "  Source Sensors:");
+  for (const auto &sensor : this->sensor_pairs_) {
+    auto &entity = *sensor.first;
+    ESP_LOGCONFIG(TAG, "    - %s", entity.get_name().c_str());
+  }
+}
+
+void CombinationNoParameterComponent::setup() {
+  for (const auto &sensor : this->sensors_) {
+    // All sensor updates are deferred until the next loop. This avoids publishing the combined sensor's result
+    // repeatedly in the same loop if multiple source senors update.
+    sensor->add_on_state_callback(
+        [this](float value) -> void { this->defer("update", [this, value]() { this->handle_new_value(value); }); });
+  }
+}
+
+void KalmanCombinationComponent::dump_config() {
+  this->log_config_(LOG_STR("kalman"));
+  ESP_LOGCONFIG(TAG, "  Update variance: %f per ms", this->update_variance_value_);
+
+  if (this->std_dev_sensor_ != nullptr) {
+    LOG_SENSOR("  ", "Standard Deviation Sensor:", this->std_dev_sensor_);
+  }
+}
+
+void KalmanCombinationComponent::setup() {
+  for (const auto &sensor : this->sensor_pairs_) {
+    const auto stddev = sensor.second;
+    sensor.first->add_on_state_callback([this, stddev](float x) -> void { this->correct_(x, stddev(x)); });
+  }
+}
+
+void KalmanCombinationComponent::update_variance_() {
+  uint32_t now = millis();
+
+  // Variance increases by update_variance_ each millisecond
+  auto dt = now - this->last_update_;
+  auto dv = this->update_variance_value_ * dt;
+  this->variance_ += dv;
+  this->last_update_ = now;
+}
+
+void KalmanCombinationComponent::correct_(float value, float stddev) {
+  if (std::isnan(value) || std::isinf(stddev)) {
+    return;
+  }
+
+  if (std::isnan(this->state_) || std::isinf(this->variance_)) {
+    this->state_ = value;
+    this->variance_ = stddev * stddev;
+    if (this->std_dev_sensor_ != nullptr) {
+      this->std_dev_sensor_->publish_state(stddev);
+    }
+    return;
+  }
+
+  this->update_variance_();
+
+  // Combine two gaussian distributions mu1+-var1, mu2+-var2 to a new one around mu
+  // Use the value with the smaller variance as mu1 to prevent precision errors
+  const bool this_first = this->variance_ < (stddev * stddev);
+  const float mu1 = this_first ? this->state_ : value;
+  const float mu2 = this_first ? value : this->state_;
+
+  const float var1 = this_first ? this->variance_ : stddev * stddev;
+  const float var2 = this_first ? stddev * stddev : this->variance_;
+
+  const float mu = mu1 + var1 * (mu2 - mu1) / (var1 + var2);
+  const float var = var1 - (var1 * var1) / (var1 + var2);
+
+  // Update and publish state
+  this->state_ = mu;
+  this->variance_ = var;
+
+  this->publish_state(mu);
+  if (this->std_dev_sensor_ != nullptr) {
+    this->std_dev_sensor_->publish_state(std::sqrt(var));
+  }
+}
+
+void LinearCombinationComponent::setup() {
+  for (const auto &sensor : this->sensor_pairs_) {
+    // All sensor updates are deferred until the next loop. This avoids publishing the combined sensor's result
+    // repeatedly in the same loop if multiple source senors update.
+    sensor.first->add_on_state_callback(
+        [this](float value) -> void { this->defer("update", [this, value]() { this->handle_new_value(value); }); });
+  }
+}
+
+void LinearCombinationComponent::handle_new_value(float value) {
+  // Multiplies each sensor state by a configured coeffecient and then sums
+
+  if (!std::isfinite(value))
+    return;
+
+  float sum = 0.0;
+
+  for (const auto &sensor : this->sensor_pairs_) {
+    const float sensor_state = sensor.first->state;
+    if (std::isfinite(sensor_state)) {
+      sum += sensor_state * sensor.second(sensor_state);
+    }
+  }
+
+  this->publish_state(sum);
+};
+
+void MaximumCombinationComponent::handle_new_value(float value) {
+  if (!std::isfinite(value))
+    return;
+
+  float max_value = (-1) * std::numeric_limits<float>::infinity();  // note x = max(x, -infinity)
+
+  for (const auto &sensor : this->sensors_) {
+    if (std::isfinite(sensor->state)) {
+      max_value = std::max(max_value, sensor->state);
+    }
+  }
+
+  this->publish_state(max_value);
+}
+
+void MeanCombinationComponent::handle_new_value(float value) {
+  if (!std::isfinite(value))
+    return;
+
+  float sum = 0.0;
+  size_t count = 0.0;
+
+  for (const auto &sensor : this->sensors_) {
+    if (std::isfinite(sensor->state)) {
+      ++count;
+      sum += sensor->state;
+    }
+  }
+
+  float mean = sum / count;
+
+  this->publish_state(mean);
+}
+
+void MedianCombinationComponent::handle_new_value(float value) {
+  // Sorts sensor states in ascending order and determines the middle value
+
+  if (!std::isfinite(value))
+    return;
+
+  std::vector<float> sensor_states;
+  for (const auto &sensor : this->sensors_) {
+    if (std::isfinite(sensor->state)) {
+      sensor_states.push_back(sensor->state);
+    }
+  }
+
+  sort(sensor_states.begin(), sensor_states.end());
+  size_t sensor_states_size = sensor_states.size();
+
+  float median = NAN;
+
+  if (sensor_states_size) {
+    if (sensor_states_size % 2) {
+      // Odd number of measurements, use middle measurement
+      median = sensor_states[sensor_states_size / 2];
+    } else {
+      // Even number of measurements, use the average of the two middle measurements
+      median = (sensor_states[sensor_states_size / 2] + sensor_states[sensor_states_size / 2 - 1]) / 2.0;
+    }
+  }
+
+  this->publish_state(median);
+}
+
+void MinimumCombinationComponent::handle_new_value(float value) {
+  if (!std::isfinite(value))
+    return;
+
+  float min_value = std::numeric_limits<float>::infinity();  // note x = min(x, infinity)
+
+  for (const auto &sensor : this->sensors_) {
+    if (std::isfinite(sensor->state)) {
+      min_value = std::min(min_value, sensor->state);
+    }
+  }
+
+  this->publish_state(min_value);
+}
+
+void MostRecentCombinationComponent::handle_new_value(float value) { this->publish_state(value); }
+
+void RangeCombinationComponent::handle_new_value(float value) {
+  // Sorts sensor states then takes difference between largest and smallest states
+
+  if (!std::isfinite(value))
+    return;
+
+  std::vector<float> sensor_states;
+  for (const auto &sensor : this->sensors_) {
+    if (std::isfinite(sensor->state)) {
+      sensor_states.push_back(sensor->state);
+    }
+  }
+
+  sort(sensor_states.begin(), sensor_states.end());
+
+  float range = sensor_states.back() - sensor_states.front();
+  this->publish_state(range);
+}
+
+void SumCombinationComponent::handle_new_value(float value) {
+  if (!std::isfinite(value))
+    return;
+
+  float sum = 0.0;
+  for (const auto &sensor : this->sensors_) {
+    if (std::isfinite(sensor->state)) {
+      sum += sensor->state;
+    }
+  }
+
+  this->publish_state(sum);
+}
+
+}  // namespace combination
+}  // namespace esphome
diff --git a/esphome/components/combination/combination.h b/esphome/components/combination/combination.h
new file mode 100644
index 0000000000..901aeaf259
--- /dev/null
+++ b/esphome/components/combination/combination.h
@@ -0,0 +1,141 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+
+#include <vector>
+
+namespace esphome {
+namespace combination {
+
+class CombinationComponent : public Component, public sensor::Sensor {
+ public:
+  float get_setup_priority() const override { return esphome::setup_priority::DATA; }
+
+  /// @brief Logs all source sensor's names
+  virtual void log_source_sensors() = 0;
+
+ protected:
+  /// @brief Logs the sensor for use in dump_config
+  /// @param combo_type Name of the combination operation
+  void log_config_(const LogString *combo_type);
+};
+
+/// @brief Base class for operations that do not require an extra parameter to compute the combination
+class CombinationNoParameterComponent : public CombinationComponent {
+ public:
+  /// @brief Adds a callback to each source sensor
+  void setup() override;
+
+  void add_source(Sensor *sensor);
+
+  /// @brief Computes the combination
+  /// @param value Newest sensor measurement
+  virtual void handle_new_value(float value) = 0;
+
+  /// @brief Logs all source sensor's names in sensors_
+  void log_source_sensors() override;
+
+ protected:
+  std::vector<Sensor *> sensors_;
+};
+
+// Base class for opertions that require one parameter to compute the combination
+class CombinationOneParameterComponent : public CombinationComponent {
+ public:
+  void add_source(Sensor *sensor, std::function<float(float)> const &stddev);
+  void add_source(Sensor *sensor, float stddev);
+
+  /// @brief Logs all source sensor's names in sensor_pairs_
+  void log_source_sensors() override;
+
+ protected:
+  std::vector<std::pair<Sensor *, std::function<float(float)>>> sensor_pairs_;
+};
+
+class KalmanCombinationComponent : public CombinationOneParameterComponent {
+ public:
+  void dump_config() override;
+  void setup() override;
+
+  void set_process_std_dev(float process_std_dev) {
+    this->update_variance_value_ = process_std_dev * process_std_dev * 0.001f;
+  }
+  void set_std_dev_sensor(Sensor *sensor) { this->std_dev_sensor_ = sensor; }
+
+ protected:
+  void update_variance_();
+  void correct_(float value, float stddev);
+
+  // Optional sensor for publishing the current error
+  sensor::Sensor *std_dev_sensor_{nullptr};
+
+  // Tick of the last update
+  uint32_t last_update_{0};
+  // Change of the variance, per ms
+  float update_variance_value_{0.f};
+
+  // Best guess for the state and its variance
+  float state_{NAN};
+  float variance_{INFINITY};
+};
+
+class LinearCombinationComponent : public CombinationOneParameterComponent {
+ public:
+  void dump_config() override { this->log_config_(LOG_STR("linear")); }
+  void setup() override;
+
+  void handle_new_value(float value);
+};
+
+class MaximumCombinationComponent : public CombinationNoParameterComponent {
+ public:
+  void dump_config() override { this->log_config_(LOG_STR("max")); }
+
+  void handle_new_value(float value) override;
+};
+
+class MeanCombinationComponent : public CombinationNoParameterComponent {
+ public:
+  void dump_config() override { this->log_config_(LOG_STR("mean")); }
+
+  void handle_new_value(float value) override;
+};
+
+class MedianCombinationComponent : public CombinationNoParameterComponent {
+ public:
+  void dump_config() override { this->log_config_(LOG_STR("median")); }
+
+  void handle_new_value(float value) override;
+};
+
+class MinimumCombinationComponent : public CombinationNoParameterComponent {
+ public:
+  void dump_config() override { this->log_config_(LOG_STR("min")); }
+
+  void handle_new_value(float value) override;
+};
+
+class MostRecentCombinationComponent : public CombinationNoParameterComponent {
+ public:
+  void dump_config() override { this->log_config_(LOG_STR("most_recently_updated")); }
+
+  void handle_new_value(float value) override;
+};
+
+class RangeCombinationComponent : public CombinationNoParameterComponent {
+ public:
+  void dump_config() override { this->log_config_(LOG_STR("range")); }
+
+  void handle_new_value(float value) override;
+};
+
+class SumCombinationComponent : public CombinationNoParameterComponent {
+ public:
+  void dump_config() override { this->log_config_(LOG_STR("sum")); }
+
+  void handle_new_value(float value) override;
+};
+
+}  // namespace combination
+}  // namespace esphome
diff --git a/esphome/components/combination/sensor.py b/esphome/components/combination/sensor.py
new file mode 100644
index 0000000000..fad0277061
--- /dev/null
+++ b/esphome/components/combination/sensor.py
@@ -0,0 +1,176 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor
+from esphome.const import (
+    CONF_ACCURACY_DECIMALS,
+    CONF_DEVICE_CLASS,
+    CONF_ENTITY_CATEGORY,
+    CONF_ICON,
+    CONF_ID,
+    CONF_RANGE,
+    CONF_SOURCE,
+    CONF_SUM,
+    CONF_TYPE,
+    CONF_UNIT_OF_MEASUREMENT,
+)
+from esphome.core.entity_helpers import inherit_property_from
+
+CODEOWNERS = ["@Cat-Ion", "@kahrendt"]
+
+combination_ns = cg.esphome_ns.namespace("combination")
+
+KalmanCombinationComponent = combination_ns.class_(
+    "KalmanCombinationComponent", cg.Component, sensor.Sensor
+)
+LinearCombinationComponent = combination_ns.class_(
+    "LinearCombinationComponent", cg.Component, sensor.Sensor
+)
+MaximumCombinationComponent = combination_ns.class_(
+    "MaximumCombinationComponent", cg.Component, sensor.Sensor
+)
+MeanCombinationComponent = combination_ns.class_(
+    "MeanCombinationComponent", cg.Component, sensor.Sensor
+)
+MedianCombinationComponent = combination_ns.class_(
+    "MedianCombinationComponent", cg.Component, sensor.Sensor
+)
+MinimumCombinationComponent = combination_ns.class_(
+    "MinimumCombinationComponent", cg.Component, sensor.Sensor
+)
+MostRecentCombinationComponent = combination_ns.class_(
+    "MostRecentCombinationComponent", cg.Component, sensor.Sensor
+)
+RangeCombinationComponent = combination_ns.class_(
+    "RangeCombinationComponent", cg.Component, sensor.Sensor
+)
+SumCombinationComponent = combination_ns.class_(
+    "SumCombinationComponent", cg.Component, sensor.Sensor
+)
+
+CONF_COEFFECIENT = "coeffecient"
+CONF_ERROR = "error"
+CONF_KALMAN = "kalman"
+CONF_LINEAR = "linear"
+CONF_MAX = "max"
+CONF_MEAN = "mean"
+CONF_MEDIAN = "median"
+CONF_MIN = "min"
+CONF_MOST_RECENTLY_UPDATED = "most_recently_updated"
+CONF_PROCESS_STD_DEV = "process_std_dev"
+CONF_SOURCES = "sources"
+CONF_STD_DEV = "std_dev"
+
+
+KALMAN_SOURCE_SCHEMA = cv.Schema(
+    {
+        cv.Required(CONF_SOURCE): cv.use_id(sensor.Sensor),
+        cv.Required(CONF_ERROR): cv.templatable(cv.positive_float),
+    }
+)
+
+LINEAR_SOURCE_SCHEMA = cv.Schema(
+    {
+        cv.Required(CONF_SOURCE): cv.use_id(sensor.Sensor),
+        cv.Required(CONF_COEFFECIENT): cv.templatable(cv.float_),
+    }
+)
+
+SENSOR_ONLY_SOURCE_SCHEMA = cv.Schema(
+    {
+        cv.Required(CONF_SOURCE): cv.use_id(sensor.Sensor),
+    }
+)
+
+CONFIG_SCHEMA = cv.typed_schema(
+    {
+        CONF_KALMAN: sensor.sensor_schema(KalmanCombinationComponent)
+        .extend(cv.COMPONENT_SCHEMA)
+        .extend(
+            {
+                cv.Required(CONF_PROCESS_STD_DEV): cv.positive_float,
+                cv.Required(CONF_SOURCES): cv.ensure_list(KALMAN_SOURCE_SCHEMA),
+                cv.Optional(CONF_STD_DEV): sensor.sensor_schema(),
+            }
+        ),
+        CONF_LINEAR: sensor.sensor_schema(LinearCombinationComponent)
+        .extend(cv.COMPONENT_SCHEMA)
+        .extend({cv.Required(CONF_SOURCES): cv.ensure_list(LINEAR_SOURCE_SCHEMA)}),
+        CONF_MAX: sensor.sensor_schema(MaximumCombinationComponent)
+        .extend(cv.COMPONENT_SCHEMA)
+        .extend({cv.Required(CONF_SOURCES): cv.ensure_list(SENSOR_ONLY_SOURCE_SCHEMA)}),
+        CONF_MEAN: sensor.sensor_schema(MeanCombinationComponent)
+        .extend(cv.COMPONENT_SCHEMA)
+        .extend({cv.Required(CONF_SOURCES): cv.ensure_list(SENSOR_ONLY_SOURCE_SCHEMA)}),
+        CONF_MEDIAN: sensor.sensor_schema(MedianCombinationComponent)
+        .extend(cv.COMPONENT_SCHEMA)
+        .extend({cv.Required(CONF_SOURCES): cv.ensure_list(SENSOR_ONLY_SOURCE_SCHEMA)}),
+        CONF_MIN: sensor.sensor_schema(MinimumCombinationComponent)
+        .extend(cv.COMPONENT_SCHEMA)
+        .extend({cv.Required(CONF_SOURCES): cv.ensure_list(SENSOR_ONLY_SOURCE_SCHEMA)}),
+        CONF_MOST_RECENTLY_UPDATED: sensor.sensor_schema(MostRecentCombinationComponent)
+        .extend(cv.COMPONENT_SCHEMA)
+        .extend({cv.Required(CONF_SOURCES): cv.ensure_list(SENSOR_ONLY_SOURCE_SCHEMA)}),
+        CONF_RANGE: sensor.sensor_schema(RangeCombinationComponent)
+        .extend(cv.COMPONENT_SCHEMA)
+        .extend({cv.Required(CONF_SOURCES): cv.ensure_list(SENSOR_ONLY_SOURCE_SCHEMA)}),
+        CONF_SUM: sensor.sensor_schema(SumCombinationComponent)
+        .extend(cv.COMPONENT_SCHEMA)
+        .extend({cv.Required(CONF_SOURCES): cv.ensure_list(SENSOR_ONLY_SOURCE_SCHEMA)}),
+    }
+)
+
+
+# Inherit some sensor values from the first source, for both the state and the error value
+# CONF_STATE_CLASS could also be inherited, but might lead to unexpected behaviour with "total_increasing"
+properties_to_inherit = [
+    CONF_ACCURACY_DECIMALS,
+    CONF_DEVICE_CLASS,
+    CONF_ENTITY_CATEGORY,
+    CONF_ICON,
+    CONF_UNIT_OF_MEASUREMENT,
+]
+inherit_schema_for_state = [
+    inherit_property_from(property, [CONF_SOURCES, 0, CONF_SOURCE])
+    for property in properties_to_inherit
+]
+inherit_schema_for_std_dev = [
+    inherit_property_from([CONF_STD_DEV, property], [CONF_SOURCES, 0, CONF_SOURCE])
+    for property in properties_to_inherit
+]
+
+FINAL_VALIDATE_SCHEMA = cv.All(
+    *inherit_schema_for_state,
+    *inherit_schema_for_std_dev,
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await sensor.register_sensor(var, config)
+
+    if proces_std_dev := config.get(CONF_PROCESS_STD_DEV):
+        cg.add(var.set_process_std_dev(proces_std_dev))
+
+    for source_conf in config[CONF_SOURCES]:
+        source = await cg.get_variable(source_conf[CONF_SOURCE])
+        if config[CONF_TYPE] == CONF_KALMAN:
+            error = await cg.templatable(
+                source_conf[CONF_ERROR],
+                [(float, "x")],
+                cg.float_,
+            )
+            cg.add(var.add_source(source, error))
+        elif config[CONF_TYPE] == CONF_LINEAR:
+            coeffecient = await cg.templatable(
+                source_conf[CONF_COEFFECIENT],
+                [(float, "x")],
+                cg.float_,
+            )
+            cg.add(var.add_source(source, coeffecient))
+        else:
+            cg.add(var.add_source(source))
+
+    if CONF_STD_DEV in config:
+        sens = await sensor.new_sensor(config[CONF_STD_DEV])
+        cg.add(var.set_std_dev_sensor(sens))
diff --git a/esphome/components/kalman_combinator/__init__.py b/esphome/components/kalman_combinator/__init__.py
index 3356e61bb2..e69de29bb2 100644
--- a/esphome/components/kalman_combinator/__init__.py
+++ b/esphome/components/kalman_combinator/__init__.py
@@ -1 +0,0 @@
-CODEOWNERS = ["@Cat-Ion"]
diff --git a/esphome/components/kalman_combinator/kalman_combinator.cpp b/esphome/components/kalman_combinator/kalman_combinator.cpp
deleted file mode 100644
index 50d8f03a93..0000000000
--- a/esphome/components/kalman_combinator/kalman_combinator.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-#include "kalman_combinator.h"
-#include "esphome/core/hal.h"
-#include <cmath>
-#include <functional>
-
-namespace esphome {
-namespace kalman_combinator {
-
-void KalmanCombinatorComponent::dump_config() {
-  ESP_LOGCONFIG("kalman_combinator", "Kalman Combinator:");
-  ESP_LOGCONFIG("kalman_combinator", "  Update variance: %f per ms", this->update_variance_value_);
-  ESP_LOGCONFIG("kalman_combinator", "  Sensors:");
-  for (const auto &sensor : this->sensors_) {
-    auto &entity = *sensor.first;
-    ESP_LOGCONFIG("kalman_combinator", "    - %s", entity.get_name().c_str());
-  }
-}
-
-void KalmanCombinatorComponent::setup() {
-  for (const auto &sensor : this->sensors_) {
-    const auto stddev = sensor.second;
-    sensor.first->add_on_state_callback([this, stddev](float x) -> void { this->correct_(x, stddev(x)); });
-  }
-}
-
-void KalmanCombinatorComponent::add_source(Sensor *sensor, std::function<float(float)> const &stddev) {
-  this->sensors_.emplace_back(sensor, stddev);
-}
-
-void KalmanCombinatorComponent::add_source(Sensor *sensor, float stddev) {
-  this->add_source(sensor, std::function<float(float)>{[stddev](float x) -> float { return stddev; }});
-}
-
-void KalmanCombinatorComponent::update_variance_() {
-  uint32_t now = millis();
-
-  // Variance increases by update_variance_ each millisecond
-  auto dt = now - this->last_update_;
-  auto dv = this->update_variance_value_ * dt;
-  this->variance_ += dv;
-  this->last_update_ = now;
-}
-
-void KalmanCombinatorComponent::correct_(float value, float stddev) {
-  if (std::isnan(value) || std::isinf(stddev)) {
-    return;
-  }
-
-  if (std::isnan(this->state_) || std::isinf(this->variance_)) {
-    this->state_ = value;
-    this->variance_ = stddev * stddev;
-    if (this->std_dev_sensor_ != nullptr) {
-      this->std_dev_sensor_->publish_state(stddev);
-    }
-    return;
-  }
-
-  this->update_variance_();
-
-  // Combine two gaussian distributions mu1+-var1, mu2+-var2 to a new one around mu
-  // Use the value with the smaller variance as mu1 to prevent precision errors
-  const bool this_first = this->variance_ < (stddev * stddev);
-  const float mu1 = this_first ? this->state_ : value;
-  const float mu2 = this_first ? value : this->state_;
-
-  const float var1 = this_first ? this->variance_ : stddev * stddev;
-  const float var2 = this_first ? stddev * stddev : this->variance_;
-
-  const float mu = mu1 + var1 * (mu2 - mu1) / (var1 + var2);
-  const float var = var1 - (var1 * var1) / (var1 + var2);
-
-  // Update and publish state
-  this->state_ = mu;
-  this->variance_ = var;
-
-  this->publish_state(mu);
-  if (this->std_dev_sensor_ != nullptr) {
-    this->std_dev_sensor_->publish_state(std::sqrt(var));
-  }
-}
-}  // namespace kalman_combinator
-}  // namespace esphome
diff --git a/esphome/components/kalman_combinator/kalman_combinator.h b/esphome/components/kalman_combinator/kalman_combinator.h
deleted file mode 100644
index afbe3ece92..0000000000
--- a/esphome/components/kalman_combinator/kalman_combinator.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-#include "esphome/core/component.h"
-#include "esphome/components/sensor/sensor.h"
-#include <cmath>
-#include <vector>
-
-namespace esphome {
-namespace kalman_combinator {
-
-class KalmanCombinatorComponent : public Component, public sensor::Sensor {
- public:
-  KalmanCombinatorComponent() = default;
-
-  float get_setup_priority() const override { return esphome::setup_priority::DATA; }
-
-  void dump_config() override;
-  void setup() override;
-
-  void add_source(Sensor *sensor, std::function<float(float)> const &stddev);
-  void add_source(Sensor *sensor, float stddev);
-  void set_process_std_dev(float process_std_dev) {
-    this->update_variance_value_ = process_std_dev * process_std_dev * 0.001f;
-  }
-  void set_std_dev_sensor(Sensor *sensor) { this->std_dev_sensor_ = sensor; }
-
- private:
-  void update_variance_();
-  void correct_(float value, float stddev);
-
-  // Source sensors and their error functions
-  std::vector<std::pair<Sensor *, std::function<float(float)>>> sensors_;
-
-  // Optional sensor for publishing the current error
-  sensor::Sensor *std_dev_sensor_{nullptr};
-
-  // Tick of the last update
-  uint32_t last_update_{0};
-  // Change of the variance, per ms
-  float update_variance_value_{0.f};
-
-  // Best guess for the state and its variance
-  float state_{NAN};
-  float variance_{INFINITY};
-};
-}  // namespace kalman_combinator
-}  // namespace esphome
diff --git a/esphome/components/kalman_combinator/sensor.py b/esphome/components/kalman_combinator/sensor.py
index 28b96077cc..eca1ba7b85 100644
--- a/esphome/components/kalman_combinator/sensor.py
+++ b/esphome/components/kalman_combinator/sensor.py
@@ -1,90 +1,6 @@
-import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome.components import sensor
-from esphome.const import (
-    CONF_ID,
-    CONF_SOURCE,
-    CONF_ACCURACY_DECIMALS,
-    CONF_DEVICE_CLASS,
-    CONF_ENTITY_CATEGORY,
-    CONF_ICON,
-    CONF_UNIT_OF_MEASUREMENT,
+
+CONFIG_SCHEMA = CONFIG_SCHEMA = cv.invalid(
+    "The kalman_combinator sensor has moved.\nPlease use the combination platform instead with type: kalman.\n"
+    "See https://esphome.io/components/sensor/combination.html"
 )
-from esphome.core.entity_helpers import inherit_property_from
-
-kalman_combinator_ns = cg.esphome_ns.namespace("kalman_combinator")
-KalmanCombinatorComponent = kalman_combinator_ns.class_(
-    "KalmanCombinatorComponent", cg.Component, sensor.Sensor
-)
-
-CONF_ERROR = "error"
-CONF_SOURCES = "sources"
-CONF_PROCESS_STD_DEV = "process_std_dev"
-CONF_STD_DEV = "std_dev"
-
-
-CONFIG_SCHEMA = (
-    sensor.sensor_schema(KalmanCombinatorComponent)
-    .extend(cv.COMPONENT_SCHEMA)
-    .extend(
-        {
-            cv.Required(CONF_PROCESS_STD_DEV): cv.positive_float,
-            cv.Required(CONF_SOURCES): cv.ensure_list(
-                cv.Schema(
-                    {
-                        cv.Required(CONF_SOURCE): cv.use_id(sensor.Sensor),
-                        cv.Required(CONF_ERROR): cv.templatable(cv.positive_float),
-                    }
-                ),
-            ),
-            cv.Optional(CONF_STD_DEV): sensor.sensor_schema(),
-        }
-    )
-)
-
-# Inherit some sensor values from the first source, for both the state and the error value
-properties_to_inherit = [
-    CONF_ACCURACY_DECIMALS,
-    CONF_DEVICE_CLASS,
-    CONF_ENTITY_CATEGORY,
-    CONF_ICON,
-    CONF_UNIT_OF_MEASUREMENT,
-    # CONF_STATE_CLASS could also be inherited, but might lead to unexpected behaviour with "total_increasing"
-]
-inherit_schema_for_state = [
-    inherit_property_from(property, [CONF_SOURCES, 0, CONF_SOURCE])
-    for property in properties_to_inherit
-]
-inherit_schema_for_std_dev = [
-    inherit_property_from([CONF_STD_DEV, property], [CONF_SOURCES, 0, CONF_SOURCE])
-    for property in properties_to_inherit
-]
-
-FINAL_VALIDATE_SCHEMA = cv.All(
-    CONFIG_SCHEMA.extend(
-        {cv.Required(CONF_ID): cv.use_id(KalmanCombinatorComponent)},
-        extra=cv.ALLOW_EXTRA,
-    ),
-    *inherit_schema_for_state,
-    *inherit_schema_for_std_dev,
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await sensor.register_sensor(var, config)
-
-    cg.add(var.set_process_std_dev(config[CONF_PROCESS_STD_DEV]))
-    for source_conf in config[CONF_SOURCES]:
-        source = await cg.get_variable(source_conf[CONF_SOURCE])
-        error = await cg.templatable(
-            source_conf[CONF_ERROR],
-            [(float, "x")],
-            cg.float_,
-        )
-        cg.add(var.add_source(source, error))
-
-    if CONF_STD_DEV in config:
-        sens = await sensor.new_sensor(config[CONF_STD_DEV])
-        cg.add(var.set_std_dev_sensor(sens))
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 038ac9c738..3558fa328e 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -971,7 +971,8 @@ sensor:
       name: Internal Ttemperature
     update_interval: 15s
     i2c_id: i2c_bus
-  - platform: kalman_combinator
+  - platform: combination
+    type: kalman
     name: Kalman-filtered temperature
     process_std_dev: 0.00139
     sources:
@@ -980,6 +981,57 @@ sensor:
           return 0.4 + std::abs(x - 25) * 0.023;
       - source: scd4x_temperature
         error: 1.5
+  - platform: combination
+    type: linear
+    name: Linearly combined temperatures
+    sources:
+      - source: scd30_temperature
+        coeffecient: !lambda |-
+          return 0.4 + std::abs(x - 25) * 0.023;
+      - source: scd4x_temperature
+        coeffecient: 1.5
+  - platform: combination
+    type: max
+    name: Max of combined temperatures
+    sources:
+      - source: scd30_temperature
+      - source: scd4x_temperature
+  - platform: combination
+    type: mean
+    name: Mean of combined temperatures
+    sources:
+      - source: scd30_temperature
+      - source: scd4x_temperature
+  - platform: combination
+    type: median
+    name: Median of combined temperatures
+    sources:
+      - source: scd30_temperature
+      - source: scd4x_temperature
+  - platform: combination
+    type: min
+    name: Min of combined temperatures
+    sources:
+      - source: scd30_temperature
+      - source: scd4x_temperature
+  - platform: combination
+    type: most_recently_updated
+    name: Most recently updated of combined temperatures
+    sources:
+      - source: scd30_temperature
+      - source: scd4x_temperature
+  - platform: combination
+    type: range
+    name: Range of combined temperatures
+    sources:
+      - source: scd30_temperature
+      - source: scd4x_temperature
+  - platform: combination
+    type: sum
+    name: Sum of combined temperatures
+    sources:
+      - source: scd30_temperature
+      - source: scd4x_temperature
   - platform: htu21d
     temperature:
       name: Living Room Temperature 6

From ea9de45d164e32227bf4ea8b61bb475fbf426518 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Jan 2024 10:07:50 +0900
Subject: [PATCH 55/68] Bump platformio from 6.1.11 to 6.1.13 (#6086)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 docker/Dockerfile | 2 +-
 requirements.txt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 468124e3ed..b28ca2ba66 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -81,7 +81,7 @@ RUN \
     fi; \
     pip3 install \
     --break-system-packages --no-cache-dir \
-    platformio==6.1.11 \
+    platformio==6.1.13 \
     # Change some platformio settings
     && platformio settings set enable_telemetry No \
     && platformio settings set check_platformio_interval 1000000 \
diff --git a/requirements.txt b/requirements.txt
index 5281b64e66..18e0295fb2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ tornado==6.4
 tzlocal==5.2    # from time
 tzdata>=2021.1  # from time
 pyserial==3.5
-platformio==6.1.11  # When updating platformio, also update Dockerfile
+platformio==6.1.13  # When updating platformio, also update Dockerfile
 esptool==4.7.0
 click==8.1.7
 esphome-dashboard==20231107.0

From 6a6a70f1e57055ff5de8cd065fb308927db327e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Jan 2024 10:08:29 +0900
Subject: [PATCH 56/68] Bump actions/cache from 3.3.2 to 4.0.0 (#6110)

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2187573709..2a108b34dd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,7 +45,7 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.3.2
+        uses: actions/cache@v4.0.0
         with:
           path: venv
           # yamllint disable-line rule:line-length
@@ -365,7 +365,7 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
           cache-key: ${{ needs.common.outputs.cache-key }}
       - name: Cache platformio
-        uses: actions/cache@v3.3.2
+        uses: actions/cache@v4.0.0
         with:
           path: ~/.platformio
           # yamllint disable-line rule:line-length

From 8267b3274ce2c801000d16eca843a7c89561d811 Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Fri, 19 Jan 2024 12:10:23 +1100
Subject: [PATCH 57/68] Enable networking and some other components on host
 platform (#6114)

---
 esphome/components/host/__init__.py            |  6 +++++-
 esphome/components/network/ip_address.h        | 16 ++++++++++++++++
 esphome/components/socket/bsd_sockets_impl.cpp |  2 +-
 esphome/core/component.cpp                     |  2 +-
 esphome/helpers.py                             |  5 +++++
 platformio.ini                                 |  1 +
 6 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/esphome/components/host/__init__.py b/esphome/components/host/__init__.py
index 14d2597866..eb44bcccd6 100644
--- a/esphome/components/host/__init__.py
+++ b/esphome/components/host/__init__.py
@@ -6,6 +6,7 @@ from esphome.const import (
     PLATFORM_HOST,
 )
 from esphome.core import CORE
+from esphome.helpers import IS_MACOS
 import esphome.config_validation as cv
 import esphome.codegen as cg
 
@@ -14,7 +15,6 @@ from .const import KEY_HOST
 # force import gpio to register pin schema
 from .gpio import host_pin_to_code  # noqa
 
-
 CODEOWNERS = ["@esphome/core"]
 AUTO_LOAD = ["network"]
 
@@ -35,5 +35,9 @@ CONFIG_SCHEMA = cv.All(
 
 async def to_code(config):
     cg.add_build_flag("-DUSE_HOST")
+    cg.add_build_flag("-std=c++17")
+    cg.add_build_flag("-lsodium")
+    if IS_MACOS:
+        cg.add_build_flag("-L/opt/homebrew/lib")
     cg.add_define("ESPHOME_BOARD", "host")
     cg.add_platformio_option("platform", "platformio/native")
diff --git a/esphome/components/network/ip_address.h b/esphome/components/network/ip_address.h
index 709524c9d1..02e71790a7 100644
--- a/esphome/components/network/ip_address.h
+++ b/esphome/components/network/ip_address.h
@@ -14,6 +14,13 @@
 #include <IPAddress.h>
 #endif /* USE_ADRDUINO */
 
+#ifdef USE_HOST
+#include <arpa/inet.h>
+using ip_addr_t = in_addr;
+using ip4_addr_t = in_addr;
+#define ipaddr_aton(x, y) inet_aton((x), (y))
+#endif
+
 #if USE_ESP32_FRAMEWORK_ARDUINO
 #define arduino_ns Arduino_h
 #elif USE_LIBRETINY
@@ -32,6 +39,14 @@ namespace network {
 
 struct IPAddress {
  public:
+#ifdef USE_HOST
+  IPAddress() { ip_addr_.s_addr = 0; }
+  IPAddress(uint8_t first, uint8_t second, uint8_t third, uint8_t fourth) {
+    this->ip_addr_.s_addr = htonl((first << 24) | (second << 16) | (third << 8) | fourth);
+  }
+  IPAddress(const std::string &in_address) { inet_aton(in_address.c_str(), &ip_addr_); }
+  IPAddress(const ip_addr_t *other_ip) { ip_addr_ = *other_ip; }
+#else
   IPAddress() { ip_addr_set_zero(&ip_addr_); }
   IPAddress(uint8_t first, uint8_t second, uint8_t third, uint8_t fourth) {
     IP_ADDR4(&ip_addr_, first, second, third, fourth);
@@ -107,6 +122,7 @@ struct IPAddress {
     }
     return *this;
   }
+#endif
 
  protected:
   ip_addr_t ip_addr_;
diff --git a/esphome/components/socket/bsd_sockets_impl.cpp b/esphome/components/socket/bsd_sockets_impl.cpp
index 6c356106f3..f07f5c8f81 100644
--- a/esphome/components/socket/bsd_sockets_impl.cpp
+++ b/esphome/components/socket/bsd_sockets_impl.cpp
@@ -87,7 +87,7 @@ class BSDSocketImpl : public Socket {
   int listen(int backlog) override { return ::listen(fd_, backlog); }
   ssize_t read(void *buf, size_t len) override { return ::read(fd_, buf, len); }
   ssize_t recvfrom(void *buf, size_t len, sockaddr *addr, socklen_t *addr_len) override {
-#if defined(USE_ESP32)
+#if defined(USE_ESP32) || defined(USE_HOST)
     return ::recvfrom(this->fd_, buf, len, 0, addr, addr_len);
 #else
     return ::lwip_recvfrom(this->fd_, buf, len, 0, addr, addr_len);
diff --git a/esphome/core/component.cpp b/esphome/core/component.cpp
index e2f27f9828..b0406e6502 100644
--- a/esphome/core/component.cpp
+++ b/esphome/core/component.cpp
@@ -169,7 +169,7 @@ float Component::get_actual_setup_priority() const {
 void Component::set_setup_priority(float priority) { this->setup_priority_override_ = priority; }
 
 bool Component::has_overridden_loop() const {
-#ifdef CLANG_TIDY
+#if defined(USE_HOST) || defined(CLANG_TIDY)
   bool loop_overridden = true;
   bool call_loop_overridden = true;
 #else
diff --git a/esphome/helpers.py b/esphome/helpers.py
index 254c950b5d..4c8cb4e2cc 100644
--- a/esphome/helpers.py
+++ b/esphome/helpers.py
@@ -3,6 +3,7 @@ from contextlib import suppress
 
 import logging
 import os
+import platform
 from pathlib import Path
 from typing import Union
 import tempfile
@@ -11,6 +12,10 @@ import re
 
 _LOGGER = logging.getLogger(__name__)
 
+IS_MACOS = platform.system() == "Darwin"
+IS_WINDOWS = platform.system() == "Windows"
+IS_LINUX = platform.system() == "Linux"
+
 
 def ensure_unique_string(preferred_string, current_strings):
     test_string = preferred_string
diff --git a/platformio.ini b/platformio.ini
index f5f510244c..e47527fe98 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -388,3 +388,4 @@ lib_deps =
 build_flags =
     ${common.build_flags}
     -DUSE_HOST
+    -std=c++17

From 2283b3b443c024fa4bb5f35d1f7310e5fd1db72a Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Fri, 19 Jan 2024 12:46:55 +1100
Subject: [PATCH 58/68] Fix time component for host platform (#6118)

---
 esphome/components/time/real_time_clock.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/esphome/components/time/real_time_clock.cpp b/esphome/components/time/real_time_clock.cpp
index 0573c7de9d..9b903d098b 100644
--- a/esphome/components/time/real_time_clock.cpp
+++ b/esphome/components/time/real_time_clock.cpp
@@ -1,6 +1,10 @@
 #include "real_time_clock.h"
 #include "esphome/core/log.h"
+#ifdef USE_HOST
+#include <sys/time.h>
+#else
 #include "lwip/opt.h"
+#endif
 #ifdef USE_ESP8266
 #include "sys/time.h"
 #endif
@@ -25,7 +29,7 @@ void RealTimeClock::synchronize_epoch_(uint32_t epoch) {
     .tv_sec = static_cast<time_t>(epoch), .tv_usec = 0,
   };
   ESP_LOGVV(TAG, "Got epoch %" PRIu32, epoch);
-  timezone tz = {0, 0};
+  struct timezone tz = {0, 0};
   int ret = settimeofday(&timev, &tz);
   if (ret == EINVAL) {
     // Some ESP8266 frameworks abort when timezone parameter is not NULL

From 1fef769496ed89c0062d8e70f5964b8318ba4550 Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Fri, 19 Jan 2024 13:42:17 +1100
Subject: [PATCH 59/68] Add quad spi features (#5925)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/spi/__init__.py     | 95 +++++++++++++++++++-------
 esphome/components/spi/spi.cpp         |  6 +-
 esphome/components/spi/spi.h           | 51 ++++++++++++--
 esphome/components/spi/spi_arduino.cpp |  3 +-
 esphome/components/spi/spi_esp_idf.cpp | 83 ++++++++++++++++++++--
 tests/test8.1.yaml                     |  9 +++
 6 files changed, 207 insertions(+), 40 deletions(-)

diff --git a/esphome/components/spi/__init__.py b/esphome/components/spi/__init__.py
index d116641373..10ea906a92 100644
--- a/esphome/components/spi/__init__.py
+++ b/esphome/components/spi/__init__.py
@@ -29,12 +29,15 @@ from esphome.const import (
     PLATFORM_ESP32,
     PLATFORM_ESP8266,
     PLATFORM_RP2040,
+    CONF_ALLOW_OTHER_USES,
+    CONF_DATA_PINS,
 )
 from esphome.core import coroutine_with_priority, CORE
 
 CODEOWNERS = ["@esphome/core", "@clydebarrow"]
 spi_ns = cg.esphome_ns.namespace("spi")
 SPIComponent = spi_ns.class_("SPIComponent", cg.Component)
+QuadSPIComponent = spi_ns.class_("QuadSPIComponent", cg.Component)
 SPIDevice = spi_ns.class_("SPIDevice")
 SPIDataRate = spi_ns.enum("SPIDataRate")
 SPIMode = spi_ns.enum("SPIMode")
@@ -190,12 +193,9 @@ def get_hw_spi(config, available):
 def validate_spi_config(config):
     available = list(range(len(get_hw_interface_list())))
     for spi in config:
+        # map pin number to schema
+        spi[CONF_CLK_PIN] = pins.gpio_output_pin_schema(spi[CONF_CLK_PIN])
         interface = spi[CONF_INTERFACE]
-        if spi[CONF_FORCE_SW]:
-            if interface == "any":
-                spi[CONF_INTERFACE] = interface = "software"
-            elif interface != "software":
-                raise cv.Invalid("force_sw is deprecated - use interface: software")
         if interface == "software":
             pass
         elif interface == "any":
@@ -229,6 +229,8 @@ def validate_spi_config(config):
             spi, spi[CONF_INTERFACE_INDEX]
         ):
             raise cv.Invalid("Invalid pin selections for hardware SPI interface")
+        if CONF_DATA_PINS in spi and CONF_INTERFACE_INDEX not in spi:
+            raise cv.Invalid("Quad mode requires a hardware interface")
 
     return config
 
@@ -249,14 +251,26 @@ def get_spi_interface(index):
     return "new SPIClass(HSPI)"
 
 
+# Do not use a pin schema for the number, as that will trigger a pin reuse error due to duplication of the
+# clock pin in the standard and quad schemas.
+clk_pin_validator = cv.maybe_simple_value(
+    {
+        cv.Required(CONF_NUMBER): cv.Any(cv.int_, cv.string),
+        cv.Optional(CONF_ALLOW_OTHER_USES): cv.boolean,
+    },
+    key=CONF_NUMBER,
+)
+
 SPI_SCHEMA = cv.All(
     cv.Schema(
         {
             cv.GenerateID(): cv.declare_id(SPIComponent),
-            cv.Required(CONF_CLK_PIN): pins.gpio_output_pin_schema,
+            cv.Required(CONF_CLK_PIN): clk_pin_validator,
             cv.Optional(CONF_MISO_PIN): pins.gpio_input_pin_schema,
             cv.Optional(CONF_MOSI_PIN): pins.gpio_output_pin_schema,
-            cv.Optional(CONF_FORCE_SW, default=False): cv.boolean,
+            cv.Optional(CONF_FORCE_SW): cv.invalid(
+                "force_sw is deprecated - use interface: software"
+            ),
             cv.Optional(CONF_INTERFACE, default="any"): cv.one_of(
                 *sum(get_hw_interface_list(), ["software", "hardware", "any"]),
                 lower=True,
@@ -267,8 +281,34 @@ SPI_SCHEMA = cv.All(
     cv.only_on([PLATFORM_ESP32, PLATFORM_ESP8266, PLATFORM_RP2040]),
 )
 
+SPI_QUAD_SCHEMA = cv.All(
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(QuadSPIComponent),
+            cv.Required(CONF_CLK_PIN): clk_pin_validator,
+            cv.Required(CONF_DATA_PINS): cv.All(
+                cv.ensure_list(pins.internal_gpio_output_pin_number),
+                cv.Length(min=4, max=4),
+            ),
+            cv.Optional(CONF_INTERFACE, default="hardware"): cv.one_of(
+                *sum(get_hw_interface_list(), ["hardware"]),
+                lower=True,
+            ),
+        }
+    ),
+    cv.only_with_esp_idf,
+)
+
 CONFIG_SCHEMA = cv.All(
-    cv.ensure_list(SPI_SCHEMA),
+    # Order is important. SPI_SCHEMA is the default.
+    cv.ensure_list(
+        cv.Any(
+            SPI_SCHEMA,
+            SPI_QUAD_SCHEMA,
+            msg="Standard SPI requires mosi_pin and/or miso_pin; quad SPI requires data_pins only."
+            + " A clock pin is always required",
+        ),
+    ),
     validate_spi_config,
 )
 
@@ -277,43 +317,46 @@ CONFIG_SCHEMA = cv.All(
 async def to_code(configs):
     cg.add_define("USE_SPI")
     cg.add_global(spi_ns.using)
+    if CORE.using_arduino:
+        cg.add_library("SPI", None)
     for spi in configs:
         var = cg.new_Pvariable(spi[CONF_ID])
         await cg.register_component(var, spi)
-
         clk = await cg.gpio_pin_expression(spi[CONF_CLK_PIN])
         cg.add(var.set_clk(clk))
-        if CONF_MISO_PIN in spi:
-            miso = await cg.gpio_pin_expression(spi[CONF_MISO_PIN])
-            cg.add(var.set_miso(miso))
-        if CONF_MOSI_PIN in spi:
-            mosi = await cg.gpio_pin_expression(spi[CONF_MOSI_PIN])
-            cg.add(var.set_mosi(mosi))
-        if CONF_INTERFACE_INDEX in spi:
-            index = spi[CONF_INTERFACE_INDEX]
-            cg.add(var.set_interface(cg.RawExpression(get_spi_interface(index))))
+        if miso := spi.get(CONF_MISO_PIN):
+            cg.add(var.set_miso(await cg.gpio_pin_expression(miso)))
+        if mosi := spi.get(CONF_MOSI_PIN):
+            cg.add(var.set_mosi(await cg.gpio_pin_expression(mosi)))
+        if data_pins := spi.get(CONF_DATA_PINS):
+            cg.add(var.set_data_pins(data_pins))
+        if (index := spi.get(CONF_INTERFACE_INDEX)) is not None:
+            interface = get_spi_interface(index)
+            cg.add(var.set_interface(cg.RawExpression(interface)))
             cg.add(
                 var.set_interface_name(
-                    re.sub(
-                        r"\W", "", get_spi_interface(index).replace("new SPIClass", "")
-                    )
+                    re.sub(r"\W", "", interface.replace("new SPIClass", ""))
                 )
             )
 
-    if CORE.using_arduino:
-        cg.add_library("SPI", None)
-
 
 def spi_device_schema(
-    cs_pin_required=True, default_data_rate=cv.UNDEFINED, default_mode=cv.UNDEFINED
+    cs_pin_required=True,
+    default_data_rate=cv.UNDEFINED,
+    default_mode=cv.UNDEFINED,
+    quad=False,
 ):
     """Create a schema for an SPI device.
     :param cs_pin_required: If true, make the CS_PIN required in the config.
     :param default_data_rate: Optional data_rate to use as default
+    :param default_mode Optional. The default SPI mode to use.
+    :param quad If set, will require an SPI component configured as quad data bits.
     :return: The SPI device schema, `extend` this in your config schema.
     """
     schema = {
-        cv.GenerateID(CONF_SPI_ID): cv.use_id(SPIComponent),
+        cv.GenerateID(CONF_SPI_ID): cv.use_id(
+            QuadSPIComponent if quad else SPIComponent
+        ),
         cv.Optional(CONF_DATA_RATE, default=default_data_rate): SPI_DATA_RATE_SCHEMA,
         cv.Optional(CONF_SPI_MODE, default=default_mode): cv.enum(
             SPI_MODE_OPTIONS, upper=True
diff --git a/esphome/components/spi/spi.cpp b/esphome/components/spi/spi.cpp
index 9d06ac0e45..b13826c443 100644
--- a/esphome/components/spi/spi.cpp
+++ b/esphome/components/spi/spi.cpp
@@ -49,7 +49,8 @@ void SPIComponent::setup() {
   }
 
   if (this->using_hw_) {
-    this->spi_bus_ = SPIComponent::get_bus(this->interface_, this->clk_pin_, this->sdo_pin_, this->sdi_pin_);
+    this->spi_bus_ =
+        SPIComponent::get_bus(this->interface_, this->clk_pin_, this->sdo_pin_, this->sdi_pin_, this->data_pins_);
     if (this->spi_bus_ == nullptr) {
       ESP_LOGE(TAG, "Unable to allocate SPI interface");
       this->mark_failed();
@@ -68,6 +69,9 @@ void SPIComponent::dump_config() {
   LOG_PIN("  CLK Pin: ", this->clk_pin_)
   LOG_PIN("  SDI Pin: ", this->sdi_pin_)
   LOG_PIN("  SDO Pin: ", this->sdo_pin_)
+  for (size_t i = 0; i != this->data_pins_.size(); i++) {
+    ESP_LOGCONFIG(TAG, "  Data pin %u: GPIO%d", i, this->data_pins_[i]);
+  }
   if (this->spi_bus_->is_hw()) {
     ESP_LOGCONFIG(TAG, "  Using HW SPI: %s", this->interface_name_);
   } else {
diff --git a/esphome/components/spi/spi.h b/esphome/components/spi/spi.h
index 0eb4cd7eb6..f581dc3f56 100644
--- a/esphome/components/spi/spi.h
+++ b/esphome/components/spi/spi.h
@@ -1,11 +1,12 @@
 #pragma once
 
+#include "esphome/core/application.h"
 #include "esphome/core/component.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/log.h"
-#include "esphome/core/application.h"
-#include <vector>
 #include <map>
+#include <utility>
+#include <vector>
 
 #ifdef USE_ARDUINO
 
@@ -208,6 +209,10 @@ class SPIDelegate {
     esph_log_e("spi_device", "variable length write not implemented");
   }
 
+  virtual void write_cmd_addr_data(size_t cmd_bits, uint32_t cmd, size_t addr_bits, uint32_t address,
+                                   const uint8_t *data, size_t length, uint8_t bus_width) {
+    esph_log_e("spi_device", "write_cmd_addr_data not implemented");
+  }
   // write 16 bits
   virtual void write16(uint16_t data) {
     if (this->bit_order_ == BIT_ORDER_MSB_FIRST) {
@@ -331,6 +336,7 @@ class SPIComponent : public Component {
   void set_miso(GPIOPin *sdi) { this->sdi_pin_ = sdi; }
 
   void set_mosi(GPIOPin *sdo) { this->sdo_pin_ = sdo; }
+  void set_data_pins(std::vector<uint8_t> pins) { this->data_pins_ = std::move(pins); }
 
   void set_interface(SPIInterface interface) {
     this->interface_ = interface;
@@ -348,15 +354,19 @@ class SPIComponent : public Component {
   GPIOPin *clk_pin_{nullptr};
   GPIOPin *sdi_pin_{nullptr};
   GPIOPin *sdo_pin_{nullptr};
+  std::vector<uint8_t> data_pins_{};
+
   SPIInterface interface_{};
   bool using_hw_{false};
   const char *interface_name_{nullptr};
   SPIBus *spi_bus_{};
   std::map<SPIClient *, SPIDelegate *> devices_;
 
-  static SPIBus *get_bus(SPIInterface interface, GPIOPin *clk, GPIOPin *sdo, GPIOPin *sdi);
+  static SPIBus *get_bus(SPIInterface interface, GPIOPin *clk, GPIOPin *sdo, GPIOPin *sdi,
+                         const std::vector<uint8_t> &data_pins);
 };
 
+using QuadSPIComponent = SPIComponent;
 /**
  * Base class for SPIDevice, un-templated.
  */
@@ -422,18 +432,49 @@ class SPIDevice : public SPIClient {
 
   void read_array(uint8_t *data, size_t length) { return this->delegate_->read_array(data, length); }
 
+  /**
+   * Write a single data item, up to 32 bits.
+   * @param data    The data
+   * @param num_bits The number of bits to write. The lower num_bits of data will be sent.
+   */
   void write(uint16_t data, size_t num_bits) { this->delegate_->write(data, num_bits); };
 
+  /* Write command, address and data. Command and address will be written as single-bit SPI,
+   * data phase can be multiple bit (currently only 1 or 4)
+   * @param cmd_bits Number of bits to write in the command phase
+   * @param cmd The command value to write
+   * @param addr_bits Number of bits to write in addr phase
+   * @param address Address data
+   * @param data Plain data bytes
+   * @param length Number of data bytes
+   * @param bus_width The number of data lines to use for the data phase.
+   */
+  void write_cmd_addr_data(size_t cmd_bits, uint32_t cmd, size_t addr_bits, uint32_t address, const uint8_t *data,
+                           size_t length, uint8_t bus_width = 1) {
+    this->delegate_->write_cmd_addr_data(cmd_bits, cmd, addr_bits, address, data, length, bus_width);
+  }
+
   void write_byte(uint8_t data) { this->delegate_->write_array(&data, 1); }
 
+  /**
+   * Write the array data, replace with received data.
+   * @param data
+   * @param length
+   */
   void transfer_array(uint8_t *data, size_t length) { this->delegate_->transfer(data, length); }
 
   uint8_t transfer_byte(uint8_t data) { return this->delegate_->transfer(data); }
 
-  // the driver will byte-swap if required.
+  /** Write 16 bit data. The driver will byte-swap if required.
+   */
   void write_byte16(uint16_t data) { this->delegate_->write16(data); }
 
-  // avoid use of this if possible. It's inefficient and ugly.
+  /**
+   * Write an array of data as 16 bit values, byte-swapping if required. Use of this should be avoided as
+   * it is horribly slow.
+   * @param data
+   * @param length
+   */
   void write_array16(const uint16_t *data, size_t length) { this->delegate_->write_array16(data, length); }
 
   void enable() { this->delegate_->begin_transaction(); }
diff --git a/esphome/components/spi/spi_arduino.cpp b/esphome/components/spi/spi_arduino.cpp
index 4628486550..f7fe523a33 100644
--- a/esphome/components/spi/spi_arduino.cpp
+++ b/esphome/components/spi/spi_arduino.cpp
@@ -85,7 +85,8 @@ class SPIBusHw : public SPIBus {
   bool is_hw() override { return true; }
 };
 
-SPIBus *SPIComponent::get_bus(SPIInterface interface, GPIOPin *clk, GPIOPin *sdo, GPIOPin *sdi) {
+SPIBus *SPIComponent::get_bus(SPIInterface interface, GPIOPin *clk, GPIOPin *sdo, GPIOPin *sdi,
+                              const std::vector<uint8_t> &data_pins) {
   return new SPIBusHw(clk, sdo, sdi, interface);
 }
 
diff --git a/esphome/components/spi/spi_esp_idf.cpp b/esphome/components/spi/spi_esp_idf.cpp
index 03ab298019..55680f72d3 100644
--- a/esphome/components/spi/spi_esp_idf.cpp
+++ b/esphome/components/spi/spi_esp_idf.cpp
@@ -104,6 +104,60 @@ class SPIDelegateHw : public SPIDelegate {
     }
   }
 
+  /**
+   * Write command, address and data
+   * @param cmd_bits Number of bits to write in the command phase
+   * @param cmd The command value to write
+   * @param addr_bits Number of bits to write in addr phase
+   * @param address Address data
+   * @param data Remaining data bytes
+   * @param length Number of data bytes
+   * @param bus_width The number of data lines to use
+   */
+  void write_cmd_addr_data(size_t cmd_bits, uint32_t cmd, size_t addr_bits, uint32_t address, const uint8_t *data,
+                           size_t length, uint8_t bus_width) override {
+    spi_transaction_ext_t desc = {};
+    if (length == 0 && cmd_bits == 0 && addr_bits == 0) {
+      esph_log_w(TAG, "Nothing to transfer");
+      return;
+    }
+    desc.base.flags = SPI_TRANS_VARIABLE_ADDR | SPI_TRANS_VARIABLE_CMD | SPI_TRANS_VARIABLE_DUMMY;
+    if (bus_width == 4) {
+      desc.base.flags |= SPI_TRANS_MODE_QIO;
+    } else if (bus_width == 8) {
+      desc.base.flags |= SPI_TRANS_MODE_OCT;
+    }
+    desc.command_bits = cmd_bits;
+    desc.address_bits = addr_bits;
+    desc.dummy_bits = 0;
+    desc.base.rxlength = 0;
+    desc.base.cmd = cmd;
+    desc.base.addr = address;
+    do {
+      size_t chunk_size = std::min(length, MAX_TRANSFER_SIZE);
+      if (data != nullptr && chunk_size != 0) {
+        desc.base.length = chunk_size * 8;
+        desc.base.tx_buffer = data;
+        length -= chunk_size;
+        data += chunk_size;
+      } else {
+        length = 0;
+        desc.base.length = 0;
+      }
+      esp_err_t err = spi_device_polling_start(this->handle_, (spi_transaction_t *) &desc, portMAX_DELAY);
+      if (err == ESP_OK) {
+        err = spi_device_polling_end(this->handle_, portMAX_DELAY);
+      }
+      if (err != ESP_OK) {
+        ESP_LOGE(TAG, "Transmit failed - err %X", err);
+        return;
+      }
+      // if more data is to be sent, skip the command and address phases.
+      desc.command_bits = 0;
+      desc.address_bits = 0;
+    } while (length != 0);
+  }
+
   void transfer(uint8_t *ptr, size_t length) override { this->transfer(ptr, ptr, length); }
 
   uint8_t transfer(uint8_t data) override {
@@ -142,13 +196,27 @@ class SPIDelegateHw : public SPIDelegate {
 
 class SPIBusHw : public SPIBus {
  public:
-  SPIBusHw(GPIOPin *clk, GPIOPin *sdo, GPIOPin *sdi, SPIInterface channel) : SPIBus(clk, sdo, sdi), channel_(channel) {
+  SPIBusHw(GPIOPin *clk, GPIOPin *sdo, GPIOPin *sdi, SPIInterface channel, std::vector<uint8_t> data_pins)
+      : SPIBus(clk, sdo, sdi), channel_(channel) {
     spi_bus_config_t buscfg = {};
-    buscfg.mosi_io_num = Utility::get_pin_no(sdo);
-    buscfg.miso_io_num = Utility::get_pin_no(sdi);
     buscfg.sclk_io_num = Utility::get_pin_no(clk);
-    buscfg.quadwp_io_num = -1;
-    buscfg.quadhd_io_num = -1;
+    buscfg.flags = SPICOMMON_BUSFLAG_MASTER | SPICOMMON_BUSFLAG_SCLK;
+    if (data_pins.empty()) {
+      buscfg.mosi_io_num = Utility::get_pin_no(sdo);
+      buscfg.miso_io_num = Utility::get_pin_no(sdi);
+      buscfg.quadwp_io_num = -1;
+      buscfg.quadhd_io_num = -1;
+    } else {
+      buscfg.data0_io_num = data_pins[0];
+      buscfg.data1_io_num = data_pins[1];
+      buscfg.data2_io_num = data_pins[2];
+      buscfg.data3_io_num = data_pins[3];
+      buscfg.data4_io_num = -1;
+      buscfg.data5_io_num = -1;
+      buscfg.data6_io_num = -1;
+      buscfg.data7_io_num = -1;
+      buscfg.flags |= SPICOMMON_BUSFLAG_QUAD;
+    }
     buscfg.max_transfer_sz = MAX_TRANSFER_SIZE;
     auto err = spi_bus_initialize(channel, &buscfg, SPI_DMA_CH_AUTO);
     if (err != ESP_OK)
@@ -166,8 +234,9 @@ class SPIBusHw : public SPIBus {
   bool is_hw() override { return true; }
 };
 
-SPIBus *SPIComponent::get_bus(SPIInterface interface, GPIOPin *clk, GPIOPin *sdo, GPIOPin *sdi) {
-  return new SPIBusHw(clk, sdo, sdi, interface);
+SPIBus *SPIComponent::get_bus(SPIInterface interface, GPIOPin *clk, GPIOPin *sdo, GPIOPin *sdi,
+                              const std::vector<uint8_t> &data_pins) {
+  return new SPIBusHw(clk, sdo, sdi, interface, data_pins);
 }
 
 #endif
diff --git a/tests/test8.1.yaml b/tests/test8.1.yaml
index bc1d2e22a4..839b1f3e6e 100644
--- a/tests/test8.1.yaml
+++ b/tests/test8.1.yaml
@@ -28,6 +28,15 @@ spi:
       allow_other_uses: false
     mosi_pin: GPIO6
     interface: any
+  - id: quad_spi
+    clk_pin: 47
+    data_pins:
+      -
+        number: 40
+        allow_other_uses: false
+      - 41
+      - 42
+      - 43
 
 spi_device:
   id: spidev

From 6561746f97c8473c5ec4a1e65bca337a4ea736d7 Mon Sep 17 00:00:00 2001
From: alexbuit <alexander@fambuit.nl>
Date: Fri, 19 Jan 2024 03:50:00 +0100
Subject: [PATCH 60/68] add AM2120 device type (#6115)

---
 esphome/components/dht/dht.cpp   | 2 +-
 esphome/components/dht/dht.h     | 2 ++
 esphome/components/dht/sensor.py | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/esphome/components/dht/dht.cpp b/esphome/components/dht/dht.cpp
index 07634cafdf..5112092073 100644
--- a/esphome/components/dht/dht.cpp
+++ b/esphome/components/dht/dht.cpp
@@ -91,7 +91,7 @@ bool HOT IRAM_ATTR DHT::read_sensor_(float *temperature, float *humidity, bool r
     delayMicroseconds(40);
   } else if (this->model_ == DHT_MODEL_DHT22_TYPE2) {
     delayMicroseconds(2000);
-  } else if (this->model_ == DHT_MODEL_AM2302) {
+  } else if (this->model_ == DHT_MODEL_AM2120 || this->model_ == DHT_MODEL_AM2302) {
     delayMicroseconds(1000);
   } else {
     delayMicroseconds(800);
diff --git a/esphome/components/dht/dht.h b/esphome/components/dht/dht.h
index f3a29f9ce9..327e8a4f5c 100644
--- a/esphome/components/dht/dht.h
+++ b/esphome/components/dht/dht.h
@@ -11,6 +11,7 @@ enum DHTModel {
   DHT_MODEL_AUTO_DETECT = 0,
   DHT_MODEL_DHT11,
   DHT_MODEL_DHT22,
+  DHT_MODEL_AM2120,
   DHT_MODEL_AM2302,
   DHT_MODEL_RHT03,
   DHT_MODEL_SI7021,
@@ -27,6 +28,7 @@ class DHT : public PollingComponent {
    *  - DHT_MODEL_AUTO_DETECT (default)
    *  - DHT_MODEL_DHT11
    *  - DHT_MODEL_DHT22
+   *  - DHT_MODEL_AM2120
    *  - DHT_MODEL_AM2302
    *  - DHT_MODEL_RHT03
    *  - DHT_MODEL_SI7021
diff --git a/esphome/components/dht/sensor.py b/esphome/components/dht/sensor.py
index cd1886728e..da92a97e1f 100644
--- a/esphome/components/dht/sensor.py
+++ b/esphome/components/dht/sensor.py
@@ -23,6 +23,7 @@ DHT_MODELS = {
     "AUTO_DETECT": DHTModel.DHT_MODEL_AUTO_DETECT,
     "DHT11": DHTModel.DHT_MODEL_DHT11,
     "DHT22": DHTModel.DHT_MODEL_DHT22,
+    "AM2120": DHTModel.DHT_MODEL_AM2120,
     "AM2302": DHTModel.DHT_MODEL_AM2302,
     "RHT03": DHTModel.DHT_MODEL_RHT03,
     "SI7021": DHTModel.DHT_MODEL_SI7021,

From ed771abc8aff491cae27bade58aa847a42acdd74 Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Fri, 19 Jan 2024 14:10:53 +1100
Subject: [PATCH 61/68] Add support for Waveshare EPD 2.13" V3 (#5363)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                                    |   1 +
 .../components/waveshare_epaper/__init__.py   |   1 +
 .../components/waveshare_epaper/display.py    |   4 +
 .../waveshare_epaper/waveshare_213v3.cpp      | 186 ++++++++++++++++++
 .../waveshare_epaper/waveshare_epaper.cpp     |  24 ++-
 .../waveshare_epaper/waveshare_epaper.h       |  37 +++-
 tests/test4.yaml                              |  19 +-
 7 files changed, 264 insertions(+), 8 deletions(-)
 create mode 100644 esphome/components/waveshare_epaper/waveshare_213v3.cpp

diff --git a/CODEOWNERS b/CODEOWNERS
index 95e3b35f56..db44317776 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -367,6 +367,7 @@ esphome/components/veml3235/* @kbx81
 esphome/components/version/* @esphome/core
 esphome/components/voice_assistant/* @jesserockz
 esphome/components/wake_on_lan/* @willwill2will54
+esphome/components/waveshare_epaper/* @clydebarrow
 esphome/components/web_server_base/* @OttoWinter
 esphome/components/web_server_idf/* @dentra
 esphome/components/whirlpool/* @glmnet
diff --git a/esphome/components/waveshare_epaper/__init__.py b/esphome/components/waveshare_epaper/__init__.py
index e69de29bb2..c58ce8a01e 100644
--- a/esphome/components/waveshare_epaper/__init__.py
+++ b/esphome/components/waveshare_epaper/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@clydebarrow"]
diff --git a/esphome/components/waveshare_epaper/display.py b/esphome/components/waveshare_epaper/display.py
index 1dd4b7fc54..1645ce0b1d 100644
--- a/esphome/components/waveshare_epaper/display.py
+++ b/esphome/components/waveshare_epaper/display.py
@@ -72,6 +72,9 @@ WaveshareEPaper7P5InHDB = waveshare_epaper_ns.class_(
 WaveshareEPaper2P13InDKE = waveshare_epaper_ns.class_(
     "WaveshareEPaper2P13InDKE", WaveshareEPaper
 )
+WaveshareEPaper2P13InV3 = waveshare_epaper_ns.class_(
+    "WaveshareEPaper2P13InV3", WaveshareEPaper
+)
 GDEW0154M09 = waveshare_epaper_ns.class_("GDEW0154M09", WaveshareEPaper)
 
 WaveshareEPaperTypeAModel = waveshare_epaper_ns.enum("WaveshareEPaperTypeAModel")
@@ -104,6 +107,7 @@ MODELS = {
     "7.50inv2alt": ("b", WaveshareEPaper7P5InV2alt),
     "7.50in-hd-b": ("b", WaveshareEPaper7P5InHDB),
     "2.13in-ttgo-dke": ("c", WaveshareEPaper2P13InDKE),
+    "2.13inv3": ("c", WaveshareEPaper2P13InV3),
     "1.54in-m5coreink-m09": ("c", GDEW0154M09),
 }
 
diff --git a/esphome/components/waveshare_epaper/waveshare_213v3.cpp b/esphome/components/waveshare_epaper/waveshare_213v3.cpp
new file mode 100644
index 0000000000..196aeed3f7
--- /dev/null
+++ b/esphome/components/waveshare_epaper/waveshare_213v3.cpp
@@ -0,0 +1,186 @@
+#include "waveshare_epaper.h"
+#include "esphome/core/log.h"
+#include "esphome/core/application.h"
+
+namespace esphome {
+namespace waveshare_epaper {
+
+static const char *const TAG = "waveshare_2.13v3";
+
+static const uint8_t PARTIAL_LUT[] = {
+    0x32,  // cmd
+    0x0,  0x40, 0x0, 0x0, 0x0,  0x0,  0x0,  0x0,  0x0,  0x0,  0x0, 0x0, 0x80, 0x80, 0x0, 0x0, 0x0, 0x0,  0x0, 0x0,
+    0x0,  0x0,  0x0, 0x0, 0x40, 0x40, 0x0,  0x0,  0x0,  0x0,  0x0, 0x0, 0x0,  0x0,  0x0, 0x0, 0x0, 0x80, 0x0, 0x0,
+    0x0,  0x0,  0x0, 0x0, 0x0,  0x0,  0x0,  0x0,  0x0,  0x0,  0x0, 0x0, 0x0,  0x0,  0x0, 0x0, 0x0, 0x0,  0x0, 0x0,
+    0xF,  0x0,  0x0, 0x0, 0x0,  0x0,  0x0,  0x4,  0x0,  0x0,  0x0, 0x0, 0x0,  0x0,  0x0, 0x0, 0x0, 0x0,  0x0, 0x0,
+    0x0,  0x0,  0x0, 0x0, 0x0,  0x0,  0x0,  0x0,  0x0,  0x0,  0x0, 0x0, 0x0,  0x0,  0x0, 0x0, 0x0, 0x0,  0x0, 0x0,
+    0x0,  0x0,  0x0, 0x0, 0x0,  0x0,  0x0,  0x0,  0x0,  0x0,  0x0, 0x0, 0x0,  0x0,  0x0, 0x0, 0x0, 0x0,  0x0, 0x0,
+    0x0,  0x0,  0x1, 0x0, 0x0,  0x0,  0x0,  0x0,  0x0,  0x1,  0x0, 0x0, 0x0,  0x0,  0x0, 0x0, 0x0, 0x0,  0x0, 0x0,
+    0x0,  0x0,  0x0, 0x0, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x0, 0x0, 0x0,
+};
+
+static const uint8_t FULL_LUT[] = {
+    0x32,  // CMD
+    0x80, 0x4A, 0x40, 0x0, 0x0,  0x0,  0x0,  0x0,  0x0,  0x0,  0x0, 0x0, 0x40, 0x4A, 0x80, 0x0, 0x0,  0x0,  0x0,  0x0,
+    0x0,  0x0,  0x0,  0x0, 0x80, 0x4A, 0x40, 0x0,  0x0,  0x0,  0x0, 0x0, 0x0,  0x0,  0x0,  0x0, 0x40, 0x4A, 0x80, 0x0,
+    0x0,  0x0,  0x0,  0x0, 0x0,  0x0,  0x0,  0x0,  0x0,  0x0,  0x0, 0x0, 0x0,  0x0,  0x0,  0x0, 0x0,  0x0,  0x0,  0x0,
+    0xF,  0x0,  0x0,  0x0, 0x0,  0x0,  0x0,  0xF,  0x0,  0x0,  0xF, 0x0, 0x0,  0x2,  0xF,  0x0, 0x0,  0x0,  0x0,  0x0,
+    0x0,  0x1,  0x0,  0x0, 0x0,  0x0,  0x0,  0x0,  0x0,  0x0,  0x0, 0x0, 0x0,  0x0,  0x0,  0x0, 0x0,  0x0,  0x0,  0x0,
+    0x0,  0x0,  0x0,  0x0, 0x0,  0x0,  0x0,  0x0,  0x0,  0x0,  0x0, 0x0, 0x0,  0x0,  0x0,  0x0, 0x0,  0x0,  0x0,  0x0,
+    0x0,  0x0,  0x0,  0x0, 0x0,  0x0,  0x0,  0x0,  0x0,  0x0,  0x0, 0x0, 0x0,  0x0,  0x0,  0x0, 0x0,  0x0,  0x0,  0x0,
+    0x0,  0x0,  0x0,  0x0, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x0, 0x0, 0x0,
+};
+
+static const uint8_t SW_RESET = 0x12;
+static const uint8_t ACTIVATE = 0x20;
+static const uint8_t WRITE_BUFFER = 0x24;
+static const uint8_t WRITE_BASE = 0x26;
+
+static const uint8_t DRV_OUT_CTL[] = {0x01, 0x27, 0x01, 0x00};  // driver output control
+static const uint8_t GATEV[] = {0x03, 0x17};
+static const uint8_t SRCV[] = {0x04, 0x41, 0x0C, 0x32};
+static const uint8_t SLEEP[] = {0x10, 0x01};
+static const uint8_t DATA_ENTRY[] = {0x11, 0x03};            // data entry mode
+static const uint8_t TEMP_SENS[] = {0x18, 0x80};             // Temp sensor
+static const uint8_t DISPLAY_UPDATE[] = {0x21, 0x00, 0x80};  // Display update control
+static const uint8_t UPSEQ[] = {0x22, 0xC0};
+static const uint8_t ON_FULL[] = {0x22, 0xC7};
+static const uint8_t ON_PARTIAL[] = {0x22, 0x0F};
+static const uint8_t VCOM[] = {0x2C, 0x36};
+static const uint8_t CMD5[] = {0x37, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00};
+static const uint8_t BORDER_PART[] = {0x3C, 0x80};  // border waveform
+static const uint8_t BORDER_FULL[] = {0x3C, 0x05};  // border waveform
+static const uint8_t CMD1[] = {0x3F, 0x22};
+static const uint8_t RAM_X_START[] = {0x44, 0x00, 121 / 8};           // set ram_x_address_start_end
+static const uint8_t RAM_Y_START[] = {0x45, 0x00, 0x00, 250 - 1, 0};  // set ram_y_address_start_end
+static const uint8_t RAM_X_POS[] = {0x4E, 0x00};                      // set ram_x_address_counter
+// static const uint8_t RAM_Y_POS[] = {0x4F, 0x00, 0x00};        // set ram_y_address_counter
+#define SEND(x) this->cmd_data(x, sizeof(x))
+
+void WaveshareEPaper2P13InV3::write_lut_(const uint8_t *lut) {
+  this->wait_until_idle_();
+  this->cmd_data(lut, sizeof(PARTIAL_LUT));
+  SEND(CMD1);
+  SEND(GATEV);
+  SEND(SRCV);
+  SEND(VCOM);
+}
+
+// write the buffer starting on line top, up to line bottom.
+void WaveshareEPaper2P13InV3::write_buffer_(uint8_t cmd, int top, int bottom) {
+  this->wait_until_idle_();
+  this->set_window_(top, bottom);
+  this->command(cmd);
+  this->start_data_();
+  auto width_bytes = this->get_width_internal() / 8;
+  this->write_array(this->buffer_ + top * width_bytes, (bottom - top) * width_bytes);
+  this->end_data_();
+}
+
+void WaveshareEPaper2P13InV3::send_reset_() {
+  if (this->reset_pin_ != nullptr) {
+    this->reset_pin_->digital_write(false);
+    delay(2);
+    this->reset_pin_->digital_write(true);
+  }
+}
+
+void WaveshareEPaper2P13InV3::setup() {
+  setup_pins_();
+  delay(20);
+  this->send_reset_();
+  // as a one-off delay this is not worth working around.
+  delay(100);  // NOLINT
+  this->wait_until_idle_();
+  this->command(SW_RESET);
+  this->wait_until_idle_();
+
+  SEND(DRV_OUT_CTL);
+  SEND(DATA_ENTRY);
+  SEND(CMD5);
+  this->set_window_(0, this->get_height_internal());
+  SEND(BORDER_FULL);
+  SEND(DISPLAY_UPDATE);
+  SEND(TEMP_SENS);
+  this->wait_until_idle_();
+  this->write_lut_(FULL_LUT);
+}
+
+// t and b are y positions, i.e. line numbers.
+void WaveshareEPaper2P13InV3::set_window_(int t, int b) {
+  uint8_t buffer[3];
+
+  SEND(RAM_X_START);
+  SEND(RAM_Y_START);
+  SEND(RAM_X_POS);
+  buffer[0] = 0x4F;
+  buffer[1] = (uint8_t) t;
+  buffer[2] = (uint8_t) (t >> 8);
+  SEND(buffer);
+}
+
+// must implement, but we override setup to have more control
+void WaveshareEPaper2P13InV3::initialize() {}
+
+void WaveshareEPaper2P13InV3::partial_update_() {
+  this->send_reset_();
+  this->set_timeout(100, [this] {
+    this->write_lut_(PARTIAL_LUT);
+    SEND(BORDER_PART);
+    SEND(UPSEQ);
+    this->command(ACTIVATE);
+    this->set_timeout(100, [this] {
+      this->wait_until_idle_();
+      this->write_buffer_(WRITE_BUFFER, 0, this->get_height_internal());
+      SEND(ON_PARTIAL);
+      this->command(ACTIVATE);  // Activate Display Update Sequence
+      this->is_busy_ = false;
+    });
+  });
+}
+
+void WaveshareEPaper2P13InV3::full_update_() {
+  ESP_LOGI(TAG, "Performing full e-paper update.");
+  this->write_lut_(FULL_LUT);
+  this->write_buffer_(WRITE_BUFFER, 0, this->get_height_internal());
+  this->write_buffer_(WRITE_BASE, 0, this->get_height_internal());
+  SEND(ON_FULL);
+  this->command(ACTIVATE);  // don't wait here
+  this->is_busy_ = false;
+}
+
+void WaveshareEPaper2P13InV3::display() {
+  if (this->is_busy_ || (this->busy_pin_ != nullptr && this->busy_pin_->digital_read()))
+    return;
+  this->is_busy_ = true;
+  const bool partial = this->at_update_ != 0;
+  this->at_update_ = (this->at_update_ + 1) % this->full_update_every_;
+  if (partial) {
+    this->partial_update_();
+  } else {
+    this->full_update_();
+  }
+}
+
+int WaveshareEPaper2P13InV3::get_width_internal() { return 128; }
+
+int WaveshareEPaper2P13InV3::get_height_internal() { return 250; }
+
+uint32_t WaveshareEPaper2P13InV3::idle_timeout_() { return 5000; }
+
+void WaveshareEPaper2P13InV3::dump_config() {
+  LOG_DISPLAY("", "Waveshare E-Paper", this)
+  ESP_LOGCONFIG(TAG, "  Model: 2.13inV3");
+  LOG_PIN("  CS Pin: ", this->cs_)
+  LOG_PIN("  Reset Pin: ", this->reset_pin_)
+  LOG_PIN("  DC Pin: ", this->dc_pin_)
+  LOG_PIN("  Busy Pin: ", this->busy_pin_)
+  LOG_UPDATE_INTERVAL(this)
+}
+
+void WaveshareEPaper2P13InV3::set_full_update_every(uint32_t full_update_every) {
+  this->full_update_every_ = full_update_every;
+}
+
+}  // namespace waveshare_epaper
+}  // namespace esphome
diff --git a/esphome/components/waveshare_epaper/waveshare_epaper.cpp b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
index 244b3b1ce2..b0946ad9d0 100644
--- a/esphome/components/waveshare_epaper/waveshare_epaper.cpp
+++ b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
@@ -109,8 +109,20 @@ void WaveshareEPaper::data(uint8_t value) {
   this->write_byte(value);
   this->end_data_();
 }
+
+// write a command followed by one or more bytes of data.
+// The command is the first byte, length is the total including cmd.
+void WaveshareEPaper::cmd_data(const uint8_t *c_data, size_t length) {
+  this->dc_pin_->digital_write(false);
+  this->enable();
+  this->write_byte(c_data[0]);
+  this->dc_pin_->digital_write(true);
+  this->write_array(c_data + 1, length - 1);
+  this->disable();
+}
+
 bool WaveshareEPaper::wait_until_idle_() {
-  if (this->busy_pin_ == nullptr) {
+  if (this->busy_pin_ == nullptr || !this->busy_pin_->digital_read()) {
     return true;
   }
 
@@ -120,7 +132,7 @@ bool WaveshareEPaper::wait_until_idle_() {
       ESP_LOGE(TAG, "Timeout while displaying image!");
       return false;
     }
-    delay(10);
+    delay(1);
   }
   return true;
 }
@@ -2218,8 +2230,9 @@ void HOT WaveshareEPaper2P13InDKE::display() {
   } else {
     // set up partial update
     this->command(0x32);
-    for (uint8_t v : PART_UPDATE_LUT_TTGO_DKE)
-      this->data(v);
+    this->start_data_();
+    this->write_array(PART_UPDATE_LUT_TTGO_DKE, sizeof(PART_UPDATE_LUT_TTGO_DKE));
+    this->end_data_();
     this->command(0x3F);
     this->data(0x22);
 
@@ -2264,12 +2277,10 @@ void HOT WaveshareEPaper2P13InDKE::display() {
     this->wait_until_idle_();
 
     // data must be sent again on partial update
-    delay(300);  // NOLINT
     this->command(0x24);
     this->start_data_();
     this->write_array(this->buffer_, this->get_buffer_length_());
     this->end_data_();
-    delay(300);  // NOLINT
   }
 
   ESP_LOGI(TAG, "Completed e-paper update.");
@@ -2281,6 +2292,7 @@ uint32_t WaveshareEPaper2P13InDKE::idle_timeout_() { return 5000; }
 void WaveshareEPaper2P13InDKE::dump_config() {
   LOG_DISPLAY("", "Waveshare E-Paper", this);
   ESP_LOGCONFIG(TAG, "  Model: 2.13inDKE");
+  LOG_PIN("  CS Pin: ", this->cs_);
   LOG_PIN("  Reset Pin: ", this->reset_pin_);
   LOG_PIN("  DC Pin: ", this->dc_pin_);
   LOG_PIN("  Busy Pin: ", this->busy_pin_);
diff --git a/esphome/components/waveshare_epaper/waveshare_epaper.h b/esphome/components/waveshare_epaper/waveshare_epaper.h
index ee9443e8be..0f1144ccba 100644
--- a/esphome/components/waveshare_epaper/waveshare_epaper.h
+++ b/esphome/components/waveshare_epaper/waveshare_epaper.h
@@ -19,6 +19,7 @@ class WaveshareEPaper : public display::DisplayBuffer,
 
   void command(uint8_t value);
   void data(uint8_t value);
+  void cmd_data(const uint8_t *data, size_t length);
 
   virtual void display() = 0;
   virtual void initialize() = 0;
@@ -49,7 +50,7 @@ class WaveshareEPaper : public display::DisplayBuffer,
       this->reset_pin_->digital_write(false);
       delay(reset_duration_);  // NOLINT
       this->reset_pin_->digital_write(true);
-      delay(200);  // NOLINT
+      delay(20);
     }
   }
 
@@ -614,5 +615,39 @@ class WaveshareEPaper2P13InDKE : public WaveshareEPaper {
   uint32_t at_update_{0};
 };
 
+class WaveshareEPaper2P13InV3 : public WaveshareEPaper {
+ public:
+  void display() override;
+
+  void dump_config() override;
+
+  void deep_sleep() override {
+    // COMMAND POWER DOWN
+    this->command(0x10);
+    this->data(0x01);
+    // cannot wait until idle here, the device no longer responds
+  }
+
+  void set_full_update_every(uint32_t full_update_every);
+
+  void setup() override;
+  void initialize() override;
+
+ protected:
+  int get_width_internal() override;
+  int get_height_internal() override;
+  uint32_t idle_timeout_() override;
+
+  void write_buffer_(uint8_t cmd, int top, int bottom);
+  void set_window_(int t, int b);
+  void send_reset_();
+  void partial_update_();
+  void full_update_();
+
+  uint32_t full_update_every_{30};
+  uint32_t at_update_{0};
+  bool is_busy_{false};
+  void write_lut_(const uint8_t *lut);
+};
 }  // namespace waveshare_epaper
 }  // namespace esphome
diff --git a/tests/test4.yaml b/tests/test4.yaml
index 089caf073b..65068871dd 100644
--- a/tests/test4.yaml
+++ b/tests/test4.yaml
@@ -693,7 +693,6 @@ display:
     greyscale: false
     partial_updating: false
     update_interval: 60s
-
     display_data_1_pin:
       number: GPIO5
       allow_other_uses: true
@@ -742,6 +741,24 @@ display:
     vcom_pin:
       number: GPIO1
       allow_other_uses: true
+  - platform: waveshare_epaper
+    spi_id: spi_id_1
+    cs_pin:
+      number: GPIO23
+      allow_other_uses: true
+    dc_pin:
+      number: GPIO23
+      allow_other_uses: true
+    busy_pin:
+      number: GPIO23
+      allow_other_uses: true
+    reset_pin:
+      number: GPIO23
+      allow_other_uses: true
+    model: 2.13inv3
+    full_update_every: 30
+    lambda: |-
+      it.rectangle(0, 0, it.get_width(), it.get_height());
 
 number:
   - platform: tuya

From 6a8da17ea39146e5aedacdcc051fca1fd7c1cd51 Mon Sep 17 00:00:00 2001
From: tomaszduda23 <tomaszduda23@gmail.com>
Date: Fri, 19 Jan 2024 05:18:06 +0100
Subject: [PATCH 62/68] OTA 2 which confirm each written chunk (#6066)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/ota/__init__.py       |  3 ++
 esphome/components/ota/ota_component.cpp | 16 ++++++--
 esphome/components/ota/ota_component.h   | 47 +++++++++++-----------
 esphome/core/defines.h                   |  1 +
 esphome/espota2.py                       | 51 +++++++++++++-----------
 tests/test3.1.yaml                       |  1 +
 6 files changed, 70 insertions(+), 49 deletions(-)

diff --git a/esphome/components/ota/__init__.py b/esphome/components/ota/__init__.py
index 039596d897..3c845490dc 100644
--- a/esphome/components/ota/__init__.py
+++ b/esphome/components/ota/__init__.py
@@ -12,6 +12,7 @@ from esphome.const import (
     CONF_TRIGGER_ID,
     CONF_OTA,
     KEY_PAST_SAFE_MODE,
+    CONF_VERSION,
 )
 from esphome.core import CORE, coroutine_with_priority
 
@@ -41,6 +42,7 @@ CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(OTAComponent),
         cv.Optional(CONF_SAFE_MODE, default=True): cv.boolean,
+        cv.Optional(CONF_VERSION, default=2): cv.one_of(1, 2, int=True),
         cv.SplitDefault(
             CONF_PORT,
             esp8266=8266,
@@ -93,6 +95,7 @@ async def to_code(config):
     if CONF_PASSWORD in config:
         cg.add(var.set_auth_password(config[CONF_PASSWORD]))
         cg.add_define("USE_OTA_PASSWORD")
+    cg.add_define("USE_OTA_VERSION", config[CONF_VERSION])
 
     await cg.register_component(var, config)
 
diff --git a/esphome/components/ota/ota_component.cpp b/esphome/components/ota/ota_component.cpp
index 41cf333be9..15af14ff1a 100644
--- a/esphome/components/ota/ota_component.cpp
+++ b/esphome/components/ota/ota_component.cpp
@@ -20,8 +20,7 @@ namespace esphome {
 namespace ota {
 
 static const char *const TAG = "ota";
-
-static const uint8_t OTA_VERSION_1_0 = 1;
+static constexpr u_int16_t OTA_BLOCK_SIZE = 8192;
 
 OTAComponent *global_ota_component = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 
@@ -101,6 +100,7 @@ void OTAComponent::dump_config() {
     ESP_LOGCONFIG(TAG, "  Using Password.");
   }
 #endif
+  ESP_LOGCONFIG(TAG, "  OTA version: %d.", USE_OTA_VERSION);
   if (this->has_safe_mode_ && this->safe_mode_rtc_value_ > 1 &&
       this->safe_mode_rtc_value_ != esphome::ota::OTAComponent::ENTER_SAFE_MODE_MAGIC) {
     ESP_LOGW(TAG, "Last Boot was an unhandled reset, will proceed to safe mode in %" PRIu32 " restarts",
@@ -132,6 +132,9 @@ void OTAComponent::handle_() {
   uint8_t ota_features;
   std::unique_ptr<OTABackend> backend;
   (void) ota_features;
+#if USE_OTA_VERSION == 2
+  size_t size_acknowledged = 0;
+#endif
 
   if (client_ == nullptr) {
     struct sockaddr_storage source_addr;
@@ -168,7 +171,7 @@ void OTAComponent::handle_() {
 
   // Send OK and version - 2 bytes
   buf[0] = OTA_RESPONSE_OK;
-  buf[1] = OTA_VERSION_1_0;
+  buf[1] = USE_OTA_VERSION;
   this->writeall_(buf, 2);
 
   backend = make_ota_backend();
@@ -312,6 +315,13 @@ void OTAComponent::handle_() {
       goto error;  // NOLINT(cppcoreguidelines-avoid-goto)
     }
     total += read;
+#if USE_OTA_VERSION == 2
+    while (size_acknowledged + OTA_BLOCK_SIZE <= total || (total == ota_size && size_acknowledged < ota_size)) {
+      buf[0] = OTA_RESPONSE_CHUNK_OK;
+      this->writeall_(buf, 1);
+      size_acknowledged += OTA_BLOCK_SIZE;
+    }
+#endif
 
     uint32_t now = millis();
     if (now - last_progress > 1000) {
diff --git a/esphome/components/ota/ota_component.h b/esphome/components/ota/ota_component.h
index 50d095be6c..c20f4f0709 100644
--- a/esphome/components/ota/ota_component.h
+++ b/esphome/components/ota/ota_component.h
@@ -10,31 +10,32 @@ namespace esphome {
 namespace ota {
 
 enum OTAResponseTypes {
-  OTA_RESPONSE_OK = 0,
-  OTA_RESPONSE_REQUEST_AUTH = 1,
+  OTA_RESPONSE_OK = 0x00,
+  OTA_RESPONSE_REQUEST_AUTH = 0x01,
 
-  OTA_RESPONSE_HEADER_OK = 64,
-  OTA_RESPONSE_AUTH_OK = 65,
-  OTA_RESPONSE_UPDATE_PREPARE_OK = 66,
-  OTA_RESPONSE_BIN_MD5_OK = 67,
-  OTA_RESPONSE_RECEIVE_OK = 68,
-  OTA_RESPONSE_UPDATE_END_OK = 69,
-  OTA_RESPONSE_SUPPORTS_COMPRESSION = 70,
+  OTA_RESPONSE_HEADER_OK = 0x40,
+  OTA_RESPONSE_AUTH_OK = 0x41,
+  OTA_RESPONSE_UPDATE_PREPARE_OK = 0x42,
+  OTA_RESPONSE_BIN_MD5_OK = 0x43,
+  OTA_RESPONSE_RECEIVE_OK = 0x44,
+  OTA_RESPONSE_UPDATE_END_OK = 0x45,
+  OTA_RESPONSE_SUPPORTS_COMPRESSION = 0x46,
+  OTA_RESPONSE_CHUNK_OK = 0x47,
 
-  OTA_RESPONSE_ERROR_MAGIC = 128,
-  OTA_RESPONSE_ERROR_UPDATE_PREPARE = 129,
-  OTA_RESPONSE_ERROR_AUTH_INVALID = 130,
-  OTA_RESPONSE_ERROR_WRITING_FLASH = 131,
-  OTA_RESPONSE_ERROR_UPDATE_END = 132,
-  OTA_RESPONSE_ERROR_INVALID_BOOTSTRAPPING = 133,
-  OTA_RESPONSE_ERROR_WRONG_CURRENT_FLASH_CONFIG = 134,
-  OTA_RESPONSE_ERROR_WRONG_NEW_FLASH_CONFIG = 135,
-  OTA_RESPONSE_ERROR_ESP8266_NOT_ENOUGH_SPACE = 136,
-  OTA_RESPONSE_ERROR_ESP32_NOT_ENOUGH_SPACE = 137,
-  OTA_RESPONSE_ERROR_NO_UPDATE_PARTITION = 138,
-  OTA_RESPONSE_ERROR_MD5_MISMATCH = 139,
-  OTA_RESPONSE_ERROR_RP2040_NOT_ENOUGH_SPACE = 140,
-  OTA_RESPONSE_ERROR_UNKNOWN = 255,
+  OTA_RESPONSE_ERROR_MAGIC = 0x80,
+  OTA_RESPONSE_ERROR_UPDATE_PREPARE = 0x81,
+  OTA_RESPONSE_ERROR_AUTH_INVALID = 0x82,
+  OTA_RESPONSE_ERROR_WRITING_FLASH = 0x83,
+  OTA_RESPONSE_ERROR_UPDATE_END = 0x84,
+  OTA_RESPONSE_ERROR_INVALID_BOOTSTRAPPING = 0x85,
+  OTA_RESPONSE_ERROR_WRONG_CURRENT_FLASH_CONFIG = 0x86,
+  OTA_RESPONSE_ERROR_WRONG_NEW_FLASH_CONFIG = 0x87,
+  OTA_RESPONSE_ERROR_ESP8266_NOT_ENOUGH_SPACE = 0x88,
+  OTA_RESPONSE_ERROR_ESP32_NOT_ENOUGH_SPACE = 0x89,
+  OTA_RESPONSE_ERROR_NO_UPDATE_PARTITION = 0x8A,
+  OTA_RESPONSE_ERROR_MD5_MISMATCH = 0x8B,
+  OTA_RESPONSE_ERROR_RP2040_NOT_ENOUGH_SPACE = 0x8C,
+  OTA_RESPONSE_ERROR_UNKNOWN = 0xFF,
 };
 
 enum OTAState { OTA_COMPLETED = 0, OTA_STARTED, OTA_IN_PROGRESS, OTA_ERROR };
diff --git a/esphome/core/defines.h b/esphome/core/defines.h
index e75abdb88f..75ed24ddfe 100644
--- a/esphome/core/defines.h
+++ b/esphome/core/defines.h
@@ -37,6 +37,7 @@
 #define USE_OTA
 #define USE_OTA_PASSWORD
 #define USE_OTA_STATE_CALLBACK
+#define USE_OTA_VERSION 1
 #define USE_OUTPUT
 #define USE_POWER_SUPPLY
 #define USE_QR_CODE
diff --git a/esphome/espota2.py b/esphome/espota2.py
index dbf48a989a..cdf6d7df32 100644
--- a/esphome/espota2.py
+++ b/esphome/espota2.py
@@ -12,32 +12,34 @@ import time
 from esphome.core import EsphomeError
 from esphome.helpers import is_ip_address, resolve_ip_address
 
-RESPONSE_OK = 0
-RESPONSE_REQUEST_AUTH = 1
+RESPONSE_OK = 0x00
+RESPONSE_REQUEST_AUTH = 0x01
 
-RESPONSE_HEADER_OK = 64
-RESPONSE_AUTH_OK = 65
-RESPONSE_UPDATE_PREPARE_OK = 66
-RESPONSE_BIN_MD5_OK = 67
-RESPONSE_RECEIVE_OK = 68
-RESPONSE_UPDATE_END_OK = 69
-RESPONSE_SUPPORTS_COMPRESSION = 70
+RESPONSE_HEADER_OK = 0x40
+RESPONSE_AUTH_OK = 0x41
+RESPONSE_UPDATE_PREPARE_OK = 0x42
+RESPONSE_BIN_MD5_OK = 0x43
+RESPONSE_RECEIVE_OK = 0x44
+RESPONSE_UPDATE_END_OK = 0x45
+RESPONSE_SUPPORTS_COMPRESSION = 0x46
+RESPONSE_CHUNK_OK = 0x47
 
-RESPONSE_ERROR_MAGIC = 128
-RESPONSE_ERROR_UPDATE_PREPARE = 129
-RESPONSE_ERROR_AUTH_INVALID = 130
-RESPONSE_ERROR_WRITING_FLASH = 131
-RESPONSE_ERROR_UPDATE_END = 132
-RESPONSE_ERROR_INVALID_BOOTSTRAPPING = 133
-RESPONSE_ERROR_WRONG_CURRENT_FLASH_CONFIG = 134
-RESPONSE_ERROR_WRONG_NEW_FLASH_CONFIG = 135
-RESPONSE_ERROR_ESP8266_NOT_ENOUGH_SPACE = 136
-RESPONSE_ERROR_ESP32_NOT_ENOUGH_SPACE = 137
-RESPONSE_ERROR_NO_UPDATE_PARTITION = 138
-RESPONSE_ERROR_MD5_MISMATCH = 139
-RESPONSE_ERROR_UNKNOWN = 255
+RESPONSE_ERROR_MAGIC = 0x80
+RESPONSE_ERROR_UPDATE_PREPARE = 0x81
+RESPONSE_ERROR_AUTH_INVALID = 0x82
+RESPONSE_ERROR_WRITING_FLASH = 0x83
+RESPONSE_ERROR_UPDATE_END = 0x84
+RESPONSE_ERROR_INVALID_BOOTSTRAPPING = 0x85
+RESPONSE_ERROR_WRONG_CURRENT_FLASH_CONFIG = 0x86
+RESPONSE_ERROR_WRONG_NEW_FLASH_CONFIG = 0x87
+RESPONSE_ERROR_ESP8266_NOT_ENOUGH_SPACE = 0x88
+RESPONSE_ERROR_ESP32_NOT_ENOUGH_SPACE = 0x89
+RESPONSE_ERROR_NO_UPDATE_PARTITION = 0x8A
+RESPONSE_ERROR_MD5_MISMATCH = 0x8B
+RESPONSE_ERROR_UNKNOWN = 0xFF
 
 OTA_VERSION_1_0 = 1
+OTA_VERSION_2_0 = 2
 
 MAGIC_BYTES = [0x6C, 0x26, 0xF7, 0x5C, 0x45]
 
@@ -203,7 +205,8 @@ def perform_ota(
     send_check(sock, MAGIC_BYTES, "magic bytes")
 
     _, version = receive_exactly(sock, 2, "version", RESPONSE_OK)
-    if version != OTA_VERSION_1_0:
+    _LOGGER.debug("Device support OTA version: %s", version)
+    if version not in (OTA_VERSION_1_0, OTA_VERSION_2_0):
         raise OTAError(f"Unsupported OTA version {version}")
 
     # Features
@@ -279,6 +282,8 @@ def perform_ota(
 
         try:
             sock.sendall(chunk)
+            if version >= OTA_VERSION_2_0:
+                receive_exactly(sock, 1, "chunk OK", RESPONSE_CHUNK_OK)
         except OSError as err:
             sys.stderr.write("\n")
             raise OTAError(f"Error sending data: {err}") from err
diff --git a/tests/test3.1.yaml b/tests/test3.1.yaml
index b5428abbfa..5cbdca91c1 100644
--- a/tests/test3.1.yaml
+++ b/tests/test3.1.yaml
@@ -49,6 +49,7 @@ spi:
     number: GPIO14
 
 ota:
+  version: 2
 
 logger:
 

From 2f09624c07d8b24c174b58ea27230f459b65df08 Mon Sep 17 00:00:00 2001
From: Stefan Rado <628587+kroimon@users.noreply.github.com>
Date: Fri, 19 Jan 2024 14:30:57 +0100
Subject: [PATCH 63/68] Remove optional<> for pointer types (#6120)

---
 esphome/components/bedjet/bedjet_hub.cpp | 12 +++++-------
 esphome/components/bedjet/bedjet_hub.h   |  2 +-
 esphome/components/tuya/tuya.cpp         | 20 ++++++++------------
 esphome/components/tuya/tuya.h           |  4 ++--
 4 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/esphome/components/bedjet/bedjet_hub.cpp b/esphome/components/bedjet/bedjet_hub.cpp
index 7933a35a97..6404298697 100644
--- a/esphome/components/bedjet/bedjet_hub.cpp
+++ b/esphome/components/bedjet/bedjet_hub.cpp
@@ -242,7 +242,7 @@ void BedJetHub::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
         this->set_notify_(true);
 
 #ifdef USE_TIME
-        if (this->time_id_.has_value()) {
+        if (this->time_id_ != nullptr) {
           this->send_local_time();
         }
 #endif
@@ -441,9 +441,8 @@ uint8_t BedJetHub::write_notify_config_descriptor_(bool enable) {
 
 #ifdef USE_TIME
 void BedJetHub::send_local_time() {
-  if (this->time_id_.has_value()) {
-    auto *time_id = *this->time_id_;
-    ESPTime now = time_id->now();
+  if (this->time_id_ != nullptr) {
+    ESPTime now = this->time_id_->now();
     if (now.is_valid()) {
       this->set_clock(now.hour, now.minute);
       ESP_LOGD(TAG, "Using time component to set BedJet clock: %d:%02d", now.hour, now.minute);
@@ -454,10 +453,9 @@ void BedJetHub::send_local_time() {
 }
 
 void BedJetHub::setup_time_() {
-  if (this->time_id_.has_value()) {
+  if (this->time_id_ != nullptr) {
     this->send_local_time();
-    auto *time_id = *this->time_id_;
-    time_id->add_on_time_sync_callback([this] { this->send_local_time(); });
+    this->time_id_->add_on_time_sync_callback([this] { this->send_local_time(); });
   } else {
     ESP_LOGI(TAG, "`time_id` is not configured: will not sync BedJet clock.");
   }
diff --git a/esphome/components/bedjet/bedjet_hub.h b/esphome/components/bedjet/bedjet_hub.h
index bb1349b2ac..6258795b02 100644
--- a/esphome/components/bedjet/bedjet_hub.h
+++ b/esphome/components/bedjet/bedjet_hub.h
@@ -141,7 +141,7 @@ class BedJetHub : public esphome::ble_client::BLEClientNode, public PollingCompo
 #ifdef USE_TIME
   /** Initializes time sync callbacks to support syncing current time to the BedJet. */
   void setup_time_();
-  optional<time::RealTimeClock *> time_id_{};
+  time::RealTimeClock *time_id_{nullptr};
 #endif
 
   uint32_t timeout_{DEFAULT_STATUS_TIMEOUT};
diff --git a/esphome/components/tuya/tuya.cpp b/esphome/components/tuya/tuya.cpp
index da03e3faad..1cc9681d09 100644
--- a/esphome/components/tuya/tuya.cpp
+++ b/esphome/components/tuya/tuya.cpp
@@ -23,8 +23,8 @@ static const int MAX_RETRIES = 5;
 
 void Tuya::setup() {
   this->set_interval("heartbeat", 15000, [this] { this->send_empty_command_(TuyaCommandType::HEARTBEAT); });
-  if (this->status_pin_.has_value()) {
-    this->status_pin_.value()->digital_write(false);
+  if (this->status_pin_ != nullptr) {
+    this->status_pin_->digital_write(false);
   }
 }
 
@@ -70,9 +70,7 @@ void Tuya::dump_config() {
     ESP_LOGCONFIG(TAG, "  GPIO Configuration: status: pin %d, reset: pin %d", this->status_pin_reported_,
                   this->reset_pin_reported_);
   }
-  if (this->status_pin_.has_value()) {
-    LOG_PIN("  Status Pin: ", this->status_pin_.value());
-  }
+  LOG_PIN("  Status Pin: ", this->status_pin_);
   ESP_LOGCONFIG(TAG, "  Product: '%s'", this->product_.c_str());
 }
 
@@ -194,7 +192,7 @@ void Tuya::handle_command_(uint8_t command, uint8_t version, const uint8_t *buff
           this->init_state_ = TuyaInitState::INIT_DATAPOINT;
           this->send_empty_command_(TuyaCommandType::DATAPOINT_QUERY);
           bool is_pin_equals =
-              this->status_pin_.has_value() && this->status_pin_.value()->get_pin() == this->status_pin_reported_;
+              this->status_pin_ != nullptr && this->status_pin_->get_pin() == this->status_pin_reported_;
           // Configure status pin toggling (if reported and configured) or WIFI_STATE periodic send
           if (is_pin_equals) {
             ESP_LOGV(TAG, "Configured status pin %i", this->status_pin_reported_);
@@ -244,13 +242,12 @@ void Tuya::handle_command_(uint8_t command, uint8_t version, const uint8_t *buff
       break;
     case TuyaCommandType::LOCAL_TIME_QUERY:
 #ifdef USE_TIME
-      if (this->time_id_.has_value()) {
+      if (this->time_id_ != nullptr) {
         this->send_local_time_();
 
         if (!this->time_sync_callback_registered_) {
           // tuya mcu supports time, so we let them know when our time changed
-          auto *time_id = *this->time_id_;
-          time_id->add_on_time_sync_callback([this] { this->send_local_time_(); });
+          this->time_id_->add_on_time_sync_callback([this] { this->send_local_time_(); });
           this->time_sync_callback_registered_ = true;
         }
       } else
@@ -463,7 +460,7 @@ void Tuya::send_empty_command_(TuyaCommandType command) {
 
 void Tuya::set_status_pin_() {
   bool is_network_ready = network::is_connected() && remote_is_connected();
-  this->status_pin_.value()->digital_write(is_network_ready);
+  this->status_pin_->digital_write(is_network_ready);
 }
 
 uint8_t Tuya::get_wifi_status_code_() {
@@ -511,8 +508,7 @@ void Tuya::send_wifi_status_() {
 #ifdef USE_TIME
 void Tuya::send_local_time_() {
   std::vector<uint8_t> payload;
-  auto *time_id = *this->time_id_;
-  ESPTime now = time_id->now();
+  ESPTime now = this->time_id_->now();
   if (now.is_valid()) {
     uint8_t year = now.year - 2000;
     uint8_t month = now.month;
diff --git a/esphome/components/tuya/tuya.h b/esphome/components/tuya/tuya.h
index 27a97c3dc9..7dc405e3dd 100644
--- a/esphome/components/tuya/tuya.h
+++ b/esphome/components/tuya/tuya.h
@@ -130,14 +130,14 @@ class Tuya : public Component, public uart::UARTDevice {
 
 #ifdef USE_TIME
   void send_local_time_();
-  optional<time::RealTimeClock *> time_id_{};
+  time::RealTimeClock *time_id_{nullptr};
   bool time_sync_callback_registered_{false};
 #endif
   TuyaInitState init_state_ = TuyaInitState::INIT_HEARTBEAT;
   bool init_failed_{false};
   int init_retries_{0};
   uint8_t protocol_version_ = -1;
-  optional<InternalGPIOPin *> status_pin_{};
+  InternalGPIOPin *status_pin_{nullptr};
   int status_pin_reported_ = -1;
   int reset_pin_reported_ = -1;
   uint32_t last_command_timestamp_ = 0;

From 0cbc06a9b91fd16e6dd9a48e75569b409039a957 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Sat, 20 Jan 2024 03:38:37 +1300
Subject: [PATCH 64/68] Fix some Voice Assistant bugs (#6121)

---
 esphome/components/voice_assistant/voice_assistant.cpp | 10 ++++++----
 esphome/core/ring_buffer.cpp                           |  9 +++++----
 esphome/core/ring_buffer.h                             |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/esphome/components/voice_assistant/voice_assistant.cpp b/esphome/components/voice_assistant/voice_assistant.cpp
index 299e624f5f..9094b93c02 100644
--- a/esphome/components/voice_assistant/voice_assistant.cpp
+++ b/esphome/components/voice_assistant/voice_assistant.cpp
@@ -17,7 +17,7 @@ static const char *const TAG = "voice_assistant";
 
 static const size_t SAMPLE_RATE_HZ = 16000;
 static const size_t INPUT_BUFFER_SIZE = 32 * SAMPLE_RATE_HZ / 1000;  // 32ms * 16kHz / 1000ms
-static const size_t BUFFER_SIZE = 1000 * SAMPLE_RATE_HZ / 1000;      // 1s
+static const size_t BUFFER_SIZE = 1024 * SAMPLE_RATE_HZ / 1000;
 static const size_t SEND_BUFFER_SIZE = INPUT_BUFFER_SIZE * sizeof(int16_t);
 static const size_t RECEIVE_SIZE = 1024;
 static const size_t SPEAKER_BUFFER_SIZE = 16 * RECEIVE_SIZE;
@@ -231,10 +231,12 @@ void VoiceAssistant::loop() {
     }
     case State::STREAMING_MICROPHONE: {
       this->read_microphone_();
-      if (this->ring_buffer_->available() >= SEND_BUFFER_SIZE) {
-        this->ring_buffer_->read((void *) this->send_buffer_, SEND_BUFFER_SIZE, 0);
-        this->socket_->sendto(this->send_buffer_, SEND_BUFFER_SIZE, 0, (struct sockaddr *) &this->dest_addr_,
+      size_t available = this->ring_buffer_->available();
+      while (available >= SEND_BUFFER_SIZE) {
+        size_t read_bytes = this->ring_buffer_->read((void *) this->send_buffer_, SEND_BUFFER_SIZE, 0);
+        this->socket_->sendto(this->send_buffer_, read_bytes, 0, (struct sockaddr *) &this->dest_addr_,
                               sizeof(this->dest_addr_));
+        available = this->ring_buffer_->available();
       }
 
       break;
diff --git a/esphome/core/ring_buffer.cpp b/esphome/core/ring_buffer.cpp
index d9c56d84c5..9bd3d9d853 100644
--- a/esphome/core/ring_buffer.cpp
+++ b/esphome/core/ring_buffer.cpp
@@ -15,17 +15,18 @@ std::unique_ptr<RingBuffer> RingBuffer::create(size_t len) {
   std::unique_ptr<RingBuffer> rb = make_unique<RingBuffer>();
 
   ExternalRAMAllocator<uint8_t> allocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);
-  rb->storage_ = allocator.allocate(len);
+  rb->storage_ = allocator.allocate(len + 1);
   if (rb->storage_ == nullptr) {
     return nullptr;
   }
 
-  rb->handle_ = xStreamBufferCreateStatic(len, 0, rb->storage_, &rb->structure_);
+  rb->handle_ = xStreamBufferCreateStatic(len + 1, 0, rb->storage_, &rb->structure_);
+  ESP_LOGD(TAG, "Created ring buffer with size %u", len);
   return rb;
 }
 
-size_t RingBuffer::read(void *data, size_t size, TickType_t ticks_to_wait) {
-  return xStreamBufferReceive(this->handle_, data, size, ticks_to_wait);
+size_t RingBuffer::read(void *data, size_t len, TickType_t ticks_to_wait) {
+  return xStreamBufferReceive(this->handle_, data, len, ticks_to_wait);
 }
 
 size_t RingBuffer::write(void *data, size_t len) {
diff --git a/esphome/core/ring_buffer.h b/esphome/core/ring_buffer.h
index 6c6d04117a..e602068844 100644
--- a/esphome/core/ring_buffer.h
+++ b/esphome/core/ring_buffer.h
@@ -12,7 +12,7 @@ namespace esphome {
 
 class RingBuffer {
  public:
-  size_t read(void *data, size_t size, TickType_t ticks_to_wait = 0);
+  size_t read(void *data, size_t len, TickType_t ticks_to_wait = 0);
 
   size_t write(void *data, size_t len);
 

From c35a21773e3158484c60879a8fdcb806b9cc1163 Mon Sep 17 00:00:00 2001
From: jxl77 <jacques.laskar@gmail.com>
Date: Sun, 21 Jan 2024 02:57:39 +0100
Subject: [PATCH 65/68] Improve temperature precision in BME280 and BMP280
 (#6124)

* Update bme280_base.cpp

Change read_temperature to get better precision

  float const temperature = (*t_fine * 5 + 128);
  return temperature / 25600.0f;

* Update bmp280.cpp

increase precision in read_temperature

* Update bmp280.cpp

clang-format correction
---
 esphome/components/bme280_base/bme280_base.cpp | 4 ++--
 esphome/components/bmp280/bmp280.cpp           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/esphome/components/bme280_base/bme280_base.cpp b/esphome/components/bme280_base/bme280_base.cpp
index 3c6e15cbca..76e20836c7 100644
--- a/esphome/components/bme280_base/bme280_base.cpp
+++ b/esphome/components/bme280_base/bme280_base.cpp
@@ -265,8 +265,8 @@ float BME280Component::read_temperature_(const uint8_t *data, int32_t *t_fine) {
   int32_t const var2 = (((((adc >> 4) - t1) * ((adc >> 4) - t1)) >> 12) * t3) >> 14;
   *t_fine = var1 + var2;
 
-  float const temperature = (*t_fine * 5 + 128) >> 8;
-  return temperature / 100.0f;
+  float const temperature = (*t_fine * 5 + 128);
+  return temperature / 25600.0f;
 }
 
 float BME280Component::read_pressure_(const uint8_t *data, int32_t t_fine) {
diff --git a/esphome/components/bmp280/bmp280.cpp b/esphome/components/bmp280/bmp280.cpp
index a5b2517893..c92daa07fb 100644
--- a/esphome/components/bmp280/bmp280.cpp
+++ b/esphome/components/bmp280/bmp280.cpp
@@ -200,8 +200,8 @@ float BMP280Component::read_temperature_(int32_t *t_fine) {
   int32_t var2 = (((((adc >> 4) - t1) * ((adc >> 4) - t1)) >> 12) * t3) >> 14;
   *t_fine = var1 + var2;
 
-  float temperature = (*t_fine * 5 + 128) >> 8;
-  return temperature / 100.0f;
+  float temperature = (*t_fine * 5 + 128);
+  return temperature / 25600.0f;
 }
 
 float BMP280Component::read_pressure_(int32_t t_fine) {

From 48129974294b26cf8528d03f971d714392c23521 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Tue, 23 Jan 2024 08:49:28 +0100
Subject: [PATCH 66/68] Nextion TFT upload IDF memory optimization (#6128)

* Nextion TFT upload IDF memory optimization

This optimizes the memory in use for TFT upload when using `esp-idf` framework.

Basically, the engine establishes 3 connections to the the http/https server:
1. Fetch the file size (used to manage chunks and file size)
2. Transfer the 1st chunk (when it evaluates Nextion response to define either to continue from that point or to another point in the file)
3. Transfer the remaining data.

Until now, connection 1 was kept open during the whole process taking aprox 40kb of heap in a esp32dev (NSPanel in my tests) and the same amount of memory was needed to the 2nd and 3rd connections (which never competes to each other).
With this change, each connection is closed and released before opening the next one with a significant reduction on the required heap needed for this transfer.

This can still be improved to use a persistent connection, but I will look at this in the future, so it is not part of this change.

In addition to the better connection management, I've added quite a lot of log (mostly at VERBOSE level), which was used for troubleshooting here.
I was unsure about removing this. As it can be useful for others, I decided to keep it, but I will be fine about removing it if this is now in line with ESPHome best practices.

* clang-format

* Log response length
---
 .../components/nextion/nextion_upload_idf.cpp | 87 ++++++++++++++-----
 1 file changed, 65 insertions(+), 22 deletions(-)

diff --git a/esphome/components/nextion/nextion_upload_idf.cpp b/esphome/components/nextion/nextion_upload_idf.cpp
index 709ff65b12..14b1b6cfaf 100644
--- a/esphome/components/nextion/nextion_upload_idf.cpp
+++ b/esphome/components/nextion/nextion_upload_idf.cpp
@@ -24,7 +24,7 @@ int Nextion::upload_range(const std::string &url, int range_start) {
   ESP_LOGVV(TAG, "url: %s", url.c_str());
   uint range_size = this->tft_size_ - range_start;
   ESP_LOGVV(TAG, "tft_size_: %i", this->tft_size_);
-  ESP_LOGV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
+  ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
   int range_end = (range_start == 0) ? std::min(this->tft_size_, 16383) : this->tft_size_;
   if (range_size <= 0 or range_end <= range_start) {
     ESP_LOGE(TAG, "Invalid range");
@@ -67,12 +67,13 @@ int Nextion::upload_range(const std::string &url, int range_start) {
 
   int total_read_len = 0, read_len;
 
+  ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
   ESP_LOGV(TAG, "Allocate buffer");
   uint8_t *buffer = new uint8_t[4096];
   std::string recv_string;
   if (buffer == nullptr) {
     ESP_LOGE(TAG, "Failed to allocate memory for buffer");
-    ESP_LOGV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
+    ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
   } else {
     ESP_LOGV(TAG, "Memory for buffer allocated successfully");
 
@@ -86,15 +87,14 @@ int Nextion::upload_range(const std::string &url, int range_start) {
         ESP_LOGVV(TAG, "Write to UART successful");
         this->recv_ret_string_(recv_string, 5000, true);
         this->content_length_ -= read_len;
-        ESP_LOGD(TAG, "Uploaded %0.2f %%, remaining %d bytes",
-                 100.0 * (this->tft_size_ - this->content_length_) / this->tft_size_, this->content_length_);
-        if (recv_string[0] != 0x05) {  // 0x05 == "ok"
+        ESP_LOGD(TAG, "Uploaded %0.2f %%, remaining %d bytes, heap is %" PRIu32 " bytes",
+                 100.0 * (this->tft_size_ - this->content_length_) / this->tft_size_, this->content_length_,
+                 esp_get_free_heap_size());
+
+        if (recv_string[0] == 0x08 && recv_string.size() == 5) {  // handle partial upload request
           ESP_LOGD(
               TAG, "recv_string [%s]",
               format_hex_pretty(reinterpret_cast<const uint8_t *>(recv_string.data()), recv_string.size()).c_str());
-        }
-        // handle partial upload request
-        if (recv_string[0] == 0x08 && recv_string.size() == 5) {
           uint32_t result = 0;
           for (int j = 0; j < 4; ++j) {
             result += static_cast<uint8_t>(recv_string[j + 1]) << (8 * j);
@@ -103,13 +103,37 @@ int Nextion::upload_range(const std::string &url, int range_start) {
             ESP_LOGI(TAG, "Nextion reported new range %" PRIu32, result);
             this->content_length_ = this->tft_size_ - result;
             // Deallocate the buffer when done
+            ESP_LOGV(TAG, "Deallocate buffer");
+            ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
             delete[] buffer;
             ESP_LOGVV(TAG, "Memory for buffer deallocated");
-            esp_http_client_cleanup(client);
+            ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
+            ESP_LOGV(TAG, "Close http client");
+            ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
             esp_http_client_close(client);
+            esp_http_client_cleanup(client);
+            ESP_LOGVV(TAG, "Client closed");
+            ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
             return result;
           }
+        } else if (recv_string[0] != 0x05) {  // 0x05 == "ok"
+          ESP_LOGE(
+              TAG, "Invalid response from Nextion: [%s]",
+              format_hex_pretty(reinterpret_cast<const uint8_t *>(recv_string.data()), recv_string.size()).c_str());
+          ESP_LOGV(TAG, "Deallocate buffer");
+          ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
+          delete[] buffer;
+          ESP_LOGVV(TAG, "Memory for buffer deallocated");
+          ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
+          ESP_LOGV(TAG, "Close http client");
+          ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
+          esp_http_client_close(client);
+          esp_http_client_cleanup(client);
+          ESP_LOGVV(TAG, "Client closed");
+          ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
+          return -1;
         }
+
         recv_string.clear();
       } else if (read_len == 0) {
         ESP_LOGV(TAG, "End of HTTP response reached");
@@ -121,11 +145,18 @@ int Nextion::upload_range(const std::string &url, int range_start) {
     }
 
     // Deallocate the buffer when done
+    ESP_LOGV(TAG, "Deallocate buffer");
+    ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
     delete[] buffer;
     ESP_LOGVV(TAG, "Memory for buffer deallocated");
+    ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
   }
-  esp_http_client_cleanup(client);
+  ESP_LOGV(TAG, "Close http client");
+  ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
   esp_http_client_close(client);
+  esp_http_client_cleanup(client);
+  ESP_LOGVV(TAG, "Client closed");
+  ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
   return range_end + 1;
 }
 
@@ -159,7 +190,7 @@ bool Nextion::upload_tft() {
 
   // Initialize the HTTP client with the configuration
   ESP_LOGV(TAG, "Initializing HTTP client");
-  ESP_LOGV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
+  ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
   esp_http_client_handle_t http = esp_http_client_init(&config);
   if (!http) {
     ESP_LOGE(TAG, "Failed to initialize HTTP client.");
@@ -168,7 +199,7 @@ bool Nextion::upload_tft() {
 
   // Perform the HTTP request
   ESP_LOGV(TAG, "Check if the client could connect");
-  ESP_LOGV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
+  ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
   esp_err_t err = esp_http_client_perform(http);
   if (err != ESP_OK) {
     ESP_LOGE(TAG, "HTTP request failed: %s", esp_err_to_name(err));
@@ -177,14 +208,22 @@ bool Nextion::upload_tft() {
   }
 
   // Check the HTTP Status Code
+  ESP_LOGV(TAG, "Check the HTTP Status Code");
+  ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
   int status_code = esp_http_client_get_status_code(http);
   ESP_LOGV(TAG, "HTTP Status Code: %d", status_code);
   size_t tft_file_size = esp_http_client_get_content_length(http);
   ESP_LOGD(TAG, "TFT file size: %zu", tft_file_size);
 
+  ESP_LOGD(TAG, "Close HTTP connection");
+  ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
+  esp_http_client_close(http);
+  esp_http_client_cleanup(http);
+  ESP_LOGVV(TAG, "Connection closed");
+  ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
+
   if (tft_file_size < 4096) {
     ESP_LOGE(TAG, "File size check failed. Size: %zu", tft_file_size);
-    esp_http_client_cleanup(http);
     return this->upload_end(false);
   } else {
     ESP_LOGV(TAG, "File size check passed. Proceeding...");
@@ -193,8 +232,10 @@ bool Nextion::upload_tft() {
   this->tft_size_ = tft_file_size;
 
   ESP_LOGD(TAG, "Updating Nextion");
-  // The Nextion will ignore the update command if it is sleeping
 
+  // The Nextion will ignore the update command if it is sleeping
+  ESP_LOGV(TAG, "Wake-up Nextion");
+  ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
   this->send_command_("sleep=0");
   this->set_backlight_brightness(1.0);
   vTaskDelay(pdMS_TO_TICKS(250));  // NOLINT
@@ -207,26 +248,31 @@ bool Nextion::upload_tft() {
   sprintf(command, "whmi-wris %d,%" PRIu32 ",1", this->content_length_, this->parent_->get_baud_rate());
 
   // Clear serial receive buffer
+  ESP_LOGV(TAG, "Clear serial receive buffer");
+  ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
   uint8_t d;
   while (this->available()) {
     this->read_byte(&d);
   };
 
+  ESP_LOGV(TAG, "Send update instruction: %s", command);
+  ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
   this->send_command_(command);
 
   std::string response;
   ESP_LOGV(TAG, "Waiting for upgrade response");
-  this->recv_ret_string_(response, 2048, true);  // This can take some time to return
+  this->recv_ret_string_(response, 5000, true);  // This can take some time to return
 
   // The Nextion display will, if it's ready to accept data, send a 0x05 byte.
-  ESP_LOGD(TAG, "Upgrade response is [%s]",
-           format_hex_pretty(reinterpret_cast<const uint8_t *>(response.data()), response.size()).c_str());
+  ESP_LOGD(TAG, "Upgrade response is [%s] - %zu bytes",
+           format_hex_pretty(reinterpret_cast<const uint8_t *>(response.data()), response.size()).c_str(),
+           response.length());
+  ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
 
   if (response.find(0x05) != std::string::npos) {
     ESP_LOGV(TAG, "Preparation for tft update done");
   } else {
     ESP_LOGE(TAG, "Preparation for tft update failed %d \"%s\"", response[0], response.c_str());
-    esp_http_client_cleanup(http);
     return this->upload_end(false);
   }
 
@@ -234,12 +280,12 @@ bool Nextion::upload_tft() {
            content_length_, esp_get_free_heap_size());
 
   ESP_LOGV(TAG, "Starting transfer by chunks loop");
+  ESP_LOGVV(TAG, "Available heap: %" PRIu32, esp_get_free_heap_size());
   int result = 0;
   while (content_length_ > 0) {
     result = upload_range(this->tft_url_.c_str(), result);
     if (result < 0) {
       ESP_LOGE(TAG, "Error updating Nextion!");
-      esp_http_client_cleanup(http);
       return this->upload_end(false);
     }
     App.feed_wdt();
@@ -248,9 +294,6 @@ bool Nextion::upload_tft() {
 
   ESP_LOGD(TAG, "Successfully updated Nextion!");
 
-  ESP_LOGD(TAG, "Close HTTP connection");
-  esp_http_client_close(http);
-  esp_http_client_cleanup(http);
   return upload_end(true);
 }
 

From 23071e932adce4d5f7a708b7c252e5758faaf36d Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Wed, 24 Jan 2024 07:40:16 +1100
Subject: [PATCH 67/68] Add support for Pico-ResTouch-LCD-3.5 to ili9xxx driver
 (#6129)

* Working version of Waveshare 3.5 Res Touch driver.

* Default color order BGR
---
 esphome/components/ili9xxx/display.py         |  1 +
 .../components/ili9xxx/ili9xxx_display.cpp    | 83 ++++++++-----------
 esphome/components/ili9xxx/ili9xxx_display.h  | 52 ++++++++++--
 esphome/components/ili9xxx/ili9xxx_init.h     | 28 +++----
 4 files changed, 94 insertions(+), 70 deletions(-)

diff --git a/esphome/components/ili9xxx/display.py b/esphome/components/ili9xxx/display.py
index b3fe8b2b41..0bd810ea16 100644
--- a/esphome/components/ili9xxx/display.py
+++ b/esphome/components/ili9xxx/display.py
@@ -66,6 +66,7 @@ MODELS = {
     "ST7789V": ili9xxx_ns.class_("ILI9XXXST7789V", ILI9XXXDisplay),
     "S3BOX": ili9xxx_ns.class_("ILI9XXXS3Box", ILI9XXXDisplay),
     "S3BOX_LITE": ili9xxx_ns.class_("ILI9XXXS3BoxLite", ILI9XXXDisplay),
+    "WAVESHARE_RES_3_5": ili9xxx_ns.class_("WAVESHARERES35", ILI9XXXDisplay),
 }
 
 COLOR_ORDERS = {
diff --git a/esphome/components/ili9xxx/ili9xxx_display.cpp b/esphome/components/ili9xxx/ili9xxx_display.cpp
index ab577b3875..e3f2c94880 100644
--- a/esphome/components/ili9xxx/ili9xxx_display.cpp
+++ b/esphome/components/ili9xxx/ili9xxx_display.cpp
@@ -7,7 +7,6 @@
 namespace esphome {
 namespace ili9xxx {
 
-static const char *const TAG = "ili9xxx";
 static const uint16_t SPI_SETUP_US = 100;         // estimated fixed overhead in microseconds for an SPI write
 static const uint16_t SPI_MAX_BLOCK_SIZE = 4092;  // Max size of continuous SPI transfer
 
@@ -17,13 +16,7 @@ static inline void put16_be(uint8_t *buf, uint16_t value) {
   buf[1] = value;
 }
 
-void ILI9XXXDisplay::setup() {
-  ESP_LOGD(TAG, "Setting up ILI9xxx");
-
-  this->setup_pins_();
-  this->init_lcd_();
-
-  this->command(this->pre_invertcolors_ ? ILI9XXX_INVON : ILI9XXX_INVOFF);
+void ILI9XXXDisplay::set_madctl() {
   // custom x/y transform and color order
   uint8_t mad = this->color_order_ == display::COLOR_ORDER_BGR ? MADCTL_BGR : MADCTL_RGB;
   if (this->swap_xy_)
@@ -32,8 +25,19 @@ void ILI9XXXDisplay::setup() {
     mad |= MADCTL_MX;
   if (this->mirror_y_)
     mad |= MADCTL_MY;
-  this->send_command(ILI9XXX_MADCTL, &mad, 1);
+  this->command(ILI9XXX_MADCTL);
+  this->data(mad);
+  esph_log_d(TAG, "Wrote MADCTL 0x%02X", mad);
+}
 
+void ILI9XXXDisplay::setup() {
+  ESP_LOGD(TAG, "Setting up ILI9xxx");
+
+  this->setup_pins_();
+  this->init_lcd_();
+
+  this->set_madctl();
+  this->command(this->pre_invertcolors_ ? ILI9XXX_INVON : ILI9XXX_INVOFF);
   this->x_low_ = this->width_;
   this->y_low_ = this->height_;
   this->x_high_ = 0;
@@ -89,6 +93,7 @@ void ILI9XXXDisplay::dump_config() {
   LOG_PIN("  CS Pin: ", this->cs_);
   LOG_PIN("  DC Pin: ", this->dc_pin_);
   LOG_PIN("  Busy Pin: ", this->busy_pin_);
+  ESP_LOGCONFIG(TAG, "  Color order: %s", this->color_order_ == display::COLOR_ORDER_BGR ? "BGR" : "RGB");
   ESP_LOGCONFIG(TAG, "  Swap_xy: %s", YESNO(this->swap_xy_));
   ESP_LOGCONFIG(TAG, "  Mirror_x: %s", YESNO(this->mirror_x_));
   ESP_LOGCONFIG(TAG, "  Mirror_y: %s", YESNO(this->mirror_y_));
@@ -196,7 +201,6 @@ void ILI9XXXDisplay::display_() {
   uint8_t transfer_buffer[ILI9XXX_TRANSFER_BUFFER_SIZE];
   // check if something was displayed
   if ((this->x_high_ < this->x_low_) || (this->y_high_ < this->y_low_)) {
-    ESP_LOGV(TAG, "Nothing to display");
     return;
   }
 
@@ -211,14 +215,13 @@ void ILI9XXXDisplay::display_() {
   size_t mw_time = (w * h * 16) / mhz + w * h * 2 / ILI9XXX_TRANSFER_BUFFER_SIZE * SPI_SETUP_US;
   ESP_LOGV(TAG,
            "Start display(xlow:%d, ylow:%d, xhigh:%d, yhigh:%d, width:%d, "
-           "height:%d, mode=%d, 18bit=%d, sw_time=%dus, mw_time=%dus)",
+           "height:%zu, mode=%d, 18bit=%d, sw_time=%zuus, mw_time=%zuus)",
            this->x_low_, this->y_low_, this->x_high_, this->y_high_, w, h, this->buffer_color_mode_,
            this->is_18bitdisplay_, sw_time, mw_time);
   auto now = millis();
-  this->enable();
   if (this->buffer_color_mode_ == BITS_16 && !this->is_18bitdisplay_ && sw_time < mw_time) {
     // 16 bit mode maps directly to display format
-    ESP_LOGV(TAG, "Doing single write of %d bytes", this->width_ * h * 2);
+    ESP_LOGV(TAG, "Doing single write of %zu bytes", this->width_ * h * 2);
     set_addr_window_(0, this->y_low_, this->width_ - 1, this->y_high_);
     this->write_array(this->buffer_ + this->y_low_ * this->width_ * 2, h * this->width_ * 2);
   } else {
@@ -267,7 +270,7 @@ void ILI9XXXDisplay::display_() {
       this->write_array(transfer_buffer, idx);
     }
   }
-  this->disable();
+  this->end_data_();
   ESP_LOGV(TAG, "Data write took %dms", (unsigned) (millis() - now));
   // invalidate watermarks
   this->x_low_ = this->width_;
@@ -290,7 +293,6 @@ void ILI9XXXDisplay::draw_pixels_at(int x_start, int y_start, int w, int h, cons
     return display::Display::draw_pixels_at(x_start, y_start, w, h, ptr, order, bitness, big_endian, x_offset, y_offset,
                                             x_pad);
   }
-  this->enable();
   this->set_addr_window_(x_start, y_start, x_start + w - 1, y_start + h - 1);
   // x_ and y_offset are offsets into the source buffer, unrelated to our own offsets into the display.
   if (x_offset == 0 && x_pad == 0 && y_offset == 0) {
@@ -302,7 +304,7 @@ void ILI9XXXDisplay::draw_pixels_at(int x_start, int y_start, int w, int h, cons
       this->write_array(ptr + (y + y_offset) * stride + x_offset, w * 2);
     }
   }
-  this->disable();
+  this->end_data_();
 }
 
 // should return the total size: return this->get_width_internal() * this->get_height_internal() * 2 // 16bit color
@@ -328,20 +330,6 @@ void ILI9XXXDisplay::send_command(uint8_t command_byte, const uint8_t *data_byte
   this->end_data_();
 }
 
-uint8_t ILI9XXXDisplay::read_command(uint8_t command_byte, uint8_t index) {
-  uint8_t data = 0x10 + index;
-  this->send_command(0xD9, &data, 1);  // Set Index Register
-  uint8_t result;
-  this->start_command_();
-  this->write_byte(command_byte);
-  this->start_data_();
-  do {
-    result = this->read_byte();
-  } while (index--);
-  this->end_data_();
-  return result;
-}
-
 void ILI9XXXDisplay::start_command_() {
   this->dc_pin_->digital_write(false);
   this->enable();
@@ -357,9 +345,9 @@ void ILI9XXXDisplay::end_data_() { this->disable(); }
 void ILI9XXXDisplay::reset_() {
   if (this->reset_pin_ != nullptr) {
     this->reset_pin_->digital_write(false);
-    delay(10);
+    delay(20);
     this->reset_pin_->digital_write(true);
-    delay(10);
+    delay(20);
   }
 }
 
@@ -369,7 +357,7 @@ void ILI9XXXDisplay::init_lcd_() {
   while ((cmd = *addr++) > 0) {
     x = *addr++;
     num_args = x & 0x7F;
-    send_command(cmd, addr, num_args);
+    this->send_command(cmd, addr, num_args);
     addr += num_args;
     if (x & 0x80)
       delay(150);  // NOLINT
@@ -377,24 +365,19 @@ void ILI9XXXDisplay::init_lcd_() {
 }
 
 // Tell the display controller where we want to draw pixels.
-// when called, the SPI should have already been enabled, only the D/C pin will be toggled here.
 void ILI9XXXDisplay::set_addr_window_(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2) {
-  uint8_t buf[4];
-  this->dc_pin_->digital_write(false);
-  this->write_byte(ILI9XXX_CASET);  // Column address set
-  put16_be(buf, x1 + this->offset_x_);
-  put16_be(buf + 2, x2 + this->offset_x_);
-  this->dc_pin_->digital_write(true);
-  this->write_array(buf, sizeof buf);
-  this->dc_pin_->digital_write(false);
-  this->write_byte(ILI9XXX_PASET);  // Row address set
-  put16_be(buf, y1 + this->offset_y_);
-  put16_be(buf + 2, y2 + this->offset_y_);
-  this->dc_pin_->digital_write(true);
-  this->write_array(buf, sizeof buf);
-  this->dc_pin_->digital_write(false);
-  this->write_byte(ILI9XXX_RAMWR);  // Write to RAM
-  this->dc_pin_->digital_write(true);
+  this->command(ILI9XXX_CASET);
+  this->data(x1 >> 8);
+  this->data(x1 & 0xFF);
+  this->data(x2 >> 8);
+  this->data(x2 & 0xFF);
+  this->command(ILI9XXX_PASET);  // Page address set
+  this->data(y1 >> 8);
+  this->data(y1 & 0xFF);
+  this->data(y2 >> 8);
+  this->data(y2 & 0xFF);
+  this->command(ILI9XXX_RAMWR);  // Write to RAM
+  this->start_data_();
 }
 
 void ILI9XXXDisplay::invert_colors(bool invert) {
diff --git a/esphome/components/ili9xxx/ili9xxx_display.h b/esphome/components/ili9xxx/ili9xxx_display.h
index 590be3e364..7b92bd2336 100644
--- a/esphome/components/ili9xxx/ili9xxx_display.h
+++ b/esphome/components/ili9xxx/ili9xxx_display.h
@@ -8,6 +8,7 @@
 namespace esphome {
 namespace ili9xxx {
 
+static const char *const TAG = "ili9xxx";
 const size_t ILI9XXX_TRANSFER_BUFFER_SIZE = 126;  // ensure this is divisible by 6
 
 enum ILI9XXXColorMode {
@@ -32,6 +33,7 @@ class ILI9XXXDisplay : public display::DisplayBuffer,
     while ((cmd = *addr++) != 0) {
       num_args = *addr++ & 0x7F;
       bits = *addr;
+      esph_log_d(TAG, "Command %02X, length %d, bits %02X", cmd, num_args, bits);
       switch (cmd) {
         case ILI9XXX_MADCTL: {
           this->swap_xy_ = (bits & MADCTL_MV) != 0;
@@ -68,10 +70,9 @@ class ILI9XXXDisplay : public display::DisplayBuffer,
     this->offset_y_ = offset_y;
   }
   void invert_colors(bool invert);
-  void command(uint8_t value);
-  void data(uint8_t value);
+  virtual void command(uint8_t value);
+  virtual void data(uint8_t value);
   void send_command(uint8_t command_byte, const uint8_t *data_bytes, uint8_t num_data_bytes);
-  uint8_t read_command(uint8_t command_byte, uint8_t index);
   void set_color_order(display::ColorOrder color_order) { this->color_order_ = color_order; }
   void set_swap_xy(bool swap_xy) { this->swap_xy_ = swap_xy; }
   void set_mirror_x(bool mirror_x) { this->mirror_x_ = mirror_x; }
@@ -92,6 +93,7 @@ class ILI9XXXDisplay : public display::DisplayBuffer,
   void draw_absolute_pixel_internal(int x, int y, Color color) override;
   void setup_pins_();
 
+  virtual void set_madctl();
   void display_();
   void init_lcd_();
   void set_addr_window_(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2);
@@ -127,7 +129,7 @@ class ILI9XXXDisplay : public display::DisplayBuffer,
   bool need_update_ = false;
   bool is_18bitdisplay_ = false;
   bool pre_invertcolors_ = false;
-  display::ColorOrder color_order_{};
+  display::ColorOrder color_order_{display::COLOR_ORDER_BGR};
   bool swap_xy_{};
   bool mirror_x_{};
   bool mirror_y_{};
@@ -181,10 +183,48 @@ class ILI9XXXILI9486 : public ILI9XXXDisplay {
   ILI9XXXILI9486() : ILI9XXXDisplay(INITCMD_ILI9486, 480, 320, false) {}
 };
 
-//-----------   ILI9XXX_35_TFT rotated display --------------
 class ILI9XXXILI9488 : public ILI9XXXDisplay {
  public:
-  ILI9XXXILI9488() : ILI9XXXDisplay(INITCMD_ILI9488, 480, 320, true) {}
+  ILI9XXXILI9488(const uint8_t *seq = INITCMD_ILI9488) : ILI9XXXDisplay(seq, 480, 320, true) {}
+
+ protected:
+  void set_madctl() override {
+    uint8_t mad = this->color_order_ == display::COLOR_ORDER_BGR ? MADCTL_BGR : MADCTL_RGB;
+    uint8_t dfun = 0x22;
+    this->width_ = 320;
+    this->height_ = 480;
+    if (!(this->swap_xy_ || this->mirror_x_ || this->mirror_y_)) {
+      // no transforms
+    } else if (this->mirror_y_ && this->mirror_x_) {
+      // rotate 180
+      dfun = 0x42;
+    } else if (this->swap_xy_) {
+      this->width_ = 480;
+      this->height_ = 320;
+      mad |= 0x20;
+      if (this->mirror_x_) {
+        dfun = 0x02;
+      } else {
+        dfun = 0x62;
+      }
+    }
+    this->command(ILI9XXX_DFUNCTR);
+    this->data(0);
+    this->data(dfun);
+    this->command(ILI9XXX_MADCTL);
+    this->data(mad);
+  }
+};
+//-----------   Waveshare 3.5 Res Touch - ILI9488 interfaced via 16 bit shift register to parallel */
+class WAVESHARERES35 : public ILI9XXXILI9488 {
+ public:
+  WAVESHARERES35() : ILI9XXXILI9488(INITCMD_WAVESHARE_RES_3_5) {}
+  void data(uint8_t value) override {
+    this->start_data_();
+    this->write_byte(0);
+    this->write_byte(value);
+    this->end_data_();
+  }
 };
 
 //-----------   ILI9XXX_35_TFT origin colors rotated display --------------
diff --git a/esphome/components/ili9xxx/ili9xxx_init.h b/esphome/components/ili9xxx/ili9xxx_init.h
index a74824052f..fe3f168c32 100644
--- a/esphome/components/ili9xxx/ili9xxx_init.h
+++ b/esphome/components/ili9xxx/ili9xxx_init.h
@@ -141,7 +141,8 @@ static const uint8_t PROGMEM INITCMD_ILI9486[] = {
   0x00                                   // End of list
 };
 
-static const uint8_t PROGMEM INITCMD_ILI9488[] = {
+
+static const uint8_t INITCMD_ILI9488[] = {
   ILI9XXX_GMCTRP1,15, 0x0f, 0x24, 0x1c, 0x0a, 0x0f, 0x08, 0x43, 0x88, 0x32, 0x0f, 0x10, 0x06, 0x0f, 0x07, 0x00,
   ILI9XXX_GMCTRN1,15, 0x0F, 0x38, 0x30, 0x09, 0x0f, 0x0f, 0x4e, 0x77, 0x3c, 0x07, 0x10, 0x05, 0x23, 0x1b, 0x00,
 
@@ -153,28 +154,27 @@ static const uint8_t PROGMEM INITCMD_ILI9488[] = {
   ILI9XXX_FRMCTR1, 1, 0xA0,  // Frame rate = 60Hz
   ILI9XXX_INVCTR,  1, 0x02,  // Display Inversion Control = 2dot
 
-  ILI9XXX_DFUNCTR, 2, 0x02, 0x02, // Nomal scan
-
   0xE9, 1, 0x00,   // Set Image Functio. Disable 24 bit data
 
   ILI9XXX_ADJCTL3, 4, 0xA9, 0x51, 0x2C, 0x82,  // Adjust Control 3
-
-  ILI9XXX_MADCTL,  1, 0x28,
-  //ILI9XXX_PIXFMT,  1, 0x55,  // Interface Pixel Format = 16bit
   ILI9XXX_PIXFMT, 1, 0x66,   //ILI9488 only supports 18-bit pixel format in 4/3 wire SPI mode
-
-
-
-  // 5 frames
-  //ILI9XXX_ETMOD,   1, 0xC6,  //
-
-
   ILI9XXX_SLPOUT,  0x80,    // Exit sleep mode
-  //ILI9XXX_INVON  , 0,
   ILI9XXX_DISPON,  0x80,    // Set display on
   0x00 // end
 };
 
+static const uint8_t INITCMD_WAVESHARE_RES_3_5[] = {
+    ILI9XXX_PWCTR3, 1, 0x33,
+    ILI9XXX_VMCTR1, 3, 0x00, 0x1e, 0x80,
+    ILI9XXX_FRMCTR1, 1, 0xA0,
+    ILI9XXX_GMCTRP1, 15, 0x0, 0x13, 0x18, 0x04, 0x0F, 0x06, 0x3a, 0x56, 0x4d, 0x03, 0x0a, 0x06, 0x30, 0x3e, 0x0f,
+    ILI9XXX_GMCTRN1, 15, 0x0, 0x13, 0x18, 0x01, 0x11, 0x06, 0x38, 0x34, 0x4d, 0x06, 0x0d, 0x0b, 0x31, 0x37, 0x0f,
+    ILI9XXX_PIXFMT, 1, 0x55,
+    ILI9XXX_SLPOUT, 0x80,   // slpout, delay
+    ILI9XXX_DISPON, 0,
+    0x00                                   // End of list
+};
+
 static const uint8_t PROGMEM INITCMD_ILI9488_A[] = {
   ILI9XXX_GMCTRP1,15, 0x00, 0x03, 0x09, 0x08, 0x16, 0x0A, 0x3F, 0x78, 0x4C, 0x09, 0x0A, 0x08, 0x16, 0x1A, 0x0F,
   ILI9XXX_GMCTRN1,15, 0x00, 0x16, 0x19, 0x03, 0x0F, 0x05, 0x32, 0x45, 0x46, 0x04, 0x0E, 0x0D, 0x35, 0x37, 0x0F,

From 25ab6f0297fcf3a21e07644854db5083ba5a0eed Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Tue, 23 Jan 2024 19:11:03 -1000
Subject: [PATCH 68/68] Ensure filename is shown when YAML raises an error
 (#6139)

* Ensure filename is shown when YAML raises an error

fixes #5423
fixes #5377

* Ensure filename is shown when YAML raises an error

fixes #5423
fixes #5377

* Ensure filename is shown when YAML raises an error

fixes #5423
fixes #5377

* Ensure filename is shown when YAML raises an error

fixes #5423
fixes #5377

* Ensure filename is shown when YAML raises an error

fixes #5423
fixes #5377
---
 esphome/yaml_util.py                          | 24 ++++++++++++-------
 .../fixtures/yaml_util/missing_comp.yaml      | 12 ++++++++++
 tests/unit_tests/test_yaml_util.py            | 20 ++++++++++++++++
 3 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 tests/unit_tests/fixtures/yaml_util/missing_comp.yaml

diff --git a/esphome/yaml_util.py b/esphome/yaml_util.py
index f5e36b79e7..60705082b6 100644
--- a/esphome/yaml_util.py
+++ b/esphome/yaml_util.py
@@ -7,6 +7,7 @@ import logging
 import math
 import os
 import uuid
+from io import TextIOWrapper
 from typing import Any
 
 import yaml
@@ -19,7 +20,7 @@ except ImportError:
     FastestAvailableSafeLoader = PurePythonLoader
 
 from esphome import core
-from esphome.config_helpers import Extend, Remove, read_config_file
+from esphome.config_helpers import Extend, Remove
 from esphome.core import (
     CORE,
     DocumentRange,
@@ -418,19 +419,26 @@ def load_yaml(fname: str, clear_secrets: bool = True) -> Any:
 
 def _load_yaml_internal(fname: str) -> Any:
     """Load a YAML file."""
-    content = read_config_file(fname)
     try:
-        return _load_yaml_internal_with_type(ESPHomeLoader, fname, content)
-    except EsphomeError:
-        # Loading failed, so we now load with the Python loader which has more
-        # readable exceptions
-        return _load_yaml_internal_with_type(ESPHomePurePythonLoader, fname, content)
+        with open(fname, encoding="utf-8") as f_handle:
+            try:
+                return _load_yaml_internal_with_type(ESPHomeLoader, fname, f_handle)
+            except EsphomeError:
+                # Loading failed, so we now load with the Python loader which has more
+                # readable exceptions
+                # Rewind the stream so we can try again
+                f_handle.seek(0, 0)
+                return _load_yaml_internal_with_type(
+                    ESPHomePurePythonLoader, fname, f_handle
+                )
+    except (UnicodeDecodeError, OSError) as err:
+        raise EsphomeError(f"Error reading file {fname}: {err}") from err
 
 
 def _load_yaml_internal_with_type(
     loader_type: type[ESPHomeLoader] | type[ESPHomePurePythonLoader],
     fname: str,
-    content: str,
+    content: TextIOWrapper,
 ) -> Any:
     """Load a YAML file."""
     loader = loader_type(content)
diff --git a/tests/unit_tests/fixtures/yaml_util/missing_comp.yaml b/tests/unit_tests/fixtures/yaml_util/missing_comp.yaml
new file mode 100644
index 0000000000..d065901ed9
--- /dev/null
+++ b/tests/unit_tests/fixtures/yaml_util/missing_comp.yaml
@@ -0,0 +1,12 @@
+esphome:
+  name: test
+
+esp32:
+  board: esp32dev
+
+wifi:
+  ap: ~
+
+image:
+  - id: its_a_bug
+    file: "mdi:bug"
diff --git a/tests/unit_tests/test_yaml_util.py b/tests/unit_tests/test_yaml_util.py
index 78b6a2ad84..9178726247 100644
--- a/tests/unit_tests/test_yaml_util.py
+++ b/tests/unit_tests/test_yaml_util.py
@@ -22,3 +22,23 @@ def test_loading_a_broken_yaml_file(fixture_path):
         yaml_util.load_yaml(yaml_file)
     except EsphomeError as err:
         assert "broken_included.yaml" in str(err)
+
+
+def test_loading_a_yaml_file_with_a_missing_component(fixture_path):
+    """Ensure we show the filename for a yaml file with a missing component."""
+    yaml_file = fixture_path / "yaml_util" / "missing_comp.yaml"
+
+    try:
+        yaml_util.load_yaml(yaml_file)
+    except EsphomeError as err:
+        assert "missing_comp.yaml" in str(err)
+
+
+def test_loading_a_missing_file(fixture_path):
+    """We throw EsphomeError when loading a missing file."""
+    yaml_file = fixture_path / "yaml_util" / "missing.yaml"
+
+    try:
+        yaml_util.load_yaml(yaml_file)
+    except EsphomeError as err:
+        assert "missing.yaml" in str(err)