Merge remote-tracking branch 'origin/dev' into uart-read-available-migrate

# Conflicts:
#	esphome/components/dfplayer/dfplayer.cpp

.clang-tidy

@@ -12,7 +12,6 @@ Checks: >-
   -bugprone-multi-level-implicit-pointer-conversion,
   -bugprone-narrowing-conversions,
   -bugprone-tagged-union-member-count,
-  -bugprone-signed-bitwise,
   -bugprone-signed-char-misuse,
   -bugprone-switch-missing-default-case,
   -cert-dcl50-cpp,
@@ -40,7 +39,6 @@ Checks: >-
   -cppcoreguidelines-avoid-const-or-ref-data-members,
   -cppcoreguidelines-avoid-do-while,
   -cppcoreguidelines-avoid-magic-numbers,
-  -cppcoreguidelines-explicit-constructor,
   -cppcoreguidelines-init-variables,
   -cppcoreguidelines-macro-to-enum,
   -cppcoreguidelines-macro-usage,
@@ -86,7 +84,6 @@ Checks: >-
   -llvm-use-ranges,
   -llvmlibc-*,
   -misc-const-correctness,
-  -misc-explicit-constructor,
   -misc-include-cleaner,
   -misc-multiple-inheritance,
   -misc-no-recursion,
@@ -116,7 +113,6 @@ Checks: >-
   -objc-*,
   -performance-enum-size,
   -portability-avoid-pragma-once,
-  -portability-no-assembler,
   -portability-template-virtual-member-function,
   -readability-ambiguous-smartptr-reset-call,
   -readability-avoid-nested-conditional-operator,
@@ -133,13 +129,9 @@ Checks: >-
   -readability-named-parameter,
   -readability-redundant-casting,
   -readability-redundant-inline-specifier,
-  -readability-redundant-lambda-parameter-list,
   -readability-redundant-member-init,
-  -readability-redundant-nested-if,
   -readability-redundant-parentheses,
   -readability-redundant-typename,
-  -readability-trailing-comma,
-  -readability-trivial-switch,
   -readability-uppercase-literal-suffix,
   -readability-use-anyofallof,
   -readability-use-std-min-max,

.pre-commit-config.yaml

@@ -38,7 +38,7 @@ repos:
       - id: yamllint
         exclude: ^(\.clang-format|\.clang-tidy)$
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v23.1.3
+    rev: v22.1.8
     hooks:
       - id: clang-format
         types_or: [c, c++]

esphome/components/api/api.proto

@@ -608,7 +608,6 @@ message ListEntitiesCoverResponse {
   bool supports_stop = 12;
   uint32 device_id = 13 [(field_ifdef) = "USE_DEVICES"];
   bool supports_stop_tilt = 14;
-  bool supports_toggle = 15;
 }
 
 // Deprecated in API version 1.1
@@ -671,7 +670,6 @@ message CoverCommandRequest {
   bool stop = 8;
   uint32 device_id = 9 [(field_ifdef) = "USE_DEVICES"];
   bool stop_tilt = 10;
-  bool toggle = 11;
 }
 
 // ==================== FAN ====================

esphome/components/api/api_connection.cpp

@@ -555,7 +555,6 @@ uint16_t APIConnection::try_send_cover_info(EntityBase *entity, APIConnection *c
   msg.supports_tilt = traits.get_supports_tilt();
   msg.supports_stop = traits.get_supports_stop();
   msg.supports_stop_tilt = traits.get_supports_stop_tilt();
-  msg.supports_toggle = traits.get_supports_toggle();
   return fill_and_encode_entity_info_with_device_class(cover, msg, msg.device_class, conn, remaining_size);
 }
 void APIConnection::on_cover_command_request(const CoverCommandRequest &msg) {
@@ -568,8 +567,6 @@ void APIConnection::on_cover_command_request(const CoverCommandRequest &msg) {
     call.set_command_stop();
   if (msg.stop_tilt)
     call.set_command_stop_tilt();
-  if (msg.toggle)
-    call.set_command_toggle();
   call.perform();
 }
 #endif

esphome/components/api/api_pb2.cpp

@@ -484,7 +484,6 @@ uint8_t *ListEntitiesCoverResponse::encode_msg(const void *self, uint8_t *__rest
   pos = ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 13, msg.device_id);
 #endif
   pos = ProtoEncode::encode_bool(pos PROTO_ENCODE_DEBUG_ARG, 14, msg.supports_stop_tilt);
-  pos = ProtoEncode::encode_bool(pos PROTO_ENCODE_DEBUG_ARG, 15, msg.supports_toggle);
   return pos;
 }
 uint32_t ListEntitiesCoverResponse::calc_size_msg(const void *self) {
@@ -507,7 +506,6 @@ uint32_t ListEntitiesCoverResponse::calc_size_msg(const void *self) {
   size += ProtoSize::calc_uint32(1, msg.device_id);
 #endif
   size += ProtoSize::calc_bool(1, msg.supports_stop_tilt);
-  size += ProtoSize::calc_bool(1, msg.supports_toggle);
   return size;
 }
 uint8_t *CoverStateResponse::encode_msg(const void *self, uint8_t *__restrict__ pos PROTO_ENCODE_DEBUG_PARAM) {
@@ -567,9 +565,6 @@ void CoverCommandRequest::decode_field(void *self, uint32_t tag, const uint8_t *
     case proto_tag(10, WIRE_TYPE_VARINT):
       msg.stop_tilt = value.as_bool();
       break;
-    case proto_tag(11, WIRE_TYPE_VARINT):
-      msg.toggle = value.as_bool();
-      break;
     default:
       break;
   }

esphome/components/api/api_pb2.h

@@ -911,7 +911,7 @@ class BinarySensorStateResponse final : public StateResponseProtoMessage {
 class ListEntitiesCoverResponse final : public InfoResponseProtoMessage {
  public:
   static constexpr uint16_t MESSAGE_TYPE = 13;
-  static constexpr uint8_t ESTIMATED_SIZE = 61;
+  static constexpr uint8_t ESTIMATED_SIZE = 59;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   const LogString *message_name() const override { return LOG_STR("list_entities_cover_response"); }
 #endif
@@ -921,7 +921,6 @@ class ListEntitiesCoverResponse final : public InfoResponseProtoMessage {
   ProgmemStringRef device_class{};
   bool supports_stop{false};
   bool supports_stop_tilt{false};
-  bool supports_toggle{false};
   static uint8_t *encode_msg(const void *self, uint8_t *pos PROTO_ENCODE_DEBUG_PARAM);
   uint8_t *encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const {
     return encode_msg(this, buffer.get_pos() PROTO_ENCODE_DEBUG_ARG);
@@ -959,7 +958,7 @@ class CoverStateResponse final : public StateResponseProtoMessage {
 class CoverCommandRequest final : public CommandProtoMessage {
  public:
   static constexpr uint16_t MESSAGE_TYPE = 30;
-  static constexpr uint8_t ESTIMATED_SIZE = 29;
+  static constexpr uint8_t ESTIMATED_SIZE = 27;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   const LogString *message_name() const override { return LOG_STR("cover_command_request"); }
 #endif
@@ -969,7 +968,6 @@ class CoverCommandRequest final : public CommandProtoMessage {
   float tilt{0.0f};
   bool stop{false};
   bool stop_tilt{false};
-  bool toggle{false};
   void decode(const uint8_t *buffer, size_t length) {
     ProtoDecodableMessage::decode_fields(this, buffer, length, &decode_field);
   }

esphome/components/api/api_pb2_dump.cpp

@@ -1246,7 +1246,6 @@ const char *ListEntitiesCoverResponse::dump_to(DumpBuffer &out) const {
   dump_field(out, ESPHOME_PSTR("device_id"), this->device_id);
 #endif
   dump_field(out, ESPHOME_PSTR("supports_stop_tilt"), this->supports_stop_tilt);
-  dump_field(out, ESPHOME_PSTR("supports_toggle"), this->supports_toggle);
   return out.c_str();
 }
 const char *CoverStateResponse::dump_to(DumpBuffer &out) const {
@@ -1272,7 +1271,6 @@ const char *CoverCommandRequest::dump_to(DumpBuffer &out) const {
   dump_field(out, ESPHOME_PSTR("device_id"), this->device_id);
 #endif
   dump_field(out, ESPHOME_PSTR("stop_tilt"), this->stop_tilt);
-  dump_field(out, ESPHOME_PSTR("toggle"), this->toggle);
   return out.c_str();
 }
 #endif

esphome/components/api/proto.h

@@ -301,7 +301,7 @@ constexpr uint32_t VARINT_MAX_1_BYTE = 1 << 7;   // 128
 constexpr uint32_t VARINT_MAX_2_BYTE = 1 << 14;  // 16384
 
 /// Generated encode body: writes the fields at pos, returns the cursor past them.
-using ProtoEncodeFn = uint8_t *(*)(const void *, uint8_t *PROTO_ENCODE_DEBUG_PARAM);
+using ProtoEncodeFn = uint8_t *(*) (const void *, uint8_t *PROTO_ENCODE_DEBUG_PARAM);
 
 /// Static encode helpers for the generated encode bodies. Each takes the write cursor by value and
 /// returns it advanced, so outlined calls at -Os chain through the return register instead of a

esphome/components/bl0906/constants.h

@@ -111,9 +111,10 @@ static const uint8_t BL0906_USR_WRPROT = 0x9E;
 // Reset Register
 static const uint8_t BL0906_SOFT_RESET = 0x9F;
 
-const uint8_t BL0906_INIT[2][6] = {// Reset to default
-                                   {BL0906_WRITE_COMMAND, BL0906_SOFT_RESET, 0x5A, 0x5A, 0x5A, 0x52},
-                                   // Enable User Operation Write
-                                   {BL0906_WRITE_COMMAND, BL0906_USR_WRPROT, 0x55, 0x55, 0x00, 0xB7}};
+const uint8_t BL0906_INIT[2][6] = {
+    // Reset to default
+    {BL0906_WRITE_COMMAND, BL0906_SOFT_RESET, 0x5A, 0x5A, 0x5A, 0x52},
+    // Enable User Operation Write
+    {BL0906_WRITE_COMMAND, BL0906_USR_WRPROT, 0x55, 0x55, 0x00, 0xB7}};
 
 }  // namespace esphome::bl0906

esphome/components/climate/climate.h

@@ -79,10 +79,6 @@ class ClimateCall {
   ClimateCall &set_fan_mode(optional<std::string> fan_mode);
   /// Set the custom fan mode of the climate device.
   ClimateCall &set_fan_mode(const char *custom_fan_mode);
-  /// Set the custom fan mode of the climate device (StringRef overload to resolve ambiguity, zero-copy).
-  ClimateCall &set_fan_mode(StringRef custom_fan_mode) {
-    return this->set_fan_mode(custom_fan_mode.c_str(), custom_fan_mode.size());
-  }
   /// Set the custom fan mode of the climate device (zero-copy API path).
   ClimateCall &set_fan_mode(const char *custom_fan_mode, size_t len);
   /// Set the swing mode of the climate device.
@@ -103,10 +99,6 @@ class ClimateCall {
   ClimateCall &set_preset(optional<std::string> preset);
   /// Set the custom preset of the climate device.
   ClimateCall &set_preset(const char *custom_preset);
-  /// Set the custom preset of the climate device (StringRef overload to resolve ambiguity, zero-copy).
-  ClimateCall &set_preset(StringRef custom_preset) {
-    return this->set_preset(custom_preset.c_str(), custom_preset.size());
-  }
   /// Set the custom preset of the climate device (zero-copy API path).
   ClimateCall &set_preset(const char *custom_preset, size_t len);
 

esphome/components/cse7766/cse7766.cpp

@@ -28,30 +28,23 @@ void CSE7766Component::loop() {
 
   // Read all available bytes in batches to reduce UART call overhead.
   // At 4800 baud (~480 bytes/sec) with ~122 Hz loop rate, typically ~4 bytes per call.
-  uint8_t buf[CSE7766_RAW_DATA_SIZE];
-  while (avail > 0) {
-    size_t to_read = std::min(avail, sizeof(buf));
-    if (!this->read_array(buf, to_read)) {
-      break;
-    }
-    avail -= to_read;
+  this->read_available<CSE7766_RAW_DATA_SIZE>(
+      [this](uint8_t byte) {
+        this->raw_data_[this->raw_data_index_] = byte;
+        if (!this->check_byte_()) {
+          this->raw_data_index_ = 0;
+          this->status_set_warning();
+          return;
+        }
 
-    for (size_t i = 0; i < to_read; i++) {
-      this->raw_data_[this->raw_data_index_] = buf[i];
-      if (!this->check_byte_()) {
-        this->raw_data_index_ = 0;
-        this->status_set_warning();
-        continue;
-      }
+        if (this->raw_data_index_ == CSE7766_RAW_DATA_SIZE - 1) {
+          this->parse_data_();
+          this->status_clear_warning();
+        }
 
-      if (this->raw_data_index_ == CSE7766_RAW_DATA_SIZE - 1) {
-        this->parse_data_();
-        this->status_clear_warning();
-      }
-
-      this->raw_data_index_ = (this->raw_data_index_ + 1) % CSE7766_RAW_DATA_SIZE;
-    }
-  }
+        this->raw_data_index_ = (this->raw_data_index_ + 1) % CSE7766_RAW_DATA_SIZE;
+      },
+      avail);
 }
 
 bool CSE7766Component::check_byte_() {

esphome/components/dfplayer/dfplayer.cpp

@@ -135,153 +135,140 @@ void DFPlayer::send_cmd_(uint8_t cmd, uint16_t argument) {
 }
 
 void DFPlayer::loop() {
-  // Read all available bytes in batches to reduce UART call overhead.
-  size_t avail = this->available();
-  uint8_t buf[64];
-  while (avail > 0) {
-    size_t to_read = std::min(avail, sizeof(buf));
-    if (!this->read_array(buf, to_read)) {
-      break;
-    }
-    avail -= to_read;
-    for (size_t bi = 0; bi < to_read; bi++) {
-      uint8_t byte = buf[bi];
+  this->read_available([this](uint8_t byte) {
+    if (this->read_pos_ == DFPLAYER_READ_BUFFER_LENGTH)
+      this->read_pos_ = 0;
 
-      if (this->read_pos_ == DFPLAYER_READ_BUFFER_LENGTH)
-        this->read_pos_ = 0;
-
-      switch (this->read_pos_) {
-        case 0:  // Start mark
-          if (byte != 0x7E)
-            continue;
-          break;
-        case 1:  // Version
-          if (byte != 0xFF) {
-            ESP_LOGW(TAG, "Expected Version 0xFF, got %#02x", byte);
-            this->read_pos_ = 0;
-            continue;
-          }
-          break;
-        case 2:  // Buffer length
-          if (byte != 0x06) {
-            ESP_LOGW(TAG, "Expected Buffer length 0x06, got %#02x", byte);
-            this->read_pos_ = 0;
-            continue;
-          }
-          break;
-        case 9:  // End byte
-#ifdef ESPHOME_LOG_HAS_VERY_VERBOSE
-          char byte_sequence[100];
-          byte_sequence[0] = '\0';
-          for (size_t i = 0; i < this->read_pos_ + 1; ++i) {
-            snprintf(byte_sequence + strlen(byte_sequence), sizeof(byte_sequence) - strlen(byte_sequence), "%02X ",
-                     this->read_buffer_[i]);
-          }
-          ESP_LOGVV(TAG, "Received byte sequence: %s", byte_sequence);
-#endif
-          if (byte != 0xEF) {
-            ESP_LOGW(TAG, "Expected end byte 0xEF, got %#02x", byte);
-            this->read_pos_ = 0;
-            continue;
-          }
-          // Parse valid received command
-          uint8_t cmd = this->read_buffer_[3];
-          uint16_t argument = (this->read_buffer_[5] << 8) | this->read_buffer_[6];
-
-          ESP_LOGV(TAG, "Received message cmd: %#02x arg %#04x", cmd, argument);
-
-          switch (cmd) {
-            case 0x3A:
-              if (argument == 1) {
-                ESP_LOGI(TAG, "USB loaded");
-              } else if (argument == 2) {
-                ESP_LOGI(TAG, "TF Card loaded");
-              }
-              break;
-            case 0x3B:
-              if (argument == 1) {
-                ESP_LOGI(TAG, "USB unloaded");
-              } else if (argument == 2) {
-                ESP_LOGI(TAG, "TF Card unloaded");
-              }
-              break;
-            case 0x3F:
-              if (argument == 1) {
-                ESP_LOGI(TAG, "USB available");
-              } else if (argument == 2) {
-                ESP_LOGI(TAG, "TF Card available");
-              } else if (argument == 3) {
-                ESP_LOGI(TAG, "USB, TF Card available");
-              }
-              break;
-            case 0x40:
-              ESP_LOGV(TAG, "Nack");
-              this->ack_set_is_playing_ = false;
-              this->ack_reset_is_playing_ = false;
-              switch (argument) {
-                case 0x01:
-                  ESP_LOGE(TAG, "Module is busy or uninitialized");
-                  break;
-                case 0x02:
-                  ESP_LOGE(TAG, "Module is in sleep mode");
-                  break;
-                case 0x03:
-                  ESP_LOGE(TAG, "Serial receive error");
-                  break;
-                case 0x04:
-                  ESP_LOGE(TAG, "Checksum incorrect");
-                  break;
-                case 0x05:
-                  ESP_LOGE(TAG, "Specified track is out of current track scope");
-                  this->is_playing_ = false;
-                  break;
-                case 0x06:
-                  ESP_LOGE(TAG, "Specified track is not found");
-                  this->is_playing_ = false;
-                  break;
-                case 0x07:
-                  ESP_LOGE(TAG,
-                           "Insertion error (an inserting operation only can be done when a track is being played)");
-                  break;
-                case 0x08:
-                  ESP_LOGE(TAG, "SD card reading failed (SD card pulled out or damaged)");
-                  break;
-                case 0x09:
-                  ESP_LOGE(TAG, "Entered into sleep mode");
-                  this->is_playing_ = false;
-                  break;
-                default:
-                  break;
-              }
-              break;
-            case 0x41:
-              ESP_LOGV(TAG, "Ack ok");
-              this->is_playing_ |= this->ack_set_is_playing_;
-              this->is_playing_ &= !this->ack_reset_is_playing_;
-              this->ack_set_is_playing_ = false;
-              this->ack_reset_is_playing_ = false;
-              break;
-            case 0x3C:
-              ESP_LOGV(TAG, "Playback finished (USB drive)");
-              this->is_playing_ = false;
-              this->on_finished_playback_callback_.call();
-              break;
-            case 0x3D:
-              ESP_LOGV(TAG, "Playback finished (SD card)");
-              this->is_playing_ = false;
-              this->on_finished_playback_callback_.call();
-              break;
-            default:
-              ESP_LOGE(TAG, "Received unknown cmd %#02x arg %#04x", cmd, argument);
-          }
-          this->sent_cmd_ = 0;
+    switch (this->read_pos_) {
+      case 0:  // Start mark
+        if (byte != 0x7E)
+          return;
+        break;
+      case 1:  // Version
+        if (byte != 0xFF) {
+          ESP_LOGW(TAG, "Expected Version 0xFF, got %#02x", byte);
           this->read_pos_ = 0;
-          continue;
-      }
-      this->read_buffer_[this->read_pos_] = byte;
-      this->read_pos_++;
+          return;
+        }
+        break;
+      case 2:  // Buffer length
+        if (byte != 0x06) {
+          ESP_LOGW(TAG, "Expected Buffer length 0x06, got %#02x", byte);
+          this->read_pos_ = 0;
+          return;
+        }
+        break;
+      case 9:  // End byte
+#ifdef ESPHOME_LOG_HAS_VERY_VERBOSE
+        char byte_sequence[100];
+        byte_sequence[0] = '\0';
+        for (size_t i = 0; i < this->read_pos_ + 1; ++i) {
+          snprintf(byte_sequence + strlen(byte_sequence), sizeof(byte_sequence) - strlen(byte_sequence), "%02X ",
+                   this->read_buffer_[i]);
+        }
+        ESP_LOGVV(TAG, "Received byte sequence: %s", byte_sequence);
+#endif
+        if (byte != 0xEF) {
+          ESP_LOGW(TAG, "Expected end byte 0xEF, got %#02x", byte);
+          this->read_pos_ = 0;
+          return;
+        }
+        // Parse valid received command
+        uint8_t cmd = this->read_buffer_[3];
+        uint16_t argument = (this->read_buffer_[5] << 8) | this->read_buffer_[6];
+
+        ESP_LOGV(TAG, "Received message cmd: %#02x arg %#04x", cmd, argument);
+
+        switch (cmd) {
+          case 0x3A:
+            if (argument == 1) {
+              ESP_LOGI(TAG, "USB loaded");
+            } else if (argument == 2) {
+              ESP_LOGI(TAG, "TF Card loaded");
+            }
+            break;
+          case 0x3B:
+            if (argument == 1) {
+              ESP_LOGI(TAG, "USB unloaded");
+            } else if (argument == 2) {
+              ESP_LOGI(TAG, "TF Card unloaded");
+            }
+            break;
+          case 0x3F:
+            if (argument == 1) {
+              ESP_LOGI(TAG, "USB available");
+            } else if (argument == 2) {
+              ESP_LOGI(TAG, "TF Card available");
+            } else if (argument == 3) {
+              ESP_LOGI(TAG, "USB, TF Card available");
+            }
+            break;
+          case 0x40:
+            ESP_LOGV(TAG, "Nack");
+            this->ack_set_is_playing_ = false;
+            this->ack_reset_is_playing_ = false;
+            switch (argument) {
+              case 0x01:
+                ESP_LOGE(TAG, "Module is busy or uninitialized");
+                break;
+              case 0x02:
+                ESP_LOGE(TAG, "Module is in sleep mode");
+                break;
+              case 0x03:
+                ESP_LOGE(TAG, "Serial receive error");
+                break;
+              case 0x04:
+                ESP_LOGE(TAG, "Checksum incorrect");
+                break;
+              case 0x05:
+                ESP_LOGE(TAG, "Specified track is out of current track scope");
+                this->is_playing_ = false;
+                break;
+              case 0x06:
+                ESP_LOGE(TAG, "Specified track is not found");
+                this->is_playing_ = false;
+                break;
+              case 0x07:
+                ESP_LOGE(TAG, "Insertion error (an inserting operation only can be done when a track is being played)");
+                break;
+              case 0x08:
+                ESP_LOGE(TAG, "SD card reading failed (SD card pulled out or damaged)");
+                break;
+              case 0x09:
+                ESP_LOGE(TAG, "Entered into sleep mode");
+                this->is_playing_ = false;
+                break;
+              default:
+                break;
+            }
+            break;
+          case 0x41:
+            ESP_LOGV(TAG, "Ack ok");
+            this->is_playing_ |= this->ack_set_is_playing_;
+            this->is_playing_ &= !this->ack_reset_is_playing_;
+            this->ack_set_is_playing_ = false;
+            this->ack_reset_is_playing_ = false;
+            break;
+          case 0x3C:
+            ESP_LOGV(TAG, "Playback finished (USB drive)");
+            this->is_playing_ = false;
+            this->on_finished_playback_callback_.call();
+            break;
+          case 0x3D:
+            ESP_LOGV(TAG, "Playback finished (SD card)");
+            this->is_playing_ = false;
+            this->on_finished_playback_callback_.call();
+            break;
+          default:
+            ESP_LOGE(TAG, "Received unknown cmd %#02x arg %#04x", cmd, argument);
+        }
+        this->sent_cmd_ = 0;
+        this->read_pos_ = 0;
+        return;
     }
-  }
+    this->read_buffer_[this->read_pos_] = byte;
+    this->read_pos_++;
+  });
 }
 void DFPlayer::dump_config() { ESP_LOGCONFIG(TAG, "DFPlayer:"); }
 

esphome/components/dfrobot_sen0609/dfrobot_sen0609.cpp

@@ -5,7 +5,6 @@
 #include "esphome/core/log.h"
 #include "esphome/core/progmem.h"
 
-#include <algorithm>
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
@@ -181,21 +180,11 @@ void DFRobotSEN0609Component::setup() {
 }
 
 void DFRobotSEN0609Component::loop() {
-  uint8_t buf[MAX_LINE_LENGTH];
-  size_t avail = this->available();
-  while (avail > 0) {
-    const size_t to_read = std::min(avail, sizeof(buf));
-    if (!this->read_array(buf, to_read)) {
-      if (!this->read_failed_) {
-        ESP_LOGW(TAG, "UART read failed");
-      }
-      this->read_failed_ = true;
-      break;
-    }
+  if (this->read_available<MAX_LINE_LENGTH>([this](uint8_t b) { this->readline_(b); })) {
     this->read_failed_ = false;
-    avail -= to_read;
-    for (size_t i = 0; i < to_read; i++)
-      this->readline_(buf[i]);
+  } else if (!this->read_failed_) {
+    ESP_LOGW(TAG, "UART read failed");
+    this->read_failed_ = true;
   }
   this->run_sequencer_();
 }

esphome/components/epaper_spi/epaper_goodisplay_3c.cpp

@@ -1,12 +0,0 @@
-#include "epaper_goodisplay_3c.h"
-
-namespace esphome::epaper_spi {
-
-void EPaperGoodDisplay3C::power_on() {}
-
-void EPaperGoodDisplay3C::refresh_screen(bool partial) {
-  EPaperWeAct3C::refresh_screen(partial);
-  this->next_delay_ = REFRESH_START_MS;
-}
-
-}  // namespace esphome::epaper_spi

esphome/components/epaper_spi/epaper_goodisplay_3c.h

@@ -1,28 +0,0 @@
-#pragma once
-
-#include "epaper_weact_3c.h"
-
-namespace esphome::epaper_spi {
-
-/**
- * Good Display 3-color e-paper displays (SSD1680 controller), e.g. GDEY029Z95.
- *
- * Driven as EPaperWeAct3C, except that there is no separate power-on: the full refresh (0xF7) powers the panel
- * up itself. Busy then only goes high a little after the refresh starts, so the next state waits before
- * checking it.
- */
-class EPaperGoodDisplay3C : public EPaperWeAct3C {
- public:
-  using EPaperWeAct3C::EPaperWeAct3C;
-
- protected:
-  // Time from master activation (0x20) until busy can be relied on
-  static constexpr uint16_t REFRESH_START_MS = 50;
-
-  // With EPaperWeAct3C's power-on (0x22 0xF8) first, this panel's refresh ends almost at once and the image
-  // does not change.
-  void power_on() override;
-  void refresh_screen(bool partial) override;
-};
-
-}  // namespace esphome::epaper_spi

esphome/components/epaper_spi/models/weact_bwr.py

@@ -4,17 +4,11 @@ Supported models:
 - weact-2.13in-3c: 122x250 pixels (2.13" display)
 - weact-2.9in-3c: 128x296 pixels (2.9" display)
 - weact-4.2in-3c: 400x300 pixels (4.2" display)
-- goodisplay-gdey029z95-2.9: 128x296 pixels (Good Display GDEY029Z95 2.9" display)
 
 These displays use SSD1680 or SSD1683 controller and require a specific initialization
 sequence. The DRV_OUT_CTL command is calculated from the display height.
-The Good Display panel is driven as the WeAct ones, except that it must not get the
-separate power-on before the refresh, so it has its own driver class, EPaperGoodDisplay3C.
 """
 
-import esphome.config_validation as cv
-from esphome.const import CONF_BUSY_PIN, CONF_RESET_PIN
-
 from . import EpaperModel
 
 
@@ -23,10 +17,8 @@ class WeActBWR(EpaperModel):
 
     source_files = ("epaper_weact_3c.cpp",)
 
-    def __init__(
-        self, name: str, class_name: str = "EPaperWeAct3C", **defaults: object
-    ) -> None:
-        super().__init__(name, class_name, **defaults)
+    def __init__(self, name, **defaults):
+        super().__init__(name, "EPaperWeAct3C", **defaults)
 
     def get_init_sequence(self, config):
         """Generate initialization sequence for WeAct BWR displays.
@@ -83,27 +75,3 @@ weact_4p2in3c = WeActBWR(
     data_rate="10MHz",
     minimum_update_interval="10s",
 )
-
-
-class GoodDisplayBWR(WeActBWR):
-    """Good Display Black/White/Red displays using SSD1680 controller."""
-
-    source_files = ("epaper_weact_3c.cpp", "epaper_goodisplay_3c.cpp")
-
-    def __init__(self, name: str, **defaults: object) -> None:
-        super().__init__(name, "EPaperGoodDisplay3C", **defaults)
-
-    def option(self, name, fallback=cv.UNDEFINED) -> cv.Optional | cv.Required:
-        # Only a hardware reset wakes the panel from deep sleep, and refreshes are timed by busy
-        if name in (CONF_RESET_PIN, CONF_BUSY_PIN):
-            return cv.Required(name)
-        return super().option(name, fallback)
-
-
-# Model: Good Display GDEY029Z95 2.9" BWR - 128x296 pixels, SSD1680 controller
-GoodDisplayBWR(
-    "goodisplay-gdey029z95-2.9",
-    width=128,
-    height=296,
-    minimum_update_interval="10s",
-)

esphome/components/ld2410/ld2410.cpp

@@ -274,20 +274,7 @@ void LD2410Component::restart_and_read_all_info() {
 }
 
 void LD2410Component::loop() {
-  // Read all available bytes in batches to reduce UART call overhead.
-  size_t avail = this->available();
-  uint8_t buf[MAX_LINE_LENGTH];
-  while (avail > 0) {
-    size_t to_read = std::min(avail, sizeof(buf));
-    if (!this->read_array(buf, to_read)) {
-      break;
-    }
-    avail -= to_read;
-
-    for (size_t i = 0; i < to_read; i++) {
-      this->readline_(buf[i]);
-    }
-  }
+  this->read_available<MAX_LINE_LENGTH>([this](uint8_t b) { this->readline_(b); });
 }
 
 void LD2410Component::send_command_(uint8_t command, const uint8_t *command_value, uint8_t command_value_len) {
@@ -407,10 +394,12 @@ void LD2410Component::handle_periodic_data_() {
 }
 
 #ifdef USE_NUMBER
-void set_number_value(number::Number *n, float value) {
+std::function<void()> set_number_value(number::Number *n, float value) {
   if (n != nullptr && (!n->has_state() || n->state != value)) {
-    n->publish_state(value);
+    n->state = value;
+    return [n, value]() { n->publish_state(value); };
   }
+  return []() {};
 }
 #endif
 
@@ -558,24 +547,29 @@ bool LD2410Component::handle_ack_data_() {
         Moving distance range: 13th byte
         Still distance range: 14th byte
       */
-      set_number_value(this->max_move_distance_gate_number_, this->buffer_data_[12]);
-      set_number_value(this->max_still_distance_gate_number_, this->buffer_data_[13]);
+      std::vector<std::function<void()>> updates;
+      updates.push_back(set_number_value(this->max_move_distance_gate_number_, this->buffer_data_[12]));
+      updates.push_back(set_number_value(this->max_still_distance_gate_number_, this->buffer_data_[13]));
       /*
         Moving Sensitivities: 15~23th bytes
       */
-      for (size_t i = 0; i < TOTAL_GATES; i++) {
-        set_number_value(this->gate_move_threshold_numbers_[i], this->buffer_data_[14 + i]);
+      for (std::vector<number::Number *>::size_type i = 0; i != this->gate_move_threshold_numbers_.size(); i++) {
+        updates.push_back(set_number_value(this->gate_move_threshold_numbers_[i], this->buffer_data_[14 + i]));
       }
       /*
         Still Sensitivities: 24~32th bytes
       */
-      for (size_t i = 0; i < TOTAL_GATES; i++) {
-        set_number_value(this->gate_still_threshold_numbers_[i], this->buffer_data_[23 + i]);
+      for (std::vector<number::Number *>::size_type i = 0; i != this->gate_still_threshold_numbers_.size(); i++) {
+        updates.push_back(set_number_value(this->gate_still_threshold_numbers_[i], this->buffer_data_[23 + i]));
       }
       /*
         None Duration: 33~34th bytes
       */
-      set_number_value(this->timeout_number_, encode_uint16(this->buffer_data_[33], this->buffer_data_[32]));
+      updates.push_back(
+          set_number_value(this->timeout_number_, encode_uint16(this->buffer_data_[33], this->buffer_data_[32])));
+      for (auto &update : updates) {
+        update();
+      }
 #endif
       break;
     }

esphome/components/ld2410s/ld2410s.cpp

@@ -1,6 +1,5 @@
 #include "ld2410s.h"
 #include "ld2410s_number.h"
-#include <algorithm>
 #include <cstring>
 #include "esphome/core/application.h"
 #include "esphome/core/hal.h"
@@ -95,19 +94,8 @@ void LD2410SComponent::dump_config() {
 }
 
 void LD2410SComponent::loop() {
-  uint8_t chunk[16];
-  // Take the count once so one pass handles a bounded number of bytes
-  size_t avail = this->available();
-  while (avail > 0) {
-    const size_t len = std::min(avail, sizeof(chunk));
-    if (!this->read_array(chunk, len)) {
-      ESP_LOGV(TAG, "UART read of %u bytes failed", static_cast<unsigned>(len));
-      break;
-    }
-    for (size_t i = 0; i < len; i++) {
-      this->receive_byte_(chunk[i]);
-    }
-    avail -= len;
+  if (!this->read_available<16>([this](uint8_t b) { this->receive_byte_(b); })) {
+    ESP_LOGV(TAG, "UART read failed");
   }
   const uint32_t now = App.get_loop_component_start_time();
   if (this->sequence_ == nullptr) {

esphome/components/ld2412/ld2412.cpp

@@ -316,20 +316,7 @@ void LD2412Component::restart_and_read_all_info() {
 }
 
 void LD2412Component::loop() {
-  // Read all available bytes in batches to reduce UART call overhead.
-  size_t avail = this->available();
-  uint8_t buf[MAX_LINE_LENGTH];
-  while (avail > 0) {
-    size_t to_read = std::min(avail, sizeof(buf));
-    if (!this->read_array(buf, to_read)) {
-      break;
-    }
-    avail -= to_read;
-
-    for (size_t i = 0; i < to_read; i++) {
-      this->readline_(buf[i]);
-    }
-  }
+  this->read_available<MAX_LINE_LENGTH>([this](uint8_t b) { this->readline_(b); });
 }
 
 void LD2412Component::send_command_(uint8_t command, const uint8_t *command_value, uint8_t command_value_len) {

esphome/components/ld2420/ld2420.cpp

@@ -543,20 +543,8 @@ void LD2420Component::handle_simple_mode_(const uint8_t *inbuf, int len) {
 }
 
 void LD2420Component::read_batch_(std::span<uint8_t, MAX_LINE_LENGTH> buffer) {
-  // Read all available bytes in batches to reduce UART call overhead.
-  size_t avail = this->available();
-  uint8_t buf[MAX_LINE_LENGTH];
-  while (avail > 0) {
-    size_t to_read = std::min(avail, sizeof(buf));
-    if (!this->read_array(buf, to_read)) {
-      break;
-    }
-    avail -= to_read;
-
-    for (size_t i = 0; i < to_read; i++) {
-      this->readline_(buf[i], buffer.data(), buffer.size());
-    }
-  }
+  this->read_available<MAX_LINE_LENGTH>(
+      [this, &buffer](uint8_t b) { this->readline_(b, buffer.data(), buffer.size()); });
 }
 
 void LD2420Component::handle_ack_data_(uint8_t *buffer, int len) {

esphome/components/ld2450/ld2450.cpp

@@ -288,20 +288,7 @@ void LD2450Component::dump_config() {
 }
 
 void LD2450Component::loop() {
-  // Read all available bytes in batches to reduce UART call overhead.
-  size_t avail = this->available();
-  uint8_t buf[MAX_LINE_LENGTH];
-  while (avail > 0) {
-    size_t to_read = std::min(avail, sizeof(buf));
-    if (!this->read_array(buf, to_read)) {
-      break;
-    }
-    avail -= to_read;
-
-    for (size_t i = 0; i < to_read; i++) {
-      this->readline_(buf[i]);
-    }
-  }
+  this->read_available<MAX_LINE_LENGTH>([this](uint8_t b) { this->readline_(b); });
 }
 
 // Count targets in zone (single pass for both still and moving)

esphome/components/ld2460/ld2460.cpp

@@ -82,19 +82,7 @@ void LD2460Component::dump_config() {
 }
 
 void LD2460Component::loop() {
-  size_t avail = this->available();
-  uint8_t buf[MAX_LINE_LENGTH];
-  while (avail > 0) {
-    size_t to_read = std::min(avail, sizeof(buf));
-    if (!this->read_array(buf, to_read)) {
-      break;
-    }
-    avail -= to_read;
-
-    for (size_t i = 0; i < to_read; i++) {
-      this->readline_(buf[i]);
-    }
-  }
+  this->read_available<MAX_LINE_LENGTH>([this](uint8_t b) { this->readline_(b); });
 }
 
 void LD2460Component::handle_periodic_data_() {

esphome/components/mipi_spi/mipi_spi.h

@@ -244,9 +244,9 @@ class MipiSpi : public display::Display,
     char hex_buf[format_hex_pretty_size(MIPI_SPI_MAX_CMD_LOG_BYTES)];
     // Don't spam the log after setup
     if (this->init_sequence_len_ == 0) {
-      esph_log_v(TAG, "Command %02X, length %zu, bytes %s", cmd, len, format_hex_pretty_to(hex_buf, bytes, len));
+      esph_log_v(TAG, "Command %02X, length %d, bytes %s", cmd, len, format_hex_pretty_to(hex_buf, bytes, len));
     } else {
-      esph_log_d(TAG, "Command %02X, length %zu, bytes %s", cmd, len, format_hex_pretty_to(hex_buf, bytes, len));
+      esph_log_d(TAG, "Command %02X, length %d, bytes %s", cmd, len, format_hex_pretty_to(hex_buf, bytes, len));
     }
     if constexpr (BUS_TYPE == BUS_TYPE_QUAD) {
       this->enable();

esphome/components/nextion/nextion.cpp

@@ -532,18 +532,9 @@ void Nextion::set_string_return_(const std::string &value) {
 }
 
 void Nextion::process_serial_() {
-  // Read all available bytes in batches to reduce UART call overhead.
-  size_t avail = this->available();
-  uint8_t buf[64];
-  while (avail > 0) {
-    size_t to_read = std::min(avail, sizeof(buf));
-    if (!this->read_array(buf, to_read)) {
-      break;
-    }
-    avail -= to_read;
-
-    this->command_data_.append(reinterpret_cast<const char *>(buf), to_read);
-  }
+  this->read_available_chunks([this](const uint8_t *data, size_t len) {
+    this->command_data_.append(reinterpret_cast<const char *>(data), len);
+  });
 }
 // nextion.tech/instruction-set/
 void Nextion::process_nextion_commands_() {

esphome/components/pipsolar/pipsolar.cpp

@@ -86,47 +86,31 @@ void Pipsolar::loop() {
   }
 
   if (this->state_ == STATE_COMMAND || this->state_ == STATE_POLL) {
-    size_t avail = this->available();
-    while (avail > 0) {
-      uint8_t buf[64];
-      size_t to_read = std::min(avail, sizeof(buf));
-      if (!this->read_array(buf, to_read)) {
-        break;
+    this->read_available([this](uint8_t byte) {
+      // make sure data and null terminator fit in buffer
+      if (this->read_pos_ >= PIPSOLAR_READ_BUFFER_LENGTH - 1) {
+        this->read_pos_ = 0;
+        this->discard_available();
+        ESP_LOGW(TAG, "response data too long, discarding.");
+        return false;
       }
-      avail -= to_read;
-      bool done = false;
-      for (size_t i = 0; i < to_read; i++) {
-        uint8_t byte = buf[i];
+      this->read_buffer_[this->read_pos_] = byte;
+      this->read_pos_++;
 
-        // make sure data and null terminator fit in buffer
-        if (this->read_pos_ >= PIPSOLAR_READ_BUFFER_LENGTH - 1) {
-          this->read_pos_ = 0;
-          this->discard_available();
-          ESP_LOGW(TAG, "response data too long, discarding.");
-          done = true;
-          break;
+      // end of answer
+      if (byte == 0x0D) {
+        this->read_buffer_[this->read_pos_] = 0;
+        this->discard_available();
+        if (this->state_ == STATE_POLL) {
+          this->state_ = STATE_POLL_COMPLETE;
         }
-        this->read_buffer_[this->read_pos_] = byte;
-        this->read_pos_++;
-
-        // end of answer
-        if (byte == 0x0D) {
-          this->read_buffer_[this->read_pos_] = 0;
-          this->discard_available();
-          if (this->state_ == STATE_POLL) {
-            this->state_ = STATE_POLL_COMPLETE;
-          }
-          if (this->state_ == STATE_COMMAND) {
-            this->state_ = STATE_COMMAND_COMPLETE;
-          }
-          done = true;
-          break;
+        if (this->state_ == STATE_COMMAND) {
+          this->state_ = STATE_COMMAND_COMPLETE;
         }
+        return false;
       }
-      if (done) {
-        break;
-      }
-    }
+      return true;
+    });
   }
   if (this->state_ == STATE_COMMAND) {
     if (millis() - this->command_start_millis_ > esphome::pipsolar::Pipsolar::COMMAND_TIMEOUT) {

esphome/components/rd03d/rd03d.cpp

@@ -85,49 +85,38 @@ void RD03DComponent::dump_config() {
 }
 
 void RD03DComponent::loop() {
-  // Read all available bytes in batches to reduce UART call overhead.
-  size_t avail = this->available();
-  uint8_t buf[64];
-  while (avail > 0) {
-    size_t to_read = std::min(avail, sizeof(buf));
-    if (!this->read_array(buf, to_read)) {
-      break;
-    }
-    avail -= to_read;
-    for (size_t i = 0; i < to_read; i++) {
-      uint8_t byte = buf[i];
-      ESP_LOGVV(TAG, "Received byte: 0x%02X, buffer_pos: %d", byte, this->buffer_pos_);
+  this->read_available([this](uint8_t byte) {
+    ESP_LOGVV(TAG, "Received byte: 0x%02X, buffer_pos: %d", byte, this->buffer_pos_);
 
-      // Check if we're looking for frame header
-      if (this->buffer_pos_ < FRAME_HEADER_SIZE) {
-        if (byte == FRAME_HEADER[this->buffer_pos_]) {
-          this->buffer_[this->buffer_pos_++] = byte;
-        } else if (byte == FRAME_HEADER[0]) {
-          // Start over if we see a potential new header
-          this->buffer_[0] = byte;
-          this->buffer_pos_ = 1;
-        } else {
-          this->buffer_pos_ = 0;
-        }
-        continue;
-      }
-
-      // Accumulate data bytes
-      this->buffer_[this->buffer_pos_++] = byte;
-
-      // Check if we have a complete frame
-      if (this->buffer_pos_ == FRAME_SIZE) {
-        // Validate footer
-        if (this->buffer_[FRAME_SIZE - 2] == FRAME_FOOTER[0] && this->buffer_[FRAME_SIZE - 1] == FRAME_FOOTER[1]) {
-          this->process_frame_();
-        } else {
-          ESP_LOGW(TAG, "Invalid frame footer: 0x%02X 0x%02X (expected 0x55 0xCC)", this->buffer_[FRAME_SIZE - 2],
-                   this->buffer_[FRAME_SIZE - 1]);
-        }
+    // Check if we're looking for frame header
+    if (this->buffer_pos_ < FRAME_HEADER_SIZE) {
+      if (byte == FRAME_HEADER[this->buffer_pos_]) {
+        this->buffer_[this->buffer_pos_++] = byte;
+      } else if (byte == FRAME_HEADER[0]) {
+        // Start over if we see a potential new header
+        this->buffer_[0] = byte;
+        this->buffer_pos_ = 1;
+      } else {
         this->buffer_pos_ = 0;
       }
+      return;
     }
-  }
+
+    // Accumulate data bytes
+    this->buffer_[this->buffer_pos_++] = byte;
+
+    // Check if we have a complete frame
+    if (this->buffer_pos_ == FRAME_SIZE) {
+      // Validate footer
+      if (this->buffer_[FRAME_SIZE - 2] == FRAME_FOOTER[0] && this->buffer_[FRAME_SIZE - 1] == FRAME_FOOTER[1]) {
+        this->process_frame_();
+      } else {
+        ESP_LOGW(TAG, "Invalid frame footer: 0x%02X 0x%02X (expected 0x55 0xCC)", this->buffer_[FRAME_SIZE - 2],
+                 this->buffer_[FRAME_SIZE - 1]);
+      }
+      this->buffer_pos_ = 0;
+    }
+  });
 }
 
 void RD03DComponent::process_frame_() {

esphome/components/rf_bridge/rf_bridge.cpp

@@ -201,27 +201,21 @@ void RFBridgeComponent::loop() {
     this->last_bridge_byte_ = now;
   }
 
-  while (avail > 0) {
-    uint8_t buf[64];
-    size_t to_read = std::min(avail, sizeof(buf));
-    if (!this->read_array(buf, to_read)) {
-      break;
-    }
-    avail -= to_read;
-    for (size_t i = 0; i < to_read; i++) {
-      if (this->rx_buffer_.size() > MAX_RX_BUFFER_SIZE) {
-        this->rx_buffer_.clear();
-        this->bucket_frame_candidate_ = false;
-      }
-      if (this->parse_bridge_byte_(buf[i])) {
-        ESP_LOGVV(TAG, "Parsed: 0x%02X", buf[i]);
-        this->last_bridge_byte_ = now;
-      } else {
-        this->rx_buffer_.clear();
-        this->bucket_frame_candidate_ = false;
-      }
-    }
-  }
+  this->read_available(
+      [this, now](uint8_t byte) {
+        if (this->rx_buffer_.size() > MAX_RX_BUFFER_SIZE) {
+          this->rx_buffer_.clear();
+          this->bucket_frame_candidate_ = false;
+        }
+        if (this->parse_bridge_byte_(byte)) {
+          ESP_LOGVV(TAG, "Parsed: 0x%02X", byte);
+          this->last_bridge_byte_ = now;
+        } else {
+          this->rx_buffer_.clear();
+          this->bucket_frame_candidate_ = false;
+        }
+      },
+      avail);
 }
 
 void RFBridgeComponent::send_code(RFBridgeData data) {

esphome/components/seeed_mr24hpc1/seeed_mr24hpc1.cpp

@@ -110,20 +110,7 @@ void MR24HPC1Component::update_() {
 
 // main loop
 void MR24HPC1Component::loop() {
-  // Read all available bytes in batches to reduce UART call overhead.
-  size_t avail = this->available();
-  uint8_t buf[64];
-  while (avail > 0) {
-    size_t to_read = std::min(avail, sizeof(buf));
-    if (!this->read_array(buf, to_read)) {
-      break;
-    }
-    avail -= to_read;
-
-    for (size_t i = 0; i < to_read; i++) {
-      this->r24_split_data_frame_(buf[i]);  // split data frame
-    }
-  }
+  this->read_available([this](uint8_t b) { this->r24_split_data_frame_(b); });
 
   if ((this->s_output_info_switch_flag_ == OUTPUT_SWTICH_OFF) &&
       (this->sg_start_query_data_ > CUSTOM_FUNCTION_QUERY_TIME_OF_ENTER_UNMANNED) && (!this->check_dev_inf_sign_)) {

esphome/components/seeed_mr60bha2/seeed_mr60bha2.cpp

@@ -29,23 +29,12 @@ void MR60BHA2Component::dump_config() {
 
 // main loop
 void MR60BHA2Component::loop() {
-  // Read all available bytes in batches to reduce UART call overhead.
-  size_t avail = this->available();
-  uint8_t buf[64];
-  while (avail > 0) {
-    size_t to_read = std::min(avail, sizeof(buf));
-    if (!this->read_array(buf, to_read)) {
-      break;
+  this->read_available([this](uint8_t b) {
+    this->rx_message_.push_back(b);
+    if (!this->validate_message_()) {
+      this->rx_message_.clear();
     }
-    avail -= to_read;
-
-    for (size_t i = 0; i < to_read; i++) {
-      this->rx_message_.push_back(buf[i]);
-      if (!this->validate_message_()) {
-        this->rx_message_.clear();
-      }
-    }
-  }
+  });
 }
 
 /**

esphome/components/seeed_mr60fda2/seeed_mr60fda2.cpp

@@ -46,20 +46,7 @@ void MR60FDA2Component::setup() {
 
 // main loop
 void MR60FDA2Component::loop() {
-  // Read all available bytes in batches to reduce UART call overhead.
-  size_t avail = this->available();
-  uint8_t buf[64];
-  while (avail > 0) {
-    size_t to_read = std::min(avail, sizeof(buf));
-    if (!this->read_array(buf, to_read)) {
-      break;
-    }
-    avail -= to_read;
-
-    for (size_t i = 0; i < to_read; i++) {
-      this->split_frame_(buf[i]);  // split data frame
-    }
-  }
+  this->read_available([this](uint8_t b) { this->split_frame_(b); });
 }
 
 // The checksum is the inverted XOR of the bytes

esphome/components/tuya/tuya.cpp

@@ -54,20 +54,7 @@ void Tuya::setup() {
 }
 
 void Tuya::loop() {
-  // Read all available bytes in batches to reduce UART call overhead.
-  size_t avail = this->available();
-  uint8_t buf[64];
-  while (avail > 0) {
-    size_t to_read = std::min(avail, sizeof(buf));
-    if (!this->read_array(buf, to_read)) {
-      break;
-    }
-    avail -= to_read;
-
-    for (size_t i = 0; i < to_read; i++) {
-      this->handle_char_(buf[i]);
-    }
-  }
+  this->read_available([this](uint8_t b) { this->handle_char_(b); });
   process_command_queue_();
 }
 

esphome/components/web_server/web_server.cpp

@@ -1043,7 +1043,7 @@ void WebServer::handle_light_request(AsyncWebServerRequest *request, const UrlMa
       if (is_on) {
         parse_cstr_param_(
             request, ESPHOME_F("effect"), call,
-            static_cast<light::LightCall &(light::LightCall::*)(const char *, size_t)>(&decltype(call)::set_effect));
+            static_cast<light::LightCall &(light::LightCall::*) (const char *, size_t)>(&decltype(call)::set_effect));
       }
 
       DEFER_ACTION(call, call.perform());
@@ -1404,7 +1404,7 @@ void WebServer::handle_text_request(AsyncWebServerRequest *request, const UrlMat
     auto call = obj->make_call();
     parse_cstr_param_(
         request, ESPHOME_F("value"), call,
-        static_cast<text::TextCall &(text::TextCall::*)(const char *, size_t)>(&decltype(call)::set_value));
+        static_cast<text::TextCall &(text::TextCall::*) (const char *, size_t)>(&decltype(call)::set_value));
 
     DEFER_ACTION(call, call.perform());
     request->send(200);
@@ -1464,7 +1464,7 @@ void WebServer::handle_select_request(AsyncWebServerRequest *request, const UrlM
     auto call = obj->make_call();
     parse_cstr_param_(
         request, ESPHOME_F("option"), call,
-        static_cast<select::SelectCall &(select::SelectCall::*)(const char *, size_t)>(&decltype(call)::set_option));
+        static_cast<select::SelectCall &(select::SelectCall::*) (const char *, size_t)>(&decltype(call)::set_option));
 
     DEFER_ACTION(call, call.perform());
     request->send(200);
@@ -1522,26 +1522,26 @@ void WebServer::handle_climate_request(AsyncWebServerRequest *request, const Url
     // Parse string mode parameters
     parse_cstr_param_(
         request, ESPHOME_F("mode"), call,
-        static_cast<climate::ClimateCall &(climate::ClimateCall::*)(const char *, size_t)>(&decltype(call)::set_mode));
+        static_cast<climate::ClimateCall &(climate::ClimateCall::*) (const char *, size_t)>(&decltype(call)::set_mode));
     parse_cstr_param_(request, ESPHOME_F("fan_mode"), call,
-                      static_cast<climate::ClimateCall &(climate::ClimateCall::*)(const char *, size_t)>(
+                      static_cast<climate::ClimateCall &(climate::ClimateCall::*) (const char *, size_t)>(
                           &decltype(call)::set_fan_mode));
     parse_cstr_param_(request, ESPHOME_F("swing_mode"), call,
-                      static_cast<climate::ClimateCall &(climate::ClimateCall::*)(const char *, size_t)>(
+                      static_cast<climate::ClimateCall &(climate::ClimateCall::*) (const char *, size_t)>(
                           &decltype(call)::set_swing_mode));
     parse_cstr_param_(request, ESPHOME_F("preset"), call,
-                      static_cast<climate::ClimateCall &(climate::ClimateCall::*)(const char *, size_t)>(
+                      static_cast<climate::ClimateCall &(climate::ClimateCall::*) (const char *, size_t)>(
                           &decltype(call)::set_preset));
 
     // Parse temperature parameters
     // static_cast needed to disambiguate overloaded setters (float vs optional<float>)
     using ClimateCall = decltype(call);
     parse_num_param_(request, ESPHOME_F("target_temperature_high"), call,
-                     static_cast<ClimateCall &(ClimateCall::*)(float)>(&ClimateCall::set_target_temperature_high));
+                     static_cast<ClimateCall &(ClimateCall::*) (float)>(&ClimateCall::set_target_temperature_high));
     parse_num_param_(request, ESPHOME_F("target_temperature_low"), call,
-                     static_cast<ClimateCall &(ClimateCall::*)(float)>(&ClimateCall::set_target_temperature_low));
+                     static_cast<ClimateCall &(ClimateCall::*) (float)>(&ClimateCall::set_target_temperature_low));
     parse_num_param_(request, ESPHOME_F("target_temperature"), call,
-                     static_cast<ClimateCall &(ClimateCall::*)(float)>(&ClimateCall::set_target_temperature));
+                     static_cast<ClimateCall &(ClimateCall::*) (float)>(&ClimateCall::set_target_temperature));
 
     DEFER_ACTION(call, call.perform());
     request->send(200);
@@ -1818,8 +1818,8 @@ void WebServer::handle_alarm_control_panel_request(AsyncWebServerRequest *reques
     auto call = obj->make_call();
     parse_cstr_param_(
         request, ESPHOME_F("code"), call,
-        static_cast<alarm_control_panel::AlarmControlPanelCall &(alarm_control_panel::AlarmControlPanelCall::*)(
-            const char *, size_t)>(&decltype(call)::set_code));
+        static_cast<alarm_control_panel::AlarmControlPanelCall &(
+            alarm_control_panel::AlarmControlPanelCall::*) (const char *, size_t)>(&decltype(call)::set_code));
 
     static constexpr ActionEntry<alarm_control_panel::AlarmControlPanelCall> ACTIONS[] PROGMEM = {
         {"disarm", &alarm_control_panel::AlarmControlPanelCall::disarm},
@@ -1893,7 +1893,7 @@ void WebServer::handle_water_heater_request(AsyncWebServerRequest *request, cons
     // Parse mode parameter
     parse_cstr_param_(
         request, ESPHOME_F("mode"), base_call,
-        static_cast<water_heater::WaterHeaterCall &(water_heater::WaterHeaterCall::*)(const char *, size_t)>(
+        static_cast<water_heater::WaterHeaterCall &(water_heater::WaterHeaterCall::*) (const char *, size_t)>(
             &water_heater::WaterHeaterCall::set_mode));
 
     // Parse temperature parameters

esphome/components/xiaomi_hhccpot002/xiaomi_hhccpot002.cpp

@@ -5,7 +5,7 @@ namespace esphome::xiaomi_hhccpot002 {
 
 ESPHOME_LOG_TAG(TAG, "xiaomi_hhccpot002");
 
-void XiaomiHHCCPOT002::dump_config() {
+void XiaomiHHCCPOT002 ::dump_config() {
   ESP_LOGCONFIG(TAG, "Xiaomi HHCCPOT002");
   LOG_SENSOR("  ", "Moisture", this->moisture_);
   LOG_SENSOR("  ", "Conductivity", this->conductivity_);

esphome/core/lock_free_queue.h

@@ -59,15 +59,13 @@ template<typename T> class PlainAtomic {
   constexpr PlainAtomic(T value) : value_(value) {}
   T load(std::memory_order order = std::memory_order_seq_cst) const {
     T value = value_;
-    if (order != std::memory_order_relaxed) {
+    if (order != std::memory_order_relaxed)
       ESPHOME_LFQ_COMPILER_BARRIER();  // acquire: later reads may not hoist above this load
-    }
     return value;
   }
   void store(T value, std::memory_order order = std::memory_order_seq_cst) {
-    if (order != std::memory_order_relaxed) {
+    if (order != std::memory_order_relaxed)
       ESPHOME_LFQ_COMPILER_BARRIER();  // release: earlier writes may not sink below this store
-    }
     value_ = value;
   }
   T fetch_add(T amount, std::memory_order /*order*/ = std::memory_order_seq_cst) {

requirements.txt

@@ -12,7 +12,7 @@ pyserial==3.5
 platformio==6.2.0
 esptool==5.6.0
 click==8.5.0
-aioesphomeapi==46.19.0
+aioesphomeapi==46.18.0
 aiohappyeyeballs==2.7.1  # Happy Eyeballs for requests downloads; already pulled in by aioesphomeapi
 zeroconf==0.151.5
 puremagic==2.2.0

requirements_dev.txt

@@ -1,4 +1,4 @@
 # Useful stuff when working in a development environment
-clang-format==23.1.3  # .pre-commit-config.yaml rev synced by script/sync_dependency_versions.py
-clang-tidy==23.1.3
+clang-format==22.1.8  # .pre-commit-config.yaml rev synced by script/sync_dependency_versions.py
+clang-tidy==22.1.8
 yamllint==1.38.0  # .pre-commit-config.yaml rev synced by script/sync_dependency_versions.py

script/clang-tidy

@@ -319,15 +319,21 @@ def run_tidy(
         disabled_checks = []
         if args.environment.startswith(("rp2", "bk72xx", "ln882h", "rtl87xx")):
             # MMIO peripheral access on these bare-metal platforms is all
-            # fixed-address. clang-tidy 23 moved the checker under optin.
-            disabled_checks += [
-                "-clang-analyzer-core.FixedAddressDereference",
-                "-clang-analyzer-optin.core.FixedAddressDereference",
-            ]
+            # fixed-address.
+            disabled_checks.append("-clang-analyzer-core.FixedAddressDereference")
         if args.environment.startswith("host"):
             # glibc's assert() expands to a call the check mistakes for a
             # constant condition.
             disabled_checks += ["-misc-static-assert", "-cert-dcl03-c"]
+        if args.environment.startswith(("rp2", "bk72xx", "ln882h", "rtl87xx", "host")):
+            # bugprone-pointer-arithmetic-on-polymorphic-object (and its
+            # cert-ctr56-cpp alias) crashes clang-tidy 22 with infinite matcher
+            # recursion on lvgl_esphome.h under the RP2 defines and on the
+            # all-include file under the host defines.
+            disabled_checks += [
+                "-bugprone-pointer-arithmetic-on-polymorphic-object",
+                "-cert-ctr56-cpp",
+            ]
         if os.path.normpath(path) in ANALYZER_SKIPPED_FILES:
             disabled_checks.append("-clang-analyzer-*")
         if disabled_checks:
@@ -517,7 +523,7 @@ def main():
     failed_files = []
     timings = []
     try:
-        executable = get_binary("clang-tidy", 23)
+        executable = get_binary("clang-tidy", 22)
         task_queue = queue.Queue(args.jobs)
         lock = threading.Lock()
         for _ in range(args.jobs):
@@ -565,13 +571,13 @@ def main():
         try:
             try:
                 subprocess.call(
-                    ["clang-apply-replacements-23", tmpdir], close_fds=False
+                    ["clang-apply-replacements-22", tmpdir], close_fds=False
                 )
             except FileNotFoundError:
                 subprocess.call(["clang-apply-replacements", tmpdir], close_fds=False)
         except FileNotFoundError:
             print(
-                "Error please install clang-apply-replacements-23 or clang-apply-replacements.\n",
+                "Error please install clang-apply-replacements-22 or clang-apply-replacements.\n",
                 file=sys.stderr,
             )
         except:

tests/component_tests/epaper_spi/test_init.py

@@ -621,69 +621,6 @@ def test_uc8279_width_must_be_a_multiple_of_8(
         )
 
 
-GDEY029Z95 = "goodisplay-gdey029z95-2.9"
-
-
-def _gdey029z95_config(**overrides: Any) -> ConfigType:
-    config: ConfigType = {
-        "id": "test_display",
-        "model": GDEY029Z95,
-        CONF_DC_PIN: 21,
-        CONF_RESET_PIN: 22,
-        CONF_BUSY_PIN: 23,
-    }
-    config.update(overrides)
-    return config
-
-
-def test_gdey029z95_uses_the_good_display_driver() -> None:
-    """The GDEY029Z95 uses EPaperGoodDisplay3C with the WeAct init sequence."""
-    model = MODELS[GDEY029Z95.upper()]
-
-    assert model.class_name == "EPaperGoodDisplay3C"
-    assert model.get_init_sequence({}) == (
-        (0x01, 0x27, 0x01, 0x00),
-        (0x11, 0x03),
-        (0x3C, 0x05),
-        (0x18, 0x80),
-        (0x21, 0x00, 0x80),
-    )
-
-
-@pytest.mark.parametrize("pin", [CONF_RESET_PIN, CONF_BUSY_PIN])
-def test_gdey029z95_requires_reset_and_busy_pins(
-    set_core_config: SetCoreConfigCallable,
-    set_component_config: Callable[[str, Any], None],
-    pin: str,
-) -> None:
-    """Only a hardware reset wakes the panel from deep sleep, and refreshes are timed by busy."""
-    set_core_config(
-        PlatformFramework.ESP32_IDF,
-        platform_data={KEY_BOARD: "esp32dev", KEY_VARIANT: VARIANT_ESP32},
-    )
-    set_component_config("spi", {"id": "spi_bus", "clk_pin": 18, "mosi_pin": 19})
-
-    config = _gdey029z95_config()
-    del config[pin]
-    with pytest.raises(cv.Invalid, match=pin):
-        run_schema_validation(config)
-
-
-def test_gdey029z95_has_no_partial_update(
-    set_core_config: SetCoreConfigCallable,
-    set_component_config: Callable[[str, Any], None],
-) -> None:
-    set_core_config(
-        PlatformFramework.ESP32_IDF,
-        platform_data={KEY_BOARD: "esp32dev", KEY_VARIANT: VARIANT_ESP32},
-    )
-    set_component_config("spi", {"id": "spi_bus", "clk_pin": 18, "mosi_pin": 19})
-
-    run_schema_validation(_gdey029z95_config())
-    with pytest.raises(cv.Invalid, match="does not support partial update"):
-        run_schema_validation(_gdey029z95_config(full_update_every=2))
-
-
 def test_uc8279_x4pro_code_generation(
     generate_main: Callable[[str | Path], str],
     component_config_path: Callable[[str], Path],

tests/components/climate/common.yaml

@@ -100,14 +100,6 @@ button:
           id: climate_test_thermostat
           custom_fan_mode: !lambda return "quiet";
           custom_preset: !lambda return "Default";
-  # Inlined lambdas returning a StringRef, the shape an api action string variable takes (issue #21327)
-  - platform: template
-    name: "Climate Control StringRef Lambdas"
-    on_press:
-      - climate.control:
-          id: climate_test_thermostat
-          custom_fan_mode: !lambda return id(climate_test_thermostat).get_custom_fan_mode();
-          custom_preset: !lambda return id(climate_test_thermostat).get_custom_preset();
 
 # Exercise climate.control inside a trigger with non-empty Ts (number on_value
 # passes float).

tests/components/epaper_spi/display/test_goodisplay_3c_transfer.cpp

@@ -1,164 +0,0 @@
-#include <gtest/gtest.h>
-
-#include <utility>
-#include <vector>
-
-#include "../common.h"
-#include "esphome/components/epaper_spi/epaper_goodisplay_3c.h"
-
-namespace esphome::epaper_spi::testing {
-namespace {
-
-class TestableGoodDisplay3C : public EPaperGoodDisplay3C {
- public:
-  TestableGoodDisplay3C(uint16_t width, uint16_t height) : EPaperGoodDisplay3C("test", width, height, nullptr, 0) {}
-
-  void install(spi::SPIDelegate *delegate) {
-    this->delegate_ = delegate;
-    this->set_dc_pin(&this->dc);
-    ASSERT_TRUE(this->init_buffer_(this->buffer_length_));
-  }
-
-  void draw(int x, int y, Color color) { this->draw_pixel_at(x, y, color); }
-
-  /// Both planes of one push; returns how many calls it took.
-  int run_push() {
-    int calls = 1;
-    while (!this->transfer_data())
-      calls++;
-    return calls;
-  }
-
-  /// A whole update with the frame already drawn, run through loop() as the main loop would.
-  void run_update() {
-    this->set_auto_clear(false);
-    this->state_ = EPaperState::UPDATE;
-    const uint32_t deadline = millis() + 2000;
-    while (this->state_ != EPaperState::IDLE) {
-      ASSERT_LT(millis(), deadline) << "update did not finish";
-      this->loop();
-    }
-  }
-
-  using EPaperGoodDisplay3C::REFRESH_START_MS;
-
-  RecordingPin dc;
-};
-
-/// Also notes when each command byte was sent.
-class TimedCommandDelegate : public RecordingDelegate {
- public:
-  using RecordingDelegate::RecordingDelegate;
-
-  void write_array(const uint8_t *ptr, size_t length) override {
-    if (!this->dc_->level) {
-      for (size_t i = 0; i != length; i++)
-        this->sent.emplace_back(ptr[i], millis());
-    }
-    RecordingDelegate::write_array(ptr, length);
-  }
-
-  /// When the n-th (from 0) copy of a command was sent.
-  uint32_t time_of(uint8_t command, int n = 0) const {
-    for (const auto &[byte, time] : this->sent) {
-      if (byte == command && n-- == 0)
-        return time;
-    }
-    ADD_FAILURE() << "command " << int(command) << " not sent";
-    return 0;
-  }
-
-  std::vector<std::pair<uint8_t, uint32_t>> sent;
-};
-
-using Bytes = std::vector<uint8_t>;
-
-const Color RED(255, 0, 0);
-
-/// One row of 16 pixels: white, black, red, then white. The red plane goes first as 1=red, then the black/white
-/// plane as 1=white with red pixels sent as 0.
-TEST(EPaperGoodDisplay3CTransfer, PixelsReachThePanel) {
-  TestableGoodDisplay3C display(16, 1);
-  RecordingDelegate bus(&display.dc);
-  display.install(&bus);
-
-  display.fill(Color::WHITE);
-  display.draw(1, 0, Color::BLACK);
-  display.draw(2, 0, RED);
-  EXPECT_EQ(display.run_push(), 1);
-
-  EXPECT_EQ(bus.commands, (Bytes{0x44, 0x45, 0x4E, 0x4F, 0x26, 0x24}));
-  EXPECT_EQ(bus.data[0x44], (Bytes{0x00, 0x01}));
-  EXPECT_EQ(bus.data[0x45], (Bytes{0x00, 0x00, 0x00, 0x00}));
-  EXPECT_EQ(bus.data[0x24], (Bytes{0x9F, 0xFF}));
-  EXPECT_EQ(bus.data[0x26], (Bytes{0x20, 0x00}));
-}
-
-/// A push that yields to the main loop after every chunk sends the same commands and bytes as one that runs to
-/// completion in one call, and a second push starts again from the window setup.
-TEST(EPaperGoodDisplay3CTransfer, ResumedPushMatches) {
-  // 128x20 pixels is 320 bytes per plane, so each plane takes three chunks of up to MAX_TRANSFER_SIZE.
-  constexpr int width = 128;
-  constexpr int height = 20;
-  const Color colors[] = {Color::WHITE, Color::BLACK, RED};
-
-  TestableGoodDisplay3C reference(width, height);
-  RecordingDelegate reference_bus(&reference.dc);
-  reference.install(&reference_bus);
-  TestableGoodDisplay3C display(width, height);
-  // Every data write takes longer than MAX_TRANSFER_TIME, so the push yields after each chunk.
-  RecordingDelegate bus(&display.dc, MAX_TRANSFER_TIME + 1);
-  display.install(&bus);
-  for (int y = 0; y != height; y++) {
-    for (int x = 0; x != width; x++) {
-      reference.draw(x, y, colors[(x * 7 + y * 3) % 3]);
-      display.draw(x, y, colors[(x * 7 + y * 3) % 3]);
-    }
-  }
-
-  EXPECT_EQ(reference.run_push(), 1);
-  EXPECT_GT(display.run_push(), 2);
-
-  EXPECT_EQ(bus.commands, reference_bus.commands);
-  EXPECT_EQ(bus.data[0x24].size(), 320u);
-  EXPECT_EQ(bus.data[0x24], reference_bus.data[0x24]);
-  EXPECT_EQ(bus.data[0x26], reference_bus.data[0x26]);
-
-  bus.clear();
-  display.run_push();
-  EXPECT_EQ(bus.commands, reference_bus.commands);
-}
-
-/// A whole update sends no power-on (0x22 0xF8) before the refresh (0x22 0xF7): with it, this panel does not
-/// refresh. Power off (0x83) and deep sleep follow.
-TEST(EPaperGoodDisplay3CTransfer, UpdateHasNoSeparatePowerOn) {
-  TestableGoodDisplay3C display(16, 1);
-  RecordingDelegate bus(&display.dc);
-  display.install(&bus);
-  display.fill(RED);
-
-  display.run_update();
-
-  EXPECT_EQ(bus.commands, (Bytes{0x44, 0x45, 0x4E, 0x4F, 0x26, 0x24, 0x4E, 0x4F, 0x22, 0x20, 0x22, 0x20, 0x10}));
-  EXPECT_EQ(bus.data[0x26], (Bytes{0xFF, 0xFF}));
-  EXPECT_EQ(bus.data[0x24], (Bytes{0x00, 0x00}));
-  EXPECT_EQ(bus.data[0x22], (Bytes{0xF7, 0x83}));
-  EXPECT_EQ(bus.data[0x10], (Bytes{0x01}));
-}
-
-/// Busy only goes high a little after master activation (0x20), so power off is not sent until REFRESH_START_MS
-/// after the refresh starts.
-TEST(EPaperGoodDisplay3CTransfer, WaitsForBusyAfterTheRefreshStarts) {
-  TestableGoodDisplay3C display(16, 1);
-  TimedCommandDelegate bus(&display.dc);
-  display.install(&bus);
-  display.fill(RED);
-
-  display.run_update();
-
-  // The first 0x20 starts the refresh; the second 0x22 selects power off.
-  EXPECT_GE(bus.time_of(0x22, 1) - bus.time_of(0x20, 0), TestableGoodDisplay3C::REFRESH_START_MS);
-}
-
-}  // namespace
-}  // namespace esphome::epaper_spi::testing

tests/components/epaper_spi/test.esp32-s3-idf.yaml

@@ -209,27 +209,6 @@ display:
       it.circle(it.get_width() / 2, it.get_height() / 2, 20, Color::BLACK);
       it.circle(it.get_width() / 2, it.get_height() / 2, 15, Color(255, 0, 0));
 
-  # Good Display GDEY029Z95 2.9" 3-color e-paper (128x296, SSD1680)
-  - platform: epaper_spi
-    spi_id: spi_bus
-    model: goodisplay-gdey029z95-2.9
-    cs_pin:
-      allow_other_uses: true
-      number: GPIO5
-    dc_pin:
-      allow_other_uses: true
-      number: GPIO17
-    reset_pin:
-      allow_other_uses: true
-      number: GPIO16
-    busy_pin:
-      allow_other_uses: true
-      number: GPIO4
-    lambda: |-
-      it.filled_rectangle(0, 0, it.get_width(), it.get_height(), Color::WHITE);
-      it.circle(it.get_width() / 2, it.get_height() / 2, 20, Color::BLACK);
-      it.circle(it.get_width() / 2, it.get_height() / 2, 15, Color(255, 0, 0));
-
   # WeAct 4.2" 3-color e-paper (400x300, SSD1683)
   - platform: epaper_spi
     spi_id: spi_bus

tests/components/template/common-base.yaml

@@ -409,10 +409,6 @@ cover:
           id: template_cover_actions
           position: 0.0
           tilt: 0.0
-    toggle_action:
-      - cover.template.publish:
-          id: template_cover_actions
-          current_operation: IDLE
     stop_action:
       - cover.template.publish:
           id: template_cover_actions

tests/integration/fixtures/api_cover_toggle.yaml

@@ -1,26 +0,0 @@
-esphome:
-  name: api-cover-toggle-test
-host:
-api:
-logger:
-  level: DEBUG
-
-cover:
-  - platform: template
-    name: "Toggle Cover"
-    id: toggle_cover
-    toggle_action:
-      - cover.template.publish:
-          id: toggle_cover
-          position: 0.5
-    stop_action:
-      - cover.template.publish:
-          id: toggle_cover
-          position: 0.25
-  - platform: template
-    name: "Plain Cover"
-    id: plain_cover
-    stop_action:
-      - cover.template.publish:
-          id: plain_cover
-          position: 0.25

tests/integration/raw_api_client.py

@@ -1,7 +1,7 @@
 """Minimal plaintext native-api client over a raw socket.
 
 Reads only when told to, so tests control when the TCP pipe backs up toward
-the device; message types are counted and each frame is kept for inspection.
+the device; payloads are skipped and only message types are counted.
 """
 
 from __future__ import annotations
@@ -59,17 +59,15 @@ class FrameParser:
 
     def __init__(self) -> None:
         self._buf = bytearray()
-        self.frames: list[tuple[int, bytes]] = []
 
     def feed(self, data: bytes) -> list[int]:
         self._buf.extend(data)
         types: list[int] = []
-        while (frame := self._try_parse()) is not None:
-            self.frames.append(frame)
-            types.append(frame[0])
+        while (msg_type := self._try_parse()) is not None:
+            types.append(msg_type)
         return types
 
-    def _try_parse(self) -> tuple[int, bytes] | None:
+    def _try_parse(self) -> int | None:
         buf = self._buf
         if not buf:
             return None
@@ -82,9 +80,8 @@ class FrameParser:
         msg_type, pos = type_decoded
         if len(buf) - pos < size:
             return None
-        payload = bytes(buf[pos : pos + size])
         del buf[: pos + size]
-        return msg_type, payload
+        return msg_type
 
 
 class RawApiClient:
@@ -148,9 +145,5 @@ class RawApiClient:
 
         await asyncio.wait_for(_read_loop(), timeout)
 
-    def frames(self, msg_type: int) -> list[bytes]:
-        """Payloads of every frame of msg_type received so far."""
-        return [payload for kind, payload in self._parser.frames if kind == msg_type]
-
     def close(self) -> None:
         self._sock.close()

tests/integration/test_api_cover_toggle.py

@@ -1,129 +0,0 @@
-"""The native API advertises cover toggle support and runs the toggle action on request."""
-
-from __future__ import annotations
-
-import asyncio
-from collections.abc import Callable
-import struct
-
-from aioesphomeapi import CoverInfo, CoverState, EntityState, api_pb2
-import pytest
-
-from .log_utils import LineWaiter
-from .raw_api_client import MESSAGE_TYPE_OF, RawApiClient, decode_varint, encode_varint
-from .state_utils import InitialStateHelper, StateWaiter, require_entity
-from .types import APIClientConnectedFactory, RunCompiledFunction
-
-COVER_COMMAND = MESSAGE_TYPE_OF[api_pb2.CoverCommandRequest]
-LIST_COVER = MESSAGE_TYPE_OF[api_pb2.ListEntitiesCoverResponse]
-LIST_DONE = MESSAGE_TYPE_OF[api_pb2.ListEntitiesDoneResponse]
-WIRE_VARINT, WIRE_LENGTH, WIRE_FIXED32 = 0, 2, 5
-# ListEntitiesCoverResponse fields; the installed client library does not know supports_toggle yet
-FIELD_ENTITY_KEY, FIELD_SUPPORTS_TOGGLE = 2, 15
-# CoverCommandRequest fields
-FIELD_KEY, FIELD_STOP, FIELD_TOGGLE = 1, 8, 11
-
-
-def tag(field: int, wire_type: int) -> bytes:
-    return encode_varint((field << 3) | wire_type)
-
-
-def decode_fields(payload: bytes) -> dict[int, list[int | bytes]]:
-    """Split a protobuf payload into field number -> raw values."""
-    fields: dict[int, list[int | bytes]] = {}
-    buf = bytearray(payload)
-    pos = 0
-    while pos < len(buf):
-        key, pos = decode_varint(buf, pos)
-        field, wire_type = key >> 3, key & 0x07
-        if wire_type == WIRE_VARINT:
-            value, pos = decode_varint(buf, pos)
-        elif wire_type == WIRE_LENGTH:
-            length, pos = decode_varint(buf, pos)
-            value = bytes(buf[pos : pos + length])
-            pos += length
-        elif wire_type == WIRE_FIXED32:
-            value = struct.unpack_from("<I", buf, pos)[0]
-            pos += 4
-        else:
-            raise AssertionError(f"unexpected wire type {wire_type} for field {field}")
-        fields.setdefault(field, []).append(value)
-    return fields
-
-
-@pytest.mark.asyncio
-async def test_api_cover_toggle(
-    yaml_config: str,
-    run_compiled: RunCompiledFunction,
-    api_client_connected: APIClientConnectedFactory,
-    unused_tcp_port: int,
-) -> None:
-    lines = LineWaiter()
-    async with (
-        run_compiled(yaml_config, line_callback=lines.callback),
-        api_client_connected() as client,
-        RawApiClient(unused_tcp_port) as raw,
-    ):
-        entities, _ = await client.list_entities_services()
-        toggle_cover = require_entity(entities, "toggle_cover", CoverInfo, exact=True)
-        plain_cover = require_entity(entities, "plain_cover", CoverInfo, exact=True)
-
-        positions: dict[int, list[float]] = {toggle_cover.key: [], plain_cover.key: []}
-        waiter = StateWaiter()
-
-        def on_state(state: EntityState) -> None:
-            if isinstance(state, CoverState) and state.key in positions:
-                positions[state.key].append(state.position)
-            waiter.on_state(state)
-
-        def position_is(key: int, value: float) -> Callable[[EntityState], bool]:
-            return lambda s: (
-                isinstance(s, CoverState)
-                and s.key == key
-                and s.position == pytest.approx(value, abs=0.01)
-            )
-
-        initial = InitialStateHelper(entities)
-        client.subscribe_states(initial.on_state_wrapper(on_state))
-        await initial.wait_for_initial_states()
-
-        # Capability discovery: only the cover with a toggle_action advertises toggle
-        await raw.connect()
-        await raw.send_message(api_pb2.ListEntitiesRequest())
-        await raw.read_until_frame(LIST_DONE)
-        supports_toggle = {}
-        for payload in raw.frames(LIST_COVER):
-            fields = decode_fields(payload)
-            key = fields[FIELD_ENTITY_KEY][0]
-            supports_toggle[key] = bool(fields.get(FIELD_SUPPORTS_TOGGLE, [0])[0])
-        assert supports_toggle == {toggle_cover.key: True, plain_cover.key: False}
-
-        def key_field(key: int) -> bytes:
-            return tag(FIELD_KEY, WIRE_FIXED32) + struct.pack("<I", key)
-
-        toggle = tag(FIELD_TOGGLE, WIRE_VARINT) + b"\x01"
-        stop = tag(FIELD_STOP, WIRE_VARINT) + b"\x01"
-
-        # A toggle request runs the toggle action, which publishes 0.5
-        toggled = waiter.expect(
-            position_is(toggle_cover.key, 0.5), label="toggle action"
-        )
-        await raw.send_raw(COVER_COMMAND, key_field(toggle_cover.key) + toggle)
-        await toggled
-
-        # A cover without toggle_action drops the request with a warning; its state does not change
-        await raw.send_raw(COVER_COMMAND, key_field(plain_cover.key) + toggle)
-        await lines.wait_for("Plain Cover", "toggle unsupported", timeout=2.0)
-        await asyncio.sleep(0.5)
-        assert all(p == pytest.approx(1.0) for p in positions[plain_cover.key])
-
-        # Stop and toggle in one request: stop wins and the toggle action does not run
-        before = len(positions[toggle_cover.key])
-        stopped = waiter.expect(
-            position_is(toggle_cover.key, 0.25), label="stop action"
-        )
-        await raw.send_raw(COVER_COMMAND, key_field(toggle_cover.key) + stop + toggle)
-        await stopped
-        await asyncio.sleep(0.5)
-        after = positions[toggle_cover.key][before:]
-        assert all(p == pytest.approx(0.25, abs=0.01) for p in after), after