Fix: Fetch file content from PR head using GitHub API

The workflow was checking out the base branch but trying to read files
from the filesystem, which meant it couldn't see changes in the PR.
Now using github.rest.repos.getContent with the PR head SHA to fetch
the actual file content from the PR branch.

Co-authored-by: clydebarrow <2366188+clydebarrow@users.noreply.github.com>

.clang-tidy.hash

@@ -1 +1 @@
-a172e2f65981e98354cc6b5ecf69bdb055dd13602226042ab2c7acd037a2bf41
+15dc295268b2dcf75942f42759b3ddec64eba89f75525698eb39c95a7f4b14ce

.github/workflows/auto-label-pr.yml

@@ -46,6 +46,7 @@ jobs:
             const BOT_COMMENT_MARKER = '<!-- auto-label-pr-bot -->';
             const CODEOWNERS_MARKER = '<!-- codeowners-request -->';
             const TOO_BIG_MARKER = '<!-- too-big-request -->';
+            const DEPRECATED_COMPONENT_MARKER = '<!-- deprecated-component-request -->';
 
             const MANAGED_LABELS = [
               'new-component',
@@ -69,7 +70,8 @@ jobs:
               'new-feature',
               'breaking-change',
               'developer-breaking-change',
-              'code-quality'
+              'code-quality',
+              'deprecated_component'
             ];
 
             const DOCS_PR_PATTERNS = [
@@ -382,6 +384,75 @@ jobs:
               return labels;
             }
 
+            // Strategy: Deprecated component detection
+            async function detectDeprecatedComponents() {
+              const labels = new Set();
+              const deprecatedInfo = [];
+              
+              // Compile regex once for better performance
+              const componentFileRegex = /^esphome\/components\/([^\/]+)\/[^/]*\.py$/;
+              
+              // Get files that are modified or added in components directory
+              const componentFiles = changedFiles.filter(file => componentFileRegex.test(file));
+              
+              if (componentFiles.length === 0) {
+                return { labels, deprecatedInfo };
+              }
+              
+              // Extract unique component names using the same regex
+              const components = new Set();
+              for (const file of componentFiles) {
+                const match = file.match(componentFileRegex);
+                if (match) {
+                  components.add(match[1]);
+                }
+              }
+              
+              // Get PR head SHA to fetch files from the PR branch
+              const prHeadSha = context.payload.pull_request.head.sha;
+              
+              // Check each component's __init__.py for DEPRECATED_COMPONENT constant
+              for (const component of components) {
+                const initFile = `esphome/components/${component}/__init__.py`;
+                try {
+                  // Fetch file content from PR head using GitHub API
+                  const { data: fileData } = await github.rest.repos.getContent({
+                    owner,
+                    repo,
+                    path: initFile,
+                    ref: prHeadSha
+                  });
+                  
+                  // Decode base64 content
+                  const content = Buffer.from(fileData.content, 'base64').toString('utf8');
+                  
+                  // Look for DEPRECATED_COMPONENT = "message" or DEPRECATED_COMPONENT = 'message'
+                  // Support single quotes, double quotes, and triple quotes (for multiline)
+                  const doubleQuoteMatch = content.match(/DEPRECATED_COMPONENT\s*=\s*"""([\s\S]*?)"""/s) ||
+                                          content.match(/DEPRECATED_COMPONENT\s*=\s*"((?:[^"\\]|\\.)*)"/);
+                  const singleQuoteMatch = content.match(/DEPRECATED_COMPONENT\s*=\s*'''([\s\S]*?)'''/s) ||
+                                          content.match(/DEPRECATED_COMPONENT\s*=\s*'((?:[^'\\]|\\.)*)'/);
+                  const deprecatedMatch = doubleQuoteMatch || singleQuoteMatch;
+                  
+                  if (deprecatedMatch) {
+                    labels.add('deprecated_component');
+                    deprecatedInfo.push({
+                      component: component,
+                      message: deprecatedMatch[1]
+                    });
+                    console.log(`Found deprecated component: ${component}`);
+                  }
+                } catch (error) {
+                  // Only log if it's not a simple "file not found" error (404)
+                  if (error.status !== 404) {
+                    console.log(`Error reading ${initFile}:`, error.message);
+                  }
+                }
+              }
+              
+              return { labels, deprecatedInfo };
+            }
+
             // Strategy: Requirements detection
             async function detectRequirements(allLabels) {
               const labels = new Set();
@@ -418,10 +489,26 @@ jobs:
             }
 
             // Generate review messages
-            function generateReviewMessages(finalLabels, originalLabelCount) {
+            function generateReviewMessages(finalLabels, originalLabelCount, deprecatedInfo) {
               const messages = [];
               const prAuthor = context.payload.pull_request.user.login;
 
+              // Deprecated component message
+              if (finalLabels.includes('deprecated_component') && deprecatedInfo && deprecatedInfo.length > 0) {
+                let message = `${DEPRECATED_COMPONENT_MARKER}\n### ⚠️ Deprecated Component\n\n`;
+                message += `Hey there @${prAuthor},\n`;
+                message += `This PR modifies one or more deprecated components. Please be aware:\n\n`;
+                
+                for (const info of deprecatedInfo) {
+                  message += `#### Component: \`${info.component}\`\n`;
+                  message += `${info.message}\n\n`;
+                }
+                
+                message += `Consider migrating to the recommended alternative if applicable.`;
+                
+                messages.push(message);
+              }
+
               // Too big message
               if (finalLabels.includes('too-big')) {
                 const testAdditions = prFiles
@@ -468,10 +555,10 @@ jobs:
             }
 
             // Handle reviews
-            async function handleReviews(finalLabels, originalLabelCount) {
-              const reviewMessages = generateReviewMessages(finalLabels, originalLabelCount);
+            async function handleReviews(finalLabels, originalLabelCount, deprecatedInfo) {
+              const reviewMessages = generateReviewMessages(finalLabels, originalLabelCount, deprecatedInfo);
               const hasReviewableLabels = finalLabels.some(label =>
-                ['too-big', 'needs-codeowners'].includes(label)
+                ['too-big', 'needs-codeowners', 'deprecated_component'].includes(label)
               );
 
               const { data: reviews } = await github.rest.pulls.listReviews({
@@ -580,7 +667,8 @@ jobs:
               actionsLabels,
               codeOwnerLabels,
               testLabels,
-              checkboxLabels
+              checkboxLabels,
+              deprecatedResult
             ] = await Promise.all([
               detectMergeBranch(),
               detectComponentPlatforms(apiData),
@@ -592,9 +680,14 @@ jobs:
               detectGitHubActionsChanges(),
               detectCodeOwner(),
               detectTests(),
-              detectPRTemplateCheckboxes()
+              detectPRTemplateCheckboxes(),
+              detectDeprecatedComponents()
             ]);
 
+            // Extract deprecated component info
+            const deprecatedLabels = deprecatedResult.labels;
+            const deprecatedInfo = deprecatedResult.deprecatedInfo;
+
             // Combine all labels
             const allLabels = new Set([
               ...branchLabels,
@@ -607,7 +700,8 @@ jobs:
               ...actionsLabels,
               ...codeOwnerLabels,
               ...testLabels,
-              ...checkboxLabels
+              ...checkboxLabels,
+              ...deprecatedLabels
             ]);
 
             // Detect requirements based on all other labels
@@ -638,7 +732,7 @@ jobs:
             console.log('Computed labels:', finalLabels.join(', '));
 
             // Handle reviews
-            await handleReviews(finalLabels, originalLabelCount);
+            await handleReviews(finalLabels, originalLabelCount, deprecatedInfo);
 
             // Apply labels
             if (finalLabels.length > 0) {

.github/workflows/codeql.yml

@@ -58,7 +58,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
+        uses: github/codeql-action/init@19b2f06db2b6f5108140aeb04014ef02b648f789 # v4.31.11
         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@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
+        uses: github/codeql-action/analyze@19b2f06db2b6f5108140aeb04014ef02b648f789 # v4.31.11
         with:
           category: "/language:${{matrix.language}}"

esphome/components/bl0940/number/calibration_number.cpp

@@ -9,7 +9,7 @@ static const char *const TAG = "bl0940.number";
 void CalibrationNumber::setup() {
   float value = 0.0f;
   if (this->restore_value_) {
-    this->pref_ = this->make_entity_preference<float>();
+    this->pref_ = global_preferences->make_preference<float>(this->get_preference_hash());
     if (!this->pref_.load(&value)) {
       value = 0.0f;
     }

esphome/components/climate/climate.cpp

@@ -360,7 +360,8 @@ void Climate::add_on_control_callback(std::function<void(ClimateCall &)> &&callb
 static const uint32_t RESTORE_STATE_VERSION = 0x848EA6ADUL;
 
 optional<ClimateDeviceRestoreState> Climate::restore_state_() {
-  this->rtc_ = this->make_entity_preference<ClimateDeviceRestoreState>(RESTORE_STATE_VERSION);
+  this->rtc_ = global_preferences->make_preference<ClimateDeviceRestoreState>(this->get_preference_hash() ^
+                                                                              RESTORE_STATE_VERSION);
   ClimateDeviceRestoreState recovered{};
   if (!this->rtc_.load(&recovered))
     return {};

esphome/components/cover/cover.cpp

@@ -1,11 +1,11 @@
 #include "cover.h"
 #include "esphome/core/defines.h"
 #include "esphome/core/controller_registry.h"
-#include "esphome/core/log.h"
-#include "esphome/core/progmem.h"
 
 #include <strings.h>
 
+#include "esphome/core/log.h"
+
 namespace esphome::cover {
 
 static const char *const TAG = "cover";
@@ -39,13 +39,13 @@ Cover::Cover() : position{COVER_OPEN} {}
 
 CoverCall::CoverCall(Cover *parent) : parent_(parent) {}
 CoverCall &CoverCall::set_command(const char *command) {
-  if (ESPHOME_strcasecmp_P(command, ESPHOME_PSTR("OPEN")) == 0) {
+  if (strcasecmp(command, "OPEN") == 0) {
     this->set_command_open();
-  } else if (ESPHOME_strcasecmp_P(command, ESPHOME_PSTR("CLOSE")) == 0) {
+  } else if (strcasecmp(command, "CLOSE") == 0) {
     this->set_command_close();
-  } else if (ESPHOME_strcasecmp_P(command, ESPHOME_PSTR("STOP")) == 0) {
+  } else if (strcasecmp(command, "STOP") == 0) {
     this->set_command_stop();
-  } else if (ESPHOME_strcasecmp_P(command, ESPHOME_PSTR("TOGGLE")) == 0) {
+  } else if (strcasecmp(command, "TOGGLE") == 0) {
     this->set_command_toggle();
   } else {
     ESP_LOGW(TAG, "'%s' - Unrecognized command %s", this->parent_->get_name().c_str(), command);
@@ -187,7 +187,7 @@ void Cover::publish_state(bool save) {
   }
 }
 optional<CoverRestoreState> Cover::restore_state_() {
-  this->rtc_ = this->make_entity_preference<CoverRestoreState>();
+  this->rtc_ = global_preferences->make_preference<CoverRestoreState>(this->get_preference_hash());
   CoverRestoreState recovered{};
   if (!this->rtc_.load(&recovered))
     return {};

esphome/components/duty_time/duty_time_sensor.cpp

@@ -41,7 +41,7 @@ void DutyTimeSensor::setup() {
   uint32_t seconds = 0;
 
   if (this->restore_) {
-    this->pref_ = this->make_entity_preference<uint32_t>();
+    this->pref_ = global_preferences->make_preference<uint32_t>(this->get_preference_hash());
     this->pref_.load(&seconds);
   }
 

esphome/components/factory_reset/factory_reset.cpp

@@ -3,7 +3,6 @@
 #include "esphome/core/application.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/log.h"
-#include "esphome/core/progmem.h"
 
 #include <cinttypes>
 
@@ -20,8 +19,7 @@ static bool was_power_cycled() {
 #endif
 #ifdef USE_ESP8266
   auto reset_reason = EspClass::getResetReason();
-  return ESPHOME_strcasecmp_P(reset_reason.c_str(), ESPHOME_PSTR("power On")) == 0 ||
-         ESPHOME_strcasecmp_P(reset_reason.c_str(), ESPHOME_PSTR("external system")) == 0;
+  return strcasecmp(reset_reason.c_str(), "power On") == 0 || strcasecmp(reset_reason.c_str(), "external system") == 0;
 #endif
 #ifdef USE_LIBRETINY
   auto reason = lt_get_reboot_reason();

esphome/components/fan/fan.cpp

@@ -227,7 +227,8 @@ void Fan::publish_state() {
 constexpr uint32_t RESTORE_STATE_VERSION = 0x71700ABA;
 optional<FanRestoreState> Fan::restore_state_() {
   FanRestoreState recovered{};
-  this->rtc_ = this->make_entity_preference<FanRestoreState>(RESTORE_STATE_VERSION);
+  this->rtc_ =
+      global_preferences->make_preference<FanRestoreState>(this->get_preference_hash() ^ RESTORE_STATE_VERSION);
   bool restored = this->rtc_.load(&recovered);
 
   switch (this->restore_mode_) {

esphome/components/haier/haier_base.cpp

@@ -350,7 +350,8 @@ ClimateTraits HaierClimateBase::traits() { return traits_; }
 
 void HaierClimateBase::initialization() {
   constexpr uint32_t restore_settings_version = 0xA77D21EF;
-  this->base_rtc_ = this->make_entity_preference<HaierBaseSettings>(restore_settings_version);
+  this->base_rtc_ =
+      global_preferences->make_preference<HaierBaseSettings>(this->get_preference_hash() ^ restore_settings_version);
   HaierBaseSettings recovered;
   if (!this->base_rtc_.load(&recovered)) {
     recovered = {false, true};

esphome/components/haier/hon_climate.cpp

@@ -515,7 +515,8 @@ haier_protocol::HaierMessage HonClimate::get_power_message(bool state) {
 void HonClimate::initialization() {
   HaierClimateBase::initialization();
   constexpr uint32_t restore_settings_version = 0x57EB59DDUL;
-  this->hon_rtc_ = this->make_entity_preference<HonSettings>(restore_settings_version);
+  this->hon_rtc_ =
+      global_preferences->make_preference<HonSettings>(this->get_preference_hash() ^ restore_settings_version);
   HonSettings recovered;
   if (this->hon_rtc_.load(&recovered)) {
     this->settings_ = recovered;

esphome/components/http_request/__init__.py

@@ -126,7 +126,7 @@ CONFIG_SCHEMA = cv.All(
             ),
             cv.Optional(CONF_CA_CERTIFICATE_PATH): cv.All(
                 cv.file_,
-                cv.Any(cv.only_on(PLATFORM_HOST), cv.only_on_esp32),
+                cv.only_on(PLATFORM_HOST),
             ),
         }
     ).extend(cv.COMPONENT_SCHEMA),
@@ -160,14 +160,7 @@ async def to_code(config):
         cg.add(var.set_verify_ssl(config[CONF_VERIFY_SSL]))
 
         if config.get(CONF_VERIFY_SSL):
-            if ca_cert_path := config.get(CONF_CA_CERTIFICATE_PATH):
-                with open(ca_cert_path, encoding="utf-8") as f:
-                    ca_cert_content = f.read()
-                cg.add(var.set_ca_certificate(ca_cert_content))
-            else:
-                esp32.add_idf_sdkconfig_option(
-                    "CONFIG_MBEDTLS_CERTIFICATE_BUNDLE", True
-                )
+            esp32.add_idf_sdkconfig_option("CONFIG_MBEDTLS_CERTIFICATE_BUNDLE", True)
 
         esp32.add_idf_sdkconfig_option(
             "CONFIG_ESP_TLS_INSECURE",

esphome/components/http_request/http_request_idf.cpp

@@ -27,9 +27,8 @@ void HttpRequestIDF::dump_config() {
   HttpRequestComponent::dump_config();
   ESP_LOGCONFIG(TAG,
                 "  Buffer Size RX: %u\n"
-                "  Buffer Size TX: %u\n"
-                "  Custom CA Certificate: %s",
-                this->buffer_size_rx_, this->buffer_size_tx_, YESNO(this->ca_certificate_ != nullptr));
+                "  Buffer Size TX: %u",
+                this->buffer_size_rx_, this->buffer_size_tx_);
 }
 
 esp_err_t HttpRequestIDF::http_event_handler(esp_http_client_event_t *evt) {
@@ -89,15 +88,11 @@ std::shared_ptr<HttpContainer> HttpRequestIDF::perform(const std::string &url, c
   config.disable_auto_redirect = !this->follow_redirects_;
   config.max_redirection_count = this->redirect_limit_;
   config.auth_type = HTTP_AUTH_TYPE_BASIC;
-  if (secure && this->verify_ssl_) {
-    if (this->ca_certificate_ != nullptr) {
-      config.cert_pem = this->ca_certificate_;
 #if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
-    } else {
-      config.crt_bundle_attach = esp_crt_bundle_attach;
-#endif
-    }
+  if (secure && this->verify_ssl_) {
+    config.crt_bundle_attach = esp_crt_bundle_attach;
   }
+#endif
 
   if (this->useragent_ != nullptr) {
     config.user_agent = this->useragent_;

esphome/components/http_request/http_request_idf.h

@@ -35,7 +35,6 @@ class HttpRequestIDF : public HttpRequestComponent {
   void set_buffer_size_rx(uint16_t buffer_size_rx) { this->buffer_size_rx_ = buffer_size_rx; }
   void set_buffer_size_tx(uint16_t buffer_size_tx) { this->buffer_size_tx_ = buffer_size_tx; }
   void set_verify_ssl(bool verify_ssl) { this->verify_ssl_ = verify_ssl; }
-  void set_ca_certificate(const char *ca_certificate) { this->ca_certificate_ = ca_certificate; }
 
  protected:
   std::shared_ptr<HttpContainer> perform(const std::string &url, const std::string &method, const std::string &body,
@@ -45,7 +44,6 @@ class HttpRequestIDF : public HttpRequestComponent {
   uint16_t buffer_size_rx_{};
   uint16_t buffer_size_tx_{};
   bool verify_ssl_{true};
-  const char *ca_certificate_{nullptr};
 
   /// @brief Monitors the http client events to gather response headers
   static esp_err_t http_event_handler(esp_http_client_event_t *evt);

esphome/components/http_request/ota/ota_http_request.cpp

@@ -82,7 +82,7 @@ uint8_t OtaHttpRequestComponent::do_ota_() {
   uint32_t last_progress = 0;
   uint32_t update_start_time = millis();
   md5::MD5Digest md5_receive;
-  char md5_receive_str[33];
+  std::unique_ptr<char[]> md5_receive_str(new char[33]);
 
   if (this->md5_expected_.empty() && !this->http_get_md5_()) {
     return OTA_MD5_INVALID;
@@ -176,14 +176,14 @@ uint8_t OtaHttpRequestComponent::do_ota_() {
 
   // verify MD5 is as expected and act accordingly
   md5_receive.calculate();
-  md5_receive.get_hex(md5_receive_str);
-  this->md5_computed_ = md5_receive_str;
+  md5_receive.get_hex(md5_receive_str.get());
+  this->md5_computed_ = md5_receive_str.get();
   if (strncmp(this->md5_computed_.c_str(), this->md5_expected_.c_str(), MD5_SIZE) != 0) {
     ESP_LOGE(TAG, "MD5 computed: %s - Aborting due to MD5 mismatch", this->md5_computed_.c_str());
     this->cleanup_(std::move(backend), container);
     return ota::OTA_RESPONSE_ERROR_MD5_MISMATCH;
   } else {
-    backend->set_update_md5(md5_receive_str);
+    backend->set_update_md5(md5_receive_str.get());
   }
 
   container->end();

esphome/components/integration/integration_sensor.cpp

@@ -10,7 +10,7 @@ static const char *const TAG = "integration";
 
 void IntegrationSensor::setup() {
   if (this->restore_) {
-    this->pref_ = this->make_entity_preference<float>();
+    this->pref_ = global_preferences->make_preference<float>(this->get_preference_hash());
     float preference_value = 0;
     this->pref_.load(&preference_value);
     this->result_ = preference_value;

esphome/components/ld2450/ld2450.cpp

@@ -184,7 +184,7 @@ static inline bool validate_header_footer(const uint8_t *header_footer, const ui
 void LD2450Component::setup() {
 #ifdef USE_NUMBER
   if (this->presence_timeout_number_ != nullptr) {
-    this->pref_ = this->presence_timeout_number_->make_entity_preference<float>();
+    this->pref_ = global_preferences->make_preference<float>(this->presence_timeout_number_->get_preference_hash());
     this->set_presence_timeout();
   }
 #endif

esphome/components/libretiny/__init__.py

@@ -191,17 +191,10 @@ def _notify_old_style(config):
 
 
 # The dev and latest branches will be at *least* this version, which is what matters.
-# Use GitHub releases directly to avoid PlatformIO moderation delays.
 ARDUINO_VERSIONS = {
-    "dev": (cv.Version(1, 11, 0), "https://github.com/libretiny-eu/libretiny.git"),
-    "latest": (
-        cv.Version(1, 11, 0),
-        "https://github.com/libretiny-eu/libretiny.git#v1.11.0",
-    ),
-    "recommended": (
-        cv.Version(1, 11, 0),
-        "https://github.com/libretiny-eu/libretiny.git#v1.11.0",
-    ),
+    "dev": (cv.Version(1, 9, 2), "https://github.com/libretiny-eu/libretiny.git"),
+    "latest": (cv.Version(1, 9, 2), "libretiny"),
+    "recommended": (cv.Version(1, 9, 2), None),
 }
 
 

esphome/components/light/addressable_light_wrapper.h

@@ -7,7 +7,9 @@ namespace esphome::light {
 
 class AddressableLightWrapper : public light::AddressableLight {
  public:
-  explicit AddressableLightWrapper(light::LightState *light_state) : light_state_(light_state) {}
+  explicit AddressableLightWrapper(light::LightState *light_state) : light_state_(light_state) {
+    this->wrapper_state_ = new uint8_t[5];  // NOLINT(cppcoreguidelines-owning-memory)
+  }
 
   int32_t size() const override { return 1; }
 
@@ -116,7 +118,7 @@ class AddressableLightWrapper : public light::AddressableLight {
   }
 
   light::LightState *light_state_;
-  mutable uint8_t wrapper_state_[5]{};
+  uint8_t *wrapper_state_;
   ColorMode color_mode_{ColorMode::UNKNOWN};
 };
 

esphome/components/light/light_state.cpp

@@ -44,7 +44,7 @@ void LightState::setup() {
     case LIGHT_RESTORE_DEFAULT_ON:
     case LIGHT_RESTORE_INVERTED_DEFAULT_OFF:
     case LIGHT_RESTORE_INVERTED_DEFAULT_ON:
-      this->rtc_ = this->make_entity_preference<LightStateRTCState>();
+      this->rtc_ = global_preferences->make_preference<LightStateRTCState>(this->get_preference_hash());
       // Attempt to load from preferences, else fall back to default values
       if (!this->rtc_.load(&recovered)) {
         recovered.state = (this->restore_mode_ == LIGHT_RESTORE_DEFAULT_ON ||
@@ -57,7 +57,7 @@ void LightState::setup() {
       break;
     case LIGHT_RESTORE_AND_OFF:
     case LIGHT_RESTORE_AND_ON:
-      this->rtc_ = this->make_entity_preference<LightStateRTCState>();
+      this->rtc_ = global_preferences->make_preference<LightStateRTCState>(this->get_preference_hash());
       this->rtc_.load(&recovered);
       recovered.state = (this->restore_mode_ == LIGHT_RESTORE_AND_ON);
       break;

esphome/components/lvgl/number/lvgl_number.h

@@ -21,7 +21,7 @@ class LVGLNumber : public number::Number, public Component {
   void setup() override {
     float value = this->value_lambda_();
     if (this->restore_) {
-      this->pref_ = this->make_entity_preference<float>();
+      this->pref_ = global_preferences->make_preference<float>(this->get_preference_hash());
       if (this->pref_.load(&value)) {
         this->control_lambda_(value);
       }

esphome/components/lvgl/select/lvgl_select.h

@@ -20,7 +20,7 @@ class LVGLSelect : public select::Select, public Component {
     this->set_options_();
     if (this->restore_) {
       size_t index;
-      this->pref_ = this->make_entity_preference<size_t>();
+      this->pref_ = global_preferences->make_preference<size_t>(this->get_preference_hash());
       if (this->pref_.load(&index))
         this->widget_->set_selected_index(index, LV_ANIM_OFF);
     }

esphome/components/mhz19/mhz19.cpp

@@ -3,7 +3,8 @@
 
 #include <cinttypes>
 
-namespace esphome::mhz19 {
+namespace esphome {
+namespace mhz19 {
 
 static const char *const TAG = "mhz19";
 static const uint8_t MHZ19_REQUEST_LENGTH = 8;
@@ -16,19 +17,6 @@ static const uint8_t MHZ19_COMMAND_DETECTION_RANGE_0_2000PPM[] = {0xFF, 0x01, 0x
 static const uint8_t MHZ19_COMMAND_DETECTION_RANGE_0_5000PPM[] = {0xFF, 0x01, 0x99, 0x00, 0x00, 0x00, 0x13, 0x88};
 static const uint8_t MHZ19_COMMAND_DETECTION_RANGE_0_10000PPM[] = {0xFF, 0x01, 0x99, 0x00, 0x00, 0x00, 0x27, 0x10};
 
-static const LogString *detection_range_to_log_string(MHZ19DetectionRange range) {
-  switch (range) {
-    case MHZ19_DETECTION_RANGE_0_2000PPM:
-      return LOG_STR("0-2000 ppm");
-    case MHZ19_DETECTION_RANGE_0_5000PPM:
-      return LOG_STR("0-5000 ppm");
-    case MHZ19_DETECTION_RANGE_0_10000PPM:
-      return LOG_STR("0-10000 ppm");
-    default:
-      return LOG_STR("default");
-  }
-}
-
 uint8_t mhz19_checksum(const uint8_t *command) {
   uint8_t sum = 0;
   for (uint8_t i = 1; i < MHZ19_REQUEST_LENGTH; i++) {
@@ -103,24 +91,24 @@ void MHZ19Component::abc_disable() {
   this->mhz19_write_command_(MHZ19_COMMAND_ABC_DISABLE, nullptr);
 }
 
-void MHZ19Component::range_set(MHZ19DetectionRange detection_range) {
-  const uint8_t *command;
-  switch (detection_range) {
+void MHZ19Component::range_set(MHZ19DetectionRange detection_ppm) {
+  switch (detection_ppm) {
+    case MHZ19_DETECTION_RANGE_DEFAULT:
+      ESP_LOGV(TAG, "Using previously set detection range (no change)");
+      break;
     case MHZ19_DETECTION_RANGE_0_2000PPM:
-      command = MHZ19_COMMAND_DETECTION_RANGE_0_2000PPM;
+      ESP_LOGD(TAG, "Setting detection range to 0 to 2000ppm");
+      this->mhz19_write_command_(MHZ19_COMMAND_DETECTION_RANGE_0_2000PPM, nullptr);
       break;
     case MHZ19_DETECTION_RANGE_0_5000PPM:
-      command = MHZ19_COMMAND_DETECTION_RANGE_0_5000PPM;
+      ESP_LOGD(TAG, "Setting detection range to 0 to 5000ppm");
+      this->mhz19_write_command_(MHZ19_COMMAND_DETECTION_RANGE_0_5000PPM, nullptr);
       break;
     case MHZ19_DETECTION_RANGE_0_10000PPM:
-      command = MHZ19_COMMAND_DETECTION_RANGE_0_10000PPM;
+      ESP_LOGD(TAG, "Setting detection range to 0 to 10000ppm");
+      this->mhz19_write_command_(MHZ19_COMMAND_DETECTION_RANGE_0_10000PPM, nullptr);
       break;
-    default:
-      ESP_LOGV(TAG, "Using previously set detection range (no change)");
-      return;
   }
-  ESP_LOGD(TAG, "Setting detection range to %s", LOG_STR_ARG(detection_range_to_log_string(detection_range)));
-  this->mhz19_write_command_(command, nullptr);
 }
 
 bool MHZ19Component::mhz19_write_command_(const uint8_t *command, uint8_t *response) {
@@ -152,7 +140,24 @@ void MHZ19Component::dump_config() {
   }
 
   ESP_LOGCONFIG(TAG, "  Warmup time: %" PRIu32 " s", this->warmup_seconds_);
-  ESP_LOGCONFIG(TAG, "  Detection range: %s", LOG_STR_ARG(detection_range_to_log_string(this->detection_range_)));
+
+  const char *range_str;
+  switch (this->detection_range_) {
+    case MHZ19_DETECTION_RANGE_DEFAULT:
+      range_str = "default";
+      break;
+    case MHZ19_DETECTION_RANGE_0_2000PPM:
+      range_str = "0 to 2000ppm";
+      break;
+    case MHZ19_DETECTION_RANGE_0_5000PPM:
+      range_str = "0 to 5000ppm";
+      break;
+    case MHZ19_DETECTION_RANGE_0_10000PPM:
+      range_str = "0 to 10000ppm";
+      break;
+  }
+  ESP_LOGCONFIG(TAG, "  Detection range: %s", range_str);
 }
 
-}  // namespace esphome::mhz19
+}  // namespace mhz19
+}  // namespace esphome

esphome/components/mhz19/mhz19.h

@@ -5,7 +5,8 @@
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/uart/uart.h"
 
-namespace esphome::mhz19 {
+namespace esphome {
+namespace mhz19 {
 
 enum MHZ19ABCLogic {
   MHZ19_ABC_NONE = 0,
@@ -31,7 +32,7 @@ class MHZ19Component : public PollingComponent, public uart::UARTDevice {
   void calibrate_zero();
   void abc_enable();
   void abc_disable();
-  void range_set(MHZ19DetectionRange detection_range);
+  void range_set(MHZ19DetectionRange detection_ppm);
 
   void set_temperature_sensor(sensor::Sensor *temperature_sensor) { temperature_sensor_ = temperature_sensor; }
   void set_co2_sensor(sensor::Sensor *co2_sensor) { co2_sensor_ = co2_sensor; }
@@ -73,4 +74,5 @@ template<typename... Ts> class MHZ19DetectionRangeSetAction : public Action<Ts..
   void play(const Ts &...x) override { this->parent_->range_set(this->detection_range_.value(x...)); }
 };
 
-}  // namespace esphome::mhz19
+}  // namespace mhz19
+}  // namespace esphome

esphome/components/mqtt/mqtt_alarm_control_panel.cpp

@@ -1,6 +1,5 @@
 #include "mqtt_alarm_control_panel.h"
 #include "esphome/core/log.h"
-#include "esphome/core/progmem.h"
 
 #include "mqtt_const.h"
 
@@ -19,21 +18,21 @@ void MQTTAlarmControlPanelComponent::setup() {
   this->alarm_control_panel_->add_on_state_callback([this]() { this->publish_state(); });
   this->subscribe(this->get_command_topic_(), [this](const std::string &topic, const std::string &payload) {
     auto call = this->alarm_control_panel_->make_call();
-    if (ESPHOME_strcasecmp_P(payload.c_str(), ESPHOME_PSTR("ARM_AWAY")) == 0) {
+    if (strcasecmp(payload.c_str(), "ARM_AWAY") == 0) {
       call.arm_away();
-    } else if (ESPHOME_strcasecmp_P(payload.c_str(), ESPHOME_PSTR("ARM_HOME")) == 0) {
+    } else if (strcasecmp(payload.c_str(), "ARM_HOME") == 0) {
       call.arm_home();
-    } else if (ESPHOME_strcasecmp_P(payload.c_str(), ESPHOME_PSTR("ARM_NIGHT")) == 0) {
+    } else if (strcasecmp(payload.c_str(), "ARM_NIGHT") == 0) {
       call.arm_night();
-    } else if (ESPHOME_strcasecmp_P(payload.c_str(), ESPHOME_PSTR("ARM_VACATION")) == 0) {
+    } else if (strcasecmp(payload.c_str(), "ARM_VACATION") == 0) {
       call.arm_vacation();
-    } else if (ESPHOME_strcasecmp_P(payload.c_str(), ESPHOME_PSTR("ARM_CUSTOM_BYPASS")) == 0) {
+    } else if (strcasecmp(payload.c_str(), "ARM_CUSTOM_BYPASS") == 0) {
       call.arm_custom_bypass();
-    } else if (ESPHOME_strcasecmp_P(payload.c_str(), ESPHOME_PSTR("DISARM")) == 0) {
+    } else if (strcasecmp(payload.c_str(), "DISARM") == 0) {
       call.disarm();
-    } else if (ESPHOME_strcasecmp_P(payload.c_str(), ESPHOME_PSTR("PENDING")) == 0) {
+    } else if (strcasecmp(payload.c_str(), "PENDING") == 0) {
       call.pending();
-    } else if (ESPHOME_strcasecmp_P(payload.c_str(), ESPHOME_PSTR("TRIGGERED")) == 0) {
+    } else if (strcasecmp(payload.c_str(), "TRIGGERED") == 0) {
       call.triggered();
     } else {
       ESP_LOGW(TAG, "'%s': Received unknown command payload %s", this->friendly_name_().c_str(), payload.c_str());
@@ -120,8 +119,7 @@ bool MQTTAlarmControlPanelComponent::publish_state() {
     default:
       state_s = "unknown";
   }
-  char topic_buf[MQTT_DEFAULT_TOPIC_MAX_LEN];
-  return this->publish(this->get_state_topic_to_(topic_buf), state_s);
+  return this->publish(this->get_state_topic_(), state_s);
 }
 
 }  // namespace esphome::mqtt

esphome/components/mqtt/mqtt_binary_sensor.cpp

@@ -52,9 +52,8 @@ bool MQTTBinarySensorComponent::publish_state(bool state) {
   if (this->binary_sensor_->is_status_binary_sensor())
     return true;
 
-  char topic_buf[MQTT_DEFAULT_TOPIC_MAX_LEN];
   const char *state_s = state ? "ON" : "OFF";
-  return this->publish(this->get_state_topic_to_(topic_buf), state_s);
+  return this->publish(this->get_state_topic_(), state_s);
 }
 
 }  // namespace esphome::mqtt

esphome/components/mqtt/mqtt_component.cpp

@@ -132,29 +132,17 @@ std::string MQTTComponent::get_command_topic_() const {
 }
 
 bool MQTTComponent::publish(const std::string &topic, const std::string &payload) {
-  return this->publish(topic.c_str(), payload.data(), payload.size());
+  return this->publish(topic, payload.data(), payload.size());
 }
 
 bool MQTTComponent::publish(const std::string &topic, const char *payload, size_t payload_length) {
-  return this->publish(topic.c_str(), payload, payload_length);
-}
-
-bool MQTTComponent::publish(const char *topic, const char *payload, size_t payload_length) {
-  if (topic[0] == '\0')
+  if (topic.empty())
     return false;
   return global_mqtt_client->publish(topic, payload, payload_length, this->qos_, this->retain_);
 }
 
-bool MQTTComponent::publish(const char *topic, const char *payload) {
-  return this->publish(topic, payload, strlen(payload));
-}
-
 bool MQTTComponent::publish_json(const std::string &topic, const json::json_build_t &f) {
-  return this->publish_json(topic.c_str(), f);
-}
-
-bool MQTTComponent::publish_json(const char *topic, const json::json_build_t &f) {
-  if (topic[0] == '\0')
+  if (topic.empty())
     return false;
   return global_mqtt_client->publish_json(topic, f, this->qos_, this->retain_);
 }

esphome/components/mqtt/mqtt_component.h

@@ -157,38 +157,6 @@ class MQTTComponent : public Component {
    */
   bool publish(const std::string &topic, const char *payload, size_t payload_length);
 
-  /** Send a MQTT message (no heap allocation for topic).
-   *
-   * @param topic The topic as C string.
-   * @param payload The payload buffer.
-   * @param payload_length The length of the payload.
-   */
-  bool publish(const char *topic, const char *payload, size_t payload_length);
-
-  /** Send a MQTT message (no heap allocation for topic).
-   *
-   * @param topic The topic as StringRef (for use with get_state_topic_to_()).
-   * @param payload The payload buffer.
-   * @param payload_length The length of the payload.
-   */
-  bool publish(StringRef topic, const char *payload, size_t payload_length) {
-    return this->publish(topic.c_str(), payload, payload_length);
-  }
-
-  /** Send a MQTT message (no heap allocation for topic).
-   *
-   * @param topic The topic as C string.
-   * @param payload The null-terminated payload.
-   */
-  bool publish(const char *topic, const char *payload);
-
-  /** Send a MQTT message (no heap allocation for topic).
-   *
-   * @param topic The topic as StringRef (for use with get_state_topic_to_()).
-   * @param payload The null-terminated payload.
-   */
-  bool publish(StringRef topic, const char *payload) { return this->publish(topic.c_str(), payload); }
-
   /** Construct and send a JSON MQTT message.
    *
    * @param topic The topic.
@@ -196,20 +164,6 @@ class MQTTComponent : public Component {
    */
   bool publish_json(const std::string &topic, const json::json_build_t &f);
 
-  /** Construct and send a JSON MQTT message (no heap allocation for topic).
-   *
-   * @param topic The topic as C string.
-   * @param f The Json Message builder.
-   */
-  bool publish_json(const char *topic, const json::json_build_t &f);
-
-  /** Construct and send a JSON MQTT message (no heap allocation for topic).
-   *
-   * @param topic The topic as StringRef (for use with get_state_topic_to_()).
-   * @param f The Json Message builder.
-   */
-  bool publish_json(StringRef topic, const json::json_build_t &f) { return this->publish_json(topic.c_str(), f); }
-
   /** Subscribe to a MQTT topic.
    *
    * @param topic The topic. Wildcards are currently not supported.

esphome/components/mqtt/mqtt_cover.cpp

@@ -115,8 +115,7 @@ bool MQTTCoverComponent::publish_state() {
                         : this->cover_->position == COVER_OPEN                       ? "open"
                         : traits.get_supports_position()                             ? "open"
                                                                                      : "unknown";
-  char topic_buf[MQTT_DEFAULT_TOPIC_MAX_LEN];
-  if (!this->publish(this->get_state_topic_to_(topic_buf), state_s))
+  if (!this->publish(this->get_state_topic_(), state_s))
     success = false;
   return success;
 }

esphome/components/mqtt/mqtt_date.cpp

@@ -53,8 +53,7 @@ bool MQTTDateComponent::send_initial_state() {
   }
 }
 bool MQTTDateComponent::publish_state(uint16_t year, uint8_t month, uint8_t day) {
-  char topic_buf[MQTT_DEFAULT_TOPIC_MAX_LEN];
-  return this->publish_json(this->get_state_topic_to_(topic_buf), [year, month, day](JsonObject root) {
+  return this->publish_json(this->get_state_topic_(), [year, month, day](JsonObject root) {
     // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
     root[ESPHOME_F("year")] = year;
     root[ESPHOME_F("month")] = month;

esphome/components/mqtt/mqtt_datetime.cpp

@@ -66,17 +66,15 @@ bool MQTTDateTimeComponent::send_initial_state() {
 }
 bool MQTTDateTimeComponent::publish_state(uint16_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute,
                                           uint8_t second) {
-  char topic_buf[MQTT_DEFAULT_TOPIC_MAX_LEN];
-  return this->publish_json(this->get_state_topic_to_(topic_buf),
-                            [year, month, day, hour, minute, second](JsonObject root) {
-                              // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
-                              root[ESPHOME_F("year")] = year;
-                              root[ESPHOME_F("month")] = month;
-                              root[ESPHOME_F("day")] = day;
-                              root[ESPHOME_F("hour")] = hour;
-                              root[ESPHOME_F("minute")] = minute;
-                              root[ESPHOME_F("second")] = second;
-                            });
+  return this->publish_json(this->get_state_topic_(), [year, month, day, hour, minute, second](JsonObject root) {
+    // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
+    root[ESPHOME_F("year")] = year;
+    root[ESPHOME_F("month")] = month;
+    root[ESPHOME_F("day")] = day;
+    root[ESPHOME_F("hour")] = hour;
+    root[ESPHOME_F("minute")] = minute;
+    root[ESPHOME_F("second")] = second;
+  });
 }
 
 }  // namespace esphome::mqtt

esphome/components/mqtt/mqtt_event.cpp

@@ -44,8 +44,7 @@ void MQTTEventComponent::dump_config() {
 }
 
 bool MQTTEventComponent::publish_event_(const std::string &event_type) {
-  char topic_buf[MQTT_DEFAULT_TOPIC_MAX_LEN];
-  return this->publish_json(this->get_state_topic_to_(topic_buf), [event_type](JsonObject root) {
+  return this->publish_json(this->get_state_topic_(), [event_type](JsonObject root) {
     // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
     root[MQTT_EVENT_TYPE] = event_type;
   });

esphome/components/mqtt/mqtt_fan.cpp

@@ -158,10 +158,9 @@ void MQTTFanComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryConfig
   }
 }
 bool MQTTFanComponent::publish_state() {
-  char topic_buf[MQTT_DEFAULT_TOPIC_MAX_LEN];
   const char *state_s = this->state_->state ? "ON" : "OFF";
   ESP_LOGD(TAG, "'%s' Sending state %s.", this->state_->get_name().c_str(), state_s);
-  this->publish(this->get_state_topic_to_(topic_buf), state_s);
+  this->publish(this->get_state_topic_(), state_s);
   bool failed = false;
   if (this->state_->get_traits().supports_direction()) {
     bool success = this->publish(this->get_direction_state_topic(),

esphome/components/mqtt/mqtt_light.cpp

@@ -34,8 +34,7 @@ void MQTTJSONLightComponent::on_light_remote_values_update() {
 MQTTJSONLightComponent::MQTTJSONLightComponent(LightState *state) : state_(state) {}
 
 bool MQTTJSONLightComponent::publish_state_() {
-  char topic_buf[MQTT_DEFAULT_TOPIC_MAX_LEN];
-  return this->publish_json(this->get_state_topic_to_(topic_buf), [this](JsonObject root) {
+  return this->publish_json(this->get_state_topic_(), [this](JsonObject root) {
     // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
     LightJSONSchema::dump_json(*this->state_, root);
   });

esphome/components/mqtt/mqtt_lock.cpp

@@ -1,6 +1,5 @@
 #include "mqtt_lock.h"
 #include "esphome/core/log.h"
-#include "esphome/core/progmem.h"
 
 #include "mqtt_const.h"
 
@@ -17,11 +16,11 @@ MQTTLockComponent::MQTTLockComponent(lock::Lock *a_lock) : lock_(a_lock) {}
 
 void MQTTLockComponent::setup() {
   this->subscribe(this->get_command_topic_(), [this](const std::string &topic, const std::string &payload) {
-    if (ESPHOME_strcasecmp_P(payload.c_str(), ESPHOME_PSTR("LOCK")) == 0) {
+    if (strcasecmp(payload.c_str(), "LOCK") == 0) {
       this->lock_->lock();
-    } else if (ESPHOME_strcasecmp_P(payload.c_str(), ESPHOME_PSTR("UNLOCK")) == 0) {
+    } else if (strcasecmp(payload.c_str(), "UNLOCK") == 0) {
       this->lock_->unlock();
-    } else if (ESPHOME_strcasecmp_P(payload.c_str(), ESPHOME_PSTR("OPEN")) == 0) {
+    } else if (strcasecmp(payload.c_str(), "OPEN") == 0) {
       this->lock_->open();
     } else {
       ESP_LOGW(TAG, "'%s': Received unknown status payload: %s", this->friendly_name_().c_str(), payload.c_str());
@@ -48,14 +47,13 @@ void MQTTLockComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryConfi
 bool MQTTLockComponent::send_initial_state() { return this->publish_state(); }
 
 bool MQTTLockComponent::publish_state() {
-  char topic_buf[MQTT_DEFAULT_TOPIC_MAX_LEN];
 #ifdef USE_STORE_LOG_STR_IN_FLASH
   char buf[LOCK_STATE_STR_SIZE];
   strncpy_P(buf, (PGM_P) lock_state_to_string(this->lock_->state), sizeof(buf) - 1);
   buf[sizeof(buf) - 1] = '\0';
-  return this->publish(this->get_state_topic_to_(topic_buf), buf);
+  return this->publish(this->get_state_topic_(), buf);
 #else
-  return this->publish(this->get_state_topic_to_(topic_buf), LOG_STR_ARG(lock_state_to_string(this->lock_->state)));
+  return this->publish(this->get_state_topic_(), LOG_STR_ARG(lock_state_to_string(this->lock_->state)));
 #endif
 }
 

esphome/components/mqtt/mqtt_number.cpp

@@ -74,10 +74,9 @@ bool MQTTNumberComponent::send_initial_state() {
   }
 }
 bool MQTTNumberComponent::publish_state(float value) {
-  char topic_buf[MQTT_DEFAULT_TOPIC_MAX_LEN];
   char buffer[64];
-  size_t len = buf_append_printf(buffer, sizeof(buffer), 0, "%f", value);
-  return this->publish(this->get_state_topic_to_(topic_buf), buffer, len);
+  buf_append_printf(buffer, sizeof(buffer), 0, "%f", value);
+  return this->publish(this->get_state_topic_(), buffer);
 }
 
 }  // namespace esphome::mqtt

esphome/components/mqtt/mqtt_select.cpp

@@ -50,8 +50,7 @@ bool MQTTSelectComponent::send_initial_state() {
   }
 }
 bool MQTTSelectComponent::publish_state(const std::string &value) {
-  char topic_buf[MQTT_DEFAULT_TOPIC_MAX_LEN];
-  return this->publish(this->get_state_topic_to_(topic_buf), value.data(), value.size());
+  return this->publish(this->get_state_topic_(), value);
 }
 
 }  // namespace esphome::mqtt

esphome/components/mqtt/mqtt_sensor.cpp

@@ -79,13 +79,12 @@ bool MQTTSensorComponent::send_initial_state() {
   }
 }
 bool MQTTSensorComponent::publish_state(float value) {
-  char topic_buf[MQTT_DEFAULT_TOPIC_MAX_LEN];
   if (mqtt::global_mqtt_client->is_publish_nan_as_none() && std::isnan(value))
-    return this->publish(this->get_state_topic_to_(topic_buf), "None", 4);
+    return this->publish(this->get_state_topic_(), "None", 4);
   int8_t accuracy = this->sensor_->get_accuracy_decimals();
   char buf[VALUE_ACCURACY_MAX_LEN];
   size_t len = value_accuracy_to_buf(buf, value, accuracy);
-  return this->publish(this->get_state_topic_to_(topic_buf), buf, len);
+  return this->publish(this->get_state_topic_(), buf, len);
 }
 
 }  // namespace esphome::mqtt

esphome/components/mqtt/mqtt_switch.cpp

@@ -52,9 +52,8 @@ void MQTTSwitchComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryCon
 bool MQTTSwitchComponent::send_initial_state() { return this->publish_state(this->switch_->state); }
 
 bool MQTTSwitchComponent::publish_state(bool state) {
-  char topic_buf[MQTT_DEFAULT_TOPIC_MAX_LEN];
   const char *state_s = state ? "ON" : "OFF";
-  return this->publish(this->get_state_topic_to_(topic_buf), state_s);
+  return this->publish(this->get_state_topic_(), state_s);
 }
 
 }  // namespace esphome::mqtt

esphome/components/mqtt/mqtt_text.cpp

@@ -53,8 +53,7 @@ bool MQTTTextComponent::send_initial_state() {
   }
 }
 bool MQTTTextComponent::publish_state(const std::string &value) {
-  char topic_buf[MQTT_DEFAULT_TOPIC_MAX_LEN];
-  return this->publish(this->get_state_topic_to_(topic_buf), value.data(), value.size());
+  return this->publish(this->get_state_topic_(), value);
 }
 
 }  // namespace esphome::mqtt

esphome/components/mqtt/mqtt_text_sensor.cpp

@@ -31,10 +31,7 @@ void MQTTTextSensor::dump_config() {
   LOG_MQTT_COMPONENT(true, false);
 }
 
-bool MQTTTextSensor::publish_state(const std::string &value) {
-  char topic_buf[MQTT_DEFAULT_TOPIC_MAX_LEN];
-  return this->publish(this->get_state_topic_to_(topic_buf), value.data(), value.size());
-}
+bool MQTTTextSensor::publish_state(const std::string &value) { return this->publish(this->get_state_topic_(), value); }
 bool MQTTTextSensor::send_initial_state() {
   if (this->sensor_->has_state()) {
     return this->publish_state(this->sensor_->state);

esphome/components/mqtt/mqtt_time.cpp

@@ -53,8 +53,7 @@ bool MQTTTimeComponent::send_initial_state() {
   }
 }
 bool MQTTTimeComponent::publish_state(uint8_t hour, uint8_t minute, uint8_t second) {
-  char topic_buf[MQTT_DEFAULT_TOPIC_MAX_LEN];
-  return this->publish_json(this->get_state_topic_to_(topic_buf), [hour, minute, second](JsonObject root) {
+  return this->publish_json(this->get_state_topic_(), [hour, minute, second](JsonObject root) {
     // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
     root[ESPHOME_F("hour")] = hour;
     root[ESPHOME_F("minute")] = minute;

esphome/components/mqtt/mqtt_update.cpp

@@ -28,8 +28,7 @@ void MQTTUpdateComponent::setup() {
 }
 
 bool MQTTUpdateComponent::publish_state() {
-  char topic_buf[MQTT_DEFAULT_TOPIC_MAX_LEN];
-  return this->publish_json(this->get_state_topic_to_(topic_buf), [this](JsonObject root) {
+  return this->publish_json(this->get_state_topic_(), [this](JsonObject root) {
     root[ESPHOME_F("installed_version")] = this->update_->update_info.current_version;
     root[ESPHOME_F("latest_version")] = this->update_->update_info.latest_version;
     root[ESPHOME_F("title")] = this->update_->update_info.title;

esphome/components/mqtt/mqtt_valve.cpp

@@ -84,8 +84,7 @@ bool MQTTValveComponent::publish_state() {
                         : this->valve_->position == VALVE_OPEN                       ? "open"
                         : traits.get_supports_position()                             ? "open"
                                                                                      : "unknown";
-  char topic_buf[MQTT_DEFAULT_TOPIC_MAX_LEN];
-  if (!this->publish(this->get_state_topic_to_(topic_buf), state_s))
+  if (!this->publish(this->get_state_topic_(), state_s))
     success = false;
   return success;
 }

esphome/components/number/automation.cpp

@@ -14,7 +14,8 @@ void ValueRangeTrigger::setup() {
   float local_min = this->min_.value(0.0);
   float local_max = this->max_.value(0.0);
   convert hash = {.from = (local_max - local_min)};
-  this->rtc_ = this->parent_->make_entity_preference<bool>(hash.to);
+  uint32_t myhash = hash.to ^ this->parent_->get_preference_hash();
+  this->rtc_ = global_preferences->make_preference<bool>(myhash);
   bool initial_state;
   if (this->rtc_.load(&initial_state)) {
     this->previous_in_range_ = initial_state;

esphome/components/opentherm/number/opentherm_number.cpp

@@ -17,7 +17,7 @@ void OpenthermNumber::setup() {
   if (!this->restore_value_) {
     value = this->initial_value_;
   } else {
-    this->pref_ = this->make_entity_preference<float>();
+    this->pref_ = global_preferences->make_preference<float>(this->get_preference_hash());
     if (!this->pref_.load(&value)) {
       if (!std::isnan(this->initial_value_)) {
         value = this->initial_value_;

esphome/components/rotary_encoder/rotary_encoder.cpp

@@ -132,7 +132,7 @@ void RotaryEncoderSensor::setup() {
   int32_t initial_value = 0;
   switch (this->restore_mode_) {
     case ROTARY_ENCODER_RESTORE_DEFAULT_ZERO:
-      this->rtc_ = this->make_entity_preference<int32_t>();
+      this->rtc_ = global_preferences->make_preference<int32_t>(this->get_preference_hash());
       if (!this->rtc_.load(&initial_value)) {
         initial_value = 0;
       }

esphome/components/rp2040/preferences.cpp

@@ -8,6 +8,7 @@
 #include "preferences.h"
 
 #include <cstring>
+#include <vector>
 
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
@@ -24,9 +25,6 @@ static bool s_flash_dirty = false;          // NOLINT(cppcoreguidelines-avoid-no
 
 static const uint32_t RP2040_FLASH_STORAGE_SIZE = 512;
 
-// Stack buffer size for preferences - covers virtually all real-world preferences without heap allocation
-static constexpr size_t PREF_BUFFER_SIZE = 64;
-
 extern "C" uint8_t _EEPROM_start;
 
 template<class It> uint8_t calculate_crc(It first, It last, uint32_t type) {
@@ -44,14 +42,12 @@ class RP2040PreferenceBackend : public ESPPreferenceBackend {
   uint32_t type = 0;
 
   bool save(const uint8_t *data, size_t len) override {
-    const size_t buffer_size = len + 1;
-    SmallBufferWithHeapFallback<PREF_BUFFER_SIZE> buffer_alloc(buffer_size);
-    uint8_t *buffer = buffer_alloc.get();
+    std::vector<uint8_t> buffer;
+    buffer.resize(len + 1);
+    memcpy(buffer.data(), data, len);
+    buffer[buffer.size() - 1] = calculate_crc(buffer.begin(), buffer.end() - 1, type);
 
-    memcpy(buffer, data, len);
-    buffer[len] = calculate_crc(buffer, buffer + len, type);
-
-    for (size_t i = 0; i < buffer_size; i++) {
+    for (uint32_t i = 0; i < len + 1; i++) {
       uint32_t j = offset + i;
       if (j >= RP2040_FLASH_STORAGE_SIZE)
         return false;
@@ -64,23 +60,22 @@ class RP2040PreferenceBackend : public ESPPreferenceBackend {
     return true;
   }
   bool load(uint8_t *data, size_t len) override {
-    const size_t buffer_size = len + 1;
-    SmallBufferWithHeapFallback<PREF_BUFFER_SIZE> buffer_alloc(buffer_size);
-    uint8_t *buffer = buffer_alloc.get();
+    std::vector<uint8_t> buffer;
+    buffer.resize(len + 1);
 
-    for (size_t i = 0; i < buffer_size; i++) {
+    for (size_t i = 0; i < len + 1; i++) {
       uint32_t j = offset + i;
       if (j >= RP2040_FLASH_STORAGE_SIZE)
         return false;
       buffer[i] = s_flash_storage[j];
     }
 
-    uint8_t crc = calculate_crc(buffer, buffer + len, type);
-    if (buffer[len] != crc) {
+    uint8_t crc = calculate_crc(buffer.begin(), buffer.end() - 1, type);
+    if (buffer[buffer.size() - 1] != crc) {
       return false;
     }
 
-    memcpy(data, buffer, len);
+    memcpy(data, buffer.data(), len);
     return true;
   }
 };

esphome/components/sensor/automation.h

@@ -39,7 +39,7 @@ class ValueRangeTrigger : public Trigger<float>, public Component {
   template<typename V> void set_max(V max) { this->max_ = max; }
 
   void setup() override {
-    this->rtc_ = this->parent_->make_entity_preference<bool>();
+    this->rtc_ = global_preferences->make_preference<bool>(this->parent_->get_preference_hash());
     bool initial_state;
     if (this->rtc_.load(&initial_state)) {
       this->previous_in_range_ = initial_state;

esphome/components/sml/constants.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <array>
 #include <cstdint>
 
 namespace esphome {
@@ -22,7 +21,7 @@ enum SmlMessageType : uint16_t { SML_PUBLIC_OPEN_RES = 0x0101, SML_GET_LIST_RES
 const uint16_t START_MASK = 0x55aa;  // 0x1b 1b 1b 1b 01 01 01 01
 const uint16_t END_MASK = 0x0157;    // 0x1b 1b 1b 1b 1a
 
-constexpr std::array<uint8_t, 8> START_SEQ = {0x1b, 0x1b, 0x1b, 0x1b, 0x01, 0x01, 0x01, 0x01};
+const std::vector<uint8_t> START_SEQ = {0x1b, 0x1b, 0x1b, 0x1b, 0x01, 0x01, 0x01, 0x01};
 
 }  // namespace sml
 }  // namespace esphome

esphome/components/socket/lwip_raw_tcp_impl.cpp

@@ -29,14 +29,6 @@ void socket_delay(uint32_t ms) {
   // Use esp_delay with a callback that checks if socket data arrived.
   // This allows the delay to exit early when socket_wake() is called by
   // lwip recv_fn/accept_fn callbacks, reducing socket latency.
-  //
-  // When ms is 0, we must use delay(0) because esp_delay(0, callback)
-  // exits immediately without yielding, which can cause watchdog timeouts
-  // when the main loop runs in high-frequency mode (e.g., during light effects).
-  if (ms == 0) {
-    delay(0);
-    return;
-  }
   s_socket_woke = false;
   esp_delay(ms, []() { return !s_socket_woke; });
 }

esphome/components/speaker/media_player/speaker_media_player.cpp

@@ -55,7 +55,7 @@ void SpeakerMediaPlayer::setup() {
 
   this->media_control_command_queue_ = xQueueCreate(MEDIA_CONTROLS_QUEUE_LENGTH, sizeof(MediaCallCommand));
 
-  this->pref_ = this->make_entity_preference<VolumeRestoreState>();
+  this->pref_ = global_preferences->make_preference<VolumeRestoreState>(this->get_preference_hash());
 
   VolumeRestoreState volume_restore_state;
   if (this->pref_.load(&volume_restore_state)) {

esphome/components/sprinkler/sprinkler.cpp

@@ -16,7 +16,7 @@ void SprinklerControllerNumber::setup() {
   if (!this->restore_value_) {
     value = this->initial_value_;
   } else {
-    this->pref_ = this->make_entity_preference<float>();
+    this->pref_ = global_preferences->make_preference<float>(this->get_preference_hash());
     if (!this->pref_.load(&value)) {
       if (!std::isnan(this->initial_value_)) {
         value = this->initial_value_;

esphome/components/switch/switch.cpp

@@ -34,7 +34,7 @@ optional<bool> Switch::get_initial_state() {
   if (!(restore_mode & RESTORE_MODE_PERSISTENT_MASK))
     return {};
 
-  this->rtc_ = this->make_entity_preference<bool>();
+  this->rtc_ = global_preferences->make_preference<bool>(this->get_preference_hash());
   bool initial_state;
   if (!this->rtc_.load(&initial_state))
     return {};

esphome/components/template/alarm_control_panel/template_alarm_control_panel.cpp

@@ -82,7 +82,7 @@ void TemplateAlarmControlPanel::setup() {
   this->current_state_ = ACP_STATE_DISARMED;
   if (this->restore_mode_ == ALARM_CONTROL_PANEL_RESTORE_DEFAULT_DISARMED) {
     uint8_t value;
-    this->pref_ = this->make_entity_preference<uint8_t>();
+    this->pref_ = global_preferences->make_preference<uint8_t>(this->get_preference_hash());
     if (this->pref_.load(&value)) {
       this->current_state_ = static_cast<alarm_control_panel::AlarmControlPanelState>(value);
     }

esphome/components/template/datetime/template_date.cpp

@@ -18,7 +18,8 @@ void TemplateDate::setup() {
     state = this->initial_value_;
   } else {
     datetime::DateEntityRestoreState temp;
-    this->pref_ = this->make_entity_preference<datetime::DateEntityRestoreState>(194434030U);
+    this->pref_ =
+        global_preferences->make_preference<datetime::DateEntityRestoreState>(194434030U ^ this->get_preference_hash());
     if (this->pref_.load(&temp)) {
       temp.apply(this);
       return;

esphome/components/template/datetime/template_datetime.cpp

@@ -18,7 +18,8 @@ void TemplateDateTime::setup() {
     state = this->initial_value_;
   } else {
     datetime::DateTimeEntityRestoreState temp;
-    this->pref_ = this->make_entity_preference<datetime::DateTimeEntityRestoreState>(194434090U);
+    this->pref_ = global_preferences->make_preference<datetime::DateTimeEntityRestoreState>(
+        194434090U ^ this->get_preference_hash());
     if (this->pref_.load(&temp)) {
       temp.apply(this);
       return;

esphome/components/template/datetime/template_time.cpp

@@ -18,7 +18,8 @@ void TemplateTime::setup() {
     state = this->initial_value_;
   } else {
     datetime::TimeEntityRestoreState temp;
-    this->pref_ = this->make_entity_preference<datetime::TimeEntityRestoreState>(194434060U);
+    this->pref_ =
+        global_preferences->make_preference<datetime::TimeEntityRestoreState>(194434060U ^ this->get_preference_hash());
     if (this->pref_.load(&temp)) {
       temp.apply(this);
       return;

esphome/components/template/number/template_number.cpp

@@ -13,7 +13,7 @@ void TemplateNumber::setup() {
   if (!this->restore_value_) {
     value = this->initial_value_;
   } else {
-    this->pref_ = this->make_entity_preference<float>();
+    this->pref_ = global_preferences->make_preference<float>(this->get_preference_hash());
     if (!this->pref_.load(&value)) {
       if (!std::isnan(this->initial_value_)) {
         value = this->initial_value_;

esphome/components/template/select/template_select.cpp

@@ -11,7 +11,7 @@ void TemplateSelect::setup() {
 
   size_t index = this->initial_option_index_;
   if (this->restore_value_) {
-    this->pref_ = this->make_entity_preference<size_t>();
+    this->pref_ = global_preferences->make_preference<size_t>(this->get_preference_hash());
     size_t restored_index;
     if (this->pref_.load(&restored_index) && this->has_index(restored_index)) {
       index = restored_index;

esphome/components/template/text/template_text.cpp

@@ -20,14 +20,7 @@ void TemplateText::setup() {
 
   // Need std::string for pref_->setup() to fill from flash
   std::string value{this->initial_value_ != nullptr ? this->initial_value_ : ""};
-  // For future hash migration: use migrate_entity_preference_() with:
-  //   old_key = get_preference_hash() + extra
-  //   new_key = get_preference_hash_v2() + extra
-  // See: https://github.com/esphome/backlog/issues/85
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
   uint32_t key = this->get_preference_hash();
-#pragma GCC diagnostic pop
   key += this->traits.get_min_length() << 2;
   key += this->traits.get_max_length() << 4;
   key += fnv1_hash(this->traits.get_pattern_c_str()) << 6;

esphome/components/test_deprecated_example/README.md

@@ -0,0 +1,17 @@
+# Test Deprecated Component
+
+This is a test component to validate the `deprecated_component` label functionality in the auto-label workflow.
+
+## Purpose
+
+This component demonstrates how the `DEPRECATED_COMPONENT` constant should be used:
+
+1. The component is still functional and usable
+2. It's deprecated and not actively maintained
+3. Users should migrate to an alternative when possible
+
+## Usage
+
+This is different from components that use `cv.invalid()`, which are completely unusable.
+
+Components with `DEPRECATED_COMPONENT` are still functional but discouraged for new projects.

esphome/components/test_deprecated_example/__init__.py

@@ -0,0 +1,6 @@
+"""Test deprecated component for validation."""
+
+CODEOWNERS = ["@test"]
+DEPRECATED_COMPONENT = "This component is deprecated and will be removed in a future release. Please use the newer_component instead."
+
+# Component is still functional but deprecated

esphome/components/test_deprecated_example/sensor.py

@@ -0,0 +1,5 @@
+"""Test sensor platform for deprecated component."""
+import esphome.config_validation as cv
+
+# This is a simple placeholder - component still works
+CONFIG_SCHEMA = cv.Schema({})

esphome/components/tm1638/tm1638.cpp

@@ -35,6 +35,9 @@ void TM1638Component::setup() {
   this->set_intensity(intensity_);
 
   this->reset_();  // all LEDs off
+
+  for (uint8_t i = 0; i < 8; i++)  // zero fill print buffer
+    this->buffer_[i] = 0;
 }
 
 void TM1638Component::dump_config() {

esphome/components/tm1638/tm1638.h

@@ -70,7 +70,7 @@ class TM1638Component : public PollingComponent {
   GPIOPin *clk_pin_;
   GPIOPin *stb_pin_;
   GPIOPin *dio_pin_;
-  uint8_t buffer_[8]{};
+  uint8_t *buffer_ = new uint8_t[8];
   tm1638_writer_t writer_{};
   std::vector<KeyListener *> listeners_{};
 };

esphome/components/total_daily_energy/total_daily_energy.cpp

@@ -10,7 +10,7 @@ void TotalDailyEnergy::setup() {
   float initial_value = 0;
 
   if (this->restore_) {
-    this->pref_ = this->make_entity_preference<float>();
+    this->pref_ = global_preferences->make_preference<float>(this->get_preference_hash());
     this->pref_.load(&initial_value);
   }
   this->publish_state_and_save(initial_value);

esphome/components/tuya/number/tuya_number.cpp

@@ -8,7 +8,7 @@ static const char *const TAG = "tuya.number";
 
 void TuyaNumber::setup() {
   if (this->restore_value_) {
-    this->pref_ = this->make_entity_preference<float>();
+    this->pref_ = global_preferences->make_preference<float>(this->get_preference_hash());
   }
 
   this->parent_->register_listener(this->number_id_, [this](const TuyaDatapoint &datapoint) {

esphome/components/uln2003/uln2003.cpp

@@ -1,23 +1,11 @@
 #include "uln2003.h"
 #include "esphome/core/log.h"
 
-namespace esphome::uln2003 {
+namespace esphome {
+namespace uln2003 {
 
 static const char *const TAG = "uln2003.stepper";
 
-static const LogString *step_mode_to_log_string(ULN2003StepMode mode) {
-  switch (mode) {
-    case ULN2003_STEP_MODE_FULL_STEP:
-      return LOG_STR("FULL STEP");
-    case ULN2003_STEP_MODE_HALF_STEP:
-      return LOG_STR("HALF STEP");
-    case ULN2003_STEP_MODE_WAVE_DRIVE:
-      return LOG_STR("WAVE DRIVE");
-    default:
-      return LOG_STR("UNKNOWN");
-  }
-}
-
 void ULN2003::setup() {
   this->pin_a_->setup();
   this->pin_b_->setup();
@@ -54,7 +42,22 @@ void ULN2003::dump_config() {
   LOG_PIN("  Pin B: ", this->pin_b_);
   LOG_PIN("  Pin C: ", this->pin_c_);
   LOG_PIN("  Pin D: ", this->pin_d_);
-  ESP_LOGCONFIG(TAG, "  Step Mode: %s", LOG_STR_ARG(step_mode_to_log_string(this->step_mode_)));
+  const char *step_mode_s;
+  switch (this->step_mode_) {
+    case ULN2003_STEP_MODE_FULL_STEP:
+      step_mode_s = "FULL STEP";
+      break;
+    case ULN2003_STEP_MODE_HALF_STEP:
+      step_mode_s = "HALF STEP";
+      break;
+    case ULN2003_STEP_MODE_WAVE_DRIVE:
+      step_mode_s = "WAVE DRIVE";
+      break;
+    default:
+      step_mode_s = "UNKNOWN";
+      break;
+  }
+  ESP_LOGCONFIG(TAG, "  Step Mode: %s", step_mode_s);
 }
 void ULN2003::write_step_(int32_t step) {
   int32_t n = this->step_mode_ == ULN2003_STEP_MODE_HALF_STEP ? 8 : 4;
@@ -87,4 +90,5 @@ void ULN2003::write_step_(int32_t step) {
   this->pin_d_->digital_write((res >> 3) & 1);
 }
 
-}  // namespace esphome::uln2003
+}  // namespace uln2003
+}  // namespace esphome

esphome/components/uln2003/uln2003.h

@@ -4,7 +4,8 @@
 #include "esphome/core/hal.h"
 #include "esphome/components/stepper/stepper.h"
 
-namespace esphome::uln2003 {
+namespace esphome {
+namespace uln2003 {
 
 enum ULN2003StepMode {
   ULN2003_STEP_MODE_FULL_STEP,
@@ -39,4 +40,5 @@ class ULN2003 : public stepper::Stepper, public Component {
   int32_t current_uln_pos_{0};
 };
 
-}  // namespace esphome::uln2003
+}  // namespace uln2003
+}  // namespace esphome

esphome/components/valve/valve.cpp

@@ -2,8 +2,6 @@
 #include "esphome/core/defines.h"
 #include "esphome/core/controller_registry.h"
 #include "esphome/core/log.h"
-#include "esphome/core/progmem.h"
-
 #include <strings.h>
 
 namespace esphome {
@@ -40,13 +38,13 @@ Valve::Valve() : position{VALVE_OPEN} {}
 
 ValveCall::ValveCall(Valve *parent) : parent_(parent) {}
 ValveCall &ValveCall::set_command(const char *command) {
-  if (ESPHOME_strcasecmp_P(command, ESPHOME_PSTR("OPEN")) == 0) {
+  if (strcasecmp(command, "OPEN") == 0) {
     this->set_command_open();
-  } else if (ESPHOME_strcasecmp_P(command, ESPHOME_PSTR("CLOSE")) == 0) {
+  } else if (strcasecmp(command, "CLOSE") == 0) {
     this->set_command_close();
-  } else if (ESPHOME_strcasecmp_P(command, ESPHOME_PSTR("STOP")) == 0) {
+  } else if (strcasecmp(command, "STOP") == 0) {
     this->set_command_stop();
-  } else if (ESPHOME_strcasecmp_P(command, ESPHOME_PSTR("TOGGLE")) == 0) {
+  } else if (strcasecmp(command, "TOGGLE") == 0) {
     this->set_command_toggle();
   } else {
     ESP_LOGW(TAG, "'%s' - Unrecognized command %s", this->parent_->get_name().c_str(), command);
@@ -163,7 +161,7 @@ void Valve::publish_state(bool save) {
   }
 }
 optional<ValveRestoreState> Valve::restore_state_() {
-  this->rtc_ = this->make_entity_preference<ValveRestoreState>();
+  this->rtc_ = global_preferences->make_preference<ValveRestoreState>(this->get_preference_hash());
   ValveRestoreState recovered{};
   if (!this->rtc_.load(&recovered))
     return {};

esphome/components/water_heater/water_heater.cpp

@@ -185,7 +185,7 @@ void WaterHeater::publish_state() {
 }
 
 optional<WaterHeaterCall> WaterHeater::restore_state_() {
-  this->pref_ = this->make_entity_preference<SavedWaterHeaterState>();
+  this->pref_ = global_preferences->make_preference<SavedWaterHeaterState>(this->get_preference_hash());
   SavedWaterHeaterState recovered{};
   if (!this->pref_.load(&recovered))
     return {};

esphome/components/waveshare_epaper/__init__.py

@@ -1 +1,2 @@
 CODEOWNERS = ["@clydebarrow"]
+DEPRECATED_COMPONENT = "The waveshare_epaper component is deprecated and no new models will be added. For new epaper displays use the epaper_spi component"

esphome/components/web_server_base/__init__.py

@@ -48,4 +48,4 @@ async def to_code(config):
         if CORE.is_libretiny:
             CORE.add_platformio_option("lib_ignore", ["ESPAsyncTCP", "RPAsyncTCP"])
         # https://github.com/ESP32Async/ESPAsyncWebServer/blob/main/library.json
-        cg.add_library("ESP32Async/ESPAsyncWebServer", "3.9.5")
+        cg.add_library("ESP32Async/ESPAsyncWebServer", "3.7.10")

esphome/components/wifi/wifi_component.cpp

@@ -746,32 +746,16 @@ void WiFiComponent::setup_ap_config_() {
     return;
 
   if (this->ap_.get_ssid().empty()) {
-    // Build AP SSID from app name without heap allocation
-    // WiFi SSID max is 32 bytes, with MAC suffix we keep first 25 + last 7
-    static constexpr size_t AP_SSID_MAX_LEN = 32;
-    static constexpr size_t AP_SSID_PREFIX_LEN = 25;
-    static constexpr size_t AP_SSID_SUFFIX_LEN = 7;
-
-    const std::string &app_name = App.get_name();
-    const char *name_ptr = app_name.c_str();
-    size_t name_len = app_name.length();
-
-    if (name_len <= AP_SSID_MAX_LEN) {
-      // Name fits, use directly
-      this->ap_.set_ssid(name_ptr);
-    } else {
-      // Name too long, need to truncate into stack buffer
-      char ssid_buf[AP_SSID_MAX_LEN + 1];
+    std::string name = App.get_name();
+    if (name.length() > 32) {
       if (App.is_name_add_mac_suffix_enabled()) {
         // Keep first 25 chars and last 7 chars (MAC suffix), remove middle
-        memcpy(ssid_buf, name_ptr, AP_SSID_PREFIX_LEN);
-        memcpy(ssid_buf + AP_SSID_PREFIX_LEN, name_ptr + name_len - AP_SSID_SUFFIX_LEN, AP_SSID_SUFFIX_LEN);
+        name.erase(25, name.length() - 32);
       } else {
-        memcpy(ssid_buf, name_ptr, AP_SSID_MAX_LEN);
+        name.resize(32);
       }
-      ssid_buf[AP_SSID_MAX_LEN] = '\0';
-      this->ap_.set_ssid(ssid_buf);
     }
+    this->ap_.set_ssid(name);
   }
   this->ap_setup_ = this->wifi_start_ap_(this->ap_);
 

esphome/core/entity_base.cpp

@@ -92,48 +92,6 @@ StringRef EntityBase::get_object_id_to(std::span<char, OBJECT_ID_MAX_LEN> buf) c
 
 uint32_t EntityBase::get_object_id_hash() { return this->object_id_hash_; }
 
-// Migrate preference data from old_key to new_key if they differ.
-// This helper is exposed so callers with custom key computation (like TextPrefs)
-// can use it for manual migration. See: https://github.com/esphome/backlog/issues/85
-//
-// FUTURE IMPLEMENTATION:
-// This will require raw load/save methods on ESPPreferenceObject that take uint8_t* and size.
-//   void EntityBase::migrate_entity_preference_(size_t size, uint32_t old_key, uint32_t new_key) {
-//     if (old_key == new_key)
-//       return;
-//     auto old_pref = global_preferences->make_preference(size, old_key);
-//     auto new_pref = global_preferences->make_preference(size, new_key);
-//     SmallBufferWithHeapFallback<64> buffer(size);
-//     if (old_pref.load(buffer.data(), size)) {
-//       new_pref.save(buffer.data(), size);
-//     }
-//   }
-
-ESPPreferenceObject EntityBase::make_entity_preference_(size_t size, uint32_t version) {
-  // This helper centralizes preference creation to enable fixing hash collisions.
-  // See: https://github.com/esphome/backlog/issues/85
-  //
-  // COLLISION PROBLEM: get_preference_hash() uses fnv1_hash on sanitized object_id.
-  // Multiple entity names can sanitize to the same object_id:
-  //   - "Living Room" and "living_room" both become "living_room"
-  //   - UTF-8 names like "温度" and "湿度" both become "__" (underscores)
-  // This causes entities to overwrite each other's stored preferences.
-  //
-  // FUTURE MIGRATION: When implementing get_preference_hash_v2() that hashes
-  // the original entity name (not sanitized object_id):
-  //
-  //   uint32_t old_key = this->get_preference_hash() ^ version;
-  //   uint32_t new_key = this->get_preference_hash_v2() ^ version;
-  //   this->migrate_entity_preference_(size, old_key, new_key);
-  //   return global_preferences->make_preference(size, new_key);
-  //
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-  uint32_t key = this->get_preference_hash() ^ version;
-#pragma GCC diagnostic pop
-  return global_preferences->make_preference(size, key);
-}
-
 std::string EntityBase_DeviceClass::get_device_class() {
   if (this->device_class_ == nullptr) {
     return "";

esphome/core/entity_base.h

@@ -6,7 +6,6 @@
 #include "string_ref.h"
 #include "helpers.h"
 #include "log.h"
-#include "preferences.h"
 
 #ifdef USE_DEVICES
 #include "device.h"
@@ -139,12 +138,7 @@ class EntityBase {
    * from previous versions, so existing single-device configurations will continue to work.
    *
    * @return uint32_t The unique hash for preferences, including device_id if available.
-   * @deprecated Use make_entity_preference<T>() instead, or preferences won't be migrated.
-   * See https://github.com/esphome/backlog/issues/85
    */
-  ESPDEPRECATED("Use make_entity_preference<T>() instead, or preferences won't be migrated. "
-                "See https://github.com/esphome/backlog/issues/85. Will be removed in 2027.1.0.",
-                "2026.7.0")
   uint32_t get_preference_hash() {
 #ifdef USE_DEVICES
     // Combine object_id_hash with device_id to ensure uniqueness across devices
@@ -157,19 +151,7 @@ class EntityBase {
 #endif
   }
 
-  /// Create a preference object for storing this entity's state/settings.
-  /// @tparam T The type of data to store (must be trivially copyable)
-  /// @param version Optional version hash XORed with preference key (change when struct layout changes)
-  template<typename T> ESPPreferenceObject make_entity_preference(uint32_t version = 0) {
-    static_assert(std::is_trivially_copyable<T>::value, "T must be trivially copyable");
-    return this->make_entity_preference_(sizeof(T), version);
-  }
-
  protected:
-  /// Non-template helper for make_entity_preference() to avoid code bloat.
-  /// When preference hash algorithm changes, migration logic goes here.
-  ESPPreferenceObject make_entity_preference_(size_t size, uint32_t version);
-
   void calc_object_id_();
 
   StringRef name_;

esphome/core/helpers.cpp

@@ -3,7 +3,6 @@
 #include "esphome/core/defines.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/log.h"
-#include "esphome/core/progmem.h"
 #include "esphome/core/string_ref.h"
 
 #include <strings.h>
@@ -452,15 +451,15 @@ std::string format_bin(const uint8_t *data, size_t length) {
 }
 
 ParseOnOffState parse_on_off(const char *str, const char *on, const char *off) {
-  if (on == nullptr && ESPHOME_strcasecmp_P(str, ESPHOME_PSTR("on")) == 0)
+  if (on == nullptr && strcasecmp(str, "on") == 0)
     return PARSE_ON;
   if (on != nullptr && strcasecmp(str, on) == 0)
     return PARSE_ON;
-  if (off == nullptr && ESPHOME_strcasecmp_P(str, ESPHOME_PSTR("off")) == 0)
+  if (off == nullptr && strcasecmp(str, "off") == 0)
     return PARSE_OFF;
   if (off != nullptr && strcasecmp(str, off) == 0)
     return PARSE_OFF;
-  if (ESPHOME_strcasecmp_P(str, ESPHOME_PSTR("toggle")) == 0)
+  if (strcasecmp(str, "toggle") == 0)
     return PARSE_TOGGLE;
 
   return PARSE_NONE;

esphome/core/helpers.h

@@ -655,11 +655,9 @@ inline uint32_t fnv1_hash_object_id(const char *str, size_t len) {
 }
 
 /// snprintf-like function returning std::string of maximum length \p len (excluding null terminator).
-/// @warning Allocates heap memory. Use snprintf() with a stack buffer instead.
 std::string __attribute__((format(printf, 1, 3))) str_snprintf(const char *fmt, size_t len, ...);
 
 /// sprintf-like function returning std::string.
-/// @warning Allocates heap memory. Use snprintf() with a stack buffer instead.
 std::string __attribute__((format(printf, 1, 2))) str_sprintf(const char *fmt, ...);
 
 #ifdef USE_ESP8266

esphome/core/progmem.h

@@ -12,10 +12,6 @@
 #define ESPHOME_strncpy_P strncpy_P
 #define ESPHOME_strncat_P strncat_P
 #define ESPHOME_snprintf_P snprintf_P
-#define ESPHOME_strcmp_P strcmp_P
-#define ESPHOME_strcasecmp_P strcasecmp_P
-#define ESPHOME_strncmp_P strncmp_P
-#define ESPHOME_strncasecmp_P strncasecmp_P
 // Type for pointers to PROGMEM strings (for use with ESPHOME_F return values)
 using ProgmemStr = const __FlashStringHelper *;
 #else
@@ -25,10 +21,6 @@ using ProgmemStr = const __FlashStringHelper *;
 #define ESPHOME_strncpy_P strncpy
 #define ESPHOME_strncat_P strncat
 #define ESPHOME_snprintf_P snprintf
-#define ESPHOME_strcmp_P strcmp
-#define ESPHOME_strcasecmp_P strcasecmp
-#define ESPHOME_strncmp_P strncmp
-#define ESPHOME_strncasecmp_P strncasecmp
 // Type for pointers to strings (no PROGMEM on non-ESP8266 platforms)
 using ProgmemStr = const char *;
 #endif

esphome/espota2.py

@@ -154,12 +154,6 @@ def check_error(data: list[int] | bytes, expect: int | list[int] | None) -> None
     """
     if not expect:
         return
-    if not data:
-        raise OTAError(
-            "Error: Device closed connection without responding. "
-            "This may indicate the device ran out of memory, "
-            "a network issue, or the connection was interrupted."
-        )
     dat = data[0]
     if dat == RESPONSE_ERROR_MAGIC:
         raise OTAError("Error: Invalid magic byte")

platformio.ini

@@ -114,7 +114,7 @@ lib_deps =
     ESP8266WiFi                           ; wifi (Arduino built-in)
     Update                                ; ota (Arduino built-in)
     ESP32Async/ESPAsyncTCP@2.0.0          ; async_tcp
-    ESP32Async/ESPAsyncWebServer@3.9.5    ; web_server_base
+    ESP32Async/ESPAsyncWebServer@3.7.8    ; web_server_base
     makuna/NeoPixelBus@2.7.3              ; neopixelbus
     ESP8266HTTPClient                     ; http_request (Arduino built-in)
     ESP8266mDNS                           ; mdns (Arduino built-in)
@@ -201,7 +201,7 @@ framework = arduino
 lib_deps =
     ${common:arduino.lib_deps}
     bblanchon/ArduinoJson@7.4.2           ; json
-    ESP32Async/ESPAsyncWebServer@3.9.5    ; web_server_base
+    ESP32Async/ESPAsyncWebServer@3.7.8    ; web_server_base
 build_flags =
     ${common:arduino.build_flags}
     -DUSE_RP2040
@@ -212,12 +212,12 @@ build_unflags =
 ; This are common settings for the LibreTiny (all variants) using Arduino.
 [common:libretiny-arduino]
 extends = common:arduino
-platform = https://github.com/libretiny-eu/libretiny.git#v1.11.0
+platform = libretiny@1.9.2
 framework = arduino
 lib_compat_mode = soft
 lib_deps =
     bblanchon/ArduinoJson@7.4.2           ; json
-    ESP32Async/ESPAsyncWebServer@3.9.5    ; web_server_base
+    ESP32Async/ESPAsyncWebServer@3.7.8    ; web_server_base
     droscy/esp_wireguard@0.4.2            ; wireguard
 build_flags =
     ${common:arduino.build_flags}

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools==80.10.2", "wheel>=0.43,<0.47"]
+requires = ["setuptools==80.10.1", "wheel>=0.43,<0.47"]
 build-backend = "setuptools.build_meta"
 
 [project]

requirements.txt

@@ -12,7 +12,7 @@ platformio==6.1.18  # When updating platformio, also update /docker/Dockerfile
 esptool==5.1.0
 click==8.1.7
 esphome-dashboard==20260110.0
-aioesphomeapi==43.14.0
+aioesphomeapi==43.13.0
 zeroconf==0.148.0
 puremagic==1.30
 ruamel.yaml==0.19.1 # dashboard_import

script/ci-custom.py

@@ -692,8 +692,6 @@ HEAP_ALLOCATING_HELPERS = {
     "str_truncate": "removal (function is unused)",
     "str_upper_case": "removal (function is unused)",
     "str_snake_case": "removal (function is unused)",
-    "str_sprintf": "snprintf() with a stack buffer",
-    "str_snprintf": "snprintf() with a stack buffer",
 }
 
 
@@ -712,9 +710,7 @@ HEAP_ALLOCATING_HELPERS = {
     r"str_sanitize(?!_)|"
     r"str_truncate|"
     r"str_upper_case|"
-    r"str_snake_case|"
-    r"str_sprintf|"
-    r"str_snprintf"
+    r"str_snake_case"
     r")\s*\(" + CPP_RE_EOL,
     include=cpp_include,
     exclude=[

tests/components/http_request/test-custom-ca.esp32-idf.yaml

@@ -1,7 +0,0 @@
-substitutions:
-  verify_ssl: "true"
-
-http_request:
-  ca_certificate_path: $component_dir/test_ca.pem
-
-<<: !include common.yaml

tests/components/http_request/test_ca.pem

@@ -1,10 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBkTCB+wIJAKHBfpegPjMCMA0GCSqGSIb3DQEBCwUAMBExDzANBgNVBAMMBnVu
-dXNlZDAeFw0yNDAxMDEwMDAwMDBaFw0yNTAxMDEwMDAwMDBaMBExDzANBgNVBAMM
-BnVudXNlZDBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC5mMUB1hOgLmlnXtsvcGMP
-XkhAqZaR0dDPW5OS8VEopWLJCX9Y0cvNCqiDI8cnP8pP8XJGU1hGLvA5PJzWnWZz
-AgMBAAGjUzBRMB0GA1UdDgQWBBR5oQ9KqFeZOdBuAJrXxEP0dqzPtTAfBgNVHSME
-GDAWgBR5oQ9KqFeZOdBuAJrXxEP0dqzPtTAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
-SIb3DQEBCwUAA0EAKqZFf6+f8FPDbKyPCpssquojgn7fEXqr/I/yz0R5CowGdMms
-H3WH3aKP4lLSHdPTBtfIoJi3gEIZjFxp3S1TWw==
------END CERTIFICATE-----

tests/components/text_sensor/common.yaml

@@ -64,16 +64,3 @@ text_sensor:
           - suffix -> SUFFIX
       - map:
           - PREFIX text SUFFIX -> mapped
-
-  - platform: template
-    name: "Test Lambda Filter"
-    id: test_lambda_filter
-    filters:
-      - lambda: |-
-          return {"[" + x + "]"};
-      - to_upper
-      - lambda: |-
-          if (x.length() > 10) {
-            return {x.substr(0, 10) + "..."};
-          }
-          return {x};

tests/integration/fixtures/text_sensor_raw_state.yaml

@@ -56,36 +56,6 @@ text_sensor:
       - prepend: "["
       - append: "]"
 
-  - platform: template
-    name: "To Lower Sensor"
-    id: to_lower_sensor
-    filters:
-      - to_lower
-
-  - platform: template
-    name: "Lambda Sensor"
-    id: lambda_sensor
-    filters:
-      - lambda: |-
-          return {"[" + x + "]"};
-
-  - platform: template
-    name: "Lambda Raw State Sensor"
-    id: lambda_raw_state_sensor
-    filters:
-      - lambda: |-
-          return {x + " MODIFIED"};
-
-  - platform: template
-    name: "Lambda Skip Sensor"
-    id: lambda_skip_sensor
-    filters:
-      - lambda: |-
-          if (x == "skip") {
-            return {};
-          }
-          return {x + " passed"};
-
 # Button to publish values and log raw_state vs state
 button:
   - platform: template
@@ -209,73 +179,3 @@ button:
           format: "CHAINED: state='%s'"
           args:
             - id(chained_sensor).state.c_str()
-
-  - platform: template
-    name: "Test To Lower Button"
-    id: test_to_lower_button
-    on_press:
-      - text_sensor.template.publish:
-          id: to_lower_sensor
-          state: "HELLO WORLD"
-      - delay: 50ms
-      - logger.log:
-          format: "TO_LOWER: state='%s'"
-          args:
-            - id(to_lower_sensor).state.c_str()
-
-  - platform: template
-    name: "Test Lambda Button"
-    id: test_lambda_button
-    on_press:
-      - text_sensor.template.publish:
-          id: lambda_sensor
-          state: "test"
-      - delay: 50ms
-      - logger.log:
-          format: "LAMBDA: state='%s'"
-          args:
-            - id(lambda_sensor).state.c_str()
-
-  - platform: template
-    name: "Test Lambda Pass Button"
-    id: test_lambda_pass_button
-    on_press:
-      - text_sensor.template.publish:
-          id: lambda_skip_sensor
-          state: "value"
-      - delay: 50ms
-      - logger.log:
-          format: "LAMBDA_PASS: state='%s'"
-          args:
-            - id(lambda_skip_sensor).state.c_str()
-
-  - platform: template
-    name: "Test Lambda Skip Button"
-    id: test_lambda_skip_button
-    on_press:
-      - text_sensor.template.publish:
-          id: lambda_skip_sensor
-          state: "skip"
-      - delay: 50ms
-      # When lambda returns {}, the value should NOT be published
-      # so state should remain from previous publish (or empty if first)
-      - logger.log:
-          format: "LAMBDA_SKIP: state='%s'"
-          args:
-            - id(lambda_skip_sensor).state.c_str()
-
-  - platform: template
-    name: "Test Lambda Raw State Button"
-    id: test_lambda_raw_state_button
-    on_press:
-      - text_sensor.template.publish:
-          id: lambda_raw_state_sensor
-          state: "original"
-      - delay: 50ms
-      # Verify raw_state is preserved (not mutated) after lambda filter
-      # state should be "original MODIFIED", raw_state should be "original"
-      - logger.log:
-          format: "LAMBDA_RAW_STATE: state='%s' raw_state='%s'"
-          args:
-            - id(lambda_raw_state_sensor).state.c_str()
-            - id(lambda_raw_state_sensor).get_raw_state().c_str()

tests/integration/test_text_sensor_raw_state.py

@@ -42,11 +42,6 @@ async def test_text_sensor_raw_state(
     map_off_future: asyncio.Future[str] = loop.create_future()
     map_unknown_future: asyncio.Future[str] = loop.create_future()
     chained_future: asyncio.Future[str] = loop.create_future()
-    to_lower_future: asyncio.Future[str] = loop.create_future()
-    lambda_future: asyncio.Future[str] = loop.create_future()
-    lambda_pass_future: asyncio.Future[str] = loop.create_future()
-    lambda_skip_future: asyncio.Future[str] = loop.create_future()
-    lambda_raw_state_future: asyncio.Future[tuple[str, str]] = loop.create_future()
 
     # Patterns to match log output
     # NO_FILTER: state='hello world' raw_state='hello world'
@@ -63,13 +58,6 @@ async def test_text_sensor_raw_state(
     map_off_pattern = re.compile(r"MAP_OFF: state='([^']*)'")
     map_unknown_pattern = re.compile(r"MAP_UNKNOWN: state='([^']*)'")
     chained_pattern = re.compile(r"CHAINED: state='([^']*)'")
-    to_lower_pattern = re.compile(r"TO_LOWER: state='([^']*)'")
-    lambda_pattern = re.compile(r"LAMBDA: state='([^']*)'")
-    lambda_pass_pattern = re.compile(r"LAMBDA_PASS: state='([^']*)'")
-    lambda_skip_pattern = re.compile(r"LAMBDA_SKIP: state='([^']*)'")
-    lambda_raw_state_pattern = re.compile(
-        r"LAMBDA_RAW_STATE: state='([^']*)' raw_state='([^']*)'"
-    )
 
     def check_output(line: str) -> None:
         """Check log output for expected messages."""
@@ -104,27 +92,6 @@ async def test_text_sensor_raw_state(
         if not chained_future.done() and (match := chained_pattern.search(line)):
             chained_future.set_result(match.group(1))
 
-        if not to_lower_future.done() and (match := to_lower_pattern.search(line)):
-            to_lower_future.set_result(match.group(1))
-
-        if not lambda_future.done() and (match := lambda_pattern.search(line)):
-            lambda_future.set_result(match.group(1))
-
-        if not lambda_pass_future.done() and (
-            match := lambda_pass_pattern.search(line)
-        ):
-            lambda_pass_future.set_result(match.group(1))
-
-        if not lambda_skip_future.done() and (
-            match := lambda_skip_pattern.search(line)
-        ):
-            lambda_skip_future.set_result(match.group(1))
-
-        if not lambda_raw_state_future.done() and (
-            match := lambda_raw_state_pattern.search(line)
-        ):
-            lambda_raw_state_future.set_result((match.group(1), match.group(2)))
-
     async with (
         run_compiled(yaml_config, line_callback=check_output),
         api_client_connected() as client,
@@ -305,111 +272,3 @@ async def test_text_sensor_raw_state(
             pytest.fail("Timeout waiting for CHAINED log message")
 
         assert state == "[value]", f"Chained failed: expected '[value]', got '{state}'"
-
-        # Test 10: to_lower filter
-        # "HELLO WORLD" -> "hello world"
-        to_lower_button = next(
-            (e for e in entities if "test_to_lower_button" in e.object_id.lower()),
-            None,
-        )
-        assert to_lower_button is not None, "Test To Lower Button not found"
-        client.button_command(to_lower_button.key)
-
-        try:
-            state = await asyncio.wait_for(to_lower_future, timeout=5.0)
-        except TimeoutError:
-            pytest.fail("Timeout waiting for TO_LOWER log message")
-
-        assert state == "hello world", (
-            f"to_lower failed: expected 'hello world', got '{state}'"
-        )
-
-        # Test 11: Lambda filter
-        # "test" -> "[test]"
-        lambda_button = next(
-            (e for e in entities if "test_lambda_button" in e.object_id.lower()),
-            None,
-        )
-        assert lambda_button is not None, "Test Lambda Button not found"
-        client.button_command(lambda_button.key)
-
-        try:
-            state = await asyncio.wait_for(lambda_future, timeout=5.0)
-        except TimeoutError:
-            pytest.fail("Timeout waiting for LAMBDA log message")
-
-        assert state == "[test]", f"Lambda failed: expected '[test]', got '{state}'"
-
-        # Test 12: Lambda filter - value passes through
-        # "value" -> "value passed"
-        lambda_pass_button = next(
-            (e for e in entities if "test_lambda_pass_button" in e.object_id.lower()),
-            None,
-        )
-        assert lambda_pass_button is not None, "Test Lambda Pass Button not found"
-        client.button_command(lambda_pass_button.key)
-
-        try:
-            state = await asyncio.wait_for(lambda_pass_future, timeout=5.0)
-        except TimeoutError:
-            pytest.fail("Timeout waiting for LAMBDA_PASS log message")
-
-        assert state == "value passed", (
-            f"Lambda pass failed: expected 'value passed', got '{state}'"
-        )
-
-        # Test 13: Lambda filter - skip publishing (return {})
-        # "skip" -> no publish, state remains "value passed" from previous test
-        lambda_skip_button = next(
-            (e for e in entities if "test_lambda_skip_button" in e.object_id.lower()),
-            None,
-        )
-        assert lambda_skip_button is not None, "Test Lambda Skip Button not found"
-        client.button_command(lambda_skip_button.key)
-
-        try:
-            state = await asyncio.wait_for(lambda_skip_future, timeout=5.0)
-        except TimeoutError:
-            pytest.fail("Timeout waiting for LAMBDA_SKIP log message")
-
-        # When lambda returns {}, value should NOT be published
-        # State remains from previous successful publish ("value passed")
-        assert state == "value passed", (
-            f"Lambda skip failed: expected 'value passed' (unchanged), got '{state}'"
-        )
-
-        # Test 14: Lambda filter - verify raw_state is preserved (not mutated)
-        # This is critical to verify the in-place mutation optimization is safe
-        # "original" -> state="original MODIFIED", raw_state="original"
-        lambda_raw_state_button = next(
-            (
-                e
-                for e in entities
-                if "test_lambda_raw_state_button" in e.object_id.lower()
-            ),
-            None,
-        )
-        assert lambda_raw_state_button is not None, (
-            "Test Lambda Raw State Button not found"
-        )
-        client.button_command(lambda_raw_state_button.key)
-
-        try:
-            state, raw_state = await asyncio.wait_for(
-                lambda_raw_state_future, timeout=5.0
-            )
-        except TimeoutError:
-            pytest.fail("Timeout waiting for LAMBDA_RAW_STATE log message")
-
-        assert state == "original MODIFIED", (
-            f"Lambda raw_state test failed: expected state='original MODIFIED', "
-            f"got '{state}'"
-        )
-        assert raw_state == "original", (
-            f"Lambda raw_state test failed: raw_state was mutated! "
-            f"Expected 'original', got '{raw_state}'"
-        )
-        assert state != raw_state, (
-            f"Lambda filter should modify state but preserve raw_state. "
-            f"state='{state}', raw_state='{raw_state}'"
-        )

tests/unit_tests/test_espota2.py

@@ -192,20 +192,6 @@ def test_check_error_unexpected_response() -> None:
         espota2.check_error([0x7F], [espota2.RESPONSE_OK, espota2.RESPONSE_AUTH_OK])
 
 
-def test_check_error_empty_data() -> None:
-    """Test check_error raises error when device closes connection without responding."""
-    with pytest.raises(
-        espota2.OTAError, match="Device closed connection without responding"
-    ):
-        espota2.check_error([], [espota2.RESPONSE_OK])
-
-    # Also test with empty bytes
-    with pytest.raises(
-        espota2.OTAError, match="Device closed connection without responding"
-    ):
-        espota2.check_error(b"", [espota2.RESPONSE_OK])
-
-
 def test_send_check_with_various_data_types(mock_socket: Mock) -> None:
     """Test send_check handles different data types."""