From 50aeefc66299f675f62a9eb09a77ceded7c61950 Mon Sep 17 00:00:00 2001
From: pethans <38168907+pethans@users.noreply.github.com>
Date: Sun, 17 Nov 2024 10:47:29 -0800
Subject: [PATCH 01/28] TuyaFan control should use oscillation_type (#7776)

Co-authored-by: Peter Hanson <phanson@whistler.lan>
---
 esphome/components/tuya/fan/tuya_fan.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/tuya/fan/tuya_fan.cpp b/esphome/components/tuya/fan/tuya_fan.cpp
index 8a613d0bae..9b132e0de6 100644
--- a/esphome/components/tuya/fan/tuya_fan.cpp
+++ b/esphome/components/tuya/fan/tuya_fan.cpp
@@ -86,7 +86,7 @@ void TuyaFan::control(const fan::FanCall &call) {
   if (this->oscillation_id_.has_value() && call.get_oscillating().has_value()) {
     if (this->oscillation_type_ == TuyaDatapointType::ENUM) {
       this->parent_->set_enum_datapoint_value(*this->oscillation_id_, *call.get_oscillating());
-    } else if (this->speed_type_ == TuyaDatapointType::BOOLEAN) {
+    } else if (this->oscillation_type_ == TuyaDatapointType::BOOLEAN) {
       this->parent_->set_boolean_datapoint_value(*this->oscillation_id_, *call.get_oscillating());
     }
   }

From 585586780bf2fe6645eff64ed9528da8bd57e042 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 18 Nov 2024 20:44:39 +1300
Subject: [PATCH 02/28] Bump esphome-dashboard to 20241118.0 (#7782)

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

diff --git a/requirements.txt b/requirements.txt
index e11e629743..4bea8cf4ef 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pyserial==3.5
 platformio==6.1.16  # When updating platformio, also update Dockerfile
 esptool==4.7.0
 click==8.1.7
-esphome-dashboard==20241025.0
+esphome-dashboard==20241118.0
 aioesphomeapi==24.6.2
 zeroconf==0.132.2
 puremagic==1.27

From 1ed27b7cc0556679344f8fbe5101f1e338cc21a0 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 19 Nov 2024 09:04:30 +1300
Subject: [PATCH 03/28] Bump version to 2024.11.0b3

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

diff --git a/esphome/const.py b/esphome/const.py
index 51c8090e91..e7edd8337e 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2024.11.0b2"
+__version__ = "2024.11.0b3"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 VALID_SUBSTITUTIONS_CHARACTERS = (

From 49e9c4333979bfeae77f25ee32c3065bc610b7a5 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 20 Nov 2024 13:54:19 +1300
Subject: [PATCH 04/28] [http_request] Feed watchdog timeout around http
 request functions (#7786)

---
 esphome/components/http_request/http_request_arduino.cpp | 2 ++
 esphome/components/http_request/http_request_idf.cpp     | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/esphome/components/http_request/http_request_arduino.cpp b/esphome/components/http_request/http_request_arduino.cpp
index af1eb6f459..85a1312aaa 100644
--- a/esphome/components/http_request/http_request_arduino.cpp
+++ b/esphome/components/http_request/http_request_arduino.cpp
@@ -104,7 +104,9 @@ std::shared_ptr<HttpContainer> HttpRequestArduino::start(std::string url, std::s
   static const size_t HEADER_COUNT = sizeof(header_keys) / sizeof(header_keys[0]);
   container->client_.collectHeaders(header_keys, HEADER_COUNT);
 
+  App.feed_wdt();
   container->status_code = container->client_.sendRequest(method.c_str(), body.c_str());
+  App.feed_wdt();
   if (container->status_code < 0) {
     ESP_LOGW(TAG, "HTTP Request failed; URL: %s; Error: %s", url.c_str(),
              HTTPClient::errorToString(container->status_code).c_str());
diff --git a/esphome/components/http_request/http_request_idf.cpp b/esphome/components/http_request/http_request_idf.cpp
index c6c567b620..b449f046ee 100644
--- a/esphome/components/http_request/http_request_idf.cpp
+++ b/esphome/components/http_request/http_request_idf.cpp
@@ -117,8 +117,11 @@ std::shared_ptr<HttpContainer> HttpRequestIDF::start(std::string url, std::strin
     return nullptr;
   }
 
+  App.feed_wdt();
   container->content_length = esp_http_client_fetch_headers(client);
+  App.feed_wdt();
   container->status_code = esp_http_client_get_status_code(client);
+  App.feed_wdt();
   if (is_success(container->status_code)) {
     container->duration_ms = millis() - start;
     return container;
@@ -148,8 +151,11 @@ std::shared_ptr<HttpContainer> HttpRequestIDF::start(std::string url, std::strin
         return nullptr;
       }
 
+      App.feed_wdt();
       container->content_length = esp_http_client_fetch_headers(client);
+      App.feed_wdt();
       container->status_code = esp_http_client_get_status_code(client);
+      App.feed_wdt();
       if (is_success(container->status_code)) {
         container->duration_ms = millis() - start;
         return container;

From cf63d627fee4224f3652a0d101fae4cad1039da4 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 20 Nov 2024 17:39:28 +1300
Subject: [PATCH 05/28] Bump esphome-dashboard to 20241120.0 (#7787)

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

diff --git a/requirements.txt b/requirements.txt
index 4bea8cf4ef..7bc1c895df 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pyserial==3.5
 platformio==6.1.16  # When updating platformio, also update Dockerfile
 esptool==4.7.0
 click==8.1.7
-esphome-dashboard==20241118.0
+esphome-dashboard==20241120.0
 aioesphomeapi==24.6.2
 zeroconf==0.132.2
 puremagic==1.27

From eb8a2326ad2a9f32c52c94b52fbb3dfb4090c6c2 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 20 Nov 2024 13:54:19 +1300
Subject: [PATCH 06/28] [http_request] Feed watchdog timeout around http
 request functions (#7786)

---
 esphome/components/http_request/http_request_arduino.cpp | 2 ++
 esphome/components/http_request/http_request_idf.cpp     | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/esphome/components/http_request/http_request_arduino.cpp b/esphome/components/http_request/http_request_arduino.cpp
index af1eb6f459..85a1312aaa 100644
--- a/esphome/components/http_request/http_request_arduino.cpp
+++ b/esphome/components/http_request/http_request_arduino.cpp
@@ -104,7 +104,9 @@ std::shared_ptr<HttpContainer> HttpRequestArduino::start(std::string url, std::s
   static const size_t HEADER_COUNT = sizeof(header_keys) / sizeof(header_keys[0]);
   container->client_.collectHeaders(header_keys, HEADER_COUNT);
 
+  App.feed_wdt();
   container->status_code = container->client_.sendRequest(method.c_str(), body.c_str());
+  App.feed_wdt();
   if (container->status_code < 0) {
     ESP_LOGW(TAG, "HTTP Request failed; URL: %s; Error: %s", url.c_str(),
              HTTPClient::errorToString(container->status_code).c_str());
diff --git a/esphome/components/http_request/http_request_idf.cpp b/esphome/components/http_request/http_request_idf.cpp
index c6c567b620..b449f046ee 100644
--- a/esphome/components/http_request/http_request_idf.cpp
+++ b/esphome/components/http_request/http_request_idf.cpp
@@ -117,8 +117,11 @@ std::shared_ptr<HttpContainer> HttpRequestIDF::start(std::string url, std::strin
     return nullptr;
   }
 
+  App.feed_wdt();
   container->content_length = esp_http_client_fetch_headers(client);
+  App.feed_wdt();
   container->status_code = esp_http_client_get_status_code(client);
+  App.feed_wdt();
   if (is_success(container->status_code)) {
     container->duration_ms = millis() - start;
     return container;
@@ -148,8 +151,11 @@ std::shared_ptr<HttpContainer> HttpRequestIDF::start(std::string url, std::strin
         return nullptr;
       }
 
+      App.feed_wdt();
       container->content_length = esp_http_client_fetch_headers(client);
+      App.feed_wdt();
       container->status_code = esp_http_client_get_status_code(client);
+      App.feed_wdt();
       if (is_success(container->status_code)) {
         container->duration_ms = millis() - start;
         return container;

From 872b8ee753ef5799894289ac941392383145d1d7 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 20 Nov 2024 17:39:28 +1300
Subject: [PATCH 07/28] Bump esphome-dashboard to 20241120.0 (#7787)

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

diff --git a/requirements.txt b/requirements.txt
index 4bea8cf4ef..7bc1c895df 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pyserial==3.5
 platformio==6.1.16  # When updating platformio, also update Dockerfile
 esptool==4.7.0
 click==8.1.7
-esphome-dashboard==20241118.0
+esphome-dashboard==20241120.0
 aioesphomeapi==24.6.2
 zeroconf==0.132.2
 puremagic==1.27

From ae46dcef7e51eb148dd0858834b02dc855979a1b Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 20 Nov 2024 17:50:30 +1300
Subject: [PATCH 08/28] Bump version to 2024.11.0b4

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

diff --git a/esphome/const.py b/esphome/const.py
index e7edd8337e..659695465e 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2024.11.0b3"
+__version__ = "2024.11.0b4"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 VALID_SUBSTITUTIONS_CHARACTERS = (

From ef78c404dd19bb35af412a9dab0bd8e294cd7469 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 20 Nov 2024 21:29:42 +1300
Subject: [PATCH 09/28] Bump version to 2024.11.0

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

diff --git a/esphome/const.py b/esphome/const.py
index 659695465e..408dc52869 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2024.11.0b4"
+__version__ = "2024.11.0"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 VALID_SUBSTITUTIONS_CHARACTERS = (

From 372d68a177196d6efb688b9f15943c5fd05dd202 Mon Sep 17 00:00:00 2001
From: Jonathan Swoboda <154711427+swoboda1337@users.noreply.github.com>
Date: Wed, 20 Nov 2024 13:27:23 -0500
Subject: [PATCH 10/28] [remote_base] Fix extra comma in dump raw (#7774)

Co-authored-by: Jonathan Swoboda <jonathan.swoboda>
---
 esphome/components/remote_base/raw_protocol.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/remote_base/raw_protocol.cpp b/esphome/components/remote_base/raw_protocol.cpp
index bdeb935dc4..ef0cb8454e 100644
--- a/esphome/components/remote_base/raw_protocol.cpp
+++ b/esphome/components/remote_base/raw_protocol.cpp
@@ -28,7 +28,7 @@ bool RawDumper::dump(RemoteReceiveData src) {
       ESP_LOGI(TAG, "%s", buffer);
       buffer_offset = 0;
       written = sprintf(buffer, "  ");
-      if (i + 1 < src.size()) {
+      if (i + 1 < src.size() - 1) {
         written += sprintf(buffer + written, "%" PRId32 ", ", value);
       } else {
         written += sprintf(buffer + written, "%" PRId32, value);

From 846b091aacbe72078996cd0c89419a40c32cb1f8 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Wed, 20 Nov 2024 19:28:21 +0100
Subject: [PATCH 11/28] [nextion] New trigger `on_buffer_overflow` (#7772)

---
 esphome/components/nextion/automation.h         |  7 +++++++
 esphome/components/nextion/base_component.py    |  1 +
 esphome/components/nextion/display.py           | 15 +++++++++++++++
 esphome/components/nextion/nextion.cpp          |  8 +++++++-
 esphome/components/nextion/nextion.h            |  7 +++++++
 tests/components/nextion/test.esp32-ard.yaml    |  3 +++
 tests/components/nextion/test.esp32-c3-ard.yaml |  3 +++
 tests/components/nextion/test.esp32-c3-idf.yaml |  3 +++
 tests/components/nextion/test.esp32-idf.yaml    |  3 +++
 tests/components/nextion/test.esp8266-ard.yaml  |  3 +++
 tests/components/nextion/test.rp2040-ard.yaml   |  3 +++
 11 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/esphome/components/nextion/automation.h b/esphome/components/nextion/automation.h
index f51fe6b4f8..5182e07229 100644
--- a/esphome/components/nextion/automation.h
+++ b/esphome/components/nextion/automation.h
@@ -42,5 +42,12 @@ class TouchTrigger : public Trigger<uint8_t, uint8_t, bool> {
   }
 };
 
+class BufferOverflowTrigger : public Trigger<> {
+ public:
+  explicit BufferOverflowTrigger(Nextion *nextion) {
+    nextion->add_buffer_overflow_event_callback([this]() { this->trigger(); });
+  }
+};
+
 }  // namespace nextion
 }  // namespace esphome
diff --git a/esphome/components/nextion/base_component.py b/esphome/components/nextion/base_component.py
index 2924f66d3c..9708379861 100644
--- a/esphome/components/nextion/base_component.py
+++ b/esphome/components/nextion/base_component.py
@@ -18,6 +18,7 @@ CONF_ON_SLEEP = "on_sleep"
 CONF_ON_WAKE = "on_wake"
 CONF_ON_SETUP = "on_setup"
 CONF_ON_PAGE = "on_page"
+CONF_ON_BUFFER_OVERFLOW = "on_buffer_overflow"
 CONF_TOUCH_SLEEP_TIMEOUT = "touch_sleep_timeout"
 CONF_WAKE_UP_PAGE = "wake_up_page"
 CONF_START_UP_PAGE = "start_up_page"
diff --git a/esphome/components/nextion/display.py b/esphome/components/nextion/display.py
index e403ba7ae8..6f284376af 100644
--- a/esphome/components/nextion/display.py
+++ b/esphome/components/nextion/display.py
@@ -13,6 +13,7 @@ from esphome.const import (
 from esphome.core import CORE
 from . import Nextion, nextion_ns, nextion_ref
 from .base_component import (
+    CONF_ON_BUFFER_OVERFLOW,
     CONF_ON_SLEEP,
     CONF_ON_WAKE,
     CONF_ON_SETUP,
@@ -36,6 +37,9 @@ SleepTrigger = nextion_ns.class_("SleepTrigger", automation.Trigger.template())
 WakeTrigger = nextion_ns.class_("WakeTrigger", automation.Trigger.template())
 PageTrigger = nextion_ns.class_("PageTrigger", automation.Trigger.template())
 TouchTrigger = nextion_ns.class_("TouchTrigger", automation.Trigger.template())
+BufferOverflowTrigger = nextion_ns.class_(
+    "BufferOverflowTrigger", automation.Trigger.template()
+)
 
 CONFIG_SCHEMA = (
     display.BASIC_DISPLAY_SCHEMA.extend(
@@ -68,6 +72,13 @@ CONFIG_SCHEMA = (
                     cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(TouchTrigger),
                 }
             ),
+            cv.Optional(CONF_ON_BUFFER_OVERFLOW): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                        BufferOverflowTrigger
+                    ),
+                }
+            ),
             cv.Optional(CONF_TOUCH_SLEEP_TIMEOUT): cv.int_range(min=3, max=65535),
             cv.Optional(CONF_WAKE_UP_PAGE): cv.uint8_t,
             cv.Optional(CONF_START_UP_PAGE): cv.uint8_t,
@@ -151,3 +162,7 @@ async def to_code(config):
             ],
             conf,
         )
+
+    for conf in config.get(CONF_ON_BUFFER_OVERFLOW, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
diff --git a/esphome/components/nextion/nextion.cpp b/esphome/components/nextion/nextion.cpp
index a80f6efc91..984db09c57 100644
--- a/esphome/components/nextion/nextion.cpp
+++ b/esphome/components/nextion/nextion.cpp
@@ -190,6 +190,10 @@ void Nextion::add_touch_event_callback(std::function<void(uint8_t, uint8_t, bool
   this->touch_callback_.add(std::move(callback));
 }
 
+void Nextion::add_buffer_overflow_event_callback(std::function<void()> &&callback) {
+  this->buffer_overflow_callback_.add(std::move(callback));
+}
+
 void Nextion::update_all_components() {
   if ((!this->is_setup() && !this->ignore_is_setup_) || this->is_sleeping())
     return;
@@ -458,7 +462,9 @@ void Nextion::process_nextion_commands_() {
         this->remove_from_q_();
         break;
       case 0x24:  //  Serial Buffer overflow occurs
-        ESP_LOGW(TAG, "Nextion reported Serial Buffer overflow!");
+        // Buffer will continue to receive the current instruction, all previous instructions are lost.
+        ESP_LOGE(TAG, "Nextion reported Serial Buffer overflow!");
+        this->buffer_overflow_callback_.call();
         break;
       case 0x65: {  // touch event return data
         if (to_process_length != 3) {
diff --git a/esphome/components/nextion/nextion.h b/esphome/components/nextion/nextion.h
index 732ee9b455..f539c79718 100644
--- a/esphome/components/nextion/nextion.h
+++ b/esphome/components/nextion/nextion.h
@@ -1134,6 +1134,12 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
    */
   void add_touch_event_callback(std::function<void(uint8_t, uint8_t, bool)> &&callback);
 
+  /** Add a callback to be notified when the nextion reports a buffer overflow.
+   *
+   * @param callback The void() callback.
+   */
+  void add_buffer_overflow_event_callback(std::function<void()> &&callback);
+
   void update_all_components();
 
   /**
@@ -1323,6 +1329,7 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
   CallbackManager<void()> wake_callback_{};
   CallbackManager<void(uint8_t)> page_callback_{};
   CallbackManager<void(uint8_t, uint8_t, bool)> touch_callback_{};
+  CallbackManager<void()> buffer_overflow_callback_{};
 
   optional<nextion_writer_t> writer_;
   float brightness_{1.0};
diff --git a/tests/components/nextion/test.esp32-ard.yaml b/tests/components/nextion/test.esp32-ard.yaml
index 27568ebc2a..ba76236fc6 100644
--- a/tests/components/nextion/test.esp32-ard.yaml
+++ b/tests/components/nextion/test.esp32-ard.yaml
@@ -58,3 +58,6 @@ display:
     on_page:
       then:
         lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
+    on_buffer_overflow:
+      then:
+        logger.log: "Nextion reported a buffer overflow!"
diff --git a/tests/components/nextion/test.esp32-c3-ard.yaml b/tests/components/nextion/test.esp32-c3-ard.yaml
index 5881d6e165..5d253268f8 100644
--- a/tests/components/nextion/test.esp32-c3-ard.yaml
+++ b/tests/components/nextion/test.esp32-c3-ard.yaml
@@ -58,3 +58,6 @@ display:
     on_page:
       then:
         lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
+    on_buffer_overflow:
+      then:
+        logger.log: "Nextion reported a buffer overflow!"
diff --git a/tests/components/nextion/test.esp32-c3-idf.yaml b/tests/components/nextion/test.esp32-c3-idf.yaml
index 5881d6e165..5d253268f8 100644
--- a/tests/components/nextion/test.esp32-c3-idf.yaml
+++ b/tests/components/nextion/test.esp32-c3-idf.yaml
@@ -58,3 +58,6 @@ display:
     on_page:
       then:
         lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
+    on_buffer_overflow:
+      then:
+        logger.log: "Nextion reported a buffer overflow!"
diff --git a/tests/components/nextion/test.esp32-idf.yaml b/tests/components/nextion/test.esp32-idf.yaml
index 27568ebc2a..ba76236fc6 100644
--- a/tests/components/nextion/test.esp32-idf.yaml
+++ b/tests/components/nextion/test.esp32-idf.yaml
@@ -58,3 +58,6 @@ display:
     on_page:
       then:
         lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
+    on_buffer_overflow:
+      then:
+        logger.log: "Nextion reported a buffer overflow!"
diff --git a/tests/components/nextion/test.esp8266-ard.yaml b/tests/components/nextion/test.esp8266-ard.yaml
index 5881d6e165..5d253268f8 100644
--- a/tests/components/nextion/test.esp8266-ard.yaml
+++ b/tests/components/nextion/test.esp8266-ard.yaml
@@ -58,3 +58,6 @@ display:
     on_page:
       then:
         lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
+    on_buffer_overflow:
+      then:
+        logger.log: "Nextion reported a buffer overflow!"
diff --git a/tests/components/nextion/test.rp2040-ard.yaml b/tests/components/nextion/test.rp2040-ard.yaml
index a1c5848ce6..9b04433095 100644
--- a/tests/components/nextion/test.rp2040-ard.yaml
+++ b/tests/components/nextion/test.rp2040-ard.yaml
@@ -53,3 +53,6 @@ display:
     on_page:
       then:
         lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
+    on_buffer_overflow:
+      then:
+        logger.log: "Nextion reported a buffer overflow!"

From 5e27a8df1f5fc3978939521d421d6330d1296128 Mon Sep 17 00:00:00 2001
From: Kjell Braden <afflux@pentabarf.de>
Date: Wed, 20 Nov 2024 19:29:48 +0100
Subject: [PATCH 12/28] enable rp2040 for online_image (#7769)

---
 esphome/components/online_image/__init__.py   |  1 +
 .../online_image/common-rp2040.yaml           | 19 +++++++++++++++++++
 .../online_image/test.rp2040-ard.yaml         |  4 ++++
 3 files changed, 24 insertions(+)
 create mode 100644 tests/components/online_image/common-rp2040.yaml
 create mode 100644 tests/components/online_image/test.rp2040-ard.yaml

diff --git a/esphome/components/online_image/__init__.py b/esphome/components/online_image/__init__.py
index dfb10137aa..be1bfb4a00 100644
--- a/esphome/components/online_image/__init__.py
+++ b/esphome/components/online_image/__init__.py
@@ -98,6 +98,7 @@ CONFIG_SCHEMA = cv.Schema(
             # esp8266_arduino=cv.Version(2, 7, 0),
             esp32_arduino=cv.Version(0, 0, 0),
             esp_idf=cv.Version(4, 0, 0),
+            rp2040_arduino=cv.Version(0, 0, 0),
         ),
     )
 )
diff --git a/tests/components/online_image/common-rp2040.yaml b/tests/components/online_image/common-rp2040.yaml
new file mode 100644
index 0000000000..16bb2b2c44
--- /dev/null
+++ b/tests/components/online_image/common-rp2040.yaml
@@ -0,0 +1,19 @@
+<<: !include common.yaml
+
+spi:
+  - id: spi_main_lcd
+    clk_pin: 18
+    mosi_pin: 19
+    miso_pin: 16
+
+display:
+  - platform: ili9xxx
+    id: main_lcd
+    model: ili9342
+    cs_pin: 20
+    dc_pin: 17
+    reset_pin: 21
+    invert_colors: true
+    lambda: |-
+      it.fill(Color(0, 0, 0));
+      it.image(0, 0, id(online_rgba_image));
diff --git a/tests/components/online_image/test.rp2040-ard.yaml b/tests/components/online_image/test.rp2040-ard.yaml
new file mode 100644
index 0000000000..d10f36b4e9
--- /dev/null
+++ b/tests/components/online_image/test.rp2040-ard.yaml
@@ -0,0 +1,4 @@
+<<: !include common-rp2040.yaml
+
+http_request:
+  verify_ssl: false

From 6d4f787f67b6d4dc16fcdbdca3a1984db8d9df62 Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Thu, 21 Nov 2024 11:10:28 +1100
Subject: [PATCH 13/28] [http_request] Fix within context with parameters.
 (Bugfix) (#7790)

---
 esphome/components/http_request/http_request.h | 2 +-
 tests/components/http_request/common.yaml      | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/esphome/components/http_request/http_request.h b/esphome/components/http_request/http_request.h
index 4ed2c834f8..b2ce718ec4 100644
--- a/esphome/components/http_request/http_request.h
+++ b/esphome/components/http_request/http_request.h
@@ -189,7 +189,7 @@ template<typename... Ts> class HttpRequestSendAction : public Action<Ts...> {
 
     if (container == nullptr) {
       for (auto *trigger : this->error_triggers_)
-        trigger->trigger(x...);
+        trigger->trigger();
       return;
     }
 
diff --git a/tests/components/http_request/common.yaml b/tests/components/http_request/common.yaml
index 593b85e435..8408f27a05 100644
--- a/tests/components/http_request/common.yaml
+++ b/tests/components/http_request/common.yaml
@@ -39,6 +39,14 @@ http_request:
   timeout: 10s
   verify_ssl: ${verify_ssl}
 
+script:
+  - id: does_not_compile
+    parameters:
+      api_url: string
+    then:
+      - http_request.get:
+          url: "http://google.com"
+
 ota:
   - platform: http_request
     on_begin:

From fbb9967117d248951906b0bb19ef200e7f546360 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 21 Nov 2024 19:22:02 +1300
Subject: [PATCH 14/28] [rtttl] Clamp gain between 0 and 1 (#7793)

---
 esphome/components/rtttl/rtttl.h | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/esphome/components/rtttl/rtttl.h b/esphome/components/rtttl/rtttl.h
index 10c290c5fb..420948bfbf 100644
--- a/esphome/components/rtttl/rtttl.h
+++ b/esphome/components/rtttl/rtttl.h
@@ -40,13 +40,7 @@ class Rtttl : public Component {
   void set_speaker(speaker::Speaker *speaker) { this->speaker_ = speaker; }
 #endif
   float get_gain() { return gain_; }
-  void set_gain(float gain) {
-    if (gain < 0.1f)
-      gain = 0.1f;
-    if (gain > 1.0f)
-      gain = 1.0f;
-    this->gain_ = gain;
-  }
+  void set_gain(float gain) { this->gain_ = clamp(gain, 0.0f, 1.0f); }
   void play(std::string rtttl);
   void stop();
   void dump_config() override;

From 6bcbbcce02ca9441cffe6d7f559eceb92ab76811 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 21 Nov 2024 21:10:20 +1300
Subject: [PATCH 15/28] [speaker] Add missing auto-load for ``audio`` (#7794)

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

diff --git a/esphome/components/speaker/__init__.py b/esphome/components/speaker/__init__.py
index 7a668dc2f3..948fe4b534 100644
--- a/esphome/components/speaker/__init__.py
+++ b/esphome/components/speaker/__init__.py
@@ -7,6 +7,7 @@ from esphome.const import CONF_DATA, CONF_ID, CONF_VOLUME
 from esphome.core import CORE
 from esphome.coroutine import coroutine_with_priority
 
+AUTO_LOAD = ["audio"]
 CODEOWNERS = ["@jesserockz", "@kahrendt"]
 
 IS_PLATFORM_COMPONENT = True

From 03ae6b2c1b6e4ae2a509c109c2381214e0cdb131 Mon Sep 17 00:00:00 2001
From: Manuel Kasper <mk@neon1.net>
Date: Thu, 21 Nov 2024 10:46:49 +0100
Subject: [PATCH 16/28] [qspi_dbi] Fix garbled graphics on RM690B0 (#7795)

---
 esphome/components/qspi_dbi/models.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/components/qspi_dbi/models.py b/esphome/components/qspi_dbi/models.py
index 071ea72d73..cbd9c4663f 100644
--- a/esphome/components/qspi_dbi/models.py
+++ b/esphome/components/qspi_dbi/models.py
@@ -55,6 +55,7 @@ chip.cmd(PAGESEL, 0x00)
 chip.cmd(0xC2, 0x00)
 chip.delay(10)
 chip.cmd(TEON, 0x00)
+chip.cmd(PIXFMT, 0x55)
 
 chip = DriverChip("AXS15231")
 chip.cmd(0xBB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA5)

From ccf2854b612a1659c27cedeb22eaf49b871f157c Mon Sep 17 00:00:00 2001
From: Spencer Owen <owenspencer@gmail.com>
Date: Thu, 21 Nov 2024 12:24:10 -0700
Subject: [PATCH 17/28] Check for min_version earlier in validation (#7797)

---
 esphome/core/config.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/esphome/core/config.py b/esphome/core/config.py
index 8c130eb6db..367e61c413 100644
--- a/esphome/core/config.py
+++ b/esphome/core/config.py
@@ -184,6 +184,9 @@ PRELOAD_CONFIG_SCHEMA = cv.Schema(
         cv.Optional(CONF_ESP8266_RESTORE_FROM_FLASH): cv.valid,
         cv.Optional(CONF_BOARD_FLASH_MODE): cv.valid,
         cv.Optional(CONF_ARDUINO_VERSION): cv.valid,
+        cv.Optional(CONF_MIN_VERSION, default=ESPHOME_VERSION): cv.All(
+            cv.version_number, cv.validate_esphome_version
+        ),
     },
     extra=cv.ALLOW_EXTRA,
 )

From 3232866dc337b0e3332f9b7283d834f025e2a642 Mon Sep 17 00:00:00 2001
From: Alain Turbide <7193213+Dilbert66@users.noreply.github.com>
Date: Thu, 21 Nov 2024 15:39:32 -0500
Subject: [PATCH 18/28] Fix for OTA mode not activating in safe_mode when OTA
 section has an on_xxxx action (#7796)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/esphome/ota/__init__.py | 8 ++++----
 esphome/components/ota/__init__.py         | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/esphome/components/esphome/ota/__init__.py b/esphome/components/esphome/ota/__init__.py
index a852d8d001..86006e3e18 100644
--- a/esphome/components/esphome/ota/__init__.py
+++ b/esphome/components/esphome/ota/__init__.py
@@ -1,10 +1,9 @@
 import logging
 
 import esphome.codegen as cg
-import esphome.config_validation as cv
-import esphome.final_validate as fv
-from esphome.components.ota import BASE_OTA_SCHEMA, ota_to_code, OTAComponent
+from esphome.components.ota import BASE_OTA_SCHEMA, OTAComponent, ota_to_code
 from esphome.config_helpers import merge_config
+import esphome.config_validation as cv
 from esphome.const import (
     CONF_ESPHOME,
     CONF_ID,
@@ -18,6 +17,7 @@ from esphome.const import (
     CONF_VERSION,
 )
 from esphome.core import coroutine_with_priority
+import esphome.final_validate as fv
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -124,7 +124,6 @@ FINAL_VALIDATE_SCHEMA = ota_esphome_final_validate
 @coroutine_with_priority(52.0)
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
-    await ota_to_code(var, config)
     cg.add(var.set_port(config[CONF_PORT]))
     if CONF_PASSWORD in config:
         cg.add(var.set_auth_password(config[CONF_PASSWORD]))
@@ -132,3 +131,4 @@ async def to_code(config):
     cg.add_define("USE_OTA_VERSION", config[CONF_VERSION])
 
     await cg.register_component(var, config)
+    await ota_to_code(var, config)
diff --git a/esphome/components/ota/__init__.py b/esphome/components/ota/__init__.py
index d9917a2aae..627c55e910 100644
--- a/esphome/components/ota/__init__.py
+++ b/esphome/components/ota/__init__.py
@@ -92,6 +92,7 @@ async def to_code(config):
 
 
 async def ota_to_code(var, config):
+    await cg.past_safe_mode()
     use_state_callback = False
     for conf in config.get(CONF_ON_STATE_CHANGE, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)

From 122ff731ef43206212976da35354494e928639f6 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 21 Nov 2024 14:41:31 -0600
Subject: [PATCH 19/28] Ensure storage I/O for ignored devices runs in the
 executor (#7792)

---
 esphome/dashboard/core.py       | 2 +-
 esphome/dashboard/web_server.py | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/esphome/dashboard/core.py b/esphome/dashboard/core.py
index 563ca1506d..f53cb7ffb1 100644
--- a/esphome/dashboard/core.py
+++ b/esphome/dashboard/core.py
@@ -103,7 +103,7 @@ class ESPHomeDashboard:
         self.loop = asyncio.get_running_loop()
         self.ping_request = asyncio.Event()
         self.entries = DashboardEntries(self)
-        self.load_ignored_devices()
+        await self.loop.run_in_executor(None, self.load_ignored_devices)
 
     def load_ignored_devices(self) -> None:
         storage_path = Path(ignored_devices_storage_path())
diff --git a/esphome/dashboard/web_server.py b/esphome/dashboard/web_server.py
index 07f7f019f8..0fed8e9c53 100644
--- a/esphome/dashboard/web_server.py
+++ b/esphome/dashboard/web_server.py
@@ -544,7 +544,7 @@ class ImportRequestHandler(BaseHandler):
 
 class IgnoreDeviceRequestHandler(BaseHandler):
     @authenticated
-    def post(self) -> None:
+    async def post(self) -> None:
         dashboard = DASHBOARD
         try:
             args = json.loads(self.request.body.decode())
@@ -576,7 +576,8 @@ class IgnoreDeviceRequestHandler(BaseHandler):
         else:
             dashboard.ignored_devices.discard(ignored_device.device_name)
 
-        dashboard.save_ignored_devices()
+        loop = asyncio.get_running_loop()
+        await loop.run_in_executor(None, dashboard.save_ignored_devices)
 
         self.set_status(204)
         self.finish()

From 888b2379647049712a94143074b95c79e1f8392b Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Thu, 21 Nov 2024 11:10:28 +1100
Subject: [PATCH 20/28] [http_request] Fix within context with parameters.
 (Bugfix) (#7790)

---
 esphome/components/http_request/http_request.h | 2 +-
 tests/components/http_request/common.yaml      | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/esphome/components/http_request/http_request.h b/esphome/components/http_request/http_request.h
index 4ed2c834f8..b2ce718ec4 100644
--- a/esphome/components/http_request/http_request.h
+++ b/esphome/components/http_request/http_request.h
@@ -189,7 +189,7 @@ template<typename... Ts> class HttpRequestSendAction : public Action<Ts...> {
 
     if (container == nullptr) {
       for (auto *trigger : this->error_triggers_)
-        trigger->trigger(x...);
+        trigger->trigger();
       return;
     }
 
diff --git a/tests/components/http_request/common.yaml b/tests/components/http_request/common.yaml
index 593b85e435..8408f27a05 100644
--- a/tests/components/http_request/common.yaml
+++ b/tests/components/http_request/common.yaml
@@ -39,6 +39,14 @@ http_request:
   timeout: 10s
   verify_ssl: ${verify_ssl}
 
+script:
+  - id: does_not_compile
+    parameters:
+      api_url: string
+    then:
+      - http_request.get:
+          url: "http://google.com"
+
 ota:
   - platform: http_request
     on_begin:

From a0693060e401153409a2095b0a29248bd23dee0e Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 21 Nov 2024 19:22:02 +1300
Subject: [PATCH 21/28] [rtttl] Clamp gain between 0 and 1 (#7793)

---
 esphome/components/rtttl/rtttl.h | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/esphome/components/rtttl/rtttl.h b/esphome/components/rtttl/rtttl.h
index 10c290c5fb..420948bfbf 100644
--- a/esphome/components/rtttl/rtttl.h
+++ b/esphome/components/rtttl/rtttl.h
@@ -40,13 +40,7 @@ class Rtttl : public Component {
   void set_speaker(speaker::Speaker *speaker) { this->speaker_ = speaker; }
 #endif
   float get_gain() { return gain_; }
-  void set_gain(float gain) {
-    if (gain < 0.1f)
-      gain = 0.1f;
-    if (gain > 1.0f)
-      gain = 1.0f;
-    this->gain_ = gain;
-  }
+  void set_gain(float gain) { this->gain_ = clamp(gain, 0.0f, 1.0f); }
   void play(std::string rtttl);
   void stop();
   void dump_config() override;

From f04e3de7b8d103a21cbe06f1b5c78e7a78be3429 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 21 Nov 2024 21:10:20 +1300
Subject: [PATCH 22/28] [speaker] Add missing auto-load for ``audio`` (#7794)

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

diff --git a/esphome/components/speaker/__init__.py b/esphome/components/speaker/__init__.py
index 7a668dc2f3..948fe4b534 100644
--- a/esphome/components/speaker/__init__.py
+++ b/esphome/components/speaker/__init__.py
@@ -7,6 +7,7 @@ from esphome.const import CONF_DATA, CONF_ID, CONF_VOLUME
 from esphome.core import CORE
 from esphome.coroutine import coroutine_with_priority
 
+AUTO_LOAD = ["audio"]
 CODEOWNERS = ["@jesserockz", "@kahrendt"]
 
 IS_PLATFORM_COMPONENT = True

From 489d0d20d2279257574038ab798755242441c18b Mon Sep 17 00:00:00 2001
From: Manuel Kasper <mk@neon1.net>
Date: Thu, 21 Nov 2024 10:46:49 +0100
Subject: [PATCH 23/28] [qspi_dbi] Fix garbled graphics on RM690B0 (#7795)

---
 esphome/components/qspi_dbi/models.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/components/qspi_dbi/models.py b/esphome/components/qspi_dbi/models.py
index 071ea72d73..cbd9c4663f 100644
--- a/esphome/components/qspi_dbi/models.py
+++ b/esphome/components/qspi_dbi/models.py
@@ -55,6 +55,7 @@ chip.cmd(PAGESEL, 0x00)
 chip.cmd(0xC2, 0x00)
 chip.delay(10)
 chip.cmd(TEON, 0x00)
+chip.cmd(PIXFMT, 0x55)
 
 chip = DriverChip("AXS15231")
 chip.cmd(0xBB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA5)

From ea424b069979e5c53438f95abdd43acdc521cd78 Mon Sep 17 00:00:00 2001
From: Spencer Owen <owenspencer@gmail.com>
Date: Thu, 21 Nov 2024 12:24:10 -0700
Subject: [PATCH 24/28] Check for min_version earlier in validation (#7797)

---
 esphome/core/config.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/esphome/core/config.py b/esphome/core/config.py
index 8c130eb6db..367e61c413 100644
--- a/esphome/core/config.py
+++ b/esphome/core/config.py
@@ -184,6 +184,9 @@ PRELOAD_CONFIG_SCHEMA = cv.Schema(
         cv.Optional(CONF_ESP8266_RESTORE_FROM_FLASH): cv.valid,
         cv.Optional(CONF_BOARD_FLASH_MODE): cv.valid,
         cv.Optional(CONF_ARDUINO_VERSION): cv.valid,
+        cv.Optional(CONF_MIN_VERSION, default=ESPHOME_VERSION): cv.All(
+            cv.version_number, cv.validate_esphome_version
+        ),
     },
     extra=cv.ALLOW_EXTRA,
 )

From 1c1f3f7c55607c504226f7a1ed52794a0482b123 Mon Sep 17 00:00:00 2001
From: Alain Turbide <7193213+Dilbert66@users.noreply.github.com>
Date: Thu, 21 Nov 2024 15:39:32 -0500
Subject: [PATCH 25/28] Fix for OTA mode not activating in safe_mode when OTA
 section has an on_xxxx action (#7796)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/esphome/ota/__init__.py | 8 ++++----
 esphome/components/ota/__init__.py         | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/esphome/components/esphome/ota/__init__.py b/esphome/components/esphome/ota/__init__.py
index a852d8d001..86006e3e18 100644
--- a/esphome/components/esphome/ota/__init__.py
+++ b/esphome/components/esphome/ota/__init__.py
@@ -1,10 +1,9 @@
 import logging
 
 import esphome.codegen as cg
-import esphome.config_validation as cv
-import esphome.final_validate as fv
-from esphome.components.ota import BASE_OTA_SCHEMA, ota_to_code, OTAComponent
+from esphome.components.ota import BASE_OTA_SCHEMA, OTAComponent, ota_to_code
 from esphome.config_helpers import merge_config
+import esphome.config_validation as cv
 from esphome.const import (
     CONF_ESPHOME,
     CONF_ID,
@@ -18,6 +17,7 @@ from esphome.const import (
     CONF_VERSION,
 )
 from esphome.core import coroutine_with_priority
+import esphome.final_validate as fv
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -124,7 +124,6 @@ FINAL_VALIDATE_SCHEMA = ota_esphome_final_validate
 @coroutine_with_priority(52.0)
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
-    await ota_to_code(var, config)
     cg.add(var.set_port(config[CONF_PORT]))
     if CONF_PASSWORD in config:
         cg.add(var.set_auth_password(config[CONF_PASSWORD]))
@@ -132,3 +131,4 @@ async def to_code(config):
     cg.add_define("USE_OTA_VERSION", config[CONF_VERSION])
 
     await cg.register_component(var, config)
+    await ota_to_code(var, config)
diff --git a/esphome/components/ota/__init__.py b/esphome/components/ota/__init__.py
index d9917a2aae..627c55e910 100644
--- a/esphome/components/ota/__init__.py
+++ b/esphome/components/ota/__init__.py
@@ -92,6 +92,7 @@ async def to_code(config):
 
 
 async def ota_to_code(var, config):
+    await cg.past_safe_mode()
     use_state_callback = False
     for conf in config.get(CONF_ON_STATE_CHANGE, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)

From e51f3d9498d377ed45d15665e1c91f91d6a2aae0 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 21 Nov 2024 14:41:31 -0600
Subject: [PATCH 26/28] Ensure storage I/O for ignored devices runs in the
 executor (#7792)

---
 esphome/dashboard/core.py       | 2 +-
 esphome/dashboard/web_server.py | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/esphome/dashboard/core.py b/esphome/dashboard/core.py
index 563ca1506d..f53cb7ffb1 100644
--- a/esphome/dashboard/core.py
+++ b/esphome/dashboard/core.py
@@ -103,7 +103,7 @@ class ESPHomeDashboard:
         self.loop = asyncio.get_running_loop()
         self.ping_request = asyncio.Event()
         self.entries = DashboardEntries(self)
-        self.load_ignored_devices()
+        await self.loop.run_in_executor(None, self.load_ignored_devices)
 
     def load_ignored_devices(self) -> None:
         storage_path = Path(ignored_devices_storage_path())
diff --git a/esphome/dashboard/web_server.py b/esphome/dashboard/web_server.py
index 07f7f019f8..0fed8e9c53 100644
--- a/esphome/dashboard/web_server.py
+++ b/esphome/dashboard/web_server.py
@@ -544,7 +544,7 @@ class ImportRequestHandler(BaseHandler):
 
 class IgnoreDeviceRequestHandler(BaseHandler):
     @authenticated
-    def post(self) -> None:
+    async def post(self) -> None:
         dashboard = DASHBOARD
         try:
             args = json.loads(self.request.body.decode())
@@ -576,7 +576,8 @@ class IgnoreDeviceRequestHandler(BaseHandler):
         else:
             dashboard.ignored_devices.discard(ignored_device.device_name)
 
-        dashboard.save_ignored_devices()
+        loop = asyncio.get_running_loop()
+        await loop.run_in_executor(None, dashboard.save_ignored_devices)
 
         self.set_status(204)
         self.finish()

From 2cc2a2153b2c219d1bd07a9fe427b16d38e2e6f7 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 22 Nov 2024 10:08:00 +1300
Subject: [PATCH 27/28] Bump version to 2024.11.1

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

diff --git a/esphome/const.py b/esphome/const.py
index 408dc52869..d14cdecb23 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2024.11.0"
+__version__ = "2024.11.1"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 VALID_SUBSTITUTIONS_CHARACTERS = (

From dea297c8d7d73f0c4f366e58994cd6a9a3995e11 Mon Sep 17 00:00:00 2001
From: Petr Kejval <petr.kejval6@gmail.com>
Date: Sat, 23 Nov 2024 05:52:02 +0100
Subject: [PATCH 28/28] [nextion] Add publish actions (#7646)

Co-authored-by: Keith Burzinski <kbx81x@gmail.com>
---
 esphome/components/nextion/__init__.py        |   2 +
 esphome/components/nextion/automation.h       |  75 ++++-
 .../nextion/binary_sensor/__init__.py         |  45 ++-
 esphome/components/nextion/sensor/__init__.py |  43 ++-
 esphome/components/nextion/switch/__init__.py |  40 ++-
 .../nextion/text_sensor/__init__.py           |  39 ++-
 tests/components/nextion/common.yaml          | 293 ++++++++++++++++++
 tests/components/nextion/test.esp32-ard.yaml  |  65 +---
 .../components/nextion/test.esp32-c3-ard.yaml |  65 +---
 .../components/nextion/test.esp32-c3-idf.yaml |  65 +---
 tests/components/nextion/test.esp32-idf.yaml  |  65 +---
 .../components/nextion/test.esp8266-ard.yaml  |  65 +---
 tests/components/nextion/test.rp2040-ard.yaml |  61 +---
 13 files changed, 558 insertions(+), 365 deletions(-)
 create mode 100644 tests/components/nextion/common.yaml

diff --git a/esphome/components/nextion/__init__.py b/esphome/components/nextion/__init__.py
index 924d58198d..fb75daf4ba 100644
--- a/esphome/components/nextion/__init__.py
+++ b/esphome/components/nextion/__init__.py
@@ -6,3 +6,5 @@ Nextion = nextion_ns.class_("Nextion", cg.PollingComponent, uart.UARTDevice)
 nextion_ref = Nextion.operator("ref")
 
 CONF_NEXTION_ID = "nextion_id"
+CONF_PUBLISH_STATE = "publish_state"
+CONF_SEND_TO_NEXTION = "send_to_nextion"
diff --git a/esphome/components/nextion/automation.h b/esphome/components/nextion/automation.h
index 5182e07229..65f1fd0058 100644
--- a/esphome/components/nextion/automation.h
+++ b/esphome/components/nextion/automation.h
@@ -5,6 +5,13 @@
 namespace esphome {
 namespace nextion {
 
+class BufferOverflowTrigger : public Trigger<> {
+ public:
+  explicit BufferOverflowTrigger(Nextion *nextion) {
+    nextion->add_buffer_overflow_event_callback([this]() { this->trigger(); });
+  }
+};
+
 class SetupTrigger : public Trigger<> {
  public:
   explicit SetupTrigger(Nextion *nextion) {
@@ -42,11 +49,73 @@ class TouchTrigger : public Trigger<uint8_t, uint8_t, bool> {
   }
 };
 
-class BufferOverflowTrigger : public Trigger<> {
+template<typename... Ts> class NextionPublishFloatAction : public Action<Ts...> {
  public:
-  explicit BufferOverflowTrigger(Nextion *nextion) {
-    nextion->add_buffer_overflow_event_callback([this]() { this->trigger(); });
+  explicit NextionPublishFloatAction(NextionComponent *component) : component_(component) {}
+
+  TEMPLATABLE_VALUE(float, state)
+  TEMPLATABLE_VALUE(bool, publish_state)
+  TEMPLATABLE_VALUE(bool, send_to_nextion)
+
+  void play(Ts... x) override {
+    this->component_->set_state(this->state_.value(x...), this->publish_state_.value(x...),
+                                this->send_to_nextion_.value(x...));
   }
+
+  void set_state(std::function<void(Ts..., float)> state) { this->state_ = state; }
+  void set_publish_state(std::function<void(Ts..., bool)> publish_state) { this->publish_state_ = publish_state; }
+  void set_send_to_nextion(std::function<void(Ts..., bool)> send_to_nextion) {
+    this->send_to_nextion_ = send_to_nextion;
+  }
+
+ protected:
+  NextionComponent *component_;
+};
+
+template<typename... Ts> class NextionPublishTextAction : public Action<Ts...> {
+ public:
+  explicit NextionPublishTextAction(NextionComponent *component) : component_(component) {}
+
+  TEMPLATABLE_VALUE(const char *, state)
+  TEMPLATABLE_VALUE(bool, publish_state)
+  TEMPLATABLE_VALUE(bool, send_to_nextion)
+
+  void play(Ts... x) override {
+    this->component_->set_state(this->state_.value(x...), this->publish_state_.value(x...),
+                                this->send_to_nextion_.value(x...));
+  }
+
+  void set_state(std::function<void(Ts..., const char *)> state) { this->state_ = state; }
+  void set_publish_state(std::function<void(Ts..., bool)> publish_state) { this->publish_state_ = publish_state; }
+  void set_send_to_nextion(std::function<void(Ts..., bool)> send_to_nextion) {
+    this->send_to_nextion_ = send_to_nextion;
+  }
+
+ protected:
+  NextionComponent *component_;
+};
+
+template<typename... Ts> class NextionPublishBoolAction : public Action<Ts...> {
+ public:
+  explicit NextionPublishBoolAction(NextionComponent *component) : component_(component) {}
+
+  TEMPLATABLE_VALUE(bool, state)
+  TEMPLATABLE_VALUE(bool, publish_state)
+  TEMPLATABLE_VALUE(bool, send_to_nextion)
+
+  void play(Ts... x) override {
+    this->component_->set_state(this->state_.value(x...), this->publish_state_.value(x...),
+                                this->send_to_nextion_.value(x...));
+  }
+
+  void set_state(std::function<void(Ts..., bool)> state) { this->state_ = state; }
+  void set_publish_state(std::function<void(Ts..., bool)> publish_state) { this->publish_state_ = publish_state; }
+  void set_send_to_nextion(std::function<void(Ts..., bool)> send_to_nextion) {
+    this->send_to_nextion_ = send_to_nextion;
+  }
+
+ protected:
+  NextionComponent *component_;
 };
 
 }  // namespace nextion
diff --git a/esphome/components/nextion/binary_sensor/__init__.py b/esphome/components/nextion/binary_sensor/__init__.py
index 8b4a45cc60..a257587e13 100644
--- a/esphome/components/nextion/binary_sensor/__init__.py
+++ b/esphome/components/nextion/binary_sensor/__init__.py
@@ -1,9 +1,16 @@
+from esphome import automation
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import binary_sensor
 
-from esphome.const import CONF_COMPONENT_ID, CONF_PAGE_ID, CONF_ID
-from .. import nextion_ns, CONF_NEXTION_ID
+from esphome.const import (
+    CONF_ID,
+    CONF_STATE,
+    CONF_COMPONENT_ID,
+    CONF_PAGE_ID,
+)
+
+from .. import nextion_ns, CONF_NEXTION_ID, CONF_PUBLISH_STATE, CONF_SEND_TO_NEXTION
 
 
 from ..base_component import (
@@ -19,6 +26,10 @@ NextionBinarySensor = nextion_ns.class_(
     "NextionBinarySensor", binary_sensor.BinarySensor, cg.PollingComponent
 )
 
+NextionPublishBoolAction = nextion_ns.class_(
+    "NextionPublishBoolAction", automation.Action
+)
+
 CONFIG_SCHEMA = cv.All(
     binary_sensor.binary_sensor_schema(NextionBinarySensor)
     .extend(
@@ -52,3 +63,33 @@ async def to_code(config):
     if CONF_COMPONENT_NAME in config or CONF_VARIABLE_NAME in config:
         await setup_component_core_(var, config, ".val")
         cg.add(hub.register_binarysensor_component(var))
+
+
+@automation.register_action(
+    "binary_sensor.nextion.publish",
+    NextionPublishBoolAction,
+    cv.Schema(
+        {
+            cv.Required(CONF_ID): cv.use_id(NextionBinarySensor),
+            cv.Required(CONF_STATE): cv.templatable(cv.boolean),
+            cv.Optional(CONF_PUBLISH_STATE, default="true"): cv.templatable(cv.boolean),
+            cv.Optional(CONF_SEND_TO_NEXTION, default="true"): cv.templatable(
+                cv.boolean
+            ),
+        }
+    ),
+)
+async def sensor_nextion_publish_to_code(config, action_id, template_arg, args):
+    paren = await cg.get_variable(config[CONF_ID])
+    var = cg.new_Pvariable(action_id, template_arg, paren)
+
+    template_ = await cg.templatable(config[CONF_STATE], args, bool)
+    cg.add(var.set_state(template_))
+
+    template_ = await cg.templatable(config[CONF_PUBLISH_STATE], args, bool)
+    cg.add(var.set_publish_state(template_))
+
+    template_ = await cg.templatable(config[CONF_SEND_TO_NEXTION], args, bool)
+    cg.add(var.set_send_to_nextion(template_))
+
+    return var
diff --git a/esphome/components/nextion/sensor/__init__.py b/esphome/components/nextion/sensor/__init__.py
index eefbe34d58..1058c2a04b 100644
--- a/esphome/components/nextion/sensor/__init__.py
+++ b/esphome/components/nextion/sensor/__init__.py
@@ -1,12 +1,11 @@
+from esphome import automation
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import sensor
 
-from esphome.const import (
-    CONF_ID,
-    CONF_COMPONENT_ID,
-)
-from .. import nextion_ns, CONF_NEXTION_ID
+from esphome.const import CONF_ID, CONF_COMPONENT_ID, CONF_STATE
+
+from .. import nextion_ns, CONF_NEXTION_ID, CONF_PUBLISH_STATE, CONF_SEND_TO_NEXTION
 
 from ..base_component import (
     setup_component_core_,
@@ -25,6 +24,10 @@ CODEOWNERS = ["@senexcrenshaw"]
 
 NextionSensor = nextion_ns.class_("NextionSensor", sensor.Sensor, cg.PollingComponent)
 
+NextionPublishFloatAction = nextion_ns.class_(
+    "NextionPublishFloatAction", automation.Action
+)
+
 
 def CheckWaveID(value):
     value = cv.int_(value)
@@ -95,3 +98,33 @@ async def to_code(config):
 
     if CONF_WAVE_MAX_LENGTH in config:
         cg.add(var.set_wave_max_length(config[CONF_WAVE_MAX_LENGTH]))
+
+
+@automation.register_action(
+    "sensor.nextion.publish",
+    NextionPublishFloatAction,
+    cv.Schema(
+        {
+            cv.Required(CONF_ID): cv.use_id(NextionSensor),
+            cv.Required(CONF_STATE): cv.templatable(cv.float_),
+            cv.Optional(CONF_PUBLISH_STATE, default="true"): cv.templatable(cv.boolean),
+            cv.Optional(CONF_SEND_TO_NEXTION, default="true"): cv.templatable(
+                cv.boolean
+            ),
+        }
+    ),
+)
+async def sensor_nextion_publish_to_code(config, action_id, template_arg, args):
+    paren = await cg.get_variable(config[CONF_ID])
+    var = cg.new_Pvariable(action_id, template_arg, paren)
+
+    template_ = await cg.templatable(config[CONF_STATE], args, float)
+    cg.add(var.set_state(template_))
+
+    template_ = await cg.templatable(config[CONF_PUBLISH_STATE], args, bool)
+    cg.add(var.set_publish_state(template_))
+
+    template_ = await cg.templatable(config[CONF_SEND_TO_NEXTION], args, bool)
+    cg.add(var.set_send_to_nextion(template_))
+
+    return var
diff --git a/esphome/components/nextion/switch/__init__.py b/esphome/components/nextion/switch/__init__.py
index 91ab0cc81f..de1a061478 100644
--- a/esphome/components/nextion/switch/__init__.py
+++ b/esphome/components/nextion/switch/__init__.py
@@ -1,9 +1,11 @@
+from esphome import automation
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import switch
 
-from esphome.const import CONF_ID
-from .. import nextion_ns, CONF_NEXTION_ID
+from esphome.const import CONF_ID, CONF_STATE
+
+from .. import nextion_ns, CONF_NEXTION_ID, CONF_PUBLISH_STATE, CONF_SEND_TO_NEXTION
 
 from ..base_component import (
     setup_component_core_,
@@ -16,6 +18,10 @@ CODEOWNERS = ["@senexcrenshaw"]
 
 NextionSwitch = nextion_ns.class_("NextionSwitch", switch.Switch, cg.PollingComponent)
 
+NextionPublishBoolAction = nextion_ns.class_(
+    "NextionPublishBoolAction", automation.Action
+)
+
 CONFIG_SCHEMA = cv.All(
     switch.switch_schema(NextionSwitch)
     .extend(CONFIG_SWITCH_COMPONENT_SCHEMA)
@@ -33,3 +39,33 @@ async def to_code(config):
     cg.add(hub.register_switch_component(var))
 
     await setup_component_core_(var, config, ".val")
+
+
+@automation.register_action(
+    "switch.nextion.publish",
+    NextionPublishBoolAction,
+    cv.Schema(
+        {
+            cv.Required(CONF_ID): cv.use_id(NextionSwitch),
+            cv.Required(CONF_STATE): cv.templatable(cv.boolean),
+            cv.Optional(CONF_PUBLISH_STATE, default="true"): cv.templatable(cv.boolean),
+            cv.Optional(CONF_SEND_TO_NEXTION, default="true"): cv.templatable(
+                cv.boolean
+            ),
+        }
+    ),
+)
+async def sensor_nextion_publish_to_code(config, action_id, template_arg, args):
+    paren = await cg.get_variable(config[CONF_ID])
+    var = cg.new_Pvariable(action_id, template_arg, paren)
+
+    template_ = await cg.templatable(config[CONF_STATE], args, bool)
+    cg.add(var.set_state(template_))
+
+    template_ = await cg.templatable(config[CONF_PUBLISH_STATE], args, bool)
+    cg.add(var.set_publish_state(template_))
+
+    template_ = await cg.templatable(config[CONF_SEND_TO_NEXTION], args, bool)
+    cg.add(var.set_send_to_nextion(template_))
+
+    return var
diff --git a/esphome/components/nextion/text_sensor/__init__.py b/esphome/components/nextion/text_sensor/__init__.py
index 826ff2354e..793397b1f4 100644
--- a/esphome/components/nextion/text_sensor/__init__.py
+++ b/esphome/components/nextion/text_sensor/__init__.py
@@ -1,9 +1,10 @@
+from esphome import automation
 from esphome.components import text_sensor
 import esphome.config_validation as cv
 import esphome.codegen as cg
-from esphome.const import CONF_ID
+from esphome.const import CONF_ID, CONF_STATE
 
-from .. import nextion_ns, CONF_NEXTION_ID
+from .. import nextion_ns, CONF_NEXTION_ID, CONF_PUBLISH_STATE, CONF_SEND_TO_NEXTION
 
 from ..base_component import (
     setup_component_core_,
@@ -16,6 +17,10 @@ NextionTextSensor = nextion_ns.class_(
     "NextionTextSensor", text_sensor.TextSensor, cg.PollingComponent
 )
 
+NextionPublishTextAction = nextion_ns.class_(
+    "NextionPublishTextAction", automation.Action
+)
+
 CONFIG_SCHEMA = (
     text_sensor.text_sensor_schema(NextionTextSensor)
     .extend(CONFIG_TEXT_COMPONENT_SCHEMA)
@@ -32,3 +37,33 @@ async def to_code(config):
     cg.add(hub.register_textsensor_component(var))
 
     await setup_component_core_(var, config, ".txt")
+
+
+@automation.register_action(
+    "text_sensor.nextion.publish",
+    NextionPublishTextAction,
+    cv.Schema(
+        {
+            cv.Required(CONF_ID): cv.use_id(NextionTextSensor),
+            cv.Required(CONF_STATE): cv.templatable(cv.string_strict),
+            cv.Optional(CONF_PUBLISH_STATE, default="true"): cv.templatable(cv.boolean),
+            cv.Optional(CONF_SEND_TO_NEXTION, default="true"): cv.templatable(
+                cv.boolean
+            ),
+        }
+    ),
+)
+async def sensor_nextion_publish_to_code(config, action_id, template_arg, args):
+    paren = await cg.get_variable(config[CONF_ID])
+    var = cg.new_Pvariable(action_id, template_arg, paren)
+
+    template_ = await cg.templatable(config[CONF_STATE], args, cg.const_char_ptr)
+    cg.add(var.set_state(template_))
+
+    template_ = await cg.templatable(config[CONF_PUBLISH_STATE], args, cg.bool_)
+    cg.add(var.set_publish_state(template_))
+
+    template_ = await cg.templatable(config[CONF_SEND_TO_NEXTION], args, cg.bool_)
+    cg.add(var.set_send_to_nextion(template_))
+
+    return var
diff --git a/tests/components/nextion/common.yaml b/tests/components/nextion/common.yaml
new file mode 100644
index 0000000000..e84cd08422
--- /dev/null
+++ b/tests/components/nextion/common.yaml
@@ -0,0 +1,293 @@
+esphome:
+  on_boot:
+    # Binary sensor publish action tests
+    - binary_sensor.nextion.publish:
+        id: r0_sensor
+        state: True
+
+    - binary_sensor.nextion.publish:
+        id: r0_sensor
+        state: True
+        publish_state: True
+        send_to_nextion: True
+
+    - binary_sensor.nextion.publish:
+        id: r0_sensor
+        state: True
+        publish_state: False
+        send_to_nextion: True
+
+    - binary_sensor.nextion.publish:
+        id: r0_sensor
+        state: True
+        publish_state: True
+        send_to_nextion: False
+
+    - binary_sensor.nextion.publish:
+        id: r0_sensor
+        state: True
+        publish_state: False
+        send_to_nextion: False
+
+    # Templated
+    - binary_sensor.nextion.publish:
+        id: r0_sensor
+        state: !lambda 'return true;'
+
+    - binary_sensor.nextion.publish:
+        id: r0_sensor
+        state: !lambda 'return true;'
+        publish_state: !lambda 'return true;'
+        send_to_nextion: !lambda 'return true;'
+
+    - binary_sensor.nextion.publish:
+        id: r0_sensor
+        state: !lambda 'return true;'
+        publish_state: !lambda 'return false;'
+        send_to_nextion: !lambda 'return true;'
+
+    - binary_sensor.nextion.publish:
+        id: r0_sensor
+        state: !lambda 'return true;'
+        publish_state: !lambda 'return true;'
+        send_to_nextion: !lambda 'return false;'
+
+    - binary_sensor.nextion.publish:
+        id: r0_sensor
+        state: !lambda 'return true;'
+        publish_state: !lambda 'return false;'
+        send_to_nextion: !lambda 'return false;'
+
+    # Sensor publish action tests
+    - sensor.nextion.publish:
+        id: testnumber
+        state: 42.0
+
+    - sensor.nextion.publish:
+        id: testnumber
+        state: 42.0
+        publish_state: True
+        send_to_nextion: True
+
+    - sensor.nextion.publish:
+        id: testnumber
+        state: 42.0
+        publish_state: False
+        send_to_nextion: True
+
+    - sensor.nextion.publish:
+        id: testnumber
+        state: 42.0
+        publish_state: True
+        send_to_nextion: False
+
+    - sensor.nextion.publish:
+        id: testnumber
+        state: 42.0
+        publish_state: False
+        send_to_nextion: False
+
+    # Templated
+    - sensor.nextion.publish:
+        id: testnumber
+        state: !lambda 'return 42.0;'
+
+    - sensor.nextion.publish:
+        id: testnumber
+        state: !lambda 'return 42.0;'
+        publish_state: !lambda 'return true;'
+        send_to_nextion: !lambda 'return true;'
+
+    - sensor.nextion.publish:
+        id: testnumber
+        state: !lambda 'return 42.0;'
+        publish_state: !lambda 'return false;'
+        send_to_nextion: !lambda 'return true;'
+
+    - sensor.nextion.publish:
+        id: testnumber
+        state: !lambda 'return 42.0;'
+        publish_state: !lambda 'return true;'
+        send_to_nextion: !lambda 'return false;'
+
+    - sensor.nextion.publish:
+        id: testnumber
+        state: !lambda 'return 42.0;'
+        publish_state: !lambda 'return false;'
+        send_to_nextion: !lambda 'return false;'
+
+    # Switch publish action tests
+    - switch.nextion.publish:
+        id: r0
+        state: True
+
+    - switch.nextion.publish:
+        id: r0
+        state: True
+        publish_state: true
+        send_to_nextion: true
+
+    - switch.nextion.publish:
+        id: r0
+        state: True
+        publish_state: false
+        send_to_nextion: true
+
+    - switch.nextion.publish:
+        id: r0
+        state: True
+        publish_state: true
+        send_to_nextion: false
+
+    - switch.nextion.publish:
+        id: r0
+        state: True
+        publish_state: false
+        send_to_nextion: false
+
+    # Templated
+    - switch.nextion.publish:
+        id: r0
+        state: !lambda 'return true;'
+
+    - switch.nextion.publish:
+        id: r0
+        state: !lambda 'return true;'
+        publish_state: !lambda 'return true;'
+        send_to_nextion: !lambda 'return true;'
+
+    - switch.nextion.publish:
+        id: r0
+        state: !lambda 'return true;'
+        publish_state: !lambda 'return false;'
+        send_to_nextion: !lambda 'return true;'
+
+    - switch.nextion.publish:
+        id: r0
+        state: !lambda 'return true;'
+        publish_state: !lambda 'return true;'
+        send_to_nextion: !lambda 'return false;'
+
+    - switch.nextion.publish:
+        id: r0
+        state: !lambda 'return true;'
+        publish_state: !lambda 'return false;'
+        send_to_nextion: !lambda 'return false;'
+
+    # Test sensor publish action tests
+    - text_sensor.nextion.publish:
+        id: text0
+        state: 'Test'
+        publish_state: true
+        send_to_nextion: true
+
+    - text_sensor.nextion.publish:
+        id: text0
+        state: 'Test'
+        publish_state: false
+        send_to_nextion: true
+
+    - text_sensor.nextion.publish:
+        id: text0
+        state: 'Test'
+        publish_state: true
+        send_to_nextion: false
+
+    - text_sensor.nextion.publish:
+        id: text0
+        state: 'Test'
+        publish_state: false
+        send_to_nextion: false
+
+    # Templated
+    - text_sensor.nextion.publish:
+        id: text0
+        state: !lambda 'return "Test";'
+
+    - text_sensor.nextion.publish:
+        id: text0
+        state: !lambda 'return "Test";'
+        publish_state: !lambda 'return true;'
+        send_to_nextion: !lambda 'return true;'
+
+    - text_sensor.nextion.publish:
+        id: text0
+        state: !lambda 'return "Test";'
+        publish_state: !lambda 'return false;'
+        send_to_nextion: !lambda 'return true;'
+
+    - text_sensor.nextion.publish:
+        id: text0
+        state: !lambda 'return "Test";'
+        publish_state: !lambda 'return true;'
+        send_to_nextion: !lambda 'return false;'
+
+    - text_sensor.nextion.publish:
+        id: text0
+        state: !lambda 'return "Test";'
+        publish_state: !lambda 'return false;'
+        send_to_nextion: !lambda 'return false;'
+
+wifi:
+  ssid: MySSID
+  password: password1
+
+uart:
+  - id: uart_nextion
+    tx_pin: ${tx_pin}
+    rx_pin: ${rx_pin}
+    baud_rate: 115200
+
+binary_sensor:
+  - platform: nextion
+    page_id: 0
+    component_id: 2
+    name: Nextion Touch Component
+  - platform: nextion
+    id: r0_sensor
+    name: R0 Sensor
+    component_name: page0.r0
+
+sensor:
+  - platform: nextion
+    id: testnumber
+    name: testnumber
+    variable_name: testnumber
+  - platform: nextion
+    id: testwave
+    name: testwave
+    component_id: 2
+    wave_channel_id: 1
+
+switch:
+  - platform: nextion
+    id: r0
+    name: R0 Switch
+    component_name: page0.r0
+
+text_sensor:
+  - platform: nextion
+    name: text0
+    id: text0
+    update_interval: 4s
+    component_name: text0
+
+display:
+  - platform: nextion
+    id: main_lcd
+    update_interval: 5s
+    on_sleep:
+      then:
+        lambda: 'ESP_LOGD("display","Display went to sleep");'
+    on_wake:
+      then:
+        lambda: 'ESP_LOGD("display","Display woke up");'
+    on_setup:
+      then:
+        lambda: 'ESP_LOGD("display","Display setup completed");'
+    on_page:
+      then:
+        lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
+    on_buffer_overflow:
+      then:
+        logger.log: "Nextion reported a buffer overflow!"
diff --git a/tests/components/nextion/test.esp32-ard.yaml b/tests/components/nextion/test.esp32-ard.yaml
index ba76236fc6..d5e02b8b85 100644
--- a/tests/components/nextion/test.esp32-ard.yaml
+++ b/tests/components/nextion/test.esp32-ard.yaml
@@ -1,63 +1,10 @@
-wifi:
-  ssid: MySSID
-  password: password1
+substitutions:
+  tx_pin: GPIO17
+  rx_pin: GPIO16
 
-uart:
-  - id: uart_nextion
-    tx_pin: 17
-    rx_pin: 16
-    baud_rate: 115200
-
-binary_sensor:
-  - platform: nextion
-    page_id: 0
-    component_id: 2
-    name: Nextion Touch Component
-  - platform: nextion
-    id: r0_sensor
-    name: R0 Sensor
-    component_name: page0.r0
-
-sensor:
-  - platform: nextion
-    id: testnumber
-    name: testnumber
-    variable_name: testnumber
-  - platform: nextion
-    id: testwave
-    name: testwave
-    component_id: 2
-    wave_channel_id: 1
-
-switch:
-  - platform: nextion
-    id: r0
-    name: R0 Switch
-    component_name: page0.r0
-
-text_sensor:
-  - platform: nextion
-    name: text0
-    id: text0
-    update_interval: 4s
-    component_name: text0
+packages:
+  base: !include common.yaml
 
 display:
-  - platform: nextion
+  - id: !extend main_lcd
     tft_url: http://esphome.io/default35.tft
-    update_interval: 5s
-    on_sleep:
-      then:
-        lambda: 'ESP_LOGD("display","Display went to sleep");'
-    on_wake:
-      then:
-        lambda: 'ESP_LOGD("display","Display woke up");'
-    on_setup:
-      then:
-        lambda: 'ESP_LOGD("display","Display setup completed");'
-    on_page:
-      then:
-        lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
-    on_buffer_overflow:
-      then:
-        logger.log: "Nextion reported a buffer overflow!"
diff --git a/tests/components/nextion/test.esp32-c3-ard.yaml b/tests/components/nextion/test.esp32-c3-ard.yaml
index 5d253268f8..5135c7e4f4 100644
--- a/tests/components/nextion/test.esp32-c3-ard.yaml
+++ b/tests/components/nextion/test.esp32-c3-ard.yaml
@@ -1,63 +1,10 @@
-wifi:
-  ssid: MySSID
-  password: password1
+substitutions:
+  tx_pin: GPIO4
+  rx_pin: GPIO5
 
-uart:
-  - id: uart_nextion
-    tx_pin: 4
-    rx_pin: 5
-    baud_rate: 115200
-
-binary_sensor:
-  - platform: nextion
-    page_id: 0
-    component_id: 2
-    name: Nextion Touch Component
-  - platform: nextion
-    id: r0_sensor
-    name: R0 Sensor
-    component_name: page0.r0
-
-sensor:
-  - platform: nextion
-    id: testnumber
-    name: testnumber
-    variable_name: testnumber
-  - platform: nextion
-    id: testwave
-    name: testwave
-    component_id: 2
-    wave_channel_id: 1
-
-switch:
-  - platform: nextion
-    id: r0
-    name: R0 Switch
-    component_name: page0.r0
-
-text_sensor:
-  - platform: nextion
-    name: text0
-    id: text0
-    update_interval: 4s
-    component_name: text0
+packages:
+  base: !include common.yaml
 
 display:
-  - platform: nextion
+  - id: !extend main_lcd
     tft_url: http://esphome.io/default35.tft
-    update_interval: 5s
-    on_sleep:
-      then:
-        lambda: 'ESP_LOGD("display","Display went to sleep");'
-    on_wake:
-      then:
-        lambda: 'ESP_LOGD("display","Display woke up");'
-    on_setup:
-      then:
-        lambda: 'ESP_LOGD("display","Display setup completed");'
-    on_page:
-      then:
-        lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
-    on_buffer_overflow:
-      then:
-        logger.log: "Nextion reported a buffer overflow!"
diff --git a/tests/components/nextion/test.esp32-c3-idf.yaml b/tests/components/nextion/test.esp32-c3-idf.yaml
index 5d253268f8..5135c7e4f4 100644
--- a/tests/components/nextion/test.esp32-c3-idf.yaml
+++ b/tests/components/nextion/test.esp32-c3-idf.yaml
@@ -1,63 +1,10 @@
-wifi:
-  ssid: MySSID
-  password: password1
+substitutions:
+  tx_pin: GPIO4
+  rx_pin: GPIO5
 
-uart:
-  - id: uart_nextion
-    tx_pin: 4
-    rx_pin: 5
-    baud_rate: 115200
-
-binary_sensor:
-  - platform: nextion
-    page_id: 0
-    component_id: 2
-    name: Nextion Touch Component
-  - platform: nextion
-    id: r0_sensor
-    name: R0 Sensor
-    component_name: page0.r0
-
-sensor:
-  - platform: nextion
-    id: testnumber
-    name: testnumber
-    variable_name: testnumber
-  - platform: nextion
-    id: testwave
-    name: testwave
-    component_id: 2
-    wave_channel_id: 1
-
-switch:
-  - platform: nextion
-    id: r0
-    name: R0 Switch
-    component_name: page0.r0
-
-text_sensor:
-  - platform: nextion
-    name: text0
-    id: text0
-    update_interval: 4s
-    component_name: text0
+packages:
+  base: !include common.yaml
 
 display:
-  - platform: nextion
+  - id: !extend main_lcd
     tft_url: http://esphome.io/default35.tft
-    update_interval: 5s
-    on_sleep:
-      then:
-        lambda: 'ESP_LOGD("display","Display went to sleep");'
-    on_wake:
-      then:
-        lambda: 'ESP_LOGD("display","Display woke up");'
-    on_setup:
-      then:
-        lambda: 'ESP_LOGD("display","Display setup completed");'
-    on_page:
-      then:
-        lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
-    on_buffer_overflow:
-      then:
-        logger.log: "Nextion reported a buffer overflow!"
diff --git a/tests/components/nextion/test.esp32-idf.yaml b/tests/components/nextion/test.esp32-idf.yaml
index ba76236fc6..d5e02b8b85 100644
--- a/tests/components/nextion/test.esp32-idf.yaml
+++ b/tests/components/nextion/test.esp32-idf.yaml
@@ -1,63 +1,10 @@
-wifi:
-  ssid: MySSID
-  password: password1
+substitutions:
+  tx_pin: GPIO17
+  rx_pin: GPIO16
 
-uart:
-  - id: uart_nextion
-    tx_pin: 17
-    rx_pin: 16
-    baud_rate: 115200
-
-binary_sensor:
-  - platform: nextion
-    page_id: 0
-    component_id: 2
-    name: Nextion Touch Component
-  - platform: nextion
-    id: r0_sensor
-    name: R0 Sensor
-    component_name: page0.r0
-
-sensor:
-  - platform: nextion
-    id: testnumber
-    name: testnumber
-    variable_name: testnumber
-  - platform: nextion
-    id: testwave
-    name: testwave
-    component_id: 2
-    wave_channel_id: 1
-
-switch:
-  - platform: nextion
-    id: r0
-    name: R0 Switch
-    component_name: page0.r0
-
-text_sensor:
-  - platform: nextion
-    name: text0
-    id: text0
-    update_interval: 4s
-    component_name: text0
+packages:
+  base: !include common.yaml
 
 display:
-  - platform: nextion
+  - id: !extend main_lcd
     tft_url: http://esphome.io/default35.tft
-    update_interval: 5s
-    on_sleep:
-      then:
-        lambda: 'ESP_LOGD("display","Display went to sleep");'
-    on_wake:
-      then:
-        lambda: 'ESP_LOGD("display","Display woke up");'
-    on_setup:
-      then:
-        lambda: 'ESP_LOGD("display","Display setup completed");'
-    on_page:
-      then:
-        lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
-    on_buffer_overflow:
-      then:
-        logger.log: "Nextion reported a buffer overflow!"
diff --git a/tests/components/nextion/test.esp8266-ard.yaml b/tests/components/nextion/test.esp8266-ard.yaml
index 5d253268f8..5135c7e4f4 100644
--- a/tests/components/nextion/test.esp8266-ard.yaml
+++ b/tests/components/nextion/test.esp8266-ard.yaml
@@ -1,63 +1,10 @@
-wifi:
-  ssid: MySSID
-  password: password1
+substitutions:
+  tx_pin: GPIO4
+  rx_pin: GPIO5
 
-uart:
-  - id: uart_nextion
-    tx_pin: 4
-    rx_pin: 5
-    baud_rate: 115200
-
-binary_sensor:
-  - platform: nextion
-    page_id: 0
-    component_id: 2
-    name: Nextion Touch Component
-  - platform: nextion
-    id: r0_sensor
-    name: R0 Sensor
-    component_name: page0.r0
-
-sensor:
-  - platform: nextion
-    id: testnumber
-    name: testnumber
-    variable_name: testnumber
-  - platform: nextion
-    id: testwave
-    name: testwave
-    component_id: 2
-    wave_channel_id: 1
-
-switch:
-  - platform: nextion
-    id: r0
-    name: R0 Switch
-    component_name: page0.r0
-
-text_sensor:
-  - platform: nextion
-    name: text0
-    id: text0
-    update_interval: 4s
-    component_name: text0
+packages:
+  base: !include common.yaml
 
 display:
-  - platform: nextion
+  - id: !extend main_lcd
     tft_url: http://esphome.io/default35.tft
-    update_interval: 5s
-    on_sleep:
-      then:
-        lambda: 'ESP_LOGD("display","Display went to sleep");'
-    on_wake:
-      then:
-        lambda: 'ESP_LOGD("display","Display woke up");'
-    on_setup:
-      then:
-        lambda: 'ESP_LOGD("display","Display setup completed");'
-    on_page:
-      then:
-        lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
-    on_buffer_overflow:
-      then:
-        logger.log: "Nextion reported a buffer overflow!"
diff --git a/tests/components/nextion/test.rp2040-ard.yaml b/tests/components/nextion/test.rp2040-ard.yaml
index 9b04433095..20347c6eff 100644
--- a/tests/components/nextion/test.rp2040-ard.yaml
+++ b/tests/components/nextion/test.rp2040-ard.yaml
@@ -1,58 +1,7 @@
-uart:
-  - id: uart_nextion
-    tx_pin: 4
-    rx_pin: 5
-    baud_rate: 115200
+substitutions:
+  tx_pin: GPIO4
+  rx_pin: GPIO5
 
-binary_sensor:
-  - platform: nextion
-    page_id: 0
-    component_id: 2
-    name: Nextion Touch Component
-  - platform: nextion
-    id: r0_sensor
-    name: R0 Sensor
-    component_name: page0.r0
+packages:
+  base: !include common.yaml
 
-sensor:
-  - platform: nextion
-    id: testnumber
-    name: testnumber
-    variable_name: testnumber
-  - platform: nextion
-    id: testwave
-    name: testwave
-    component_id: 2
-    wave_channel_id: 1
-
-switch:
-  - platform: nextion
-    id: r0
-    name: R0 Switch
-    component_name: page0.r0
-
-text_sensor:
-  - platform: nextion
-    name: text0
-    id: text0
-    update_interval: 4s
-    component_name: text0
-
-display:
-  - platform: nextion
-    update_interval: 5s
-    on_sleep:
-      then:
-        lambda: 'ESP_LOGD("display","Display went to sleep");'
-    on_wake:
-      then:
-        lambda: 'ESP_LOGD("display","Display woke up");'
-    on_setup:
-      then:
-        lambda: 'ESP_LOGD("display","Display setup completed");'
-    on_page:
-      then:
-        lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
-    on_buffer_overflow:
-      then:
-        logger.log: "Nextion reported a buffer overflow!"