Address review: reference WDT_FEED_INTERVAL_MS in slow-path comment

# Conflicts:
#	esphome/core/application.cpp
#	esphome/core/application.h

.clang-tidy.hash

@@ -1 +1 @@
-c65f1a0804a7765462d570c50891ac719260592df2c9cdfe88233fc346ac59e9
+dc8ad5472d9fb44ce1ca29a0601afd65705642799a2819704dfc8459fbaf9815

.devcontainer/devcontainer.json

@@ -12,7 +12,7 @@
     "--privileged",
     "-e",
     "GIT_EDITOR=code --wait"
-    // uncomment and edit the path in order to pass through local USB serial to the container
+    // uncomment and edit the path in order to pass though local USB serial to the conatiner
     // , "--device=/dev/ttyACM0"
   ],
   "appPort": 6052,

.github/workflows/ci.yml

@@ -339,7 +339,7 @@ jobs:
           echo "binary=$BINARY" >> $GITHUB_OUTPUT
 
       - name: Run CodSpeed benchmarks
-        uses: CodSpeedHQ/action@658a901452bb54c799643e060733b7afe9121b8d # v4.14.0
+        uses: CodSpeedHQ/action@db35df748deb45fdef0960669f57d627c1956c30 # v4
         with:
           run: ${{ steps.build.outputs.binary }}
           mode: simulation

.github/workflows/codeql.yml

@@ -58,7 +58,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
+        uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
         with:
           languages: ${{ matrix.language }}
           build-mode: ${{ matrix.build-mode }}
@@ -86,6 +86,6 @@ jobs:
           exit 1
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
+        uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/lock.yml

@@ -8,4 +8,4 @@ on:
 
 jobs:
   lock:
-    uses: esphome/workflows/.github/workflows/lock.yml@3c4e8446aa1029f1c346a482034b3ee1489077ca  # 2026.4.0
+    uses: esphome/workflows/.github/workflows/lock.yml@main

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ ci:
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.15.11
+    rev: v0.15.10
     hooks:
       # Run the linter.
       - id: ruff
@@ -58,7 +58,6 @@ repos:
         entry: python3 script/run-in-env.py pylint
         language: system
         types: [python]
-        files: ^esphome/.+\.py$
       - id: clang-tidy-hash
         name: Update clang-tidy hash
         entry: python script/clang_tidy_hash.py --update-if-changed

esphome/automation.py

@@ -199,10 +199,11 @@ def validate_automation(extra_schema=None, extra_validators=None, single=False):
                     return cv.Schema([schema])(value)
                 except cv.Invalid as err2:
                     if "extra keys not allowed" in str(err2) and len(err2.path) == 2:
-                        raise err from None
+                        # pylint: disable=raise-missing-from
+                        raise err
                     if "Unable to find action" in str(err):
-                        raise err2 from None
-                    raise cv.MultipleInvalid([err, err2]) from None
+                        raise err2
+                    raise cv.MultipleInvalid([err, err2])
         elif isinstance(value, dict):
             if CONF_THEN in value:
                 return [schema(value)]

esphome/bundle.py

@@ -151,8 +151,8 @@ class ConfigBundleCreator:
 
     def __init__(self, config: dict[str, Any]) -> None:
         self._config = config
-        self._config_dir = Path(CORE.config_dir).resolve()
-        self._config_path = Path(CORE.config_path).resolve()
+        self._config_dir = CORE.config_dir
+        self._config_path = CORE.config_path
         self._files: list[BundleFile] = []
         self._seen_paths: set[Path] = set()
         self._secrets_paths: set[Path] = set()
@@ -258,36 +258,21 @@ class ConfigBundleCreator:
     def _discover_yaml_includes(self) -> None:
         """Discover YAML files loaded during config parsing.
 
-        Deliberately uses a fresh re-parse and force-loads every deferred
-        ``IncludeFile`` to include *all* potentially-reachable includes,
-        even branches not selected by the local substitutions. Bundles are
-        meant to be compiled on another system where command-line
-        substitution overrides may choose a different branch — e.g.
-        ``!include network/${eth_model}/config.yaml`` must ship every
-        candidate so the remote build can pick any one.
-
-        Entries with unresolved substitution variables in the filename
-        path are skipped with a warning (they cannot be resolved without
-        the substitution pass).
+        We track files by wrapping _load_yaml_internal. The config has already
+        been loaded at this point (bundle is a POST_CONFIG_ACTION), so we
+        re-load just to discover the file list.
 
         Secrets files are tracked separately so we can filter them to
         only include the keys this config actually references.
         """
-        # Must be a fresh parse: IncludeFile.load() caches its result in
-        # _content, and we discover files by listening for loader calls. On
-        # an already-parsed tree the cache is populated, .load() returns
-        # without calling the loader, the listener never fires, and the
-        # referenced files would be silently dropped from the bundle.
         with yaml_util.track_yaml_loads() as loaded_files:
             try:
-                data = yaml_util.load_yaml(self._config_path)
+                yaml_util.load_yaml(self._config_path)
             except EsphomeError:
                 _LOGGER.debug(
                     "Bundle: re-loading YAML for include discovery failed, "
                     "proceeding with partial file list"
                 )
-            else:
-                _force_load_include_files(data)
 
         for fpath in loaded_files:
             if fpath == self._config_path.resolve():
@@ -623,57 +608,6 @@ def _add_bytes_to_tar(tar: tarfile.TarFile, name: str, data: bytes) -> None:
     tar.addfile(info, io.BytesIO(data))
 
 
-def _force_load_include_files(obj: Any, _seen: set[int] | None = None) -> None:
-    """Recursively resolve any ``IncludeFile`` instances in a YAML tree.
-
-    Nested ``!include`` returns a deferred ``IncludeFile`` that is only
-    resolved during the substitution pass. During bundle discovery we need
-    the referenced files to actually load so the ``track_yaml_loads``
-    listener fires for them.
-
-    ``IncludeFile`` instances with unresolved substitution variables in the
-    filename cannot be loaded — we skip and warn about those.
-    """
-    if _seen is None:
-        _seen = set()
-
-    if isinstance(obj, yaml_util.IncludeFile):
-        if id(obj) in _seen:
-            return
-        _seen.add(id(obj))
-        if obj.has_unresolved_expressions():
-            _LOGGER.warning(
-                "Bundle: cannot resolve !include %s (referenced from %s) "
-                "with substitutions in path",
-                obj.file,
-                obj.parent_file,
-            )
-            return
-        try:
-            loaded = obj.load()
-        except EsphomeError as err:
-            _LOGGER.warning(
-                "Bundle: failed to load !include %s (referenced from %s): %s",
-                obj.file,
-                obj.parent_file,
-                err,
-            )
-            return
-        _force_load_include_files(loaded, _seen)
-    elif isinstance(obj, dict):
-        if id(obj) in _seen:
-            return
-        _seen.add(id(obj))
-        for value in obj.values():
-            _force_load_include_files(value, _seen)
-    elif isinstance(obj, (list, tuple)):
-        if id(obj) in _seen:
-            return
-        _seen.add(id(obj))
-        for item in obj:
-            _force_load_include_files(item, _seen)
-
-
 def _resolve_include_path(include_path: Any) -> Path | None:
     """Resolve an include path to absolute, skipping system includes."""
     if isinstance(include_path, str) and include_path.startswith("<"):

esphome/components/anova/anova_base.cpp

@@ -2,8 +2,6 @@
 #include <cstdio>
 #include <cstring>
 
-#include "esphome/core/alloc_helpers.h"
-
 namespace esphome {
 namespace anova {
 
@@ -107,14 +105,14 @@ void AnovaCodec::decode(const uint8_t *data, uint16_t length) {
     }
     case READ_TARGET_TEMPERATURE:
     case SET_TARGET_TEMPERATURE: {
-      this->target_temp_ = parse_number<float>(str_until(buf, '\r')).value_or(0.0f);  // NOLINT
+      this->target_temp_ = parse_number<float>(str_until(buf, '\r')).value_or(0.0f);
       if (this->fahrenheit_)
         this->target_temp_ = ftoc(this->target_temp_);
       this->has_target_temp_ = true;
       break;
     }
     case READ_CURRENT_TEMPERATURE: {
-      this->current_temp_ = parse_number<float>(str_until(buf, '\r')).value_or(0.0f);  // NOLINT
+      this->current_temp_ = parse_number<float>(str_until(buf, '\r')).value_or(0.0f);
       if (this->fahrenheit_)
         this->current_temp_ = ftoc(this->current_temp_);
       this->has_current_temp_ = true;

esphome/components/api/__init__.py

@@ -291,12 +291,12 @@ CONFIG_SCHEMA = cv.All(
             cv.SplitDefault(
                 CONF_MAX_CONNECTIONS,
                 esp8266=4,  # ~40KB free RAM, each connection uses ~500-1000 bytes
-                esp32=5,  # 520KB RAM available
+                esp32=8,  # 520KB RAM available
                 rp2040=4,  # 264KB RAM but LWIP constraints
-                bk72xx=5,  # Moderate RAM
-                rtl87xx=5,  # Moderate RAM
+                bk72xx=8,  # Moderate RAM
+                rtl87xx=8,  # Moderate RAM
                 host=8,  # Abundant resources
-                ln882x=5,  # Moderate RAM
+                ln882x=8,  # Moderate RAM
             ): cv.int_range(min=1, max=20),
             # Maximum queued send buffers per connection before dropping connection
             # Each buffer uses ~8-12 bytes overhead plus actual message size
@@ -336,7 +336,8 @@ async def to_code(config: ConfigType) -> None:
     cg.add(var.set_batch_delay(config[CONF_BATCH_DELAY]))
     if CONF_LISTEN_BACKLOG in config:
         cg.add(var.set_listen_backlog(config[CONF_LISTEN_BACKLOG]))
-    cg.add_define("MAX_API_CONNECTIONS", config[CONF_MAX_CONNECTIONS])
+    if CONF_MAX_CONNECTIONS in config:
+        cg.add(var.set_max_connections(config[CONF_MAX_CONNECTIONS]))
     cg.add_define("API_MAX_SEND_QUEUE", config[CONF_MAX_SEND_QUEUE])
 
     # Set USE_API_USER_DEFINED_ACTIONS if any services are enabled

esphome/components/api/api_server.cpp

@@ -118,7 +118,7 @@ void APIServer::loop() {
     this->accept_new_connections_();
   }
 
-  if (this->api_connection_count_ == 0) {
+  if (this->clients_.empty()) {
     // Check reboot timeout - done in loop to avoid scheduler heap churn
     // (cancelled scheduler items sit in heap memory until their scheduled time)
     if (this->reboot_timeout_ != 0) {
@@ -135,15 +135,15 @@ void APIServer::loop() {
   // Check network connectivity once for all clients
   if (!network::is_connected()) {
     // Network is down - disconnect all clients
-    for (auto &client : this->active_clients()) {
+    for (auto &client : this->clients_) {
       client->on_fatal_error();
       client->log_client_(ESPHOME_LOG_LEVEL_WARN, LOG_STR("Network down; disconnect"));
     }
     // Continue to process and clean up the clients below
   }
 
-  uint8_t client_index = 0;
-  while (client_index < this->api_connection_count_) {
+  size_t client_index = 0;
+  while (client_index < this->clients_.size()) {
     auto &client = this->clients_[client_index];
 
     // Common case: process active client
@@ -161,7 +161,7 @@ void APIServer::loop() {
   }
 }
 
-void APIServer::remove_client_(uint8_t client_index) {
+void APIServer::remove_client_(size_t client_index) {
   auto &client = this->clients_[client_index];
 
 #ifdef USE_API_USER_DEFINED_ACTION_RESPONSES
@@ -179,17 +179,14 @@ void APIServer::remove_client_(uint8_t client_index) {
   // Close socket now (was deferred from on_fatal_error to allow getpeername)
   client->helper_->close();
 
-  // Swap-and-reset: move the removed client to the trailing slot and null it out so slots
-  // [api_connection_count_, N) remain nullptr.
-  const uint8_t last_index = this->api_connection_count_ - 1;
-  if (client_index < last_index) {
-    std::swap(this->clients_[client_index], this->clients_[last_index]);
+  // Swap with the last element and pop (avoids expensive vector shifts)
+  if (client_index < this->clients_.size() - 1) {
+    std::swap(this->clients_[client_index], this->clients_.back());
   }
-  this->clients_[last_index].reset();
-  this->api_connection_count_--;
+  this->clients_.pop_back();
 
   // Last client disconnected - set warning and start tracking for reboot timeout
-  if (this->api_connection_count_ == 0 && this->reboot_timeout_ != 0) {
+  if (this->clients_.empty() && this->reboot_timeout_ != 0) {
     this->status_set_warning(LOG_STR("waiting for client connection"));
     this->last_connected_ = App.get_loop_component_start_time();
   }
@@ -213,8 +210,8 @@ void __attribute__((flatten)) APIServer::accept_new_connections_() {
     sock->getpeername_to(peername);
 
     // Check if we're at the connection limit
-    if (this->api_connection_count_ >= MAX_API_CONNECTIONS) {
-      ESP_LOGW(TAG, "Max connections (%d), rejecting %s", MAX_API_CONNECTIONS, peername);
+    if (this->clients_.size() >= this->max_connections_) {
+      ESP_LOGW(TAG, "Max connections (%d), rejecting %s", this->max_connections_, peername);
       // Immediately close - socket destructor will handle cleanup
       sock.reset();
       continue;
@@ -223,11 +220,11 @@ void __attribute__((flatten)) APIServer::accept_new_connections_() {
     ESP_LOGD(TAG, "Accept %s", peername);
 
     auto *conn = new APIConnection(std::move(sock), this);
-    this->clients_[this->api_connection_count_++].reset(conn);
+    this->clients_.emplace_back(conn);
     conn->start();
 
     // First client connected - clear warning and update timestamp
-    if (this->api_connection_count_ == 1 && this->reboot_timeout_ != 0) {
+    if (this->clients_.size() == 1 && this->reboot_timeout_ != 0) {
       this->status_clear_warning();
       this->last_connected_ = App.get_loop_component_start_time();
     }
@@ -240,7 +237,7 @@ void APIServer::dump_config() {
                 "  Address: %s:%u\n"
                 "  Listen backlog: %u\n"
                 "  Max connections: %u",
-                network::get_use_address(), this->port_, this->listen_backlog_, MAX_API_CONNECTIONS);
+                network::get_use_address(), this->port_, this->listen_backlog_, this->max_connections_);
 #ifdef USE_API_NOISE
   ESP_LOGCONFIG(TAG, "  Noise encryption: %s", YESNO(this->noise_ctx_.has_psk()));
   if (!this->noise_ctx_.has_psk()) {
@@ -258,7 +255,7 @@ void APIServer::handle_disconnect(APIConnection *conn) {}
   void APIServer::on_##entity_name##_update(entity_type *obj) { /* NOLINT(bugprone-macro-parentheses) */ \
     if (obj->is_internal()) \
       return; \
-    for (auto &c : this->active_clients()) { \
+    for (auto &c : this->clients_) { \
       if (c->flags_.state_subscription) \
         c->send_##entity_name##_state(obj); \
     } \
@@ -340,7 +337,7 @@ API_DISPATCH_UPDATE(water_heater::WaterHeater, water_heater)
 void APIServer::on_event(event::Event *obj) {
   if (obj->is_internal())
     return;
-  for (auto &c : this->active_clients()) {
+  for (auto &c : this->clients_) {
     if (c->flags_.state_subscription)
       c->send_event(obj);
   }
@@ -352,7 +349,7 @@ void APIServer::on_event(event::Event *obj) {
 void APIServer::on_update(update::UpdateEntity *obj) {
   if (obj->is_internal())
     return;
-  for (auto &c : this->active_clients()) {
+  for (auto &c : this->clients_) {
     if (c->flags_.state_subscription)
       c->send_update_state(obj);
   }
@@ -363,7 +360,7 @@ void APIServer::on_update(update::UpdateEntity *obj) {
 void APIServer::on_zwave_proxy_request(const ZWaveProxyRequest &msg) {
   // We could add code to manage a second subscription type, but, since this message type is
   //  very infrequent and small, we simply send it to all clients
-  for (auto &c : this->active_clients())
+  for (auto &c : this->clients_)
     c->send_message(msg);
 }
 #endif
@@ -378,7 +375,7 @@ void APIServer::send_infrared_rf_receive_event([[maybe_unused]] uint32_t device_
   resp.key = key;
   resp.timings = timings;
 
-  for (auto &c : this->active_clients())
+  for (auto &c : this->clients_)
     c->send_infrared_rf_receive_event(resp);
 }
 #endif
@@ -395,7 +392,7 @@ void APIServer::set_batch_delay(uint16_t batch_delay) { this->batch_delay_ = bat
 
 #ifdef USE_API_HOMEASSISTANT_SERVICES
 void APIServer::send_homeassistant_action(const HomeassistantActionRequest &call) {
-  for (auto &client : this->active_clients()) {
+  for (auto &client : this->clients_) {
     client->send_homeassistant_action(call);
   }
 }
@@ -535,7 +532,7 @@ bool APIServer::update_noise_psk_(const SavedNoisePsk &new_psk, const LogString
         return;
       }
       ESP_LOGW(TAG, "Disconnecting all clients to reset PSK");
-      for (auto &c : this->active_clients()) {
+      for (auto &c : this->clients_) {
         DisconnectRequest req;
         c->send_message(req);
       }
@@ -586,7 +583,7 @@ bool APIServer::clear_noise_psk(bool make_active) {
 
 #ifdef USE_HOMEASSISTANT_TIME
 void APIServer::request_time() {
-  for (auto &client : this->active_clients()) {
+  for (auto &client : this->clients_) {
     if (!client->flags_.remove && client->is_authenticated()) {
       client->send_time_request();
       return;  // Only request from one client to avoid clock conflicts
@@ -596,8 +593,8 @@ void APIServer::request_time() {
 #endif
 
 bool APIServer::is_connected_with_state_subscription() const {
-  for (uint8_t i = 0; i < this->api_connection_count_; i++) {
-    if (this->clients_[i]->flags_.state_subscription) {
+  for (const auto &client : this->clients_) {
+    if (client->flags_.state_subscription) {
       return true;
     }
   }
@@ -612,7 +609,7 @@ void APIServer::on_log(uint8_t level, const char *tag, const char *message, size
     // we would be filling a buffer we are trying to clear
     return;
   }
-  for (auto &c : this->active_clients()) {
+  for (auto &c : this->clients_) {
     if (!c->flags_.remove && c->get_log_subscription_level() >= level)
       c->try_send_log_message(level, tag, message, message_len);
   }
@@ -621,7 +618,7 @@ void APIServer::on_log(uint8_t level, const char *tag, const char *message, size
 
 #ifdef USE_CAMERA
 void APIServer::on_camera_image(const std::shared_ptr<camera::CameraImage> &image) {
-  for (auto &c : this->active_clients()) {
+  for (auto &c : this->clients_) {
     if (!c->flags_.remove)
       c->set_camera_state(image);
   }
@@ -638,7 +635,7 @@ void APIServer::on_shutdown() {
   this->batch_delay_ = 5;
 
   // Send disconnect requests to all connected clients
-  for (auto &c : this->active_clients()) {
+  for (auto &c : this->clients_) {
     DisconnectRequest req;
     if (!c->send_message(req)) {
       // If we can't send the disconnect request directly (tx_buffer full),
@@ -656,7 +653,7 @@ bool APIServer::teardown() {
   this->loop();
 
   // Return true only when all clients have been torn down
-  return this->api_connection_count_ == 0;
+  return this->clients_.empty();
 }
 
 #ifdef USE_API_USER_DEFINED_ACTION_RESPONSES

esphome/components/api/api_server.h

@@ -21,8 +21,6 @@
 #include "esphome/components/camera/camera.h"
 #endif
 
-#include <array>
-#include <memory>
 #include <vector>
 
 namespace esphome::api {
@@ -65,6 +63,7 @@ class APIServer final : public Component,
   void set_batch_delay(uint16_t batch_delay);
   uint16_t get_batch_delay() const { return batch_delay_; }
   void set_listen_backlog(uint8_t listen_backlog) { this->listen_backlog_ = listen_backlog; }
+  void set_max_connections(uint8_t max_connections) { this->max_connections_ = max_connections; }
 
   // Get reference to shared buffer for API connections
   APIBuffer &get_shared_buffer_ref() { return shared_write_buffer_; }
@@ -187,26 +186,9 @@ class APIServer final : public Component,
   void send_infrared_rf_receive_event(uint32_t device_id, uint32_t key, const std::vector<int32_t> *timings);
 #endif
 
-  bool is_connected() const { return this->api_connection_count_ != 0; }
+  bool is_connected() const { return !this->clients_.empty(); }
   bool is_connected_with_state_subscription() const;
 
-  // Range-for view over the populated slice [0, api_connection_count_). Read-only with respect
-  // to ownership — callers get `const unique_ptr&` so they can invoke non-const methods on the
-  // APIConnection but cannot reset/move the slot and break the count invariant.
-  using APIConnectionPtr = std::unique_ptr<APIConnection>;
-  class ActiveClientsView {
-    const APIConnectionPtr *begin_;
-    const APIConnectionPtr *end_;
-
-   public:
-    ActiveClientsView(const APIConnectionPtr *b, const APIConnectionPtr *e) : begin_(b), end_(e) {}
-    const APIConnectionPtr *begin() const { return this->begin_; }
-    const APIConnectionPtr *end() const { return this->end_; }
-  };
-  ActiveClientsView active_clients() const {
-    return {this->clients_.data(), this->clients_.data() + this->api_connection_count_};
-  }
-
 #ifdef USE_API_HOMEASSISTANT_STATES
   struct HomeAssistantStateSubscription {
     const char *entity_id;  // Pointer to flash (internal) or heap (external)
@@ -252,8 +234,8 @@ class APIServer final : public Component,
  protected:
   // Accept incoming socket connections. Only called when socket has pending connections.
   void __attribute__((noinline)) accept_new_connections_();
-  // Remove a disconnected client by index. Swaps with the last populated slot and resets it.
-  void __attribute__((noinline)) remove_client_(uint8_t client_index);
+  // Remove a disconnected client by index. Swaps with last element and pops.
+  void __attribute__((noinline)) remove_client_(size_t client_index);
 
 #ifdef USE_API_NOISE
   bool update_noise_psk_(const SavedNoisePsk &new_psk, const LogString *save_log_msg, const LogString *fail_log_msg,
@@ -291,9 +273,8 @@ class APIServer final : public Component,
   uint32_t reboot_timeout_{300000};
   uint32_t last_connected_{0};
 
-  // Slots [0, api_connection_count_) are populated; trailing slots are always nullptr.
-  std::array<std::unique_ptr<APIConnection>, MAX_API_CONNECTIONS> clients_{};
   // Vectors and strings (12 bytes each on 32-bit)
+  std::vector<std::unique_ptr<APIConnection>> clients_;
   // Shared proto write buffer for all connections.
   // Not pre-allocated: all send paths call prepare_first_message_buffer() which
   // reserves the exact needed size. Pre-allocating here would cause heap fragmentation
@@ -328,10 +309,10 @@ class APIServer final : public Component,
   uint16_t port_{6053};
   uint16_t batch_delay_{100};
   // Connection limits - these defaults will be overridden by config values
-  // from cv.SplitDefault in __init__.py which sets platform-specific defaults.
+  // from cv.SplitDefault in __init__.py which sets platform-specific defaults
   uint8_t listen_backlog_{4};
+  uint8_t max_connections_{8};
   bool shutting_down_ = false;
-  uint8_t api_connection_count_{0};
   // 7 bytes used, 1 byte padding
 
 #ifdef USE_API_NOISE

esphome/components/as5600/__init__.py

@@ -83,7 +83,7 @@ def angle_to_position(value, min=-360, max=360):
         value = angle(min=min, max=max)(value)
         return (RESOLUTION + round(value * ANGLE_TO_POSITION)) % RESOLUTION
     except cv.Invalid as e:
-        raise cv.Invalid(f"When using angle, {e.error_message}") from e
+        raise cv.Invalid(f"When using angle, {e.error_message}")
 
 
 def percent_to_position(value):
@@ -164,7 +164,7 @@ def has_valid_range_config():
         except cv.Invalid as e:
             raise cv.Invalid(
                 f"The range between start and end position is invalid. It was was {range} but {e.error_message}"
-            ) from e
+            )
 
     return validator
 

esphome/components/audio_file/__init__.py

@@ -116,7 +116,7 @@ def read_audio_file_and_type(file_config: ConfigType) -> tuple[bytes, MockObj]:
         raise cv.Invalid(
             f"Unable to determine audio file type of '{path}'. "
             f"Try re-encoding the file into a supported format. Details: {e}"
-        ) from e
+        )
 
     media_file_type = audio.AUDIO_FILE_TYPE_ENUM["NONE"]
     if file_type == "wav":

esphome/components/binary_sensor/__init__.py

@@ -332,9 +332,8 @@ def parse_multi_click_timing_str(value):
     try:
         state = cv.boolean(parts[0])
     except cv.Invalid:
-        raise cv.Invalid(
-            f"First word must either be ON or OFF, not {parts[0]}"
-        ) from None
+        # pylint: disable=raise-missing-from
+        raise cv.Invalid(f"First word must either be ON or OFF, not {parts[0]}")
 
     if parts[1] != "for":
         raise cv.Invalid(f"Second word must be 'for', got {parts[1]}")
@@ -351,9 +350,7 @@ def parse_multi_click_timing_str(value):
         try:
             length = cv.positive_time_period_milliseconds(parts[4])
         except cv.Invalid as err:
-            raise cv.Invalid(
-                f"Multi Click Grammar Parsing length failed: {err}"
-            ) from err
+            raise cv.Invalid(f"Multi Click Grammar Parsing length failed: {err}")
         return {CONF_STATE: state, key: str(length)}
 
     if parts[3] != "to":
@@ -362,16 +359,12 @@ def parse_multi_click_timing_str(value):
     try:
         min_length = cv.positive_time_period_milliseconds(parts[2])
     except cv.Invalid as err:
-        raise cv.Invalid(
-            f"Multi Click Grammar Parsing minimum length failed: {err}"
-        ) from err
+        raise cv.Invalid(f"Multi Click Grammar Parsing minimum length failed: {err}")
 
     try:
         max_length = cv.positive_time_period_milliseconds(parts[4])
     except cv.Invalid as err:
-        raise cv.Invalid(
-            f"Multi Click Grammar Parsing maximum length failed: {err}"
-        ) from err
+        raise cv.Invalid(f"Multi Click Grammar Parsing minimum length failed: {err}")
 
     return {
         CONF_STATE: state,

esphome/components/bk72xx/__init__.py

@@ -65,8 +65,3 @@ async def to_code(config):
 @pins.PIN_SCHEMA_REGISTRY.register("bk72xx", PIN_SCHEMA)
 async def pin_to_code(config):
     return await libretiny.gpio.component_pin_to_code(config)
-
-
-# Called by writer.py; delegates to the shared libretiny implementation.
-def copy_files() -> None:
-    libretiny.copy_files()

esphome/components/bl0906/bl0906.cpp

@@ -20,77 +20,58 @@ constexpr uint8_t bl0906_checksum(const uint8_t address, const DataPacket *data)
 }
 
 void BL0906::loop() {
-  while (this->available())
-    this->flush();
-
-  if (this->current_stage_ == STAGE_IDLE) {
-    // Woken up between cycles to drain the action queue. Go back to sleep.
-    this->handle_actions_();
-    this->disable_loop();
+  if (this->current_channel_ == UINT8_MAX) {
     return;
   }
 
-  if (this->current_stage_ == STAGE_TEMP) {
+  while (this->available())
+    this->flush();
+
+  if (this->current_channel_ == 0) {
     // Temperature
     this->read_data_(BL0906_TEMPERATURE, BL0906_TREF, this->temperature_sensor_);
-  } else if (this->current_stage_ == STAGE_CHANNEL_1) {
+  } else if (this->current_channel_ == 1) {
     this->read_data_(BL0906_I_1_RMS, BL0906_IREF, this->current_1_sensor_);
     this->read_data_(BL0906_WATT_1, BL0906_PREF, this->power_1_sensor_);
     this->read_data_(BL0906_CF_1_CNT, BL0906_EREF, this->energy_1_sensor_);
-  } else if (this->current_stage_ == STAGE_CHANNEL_2) {
+  } else if (this->current_channel_ == 2) {
     this->read_data_(BL0906_I_2_RMS, BL0906_IREF, this->current_2_sensor_);
     this->read_data_(BL0906_WATT_2, BL0906_PREF, this->power_2_sensor_);
     this->read_data_(BL0906_CF_2_CNT, BL0906_EREF, this->energy_2_sensor_);
-  } else if (this->current_stage_ == STAGE_CHANNEL_3) {
+  } else if (this->current_channel_ == 3) {
     this->read_data_(BL0906_I_3_RMS, BL0906_IREF, this->current_3_sensor_);
     this->read_data_(BL0906_WATT_3, BL0906_PREF, this->power_3_sensor_);
     this->read_data_(BL0906_CF_3_CNT, BL0906_EREF, this->energy_3_sensor_);
-  } else if (this->current_stage_ == STAGE_CHANNEL_4) {
+  } else if (this->current_channel_ == 4) {
     this->read_data_(BL0906_I_4_RMS, BL0906_IREF, this->current_4_sensor_);
     this->read_data_(BL0906_WATT_4, BL0906_PREF, this->power_4_sensor_);
     this->read_data_(BL0906_CF_4_CNT, BL0906_EREF, this->energy_4_sensor_);
-  } else if (this->current_stage_ == STAGE_CHANNEL_5) {
+  } else if (this->current_channel_ == 5) {
     this->read_data_(BL0906_I_5_RMS, BL0906_IREF, this->current_5_sensor_);
     this->read_data_(BL0906_WATT_5, BL0906_PREF, this->power_5_sensor_);
     this->read_data_(BL0906_CF_5_CNT, BL0906_EREF, this->energy_5_sensor_);
-  } else if (this->current_stage_ == STAGE_CHANNEL_6) {
+  } else if (this->current_channel_ == 6) {
     this->read_data_(BL0906_I_6_RMS, BL0906_IREF, this->current_6_sensor_);
     this->read_data_(BL0906_WATT_6, BL0906_PREF, this->power_6_sensor_);
     this->read_data_(BL0906_CF_6_CNT, BL0906_EREF, this->energy_6_sensor_);
-  } else if (this->current_stage_ == STAGE_FREQ) {
+  } else if (this->current_channel_ == UINT8_MAX - 2) {
     // Frequency
-    this->read_data_(BL0906_FREQUENCY, BL0906_FREF, this->frequency_sensor_);
+    this->read_data_(BL0906_FREQUENCY, BL0906_FREF, frequency_sensor_);
     // Voltage
-    this->read_data_(BL0906_V_RMS, BL0906_UREF, this->voltage_sensor_);
-  } else if (this->current_stage_ == STAGE_POWER) {
+    this->read_data_(BL0906_V_RMS, BL0906_UREF, voltage_sensor_);
+  } else if (this->current_channel_ == UINT8_MAX - 1) {
     // Total power
     this->read_data_(BL0906_WATT_SUM, BL0906_WATT, this->total_power_sensor_);
     // Total Energy
     this->read_data_(BL0906_CF_SUM_CNT, BL0906_CF, this->total_energy_sensor_);
+  } else {
+    this->current_channel_ = UINT8_MAX - 2;  // Go to frequency and voltage
+    return;
   }
-  this->advance_stage_();
+  this->current_channel_++;
   this->handle_actions_();
 }
 
-void BL0906::advance_stage_() {
-  switch (this->current_stage_) {
-    case STAGE_CHANNEL_6:
-      this->current_stage_ = STAGE_FREQ;
-      break;
-    case STAGE_FREQ:
-      this->current_stage_ = STAGE_POWER;
-      break;
-    case STAGE_POWER:
-      // Cycle complete; sleep until the next update().
-      this->current_stage_ = STAGE_IDLE;
-      this->disable_loop();
-      break;
-    default:
-      this->current_stage_ = static_cast<BL0906Stage>(this->current_stage_ + 1);
-      break;
-  }
-}
-
 void BL0906::setup() {
   while (this->available())
     this->flush();
@@ -104,20 +85,12 @@ void BL0906::setup() {
   this->bias_correction_(BL0906_RMSOS_6, 0.01200, 0);  // Calibration current_6
 
   this->write_array(USR_WRPROT_ONLYREAD, sizeof(USR_WRPROT_ONLYREAD));
-
-  // Loop stays idle until the first update() or enqueued action.
-  this->disable_loop();
 }
 
-void BL0906::update() {
-  this->current_stage_ = STAGE_TEMP;
-  this->enable_loop();
-}
+void BL0906::update() { this->current_channel_ = 0; }
 
 size_t BL0906::enqueue_action_(ActionCallbackFuncPtr function) {
   this->action_queue_.push_back(function);
-  // Ensure the queue is serviced even if the read cycle has already completed.
-  this->enable_loop();
   return this->action_queue_.size();
 }
 

esphome/components/bl0906/bl0906.h

@@ -12,22 +12,6 @@
 namespace esphome {
 namespace bl0906 {
 
-// Stage values for the read state machine. After STAGE_CHANNEL_6 the state machine
-// jumps to the two sentinel stages below, then to STAGE_IDLE which marks the cycle
-// as complete and disables the loop.
-enum BL0906Stage : uint8_t {
-  STAGE_TEMP = 0,       // chip temperature
-  STAGE_CHANNEL_1 = 1,  // per-phase current + power + energy
-  STAGE_CHANNEL_2 = 2,
-  STAGE_CHANNEL_3 = 3,
-  STAGE_CHANNEL_4 = 4,
-  STAGE_CHANNEL_5 = 5,
-  STAGE_CHANNEL_6 = 6,
-  STAGE_FREQ = UINT8_MAX - 2,   // frequency + voltage
-  STAGE_POWER = UINT8_MAX - 1,  // total power + total energy
-  STAGE_IDLE = UINT8_MAX,       // cycle complete
-};
-
 struct DataPacket {  // NOLINT(altera-struct-pack-align)
   uint8_t l{0};
   uint8_t m{0};
@@ -95,8 +79,7 @@ class BL0906 : public PollingComponent, public uart::UARTDevice {
 
   void bias_correction_(uint8_t address, float measurements, float correction);
 
-  BL0906Stage current_stage_{STAGE_IDLE};
-  void advance_stage_();
+  uint8_t current_channel_{0};
   size_t enqueue_action_(ActionCallbackFuncPtr function);
   void handle_actions_();
 

esphome/components/bm8563/bm8563.cpp

@@ -63,7 +63,7 @@ void BM8563::read_time() {
            rtc_time.day_of_week, rtc_time.hour, rtc_time.minute, rtc_time.second);
 
   rtc_time.recalc_timestamp_utc(false);
-  if (!rtc_time.is_valid(/*check_day_of_week=*/true, /*check_day_of_year=*/false)) {
+  if (!rtc_time.is_valid()) {
     ESP_LOGE(TAG, "Invalid RTC time, not syncing to system clock.");
     return;
   }

esphome/components/bme680_bsec/__init__.py

@@ -6,7 +6,6 @@ from esphome.const import CONF_ID, CONF_SAMPLE_RATE, CONF_TEMPERATURE_OFFSET, Fr
 CODEOWNERS = ["@trvrnrth"]
 DEPENDENCIES = ["i2c"]
 AUTO_LOAD = ["sensor", "text_sensor"]
-CONFLICTS_WITH = ["bme68x_bsec2"]
 MULTI_CONF = True
 
 CONF_BME680_BSEC_ID = "bme680_bsec_id"

esphome/components/bme68x_bsec2/__init__.py

@@ -13,7 +13,6 @@ from esphome.const import (
 )
 
 CODEOWNERS = ["@neffs", "@kbx81"]
-CONFLICTS_WITH = ["bme680_bsec"]
 
 DOMAIN = "bme68x_bsec2"
 
@@ -172,9 +171,7 @@ async def to_code_base(config):
         with open(path, encoding="utf-8") as f:
             bsec2_iaq_config = f.read()
     except Exception as e:
-        raise core.EsphomeError(
-            f"Could not open binary configuration file {path}: {e}"
-        ) from e
+        raise core.EsphomeError(f"Could not open binary configuration file {path}: {e}")
 
     # Convert retrieved BSEC2 config to an array of ints
     rhs = [int(x) for x in bsec2_iaq_config.split(",")]

esphome/components/debug/debug_component.cpp

@@ -30,7 +30,7 @@ void DebugComponent::dump_config() {
 
   char device_info_buffer[DEVICE_INFO_BUFFER_SIZE];
   ESP_LOGD(TAG, "ESPHome version %s", ESPHOME_VERSION);
-  size_t pos = buf_append_str(device_info_buffer, DEVICE_INFO_BUFFER_SIZE, 0, ESPHOME_VERSION);
+  size_t pos = buf_append_printf(device_info_buffer, DEVICE_INFO_BUFFER_SIZE, 0, "%s", ESPHOME_VERSION);
 
   this->free_heap_ = get_free_heap_();
   ESP_LOGD(TAG, "Free Heap Size: %" PRIu32 " bytes", this->free_heap_);

esphome/components/debug/debug_esp32.cpp

@@ -224,21 +224,17 @@ size_t DebugComponent::get_device_info_(std::span<char, DEVICE_INFO_BUFFER_SIZE>
   const char *model = ESPHOME_VARIANT;
 
   // Build features string
-  pos = buf_append_str(buf, size, pos, "|Chip: ");
-  pos = buf_append_str(buf, size, pos, model);
-  pos = buf_append_str(buf, size, pos, " Features:");
+  pos = buf_append_printf(buf, size, pos, "|Chip: %s Features:", model);
   bool first_feature = true;
   for (const auto &feature : CHIP_FEATURES) {
     if (info.features & feature.bit) {
-      pos = buf_append_str(buf, size, pos, first_feature ? "" : ", ");
-      pos = buf_append_str(buf, size, pos, feature.name);
+      pos = buf_append_printf(buf, size, pos, "%s%s", first_feature ? "" : ", ", feature.name);
       first_feature = false;
       info.features &= ~feature.bit;
     }
   }
   if (info.features != 0) {
-    pos = buf_append_str(buf, size, pos, first_feature ? "" : ", ");
-    pos = buf_append_printf(buf, size, pos, "Other:0x%" PRIx32, info.features);
+    pos = buf_append_printf(buf, size, pos, "%sOther:0x%" PRIx32, first_feature ? "" : ", ", info.features);
   }
   pos = buf_append_printf(buf, size, pos, " Cores:%u Revision:%u", info.cores, info.revision);
 
@@ -271,20 +267,17 @@ size_t DebugComponent::get_device_info_(std::span<char, DEVICE_INFO_BUFFER_SIZE>
   // Framework detection
 #ifdef USE_ARDUINO
   ESP_LOGD(TAG, "  Framework: Arduino");
-  pos = buf_append_str(buf, size, pos, "|Framework: Arduino");
+  pos = buf_append_printf(buf, size, pos, "|Framework: Arduino");
 #else
   ESP_LOGD(TAG, "  Framework: ESP-IDF");
-  pos = buf_append_str(buf, size, pos, "|Framework: ESP-IDF");
+  pos = buf_append_printf(buf, size, pos, "|Framework: ESP-IDF");
 #endif
 
-  pos = buf_append_str(buf, size, pos, "|ESP-IDF: ");
-  pos = buf_append_str(buf, size, pos, esp_get_idf_version());
+  pos = buf_append_printf(buf, size, pos, "|ESP-IDF: %s", esp_get_idf_version());
   pos = buf_append_printf(buf, size, pos, "|EFuse MAC: %02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3],
                           mac[4], mac[5]);
-  pos = buf_append_str(buf, size, pos, "|Reset: ");
-  pos = buf_append_str(buf, size, pos, reset_reason);
-  pos = buf_append_str(buf, size, pos, "|Wakeup: ");
-  pos = buf_append_str(buf, size, pos, wakeup_cause);
+  pos = buf_append_printf(buf, size, pos, "|Reset: %s", reset_reason);
+  pos = buf_append_printf(buf, size, pos, "|Wakeup: %s", wakeup_cause);
 
   return pos;
 }

esphome/components/debug/debug_libretiny.cpp

@@ -38,12 +38,9 @@ size_t DebugComponent::get_device_info_(std::span<char, DEVICE_INFO_BUFFER_SIZE>
            lt_get_version(), lt_cpu_get_model_name(), lt_cpu_get_model(), lt_cpu_get_freq_mhz(), mac_id,
            lt_get_board_code(), flash_kib, ram_kib, reset_reason);
 
-  pos = buf_append_str(buf, size, pos, "|Version: ");
-  pos = buf_append_str(buf, size, pos, LT_BANNER_STR + 10);
-  pos = buf_append_str(buf, size, pos, "|Reset Reason: ");
-  pos = buf_append_str(buf, size, pos, reset_reason);
-  pos = buf_append_str(buf, size, pos, "|Chip Name: ");
-  pos = buf_append_str(buf, size, pos, lt_cpu_get_model_name());
+  pos = buf_append_printf(buf, size, pos, "|Version: %s", LT_BANNER_STR + 10);
+  pos = buf_append_printf(buf, size, pos, "|Reset Reason: %s", reset_reason);
+  pos = buf_append_printf(buf, size, pos, "|Chip Name: %s", lt_cpu_get_model_name());
   pos = buf_append_printf(buf, size, pos, "|Chip ID: 0x%06" PRIX32, mac_id);
   pos = buf_append_printf(buf, size, pos, "|Flash: %" PRIu32 " KiB", flash_kib);
   pos = buf_append_printf(buf, size, pos, "|RAM: %" PRIu32 " KiB", ram_kib);

esphome/components/debug/debug_zephyr.cpp

@@ -162,18 +162,14 @@ size_t DebugComponent::get_device_info_(std::span<char, DEVICE_INFO_BUFFER_SIZE>
   const char *supply_status =
       (nrf_power_mainregstatus_get(NRF_POWER) == NRF_POWER_MAINREGSTATUS_NORMAL) ? "Normal voltage." : "High voltage.";
   ESP_LOGD(TAG, "Main supply status: %s", supply_status);
-  pos = buf_append_str(buf, size, pos, "|Main supply status: ");
-  pos = buf_append_str(buf, size, pos, supply_status);
+  pos = buf_append_printf(buf, size, pos, "|Main supply status: %s", supply_status);
 
   // Regulator stage 0
   if (nrf_power_mainregstatus_get(NRF_POWER) == NRF_POWER_MAINREGSTATUS_HIGH) {
     const char *reg0_type = nrf_power_dcdcen_vddh_get(NRF_POWER) ? "DC/DC" : "LDO";
     const char *reg0_voltage = regout0_to_str((NRF_UICR->REGOUT0 & UICR_REGOUT0_VOUT_Msk) >> UICR_REGOUT0_VOUT_Pos);
     ESP_LOGD(TAG, "Regulator stage 0: %s, %s", reg0_type, reg0_voltage);
-    pos = buf_append_str(buf, size, pos, "|Regulator stage 0: ");
-    pos = buf_append_str(buf, size, pos, reg0_type);
-    pos = buf_append_str(buf, size, pos, ", ");
-    pos = buf_append_str(buf, size, pos, reg0_voltage);
+    pos = buf_append_printf(buf, size, pos, "|Regulator stage 0: %s, %s", reg0_type, reg0_voltage);
 #ifdef USE_NRF52_REG0_VOUT
     if ((NRF_UICR->REGOUT0 & UICR_REGOUT0_VOUT_Msk) >> UICR_REGOUT0_VOUT_Pos != USE_NRF52_REG0_VOUT) {
       ESP_LOGE(TAG, "Regulator stage 0: expected %s", regout0_to_str(USE_NRF52_REG0_VOUT));
@@ -181,14 +177,13 @@ size_t DebugComponent::get_device_info_(std::span<char, DEVICE_INFO_BUFFER_SIZE>
 #endif
   } else {
     ESP_LOGD(TAG, "Regulator stage 0: disabled");
-    pos = buf_append_str(buf, size, pos, "|Regulator stage 0: disabled");
+    pos = buf_append_printf(buf, size, pos, "|Regulator stage 0: disabled");
   }
 
   // Regulator stage 1
   const char *reg1_type = nrf_power_dcdcen_get(NRF_POWER) ? "DC/DC" : "LDO";
   ESP_LOGD(TAG, "Regulator stage 1: %s", reg1_type);
-  pos = buf_append_str(buf, size, pos, "|Regulator stage 1: ");
-  pos = buf_append_str(buf, size, pos, reg1_type);
+  pos = buf_append_printf(buf, size, pos, "|Regulator stage 1: %s", reg1_type);
 
   // USB power state
   const char *usb_state;
@@ -202,8 +197,7 @@ size_t DebugComponent::get_device_info_(std::span<char, DEVICE_INFO_BUFFER_SIZE>
     usb_state = "disconnected";
   }
   ESP_LOGD(TAG, "USB power state: %s", usb_state);
-  pos = buf_append_str(buf, size, pos, "|USB power state: ");
-  pos = buf_append_str(buf, size, pos, usb_state);
+  pos = buf_append_printf(buf, size, pos, "|USB power state: %s", usb_state);
 
   // Power-fail comparator
   bool enabled;
@@ -308,18 +302,14 @@ size_t DebugComponent::get_device_info_(std::span<char, DEVICE_INFO_BUFFER_SIZE>
           break;
       }
       ESP_LOGD(TAG, "Power-fail comparator: %s, VDDH: %s", pof_voltage, vddh_voltage);
-      pos = buf_append_str(buf, size, pos, "|Power-fail comparator: ");
-      pos = buf_append_str(buf, size, pos, pof_voltage);
-      pos = buf_append_str(buf, size, pos, ", VDDH: ");
-      pos = buf_append_str(buf, size, pos, vddh_voltage);
+      pos = buf_append_printf(buf, size, pos, "|Power-fail comparator: %s, VDDH: %s", pof_voltage, vddh_voltage);
     } else {
       ESP_LOGD(TAG, "Power-fail comparator: %s", pof_voltage);
-      pos = buf_append_str(buf, size, pos, "|Power-fail comparator: ");
-      pos = buf_append_str(buf, size, pos, pof_voltage);
+      pos = buf_append_printf(buf, size, pos, "|Power-fail comparator: %s", pof_voltage);
     }
   } else {
     ESP_LOGD(TAG, "Power-fail comparator: disabled");
-    pos = buf_append_str(buf, size, pos, "|Power-fail comparator: disabled");
+    pos = buf_append_printf(buf, size, pos, "|Power-fail comparator: disabled");
   }
 
   auto package = [](uint32_t value) {

esphome/components/ds1307/ds1307.cpp

@@ -44,7 +44,7 @@ void DS1307Component::read_time() {
       .year = uint16_t(ds1307_.reg.year + 10u * ds1307_.reg.year_10 + 2000),
   };
   rtc_time.recalc_timestamp_utc(false);
-  if (!rtc_time.is_valid(/*check_day_of_week=*/true, /*check_day_of_year=*/false)) {
+  if (!rtc_time.is_valid()) {
     ESP_LOGE(TAG, "Invalid RTC time, not syncing to system clock.");
     return;
   }

esphome/components/epaper_spi/epaper_spi_ssd1683.cpp

@@ -1,97 +0,0 @@
-#include "epaper_spi_ssd1683.h"
-
-#include <algorithm>
-
-#include "esphome/core/log.h"
-
-namespace esphome::epaper_spi {
-static constexpr const char *const TAG = "epaper_spi.mono";
-
-void EPaperSSD1683::refresh_screen(bool partial) {
-  ESP_LOGV(TAG, "Refresh screen");
-  this->cmd_data(0x3C, {partial ? (uint8_t) 0x80 : (uint8_t) 0x01});
-  // On partial update, set red RAM to inverse to remove BW ghosting
-  this->cmd_data(0x21, {partial ? (uint8_t) 0x80 : (uint8_t) 0x40, (uint8_t) 0x00});
-  // Set full update to 0xD7 for fast update, 0xF7 for normal
-  // Fast update flashes less and draws sooner but is in busy state for the same amount of time
-  // Manufacturer recommends not using fast update all the time, TODO expose this to the user
-  this->cmd_data(0x22, {partial ? (uint8_t) 0xFC : (uint8_t) 0xF7});
-  this->command(0x20);
-}
-
-// Puts the display into deep sleep mode 1, only way to get out is to reset the display
-// Mode 1 retains RAM while sleeping, necessary for future partial and window updates
-void EPaperSSD1683::deep_sleep() {
-  if (this->is_using_partial_update_()) {
-    ESP_LOGV(TAG, "Deep sleep mode 1");
-    this->cmd_data(0x10, {0x01});  // deep sleep, retain RAM
-  } else {
-    ESP_LOGV(TAG, "Deep sleep mode 2");
-    this->cmd_data(0x10, {0x03});  // deep sleep, lose RAM
-  }
-}
-
-void EPaperSSD1683::set_window() {
-  // if not using partial update, the display will go into deep sleep mode 2, so must rewrite entire
-  // buffer since the display RAM will not retain contents
-  if (!this->is_using_partial_update_()) {
-    this->x_low_ = 0;
-    this->x_high_ = this->width_;
-    this->y_low_ = 0;
-    this->y_high_ = this->height_;
-  }
-
-  // round x-coordinates to byte boundaries
-  this->x_low_ /= 8;
-  this->x_high_ += 7;
-  this->x_high_ /= 8;
-
-  this->cmd_data(0x44, {(uint8_t) this->x_low_, (uint8_t) (this->x_high_ - 1)});
-  this->cmd_data(0x45, {(uint8_t) this->y_low_, (uint8_t) (this->y_low_ / 256), (uint8_t) (this->y_high_ - 1),
-                        (uint8_t) ((this->y_high_ - 1) / 256)});
-  this->cmd_data(0x4E, {(uint8_t) this->x_low_});
-  this->cmd_data(0x4F, {(uint8_t) this->y_low_, (uint8_t) (this->y_low_ / 256)});
-}
-
-bool HOT EPaperSSD1683::transfer_data() {
-  auto start_time = millis();
-  if (this->current_data_index_ == 0) {
-    if (this->send_red_) {
-      // round to byte boundaries
-      this->set_window();
-    }
-    // for monochrome, we need to send red on every refresh to prevent dirty pixels
-    // when doing a partial refresh
-    this->command(this->send_red_ ? 0x26 : 0x24);
-    this->current_data_index_ = this->y_low_;  // actually current line
-  }
-  size_t row_length = this->x_high_ - this->x_low_;
-  FixedVector<uint8_t> bytes_to_send{};
-  bytes_to_send.init(row_length);
-  ESP_LOGV(TAG, "Writing %u bytes at line %zu at %ums", row_length, this->current_data_index_, (unsigned) millis());
-  this->start_data_();
-  while (this->current_data_index_ != this->y_high_) {
-    size_t data_idx = this->current_data_index_ * this->row_width_ + this->x_low_;
-    for (size_t i = 0; i != row_length; i++) {
-      bytes_to_send[i] = this->buffer_[data_idx++];
-    }
-    ++this->current_data_index_;
-    this->write_array(&bytes_to_send.front(), row_length);  // NOLINT
-    if (millis() - start_time > MAX_TRANSFER_TIME) {
-      // Let the main loop run and come back next loop
-      this->disable();
-      return false;
-    }
-  }
-
-  this->disable();
-  this->current_data_index_ = 0;
-  if (this->send_red_) {
-    this->send_red_ = false;
-    return false;
-  }
-  this->send_red_ = true;
-  return true;
-}
-
-}  // namespace esphome::epaper_spi

esphome/components/epaper_spi/epaper_spi_ssd1683.h

@@ -1,22 +0,0 @@
-#pragma once
-
-#include "epaper_spi_mono.h"
-
-namespace esphome::epaper_spi {
-/**
- * A class for Solomon SSD1683 epaper displays.
- */
-class EPaperSSD1683 : public EPaperMono {
- public:
-  EPaperSSD1683(const char *name, uint16_t width, uint16_t height, const uint8_t *init_sequence,
-                size_t init_sequence_length)
-      : EPaperMono(name, width, height, init_sequence, init_sequence_length) {}
-
- protected:
-  void refresh_screen(bool partial) override;
-  void deep_sleep() override;
-  void set_window() override;
-  bool transfer_data() override;
-};
-
-}  // namespace esphome::epaper_spi

esphome/components/epaper_spi/models/ssd1683.py

@@ -1,27 +0,0 @@
-from esphome.const import CONF_DATA_RATE
-
-from . import EpaperModel
-
-
-class SSD1683(EpaperModel):
-    def __init__(self, name, class_name="EPaperSSD1683", data_rate="20MHz", **defaults):
-        defaults[CONF_DATA_RATE] = data_rate
-        super().__init__(name, class_name, **defaults)
-
-    # fmt: off
-    def get_init_sequence(self, config: dict):
-        _width, height = self.get_dimensions(config)
-        return (
-            (0x01, (height - 1) % 256, (height - 1) // 256, 0x00),    # Set column gate limit
-            (0x18, 0x80),    # Select internal Temp sensor
-            (0x11, 0x03),      # Set transform
-        )
-
-
-ssd1683 = SSD1683("ssd1683")
-
-goodisplay_gdey042t81 = ssd1683.extend(
-    "goodisplay-gdey042t81-4.2",
-    width=400,
-    height=300,
-)

esphome/components/esp32/__init__.py

@@ -128,30 +128,23 @@ ASSERTION_LEVELS = {
 SIGNING_SCHEMES = {
     "rsa3072": "CONFIG_SECURE_SIGNED_APPS_RSA_SCHEME",
     "ecdsa256": "CONFIG_SECURE_SIGNED_APPS_ECDSA_V2_SCHEME",
-    "ecdsa_v1": "CONFIG_SECURE_SIGNED_APPS_ECDSA_SCHEME",
 }
 
-# Chip variants that only support one V2 signing scheme.
+# Chip variants that only support one signing scheme for Secure Boot V2.
 # Based on SOC_SECURE_BOOT_V2_RSA / SOC_SECURE_BOOT_V2_ECC in soc_caps.h.
-# Variants not listed in either set support both RSA and ECDSA V2
+# Variants not listed in either set support both RSA and ECDSA
 # (e.g. C5, C6, H2, P4). New variants should be added to the
 # appropriate set if they only support one scheme.
-# Note: VARIANT_ESP32 is not listed here because it supports V2 RSA only
-# when minimum_chip_revision >= 3.0, which requires special handling.
-SIGNED_OTA_V2_RSA_ONLY_VARIANTS = {
+SIGNED_OTA_RSA_ONLY_VARIANTS = {
+    VARIANT_ESP32,
     VARIANT_ESP32S2,
     VARIANT_ESP32S3,
     VARIANT_ESP32C3,
 }
-SIGNED_OTA_V2_ECC_ONLY_VARIANTS = {
+SIGNED_OTA_ECC_ONLY_VARIANTS = {
     VARIANT_ESP32C2,
     VARIANT_ESP32C61,
 }
-# V1 ECDSA (Secure Boot V1) is only supported on the original ESP32.
-# Based on SOC_SECURE_BOOT_V1 in soc_caps.h.
-SIGNED_OTA_V1_ECDSA_VARIANTS = {
-    VARIANT_ESP32,
-}
 
 COMPILER_OPTIMIZATIONS = {
     "DEBUG": "CONFIG_COMPILER_OPTIMIZATION_DEBUG",
@@ -998,73 +991,25 @@ def final_validate(config):
     if signed_ota := advanced.get(CONF_SIGNED_OTA_VERIFICATION):
         scheme = signed_ota[CONF_SIGNING_SCHEME]
         variant = config[CONF_VARIANT]
-        min_rev = advanced.get(CONF_MINIMUM_CHIP_REVISION)
-        scheme_path = [
-            CONF_FRAMEWORK,
-            CONF_ADVANCED,
-            CONF_SIGNED_OTA_VERIFICATION,
-            CONF_SIGNING_SCHEME,
-        ]
-
-        # V1 ECDSA is only available on the original ESP32
-        if scheme == "ecdsa_v1" and variant not in SIGNED_OTA_V1_ECDSA_VARIANTS:
+        scheme_variant_conflicts = {
+            "ecdsa256": (SIGNED_OTA_RSA_ONLY_VARIANTS, "rsa3072"),
+            "rsa3072": (SIGNED_OTA_ECC_ONLY_VARIANTS, "ecdsa256"),
+        }
+        if (conflict := scheme_variant_conflicts.get(scheme)) and variant in conflict[
+            0
+        ]:
             errs.append(
                 cv.Invalid(
-                    f"Signing scheme 'ecdsa_v1' is only supported on "
-                    f"{VARIANT_FRIENDLY[VARIANT_ESP32]}. "
-                    f"Use 'rsa3072' or 'ecdsa256' instead.",
-                    path=scheme_path,
+                    f"Signing scheme '{scheme}' is not supported on "
+                    f"{VARIANT_FRIENDLY[variant]}. Use '{conflict[1]}' instead.",
+                    path=[
+                        CONF_FRAMEWORK,
+                        CONF_ADVANCED,
+                        CONF_SIGNED_OTA_VERIFICATION,
+                        CONF_SIGNING_SCHEME,
+                    ],
                 )
             )
-        elif variant == VARIANT_ESP32:
-            # On ESP32, V2 RSA requires minimum_chip_revision >= 3.0
-            # Note: string comparison works here because cv.one_of constrains
-            # min_rev to known ESP32_CHIP_REVISIONS values ("0.0".."3.1").
-            if scheme == "rsa3072" and (min_rev is None or min_rev < "3.0"):
-                errs.append(
-                    cv.Invalid(
-                        f"Signing scheme 'rsa3072' on {VARIANT_FRIENDLY[variant]} "
-                        f"requires minimum_chip_revision: '3.0' or higher "
-                        f"(Secure Boot V2 RSA needs chip revision 3.0+). "
-                        f"For older chip revisions, use 'ecdsa_v1' instead.",
-                        path=scheme_path,
-                    )
-                )
-            # ESP32 does not support V2 ECDSA (no SOC_SECURE_BOOT_V2_ECC)
-            elif scheme == "ecdsa256":
-                errs.append(
-                    cv.Invalid(
-                        f"Signing scheme 'ecdsa256' is not supported on "
-                        f"{VARIANT_FRIENDLY[variant]}. Use 'rsa3072' (with "
-                        f"minimum_chip_revision: '3.0') or 'ecdsa_v1' instead.",
-                        path=scheme_path,
-                    )
-                )
-            # V1 on rev 3.0+ -- suggest V2 RSA for stronger security
-            elif scheme == "ecdsa_v1" and min_rev is not None and min_rev >= "3.0":
-                _LOGGER.info(
-                    "Using Secure Boot V1 ECDSA on %s rev %s. "
-                    "Consider using 'rsa3072' (Secure Boot V2 RSA) for "
-                    "stronger security on chip revision 3.0+.",
-                    VARIANT_FRIENDLY[variant],
-                    min_rev,
-                )
-        else:
-            # Non-ESP32 variants: check V2 scheme-variant compatibility
-            scheme_variant_conflicts = {
-                "ecdsa256": (SIGNED_OTA_V2_RSA_ONLY_VARIANTS, "rsa3072"),
-                "rsa3072": (SIGNED_OTA_V2_ECC_ONLY_VARIANTS, "ecdsa256"),
-            }
-            if (
-                conflict := scheme_variant_conflicts.get(scheme)
-            ) and variant in conflict[0]:
-                errs.append(
-                    cv.Invalid(
-                        f"Signing scheme '{scheme}' is not supported on "
-                        f"{VARIANT_FRIENDLY[variant]}. Use '{conflict[1]}' instead.",
-                        path=scheme_path,
-                    )
-                )
         if CONF_OTA not in full_config:
             _LOGGER.warning(
                 "Signed OTA verification is enabled but no OTA component is configured. "
@@ -1277,7 +1222,7 @@ FRAMEWORK_SCHEMA = cv.Schema(
                 cv.Optional(CONF_IGNORE_EFUSE_CUSTOM_MAC, default=False): cv.boolean,
                 cv.Optional(CONF_IGNORE_EFUSE_MAC_CRC, default=False): cv.boolean,
                 cv.Optional(CONF_MINIMUM_CHIP_REVISION): cv.one_of(
-                    *ESP32_CHIP_REVISIONS, string=True
+                    *ESP32_CHIP_REVISIONS
                 ),
                 cv.Optional(CONF_SRAM1_AS_IRAM, default=False): cv.boolean,
                 # DHCP server is needed for WiFi AP mode. When WiFi component is used,

esphome/components/esp32/gpio.py

@@ -172,16 +172,10 @@ def validate_gpio_pin(pin):
             exc,
         )
     else:
-        # `ignore_pin_validation_error` only suppresses an error raised by the
-        # variant's pin_validation above (e.g. SPI flash/PSRAM pins, invalid pin
-        # numbers). If that didn't raise, the option is a no-op -- warn so the
-        # user can clean it up, but don't block the build.
+        # Throw an exception if used for a pin that would not have resulted
+        # in a validation error anyway!
         if ignore_pin_validation_warning:
-            _LOGGER.warning(
-                "GPIO%d has no validation errors to ignore; "
-                "remove `ignore_pin_validation_error: true` from this pin.",
-                pin[CONF_NUMBER],
-            )
+            raise cv.Invalid(f"GPIO{pin[CONF_NUMBER]} is not a reserved pin")
 
     return pin
 

esphome/components/esp32/post_build.py.script

@@ -5,7 +5,6 @@ import json  # noqa: E402
 import os  # noqa: E402
 import pathlib  # noqa: E402
 import shutil  # noqa: E402
-import subprocess  # noqa: E402
 from glob import glob  # noqa: E402
 
 
@@ -26,114 +25,6 @@ def _parse_sdkconfig(sdkconfig_path):
     return options
 
 
-def _generate_v1_verification_key(env):
-    """Generate the V1 ECDSA verification key binary and assembly source file.
-
-    Secure Boot V1 embeds the public verification key directly in the app binary
-    as a compiled object (via a .S assembly file). The ESP-IDF CMake build generates
-    these files via custom commands, but PlatformIO's SCons bridge does not execute
-    them. This function replicates that logic:
-      1. Extracts the raw public key from the PEM signing key using espsecure.
-      2. Generates the .S assembly source that embeds the key bytes.
-    """
-    build_dir = pathlib.Path(env.subst("$BUILD_DIR"))
-    project_dir = pathlib.Path(env.subst("$PROJECT_DIR"))
-    pioenv = env.subst("$PIOENV")
-    sdkconfig = _parse_sdkconfig(project_dir / f"sdkconfig.{pioenv}")
-
-    if sdkconfig.get("CONFIG_SECURE_SIGNED_APPS_ECDSA_SCHEME") != "y":
-        return
-
-    bin_path = build_dir / "signature_verification_key.bin"
-    asm_path = build_dir / "signature_verification_key.bin.S"
-
-    # Determine the source of the verification key
-    if sdkconfig.get("CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES") == "y":
-        # Extract public key from the signing key
-        signing_key = sdkconfig.get("CONFIG_SECURE_BOOT_SIGNING_KEY")
-        if not signing_key:
-            return
-        signing_key_path = pathlib.Path(signing_key)
-        if not signing_key_path.exists():
-            print(f"Error: V1 ECDSA signing key not found: {signing_key_path}")
-            env.Exit(1)
-            return
-
-        if not bin_path.exists() or bin_path.stat().st_mtime < signing_key_path.stat().st_mtime:
-            python_exe = env.subst("$PYTHONEXE")
-            result = subprocess.run(
-                [python_exe, "-m", "espsecure", "extract_public_key",
-                 "--keyfile", str(signing_key_path), str(bin_path)],
-                capture_output=True, text=True,
-            )
-            if result.returncode != 0:
-                print(f"Error extracting V1 verification key: {result.stderr}")
-                env.Exit(1)
-                return
-            print(f"Extracted V1 ECDSA verification key from {signing_key_path.name}")
-    else:
-        # User-provided verification key -- should already be a raw binary file
-        verification_key = sdkconfig.get("CONFIG_SECURE_BOOT_VERIFICATION_KEY")
-        if not verification_key:
-            return
-        verification_key_path = pathlib.Path(verification_key)
-        if not verification_key_path.exists():
-            print(f"Error: Verification key not found: {verification_key_path}")
-            env.Exit(1)
-            return
-        shutil.copyfile(str(verification_key_path), str(bin_path))
-
-    if not bin_path.exists():
-        return
-
-    # Generate the .S assembly file from the binary key data.
-    # Replicates ESP-IDF's data_file_embed_asm.cmake with RENAME_TO=signature_verification_key_bin.
-    # The file is needed in both the app build dir and the bootloader build dir, since
-    # the bootloader also embeds the verification key when CONFIG_SECURE_SIGNED_ON_BOOT_NO_SECURE_BOOT
-    # is enabled. PlatformIO's SCons bridge does not execute the CMake custom commands that
-    # normally generate these files.
-    data = bin_path.read_bytes()
-    varname = "signature_verification_key_bin"
-
-    lines = []
-    lines.append(f"/* Data converted from {bin_path.name} */")
-    lines.append(".data")
-    lines.append("#if !defined (__APPLE__) && !defined (__linux__)")
-    lines.append(".section .rodata.embedded")
-    lines.append("#endif")
-    lines.append(f"\n.global {varname}")
-    lines.append(f"{varname}:")
-    lines.append(f"\n.global _binary_{varname}_start")
-    lines.append(f"_binary_{varname}_start: /* for objcopy compatibility */")
-
-    # Format binary data as .byte lines (16 bytes per line)
-    for i in range(0, len(data), 16):
-        chunk = data[i:i + 16]
-        hex_bytes = ", ".join(f"0x{b:02x}" for b in chunk)
-        lines.append(f".byte {hex_bytes}")
-
-    lines.append(f"\n.global _binary_{varname}_end")
-    lines.append(f"_binary_{varname}_end: /* for objcopy compatibility */")
-    lines.append(f"\n.global {varname}_length")
-    lines.append(f"{varname}_length:")
-    lines.append(f".long {len(data)}")
-    lines.append("")
-    lines.append('#if defined (__linux__)')
-    lines.append('.section .note.GNU-stack,"",@progbits')
-    lines.append("#endif")
-
-    asm_content = "\n".join(lines) + "\n"
-
-    # Write to app build dir and bootloader build dir
-    asm_path.write_text(asm_content)
-    bootloader_dir = build_dir / "bootloader"
-    if bootloader_dir.is_dir():
-        bootloader_bin = bootloader_dir / "signature_verification_key.bin"
-        bootloader_asm = bootloader_dir / "signature_verification_key.bin.S"
-        shutil.copyfile(str(bin_path), str(bootloader_bin))
-        bootloader_asm.write_text(asm_content)
-
-
 def sign_firmware(source, target, env):
     """
     Sign the firmware binary using espsecure.py if signed OTA verification is enabled.
@@ -164,12 +55,9 @@ def sign_firmware(source, target, env):
         env.Exit(1)
         return
 
-    # Determine espsecure signature version from the signing scheme:
-    # V1 ECDSA (Secure Boot V1) uses --version 1, V2 RSA/ECDSA use --version 2.
-    if sdkconfig.get("CONFIG_SECURE_SIGNED_APPS_ECDSA_SCHEME") == "y":
-        sign_version = "1"
-    else:
-        sign_version = "2"
+    # ESPHome only exposes RSA3072 and ECDSA256 (both Secure Boot V2 schemes),
+    # so the espsecure signature version is always 2.
+    sign_version = "2"
 
     firmware_name = os.path.basename(env.subst("$PROGNAME")) + ".bin"
     firmware_path = build_dir / firmware_name
@@ -329,11 +217,6 @@ def esp32_copy_ota_bin(source, target, env):
     print(f"Copied firmware to {new_file_name}")
 
 
-# Generate V1 ECDSA verification key files before build starts.
-# Workaround for PlatformIO not executing CMake custom commands that extract
-# the public key and generate the .S assembly file for Secure Boot V1.
-_generate_v1_verification_key(env)  # noqa: F821
-
 # Run signing first, then merge, then ota copy
 env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", sign_firmware)  # noqa: F821
 env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", merge_factory_bin)  # noqa: F821

esphome/components/esp32_ble/__init__.py

@@ -7,7 +7,6 @@ from typing import Any
 
 from esphome import automation
 import esphome.codegen as cg
-from esphome.components.const import CONF_USE_PSRAM
 from esphome.components.esp32 import add_idf_sdkconfig_option, const, get_esp32_variant
 from esphome.components.esp32.const import VARIANT_ESP32C2
 import esphome.config_validation as cv
@@ -343,9 +342,6 @@ CONFIG_SCHEMA = cv.Schema(
         cv.Optional(CONF_MAX_CONNECTIONS, default=DEFAULT_MAX_CONNECTIONS): cv.All(
             cv.positive_int, cv.Range(min=1, max=IDF_MAX_CONNECTIONS)
         ),
-        cv.Optional(CONF_USE_PSRAM): cv.All(
-            cv.only_on_esp32, cv.requires_component("psram"), cv.boolean
-        ),
     }
 ).extend(cv.COMPONENT_SCHEMA)
 
@@ -602,22 +598,6 @@ async def to_code(config):
     add_idf_sdkconfig_option("CONFIG_BT_ENABLED", True)
     add_idf_sdkconfig_option("CONFIG_BT_BLE_42_FEATURES_SUPPORTED", True)
 
-    # When PSRAM and BT are used together, Bluedroid should prefer SPIRAM for
-    # heap allocations and use dynamic (heap-based) environment memory tables
-    # instead of large static DRAM arrays. This frees ~40 kB of internal RAM.
-    # Reference: Espressif ADF Design Considerations
-    # https://espressif-docs.readthedocs-hosted.com/projects/esp-adf/en/latest/
-    #            design-guide/design-considerations.html
-    if config.get(CONF_USE_PSRAM, False):
-        cg.add_define("USE_ESP32_BLE_PSRAM")
-        # CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST is only available on ESP32
-        # (BTDM dual-mode controller). BLE-only SoCs (C3, S3, C2, H2) do not
-        # expose this Kconfig symbol; applying it there would cause a build error.
-        if get_esp32_variant() == const.VARIANT_ESP32:
-            add_idf_sdkconfig_option("CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST", True)
-        # CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY applies to all Bluedroid-enabled variants.
-        add_idf_sdkconfig_option("CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY", True)
-
     # Register the core BLE loggers that are always needed
     register_bt_logger(BTLoggers.GAP, BTLoggers.BTM, BTLoggers.HCI)
 

esphome/components/esp32_ble/ble.cpp

@@ -667,9 +667,6 @@ void ESP32BLE::dump_config() {
                   "  MAC address: %s\n"
                   "  IO Capability: %s",
                   mac_s, io_capability_s);
-#ifdef USE_ESP32_BLE_PSRAM
-    ESP_LOGCONFIG(TAG, "  PSRAM BLE allocation: enabled");
-#endif
 
 #ifdef ESPHOME_ESP32_BLE_EXTENDED_AUTH_PARAMS
     const char *auth_req_mode_s = "<default>";

esphome/components/esphome/ota/__init__.py

@@ -78,14 +78,6 @@ def ota_esphome_final_validate(config):
         else:
             new_ota_conf.append(ota_conf)
 
-    if len(merged_ota_esphome_configs_by_port) > 1:
-        raise cv.Invalid(
-            f"Only a single port is supported for '{CONF_OTA}' "
-            f"'{CONF_PLATFORM}: {CONF_ESPHOME}'. Got ports "
-            f"{sorted(merged_ota_esphome_configs_by_port.keys())}. Consolidate "
-            f"onto a single port; configs sharing a port are merged automatically."
-        )
-
     new_ota_conf.extend(merged_ota_esphome_configs_by_port.values())
 
     full_conf[CONF_OTA] = new_ota_conf
@@ -155,8 +147,6 @@ async def to_code(config: ConfigType) -> None:
         cg.add(var.set_auth_password(config[CONF_PASSWORD]))
         cg.add_define("USE_OTA_PASSWORD")
     cg.add_define("USE_OTA_VERSION", config[CONF_VERSION])
-    # Build flag so lwip_fast_select.c (a .c file that can't include defines.h) sees it.
-    cg.add_build_flag("-DUSE_OTA_PLATFORM_ESPHOME")
 
     await cg.register_component(var, config)
     await ota_to_code(var, config)

esphome/components/esphome/ota/ota_esphome.cpp

@@ -15,9 +15,6 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 #include "esphome/core/util.h"
-#ifdef USE_LWIP_FAST_SELECT
-#include "esphome/core/lwip_fast_select.h"
-#endif
 
 #include <cerrno>
 #include <cstdio>
@@ -31,17 +28,6 @@ static constexpr size_t OTA_BUFFER_SIZE = 1024;                  // buffer size
 static constexpr uint32_t OTA_SOCKET_TIMEOUT_HANDSHAKE = 20000;  // milliseconds for initial handshake
 static constexpr uint32_t OTA_SOCKET_TIMEOUT_DATA = 90000;       // milliseconds for data transfer
 
-// Single-instance pointer — multi-port configs are rejected in final_validate.
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-static ESPHomeOTAComponent *global_esphome_ota_component = nullptr;
-
-// Called from any context (LwIP TCP/IP task, RP2040 user-IRQ).
-extern "C" void esphome_wake_ota_component_any_context() {
-  if (global_esphome_ota_component != nullptr) {
-    global_esphome_ota_component->enable_loop_soon_any_context();
-  }
-}
-
 void ESPHomeOTAComponent::setup() {
   this->server_ = socket::socket_ip_loop_monitored(SOCK_STREAM, 0).release();  // monitored for incoming connections
   if (this->server_ == nullptr) {
@@ -79,14 +65,6 @@ void ESPHomeOTAComponent::setup() {
     this->server_failed_(LOG_STR("listen"));
     return;
   }
-
-  // loop() self-disables on its first idle tick; no explicit disable_loop() needed here.
-  global_esphome_ota_component = this;
-#ifdef USE_LWIP_FAST_SELECT
-  // Filter fast-select wakes to this listener only. If the sock lookup returns nullptr,
-  // no wakes fire and loop() falls back to the self-disable safety net.
-  esphome_fast_select_set_ota_listener_sock(esphome_lwip_get_sock(this->server_->get_fd()));
-#endif
 }
 
 void ESPHomeOTAComponent::dump_config() {
@@ -103,15 +81,13 @@ void ESPHomeOTAComponent::dump_config() {
 }
 
 void ESPHomeOTAComponent::loop() {
-  // Self-disabling idle loop. Runs when a wake path marks us pending-enable (fast-select
-  // listener filter, raw-TCP accept_fn_, or host select), finds no work, and goes back
-  // to sleep. cleanup_connection_() deliberately leaves the loop enabled for one more
-  // iteration so a connection queued mid-session is still caught here.
-  if (this->client_ == nullptr && !this->server_->ready()) {
-    this->disable_loop();
-    return;
+  // Skip handle_handshake_() call if no client connected and no incoming connections
+  // This optimization reduces idle loop overhead when OTA is not active
+  // Note: No need to check server_ for null as the component is marked failed in setup()
+  // if server_ creation fails
+  if (this->client_ != nullptr || this->server_->ready()) {
+    this->handle_handshake_();
   }
-  this->handle_handshake_();
 }
 
 static const uint8_t FEATURE_SUPPORTS_COMPRESSION = 0x01;
@@ -590,9 +566,6 @@ void ESPHomeOTAComponent::cleanup_connection_() {
 #ifdef USE_OTA_PASSWORD
   this->cleanup_auth_();
 #endif
-  // Intentionally no disable_loop() — letting loop() run one more iteration catches
-  // any connection that queued on the listener mid-session (otherwise the wake flag,
-  // set while we were in LOOP state, would be lost to enable_pending_loops_()).
 }
 
 void ESPHomeOTAComponent::yield_and_feed_watchdog_() {

esphome/components/ethernet/ethernet_component.h

@@ -221,7 +221,7 @@ class EthernetComponent final : public Component {
   int reset_pin_{-1};
   int phy_addr_spi_{-1};
   int clock_speed_;
-  spi_host_device_t interface_{SPI2_HOST};
+  spi_host_device_t interface_{SPI3_HOST};
 #ifdef USE_ETHERNET_SPI_POLLING_SUPPORT
   uint32_t polling_interval_{0};
 #endif

esphome/components/font/__init__.py

@@ -325,7 +325,7 @@ def download_gfont(value):
             raise cv.Invalid(
                 f"Could not download font at {url}, please check the fonts exists "
                 f"at google fonts ({e})"
-            ) from e
+            )
         match = re.search(r"src:\s+url\((.+)\)\s+format\('truetype'\);", req.text)
         if match is None:
             raise cv.Invalid(

esphome/components/gpio/binary_sensor/__init__.py

@@ -60,73 +60,6 @@ CONFIG_SCHEMA = (
 )
 
 
-def _pin_shared_only_with_deep_sleep(pin_num: int) -> bool:
-    """Check if pin is shared exclusively with deep_sleep (wakeup pin)."""
-    pin_key = (CORE.target_platform, CORE.target_platform, pin_num)
-    pin_users = pins.PIN_SCHEMA_REGISTRY.pins_used.get(pin_key, [])
-    if len(pin_users) != 2:
-        return False
-    return any(path and path[0] == "deep_sleep" for path, _, _ in pin_users)
-
-
-def _final_validate(config):
-    use_interrupt = config[CONF_USE_INTERRUPT]
-    if not use_interrupt:
-        return config
-
-    pin_num = config[CONF_PIN][CONF_NUMBER]
-
-    # Expander pins (e.g. PCF8574, MCP23017) don't support direct interrupt
-    # attachment — only internal/native GPIO pins do.
-    if pins.PIN_SCHEMA_REGISTRY.get_key(config[CONF_PIN]) != CORE.target_platform:
-        _LOGGER.info(
-            "GPIO binary_sensor '%s': Pin is not an internal GPIO, "
-            "falling back to polling mode.",
-            config.get(CONF_NAME, config[CONF_ID]),
-        )
-        config[CONF_USE_INTERRUPT] = False
-        return config
-
-    # GPIO16 on ESP8266 doesn't support interrupts through attachInterrupt().
-    if CORE.is_esp8266 and pin_num == 16:
-        _LOGGER.warning(
-            "GPIO binary_sensor '%s': GPIO16 on ESP8266 doesn't support interrupts. "
-            "Falling back to polling mode (same as in ESPHome <2025.7). "
-            "The sensor will work exactly as before, but other pins have better "
-            "performance with interrupts.",
-            config.get(CONF_NAME, config[CONF_ID]),
-        )
-        config[CONF_USE_INTERRUPT] = False
-        return config
-
-    # When a pin is shared, interrupts can interfere with other components
-    # (e.g., duty_cycle sensor) that need to monitor the pin's state changes.
-    # Exception: deep_sleep wakeup pins are compatible with interrupts when
-    # the pin is only shared between this sensor and deep_sleep (count == 2).
-    if config[CONF_PIN].get(CONF_ALLOW_OTHER_USES, False):
-        if not _pin_shared_only_with_deep_sleep(pin_num):
-            _LOGGER.info(
-                "GPIO binary_sensor '%s': Disabling interrupts because pin %s is shared "
-                "with other components. The sensor will use polling mode for "
-                "compatibility with other pin uses.",
-                config.get(CONF_NAME, config[CONF_ID]),
-                pin_num,
-            )
-            config[CONF_USE_INTERRUPT] = False
-        else:
-            _LOGGER.debug(
-                "GPIO binary_sensor '%s': Pin %s is shared with deep_sleep, "
-                "keeping interrupts enabled.",
-                config.get(CONF_NAME, config[CONF_ID]),
-                pin_num,
-            )
-
-    return config
-
-
-FINAL_VALIDATE_SCHEMA = _final_validate
-
-
 async def to_code(config):
     var = await binary_sensor.new_binary_sensor(config)
     await cg.register_component(var, config)
@@ -134,7 +67,36 @@ async def to_code(config):
     pin = await cg.gpio_pin_expression(config[CONF_PIN])
     cg.add(var.set_pin(pin))
 
-    if config[CONF_USE_INTERRUPT]:
+    # Check for ESP8266 GPIO16 interrupt limitation
+    # GPIO16 on ESP8266 is a special pin that doesn't support interrupts through
+    # the Arduino attachInterrupt() function. This is the only known GPIO pin
+    # across all supported platforms that has this limitation, so we handle it
+    # here instead of in the platform-specific code.
+    use_interrupt = config[CONF_USE_INTERRUPT]
+    if use_interrupt and CORE.is_esp8266 and config[CONF_PIN][CONF_NUMBER] == 16:
+        _LOGGER.warning(
+            "GPIO binary_sensor '%s': GPIO16 on ESP8266 doesn't support interrupts. "
+            "Falling back to polling mode (same as in ESPHome <2025.7). "
+            "The sensor will work exactly as before, but other pins have better "
+            "performance with interrupts.",
+            config.get(CONF_NAME, config[CONF_ID]),
+        )
+        use_interrupt = False
+
+    # Check if pin is shared with other components (allow_other_uses)
+    # When a pin is shared, interrupts can interfere with other components
+    # (e.g., duty_cycle sensor) that need to monitor the pin's state changes
+    if use_interrupt and config[CONF_PIN].get(CONF_ALLOW_OTHER_USES, False):
+        _LOGGER.info(
+            "GPIO binary_sensor '%s': Disabling interrupts because pin %s is shared with other components. "
+            "The sensor will use polling mode for compatibility with other pin uses.",
+            config.get(CONF_NAME, config[CONF_ID]),
+            config[CONF_PIN][CONF_NUMBER],
+        )
+        use_interrupt = False
+
+    if use_interrupt:
         cg.add(var.set_interrupt_type(config[CONF_INTERRUPT_TYPE]))
     else:
-        cg.add(var.set_use_interrupt(False))
+        # Only generate call when disabling interrupts (default is true)
+        cg.add(var.set_use_interrupt(use_interrupt))

esphome/components/gpio/binary_sensor/gpio_binary_sensor.cpp

@@ -46,6 +46,11 @@ void GPIOBinarySensorStore::setup(InternalGPIOPin *pin, Component *component) {
 }
 
 void GPIOBinarySensor::setup() {
+  if (this->store_.use_interrupt_ && !this->pin_->is_internal()) {
+    ESP_LOGD(TAG, "GPIO is not internal, falling back to polling mode");
+    this->store_.use_interrupt_ = false;
+  }
+
   if (this->store_.use_interrupt_) {
     auto *internal_pin = static_cast<InternalGPIOPin *>(this->pin_);
     this->store_.setup(internal_pin, this);

esphome/components/http_request/http_request.cpp

@@ -22,7 +22,7 @@ void HttpRequestComponent::dump_config() {
 }
 
 std::string HttpContainer::get_response_header(const std::string &header_name) {
-  auto lower = str_lower_case(header_name);  // NOLINT
+  auto lower = str_lower_case(header_name);
   for (const auto &entry : this->response_headers_) {
     if (entry.name == lower) {
       ESP_LOGD(TAG, "Header with name %s found with value %s", lower.c_str(), entry.value.c_str());

esphome/components/http_request/http_request.h

@@ -11,7 +11,6 @@
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 #include "esphome/core/defines.h"
-#include "esphome/core/alloc_helpers.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
@@ -401,7 +400,7 @@ class HttpRequestComponent : public Component {
     std::vector<std::string> lower;
     lower.reserve(collect_headers.size());
     for (const auto &h : collect_headers) {
-      lower.push_back(str_lower_case(h));  // NOLINT
+      lower.push_back(str_lower_case(h));
     }
     return this->perform(url, method, body, request_headers, lower);
   }
@@ -416,7 +415,7 @@ class HttpRequestComponent : public Component {
     std::vector<std::string> lower;
     lower.reserve(collect_headers.size());
     for (const auto &h : collect_headers) {
-      lower.push_back(str_lower_case(h));  // NOLINT
+      lower.push_back(str_lower_case(h));
     }
     return this->perform(url, method, body, std::vector<Header>(request_headers.begin(), request_headers.end()), lower);
   }

esphome/components/http_request/http_request_arduino.cpp

@@ -161,7 +161,7 @@ std::shared_ptr<HttpContainer> HttpRequestArduino::perform(const std::string &ur
   container->response_headers_.clear();
   auto header_count = container->client_.headers();
   for (int i = 0; i < header_count; i++) {
-    const std::string header_name = str_lower_case(container->client_.headerName(i).c_str());  // NOLINT
+    const std::string header_name = str_lower_case(container->client_.headerName(i).c_str());
     if (should_collect_header(lower_case_collect_headers, header_name)) {
       std::string header_value = container->client_.header(i).c_str();
       ESP_LOGD(TAG, "Received response header, name: %s, value: %s", header_name.c_str(), header_value.c_str());

esphome/components/http_request/http_request_host.cpp

@@ -115,7 +115,7 @@ std::shared_ptr<HttpContainer> HttpRequestHost::perform(const std::string &url,
   container->content_length = container->response_body_.size();
   for (auto header : response.headers) {
     ESP_LOGD(TAG, "Header: %s: %s", header.first.c_str(), header.second.c_str());
-    auto lower_name = str_lower_case(header.first);  // NOLINT
+    auto lower_name = str_lower_case(header.first);
     if (should_collect_header(lower_case_collect_headers, lower_name)) {
       container->response_headers_.push_back({lower_name, header.second});
     }

esphome/components/http_request/http_request_idf.cpp

@@ -38,7 +38,7 @@ esp_err_t HttpRequestIDF::http_event_handler(esp_http_client_event_t *evt) {
 
   switch (evt->event_id) {
     case HTTP_EVENT_ON_HEADER: {
-      const std::string header_name = str_lower_case(evt->header_key);  // NOLINT
+      const std::string header_name = str_lower_case(evt->header_key);
       if (should_collect_header(user_data->lower_case_collect_headers, header_name)) {
         const std::string header_value = evt->header_value;
         ESP_LOGD(TAG, "Received response header, name: %s, value: %s", header_name.c_str(), header_value.c_str());

esphome/components/i2s_audio/microphone/__init__.py

@@ -36,7 +36,7 @@ I2SAudioMicrophone = i2s_audio_ns.class_(
 )
 
 INTERNAL_ADC_VARIANTS = [esp32.VARIANT_ESP32]
-PDM_VARIANTS = [esp32.VARIANT_ESP32, esp32.VARIANT_ESP32S3, esp32.VARIANT_ESP32P4]
+PDM_VARIANTS = [esp32.VARIANT_ESP32, esp32.VARIANT_ESP32S3]
 
 
 def _validate_esp32_variant(config):

esphome/components/ili9xxx/display.py

@@ -283,7 +283,7 @@ async def to_code(config):
             try:
                 return Image.open(path)
             except Exception as e:
-                raise core.EsphomeError(f"Could not load image file {path}: {e}") from e
+                raise core.EsphomeError(f"Could not load image file {path}: {e}")
 
         # make a wide horizontal combined image.
         images = [load_image(x) for x in config[CONF_COLOR_PALETTE_IMAGES]]

esphome/components/ili9xxx/ili9xxx_defines.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <cstdint>
-
 namespace esphome {
 namespace ili9xxx {
 

esphome/components/ili9xxx/ili9xxx_display.cpp

@@ -229,10 +229,6 @@ void ILI9XXXDisplay::update() {
 }
 
 void ILI9XXXDisplay::display_() {
-  // buffer may be null if allocation failed
-  if (this->buffer_ == nullptr) {
-    return;
-  }
   // check if something was displayed
   if ((this->x_high_ < this->x_low_) || (this->y_high_ < this->y_low_)) {
     return;

esphome/components/image/__init__.py

@@ -28,6 +28,7 @@ from esphome.const import (
     CONF_URL,
 )
 from esphome.core import CORE, HexInt
+from esphome.final_validate import full_config
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -675,16 +676,12 @@ def _final_validate(config):
     :param config:
     :return:
     """
-    config = config.copy()
-    for c in config:
-        if byte_order := c.get(CONF_BYTE_ORDER):
-            if byte_order == "BIG_ENDIAN":
-                _LOGGER.warning(
-                    "The image '%s' is configured with big-endian byte order, little-endian is expected",
-                    c.get(CONF_FILE),
-                )
-        else:
-            c[CONF_BYTE_ORDER] = "LITTLE_ENDIAN"
+    fv = full_config.get()
+    if "lvgl" in fv and not all(CONF_BYTE_ORDER in x for x in config):
+        config = config.copy()
+        for c in config:
+            if not c.get(CONF_BYTE_ORDER):
+                c[CONF_BYTE_ORDER] = "LITTLE_ENDIAN"
     return config
 
 
@@ -756,7 +753,7 @@ async def write_image(config, all_frames=False):
             for col in range(width):
                 encoder.encode(pixels[row * width + col])
             encoder.end_row()
-    encoder.end_image()
+        encoder.end_image()
 
     rhs = [HexInt(x) for x in encoder.data]
     prog_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)

esphome/components/image/image.cpp

@@ -189,7 +189,7 @@ Color Image::get_rgb_pixel_(int x, int y) const {
 }
 Color Image::get_rgb565_pixel_(int x, int y) const {
   const uint8_t *pos = this->data_start_ + (x + y * this->width_) * this->bpp_ / 8;
-  uint16_t rgb565 = encode_uint16(progmem_read_byte(pos + 1), progmem_read_byte(pos));
+  uint16_t rgb565 = encode_uint16(progmem_read_byte(pos), progmem_read_byte(pos + 1));
   auto r = (rgb565 & 0xF800) >> 11;
   auto g = (rgb565 & 0x07E0) >> 5;
   auto b = rgb565 & 0x001F;

esphome/components/ld2412/ld2412.cpp

@@ -766,38 +766,32 @@ void LD2412Component::get_distance_resolution_() { this->send_command_(CMD_QUERY
 void LD2412Component::query_light_control_() { this->send_command_(CMD_QUERY_LIGHT_CONTROL, nullptr, 0); }
 
 void LD2412Component::set_basic_config() {
-  uint8_t min_gate = 1;
-  uint8_t max_gate = TOTAL_GATES;
-  uint16_t timeout = DEFAULT_PRESENCE_TIMEOUT;
-  uint8_t out_pin_level = 0x01;
-
 #ifdef USE_NUMBER
-  if (this->min_distance_gate_number_ != nullptr) {
-    if (!this->min_distance_gate_number_->has_state())
-      return;
-    min_gate = static_cast<int>(this->min_distance_gate_number_->state);
-  }
-  if (this->max_distance_gate_number_ != nullptr) {
-    if (!this->max_distance_gate_number_->has_state())
-      return;
-    max_gate = static_cast<int>(this->max_distance_gate_number_->state) + 1;
-  }
-  if (this->timeout_number_ != nullptr) {
-    if (!this->timeout_number_->has_state())
-      return;
-    timeout = static_cast<int>(this->timeout_number_->state);
+  if (!this->min_distance_gate_number_->has_state() || !this->max_distance_gate_number_->has_state() ||
+      !this->timeout_number_->has_state()) {
+    return;
   }
 #endif
 #ifdef USE_SELECT
-  if (this->out_pin_level_select_ != nullptr) {
-    if (!this->out_pin_level_select_->has_state())
-      return;
-    out_pin_level = find_uint8(OUT_PIN_LEVELS_BY_STR, this->out_pin_level_select_->current_option().c_str());
+  if (!this->out_pin_level_select_->has_state()) {
+    return;
   }
 #endif
 
   uint8_t value[5] = {
-      lowbyte(min_gate), lowbyte(max_gate), lowbyte(timeout), highbyte(timeout), out_pin_level,
+#ifdef USE_NUMBER
+      lowbyte(static_cast<int>(this->min_distance_gate_number_->state)),
+      lowbyte(static_cast<int>(this->max_distance_gate_number_->state) + 1),
+      lowbyte(static_cast<int>(this->timeout_number_->state)),
+      highbyte(static_cast<int>(this->timeout_number_->state)),
+#else
+      1,    TOTAL_GATES, DEFAULT_PRESENCE_TIMEOUT, 0,
+#endif
+#ifdef USE_SELECT
+      find_uint8(OUT_PIN_LEVELS_BY_STR, this->out_pin_level_select_->current_option().c_str()),
+#else
+      0x01,  // Default value if not using select
+#endif
   };
   this->set_config_mode_(true);
   this->send_command_(CMD_BASIC_CONF, value, sizeof(value));

esphome/components/libretiny/__init__.py

@@ -1,6 +1,5 @@
 import json
 import logging
-from pathlib import Path
 
 import esphome.codegen as cg
 import esphome.config_validation as cv
@@ -25,7 +24,6 @@ from esphome.const import (
 )
 from esphome.core import CORE
 from esphome.core.config import BOARD_MAX_LENGTH
-from esphome.helpers import copy_file_if_changed
 from esphome.storage_json import StorageJSON
 
 from . import gpio  # noqa
@@ -467,11 +465,6 @@ async def component_to_code(config):
         # it for project source files only. GCC uses the last -O flag.
         build_src_flags += " -Os"
     cg.add_platformio_option("build_src_flags", build_src_flags)
-    # IRAM_ATTR is a no-op on BK72xx (SDK masks FIQ+IRQ around flash ops).
-    # On other families, patch_linker.py routes .sram.text into the right
-    # RAM-executable output section and prints a post-link placement summary.
-    if FAMILY_COMPONENT[config[CONF_FAMILY]] != COMPONENT_BK72XX:
-        cg.add_platformio_option("extra_scripts", ["pre:patch_linker.py"])
     # dummy version code
     cg.add_define("USE_ARDUINO_VERSION_CODE", cg.RawExpression("VERSION_CODE(0, 0, 0)"))
     # decrease web server stack size (16k words -> 4k words)
@@ -556,13 +549,3 @@ async def component_to_code(config):
     _configure_lwip(config)
 
     await cg.register_component(var, config)
-
-
-# Called by writer.py
-def copy_files() -> None:
-    script_dir = Path(__file__).parent
-    patch_linker_file = script_dir / "patch_linker.py.script"
-    copy_file_if_changed(
-        patch_linker_file,
-        CORE.relative_build_path("patch_linker.py"),
-    )

esphome/components/libretiny/generate_components.py

@@ -79,11 +79,6 @@ async def to_code(config):
 @pins.PIN_SCHEMA_REGISTRY.register("{COMPONENT_LOWER}", PIN_SCHEMA)
 async def pin_to_code(config):
     return await libretiny.gpio.component_pin_to_code(config)
-
-
-# Called by writer.py; delegates to the shared libretiny implementation.
-def copy_files() -> None:
-    libretiny.copy_files()
 '''
 
 BASE_CODE_BOARDS = '''

esphome/components/libretiny/patch_linker.py.script

@@ -1,171 +0,0 @@
-# pylint: disable=E0602
-Import("env")  # noqa
-
-import os
-import re
-import subprocess
-
-# ESPHome marks ISR code IRAM_ATTR, which on LibreTiny maps to a per-family
-# section routed into RAM-executable memory (see esphome/core/hal.h).
-#
-# This script is NOT loaded on BK72xx (IRAM_ATTR is a no-op there; the SDK
-# masks FIQ+IRQ around flash writes). On the remaining families:
-# - RTL8710B: hal.h uses section(".image2.ram.text"); stock linker consumes it.
-# - RTL8720C: hal.h uses section(".sram.text"); stock linker consumes it.
-# - LN882H: stock linker has no glob for ".sram.text", so we inject
-#   KEEP(*(.sram.text*)) into ".flash_copysection" (> RAM0 AT> FLASH).
-#
-# All families also get a post-link summary showing where IRAM_ATTR landed.
-
-
-_MARKER = "/* esphome .sram.text */"
-# Strong assignments (not PROVIDE) so the symbols are always emitted in the
-# ELF; PROVIDE symbols with no references can be garbage-collected.
-_KEEP_LINE = (
-    "    __esphome_sram_text_start = .; "
-    "KEEP(*(.sram.text*)) "
-    "__esphome_sram_text_end = .; "
-    + _MARKER + "\n"
-)
-_LN_COPY = re.compile(r"(\.flash_copysection\s*:\s*\{\s*\n)")
-
-
-def _detect(env):
-    prefix = "USE_LIBRETINY_VARIANT_"
-    # CPPDEFINES may hold strings or (name, value) tuples; BUILD_FLAGS holds
-    # the raw "-DNAME" strings. PlatformIO populates both, but the exact order
-    # vs. extra_scripts varies, so check both to be robust.
-    for token in env.get("CPPDEFINES", []):
-        if isinstance(token, (list, tuple)):
-            token = token[0]
-        if isinstance(token, str) and token.startswith(prefix):
-            return token[len(prefix):]
-    for flag in env.get("BUILD_FLAGS", []):
-        if isinstance(flag, str) and "-D" + prefix in flag:
-            name = flag.split("-D", 1)[1].split("=", 1)[0].strip()
-            if name.startswith(prefix):
-                return name[len(prefix):]
-    return None
-
-
-KNOWN_VARIANTS = frozenset({
-    "LN882H",
-    "RTL8710B",
-    "RTL8720C",
-})
-
-
-def _inject_keep(host_section):
-    """Return a patcher that injects _KEEP_LINE at the top of `host_section`."""
-    def patch(content):
-        if _MARKER in content:
-            return content
-        return host_section.sub(r"\1" + _KEEP_LINE, content, count=1)
-    return patch
-
-
-# Variants not listed here intentionally have no .ld patcher:
-# - RTL8710B: hal.h uses section(".image2.ram.text") which the stock linker
-#   already routes into .ram_image2.text (> BD_RAM).
-# - RTL8720C: stock linker already consumes *(.sram.text*).
-# - BK72xx (all): SDK masks FIQ+IRQ around flash writes, IRAM_ATTR is no-op.
-_PATCHERS_BY_VARIANT = {
-    "LN882H": (_inject_keep(_LN_COPY),),
-}
-
-
-def _patchers_for(variant):
-    return _PATCHERS_BY_VARIANT.get(variant, ())
-
-
-def _pre_link(target, source, env):
-    build_dir = env.subst("$BUILD_DIR")
-    ld_files = [f for f in os.listdir(build_dir) if f.endswith(".ld")]
-    patched = 0
-    for name in ld_files:
-        path = os.path.join(build_dir, name)
-        with open(path, "r", encoding="utf-8") as fh:
-            original = fh.read()
-        if _MARKER in original:
-            patched += 1
-            continue
-        content = original
-        for fn in _patchers:
-            content = fn(content)
-        if content != original:
-            with open(path, "w", encoding="utf-8") as fh:
-                fh.write(content)
-            print("ESPHome: patched {} for IRAM_ATTR placement".format(name))
-            patched += 1
-    if not patched:
-        raise RuntimeError(
-            "ESPHome: no .ld in {} was patched for IRAM_ATTR. Update the "
-            "regex in patch_linker.py.script (_PATCHERS_BY_VARIANT).".format(
-                build_dir
-            )
-        )
-
-
-# Substrings matched against demangled names as a fallback on RTL8720C,
-# where we cannot inject __esphome_sram_text_start/end markers.
-_FALLBACK_SUBSTRINGS = ("wake_loop_any_context", "wake_loop_isrsafe",
-                        "enable_loop_soon_any_context")
-
-
-def _post_link(target, source, env):
-    """Print where IRAM_ATTR ended up so users can confirm at a glance."""
-    elf = env.subst("$BUILD_DIR/${PROGNAME}.elf")
-    if not os.path.isfile(elf):
-        return
-    nm = env.subst("$NM")
-    try:
-        out = subprocess.check_output(
-            [nm, "--defined-only", "--demangle", elf], text=True
-        )
-    except (OSError, subprocess.CalledProcessError) as exc:
-        print("ESPHome: IRAM_ATTR summary unavailable (nm failed: {})".format(exc))
-        return
-    start = end = None
-    fallback = []
-    for line in out.splitlines():
-        parts = line.split(maxsplit=2)
-        if len(parts) != 3:
-            continue
-        addr_str, _kind, name = parts
-        if name == "__esphome_sram_text_start":
-            start = int(addr_str, 16)
-        elif name == "__esphome_sram_text_end":
-            end = int(addr_str, 16)
-        elif "veneer" not in name and any(s in name for s in _FALLBACK_SUBSTRINGS):
-            fallback.append(int(addr_str, 16))
-    print("ESPHome: IRAM_ATTR placement summary ({}):".format(_variant))
-    if start is not None and end is not None:
-        print("  .sram.text:  {} bytes at 0x{:08x} - 0x{:08x}".format(end - start, start, end))
-    elif fallback:
-        lo, hi = min(fallback), max(fallback)
-        print("  IRAM symbols at 0x{:08x} - 0x{:08x} (approx {} bytes)".format(lo, hi, hi - lo))
-    else:
-        print("  no IRAM_ATTR symbols found")
-
-
-if (_variant := _detect(env)) is None:
-    raise RuntimeError(
-        "ESPHome: could not determine LibreTiny variant from build flags. "
-        "patch_linker.py needs USE_LIBRETINY_VARIANT_* to route IRAM_ATTR "
-        "into SRAM; without it, ISR handlers would silently end up in flash."
-    )
-if _variant not in KNOWN_VARIANTS:
-    raise RuntimeError(
-        "ESPHome: unknown LibreTiny variant {!r}; patch_linker.py does not "
-        "know how to route IRAM_ATTR into SRAM for this family. Update "
-        "patch_linker.py.script before shipping firmware.".format(_variant)
-    )
-
-if _patchers := _patchers_for(_variant):
-    # LibreTiny writes the processed .ld templates into $BUILD_DIR during its
-    # own builder setup, which may run after this script. Register the patch
-    # as a pre-link action so it executes once the linker scripts exist.
-    env.AddPreAction("$BUILD_DIR/${PROGNAME}.elf", _pre_link)
-
-# Post-link summary for every family that reaches this script.
-env.AddPostAction("$BUILD_DIR/${PROGNAME}.elf", _post_link)

esphome/components/light/addressable_light.cpp

@@ -58,12 +58,6 @@ void AddressableLightTransformer::start() {
   // our transition will handle brightness, disable brightness in correction.
   this->light_.correction_.set_local_brightness(255);
   this->target_color_ *= to_uint8_scale(end_values.get_brightness() * end_values.get_state());
-
-  // Uniformity scan is deferred to the first apply() call. start() can run before the underlying
-  // LED output's setup() has allocated its frame buffer (e.g. on_boot at priority > HARDWARE
-  // triggering a transition), and reading through ESPColorView would deref a null buffer.
-  this->uniform_start_scanned_ = false;
-  this->uniform_start_is_uniform_ = false;
 }
 
 inline constexpr uint8_t subtract_scaled_difference(uint8_t a, uint8_t b, int32_t scale) {
@@ -103,57 +97,12 @@ optional<LightColorValues> AddressableLightTransformer::apply() {
   // non-linear when applying small deltas.
 
   if (smoothed_progress > this->last_transition_progress_ && this->last_transition_progress_ < 1.f) {
-    // Lazy uniformity scan: deferred from start() so the LED output's setup() has run and the
-    // frame buffer is valid. When every LED already has the same color (the common case: plain
-    // turn_on/turn_off on a uniform strip), interpolate math-only against a single start color.
-    // Avoiding the per-step read-back through the 8-bit stored byte prevents gamma round-trip
-    // quantization from stalling the fade at low values (e.g. gamma 2.8 pre-gamma values <27
-    // round to stored 0, freezing progress).
-    if (!this->uniform_start_scanned_) {
-      this->uniform_start_scanned_ = true;
-      if (this->light_.size() > 0) {
-        Color first = this->light_[0].get();
-        bool uniform = true;
-        for (int32_t i = 1; i < this->light_.size(); i++) {
-          if (this->light_[i].get() != first) {
-            uniform = false;
-            break;
-          }
-        }
-        if (uniform) {
-          this->uniform_start_color_ = first;
-          this->uniform_start_is_uniform_ = true;
-        }
-      }
-    }
-    if (this->uniform_start_is_uniform_) {
-      // All LEDs started at the same color: compute the interpolated value once and write it to
-      // every LED. No read-back, so each LED's stored byte advances through every gamma threshold
-      // as smoothed_progress crosses it, instead of stalling at 0 for low pre-gamma values.
-      //
-      // Trade-off: any mid-transition writes to individual LEDs (e.g. from a user lambda) will be
-      // overwritten on the next apply() here. The fallback path below would have respected them
-      // via its read-back. Concurrent per-LED mutation during a transition isn't a pattern we
-      // support, so this is acceptable.
-      // lerp(start, target, progress) via existing helper: target - (target-start)*(1-progress).
-      const Color &start = this->uniform_start_color_;
-      int32_t remaining = int32_t(256.f * (1.f - smoothed_progress));
-      uint8_t r = subtract_scaled_difference(this->target_color_.red, start.red, remaining);
-      uint8_t g = subtract_scaled_difference(this->target_color_.green, start.green, remaining);
-      uint8_t b = subtract_scaled_difference(this->target_color_.blue, start.blue, remaining);
-      uint8_t w = subtract_scaled_difference(this->target_color_.white, start.white, remaining);
-      for (auto led : this->light_) {
-        led.set_rgbw(r, g, b, w);
-      }
-    } else {
-      int32_t scale =
-          int32_t(256.f * std::max((1.f - smoothed_progress) / (1.f - this->last_transition_progress_), 0.f));
-      for (auto led : this->light_) {
-        led.set_rgbw(subtract_scaled_difference(this->target_color_.red, led.get_red(), scale),
-                     subtract_scaled_difference(this->target_color_.green, led.get_green(), scale),
-                     subtract_scaled_difference(this->target_color_.blue, led.get_blue(), scale),
-                     subtract_scaled_difference(this->target_color_.white, led.get_white(), scale));
-      }
+    int32_t scale = int32_t(256.f * std::max((1.f - smoothed_progress) / (1.f - this->last_transition_progress_), 0.f));
+    for (auto led : this->light_) {
+      led.set_rgbw(subtract_scaled_difference(this->target_color_.red, led.get_red(), scale),
+                   subtract_scaled_difference(this->target_color_.green, led.get_green(), scale),
+                   subtract_scaled_difference(this->target_color_.blue, led.get_blue(), scale),
+                   subtract_scaled_difference(this->target_color_.white, led.get_white(), scale));
     }
     this->last_transition_progress_ = smoothed_progress;
     this->light_.schedule_show();

esphome/components/light/addressable_light.h

@@ -115,9 +115,6 @@ class AddressableLightTransformer : public LightTransformer {
   AddressableLight &light_;
   float last_transition_progress_{0.0f};
   Color target_color_{};
-  Color uniform_start_color_{};
-  bool uniform_start_scanned_{false};
-  bool uniform_start_is_uniform_{false};
 };
 
 }  // namespace esphome::light

esphome/components/light/light_call.h

@@ -222,7 +222,7 @@ class LightCall {
   inline bool get_save_() { return (this->flags_ & FLAG_SAVE) != 0; }
 
   // Helper to set flag - defaults to true for common case
-  void set_flag_(FieldFlags flag, bool value = true) ESPHOME_ALWAYS_INLINE {
+  void set_flag_(FieldFlags flag, bool value = true) {
     if (value) {
       this->flags_ |= flag;
     } else {
@@ -231,7 +231,7 @@ class LightCall {
   }
 
   // Helper to clear flag - reduces code size for common case
-  void clear_flag_(FieldFlags flag) ESPHOME_ALWAYS_INLINE { this->flags_ &= ~flag; }
+  void clear_flag_(FieldFlags flag) { this->flags_ &= ~flag; }
 
   // Helper to log unsupported feature and clear flag - reduces code duplication
   void log_and_clear_unsupported_(FieldFlags flag, const LogString *feature, bool use_color_mode_log);

esphome/components/ln882x/__init__.py

@@ -65,8 +65,3 @@ async def to_code(config):
 @pins.PIN_SCHEMA_REGISTRY.register("ln882x", PIN_SCHEMA)
 async def pin_to_code(config):
     return await libretiny.gpio.component_pin_to_code(config)
-
-
-# Called by writer.py; delegates to the shared libretiny implementation.
-def copy_files() -> None:
-    libretiny.copy_files()

esphome/components/lock/__init__.py

@@ -35,11 +35,9 @@ LockStateForwarder = lock_ns.class_("LockStateForwarder")
 LockState = lock_ns.enum("LockState")
 
 LOCK_STATES = {
-    "OPEN": LockState.LOCK_STATE_OPEN,
     "LOCKED": LockState.LOCK_STATE_LOCKED,
     "UNLOCKED": LockState.LOCK_STATE_UNLOCKED,
     "JAMMED": LockState.LOCK_STATE_JAMMED,
-    "OPENING": LockState.LOCK_STATE_OPENING,
     "LOCKING": LockState.LOCK_STATE_LOCKING,
     "UNLOCKING": LockState.LOCK_STATE_UNLOCKING,
 }

esphome/components/lock/lock.cpp

@@ -8,10 +8,9 @@ namespace esphome::lock {
 
 static const char *const TAG = "lock";
 
-// Lock state strings indexed by LockState enum.
+// Lock state strings indexed by LockState enum (0-5): NONE(UNKNOWN), LOCKED, UNLOCKED, JAMMED, LOCKING, UNLOCKING
 // Index 0 is UNKNOWN (for LOCK_STATE_NONE), also used as fallback for out-of-range
-PROGMEM_STRING_TABLE(LockStateStrings, "UNKNOWN", "LOCKED", "UNLOCKED", "JAMMED", "LOCKING", "UNLOCKING", "OPENING",
-                     "OPEN");
+PROGMEM_STRING_TABLE(LockStateStrings, "UNKNOWN", "LOCKED", "UNLOCKED", "JAMMED", "LOCKING", "UNLOCKING");
 
 const LogString *lock_state_to_string(LockState state) {
   return LockStateStrings::get_log_str(static_cast<uint8_t>(state), 0);
@@ -75,16 +74,12 @@ LockCall &LockCall::set_state(optional<LockState> state) {
   return *this;
 }
 LockCall &LockCall::set_state(const char *state) {
-  if (ESPHOME_strcasecmp_P(state, ESPHOME_PSTR("OPEN")) == 0) {
-    this->set_state(LOCK_STATE_OPEN);
-  } else if (ESPHOME_strcasecmp_P(state, ESPHOME_PSTR("LOCKED")) == 0) {
+  if (ESPHOME_strcasecmp_P(state, ESPHOME_PSTR("LOCKED")) == 0) {
     this->set_state(LOCK_STATE_LOCKED);
   } else if (ESPHOME_strcasecmp_P(state, ESPHOME_PSTR("UNLOCKED")) == 0) {
     this->set_state(LOCK_STATE_UNLOCKED);
   } else if (ESPHOME_strcasecmp_P(state, ESPHOME_PSTR("JAMMED")) == 0) {
     this->set_state(LOCK_STATE_JAMMED);
-  } else if (ESPHOME_strcasecmp_P(state, ESPHOME_PSTR("OPENING")) == 0) {
-    this->set_state(LOCK_STATE_OPENING);
   } else if (ESPHOME_strcasecmp_P(state, ESPHOME_PSTR("LOCKING")) == 0) {
     this->set_state(LOCK_STATE_LOCKING);
   } else if (ESPHOME_strcasecmp_P(state, ESPHOME_PSTR("UNLOCKING")) == 0) {

esphome/components/lock/lock.h

@@ -26,9 +26,7 @@ enum LockState : uint8_t {
   LOCK_STATE_UNLOCKED = 2,
   LOCK_STATE_JAMMED = 3,
   LOCK_STATE_LOCKING = 4,
-  LOCK_STATE_UNLOCKING = 5,
-  LOCK_STATE_OPENING = 6,
-  LOCK_STATE_OPEN = 7,
+  LOCK_STATE_UNLOCKING = 5
 };
 const LogString *lock_state_to_string(LockState state);
 

esphome/components/ltr390/ltr390.cpp

@@ -45,7 +45,6 @@ optional<uint32_t> LTR390Component::read_sensor_data_(LTR390MODE mode) {
   uint8_t buffer[num_bytes];
 
   // Wait until data available
-  constexpr uint32_t max_wait_ms = 25;
   const uint32_t now = millis();
   while (true) {
     std::bitset<8> status = this->reg(LTR390_MAIN_STATUS).get();
@@ -53,12 +52,12 @@ optional<uint32_t> LTR390Component::read_sensor_data_(LTR390MODE mode) {
     if (available)
       break;
 
-    if (millis() - now > max_wait_ms) {
+    if (millis() - now > 100) {
       ESP_LOGW(TAG, "Sensor didn't return any data, aborting");
       return {};
     }
-    ESP_LOGV(TAG, "Waiting for data");
-    delay(1);
+    ESP_LOGD(TAG, "Waiting for data");
+    delay(2);
   }
 
   if (!this->read_bytes(MODEADDRESSES[mode], buffer, num_bytes)) {

esphome/components/lvgl/__init__.py

@@ -44,7 +44,6 @@ from esphome.core import CORE, ID, Lambda
 from esphome.cpp_generator import MockObj
 from esphome.final_validate import full_config
 from esphome.helpers import write_file_if_changed
-from esphome.writer import clean_build
 from esphome.yaml_util import load_yaml
 
 from . import defines as df, helpers, lv_validation as lvalid, widgets
@@ -452,8 +451,7 @@ async def to_code(configs):
         df.add_define(f"LV_DRAW_SW_SUPPORT_{fmt}", "1")
 
     lv_conf_h_file = CORE.relative_src_path(LV_CONF_FILENAME)
-    if write_file_if_changed(lv_conf_h_file, generate_lv_conf_h()):
-        clean_build(clear_pio_cache=False)
+    write_file_if_changed(lv_conf_h_file, generate_lv_conf_h())
     cg.add_build_flag("-DLV_CONF_H=1")
     # handle windows paths in a way that doesn't break the generated C++
     lv_conf_h_path = Path(lv_conf_h_file).as_posix()

esphome/components/lvgl/hello_world.yaml

@@ -89,12 +89,10 @@
                       id: hello_world_label_
                       text: "Hello World!"
                       align: center
-            - container:
+            - obj:
                 id: hello_world_qrcode_
                 outline_width: 0
                 border_width: 0
-                height: 100
-                width: 100
                 hidden: !lambda |-
                     return lv_obj_get_width(lv_screen_active()) < 300 && lv_obj_get_height(lv_screen_active()) < 400;
                 widgets:

esphome/components/lvgl/lvgl_esphome.cpp

@@ -642,28 +642,26 @@ void LvglComponent::write_random_() {
   int iterations = 6 - lv_display_get_inactive_time(this->disp_) / 60000;
   if (iterations <= 0)
     iterations = 1;
-  int16_t width = lv_display_get_horizontal_resolution(this->disp_);
-  int16_t height = lv_display_get_vertical_resolution(this->disp_);
   while (iterations-- != 0) {
-    int32_t col = random_uint32() % width;
+    int32_t col = random_uint32() % this->width_;
     col = col / this->draw_rounding * this->draw_rounding;
-    int32_t row = random_uint32() % height;
+    int32_t row = random_uint32() % this->height_;
     row = row / this->draw_rounding * this->draw_rounding;
     // size will be between 8 and 32, and a multiple of draw_rounding
     int32_t size = (random_uint32() % 25 + 8) / this->draw_rounding * this->draw_rounding;
-    lv_area_t area{.x1 = col, .y1 = row, .x2 = col + size - 1, .y2 = row + size - 1};
+    lv_area_t area{col, row, col + size - 1, row + size - 1};
     // clip to display bounds just in case
-    if (area.x2 >= width)
-      area.x2 = width - 1;
-    if (area.y2 >= height)
-      area.y2 = height - 1;
+    if (area.x2 >= this->width_)
+      area.x2 = this->width_ - 1;
+    if (area.y2 >= this->height_)
+      area.y2 = this->height_ - 1;
 
     // line_len can't exceed 1024, and minimum buffer size is 2048, so this won't overflow the buffer
     size_t line_len = lv_area_get_width(&area) * lv_area_get_height(&area) / 2;
     for (size_t i = 0; i != line_len; i++) {
-      reinterpret_cast<uint32_t *>(this->draw_buf_)[i] = random_uint32();
+      ((uint32_t *) (this->draw_buf_))[i] = random_uint32();
     }
-    this->draw_buffer_(&area, reinterpret_cast<lv_color_data *>(this->draw_buf_));
+    this->draw_buffer_(&area, (lv_color_data *) this->draw_buf_);
   }
 }
 

esphome/components/lvgl/lvgl_esphome.h

@@ -76,23 +76,16 @@ inline void lv_style_set_text_font(lv_style_t *style, const font::Font *font) {
 }
 #endif
 #if defined(USE_LVGL_IMAGE) && defined(USE_IMAGE)
-#if LV_USE_IMAGE
-// Shortcut / overload, so that the source of an image widget can easily be updated from within a lambda.
-inline void lv_image_set_src(lv_obj_t *obj, image::Image *image) { ::lv_image_set_src(obj, image->get_lv_image_dsc()); }
-#endif  // LV_USE_IMAGE
+// Shortcut / overload, so that the source of an image can easily be updated
+// from within a lambda.
+inline void lv_image_set_src(lv_obj_t *obj, image::Image *image) { lv_image_set_src(obj, image->get_lv_image_dsc()); }
 
 inline void lv_obj_set_style_bitmap_mask_src(lv_obj_t *obj, image::Image *image, lv_style_selector_t selector) {
-  ::lv_obj_set_style_bitmap_mask_src(obj, image->get_lv_image_dsc(), selector);
+  lv_obj_set_style_bitmap_mask_src(obj, image->get_lv_image_dsc(), selector);
 }
 
 inline void lv_obj_set_style_bg_image_src(lv_obj_t *obj, image::Image *image, lv_style_selector_t selector) {
-  ::lv_obj_set_style_bg_image_src(obj, image->get_lv_image_dsc(), selector);
-}
-inline void lv_style_set_bg_image_src(lv_style_t *style, image::Image *image) {
-  ::lv_style_set_bg_image_src(style, image->get_lv_image_dsc());
-}
-inline void lv_style_set_bitmap_mask_src(lv_style_t *style, image::Image *image) {
-  ::lv_style_set_bitmap_mask_src(style, image->get_lv_image_dsc());
+  lv_obj_set_style_bg_image_src(obj, image->get_lv_image_dsc(), selector);
 }
 #endif  // USE_LVGL_IMAGE
 #ifdef USE_LVGL_ANIMIMG

esphome/components/lvgl/widgets/arc.py

@@ -77,11 +77,8 @@ class ArcType(NumberType):
                 # start_angle and end_angle are mapped to bg_start_angle and bg_end_angle
                 prop = str(prop)
                 if prop.endswith("_angle"):
-                    await w.set_property(
-                        "bg_" + prop, await validator.process(config.get(prop))
-                    )
-                else:
-                    await w.set_property(prop, config, processor=validator)
+                    prop = "bg_" + prop
+                await w.set_property(prop, config, processor=validator)
         if CONF_ADJUSTABLE in config:
             if not config[CONF_ADJUSTABLE]:
                 lv_obj.remove_style(w.obj, nullptr, LV_PART.KNOB)

esphome/components/lvgl/widgets/keyboard.py

@@ -52,23 +52,19 @@ class KeyboardType(WidgetType):
         if mode := config.get(CONF_MODE):
             await w.set_property(CONF_MODE, await KEYBOARD_MODES.process(mode))
         if textarea := config.get(CONF_TEXTAREA):
-            if not is_widget_completed(textarea):
-                # Can only happen for an initial config, where the keyboard is configured before the
-                # textarea, so it's ok to always emit into the global context
-                async def add_textarea():
-                    async with LvContext():
-                        await w.set_property(
-                            CONF_TEXTAREA,
-                            (await get_widgets(config, CONF_TEXTAREA))[0].obj,
-                        )
+            # If a textarea is configured, it must be generated before the keyboard can attach it.
+            # If not yet configured, defer the attachment code.
 
-                CORE.add_job(add_textarea)
+            async def add_textarea():
+                async with LvContext():
+                    await w.set_property(
+                        CONF_TEXTAREA, (await get_widgets(config, CONF_TEXTAREA))[0].obj
+                    )
+
+            if is_widget_completed(textarea):
+                await add_textarea()
             else:
-                # Handles updates in automations, and properly ordered initial config. Code is generated
-                # into the enclosing context (main or lambda)
-                await w.set_property(
-                    CONF_TEXTAREA, (await get_widgets(config, CONF_TEXTAREA))[0].obj
-                )
+                CORE.add_job(add_textarea)
 
 
 keyboard_spec = KeyboardType()

esphome/components/micro_wake_word/__init__.py

@@ -454,12 +454,12 @@ async def to_code(config):
     # Pin esp-nn for stable future builds (esp-tflite-micro depends on esp-nn)
     esp32.add_idf_component(name="espressif/esp-nn", ref="1.1.2")
 
-    esp32.add_idf_component(name="esphome/esp-micro-speech-features", ref="1.2.3")
-
     cg.add_build_flag("-DTF_LITE_STATIC_MEMORY")
     cg.add_build_flag("-DTF_LITE_DISABLE_X86_NEON")
     cg.add_build_flag("-DESP_NN")
 
+    cg.add_library("kahrendt/ESPMicroSpeechFeatures", "1.1.0")
+
     if vad_model := config.get(CONF_VAD):
         cg.add_define("USE_MICRO_WAKE_WORD_VAD")
 

esphome/components/mipi_dsi/models/seeed.py

@@ -1,29 +0,0 @@
-from esphome.components.mipi import DriverChip
-import esphome.config_validation as cv
-
-# Standalone display
-# Product page: https://www.seeedstudio.com/reTerminal-D1001-p-6729.html
-DriverChip(
-    "SEEED-RETERMINAL-D1001",
-    height=1280,
-    width=800,
-    hsync_back_porch=20,
-    hsync_pulse_width=20,
-    hsync_front_porch=40,
-    vsync_back_porch=12,
-    vsync_pulse_width=4,
-    vsync_front_porch=30,
-    pclk_frequency="80MHz",
-    lane_bit_rate="1.5Gbps",
-    swap_xy=cv.UNDEFINED,
-    color_order="RGB",
-    enable_pin=[{"xl9535": None, "number": 0}, {"xl9535": None, "number": 7}],
-    reset_pin={"xl9535": None, "number": 2},
-    initsequence=(
-        (0xE0, 0x00),
-        (0xE1, 0x93),
-        (0xE2, 0x65),
-        (0xE3, 0xF8),
-        (0x80, 0x01),
-    ),
-)

esphome/components/mipi_rgb/models/sunton.py

@@ -1,51 +0,0 @@
-from esphome.components.mipi import DriverChip
-from esphome.config_validation import UNDEFINED
-
-# fmt: off
-sunton = DriverChip(
-    "ESP32-8048S070",
-    swap_xy=UNDEFINED,
-    initsequence=(),
-    width=800,
-    height=480,
-    pclk_frequency="12.5MHz",
-    de_pin=41,
-    hsync_pin=39,
-    vsync_pin=40,
-    pclk_pin=42,
-    hsync_pulse_width=30,
-    hsync_back_porch=16,
-    hsync_front_porch=210,
-    vsync_pulse_width=13,
-    vsync_back_porch=10,
-    vsync_front_porch=22,
-    data_pins={
-        "red": [14, 21, 47, 48, 45],
-        "green": [9, 46, 3, 8, 16, 1],
-        "blue": [15, 7, 6, 5, 4],
-    },
-)
-
-sunton.extend(
-    "ESP32-8048S050",
-    swap_xy=UNDEFINED,
-    initsequence=(),
-    width=800,
-    height=480,
-    pclk_frequency="16MHz",
-    de_pin=40,
-    hsync_pin=39,
-    vsync_pin=41,
-    pclk_pin=42,
-    hsync_back_porch=8,
-    hsync_front_porch=8,
-    hsync_pulse_width=4,
-    vsync_back_porch=8,
-    vsync_front_porch=8,
-    vsync_pulse_width=4,
-    data_pins={
-        "red": [45, 48, 47, 21, 14],
-        "green": [5, 6, 7, 15, 16, 4],
-        "blue": [8, 3, 46, 9, 1],
-    },
-)

esphome/components/mipi_spi/display.py

@@ -195,7 +195,7 @@ def model_schema(config):
                     "big_endian", "little_endian", lower=True
                 ),
                 model.option(CONF_COLOR_DEPTH, 16): cv.one_of(*color_depth, lower=True),
-                model.option(CONF_DRAW_ROUNDING, 1): power_of_two,
+                model.option(CONF_DRAW_ROUNDING, 2): power_of_two,
                 model.option(CONF_PIXEL_MODE, DISPLAY_16BIT): cv.one_of(
                     *pixel_modes, lower=True
                 ),
@@ -297,9 +297,9 @@ def _final_validate(config):
 
         buffer_size = color_depth // 8 * width * height // frac
         # Target a buffer size of 20kB, except for large displays, which shouldn't end up here
-        fraction = min(20000.0, buffer_size // 4) / buffer_size
+        fraction = min(20000.0, buffer_size // 16) / buffer_size
         config[CONF_BUFFER_SIZE] = 1.0 / next(
-            (x for x in range(2, 8) if fraction >= 1 / x), 8
+            x for x in range(2, 17) if fraction >= 1 / x
         )
 
 

esphome/components/mipi_spi/mipi_spi.h

@@ -546,12 +546,13 @@ class MipiSpiBuffer : public MipiSpi<BUFFERTYPE, BUFFERPIXEL, IS_BIG_ENDIAN, DIS
     }
     // for updates with a small buffer, we repeatedly call the writer_ function, clipping the height to a fraction of
     // the display height,
-    auto increment = (this->get_height_internal() / FRACTION / ROUNDING) * ROUNDING;
-    for (this->start_line_ = 0; this->start_line_ < this->get_height_internal(); this->start_line_ = this->end_line_) {
+    for (this->start_line_ = 0; this->start_line_ < this->get_height_internal();
+         this->start_line_ += this->get_height_internal() / FRACTION) {
 #if ESPHOME_LOG_LEVEL == ESPHOME_LOG_LEVEL_VERBOSE
       auto lap = millis();
 #endif
-      this->end_line_ = clamp_at_most(this->start_line_ + increment, this->get_height_internal());
+      this->end_line_ =
+          clamp_at_most(this->start_line_ + this->get_height_internal() / FRACTION, this->get_height_internal());
       if (this->auto_clear_enabled_) {
         this->clear();
       }
@@ -573,13 +574,12 @@ class MipiSpiBuffer : public MipiSpi<BUFFERTYPE, BUFFERPIXEL, IS_BIG_ENDIAN, DIS
       // Some chips require that the drawing window be aligned on certain boundaries
       this->x_low_ = this->x_low_ / ROUNDING * ROUNDING;
       this->y_low_ = this->y_low_ / ROUNDING * ROUNDING;
-      this->x_high_ = round_buffer(this->x_high_ + 1) - 1;
-      this->y_high_ = clamp_at_most(round_buffer(this->y_high_ + 1) - 1, this->end_line_ - 1);
+      this->x_high_ = (this->x_high_ + ROUNDING) / ROUNDING * ROUNDING - 1;
+      this->y_high_ = (this->y_high_ + ROUNDING) / ROUNDING * ROUNDING - 1;
       int w = this->x_high_ - this->x_low_ + 1;
       int h = this->y_high_ - this->y_low_ + 1;
       this->write_to_display_(this->x_low_, this->y_low_, w, h, this->buffer_, this->x_low_,
-                              this->y_low_ - this->start_line_,
-                              round_buffer(this->get_width_internal()) - w - this->x_low_);
+                              this->y_low_ - this->start_line_, round_buffer(this->get_width_internal()) - w);
       // invalidate watermarks
       this->x_low_ = this->get_width_internal();
       this->y_low_ = this->get_height_internal();

esphome/components/mipi_spi/models/cyd.py

@@ -1,6 +1,4 @@
-from esphome.const import CONF_IGNORE_STRAPPING_WARNING, CONF_NUMBER
-
-from .ili import GC9A01A, ILI9341, ILI9342, ST7789V
+from .ili import ILI9341, ILI9342, ST7789V
 
 ILI9341.extend(
     # ESP32-2432S028 CYD board with Micro USB, has ILI9341 controller
@@ -45,10 +43,3 @@ ILI9342.extend(
         (0xE1, 0x00, 0x0B, 0x11, 0x05, 0x13, 0x09, 0x33, 0x67, 0x48, 0x07, 0x0E, 0x0B, 0x23, 0x33, 0x0F),  # Negative Gamma Correction
     )
 )
-
-GC9A01A.extend(
-    "ESP32-2424S012",
-    invert_colors=True,
-    cs_pin=10,
-    dc_pin={CONF_NUMBER: 2, CONF_IGNORE_STRAPPING_WARNING: True},
-)

esphome/components/mipi_spi/models/ili.py

@@ -555,7 +555,7 @@ ST7789V = DriverChip(
         ),
     ),
 )
-GC9A01A = DriverChip(
+DriverChip(
     "GC9A01A",
     mirror_x=True,
     width=240,

esphome/components/mipi_spi/models/waveshare.py

@@ -15,7 +15,7 @@ from esphome.components.mipi import (
 import esphome.config_validation as cv
 
 from .amoled import CO5300
-from .ili import ILI9488_A, ST7789V
+from .ili import ILI9488_A
 from .jc import AXS15231
 
 DriverChip(
@@ -243,15 +243,3 @@ ST7789P.extend(
         ),
     ),
 )
-
-ST7789V.extend(
-    "WAVESHARE-ESP32-C6-LCD-1.47",
-    width=172,
-    height=320,
-    offset_width=34,
-    invert_colors=True,
-    data_rate="40MHz",
-    reset_pin=21,
-    cs_pin=14,
-    dc_pin={"number": 15, "ignore_strapping_warning": True},
-)

esphome/components/mitsubishi_cn105/mitsubishi_cn105_climate.cpp

@@ -7,7 +7,7 @@ namespace esphome::mitsubishi_cn105 {
 static const char *const TAG = "mitsubishi_cn105.climate";
 
 static constexpr std::array MODE_MAP{
-    std::pair{MitsubishiCN105::Mode::AUTO, climate::CLIMATE_MODE_HEAT_COOL},
+    std::pair{MitsubishiCN105::Mode::AUTO, climate::CLIMATE_MODE_AUTO},
     std::pair{MitsubishiCN105::Mode::HEAT, climate::CLIMATE_MODE_HEAT},
     std::pair{MitsubishiCN105::Mode::DRY, climate::CLIMATE_MODE_DRY},
     std::pair{MitsubishiCN105::Mode::COOL, climate::CLIMATE_MODE_COOL},
@@ -76,13 +76,23 @@ void MitsubishiCN105Climate::loop() {
 climate::ClimateTraits MitsubishiCN105Climate::traits() {
   climate::ClimateTraits traits;
 
-  for (const auto &p : MODE_MAP) {
-    traits.add_supported_mode(p.second);
-  }
+  traits.set_supported_modes({
+      climate::CLIMATE_MODE_OFF,
+      climate::CLIMATE_MODE_COOL,
+      climate::CLIMATE_MODE_HEAT,
+      climate::CLIMATE_MODE_DRY,
+      climate::CLIMATE_MODE_FAN_ONLY,
+      climate::CLIMATE_MODE_AUTO,
+  });
 
-  for (const auto &p : FAN_MODE_MAP) {
-    traits.add_supported_fan_mode(p.second);
-  }
+  traits.set_supported_fan_modes({
+      climate::CLIMATE_FAN_AUTO,
+      climate::CLIMATE_FAN_QUIET,
+      climate::CLIMATE_FAN_LOW,
+      climate::CLIMATE_FAN_MEDIUM,
+      climate::CLIMATE_FAN_MIDDLE,
+      climate::CLIMATE_FAN_HIGH,
+  });
 
   traits.set_visual_min_temperature(16.0f);
   traits.set_visual_max_temperature(31.0f);

esphome/components/modbus/modbus_helpers.cpp

@@ -5,29 +5,6 @@ namespace esphome::modbus::helpers {
 
 static const char *const TAG = "modbus_helpers";
 
-static size_t required_payload_size(SensorValueType sensor_value_type) {
-  switch (sensor_value_type) {
-    case SensorValueType::U_WORD:
-    case SensorValueType::S_WORD:
-      return 2;
-    case SensorValueType::U_DWORD:
-    case SensorValueType::FP32:
-    case SensorValueType::U_DWORD_R:
-    case SensorValueType::FP32_R:
-    case SensorValueType::S_DWORD:
-    case SensorValueType::S_DWORD_R:
-      return 4;
-    case SensorValueType::U_QWORD:
-    case SensorValueType::S_QWORD:
-    case SensorValueType::U_QWORD_R:
-    case SensorValueType::S_QWORD_R:
-      return 8;
-    case SensorValueType::RAW:
-    default:
-      return 0;
-  }
-}
-
 void number_to_payload(std::vector<uint16_t> &data, int64_t value, SensorValueType value_type) {
   switch (value_type) {
     case SensorValueType::U_WORD:
@@ -70,70 +47,93 @@ int64_t payload_to_number(const std::vector<uint8_t> &data, SensorValueType sens
                           uint32_t bitmask) {
   int64_t value = 0;  // int64_t because it can hold signed and unsigned 32 bits
 
-  // Validate offset against the buffer for all types, including RAW/unsupported, so
-  // a malformed or misconfigured frame still produces an error log.
-  if (static_cast<size_t>(offset) > data.size()) {
-    ESP_LOGE(TAG, "not enough data for value type=%u offset=%u size=%zu", static_cast<unsigned int>(sensor_value_type),
-             static_cast<unsigned int>(offset), data.size());
-    return value;
-  }
-
-  const size_t required_size = required_payload_size(sensor_value_type);
-  if (required_size == 0) {
-    return value;
-  }
-
-  if (data.size() - offset < required_size) {
-    ESP_LOGE(TAG, "not enough data for value type=%u offset=%u size=%zu required=%zu",
-             static_cast<unsigned int>(sensor_value_type), static_cast<unsigned int>(offset), data.size(),
-             required_size);
+  if (offset > data.size()) {
+    ESP_LOGE(TAG, "not enough data for value");
     return value;
   }
 
+  size_t size = data.size() - offset;
+  bool error = false;
   switch (sensor_value_type) {
     case SensorValueType::U_WORD:
-      value = mask_and_shift_by_rightbit(get_data<uint16_t>(data, offset), bitmask);  // default is 0xFFFF ;
+      if (size >= 2) {
+        value = mask_and_shift_by_rightbit(get_data<uint16_t>(data, offset),
+                                           bitmask);  // default is 0xFFFF ;
+      } else {
+        error = true;
+      }
       break;
     case SensorValueType::U_DWORD:
     case SensorValueType::FP32:
-      value = get_data<uint32_t>(data, offset);
-      value = mask_and_shift_by_rightbit((uint32_t) value, bitmask);
+      if (size >= 4) {
+        value = get_data<uint32_t>(data, offset);
+        value = mask_and_shift_by_rightbit((uint32_t) value, bitmask);
+      } else {
+        error = true;
+      }
       break;
     case SensorValueType::U_DWORD_R:
     case SensorValueType::FP32_R:
-      value = get_data<uint32_t>(data, offset);
-      value = static_cast<uint32_t>(value & 0xFFFF) << 16 | (value & 0xFFFF0000) >> 16;
-      value = mask_and_shift_by_rightbit((uint32_t) value, bitmask);
+      if (size >= 4) {
+        value = get_data<uint32_t>(data, offset);
+        value = static_cast<uint32_t>(value & 0xFFFF) << 16 | (value & 0xFFFF0000) >> 16;
+        value = mask_and_shift_by_rightbit((uint32_t) value, bitmask);
+      } else {
+        error = true;
+      }
       break;
     case SensorValueType::S_WORD:
-      value = mask_and_shift_by_rightbit(get_data<int16_t>(data, offset), bitmask);  // default is 0xFFFF ;
+      if (size >= 2) {
+        value = mask_and_shift_by_rightbit(get_data<int16_t>(data, offset),
+                                           bitmask);  // default is 0xFFFF ;
+      } else {
+        error = true;
+      }
       break;
     case SensorValueType::S_DWORD:
-      value = mask_and_shift_by_rightbit(get_data<int32_t>(data, offset), bitmask);
+      if (size >= 4) {
+        value = mask_and_shift_by_rightbit(get_data<int32_t>(data, offset), bitmask);
+      } else {
+        error = true;
+      }
       break;
     case SensorValueType::S_DWORD_R: {
-      value = get_data<uint32_t>(data, offset);
-      // Currently the high word is at the low position
-      // the sign bit is therefore at low before the switch
-      uint32_t sign_bit = (value & 0x8000) << 16;
-      value = mask_and_shift_by_rightbit(
-          static_cast<int32_t>(((value & 0x7FFF) << 16 | (value & 0xFFFF0000) >> 16) | sign_bit), bitmask);
+      if (size >= 4) {
+        value = get_data<uint32_t>(data, offset);
+        // Currently the high word is at the low position
+        // the sign bit is therefore at low before the switch
+        uint32_t sign_bit = (value & 0x8000) << 16;
+        value = mask_and_shift_by_rightbit(
+            static_cast<int32_t>(((value & 0x7FFF) << 16 | (value & 0xFFFF0000) >> 16) | sign_bit), bitmask);
+      } else {
+        error = true;
+      }
     } break;
     case SensorValueType::U_QWORD:
     case SensorValueType::S_QWORD:
       // Ignore bitmask for QWORD
-      value = get_data<uint64_t>(data, offset);
+      if (size >= 8) {
+        value = get_data<uint64_t>(data, offset);
+      } else {
+        error = true;
+      }
       break;
     case SensorValueType::U_QWORD_R:
     case SensorValueType::S_QWORD_R: {
       // Ignore bitmask for QWORD
-      uint64_t tmp = get_data<uint64_t>(data, offset);
-      value = (tmp << 48) | (tmp >> 48) | ((tmp & 0xFFFF0000) << 16) | ((tmp >> 16) & 0xFFFF0000);
+      if (size >= 8) {
+        uint64_t tmp = get_data<uint64_t>(data, offset);
+        value = (tmp << 48) | (tmp >> 48) | ((tmp & 0xFFFF0000) << 16) | ((tmp >> 16) & 0xFFFF0000);
+      } else {
+        error = true;
+      }
     } break;
     case SensorValueType::RAW:
     default:
       break;
   }
+  if (error)
+    ESP_LOGE(TAG, "not enough data for value");
   return value;
 }
 }  // namespace esphome::modbus::helpers

esphome/components/nextion/nextion.cpp

@@ -36,9 +36,8 @@ bool Nextion::send_command_(const std::string &command) {
   }
 
 #ifdef USE_NEXTION_COMMAND_SPACING
-  const uint32_t now = App.get_loop_component_start_time();
-  if (!this->connection_state_.ignore_is_setup_ && !this->command_pacer_.can_send(now)) {
-    ESP_LOGN(TAG, "Command spacing: delaying '%s'", command.c_str());
+  if (!this->connection_state_.ignore_is_setup_ && !this->command_pacer_.can_send()) {
+    ESP_LOGN(TAG, "Command spacing: delaying command '%s'", command.c_str());
     return false;
   }
 #endif  // USE_NEXTION_COMMAND_SPACING
@@ -49,16 +48,6 @@ bool Nextion::send_command_(const std::string &command) {
   const uint8_t to_send[3] = {0xFF, 0xFF, 0xFF};
   this->write_array(to_send, sizeof(to_send));
 
-#ifdef USE_NEXTION_COMMAND_SPACING
-  // Mark sent immediately after writing to UART. The pacer enforces inter-command
-  // spacing from the transmit side. Marking on ACK (0x01) would leave last_command_time_
-  // at zero indefinitely, making can_send() always return true and spacing a no-op.
-  // ignore_is_setup_ commands (setup/init sequence) bypass spacing intentionally.
-  if (!this->connection_state_.ignore_is_setup_) {
-    this->command_pacer_.mark_sent(now);
-  }
-#endif  // USE_NEXTION_COMMAND_SPACING
-
   return true;
 }
 
@@ -264,8 +253,11 @@ bool Nextion::send_command(const char *command) {
   if ((!this->is_setup() && !this->connection_state_.ignore_is_setup_) || this->is_sleeping())
     return false;
 
-  this->add_no_result_to_queue_with_command_("command", command);
-  return true;
+  if (this->send_command_(command)) {
+    this->add_no_result_to_queue_("command");
+    return true;
+  }
+  return false;
 }
 
 bool Nextion::send_command_printf(const char *format, ...) {
@@ -282,8 +274,11 @@ bool Nextion::send_command_printf(const char *format, ...) {
     return false;
   }
 
-  this->add_no_result_to_queue_with_command_("command_printf", buffer);
-  return true;
+  if (this->send_command_(buffer)) {
+    this->add_no_result_to_queue_("command_printf");
+    return true;
+  }
+  return false;
 }
 
 #ifdef NEXTION_PROTOCOL_LOG
@@ -354,43 +349,25 @@ void Nextion::loop() {
   }
 
 #ifdef USE_NEXTION_COMMAND_SPACING
+  // Try to send any pending commands if spacing allows
   this->process_pending_in_queue_();
-#ifdef USE_NEXTION_WAVEFORM
-  if (!this->waveform_queue_.empty()) {
-    this->check_pending_waveform_();
-  }
-#endif  // USE_NEXTION_WAVEFORM
 #endif  // USE_NEXTION_COMMAND_SPACING
 }
 
 #ifdef USE_NEXTION_COMMAND_SPACING
 void Nextion::process_pending_in_queue_() {
-#ifdef USE_NEXTION_MAX_COMMANDS_PER_LOOP
-  size_t commands_sent = 0;
-#endif  // USE_NEXTION_MAX_COMMANDS_PER_LOOP
+  if (this->nextion_queue_.empty() || !this->command_pacer_.can_send()) {
+    return;
+  }
 
-  for (auto *item : this->nextion_queue_) {
-    if (item == nullptr || item->pending_command.empty()) {
-      continue;  // Already sent, waiting for ACK — skip, don't stop
+  // Check if first item in queue has a pending command
+  auto *front_item = this->nextion_queue_.front();
+  if (front_item && !front_item->pending_command.empty()) {
+    if (this->send_command_(front_item->pending_command)) {
+      // Command sent successfully, clear the pending command
+      front_item->pending_command.clear();
+      ESP_LOGVV(TAG, "Pending command sent: %s", front_item->component->get_variable_name().c_str());
     }
-
-#ifdef USE_NEXTION_MAX_COMMANDS_PER_LOOP
-    if (++commands_sent > this->max_commands_per_loop_) {
-      ESP_LOGV(TAG, "Pending cmds: loop limit reached, deferring");
-      break;
-    }
-#endif  // USE_NEXTION_MAX_COMMANDS_PER_LOOP
-
-    const uint32_t now = App.get_loop_component_start_time();
-    if (!this->command_pacer_.can_send(now)) {
-      break;  // Spacing not elapsed, stop for this loop iteration
-    }
-
-    if (!this->send_command_(item->pending_command)) {
-      break;  // Unexpected send failure, stop
-    }
-    item->pending_command.clear();
-    ESP_LOGVV(TAG, "Pending cmd sent: %s", item->component->get_variable_name().c_str());
   }
 }
 #endif  // USE_NEXTION_COMMAND_SPACING
@@ -493,6 +470,10 @@ void Nextion::process_nextion_commands_() {
             this->setup_callback_.call();
           }
         }
+#ifdef USE_NEXTION_COMMAND_SPACING
+        this->command_pacer_.mark_sent();  // Here is where we should mark the command as sent
+        ESP_LOGN(TAG, "Command spacing: marked command sent");
+#endif
         break;
       case 0x02:  // invalid Component ID or name was used
         ESP_LOGW(TAG, "Invalid component ID/name");
@@ -1098,18 +1079,10 @@ void Nextion::add_no_result_to_queue_(const std::string &variable_name) {
 }
 
 /**
- * @brief Send a command and enqueue it for response tracking.
+ * @brief
  *
- * Callers are responsible for checking is_sleeping() before calling this
- * method. The sleep guard is deliberately absent here because some callers
- * (e.g. add_no_result_to_queue_with_ignore_sleep_printf_()) are explicitly
- * sleep-safe and must bypass it.
- *
- * If USE_NEXTION_COMMAND_SPACING is enabled and the pacer is not ready,
- * the command is saved in the queue entry for retry rather than dropped.
- *
- * @param variable_name Name of the variable or component associated with the command.
- * @param command       The raw command string to send.
+ * @param variable_name Variable name for the queue
+ * @param command
  */
 void Nextion::add_no_result_to_queue_with_command_(const std::string &variable_name, const std::string &command) {
   if ((!this->is_setup() && !this->connection_state_.ignore_is_setup_) || command.empty())
@@ -1290,22 +1263,9 @@ void Nextion::add_to_get_queue(NextionComponentBase *component) {
 
   std::string command = "get " + component->get_variable_name_to_send();
 
-#ifdef USE_NEXTION_COMMAND_SPACING
-  // Always enqueue first so the response handler is present when the command
-  // is eventually sent. Store the command for retry if spacing blocked it;
-  // process_pending_in_queue_() will transmit it when the pacer allows.
-  nextion_queue->pending_command = command;
-  this->nextion_queue_.push_back(nextion_queue);
-  if (this->send_command_(command)) {
-    nextion_queue->pending_command.clear();
-  }
-#else   // USE_NEXTION_COMMAND_SPACING
   if (this->send_command_(command)) {
     this->nextion_queue_.push_back(nextion_queue);
-  } else {
-    delete nextion_queue;  // NOLINT(cppcoreguidelines-owning-memory)
   }
-#endif  // USE_NEXTION_COMMAND_SPACING
 }
 
 #ifdef USE_NEXTION_WAVEFORM
@@ -1349,10 +1309,10 @@ void Nextion::check_pending_waveform_() {
   char command[24];  // "addt " + uint8 + "," + uint8 + "," + uint8 + null = max 17 chars
   buf_append_printf(command, sizeof(command), 0, "addt %u,%u,%zu", component->get_component_id(),
                     component->get_wave_channel_id(), buffer_to_send);
-  // If spacing or setup state blocks the send, leave the entry at the front
-  // of waveform_queue_ for retry on the next loop iteration via
-  // check_pending_waveform_(). Only pop on a successful send.
-  this->send_command_(command);
+  if (!this->send_command_(command)) {
+    delete nb;  // NOLINT(cppcoreguidelines-owning-memory)
+    this->waveform_queue_.pop();
+  }
 }
 #endif  // USE_NEXTION_WAVEFORM
 

esphome/components/nextion/nextion.h

@@ -55,20 +55,15 @@ class NextionCommandPacer {
   uint8_t get_spacing() const { return spacing_ms_; }
 
   /**
-   * @brief Check if enough time has passed to send the next command.
-   * @param now Current timestamp in milliseconds (use App.get_loop_component_start_time()
-   *            for consistency with the rest of the queue timing).
-   * @return true if the spacing interval has elapsed since the last command was sent.
+   * @brief Check if enough time has passed to send next command
+   * @return true if enough time has passed since last command
    */
-  bool can_send(uint32_t now) const { return (now - last_command_time_) >= spacing_ms_; }
+  bool can_send() const { return (millis() - last_command_time_) >= spacing_ms_; }
 
   /**
-   * @brief Record the transmit timestamp for the most recently sent command.
-   * @param now Current timestamp in milliseconds, as returned by
-   *            App.get_loop_component_start_time(). Must use the same clock
-   *            source as can_send() to avoid unsigned underflow.
+   * @brief Mark a command as sent, updating the timing
    */
-  void mark_sent(uint32_t now) { last_command_time_ = now; }
+  void mark_sent() { last_command_time_ = millis(); }
 
  private:
   uint8_t spacing_ms_;

esphome/components/packages/__init__.py

@@ -8,11 +8,8 @@ from typing import Any
 from esphome import git, yaml_util
 from esphome.components.substitutions import (
     ContextVars,
-    ErrList,
     push_context,
-    raise_first_undefined,
     resolve_include,
-    resolve_substitutions_block,
     substitute,
 )
 from esphome.components.substitutions.jinja import has_jinja
@@ -42,11 +39,6 @@ DOMAIN = CONF_PACKAGES
 # Guard against infinite include chains (e.g. A includes B includes A).
 MAX_INCLUDE_DEPTH = 20
 
-PackageCallback = Callable[
-    [dict | str | yaml_util.IncludeFile, ContextVars | None, yaml_util.DocumentPath],
-    dict,
-]
-
 
 def is_remote_package(package_config: dict) -> bool:
     """Returns True if the package_config is a remote package definition."""
@@ -286,9 +278,8 @@ def _process_remote_package(config: dict, skip_update: bool = False) -> dict:
 
 def _walk_package_dict(
     packages: dict,
-    callback: PackageCallback,
+    callback: Callable[[dict, ContextVars | None], dict],
     context: ContextVars | None,
-    path: yaml_util.DocumentPath,
 ) -> cv.Invalid | None:
     """Iterate a packages dict in reverse priority order, invoking callback on each entry.
 
@@ -297,9 +288,7 @@ def _walk_package_dict(
     for package_name, package_config in reversed(packages.items()):
         with cv.prepend_path(package_name):
             try:
-                packages[package_name] = callback(
-                    package_config, context, path + [package_name]
-                )
+                packages[package_name] = callback(package_config, context)
             except cv.Invalid as err:
                 return err
     return None
@@ -307,22 +296,20 @@ def _walk_package_dict(
 
 def _walk_package_list(
     packages: list,
-    callback: PackageCallback,
+    callback: Callable[[dict, ContextVars | None], dict],
     context: ContextVars | None,
-    path: yaml_util.DocumentPath,
 ) -> None:
     """Iterate a packages list in reverse priority order, invoking callback on each entry."""
     for idx in reversed(range(len(packages))):
         with cv.prepend_path(idx):
-            packages[idx] = callback(packages[idx], context, path + [idx])
+            packages[idx] = callback(packages[idx], context)
 
 
 def _walk_packages(
     config: dict,
-    callback: PackageCallback,
+    callback: Callable[[dict, ContextVars | None], dict],
     context: ContextVars | None = None,
     validate_deprecated: bool = True,
-    path: yaml_util.DocumentPath | None = None,
 ) -> dict:
     """Walks the packages structure in priority order, invoking ``callback`` on each package definition found.
 
@@ -333,24 +320,19 @@ def _walk_packages(
     if CONF_PACKAGES not in config:
         return config
     packages = config[CONF_PACKAGES]
-    packages_path = (path or []) + [CONF_PACKAGES]
 
     with cv.prepend_path(CONF_PACKAGES):
         if isinstance(packages, yaml_util.IncludeFile):
             # If the packages key is an IncludeFile, resolve it first before processing.
-            packages = resolve_include(
-                packages, packages_path, context, strict_undefined=False
-            )
+            packages, _ = resolve_include(packages, [], context, strict_undefined=False)
         if not isinstance(packages, (dict, list)):
             raise cv.Invalid(
                 f"Packages must be a key to value mapping or list, got {type(packages)} instead"
             )
 
         if not isinstance(packages, dict):
-            _walk_package_list(packages, callback, context, packages_path)
-        elif (
-            result := _walk_package_dict(packages, callback, context, packages_path)
-        ) is not None:
+            _walk_package_list(packages, callback, context)
+        elif (result := _walk_package_dict(packages, callback, context)) is not None:
             if not validate_deprecated or any(
                 is_package_definition(v) for v in packages.values()
             ):
@@ -359,18 +341,14 @@ def _walk_packages(
             # This block can be removed once the single-package
             # deprecation period (2026.7.0) is over.
             config[CONF_PACKAGES] = [packages]
-            return _walk_packages(
-                deprecate_single_package(config), callback, context, path=path
-            )
+            return _walk_packages(deprecate_single_package(config), callback, context)
 
     config[CONF_PACKAGES] = packages
     return config
 
 
 def _substitute_package_definition(
-    package_config: dict | str,
-    context_vars: ContextVars | None,
-    path: yaml_util.DocumentPath | None = None,
+    package_config: dict | str, context_vars: ContextVars | None
 ) -> dict | str:
     """Substitute variables in a package definition string or remote package dict.
 
@@ -381,19 +359,12 @@ def _substitute_package_definition(
     if isinstance(package_config, str) or (
         isinstance(package_config, dict) and is_remote_package(package_config)
     ):
-        # Collect undefined-variable errors (rather than raising strict) so the
-        # path walked through a remote-package dict is preserved and the user
-        # sees which field (url / path / ref / ...) referenced the undefined
-        # variable.
-        errors: ErrList = []
         package_config = substitute(
             item=package_config,
-            path=path or [],
+            path=[],
             parent_context=context_vars or ContextVars(),
             strict_undefined=False,
-            errors=errors,
         )
-        raise_first_undefined(errors, "package definition")
     return package_config
 
 
@@ -451,7 +422,6 @@ class _PackageProcessor:
         self,
         package_config: dict | str | yaml_util.IncludeFile,
         context_vars: ContextVars | None,
-        path: yaml_util.DocumentPath,
     ) -> dict:
         """Resolve a package definition to a concrete ``dict`` and fetch remote packages.
 
@@ -474,15 +444,15 @@ class _PackageProcessor:
         """
         for _ in range(MAX_INCLUDE_DEPTH):
             if isinstance(package_config, yaml_util.IncludeFile):
-                package_config = resolve_include(
+                package_config, _ = resolve_include(
                     package_config,
-                    path,
+                    [],
                     context_vars or ContextVars(),
                     strict_undefined=False,
                 )
 
             package_config = _substitute_package_definition(
-                package_config, context_vars, path
+                package_config, context_vars
             )
             package_config = PACKAGE_SCHEMA(package_config)
             if isinstance(package_config, dict):
@@ -503,16 +473,13 @@ class _PackageProcessor:
             _update_substitutions_context(self.parent_context, subs)
 
     def process_package(
-        self,
-        package_config: dict | str,
-        context_vars: ContextVars | None,
-        path: yaml_util.DocumentPath,
+        self, package_config: dict | str, context_vars: ContextVars | None
     ) -> dict:
         """Resolve a single package and recurse into any nested packages."""
         from_remote = isinstance(package_config, dict) and is_remote_package(
             package_config
         )
-        package_config = self.resolve_package(package_config, context_vars, path)
+        package_config = self.resolve_package(package_config, context_vars)
         self.collect_substitutions(package_config)
 
         if CONF_PACKAGES not in package_config:
@@ -532,7 +499,6 @@ class _PackageProcessor:
             self.process_package,
             context_vars,
             validate_deprecated=not from_remote,
-            path=path,
         )
 
 
@@ -550,12 +516,7 @@ def do_packages_pass(
     if CONF_PACKAGES not in config:
         return config
 
-    with cv.prepend_path(CONF_SUBSTITUTIONS):
-        substitutions = UserDict(
-            resolve_substitutions_block(
-                config.pop(CONF_SUBSTITUTIONS, {}), command_line_substitutions
-            )
-        )
+    substitutions = UserDict(config.pop(CONF_SUBSTITUTIONS, {}))
     processor = _PackageProcessor(
         substitutions, command_line_substitutions, skip_update
     )
@@ -589,13 +550,11 @@ def merge_packages(config: dict) -> dict:
     merge_list: list[dict] = []
 
     def process_package_callback(
-        package_config: dict,
-        context: ContextVars | None,
-        path: yaml_util.DocumentPath | None = None,
+        package_config: dict, context: ContextVars | None
     ) -> dict:
         """This will be called for each package found in the config."""
         merge_list.append(package_config)
-        return _walk_packages(package_config, process_package_callback, path=path)
+        return _walk_packages(package_config, process_package_callback)
 
     _walk_packages(config, process_package_callback, validate_deprecated=False)
     # Merge all packages into the main config:

esphome/components/pcf85063/pcf85063.cpp

@@ -44,7 +44,7 @@ void PCF85063Component::read_time() {
       .year = uint16_t(pcf85063_.reg.year + 10u * pcf85063_.reg.year_10 + 2000),
   };
   rtc_time.recalc_timestamp_utc(false);
-  if (!rtc_time.is_valid(/*check_day_of_week=*/true, /*check_day_of_year=*/false)) {
+  if (!rtc_time.is_valid()) {
     ESP_LOGE(TAG, "Invalid RTC time, not syncing to system clock.");
     return;
   }

esphome/components/pcf8563/pcf8563.cpp

@@ -44,7 +44,7 @@ void PCF8563Component::read_time() {
       .year = uint16_t(pcf8563_.reg.year + 10u * pcf8563_.reg.year_10 + 2000),
   };
   rtc_time.recalc_timestamp_utc(false);
-  if (!rtc_time.is_valid(/*check_day_of_week=*/true, /*check_day_of_year=*/false)) {
+  if (!rtc_time.is_valid()) {
     ESP_LOGE(TAG, "Invalid RTC time, not syncing to system clock.");
     return;
   }

esphome/components/qmc5883l/qmc5883l.cpp

@@ -24,8 +24,6 @@ static const uint8_t QMC5883L_REGISTER_CONTROL_1 = 0x09;
 static const uint8_t QMC5883L_REGISTER_CONTROL_2 = 0x0A;
 static const uint8_t QMC5883L_REGISTER_PERIOD = 0x0B;
 
-void IRAM_ATTR QMC5883LComponent::gpio_intr(QMC5883LComponent *arg) { arg->enable_loop_soon_any_context(); }
-
 void QMC5883LComponent::setup() {
   // Soft Reset
   if (!this->write_byte(QMC5883L_REGISTER_CONTROL_2, 1 << 7)) {
@@ -37,12 +35,6 @@ void QMC5883LComponent::setup() {
 
   if (this->drdy_pin_) {
     this->drdy_pin_->setup();
-    if (this->drdy_pin_->is_internal()) {
-      static_cast<InternalGPIOPin *>(this->drdy_pin_)
-          ->attach_interrupt(&QMC5883LComponent::gpio_intr, this, gpio::INTERRUPT_RISING_EDGE);
-      this->drdy_use_isr_ = true;
-      this->stop_poller();
-    }
   }
 
   uint8_t control_1 = 0;
@@ -73,8 +65,8 @@ void QMC5883LComponent::setup() {
     return;
   }
 
-  if (!this->drdy_use_isr_ && this->get_update_interval() < App.get_loop_interval()) {
-    this->high_freq_.start();
+  if (this->get_update_interval() < App.get_loop_interval()) {
+    high_freq_.start();
   }
 }
 
@@ -92,39 +84,23 @@ void QMC5883LComponent::dump_config() {
   LOG_SENSOR("  ", "Heading", this->heading_sensor_);
   LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
   LOG_PIN("  DRDY Pin: ", this->drdy_pin_);
-  if (this->drdy_pin_ != nullptr) {
-    ESP_LOGCONFIG(TAG, "  DRDY mode: %s",
-                  this->drdy_use_isr_ ? LOG_STR_LITERAL("interrupt") : LOG_STR_LITERAL("polling"));
-  }
 }
 
 void QMC5883LComponent::update() {
-  // If DRDY is on an external expander we keep the polling path and early-return
-  // if data is not ready yet. Internal DRDY pins take the ISR path via loop().
+  i2c::ErrorCode err;
+  uint8_t status = false;
+
+  // If DRDY pin is configured and the data is not ready return.
   if (this->drdy_pin_ && !this->drdy_pin_->digital_read()) {
     return;
   }
-  this->read_sensor_();
-}
-
-void QMC5883LComponent::loop() {
-  this->disable_loop();
-  if (!this->drdy_use_isr_ || !this->drdy_pin_->digital_read()) {
-    return;
-  }
-  this->read_sensor_();
-}
-
-void QMC5883LComponent::read_sensor_() {
-  i2c::ErrorCode err;
-  uint8_t status = false;
 
   // Status byte gets cleared when data is read, so we have to read this first.
   // If status and two axes are desired, it's possible to save one byte of traffic by enabling
   // ROL_PNT in setup and reading 7 bytes starting at the status register.
   // If status and all three axes are desired, using ROL_PNT saves you 3 bytes.
   // But simply not reading status saves you 4 bytes always and is much simpler.
-  if (ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERBOSE) {
+  if (ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_DEBUG) {
     err = this->read_register(QMC5883L_REGISTER_STATUS, &status, 1);
     if (err != i2c::ERROR_OK) {
       char buf[32];
@@ -189,7 +165,7 @@ void QMC5883LComponent::read_sensor_() {
     temp = int16_t(raw_temp) * 0.01f;
   }
 
-  ESP_LOGV(TAG, "Got x=%0.02fµT y=%0.02fµT z=%0.02fµT heading=%0.01f° temperature=%0.01f°C status=%u", x, y, z, heading,
+  ESP_LOGD(TAG, "Got x=%0.02fµT y=%0.02fµT z=%0.02fµT heading=%0.01f° temperature=%0.01f°C status=%u", x, y, z, heading,
            temp, status);
 
   if (this->x_sensor_ != nullptr)

esphome/components/qmc5883l/qmc5883l.h

@@ -32,7 +32,6 @@ class QMC5883LComponent : public PollingComponent, public i2c::I2CDevice {
   void setup() override;
   void dump_config() override;
   void update() override;
-  void loop() override;
 
   void set_drdy_pin(GPIOPin *pin) { drdy_pin_ = pin; }
   void set_datarate(QMC5883LDatarate datarate) { datarate_ = datarate; }
@@ -45,9 +44,6 @@ class QMC5883LComponent : public PollingComponent, public i2c::I2CDevice {
   void set_temperature_sensor(sensor::Sensor *temperature_sensor) { temperature_sensor_ = temperature_sensor; }
 
  protected:
-  static void IRAM_ATTR gpio_intr(QMC5883LComponent *arg);
-  void read_sensor_();
-
   QMC5883LDatarate datarate_{QMC5883L_DATARATE_10_HZ};
   QMC5883LRange range_{QMC5883L_RANGE_200_UT};
   QMC5883LOversampling oversampling_{QMC5883L_SAMPLING_512};
@@ -57,7 +53,6 @@ class QMC5883LComponent : public PollingComponent, public i2c::I2CDevice {
   sensor::Sensor *heading_sensor_{nullptr};
   sensor::Sensor *temperature_sensor_{nullptr};
   GPIOPin *drdy_pin_{nullptr};
-  bool drdy_use_isr_{false};
   enum ErrorCode {
     NONE = 0,
     COMMUNICATION_FAILED,

esphome/components/rtl87xx/__init__.py

@@ -65,8 +65,3 @@ async def to_code(config):
 @pins.PIN_SCHEMA_REGISTRY.register("rtl87xx", PIN_SCHEMA)
 async def pin_to_code(config):
     return await libretiny.gpio.component_pin_to_code(config)
-
-
-# Called by writer.py; delegates to the shared libretiny implementation.
-def copy_files() -> None:
-    libretiny.copy_files()

esphome/components/rtttl/rtttl.cpp

@@ -294,59 +294,57 @@ void Rtttl::play(std::string rtttl) {
   }
   ESP_LOGD(TAG, "Playing song %.*s", (int) this->position_, this->rtttl_.c_str());
 
-  size_t name_end_position = this->position_;
-  size_t control_end = this->rtttl_.find(':', name_end_position + 1);
-  if (control_end == std::string::npos) {
-    ESP_LOGE(TAG, "Missing second ':'");
+  // Get default duration
+  this->position_ = this->rtttl_.find("d=", this->position_);
+  if (this->position_ == std::string::npos) {
+    ESP_LOGE(TAG, "Missing 'd='");
+    return;
+  }
+  this->position_ += 2;
+  num = this->get_integer_();
+  if (num == 1 || num == 2 || num == 4 || num == 8 || num == 16 || num == 32) {
+    this->default_note_denominator_ = num;
+  } else {
+    ESP_LOGE(TAG, "Invalid default duration: %d", num);
     return;
   }
 
-  // Get default duration
-  size_t pos = this->rtttl_.find("d=", name_end_position);
-  if (pos == std::string::npos || pos >= control_end) {
-    ESP_LOGW(TAG, "Missing 'd='; use default duration %d", this->default_note_denominator_);
-  } else {
-    this->position_ = pos + 2;
-    num = this->get_integer_();
-    if (num == 1 || num == 2 || num == 4 || num == 8 || num == 16 || num == 32) {
-      this->default_note_denominator_ = num;
-    } else {
-      ESP_LOGE(TAG, "Invalid default duration: %d", num);
-      return;
-    }
-  }
-
   // Get default octave
-  pos = this->rtttl_.find("o=", name_end_position);
-  if (pos == std::string::npos || pos >= control_end) {
-    ESP_LOGW(TAG, "Missing 'o='; use default octave %d", this->default_octave_);
+  this->position_ = this->rtttl_.find("o=", this->position_);
+  if (this->position_ == std::string::npos) {
+    ESP_LOGE(TAG, "Missing 'o=");
+    return;
+  }
+  this->position_ += 2;
+  num = this->get_integer_();
+  if (num >= MIN_OCTAVE && num <= MAX_OCTAVE) {
+    this->default_octave_ = num;
   } else {
-    this->position_ = pos + 2;
-    num = this->get_integer_();
-    if (num >= MIN_OCTAVE && num <= MAX_OCTAVE) {
-      this->default_octave_ = num;
-    } else {
-      ESP_LOGE(TAG, "Invalid default octave: %d", num);
-      return;
-    }
+    ESP_LOGE(TAG, "Invalid default octave: %d", num);
+    return;
   }
 
   // Get BPM
-  pos = this->rtttl_.find("b=", name_end_position);
-  if (pos == std::string::npos || pos >= control_end) {
-    ESP_LOGW(TAG, "Missing 'b='; use default BPM %d", bpm);
+  this->position_ = this->rtttl_.find("b=", this->position_);
+  if (this->position_ == std::string::npos) {
+    ESP_LOGE(TAG, "Missing b=");
+    return;
+  }
+  this->position_ += 2;
+  num = this->get_integer_();
+  if (num >= 4) {  // Below 4 is not realistic and would cause a integer overflow
+    bpm = num;
   } else {
-    this->position_ = pos + 2;
-    num = this->get_integer_();
-    if (num >= 4) {  // Below 4 is not realistic and would cause a integer overflow
-      bpm = num;
-    } else {
-      ESP_LOGE(TAG, "Invalid BPM: %d", num);
-      return;
-    }
+    ESP_LOGE(TAG, "Invalid BPM: %d", num);
+    return;
   }
 
-  this->position_ = control_end + 1;
+  this->position_ = this->rtttl_.find(':', this->position_);
+  if (this->position_ == std::string::npos) {
+    ESP_LOGE(TAG, "Missing second ':'");
+    return;
+  }
+  this->position_++;
 
   // BPM usually expresses the number of quarter notes per minute
   this->wholenote_duration_ = 60 * 1000L * 4 / bpm;  // This is the time for whole note (in milliseconds)

esphome/components/runtime_image/runtime_image.cpp

@@ -127,9 +127,9 @@ void RuntimeImage::draw_pixel(int x, int y, const Color &color) {
       uint32_t pos = this->get_position_(x, y);
       Color mapped_color = color;
       this->map_chroma_key(mapped_color);
-      this->buffer_[pos + 0] = mapped_color.b;
+      this->buffer_[pos + 0] = mapped_color.r;
       this->buffer_[pos + 1] = mapped_color.g;
-      this->buffer_[pos + 2] = mapped_color.r;
+      this->buffer_[pos + 2] = mapped_color.b;
       if (this->transparency_ == image::TRANSPARENCY_ALPHA_CHANNEL) {
         this->buffer_[pos + 3] = color.w;
       }

esphome/components/runtime_stats/runtime_stats.cpp

@@ -32,101 +32,40 @@ void RuntimeStatsCollector::log_stats_() {
            " Period stats (last %" PRIu32 "ms): %zu active components",
            this->log_interval_, count);
 
-  // Sum component time so we can derive main-loop overhead
-  // (active loop time minus time attributable to component loop()s).
-  // Period sum iterates the active-in-period subset; total sum must iterate
-  // all components since total_active_time_us_ includes iterations where
-  // currently-idle components previously ran.
-  uint64_t period_component_sum_us = 0;
+  if (count == 0) {
+    return;
+  }
+
+  // Sort by period runtime (descending)
+  std::sort(sorted, sorted + count, compare_period_time);
+
+  // Log top components by period runtime
   for (size_t i = 0; i < count; i++) {
-    period_component_sum_us += sorted[i]->runtime_stats_.period_time_us;
-  }
-  uint64_t total_component_sum_us = 0;
-  for (auto *component : components) {
-    total_component_sum_us += component->runtime_stats_.total_time_us;
-  }
-
-  if (count > 0) {
-    // Sort by period runtime (descending)
-    std::sort(sorted, sorted + count, compare_period_time);
-
-    // Log top components by period runtime
-    for (size_t i = 0; i < count; i++) {
-      const auto &stats = sorted[i]->runtime_stats_;
-      ESP_LOGI(TAG, "  %s: count=%" PRIu32 ", avg=%.3fms, max=%.2fms, total=%.1fms",
-               LOG_STR_ARG(sorted[i]->get_component_log_str()), stats.period_count,
-               stats.period_count > 0 ? stats.period_time_us / (float) stats.period_count / 1000.0f : 0.0f,
-               stats.period_max_time_us / 1000.0f, stats.period_time_us / 1000.0f);
-    }
-  }
-
-  // Main-loop overhead for the period: active wall time minus component time.
-  // active = sum of per-iteration loop time excluding yield/sleep.
-  if (this->period_active_count_ > 0) {
-    uint64_t active = this->period_active_time_us_;
-    uint64_t overhead = active > period_component_sum_us ? active - period_component_sum_us : 0;
-    // Use double for µs→ms conversion so multi-day uptimes (where total
-    // microsecond counters exceed float's ~7-digit mantissa) keep resolution.
-    ESP_LOGI(TAG,
-             "  main_loop: iters=%" PRIu64 ", active_avg=%.3fms, active_max=%.2fms, active_total=%.1fms, "
-             "overhead_total=%.1fms",
-             this->period_active_count_,
-             static_cast<double>(active) / static_cast<double>(this->period_active_count_) / 1000.0,
-             static_cast<double>(this->period_active_max_us_) / 1000.0, static_cast<double>(active) / 1000.0,
-             static_cast<double>(overhead) / 1000.0);
-    uint64_t before = this->period_before_time_us_;
-    uint64_t tail = this->period_tail_time_us_;
-    uint64_t accounted = before + tail;
-    uint64_t inter = overhead > accounted ? overhead - accounted : 0;
-    ESP_LOGI(TAG, "  main_loop_overhead_section: before=%.1fms, tail=%.1fms, inter_component=%.1fms",
-             static_cast<double>(before) / 1000.0, static_cast<double>(tail) / 1000.0,
-             static_cast<double>(inter) / 1000.0);
+    const auto &stats = sorted[i]->runtime_stats_;
+    ESP_LOGI(TAG, "  %s: count=%" PRIu32 ", avg=%.3fms, max=%.2fms, total=%.1fms",
+             LOG_STR_ARG(sorted[i]->get_component_log_str()), stats.period_count,
+             stats.period_count > 0 ? stats.period_time_us / (float) stats.period_count / 1000.0f : 0.0f,
+             stats.period_max_time_us / 1000.0f, stats.period_time_us / 1000.0f);
   }
 
   // Log total stats since boot (only for active components - idle ones haven't changed)
   ESP_LOGI(TAG, " Total stats (since boot): %zu active components", count);
 
-  if (count > 0) {
-    // Re-sort by total runtime for all-time stats
-    std::sort(sorted, sorted + count, compare_total_time);
+  // Re-sort by total runtime for all-time stats
+  std::sort(sorted, sorted + count, compare_total_time);
 
-    for (size_t i = 0; i < count; i++) {
-      const auto &stats = sorted[i]->runtime_stats_;
-      ESP_LOGI(TAG, "  %s: count=%" PRIu32 ", avg=%.3fms, max=%.2fms, total=%.1fms",
-               LOG_STR_ARG(sorted[i]->get_component_log_str()), stats.total_count,
-               stats.total_count > 0 ? stats.total_time_us / (float) stats.total_count / 1000.0f : 0.0f,
-               stats.total_max_time_us / 1000.0f, stats.total_time_us / 1000.0);
-    }
-  }
-
-  if (this->total_active_count_ > 0) {
-    uint64_t active = this->total_active_time_us_;
-    uint64_t overhead = active > total_component_sum_us ? active - total_component_sum_us : 0;
-    ESP_LOGI(TAG,
-             "  main_loop: iters=%" PRIu64 ", active_avg=%.3fms, active_max=%.2fms, active_total=%.1fms, "
-             "overhead_total=%.1fms",
-             this->total_active_count_,
-             static_cast<double>(active) / static_cast<double>(this->total_active_count_) / 1000.0,
-             static_cast<double>(this->total_active_max_us_) / 1000.0, static_cast<double>(active) / 1000.0,
-             static_cast<double>(overhead) / 1000.0);
-    uint64_t before = this->total_before_time_us_;
-    uint64_t tail = this->total_tail_time_us_;
-    uint64_t accounted = before + tail;
-    uint64_t inter = overhead > accounted ? overhead - accounted : 0;
-    ESP_LOGI(TAG, "  main_loop_overhead_section: before=%.1fms, tail=%.1fms, inter_component=%.1fms",
-             static_cast<double>(before) / 1000.0, static_cast<double>(tail) / 1000.0,
-             static_cast<double>(inter) / 1000.0);
+  for (size_t i = 0; i < count; i++) {
+    const auto &stats = sorted[i]->runtime_stats_;
+    ESP_LOGI(TAG, "  %s: count=%" PRIu32 ", avg=%.3fms, max=%.2fms, total=%.1fms",
+             LOG_STR_ARG(sorted[i]->get_component_log_str()), stats.total_count,
+             stats.total_count > 0 ? stats.total_time_us / (float) stats.total_count / 1000.0f : 0.0f,
+             stats.total_max_time_us / 1000.0f, stats.total_time_us / 1000.0);
   }
 
   // Reset period stats
   for (auto *component : components) {
     component->runtime_stats_.reset_period();
   }
-  this->period_active_count_ = 0;
-  this->period_active_time_us_ = 0;
-  this->period_active_max_us_ = 0;
-  this->period_before_time_us_ = 0;
-  this->period_tail_time_us_ = 0;
 }
 
 bool RuntimeStatsCollector::compare_period_time(Component *a, Component *b) {
@@ -137,12 +76,11 @@ bool RuntimeStatsCollector::compare_total_time(Component *a, Component *b) {
   return a->runtime_stats_.total_time_us > b->runtime_stats_.total_time_us;
 }
 
-// Slow path for process_pending_stats — gate already checked by the inline
-// wrapper in runtime_stats.h. Out-of-line keeps the log_stats_ machinery out
-// of Application::loop().
-void RuntimeStatsCollector::process_pending_stats_slow_(uint32_t current_time) {
-  this->log_stats_();
-  this->next_log_time_ = current_time + this->log_interval_;
+void RuntimeStatsCollector::process_pending_stats(uint32_t current_time) {
+  if ((int32_t) (current_time - this->next_log_time_) >= 0) {
+    this->log_stats_();
+    this->next_log_time_ = current_time + this->log_interval_;
+  }
 }
 
 }  // namespace runtime_stats

esphome/components/runtime_stats/runtime_stats.h

@@ -6,7 +6,6 @@
 
 #include <cstdint>
 #include "esphome/core/hal.h"
-#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
 namespace esphome {
@@ -27,46 +26,10 @@ class RuntimeStatsCollector {
   }
   uint32_t get_log_interval() const { return this->log_interval_; }
 
-  // Process any pending stats printing. Called on every Application::loop()
-  // tick, so the common "not yet time to log" path must be cheap — inline
-  // the gate check and keep the actual logging work out-of-line.
-  void ESPHOME_ALWAYS_INLINE process_pending_stats(uint32_t current_time) {
-    if ((int32_t) (current_time - this->next_log_time_) >= 0) [[unlikely]] {
-      this->process_pending_stats_slow_(current_time);
-    }
-  }
-
-  // Record the wall time of one main loop iteration excluding the yield/sleep.
-  // Called once per loop from Application::loop().
-  //   active_us = total time between loop start and just before yield.
-  //   before_us = time spent in Phase A (scheduler tick) excluding time
-  //               already attributed to per-component stats.
-  //   tail_us   = time spent in after_component_phase_ + the trailing record/stats
-  //               prefix. Only meaningful on component-phase ticks; reported
-  //               as 0 on Phase A-only ticks (no component phase ran, so any
-  //               overhead between Phase A and stats belongs to "residual").
-  // Residual overhead at log time = active − Σ(component) − before − tail,
-  // which captures per-iteration inter-component bookkeeping (set_current_component,
-  // WarnIfComponentBlockingGuard construction/destruction, feed_wdt_with_time calls,
-  // the for-loop itself).
-  void record_loop_active(uint32_t active_us, uint32_t before_us, uint32_t tail_us) {
-    this->period_active_count_++;
-    this->period_active_time_us_ += active_us;
-    if (active_us > this->period_active_max_us_)
-      this->period_active_max_us_ = active_us;
-    this->total_active_count_++;
-    this->total_active_time_us_ += active_us;
-    if (active_us > this->total_active_max_us_)
-      this->total_active_max_us_ = active_us;
-
-    this->period_before_time_us_ += before_us;
-    this->total_before_time_us_ += before_us;
-    this->period_tail_time_us_ += tail_us;
-    this->total_tail_time_us_ += tail_us;
-  }
+  // Process any pending stats printing (should be called after component loop)
+  void process_pending_stats(uint32_t current_time);
 
  protected:
-  void process_pending_stats_slow_(uint32_t current_time);
   void log_stats_();
   // Static comparators — member functions have friend access, lambdas do not
   static bool compare_period_time(Component *a, Component *b);
@@ -74,22 +37,6 @@ class RuntimeStatsCollector {
 
   uint32_t log_interval_;
   uint32_t next_log_time_{0};
-
-  // Main loop active-time stats (wall time per iteration, excluding yield/sleep).
-  // Counters are uint64_t — at sub-millisecond loop times a uint32_t can wrap in
-  // a few weeks of uptime, which is well within ESPHome device lifetimes.
-  uint64_t period_active_count_{0};
-  uint64_t period_active_time_us_{0};
-  uint32_t period_active_max_us_{0};
-  uint64_t total_active_count_{0};
-  uint64_t total_active_time_us_{0};
-  uint32_t total_active_max_us_{0};
-
-  // Split of overhead sections — accumulated per iteration.
-  uint64_t period_before_time_us_{0};
-  uint64_t total_before_time_us_{0};
-  uint64_t period_tail_time_us_{0};
-  uint64_t total_tail_time_us_{0};
 };
 
 }  // namespace runtime_stats

esphome/components/rx8130/rx8130.cpp

@@ -81,7 +81,7 @@ void RX8130Component::read_time() {
       .year = static_cast<uint16_t>(bcd2dec(date[6]) + 2000),
   };
   rtc_time.recalc_timestamp_utc(false);
-  if (!rtc_time.is_valid(/*check_day_of_week=*/true, /*check_day_of_year=*/false)) {
+  if (!rtc_time.is_valid()) {
     ESP_LOGE(TAG, "Invalid RTC time, not syncing to system clock.");
     return;
   }

esphome/components/sensor/__init__.py

@@ -118,7 +118,6 @@ from esphome.schema_extractors import SCHEMA_EXTRACT, schema_extractor
 from esphome.util import Registry
 
 CODEOWNERS = ["@esphome/core"]
-
 DEVICE_CLASSES = [
     DEVICE_CLASS_ABSOLUTE_HUMIDITY,
     DEVICE_CLASS_APPARENT_POWER,
@@ -276,9 +275,6 @@ ThrottleFilter = sensor_ns.class_("ThrottleFilter", Filter)
 ThrottleWithPriorityFilter = sensor_ns.class_(
     "ThrottleWithPriorityFilter", ValueListFilter
 )
-ThrottleWithPriorityNanFilter = sensor_ns.class_(
-    "ThrottleWithPriorityNanFilter", Filter
-)
 TimeoutFilterBase = sensor_ns.class_("TimeoutFilterBase", Filter, cg.Component)
 TimeoutFilterLast = sensor_ns.class_("TimeoutFilterLast", TimeoutFilterBase)
 TimeoutFilterConfigured = sensor_ns.class_("TimeoutFilterConfigured", TimeoutFilterBase)
@@ -294,7 +290,6 @@ SensorInRangeCondition = sensor_ns.class_("SensorInRangeCondition", Filter)
 ClampFilter = sensor_ns.class_("ClampFilter", Filter)
 RoundFilter = sensor_ns.class_("RoundFilter", Filter)
 RoundMultipleFilter = sensor_ns.class_("RoundMultipleFilter", Filter)
-RoundSignificantDigitsFilter = sensor_ns.class_("RoundSignificantDigitsFilter", Filter)
 
 validate_unit_of_measurement = cv.All(
     cv.string_strict,
@@ -661,18 +656,9 @@ THROTTLE_WITH_PRIORITY_SCHEMA = cv.maybe_simple_value(
     THROTTLE_WITH_PRIORITY_SCHEMA,
 )
 async def throttle_with_priority_filter_to_code(config, filter_id):
-    values = config[CONF_VALUE]
-    if not isinstance(values, list):
-        values = [values]
-    # Specialize the common "NaN-only" case (the schema default when the user
-    # omits `value:`) to avoid the TemplatableFn<float> array + NaN lambda the
-    # generic ValueListFilter path requires. Behavior is identical: NaN sensor
-    # readings always bypass the throttle.
-    if values and all(isinstance(v, float) and math.isnan(v) for v in values):
-        filter_id = filter_id.copy()
-        filter_id.type = ThrottleWithPriorityNanFilter
-        return cg.new_Pvariable(filter_id, config[CONF_TIMEOUT])
-    template_ = [await cg.templatable(x, [], cg.float_) for x in values]
+    if not isinstance(config[CONF_VALUE], list):
+        config[CONF_VALUE] = [config[CONF_VALUE]]
+    template_ = [await cg.templatable(x, [], cg.float_) for x in config[CONF_VALUE]]
     return cg.new_Pvariable(
         filter_id, cg.TemplateArguments(len(template_)), config[CONF_TIMEOUT], template_
     )
@@ -902,18 +888,6 @@ async def round_multiple_filter_to_code(config, filter_id):
     )
 
 
-@FILTER_REGISTRY.register(
-    "round_to_significant_digits",
-    RoundSignificantDigitsFilter,
-    cv.int_range(min=1, max=6),
-)
-async def round_significant_digits_filter_to_code(config, filter_id):
-    return cg.new_Pvariable(
-        filter_id,
-        cg.TemplateArguments(config),
-    )
-
-
 async def build_filters(config):
     return await cg.build_registry_list(FILTER_REGISTRY, config)
 

esphome/components/sensor/filter.cpp

@@ -269,18 +269,6 @@ optional<float> throttle_with_priority_new_value(Sensor *parent, float value, co
   return {};
 }
 
-// ThrottleWithPriorityNanFilter
-ThrottleWithPriorityNanFilter::ThrottleWithPriorityNanFilter(uint32_t min_time_between_inputs)
-    : min_time_between_inputs_(min_time_between_inputs) {}
-optional<float> ThrottleWithPriorityNanFilter::new_value(float value) {
-  const uint32_t now = App.get_loop_component_start_time();
-  if (this->last_input_ == 0 || now - this->last_input_ >= this->min_time_between_inputs_ || std::isnan(value)) {
-    this->last_input_ = now;
-    return value;
-  }
-  return {};
-}
-
 // DeltaFilter
 DeltaFilter::DeltaFilter(float min_a0, float min_a1, float max_a0, float max_a1)
     : min_a0_(min_a0), min_a1_(min_a1), max_a0_(max_a0), max_a1_(max_a1) {}

esphome/components/sensor/filter.h

@@ -399,19 +399,6 @@ template<size_t N> class ThrottleWithPriorityFilter : public ValueListFilter<N>
   uint32_t min_time_between_inputs_;
 };
 
-/// Specialization of ThrottleWithPriorityFilter for the common "prioritize NaN"
-/// case: skips the TemplatableFn<float> array + lambda and inlines the check.
-class ThrottleWithPriorityNanFilter : public Filter {
- public:
-  explicit ThrottleWithPriorityNanFilter(uint32_t min_time_between_inputs);
-
-  optional<float> new_value(float value) override;
-
- protected:
-  uint32_t last_input_{0};
-  uint32_t min_time_between_inputs_;
-};
-
 // Base class for timeout filters - contains common loop logic
 class TimeoutFilterBase : public Filter, public Component {
  public:
@@ -604,19 +591,6 @@ class RoundMultipleFilter : public Filter {
   float multiple_;
 };
 
-template<uint8_t Digits> class RoundSignificantDigitsFilter : public Filter {
- public:
-  optional<float> new_value(float value) override {
-    if (std::isfinite(value)) {
-      if (value == 0.0f)
-        return 0.0f;
-      float factor = pow10_int(Digits - 1 - ilog10(value));
-      return roundf(value * factor) / factor;
-    }
-    return value;
-  }
-};
-
 class ToNTCResistanceFilter : public Filter {
  public:
   ToNTCResistanceFilter(double a, double b, double c) : a_(a), b_(b), c_(c) {}

esphome/components/shelly_dimmer/light.py

@@ -84,7 +84,7 @@ def get_firmware(value):
             req = requests.get(url, timeout=30)
             req.raise_for_status()
         except requests.exceptions.RequestException as e:
-            raise cv.Invalid(f"Could not download firmware file ({url}): {e}") from e
+            raise cv.Invalid(f"Could not download firmware file ({url}): {e}")
 
         h = hashlib.new("sha256")
         h.update(req.content)

esphome/components/socket/bsd_sockets_impl.cpp

@@ -14,34 +14,38 @@ BSDSocketImpl::BSDSocketImpl(int fd, bool monitor_loop) {
   if (!monitor_loop || this->fd_ < 0)
     return;
 #ifdef USE_LWIP_FAST_SELECT
-  this->cached_sock_ = hook_fd_for_fast_select(this->fd_);
+  // Cache lwip_sock pointer and register for monitoring (hooks callback internally)
+  this->cached_sock_ = esphome_lwip_get_sock(this->fd_);
+  this->loop_monitored_ = App.register_socket(this->cached_sock_);
 #else
   this->loop_monitored_ = App.register_socket_fd(this->fd_);
 #endif
 }
 
-BSDSocketImpl::~BSDSocketImpl() { this->close(); }
+BSDSocketImpl::~BSDSocketImpl() {
+  if (!this->closed_) {
+    this->close();
+  }
+}
 
 int BSDSocketImpl::close() {
-  if (this->fd_ < 0) {
-    // Already closed, or never opened.
-    return 0;
-  }
+  if (!this->closed_) {
+    // Unregister before closing to avoid dangling pointer in monitored set
 #ifdef USE_LWIP_FAST_SELECT
-  // Null the cached lwip_sock pointer before closing. The underlying lwip slot can be
-  // recycled for a new connection as soon as ::close() returns, so anything that might
-  // dereference cached_sock_ post-close (e.g. setsockopt(TCP_NODELAY)) would otherwise
-  // touch an unrelated socket's pcb. No per-socket callback unhook is needed —
-  // all LwIP sockets share the same static event_callback.
-  this->cached_sock_ = nullptr;
+    if (this->loop_monitored_) {
+      App.unregister_socket(this->cached_sock_);
+      this->cached_sock_ = nullptr;
+    }
 #else
-  if (this->loop_monitored_) {
-    App.unregister_socket_fd(this->fd_);
-  }
+    if (this->loop_monitored_) {
+      App.unregister_socket_fd(this->fd_);
+    }
 #endif
-  int ret = ::close(this->fd_);
-  this->fd_ = -1;  // Sentinel for "closed" — prevents double-close and makes use-after-close visible.
-  return ret;
+    int ret = ::close(this->fd_);
+    this->closed_ = true;
+    return ret;
+  }
+  return 0;
 }
 
 int BSDSocketImpl::setblocking(bool blocking) {

esphome/components/socket/bsd_sockets_impl.h

@@ -119,21 +119,12 @@ class BSDSocketImpl {
   int get_fd() const { return this->fd_; }
 
  protected:
-  // fd_ < 0 means "not open" — used both pre-open (initial state) and post-close. This
-  // replaces a separate closed_ flag: close() sets fd_ = -1 after ::close(), and the
-  // destructor / double-close path just check fd_ < 0.
   int fd_{-1};
 #ifdef USE_LWIP_FAST_SELECT
-  // Cached lwip_sock pointer used for direct rcvevent reads in ready() on the
-  // fast-select path. Replaces loop_monitored_: null means this socket is not being
-  // monitored for read events — either monitoring was not requested, the fd was
-  // invalid, or esphome_lwip_get_sock() failed. Non-null means the netconn event
-  // callback was hooked and notifications are flowing. close() nulls this to prevent
-  // use-after-free via a recycled lwip slot.
-  struct lwip_sock *cached_sock_{nullptr};
-#else
-  bool loop_monitored_{false};
+  struct lwip_sock *cached_sock_{nullptr};  // Cached for direct rcvevent read in ready()
 #endif
+  bool closed_{false};
+  bool loop_monitored_{false};
 };
 
 }  // namespace esphome::socket

esphome/components/socket/lwip_raw_tcp_impl.cpp

@@ -11,10 +11,6 @@
 #include "esphome/core/wake.h"
 #include "esphome/core/log.h"
 
-#ifdef USE_OTA_PLATFORM_ESPHOME
-extern "C" void esphome_wake_ota_component_any_context();
-#endif
-
 #ifdef USE_ESP8266
 #include <coredecls.h>  // For esp_schedule()
 #elif defined(USE_RP2040)
@@ -858,10 +854,6 @@ err_t LWIPRawListenImpl::accept_fn_(struct tcp_pcb *newpcb, err_t err) {
   tcp_err(newpcb, LWIPRawListenImpl::s_queued_err_fn);
   tcp_recv(newpcb, LWIPRawListenImpl::s_queued_recv_fn);
   LWIP_LOG("Accepted connection, queue size: %d", this->accepted_socket_count_);
-#ifdef USE_OTA_PLATFORM_ESPHOME
-  // Must run before wake_loop_any_context() so flags are visible when the main task wakes.
-  esphome_wake_ota_component_any_context();
-#endif
   // Wake the main loop immediately so it can accept the new connection.
   esphome::wake_loop_any_context();
   return ERR_OK;

esphome/components/socket/lwip_sockets_impl.cpp

@@ -14,34 +14,38 @@ LwIPSocketImpl::LwIPSocketImpl(int fd, bool monitor_loop) {
   if (!monitor_loop || this->fd_ < 0)
     return;
 #ifdef USE_LWIP_FAST_SELECT
-  this->cached_sock_ = hook_fd_for_fast_select(this->fd_);
+  // Cache lwip_sock pointer and register for monitoring (hooks callback internally)
+  this->cached_sock_ = esphome_lwip_get_sock(this->fd_);
+  this->loop_monitored_ = App.register_socket(this->cached_sock_);
 #else
   this->loop_monitored_ = App.register_socket_fd(this->fd_);
 #endif
 }
 
-LwIPSocketImpl::~LwIPSocketImpl() { this->close(); }
+LwIPSocketImpl::~LwIPSocketImpl() {
+  if (!this->closed_) {
+    this->close();
+  }
+}
 
 int LwIPSocketImpl::close() {
-  if (this->fd_ < 0) {
-    // Already closed, or never opened.
-    return 0;
-  }
+  if (!this->closed_) {
+    // Unregister before closing to avoid dangling pointer in monitored set
 #ifdef USE_LWIP_FAST_SELECT
-  // Null the cached lwip_sock pointer before closing. The underlying lwip slot can be
-  // recycled for a new connection as soon as lwip_close() returns, so anything that
-  // might dereference cached_sock_ post-close (e.g. setsockopt(TCP_NODELAY)) would
-  // otherwise touch an unrelated socket's pcb. No per-socket callback unhook is needed —
-  // all LwIP sockets share the same static event_callback.
-  this->cached_sock_ = nullptr;
+    if (this->loop_monitored_) {
+      App.unregister_socket(this->cached_sock_);
+      this->cached_sock_ = nullptr;
+    }
 #else
-  if (this->loop_monitored_) {
-    App.unregister_socket_fd(this->fd_);
-  }
+    if (this->loop_monitored_) {
+      App.unregister_socket_fd(this->fd_);
+    }
 #endif
-  int ret = lwip_close(this->fd_);
-  this->fd_ = -1;  // Sentinel for "closed" — prevents double-close and makes use-after-close visible.
-  return ret;
+    int ret = lwip_close(this->fd_);
+    this->closed_ = true;
+    return ret;
+  }
+  return 0;
 }
 
 int LwIPSocketImpl::setblocking(bool blocking) {