simplify

tweaks
cover
2025-11-20 08:46:01 +00:00 · 2025-11-19 23:25:45 -06:00 · 2025-11-19 23:20:24 -06:00 · 2025-11-19 22:49:52 -06:00 · 2025-11-19 22:32:41 -06:00 · 2025-11-19 22:24:00 -06:00
226 changed files with 1069 additions and 2150 deletions
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -58,7 +58,7 @@ jobs:

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
+        uses: github/codeql-action/init@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
        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@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
+        uses: github/codeql-action/analyze@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
        with:
          category: "/language:${{matrix.language}}"
--- a/1
+++ b/1
@@ -460,6 +460,7 @@ esphome/components/st7735/* @SenexCrenshaw
 esphome/components/st7789v/* @kbx81
 esphome/components/st7920/* @marsjan155
 esphome/components/statsd/* @Links2004
+esphome/components/stts22h/* @B48D81EFCC
 esphome/components/substitutions/* @esphome/core
 esphome/components/sun/* @OttoWinter
 esphome/components/sun_gtil2/* @Mat931
--- a/esphome/main.py
+++ b/esphome/main.py
@@ -741,13 +741,6 @@ def command_vscode(args: ArgsProtocol) -> int | None:


 def command_compile(args: ArgsProtocol, config: ConfigType) -> int | None:
-    # Set memory analysis options in config
-    if args.analyze_memory:
-        config.setdefault(CONF_ESPHOME, {})["analyze_memory"] = True
-
-    if args.memory_report:
-        config.setdefault(CONF_ESPHOME, {})["memory_report_file"] = args.memory_report
-
    exit_code = write_cpp(config)
    if exit_code != 0:
        return exit_code
@@ -1209,17 +1202,6 @@ def parse_args(argv):
        help="Only generate source code, do not compile.",
        action="store_true",
    )
-    parser_compile.add_argument(
-        "--analyze-memory",
-        help="Analyze and display memory usage by component after compilation.",
-        action="store_true",
-    )
-    parser_compile.add_argument(
-        "--memory-report",
-        help="Save memory analysis report to a file (supports .json or .txt).",
-        type=str,
-        metavar="FILE",
-    )

    parser_upload = subparsers.add_parser(
        "upload",
--- a/esphome/analyze_memory/cli.py
+++ b/esphome/analyze_memory/cli.py
@@ -1,7 +1,6 @@
 """CLI interface for memory analysis with report generation."""

 from collections import defaultdict
-import json
 import sys

 from . import (
@@ -298,28 +297,6 @@ class MemoryAnalyzerCLI(MemoryAnalyzer):

        return "\n".join(lines)

-    def to_json(self) -> str:
-        """Export analysis results as JSON."""
-        data = {
-            "components": {
-                name: {
-                    "text": mem.text_size,
-                    "rodata": mem.rodata_size,
-                    "data": mem.data_size,
-                    "bss": mem.bss_size,
-                    "flash_total": mem.flash_total,
-                    "ram_total": mem.ram_total,
-                    "symbol_count": mem.symbol_count,
-                }
-                for name, mem in self.components.items()
-            },
-            "totals": {
-                "flash": sum(c.flash_total for c in self.components.values()),
-                "ram": sum(c.ram_total for c in self.components.values()),
-            },
-        }
-        return json.dumps(data, indent=2)
-
    def dump_uncategorized_symbols(self, output_file: str | None = None) -> None:
        """Dump uncategorized symbols for analysis."""
        # Sort by size descending
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -1451,11 +1451,8 @@ bool APIConnection::send_device_info_response(const DeviceInfoRequest &msg) {
 #ifdef USE_AREAS
  resp.set_suggested_area(StringRef(App.get_area()));
 #endif
-  // Stack buffer for MAC address (XX:XX:XX:XX:XX:XX\0 = 18 bytes)
-  char mac_address[18];
-  uint8_t mac[6];
-  get_mac_address_raw(mac);
-  format_mac_addr_upper(mac, mac_address);
+  // mac_address must store temporary string - will be valid during send_message call
+  std::string mac_address = get_mac_address_pretty();
  resp.set_mac_address(StringRef(mac_address));

  resp.set_esphome_version(ESPHOME_VERSION_REF);
@@ -1496,9 +1493,8 @@ bool APIConnection::send_device_info_response(const DeviceInfoRequest &msg) {
 #endif
 #ifdef USE_BLUETOOTH_PROXY
  resp.bluetooth_proxy_feature_flags = bluetooth_proxy::global_bluetooth_proxy->get_feature_flags();
-  // Stack buffer for Bluetooth MAC address (XX:XX:XX:XX:XX:XX\0 = 18 bytes)
-  char bluetooth_mac[18];
-  bluetooth_proxy::global_bluetooth_proxy->get_bluetooth_mac_address_pretty(bluetooth_mac);
+  // bt_mac must store temporary string - will be valid during send_message call
+  std::string bluetooth_mac = bluetooth_proxy::global_bluetooth_proxy->get_bluetooth_mac_address_pretty();
  resp.set_bluetooth_mac_address(StringRef(bluetooth_mac));
 #endif
 #ifdef USE_VOICE_ASSISTANT
@@ -1539,8 +1535,13 @@ bool APIConnection::send_device_info_response(const DeviceInfoRequest &msg) {
 #ifdef USE_API_HOMEASSISTANT_STATES
 void APIConnection::on_home_assistant_state_response(const HomeAssistantStateResponse &msg) {
  for (auto &it : this->parent_->get_state_subs()) {
-    if (it.entity_id == msg.entity_id && it.attribute.value() == msg.attribute) {
-      it.callback(msg.state);
+    // Compare entity_id and attribute with message fields
+    bool entity_match = (strcmp(it.entity_id_, msg.entity_id.c_str()) == 0);
+    bool attribute_match = (it.attribute_ != nullptr && strcmp(it.attribute_, msg.attribute.c_str()) == 0) ||
+                           (it.attribute_ == nullptr && msg.attribute.empty());
+
+    if (entity_match && attribute_match) {
+      it.callback_(msg.state);
    }
  }
 }
@@ -1877,12 +1878,12 @@ void APIConnection::process_state_subscriptions_() {

  const auto &it = subs[this->state_subs_at_];
  SubscribeHomeAssistantStateResponse resp;
-  resp.set_entity_id(StringRef(it.entity_id));
+  resp.set_entity_id(StringRef(it.entity_id_));

-  // Avoid string copy by directly using the optional's value if it exists
-  resp.set_attribute(it.attribute.has_value() ? StringRef(it.attribute.value()) : StringRef(""));
+  // Avoid string copy by using the const char* pointer if it exists
+  resp.set_attribute(it.attribute_ != nullptr ? StringRef(it.attribute_) : StringRef(""));

-  resp.once = it.once;
+  resp.once = it.once_;
  if (this->send_message(resp, SubscribeHomeAssistantStateResponse::MESSAGE_TYPE)) {
    this->state_subs_at_++;
  }
--- a/esphome/components/api/api_pb2_dump.cpp
+++ b/esphome/components/api/api_pb2_dump.cpp
@@ -66,7 +66,7 @@ static void dump_field(std::string &out, const char *field_name, float value, in
 static void dump_field(std::string &out, const char *field_name, uint64_t value, int indent = 2) {
  char buffer[64];
  append_field_prefix(out, field_name, indent);
-  snprintf(buffer, 64, "%llu", value);
+  snprintf(buffer, 64, "%" PRIu64, value);
  append_with_newline(out, buffer);
 }

--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -431,25 +431,56 @@ void APIServer::handle_action_response(uint32_t call_id, bool success, const std
 #endif  // USE_API_HOMEASSISTANT_SERVICES

 #ifdef USE_API_HOMEASSISTANT_STATES
+// Helper to add subscription (reduces duplication)
+void APIServer::add_state_subscription_(const char *entity_id, const char *attribute,
+                                        std::function<void(std::string)> f, bool once) {
+  this->state_subs_.push_back(HomeAssistantStateSubscription{
+      .entity_id_ = entity_id, .attribute_ = attribute, .callback_ = std::move(f), .once_ = once,
+      // entity_id_copy_ and attribute_copy_ remain nullptr (no heap allocation)
+  });
+}
+
+// Helper to add subscription with heap-allocated strings (reduces duplication)
+void APIServer::add_state_subscription_(std::string entity_id, optional<std::string> attribute,
+                                        std::function<void(std::string)> f, bool once) {
+  HomeAssistantStateSubscription sub;
+  // Allocate heap storage for the strings
+  sub.entity_id_copy_ = std::make_unique<std::string>(std::move(entity_id));
+  sub.entity_id_ = sub.entity_id_copy_->c_str();
+
+  if (attribute.has_value()) {
+    sub.attribute_copy_ = std::make_unique<std::string>(std::move(attribute.value()));
+    sub.attribute_ = sub.attribute_copy_->c_str();
+  } else {
+    sub.attribute_ = nullptr;
+  }
+
+  sub.callback_ = std::move(f);
+  sub.once_ = once;
+  this->state_subs_.push_back(std::move(sub));
+}
+
+// New const char* overload (for internal components - zero allocation)
+void APIServer::subscribe_home_assistant_state(const char *entity_id, const char *attribute,
+                                               std::function<void(std::string)> f) {
+  this->add_state_subscription_(entity_id, attribute, std::move(f), false);
+}
+
+void APIServer::get_home_assistant_state(const char *entity_id, const char *attribute,
+                                         std::function<void(std::string)> f) {
+  this->add_state_subscription_(entity_id, attribute, std::move(f), true);
+}
+
+// Existing std::string overload (for custom_api_device.h - heap allocation)
 void APIServer::subscribe_home_assistant_state(std::string entity_id, optional<std::string> attribute,
                                               std::function<void(std::string)> f) {
-  this->state_subs_.push_back(HomeAssistantStateSubscription{
-      .entity_id = std::move(entity_id),
-      .attribute = std::move(attribute),
-      .callback = std::move(f),
-      .once = false,
-  });
+  this->add_state_subscription_(std::move(entity_id), std::move(attribute), std::move(f), false);
 }

 void APIServer::get_home_assistant_state(std::string entity_id, optional<std::string> attribute,
                                         std::function<void(std::string)> f) {
-  this->state_subs_.push_back(HomeAssistantStateSubscription{
-      .entity_id = std::move(entity_id),
-      .attribute = std::move(attribute),
-      .callback = std::move(f),
-      .once = true,
-  });
-};
+  this->add_state_subscription_(std::move(entity_id), std::move(attribute), std::move(f), true);
+}

 const std::vector<APIServer::HomeAssistantStateSubscription> &APIServer::get_state_subs() const {
  return this->state_subs_;
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -154,16 +154,27 @@ class APIServer : public Component, public Controller {

 #ifdef USE_API_HOMEASSISTANT_STATES
  struct HomeAssistantStateSubscription {
-    std::string entity_id;
-    optional<std::string> attribute;
-    std::function<void(std::string)> callback;
-    bool once;
+    const char *entity_id_;  // Pointer to flash (internal) or heap (external)
+    const char *attribute_;  // Pointer to flash or nullptr (nullptr means no attribute)
+    std::function<void(std::string)> callback_;
+    bool once_;
+
+    // Storage for external components using std::string API (custom_api_device.h)
+    // These are only allocated when using the std::string overload
+    std::unique_ptr<std::string> entity_id_copy_;
+    std::unique_ptr<std::string> attribute_copy_;
  };

+  // New const char* overload (for internal components - zero allocation)
+  void subscribe_home_assistant_state(const char *entity_id, const char *attribute, std::function<void(std::string)> f);
+  void get_home_assistant_state(const char *entity_id, const char *attribute, std::function<void(std::string)> f);
+
+  // Existing std::string overload (for custom_api_device.h - heap allocation)
  void subscribe_home_assistant_state(std::string entity_id, optional<std::string> attribute,
                                      std::function<void(std::string)> f);
  void get_home_assistant_state(std::string entity_id, optional<std::string> attribute,
                                std::function<void(std::string)> f);
+
  const std::vector<HomeAssistantStateSubscription> &get_state_subs() const;
 #endif
 #ifdef USE_API_SERVICES
@@ -185,6 +196,13 @@ class APIServer : public Component, public Controller {
  bool update_noise_psk_(const SavedNoisePsk &new_psk, const LogString *save_log_msg, const LogString *fail_log_msg,
                         const psk_t &active_psk, bool make_active);
 #endif  // USE_API_NOISE
+#ifdef USE_API_HOMEASSISTANT_STATES
+  // Helper methods to reduce code duplication
+  void add_state_subscription_(const char *entity_id, const char *attribute, std::function<void(std::string)> f,
+                               bool once);
+  void add_state_subscription_(std::string entity_id, optional<std::string> attribute,
+                               std::function<void(std::string)> f, bool once);
+#endif  // USE_API_HOMEASSISTANT_STATES
  // Pointers and pointer-like types first (4 bytes each)
  std::unique_ptr<socket::Socket> socket_ = nullptr;
 #ifdef USE_API_CLIENT_CONNECTED_TRIGGER
--- a/esphome/components/api/user_services.h
+++ b/esphome/components/api/user_services.h
@@ -51,14 +51,13 @@ template<typename... Ts> class UserServiceBase : public UserServiceDescriptor {
      return false;
    if (req.args.size() != sizeof...(Ts))
      return false;
-    this->execute_(req.args, std::make_index_sequence<sizeof...(Ts)>{});
+    this->execute_(req.args, typename gens<sizeof...(Ts)>::type());
    return true;
  }

 protected:
  virtual void execute(Ts... x) = 0;
-  template<typename ArgsContainer, size_t... S>
-  void execute_(const ArgsContainer &args, std::index_sequence<S...> type) {
+  template<typename ArgsContainer, int... S> void execute_(const ArgsContainer &args, seq<S...> type) {
    this->execute((get_execute_arg_value<Ts>(args[S]))...);
  }

@@ -96,14 +95,13 @@ template<typename... Ts> class UserServiceDynamic : public UserServiceDescriptor
      return false;
    if (req.args.size() != sizeof...(Ts))
      return false;
-    this->execute_(req.args, std::make_index_sequence<sizeof...(Ts)>{});
+    this->execute_(req.args, typename gens<sizeof...(Ts)>::type());
    return true;
  }

 protected:
  virtual void execute(Ts... x) = 0;
-  template<typename ArgsContainer, size_t... S>
-  void execute_(const ArgsContainer &args, std::index_sequence<S...> type) {
+  template<typename ArgsContainer, int... S> void execute_(const ArgsContainer &args, seq<S...> type) {
    this->execute((get_execute_arg_value<Ts>(args[S]))...);
  }

--- a/esphome/components/bh1750/bh1750.cpp
+++ b/esphome/components/bh1750/bh1750.cpp
@@ -1,8 +1,8 @@
 #include "bh1750.h"
 #include "esphome/core/log.h"
-#include "esphome/core/application.h"

-namespace esphome::bh1750 {
+namespace esphome {
+namespace bh1750 {

 static const char *const TAG = "bh1750.sensor";

@@ -13,31 +13,6 @@ static const uint8_t BH1750_COMMAND_ONE_TIME_L = 0b00100011;
 static const uint8_t BH1750_COMMAND_ONE_TIME_H = 0b00100000;
 static const uint8_t BH1750_COMMAND_ONE_TIME_H2 = 0b00100001;

-static constexpr uint32_t MEASUREMENT_TIMEOUT_MS = 2000;
-static constexpr float HIGH_LIGHT_THRESHOLD_LX = 7000.0f;
-
-// Measurement time constants (datasheet values)
-static constexpr uint16_t MTREG_DEFAULT = 69;
-static constexpr uint16_t MTREG_MIN = 31;
-static constexpr uint16_t MTREG_MAX = 254;
-static constexpr uint16_t MEAS_TIME_L_MS = 24;   // L-resolution max measurement time @ mtreg=69
-static constexpr uint16_t MEAS_TIME_H_MS = 180;  // H/H2-resolution max measurement time @ mtreg=69
-
-// Conversion constants (datasheet formulas)
-static constexpr float RESOLUTION_DIVISOR = 1.2f;  // counts to lux conversion divisor
-static constexpr float MODE_H2_DIVISOR = 2.0f;     // H2 mode has 2x higher resolution
-
-// MTreg calculation constants
-static constexpr int COUNTS_TARGET = 50000;  // Target counts for optimal range (avoid saturation)
-static constexpr int COUNTS_NUMERATOR = 10;
-static constexpr int COUNTS_DENOMINATOR = 12;
-
-// MTreg register bit manipulation constants
-static constexpr uint8_t MTREG_HI_SHIFT = 5;       // High 3 bits start at bit 5
-static constexpr uint8_t MTREG_HI_MASK = 0b111;    // 3-bit mask for high bits
-static constexpr uint8_t MTREG_LO_SHIFT = 0;       // Low 5 bits start at bit 0
-static constexpr uint8_t MTREG_LO_MASK = 0b11111;  // 5-bit mask for low bits
-
 /*
 bh1750 properties:

@@ -68,7 +43,74 @@ void BH1750Sensor::setup() {
    this->mark_failed();
    return;
  }
-  this->state_ = IDLE;
+}
+
+void BH1750Sensor::read_lx_(BH1750Mode mode, uint8_t mtreg, const std::function<void(float)> &f) {
+  // turn on (after one-shot sensor automatically powers down)
+  uint8_t turn_on = BH1750_COMMAND_POWER_ON;
+  if (this->write(&turn_on, 1) != i2c::ERROR_OK) {
+    ESP_LOGW(TAG, "Power on failed");
+    f(NAN);
+    return;
+  }
+
+  if (active_mtreg_ != mtreg) {
+    // set mtreg
+    uint8_t mtreg_hi = BH1750_COMMAND_MT_REG_HI | ((mtreg >> 5) & 0b111);
+    uint8_t mtreg_lo = BH1750_COMMAND_MT_REG_LO | ((mtreg >> 0) & 0b11111);
+    if (this->write(&mtreg_hi, 1) != i2c::ERROR_OK || this->write(&mtreg_lo, 1) != i2c::ERROR_OK) {
+      ESP_LOGW(TAG, "Set measurement time failed");
+      active_mtreg_ = 0;
+      f(NAN);
+      return;
+    }
+    active_mtreg_ = mtreg;
+  }
+
+  uint8_t cmd;
+  uint16_t meas_time;
+  switch (mode) {
+    case BH1750_MODE_L:
+      cmd = BH1750_COMMAND_ONE_TIME_L;
+      meas_time = 24 * mtreg / 69;
+      break;
+    case BH1750_MODE_H:
+      cmd = BH1750_COMMAND_ONE_TIME_H;
+      meas_time = 180 * mtreg / 69;
+      break;
+    case BH1750_MODE_H2:
+      cmd = BH1750_COMMAND_ONE_TIME_H2;
+      meas_time = 180 * mtreg / 69;
+      break;
+    default:
+      f(NAN);
+      return;
+  }
+  if (this->write(&cmd, 1) != i2c::ERROR_OK) {
+    ESP_LOGW(TAG, "Start measurement failed");
+    f(NAN);
+    return;
+  }
+
+  // probably not needed, but adjust for rounding
+  meas_time++;
+
+  this->set_timeout("read", meas_time, [this, mode, mtreg, f]() {
+    uint16_t raw_value;
+    if (this->read(reinterpret_cast<uint8_t *>(&raw_value), 2) != i2c::ERROR_OK) {
+      ESP_LOGW(TAG, "Read data failed");
+      f(NAN);
+      return;
+    }
+    raw_value = i2c::i2ctohs(raw_value);
+
+    float lx = float(raw_value) / 1.2f;
+    lx *= 69.0f / mtreg;
+    if (mode == BH1750_MODE_H2)
+      lx /= 2.0f;
+
+    f(lx);
+  });
 }

 void BH1750Sensor::dump_config() {
@@ -82,189 +124,45 @@ void BH1750Sensor::dump_config() {
 }

 void BH1750Sensor::update() {
-  const uint32_t now = millis();
-
-  // Start coarse measurement to determine optimal mode/mtreg
-  if (this->state_ != IDLE) {
-    // Safety timeout: reset if stuck
-    if (now - this->measurement_start_time_ > MEASUREMENT_TIMEOUT_MS) {
-      ESP_LOGW(TAG, "Measurement timeout, resetting state");
-      this->state_ = IDLE;
-    } else {
-      ESP_LOGW(TAG, "Previous measurement not complete, skipping update");
+  // first do a quick measurement in L-mode with full range
+  // to find right range
+  this->read_lx_(BH1750_MODE_L, 31, [this](float val) {
+    if (std::isnan(val)) {
+      this->status_set_warning();
+      this->publish_state(NAN);
      return;
    }
-  }

-  if (!this->start_measurement_(BH1750_MODE_L, MTREG_MIN, now)) {
-    this->status_set_warning();
-    this->publish_state(NAN);
-    return;
-  }
-
-  this->state_ = WAITING_COARSE_MEASUREMENT;
-  this->enable_loop();  // Enable loop while measurement in progress
-}
-
-void BH1750Sensor::loop() {
-  const uint32_t now = App.get_loop_component_start_time();
-
-  switch (this->state_) {
-    case IDLE:
-      // Disable loop when idle to save cycles
-      this->disable_loop();
-      break;
-
-    case WAITING_COARSE_MEASUREMENT:
-      if (now - this->measurement_start_time_ >= this->measurement_duration_) {
-        this->state_ = READING_COARSE_RESULT;
-      }
-      break;
-
-    case READING_COARSE_RESULT: {
-      float lx;
-      if (!this->read_measurement_(lx)) {
-        this->fail_and_reset_();
-        break;
-      }
-
-      this->process_coarse_result_(lx);
-
-      // Start fine measurement with optimal settings
-      // fetch millis() again since the read can take a bit
-      if (!this->start_measurement_(this->fine_mode_, this->fine_mtreg_, millis())) {
-        this->fail_and_reset_();
-        break;
-      }
-
-      this->state_ = WAITING_FINE_MEASUREMENT;
-      break;
+    BH1750Mode use_mode;
+    uint8_t use_mtreg;
+    if (val <= 7000) {
+      use_mode = BH1750_MODE_H2;
+      use_mtreg = 254;
+    } else {
+      use_mode = BH1750_MODE_H;
+      // lx = counts / 1.2 * (69 / mtreg)
+      // -> mtreg = counts / 1.2 * (69 / lx)
+      // calculate for counts=50000 (allow some range to not saturate, but maximize mtreg)
+      // -> mtreg = 50000*(10/12)*(69/lx)
+      int ideal_mtreg = 50000 * 10 * 69 / (12 * (int) val);
+      use_mtreg = std::min(254, std::max(31, ideal_mtreg));
    }
+    ESP_LOGV(TAG, "L result: %f -> Calculated mode=%d, mtreg=%d", val, (int) use_mode, use_mtreg);

-    case WAITING_FINE_MEASUREMENT:
-      if (now - this->measurement_start_time_ >= this->measurement_duration_) {
-        this->state_ = READING_FINE_RESULT;
+    this->read_lx_(use_mode, use_mtreg, [this](float val) {
+      if (std::isnan(val)) {
+        this->status_set_warning();
+        this->publish_state(NAN);
+        return;
      }
-      break;
-
-    case READING_FINE_RESULT: {
-      float lx;
-      if (!this->read_measurement_(lx)) {
-        this->fail_and_reset_();
-        break;
-      }
-
-      ESP_LOGD(TAG, "'%s': Illuminance=%.1flx", this->get_name().c_str(), lx);
+      ESP_LOGD(TAG, "'%s': Illuminance=%.1flx", this->get_name().c_str(), val);
      this->status_clear_warning();
-      this->publish_state(lx);
-      this->state_ = IDLE;
-      break;
-    }
-  }
-}
-
-bool BH1750Sensor::start_measurement_(BH1750Mode mode, uint8_t mtreg, uint32_t now) {
-  // Power on
-  uint8_t turn_on = BH1750_COMMAND_POWER_ON;
-  if (this->write(&turn_on, 1) != i2c::ERROR_OK) {
-    ESP_LOGW(TAG, "Power on failed");
-    return false;
-  }
-
-  // Set MTreg if changed
-  if (this->active_mtreg_ != mtreg) {
-    uint8_t mtreg_hi = BH1750_COMMAND_MT_REG_HI | ((mtreg >> MTREG_HI_SHIFT) & MTREG_HI_MASK);
-    uint8_t mtreg_lo = BH1750_COMMAND_MT_REG_LO | ((mtreg >> MTREG_LO_SHIFT) & MTREG_LO_MASK);
-    if (this->write(&mtreg_hi, 1) != i2c::ERROR_OK || this->write(&mtreg_lo, 1) != i2c::ERROR_OK) {
-      ESP_LOGW(TAG, "Set measurement time failed");
-      this->active_mtreg_ = 0;
-      return false;
-    }
-    this->active_mtreg_ = mtreg;
-  }
-
-  // Start measurement
-  uint8_t cmd;
-  uint16_t meas_time;
-  switch (mode) {
-    case BH1750_MODE_L:
-      cmd = BH1750_COMMAND_ONE_TIME_L;
-      meas_time = MEAS_TIME_L_MS * mtreg / MTREG_DEFAULT;
-      break;
-    case BH1750_MODE_H:
-      cmd = BH1750_COMMAND_ONE_TIME_H;
-      meas_time = MEAS_TIME_H_MS * mtreg / MTREG_DEFAULT;
-      break;
-    case BH1750_MODE_H2:
-      cmd = BH1750_COMMAND_ONE_TIME_H2;
-      meas_time = MEAS_TIME_H_MS * mtreg / MTREG_DEFAULT;
-      break;
-    default:
-      return false;
-  }
-
-  if (this->write(&cmd, 1) != i2c::ERROR_OK) {
-    ESP_LOGW(TAG, "Start measurement failed");
-    return false;
-  }
-
-  // Store current measurement parameters
-  this->current_mode_ = mode;
-  this->current_mtreg_ = mtreg;
-  this->measurement_start_time_ = now;
-  this->measurement_duration_ = meas_time + 1;  // Add 1ms for safety
-
-  return true;
-}
-
-bool BH1750Sensor::read_measurement_(float &lx_out) {
-  uint16_t raw_value;
-  if (this->read(reinterpret_cast<uint8_t *>(&raw_value), 2) != i2c::ERROR_OK) {
-    ESP_LOGW(TAG, "Read data failed");
-    return false;
-  }
-  raw_value = i2c::i2ctohs(raw_value);
-
-  float lx = float(raw_value) / RESOLUTION_DIVISOR;
-  lx *= float(MTREG_DEFAULT) / this->current_mtreg_;
-  if (this->current_mode_ == BH1750_MODE_H2) {
-    lx /= MODE_H2_DIVISOR;
-  }
-
-  lx_out = lx;
-  return true;
-}
-
-void BH1750Sensor::process_coarse_result_(float lx) {
-  if (std::isnan(lx)) {
-    // Use defaults if coarse measurement failed
-    this->fine_mode_ = BH1750_MODE_H2;
-    this->fine_mtreg_ = MTREG_MAX;
-    return;
-  }
-
-  if (lx <= HIGH_LIGHT_THRESHOLD_LX) {
-    this->fine_mode_ = BH1750_MODE_H2;
-    this->fine_mtreg_ = MTREG_MAX;
-  } else {
-    this->fine_mode_ = BH1750_MODE_H;
-    // lx = counts / 1.2 * (69 / mtreg)
-    // -> mtreg = counts / 1.2 * (69 / lx)
-    // calculate for counts=50000 (allow some range to not saturate, but maximize mtreg)
-    // -> mtreg = 50000*(10/12)*(69/lx)
-    int ideal_mtreg = COUNTS_TARGET * COUNTS_NUMERATOR * MTREG_DEFAULT / (COUNTS_DENOMINATOR * (int) lx);
-    this->fine_mtreg_ = std::min((int) MTREG_MAX, std::max((int) MTREG_MIN, ideal_mtreg));
-  }
-
-  ESP_LOGV(TAG, "L result: %.1f -> Calculated mode=%d, mtreg=%d", lx, (int) this->fine_mode_, this->fine_mtreg_);
-}
-
-void BH1750Sensor::fail_and_reset_() {
-  this->status_set_warning();
-  this->publish_state(NAN);
-  this->state_ = IDLE;
+      this->publish_state(val);
+    });
+  });
 }

 float BH1750Sensor::get_setup_priority() const { return setup_priority::DATA; }

-}  // namespace esphome::bh1750
+}  // namespace bh1750
+}  // namespace esphome
--- a/esphome/components/bh1750/bh1750.h
+++ b/esphome/components/bh1750/bh1750.h
@@ -4,9 +4,10 @@
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/i2c/i2c.h"

-namespace esphome::bh1750 {
+namespace esphome {
+namespace bh1750 {

-enum BH1750Mode : uint8_t {
+enum BH1750Mode {
  BH1750_MODE_L,
  BH1750_MODE_H,
  BH1750_MODE_H2,
@@ -20,36 +21,13 @@ class BH1750Sensor : public sensor::Sensor, public PollingComponent, public i2c:
  void setup() override;
  void dump_config() override;
  void update() override;
-  void loop() override;
  float get_setup_priority() const override;

 protected:
-  // State machine states
-  enum State : uint8_t {
-    IDLE,
-    WAITING_COARSE_MEASUREMENT,
-    READING_COARSE_RESULT,
-    WAITING_FINE_MEASUREMENT,
-    READING_FINE_RESULT,
-  };
+  void read_lx_(BH1750Mode mode, uint8_t mtreg, const std::function<void(float)> &f);

-  // 4-byte aligned members
-  uint32_t measurement_start_time_{0};
-  uint32_t measurement_duration_{0};
-
-  // 1-byte members grouped together to minimize padding
-  State state_{IDLE};
-  BH1750Mode current_mode_{BH1750_MODE_L};
-  uint8_t current_mtreg_{31};
-  BH1750Mode fine_mode_{BH1750_MODE_H2};
-  uint8_t fine_mtreg_{254};
  uint8_t active_mtreg_{0};
-
-  // Helper methods
-  bool start_measurement_(BH1750Mode mode, uint8_t mtreg, uint32_t now);
-  bool read_measurement_(float &lx_out);
-  void process_coarse_result_(float lx);
-  void fail_and_reset_();
 };

-}  // namespace esphome::bh1750
+}  // namespace bh1750
+}  // namespace esphome
--- a/esphome/components/ble_client/automation.h
+++ b/esphome/components/ble_client/automation.h
@@ -122,19 +122,16 @@ template<typename... Ts> class BLEClientWriteAction : public Action<Ts...>, publ
  void play_complex(const Ts &...x) override {
    this->num_running_++;
    this->var_ = std::make_tuple(x...);
-
-    bool result;
+    std::vector<uint8_t> value;
    if (this->len_ >= 0) {
-      // Static mode: write directly from flash pointer
-      result = this->write(this->value_.data, this->len_);
+      // Static mode: copy from flash to vector
+      value.assign(this->value_.data, this->value_.data + this->len_);
    } else {
-      // Template mode: call function and write the vector
-      std::vector<uint8_t> value = this->value_.func(x...);
-      result = this->write(value);
+      // Template mode: call function
+      value = this->value_.func(x...);
    }
-
    // on write failure, continue the automation chain rather than stopping so that e.g. disconnect can work.
-    if (!result)
+    if (!write(value))
      this->play_next_(x...);
  }

@@ -147,15 +144,15 @@ template<typename... Ts> class BLEClientWriteAction : public Action<Ts...>, publ
   * errors.
   */
  // initiate the write. Return true if all went well, will be followed by a WRITE_CHAR event.
-  bool write(const uint8_t *data, size_t len) {
+  bool write(const std::vector<uint8_t> &value) {
    if (this->node_state != espbt::ClientState::ESTABLISHED) {
      esph_log_w(Automation::TAG, "Cannot write to BLE characteristic - not connected");
      return false;
    }
-    esph_log_vv(Automation::TAG, "Will write %d bytes: %s", len, format_hex_pretty(data, len).c_str());
-    esp_err_t err =
-        esp_ble_gattc_write_char(this->parent()->get_gattc_if(), this->parent()->get_conn_id(), this->char_handle_, len,
-                                 const_cast<uint8_t *>(data), this->write_type_, ESP_GATT_AUTH_REQ_NONE);
+    esph_log_vv(Automation::TAG, "Will write %d bytes: %s", value.size(), format_hex_pretty(value).c_str());
+    esp_err_t err = esp_ble_gattc_write_char(this->parent()->get_gattc_if(), this->parent()->get_conn_id(),
+                                             this->char_handle_, value.size(), const_cast<uint8_t *>(value.data()),
+                                             this->write_type_, ESP_GATT_AUTH_REQ_NONE);
    if (err != ESP_OK) {
      esph_log_e(Automation::TAG, "Error writing to characteristic: %s!", esp_err_to_name(err));
      return false;
@@ -163,8 +160,6 @@ template<typename... Ts> class BLEClientWriteAction : public Action<Ts...>, publ
    return true;
  }

-  bool write(const std::vector<uint8_t> &value) { return this->write(value.data(), value.size()); }
-
  void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                           esp_ble_gattc_cb_param_t *param) override {
    switch (event) {
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
@@ -130,9 +130,11 @@ class BluetoothProxy final : public esp32_ble_tracker::ESPBTDeviceListener, publ
    return flags;
  }

-  void get_bluetooth_mac_address_pretty(std::span<char, 18> output) {
+  std::string get_bluetooth_mac_address_pretty() {
    const uint8_t *mac = esp_bt_dev_get_address();
-    format_mac_addr_upper(mac, output.data());
+    char buf[18];
+    format_mac_addr_upper(mac, buf);
+    return std::string(buf);
  }

 protected:
--- a/esphome/components/bme68x_bsec2/bme68x_bsec2.cpp
+++ b/esphome/components/bme68x_bsec2/bme68x_bsec2.cpp
@@ -70,6 +70,9 @@ void BME68xBSEC2Component::dump_config() {
  if (this->is_failed()) {
    ESP_LOGE(TAG, "Communication failed (BSEC2 status: %d, BME68X status: %d)", this->bsec_status_,
             this->bme68x_status_);
+    if (this->bsec_status_ == BSEC_I_SU_SUBSCRIBEDOUTPUTGATES) {
+      ESP_LOGE(TAG, "No sensors, add at least one sensor to the config");
+    }
  }

  if (this->algorithm_output_ != ALGORITHM_OUTPUT_IAQ) {
--- a/esphome/components/captive_portal/init.py
+++ b/esphome/components/captive_portal/init.py
@@ -72,10 +72,15 @@ def _final_validate(config: ConfigType) -> ConfigType:
            "Add 'ap:' to your WiFi configuration to enable the captive portal."
        )

-    # Register socket needs for DNS server (1 UDP socket)
+    # Register socket needs for DNS server and additional HTTP connections
+    # - 1 UDP socket for DNS server
+    # - 3 additional TCP sockets for captive portal detection probes + configuration requests
+    #   OS captive portal detection makes multiple probe requests that stay in TIME_WAIT.
+    #   Need headroom for actual user configuration requests.
+    #   LRU purging will reclaim idle sockets to prevent exhaustion from repeated attempts.
    from esphome.components import socket

-    socket.consume_sockets(1, "captive_portal")(config)
+    socket.consume_sockets(4, "captive_portal")(config)

    return config

--- a/esphome/components/captive_portal/captive_portal.cpp
+++ b/esphome/components/captive_portal/captive_portal.cpp
@@ -52,8 +52,8 @@ void CaptivePortal::handle_wifisave(AsyncWebServerRequest *request) {
  ESP_LOGI(TAG, "Requested WiFi Settings Change:");
  ESP_LOGI(TAG, "  SSID='%s'", ssid.c_str());
  ESP_LOGI(TAG, "  Password=" LOG_SECRET("'%s'"), psk.c_str());
-  wifi::global_wifi_component->save_wifi_sta(ssid, psk);
-  wifi::global_wifi_component->start_scanning();
+  // Defer save to main loop thread to avoid NVS operations from HTTP thread
+  this->defer([ssid, psk]() { wifi::global_wifi_component->save_wifi_sta(ssid, psk); });
  request->redirect(ESPHOME_F("/?save"));
 }

@@ -65,6 +65,12 @@ void CaptivePortal::start() {
  this->base_->init();
  if (!this->initialized_) {
    this->base_->add_handler(this);
+#ifdef USE_ESP32
+    // Enable LRU socket purging to handle captive portal detection probe bursts
+    // OS captive portal detection makes many simultaneous HTTP requests which can
+    // exhaust sockets. LRU purging automatically closes oldest idle connections.
+    this->base_->get_server()->set_lru_purge_enable(true);
+#endif
  }

  network::IPAddress ip = wifi::global_wifi_component->wifi_soft_ap_ip();
--- a/esphome/components/captive_portal/captive_portal.h
+++ b/esphome/components/captive_portal/captive_portal.h
@@ -40,6 +40,10 @@ class CaptivePortal : public AsyncWebHandler, public Component {
  void end() {
    this->active_ = false;
    this->disable_loop();  // Stop processing DNS requests
+#ifdef USE_ESP32
+    // Disable LRU socket purging now that captive portal is done
+    this->base_->get_server()->set_lru_purge_enable(false);
+#endif
    this->base_->deinit();
    if (this->dns_server_ != nullptr) {
      this->dns_server_->stop();
--- a/esphome/components/epaper_spi/display.py
+++ b/esphome/components/epaper_spi/display.py
@@ -102,7 +102,7 @@ def customise_schema(config):
    """
    config = cv.Schema(
        {
-            cv.Required(CONF_MODEL): cv.one_of(*MODELS, upper=True),
+            cv.Required(CONF_MODEL): cv.one_of(*MODELS, upper=True, space="-"),
        },
        extra=cv.ALLOW_EXTRA,
    )(config)
--- a/esphome/components/epaper_spi/models/spectra_e6.py
+++ b/esphome/components/epaper_spi/models/spectra_e6.py
@@ -32,11 +32,15 @@ class SpectraE6(EpaperModel):

 spectra_e6 = SpectraE6("spectra-e6")

-spectra_e6.extend(
-    "Seeed-reTerminal-E1002",
+spectra_e6_7p3 = spectra_e6.extend(
+    "7.3in-Spectra-E6",
    width=800,
    height=480,
    data_rate="20MHz",
+)
+
+spectra_e6_7p3.extend(
+    "Seeed-reTerminal-E1002",
    cs_pin=10,
    dc_pin=11,
    reset_pin=12,
--- a/esphome/components/esp32/init.py
+++ b/esphome/components/esp32/init.py
@@ -931,6 +931,12 @@ async def to_code(config):
        add_idf_sdkconfig_option("CONFIG_MBEDTLS_CERTIFICATE_BUNDLE", True)
        add_idf_sdkconfig_option("CONFIG_ESP_PHY_REDUCE_TX_POWER", True)

+        # ESP32-S2 Arduino: Disable USB Serial on boot to avoid TinyUSB dependency
+        if get_esp32_variant() == VARIANT_ESP32S2:
+            cg.add_build_unflag("-DARDUINO_USB_CDC_ON_BOOT=1")
+            cg.add_build_unflag("-DARDUINO_USB_CDC_ON_BOOT=0")
+            cg.add_build_flag("-DARDUINO_USB_CDC_ON_BOOT=0")
+
    cg.add_build_flag("-Wno-nonnull-compare")

    add_idf_sdkconfig_option(f"CONFIG_IDF_TARGET_{variant}", True)
--- a/esphome/components/esp32_ble/ble.cpp
+++ b/esphome/components/esp32_ble/ble.cpp
@@ -96,10 +96,6 @@ void ESP32BLE::advertising_set_service_data(const std::vector<uint8_t> &data) {
 }

 void ESP32BLE::advertising_set_manufacturer_data(const std::vector<uint8_t> &data) {
-  this->advertising_set_manufacturer_data(std::span<const uint8_t>(data));
-}
-
-void ESP32BLE::advertising_set_manufacturer_data(std::span<const uint8_t> data) {
  this->advertising_init_();
  this->advertising_->set_manufacturer_data(data);
  this->advertising_start();
--- a/esphome/components/esp32_ble/ble.h
+++ b/esphome/components/esp32_ble/ble.h
@@ -118,7 +118,6 @@ class ESP32BLE : public Component {
  void advertising_start();
  void advertising_set_service_data(const std::vector<uint8_t> &data);
  void advertising_set_manufacturer_data(const std::vector<uint8_t> &data);
-  void advertising_set_manufacturer_data(std::span<const uint8_t> data);
  void advertising_set_appearance(uint16_t appearance) { this->appearance_ = appearance; }
  void advertising_set_service_data_and_name(std::span<const uint8_t> data, bool include_name);
  void advertising_add_service_uuid(ESPBTUUID uuid);
--- a/esphome/components/esp32_ble/ble_advertising.cpp
+++ b/esphome/components/esp32_ble/ble_advertising.cpp
@@ -59,10 +59,6 @@ void BLEAdvertising::set_service_data(const std::vector<uint8_t> &data) {
 }

 void BLEAdvertising::set_manufacturer_data(const std::vector<uint8_t> &data) {
-  this->set_manufacturer_data(std::span<const uint8_t>(data));
-}
-
-void BLEAdvertising::set_manufacturer_data(std::span<const uint8_t> data) {
  delete[] this->advertising_data_.p_manufacturer_data;
  this->advertising_data_.p_manufacturer_data = nullptr;
  this->advertising_data_.manufacturer_len = data.size();
--- a/esphome/components/esp32_ble/ble_advertising.h
+++ b/esphome/components/esp32_ble/ble_advertising.h
@@ -37,7 +37,6 @@ class BLEAdvertising {
  void set_scan_response(bool scan_response) { this->scan_response_ = scan_response; }
  void set_min_preferred_interval(uint16_t interval) { this->advertising_data_.min_interval = interval; }
  void set_manufacturer_data(const std::vector<uint8_t> &data);
-  void set_manufacturer_data(std::span<const uint8_t> data);
  void set_appearance(uint16_t appearance) { this->advertising_data_.appearance = appearance; }
  void set_service_data(const std::vector<uint8_t> &data);
  void set_service_data(std::span<const uint8_t> data);
--- a/esphome/components/esp32_ble_beacon/esp32_ble_beacon.cpp
+++ b/esphome/components/esp32_ble_beacon/esp32_ble_beacon.cpp
@@ -1,6 +1,5 @@
 #include "esp32_ble_beacon.h"
 #include "esphome/core/log.h"
-#include "esphome/core/helpers.h"

 #ifdef USE_ESP32

--- a/esphome/components/esp32_ble_server/ble_server_automations.cpp
+++ b/esphome/components/esp32_ble_server/ble_server_automations.cpp
@@ -15,10 +15,7 @@ Trigger<std::vector<uint8_t>, uint16_t> *BLETriggers::create_characteristic_on_w
  Trigger<std::vector<uint8_t>, uint16_t> *on_write_trigger =  // NOLINT(cppcoreguidelines-owning-memory)
      new Trigger<std::vector<uint8_t>, uint16_t>();
  characteristic->on_write([on_write_trigger](std::span<const uint8_t> data, uint16_t id) {
-    // Convert span to vector for trigger - copy is necessary because:
-    // 1. Trigger stores the data for use in automation actions that execute later
-    // 2. The span is only valid during this callback (points to temporary BLE stack data)
-    // 3. User lambdas in automations need persistent data they can access asynchronously
+    // Convert span to vector for trigger
    on_write_trigger->trigger(std::vector<uint8_t>(data.begin(), data.end()), id);
  });
  return on_write_trigger;
@@ -30,10 +27,7 @@ Trigger<std::vector<uint8_t>, uint16_t> *BLETriggers::create_descriptor_on_write
  Trigger<std::vector<uint8_t>, uint16_t> *on_write_trigger =  // NOLINT(cppcoreguidelines-owning-memory)
      new Trigger<std::vector<uint8_t>, uint16_t>();
  descriptor->on_write([on_write_trigger](std::span<const uint8_t> data, uint16_t id) {
-    // Convert span to vector for trigger - copy is necessary because:
-    // 1. Trigger stores the data for use in automation actions that execute later
-    // 2. The span is only valid during this callback (points to temporary BLE stack data)
-    // 3. User lambdas in automations need persistent data they can access asynchronously
+    // Convert span to vector for trigger
    on_write_trigger->trigger(std::vector<uint8_t>(data.begin(), data.end()), id);
  });
  return on_write_trigger;
--- a/esphome/components/esp32_improv/init.py
+++ b/esphome/components/esp32_improv/init.py
@@ -20,6 +20,10 @@ CONF_ON_STOP = "on_stop"
 CONF_STATUS_INDICATOR = "status_indicator"
 CONF_WIFI_TIMEOUT = "wifi_timeout"

+# Default WiFi timeout - aligned with WiFi component ap_timeout
+# Allows sufficient time to try all BSSIDs before starting provisioning mode
+DEFAULT_WIFI_TIMEOUT = "90s"
+

 improv_ns = cg.esphome_ns.namespace("improv")
 Error = improv_ns.enum("Error")
@@ -59,7 +63,7 @@ CONFIG_SCHEMA = (
                CONF_AUTHORIZED_DURATION, default="1min"
            ): cv.positive_time_period_milliseconds,
            cv.Optional(
-                CONF_WIFI_TIMEOUT, default="1min"
+                CONF_WIFI_TIMEOUT, default=DEFAULT_WIFI_TIMEOUT
            ): cv.positive_time_period_milliseconds,
            cv.Optional(CONF_ON_PROVISIONED): automation.validate_automation(
                {
--- a/esphome/components/esp32_improv/esp32_improv_component.cpp
+++ b/esphome/components/esp32_improv/esp32_improv_component.cpp
@@ -127,6 +127,7 @@ void ESP32ImprovComponent::loop() {
          // Set initial state based on whether we have an authorizer
          this->set_state_(this->get_initial_state_(), false);
          this->set_error_(improv::ERROR_NONE);
+          this->should_start_ = false;  // Clear flag after starting
          ESP_LOGD(TAG, "Service started!");
        }
      }
--- a/esphome/components/esp32_improv/esp32_improv_component.h
+++ b/esphome/components/esp32_improv/esp32_improv_component.h
@@ -45,6 +45,7 @@ class ESP32ImprovComponent : public Component, public improv_base::ImprovBase {
  void start();
  void stop();
  bool is_active() const { return this->state_ != improv::STATE_STOPPED; }
+  bool should_start() const { return this->should_start_; }

 #ifdef USE_ESP32_IMPROV_STATE_CALLBACK
  void add_on_state_callback(std::function<void(improv::State, improv::Error)> &&callback) {
--- a/esphome/components/ethernet/init.py
+++ b/esphome/components/ethernet/init.py
@@ -383,7 +383,6 @@ async def to_code(config):
    cg.add(var.set_use_address(config[CONF_USE_ADDRESS]))

    if CONF_MANUAL_IP in config:
-        cg.add_define("USE_ETHERNET_MANUAL_IP")
        cg.add(var.set_manual_ip(manual_ip(config[CONF_MANUAL_IP])))

    # Add compile-time define for PHY types with specific code
--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -553,14 +553,11 @@ void EthernetComponent::start_connect_() {
  }

  esp_netif_ip_info_t info;
-#ifdef USE_ETHERNET_MANUAL_IP
  if (this->manual_ip_.has_value()) {
    info.ip = this->manual_ip_->static_ip;
    info.gw = this->manual_ip_->gateway;
    info.netmask = this->manual_ip_->subnet;
-  } else
-#endif
-  {
+  } else {
    info.ip.addr = 0;
    info.gw.addr = 0;
    info.netmask.addr = 0;
@@ -581,7 +578,6 @@ void EthernetComponent::start_connect_() {
  err = esp_netif_set_ip_info(this->eth_netif_, &info);
  ESPHL_ERROR_CHECK(err, "DHCPC set IP info error");

-#ifdef USE_ETHERNET_MANUAL_IP
  if (this->manual_ip_.has_value()) {
    LwIPLock lock;
    if (this->manual_ip_->dns1.is_set()) {
@@ -594,9 +590,7 @@ void EthernetComponent::start_connect_() {
      d = this->manual_ip_->dns2;
      dns_setserver(1, &d);
    }
-  } else
-#endif
-  {
+  } else {
    err = esp_netif_dhcpc_start(this->eth_netif_);
    if (err != ESP_ERR_ESP_NETIF_DHCP_ALREADY_STARTED) {
      ESPHL_ERROR_CHECK(err, "DHCPC start error");
@@ -694,9 +688,7 @@ void EthernetComponent::set_clk_mode(emac_rmii_clock_mode_t clk_mode) { this->cl
 void EthernetComponent::add_phy_register(PHYRegister register_value) { this->phy_registers_.push_back(register_value); }
 #endif
 void EthernetComponent::set_type(EthernetType type) { this->type_ = type; }
-#ifdef USE_ETHERNET_MANUAL_IP
 void EthernetComponent::set_manual_ip(const ManualIP &manual_ip) { this->manual_ip_ = manual_ip; }
-#endif

 // set_use_address() is guaranteed to be called during component setup by Python code generation,
 // so use_address_ will always be valid when get_use_address() is called - no fallback needed.
--- a/esphome/components/ethernet/ethernet_component.h
+++ b/esphome/components/ethernet/ethernet_component.h
@@ -82,9 +82,7 @@ class EthernetComponent : public Component {
  void add_phy_register(PHYRegister register_value);
 #endif
  void set_type(EthernetType type);
-#ifdef USE_ETHERNET_MANUAL_IP
  void set_manual_ip(const ManualIP &manual_ip);
-#endif
  void set_fixed_mac(const std::array<uint8_t, 6> &mac) { this->fixed_mac_ = mac; }

  network::IPAddresses get_ip_addresses();
@@ -139,9 +137,7 @@ class EthernetComponent : public Component {
  uint8_t mdc_pin_{23};
  uint8_t mdio_pin_{18};
 #endif
-#ifdef USE_ETHERNET_MANUAL_IP
  optional<ManualIP> manual_ip_{};
-#endif
  uint32_t connect_begin_;

  // Group all uint8_t types together (enums and bools)
--- a/esphome/components/graph/graph.cpp
+++ b/esphome/components/graph/graph.cpp
@@ -337,7 +337,7 @@ void Graph::draw_legend(display::Display *buff, uint16_t x_offset, uint16_t y_of
    return;

  /// Plot border
-  if (this->border_) {
+  if (legend_->border_) {
    int w = legend_->width_;
    int h = legend_->height_;
    buff->horizontal_line(x_offset, y_offset, w, color);
--- a/esphome/components/homeassistant/binary_sensor/homeassistant_binary_sensor.cpp
+++ b/esphome/components/homeassistant/binary_sensor/homeassistant_binary_sensor.cpp
@@ -19,11 +19,10 @@ void HomeassistantBinarySensor::setup() {
          case PARSE_ON:
          case PARSE_OFF:
            bool new_state = val == PARSE_ON;
-            if (this->attribute_.has_value()) {
-              ESP_LOGD(TAG, "'%s::%s': Got attribute state %s", this->entity_id_.c_str(),
-                       this->attribute_.value().c_str(), ONOFF(new_state));
+            if (this->attribute_ != nullptr) {
+              ESP_LOGD(TAG, "'%s::%s': Got attribute state %s", this->entity_id_, this->attribute_, ONOFF(new_state));
            } else {
-              ESP_LOGD(TAG, "'%s': Got state %s", this->entity_id_.c_str(), ONOFF(new_state));
+              ESP_LOGD(TAG, "'%s': Got state %s", this->entity_id_, ONOFF(new_state));
            }
            if (this->initial_) {
              this->publish_initial_state(new_state);
@@ -37,9 +36,9 @@ void HomeassistantBinarySensor::setup() {
 }
 void HomeassistantBinarySensor::dump_config() {
  LOG_BINARY_SENSOR("", "Homeassistant Binary Sensor", this);
-  ESP_LOGCONFIG(TAG, "  Entity ID: '%s'", this->entity_id_.c_str());
-  if (this->attribute_.has_value()) {
-    ESP_LOGCONFIG(TAG, "  Attribute: '%s'", this->attribute_.value().c_str());
+  ESP_LOGCONFIG(TAG, "  Entity ID: '%s'", this->entity_id_);
+  if (this->attribute_ != nullptr) {
+    ESP_LOGCONFIG(TAG, "  Attribute: '%s'", this->attribute_);
  }
 }
 float HomeassistantBinarySensor::get_setup_priority() const { return setup_priority::AFTER_WIFI; }
--- a/esphome/components/homeassistant/binary_sensor/homeassistant_binary_sensor.h
+++ b/esphome/components/homeassistant/binary_sensor/homeassistant_binary_sensor.h
@@ -8,15 +8,15 @@ namespace homeassistant {

 class HomeassistantBinarySensor : public binary_sensor::BinarySensor, public Component {
 public:
-  void set_entity_id(const std::string &entity_id) { entity_id_ = entity_id; }
-  void set_attribute(const std::string &attribute) { attribute_ = attribute; }
+  void set_entity_id(const char *entity_id) { this->entity_id_ = entity_id; }
+  void set_attribute(const char *attribute) { this->attribute_ = attribute; }
  void setup() override;
  void dump_config() override;
  float get_setup_priority() const override;

 protected:
-  std::string entity_id_;
-  optional<std::string> attribute_;
+  const char *entity_id_{nullptr};
+  const char *attribute_{nullptr};
  bool initial_{true};
 };

--- a/esphome/components/homeassistant/number/homeassistant_number.cpp
+++ b/esphome/components/homeassistant/number/homeassistant_number.cpp
@@ -12,21 +12,21 @@ static const char *const TAG = "homeassistant.number";
 void HomeassistantNumber::state_changed_(const std::string &state) {
  auto number_value = parse_number<float>(state);
  if (!number_value.has_value()) {
-    ESP_LOGW(TAG, "'%s': Can't convert '%s' to number!", this->entity_id_.c_str(), state.c_str());
+    ESP_LOGW(TAG, "'%s': Can't convert '%s' to number!", this->entity_id_, state.c_str());
    this->publish_state(NAN);
    return;
  }
  if (this->state == number_value.value()) {
    return;
  }
-  ESP_LOGD(TAG, "'%s': Got state %s", this->entity_id_.c_str(), state.c_str());
+  ESP_LOGD(TAG, "'%s': Got state %s", this->entity_id_, state.c_str());
  this->publish_state(number_value.value());
 }

 void HomeassistantNumber::min_retrieved_(const std::string &min) {
  auto min_value = parse_number<float>(min);
  if (!min_value.has_value()) {
-    ESP_LOGE(TAG, "'%s': Can't convert 'min' value '%s' to number!", this->entity_id_.c_str(), min.c_str());
+    ESP_LOGE(TAG, "'%s': Can't convert 'min' value '%s' to number!", this->entity_id_, min.c_str());
    return;
  }
  ESP_LOGD(TAG, "'%s': Min retrieved: %s", get_name().c_str(), min.c_str());
@@ -36,7 +36,7 @@ void HomeassistantNumber::min_retrieved_(const std::string &min) {
 void HomeassistantNumber::max_retrieved_(const std::string &max) {
  auto max_value = parse_number<float>(max);
  if (!max_value.has_value()) {
-    ESP_LOGE(TAG, "'%s': Can't convert 'max' value '%s' to number!", this->entity_id_.c_str(), max.c_str());
+    ESP_LOGE(TAG, "'%s': Can't convert 'max' value '%s' to number!", this->entity_id_, max.c_str());
    return;
  }
  ESP_LOGD(TAG, "'%s': Max retrieved: %s", get_name().c_str(), max.c_str());
@@ -46,7 +46,7 @@ void HomeassistantNumber::max_retrieved_(const std::string &max) {
 void HomeassistantNumber::step_retrieved_(const std::string &step) {
  auto step_value = parse_number<float>(step);
  if (!step_value.has_value()) {
-    ESP_LOGE(TAG, "'%s': Can't convert 'step' value '%s' to number!", this->entity_id_.c_str(), step.c_str());
+    ESP_LOGE(TAG, "'%s': Can't convert 'step' value '%s' to number!", this->entity_id_, step.c_str());
    return;
  }
  ESP_LOGD(TAG, "'%s': Step Retrieved %s", get_name().c_str(), step.c_str());
@@ -55,22 +55,19 @@ void HomeassistantNumber::step_retrieved_(const std::string &step) {

 void HomeassistantNumber::setup() {
  api::global_api_server->subscribe_home_assistant_state(
-      this->entity_id_, nullopt, std::bind(&HomeassistantNumber::state_changed_, this, std::placeholders::_1));
+      this->entity_id_, nullptr, std::bind(&HomeassistantNumber::state_changed_, this, std::placeholders::_1));

  api::global_api_server->get_home_assistant_state(
-      this->entity_id_, optional<std::string>("min"),
-      std::bind(&HomeassistantNumber::min_retrieved_, this, std::placeholders::_1));
+      this->entity_id_, "min", std::bind(&HomeassistantNumber::min_retrieved_, this, std::placeholders::_1));
  api::global_api_server->get_home_assistant_state(
-      this->entity_id_, optional<std::string>("max"),
-      std::bind(&HomeassistantNumber::max_retrieved_, this, std::placeholders::_1));
+      this->entity_id_, "max", std::bind(&HomeassistantNumber::max_retrieved_, this, std::placeholders::_1));
  api::global_api_server->get_home_assistant_state(
-      this->entity_id_, optional<std::string>("step"),
-      std::bind(&HomeassistantNumber::step_retrieved_, this, std::placeholders::_1));
+      this->entity_id_, "step", std::bind(&HomeassistantNumber::step_retrieved_, this, std::placeholders::_1));
 }

 void HomeassistantNumber::dump_config() {
  LOG_NUMBER("", "Homeassistant Number", this);
-  ESP_LOGCONFIG(TAG, "  Entity ID: '%s'", this->entity_id_.c_str());
+  ESP_LOGCONFIG(TAG, "  Entity ID: '%s'", this->entity_id_);
 }

 float HomeassistantNumber::get_setup_priority() const { return setup_priority::AFTER_CONNECTION; }
--- a/esphome/components/homeassistant/number/homeassistant_number.h
+++ b/esphome/components/homeassistant/number/homeassistant_number.h
@@ -11,7 +11,7 @@ namespace homeassistant {

 class HomeassistantNumber : public number::Number, public Component {
 public:
-  void set_entity_id(const std::string &entity_id) { this->entity_id_ = entity_id; }
+  void set_entity_id(const char *entity_id) { this->entity_id_ = entity_id; }

  void setup() override;
  void dump_config() override;
@@ -25,7 +25,7 @@ class HomeassistantNumber : public number::Number, public Component {

  void control(float value) override;

-  std::string entity_id_;
+  const char *entity_id_{nullptr};
 };
 }  // namespace homeassistant
 }  // namespace esphome
--- a/esphome/components/homeassistant/sensor/homeassistant_sensor.cpp
+++ b/esphome/components/homeassistant/sensor/homeassistant_sensor.cpp
@@ -12,25 +12,24 @@ void HomeassistantSensor::setup() {
      this->entity_id_, this->attribute_, [this](const std::string &state) {
        auto val = parse_number<float>(state);
        if (!val.has_value()) {
-          ESP_LOGW(TAG, "'%s': Can't convert '%s' to number!", this->entity_id_.c_str(), state.c_str());
+          ESP_LOGW(TAG, "'%s': Can't convert '%s' to number!", this->entity_id_, state.c_str());
          this->publish_state(NAN);
          return;
        }

-        if (this->attribute_.has_value()) {
-          ESP_LOGD(TAG, "'%s::%s': Got attribute state %.2f", this->entity_id_.c_str(),
-                   this->attribute_.value().c_str(), *val);
+        if (this->attribute_ != nullptr) {
+          ESP_LOGD(TAG, "'%s::%s': Got attribute state %.2f", this->entity_id_, this->attribute_, *val);
        } else {
-          ESP_LOGD(TAG, "'%s': Got state %.2f", this->entity_id_.c_str(), *val);
+          ESP_LOGD(TAG, "'%s': Got state %.2f", this->entity_id_, *val);
        }
        this->publish_state(*val);
      });
 }
 void HomeassistantSensor::dump_config() {
  LOG_SENSOR("", "Homeassistant Sensor", this);
-  ESP_LOGCONFIG(TAG, "  Entity ID: '%s'", this->entity_id_.c_str());
-  if (this->attribute_.has_value()) {
-    ESP_LOGCONFIG(TAG, "  Attribute: '%s'", this->attribute_.value().c_str());
+  ESP_LOGCONFIG(TAG, "  Entity ID: '%s'", this->entity_id_);
+  if (this->attribute_ != nullptr) {
+    ESP_LOGCONFIG(TAG, "  Attribute: '%s'", this->attribute_);
  }
 }
 float HomeassistantSensor::get_setup_priority() const { return setup_priority::AFTER_CONNECTION; }
--- a/esphome/components/homeassistant/sensor/homeassistant_sensor.h
+++ b/esphome/components/homeassistant/sensor/homeassistant_sensor.h
@@ -8,15 +8,15 @@ namespace homeassistant {

 class HomeassistantSensor : public sensor::Sensor, public Component {
 public:
-  void set_entity_id(const std::string &entity_id) { entity_id_ = entity_id; }
-  void set_attribute(const std::string &attribute) { attribute_ = attribute; }
+  void set_entity_id(const char *entity_id) { this->entity_id_ = entity_id; }
+  void set_attribute(const char *attribute) { this->attribute_ = attribute; }
  void setup() override;
  void dump_config() override;
  float get_setup_priority() const override;

 protected:
-  std::string entity_id_;
-  optional<std::string> attribute_;
+  const char *entity_id_{nullptr};
+  const char *attribute_{nullptr};
 };

 }  // namespace homeassistant
--- a/esphome/components/homeassistant/switch/homeassistant_switch.cpp
+++ b/esphome/components/homeassistant/switch/homeassistant_switch.cpp
@@ -10,7 +10,7 @@ static const char *const TAG = "homeassistant.switch";
 using namespace esphome::switch_;

 void HomeassistantSwitch::setup() {
-  api::global_api_server->subscribe_home_assistant_state(this->entity_id_, nullopt, [this](const std::string &state) {
+  api::global_api_server->subscribe_home_assistant_state(this->entity_id_, nullptr, [this](const std::string &state) {
    auto val = parse_on_off(state.c_str());
    switch (val) {
      case PARSE_NONE:
@@ -20,7 +20,7 @@ void HomeassistantSwitch::setup() {
      case PARSE_ON:
      case PARSE_OFF:
        bool new_state = val == PARSE_ON;
-        ESP_LOGD(TAG, "'%s': Got state %s", this->entity_id_.c_str(), ONOFF(new_state));
+        ESP_LOGD(TAG, "'%s': Got state %s", this->entity_id_, ONOFF(new_state));
        this->publish_state(new_state);
        break;
    }
@@ -29,7 +29,7 @@ void HomeassistantSwitch::setup() {

 void HomeassistantSwitch::dump_config() {
  LOG_SWITCH("", "Homeassistant Switch", this);
-  ESP_LOGCONFIG(TAG, "  Entity ID: '%s'", this->entity_id_.c_str());
+  ESP_LOGCONFIG(TAG, "  Entity ID: '%s'", this->entity_id_);
 }

 float HomeassistantSwitch::get_setup_priority() const { return setup_priority::AFTER_CONNECTION; }
--- a/esphome/components/homeassistant/switch/homeassistant_switch.h
+++ b/esphome/components/homeassistant/switch/homeassistant_switch.h
@@ -8,14 +8,14 @@ namespace homeassistant {

 class HomeassistantSwitch : public switch_::Switch, public Component {
 public:
-  void set_entity_id(const std::string &entity_id) { this->entity_id_ = entity_id; }
+  void set_entity_id(const char *entity_id) { this->entity_id_ = entity_id; }
  void setup() override;
  void dump_config() override;
  float get_setup_priority() const override;

 protected:
  void write_state(bool state) override;
-  std::string entity_id_;
+  const char *entity_id_{nullptr};
 };

 }  // namespace homeassistant
--- a/esphome/components/homeassistant/text_sensor/homeassistant_text_sensor.cpp
+++ b/esphome/components/homeassistant/text_sensor/homeassistant_text_sensor.cpp
@@ -10,20 +10,19 @@ static const char *const TAG = "homeassistant.text_sensor";
 void HomeassistantTextSensor::setup() {
  api::global_api_server->subscribe_home_assistant_state(
      this->entity_id_, this->attribute_, [this](const std::string &state) {
-        if (this->attribute_.has_value()) {
-          ESP_LOGD(TAG, "'%s::%s': Got attribute state '%s'", this->entity_id_.c_str(),
-                   this->attribute_.value().c_str(), state.c_str());
+        if (this->attribute_ != nullptr) {
+          ESP_LOGD(TAG, "'%s::%s': Got attribute state '%s'", this->entity_id_, this->attribute_, state.c_str());
        } else {
-          ESP_LOGD(TAG, "'%s': Got state '%s'", this->entity_id_.c_str(), state.c_str());
+          ESP_LOGD(TAG, "'%s': Got state '%s'", this->entity_id_, state.c_str());
        }
        this->publish_state(state);
      });
 }
 void HomeassistantTextSensor::dump_config() {
  LOG_TEXT_SENSOR("", "Homeassistant Text Sensor", this);
-  ESP_LOGCONFIG(TAG, "  Entity ID: '%s'", this->entity_id_.c_str());
-  if (this->attribute_.has_value()) {
-    ESP_LOGCONFIG(TAG, "  Attribute: '%s'", this->attribute_.value().c_str());
+  ESP_LOGCONFIG(TAG, "  Entity ID: '%s'", this->entity_id_);
+  if (this->attribute_ != nullptr) {
+    ESP_LOGCONFIG(TAG, "  Attribute: '%s'", this->attribute_);
  }
 }
 float HomeassistantTextSensor::get_setup_priority() const { return setup_priority::AFTER_CONNECTION; }
--- a/esphome/components/homeassistant/text_sensor/homeassistant_text_sensor.h
+++ b/esphome/components/homeassistant/text_sensor/homeassistant_text_sensor.h
@@ -8,15 +8,15 @@ namespace homeassistant {

 class HomeassistantTextSensor : public text_sensor::TextSensor, public Component {
 public:
-  void set_entity_id(const std::string &entity_id) { entity_id_ = entity_id; }
-  void set_attribute(const std::string &attribute) { attribute_ = attribute; }
+  void set_entity_id(const char *entity_id) { this->entity_id_ = entity_id; }
+  void set_attribute(const char *attribute) { this->attribute_ = attribute; }
  void setup() override;
  void dump_config() override;
  float get_setup_priority() const override;

 protected:
-  std::string entity_id_;
-  optional<std::string> attribute_;
+  const char *entity_id_{nullptr};
+  const char *attribute_{nullptr};
 };

 }  // namespace homeassistant
--- a/esphome/components/i2c/i2c_bus_esp_idf.cpp
+++ b/esphome/components/i2c/i2c_bus_esp_idf.cpp
@@ -107,7 +107,7 @@ void IDFI2CBus::dump_config() {
        if (s.second) {
          ESP_LOGCONFIG(TAG, "Found device at address 0x%02X", s.first);
        } else {
-          ESP_LOGCONFIG(TAG, "Unknown error at address 0x%02X", s.first);
+          ESP_LOGE(TAG, "Unknown error at address 0x%02X", s.first);
        }
      }
    }
--- a/esphome/components/ld2410/automation.h
+++ b/esphome/components/ld2410/automation.h
@@ -4,8 +4,7 @@
 #include "esphome/core/component.h"
 #include "ld2410.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 template<typename... Ts> class BluetoothPasswordSetAction : public Action<Ts...> {
 public:
@@ -18,5 +17,4 @@ template<typename... Ts> class BluetoothPasswordSetAction : public Action<Ts...>
  LD2410Component *ld2410_comp_;
 };

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/button/factory_reset_button.cpp
+++ b/esphome/components/ld2410/button/factory_reset_button.cpp
@@ -1,9 +1,7 @@
 #include "factory_reset_button.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 void FactoryResetButton::press_action() { this->parent_->factory_reset(); }

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/button/factory_reset_button.h
+++ b/esphome/components/ld2410/button/factory_reset_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2410.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 class FactoryResetButton : public button::Button, public Parented<LD2410Component> {
 public:
@@ -14,5 +13,4 @@ class FactoryResetButton : public button::Button, public Parented<LD2410Componen
  void press_action() override;
 };

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/button/query_button.cpp
+++ b/esphome/components/ld2410/button/query_button.cpp
@@ -1,9 +1,7 @@
 #include "query_button.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 void QueryButton::press_action() { this->parent_->read_all_info(); }

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/button/query_button.h
+++ b/esphome/components/ld2410/button/query_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2410.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 class QueryButton : public button::Button, public Parented<LD2410Component> {
 public:
@@ -14,5 +13,4 @@ class QueryButton : public button::Button, public Parented<LD2410Component> {
  void press_action() override;
 };

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/button/restart_button.cpp
+++ b/esphome/components/ld2410/button/restart_button.cpp
@@ -1,9 +1,7 @@
 #include "restart_button.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 void RestartButton::press_action() { this->parent_->restart_and_read_all_info(); }

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/button/restart_button.h
+++ b/esphome/components/ld2410/button/restart_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2410.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 class RestartButton : public button::Button, public Parented<LD2410Component> {
 public:
@@ -14,5 +13,4 @@ class RestartButton : public button::Button, public Parented<LD2410Component> {
  void press_action() override;
 };

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/ld2410.cpp
+++ b/esphome/components/ld2410/ld2410.cpp
@@ -9,8 +9,7 @@

 #include "esphome/core/application.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 static const char *const TAG = "ld2410";

@@ -782,5 +781,4 @@ void LD2410Component::set_gate_still_sensor(uint8_t gate, sensor::Sensor *s) {
 }
 #endif

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/ld2410.h
+++ b/esphome/components/ld2410/ld2410.h
@@ -29,8 +29,7 @@

 #include <array>

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 using namespace ld24xx;

@@ -133,5 +132,4 @@ class LD2410Component : public Component, public uart::UARTDevice {
 #endif
 };

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/number/gate_threshold_number.cpp
+++ b/esphome/components/ld2410/number/gate_threshold_number.cpp
@@ -1,7 +1,6 @@
 #include "gate_threshold_number.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 GateThresholdNumber::GateThresholdNumber(uint8_t gate) : gate_(gate) {}

@@ -10,5 +9,4 @@ void GateThresholdNumber::control(float value) {
  this->parent_->set_gate_threshold(this->gate_);
 }

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/number/gate_threshold_number.h
+++ b/esphome/components/ld2410/number/gate_threshold_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2410.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 class GateThresholdNumber : public number::Number, public Parented<LD2410Component> {
 public:
@@ -15,5 +14,4 @@ class GateThresholdNumber : public number::Number, public Parented<LD2410Compone
  void control(float value) override;
 };

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/number/light_threshold_number.cpp
+++ b/esphome/components/ld2410/number/light_threshold_number.cpp
@@ -1,12 +1,10 @@
 #include "light_threshold_number.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 void LightThresholdNumber::control(float value) {
  this->publish_state(value);
  this->parent_->set_light_out_control();
 }

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/number/light_threshold_number.h
+++ b/esphome/components/ld2410/number/light_threshold_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2410.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 class LightThresholdNumber : public number::Number, public Parented<LD2410Component> {
 public:
@@ -14,5 +13,4 @@ class LightThresholdNumber : public number::Number, public Parented<LD2410Compon
  void control(float value) override;
 };

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/number/max_distance_timeout_number.cpp
+++ b/esphome/components/ld2410/number/max_distance_timeout_number.cpp
@@ -1,12 +1,10 @@
 #include "max_distance_timeout_number.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 void MaxDistanceTimeoutNumber::control(float value) {
  this->publish_state(value);
  this->parent_->set_max_distances_timeout();
 }

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/number/max_distance_timeout_number.h
+++ b/esphome/components/ld2410/number/max_distance_timeout_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2410.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 class MaxDistanceTimeoutNumber : public number::Number, public Parented<LD2410Component> {
 public:
@@ -14,5 +13,4 @@ class MaxDistanceTimeoutNumber : public number::Number, public Parented<LD2410Co
  void control(float value) override;
 };

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/select/baud_rate_select.cpp
+++ b/esphome/components/ld2410/select/baud_rate_select.cpp
@@ -1,12 +1,10 @@
 #include "baud_rate_select.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 void BaudRateSelect::control(size_t index) {
  this->publish_state(index);
  this->parent_->set_baud_rate(this->option_at(index));
 }

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/select/baud_rate_select.h
+++ b/esphome/components/ld2410/select/baud_rate_select.h
@@ -3,8 +3,7 @@
 #include "esphome/components/select/select.h"
 #include "../ld2410.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 class BaudRateSelect : public select::Select, public Parented<LD2410Component> {
 public:
@@ -14,5 +13,4 @@ class BaudRateSelect : public select::Select, public Parented<LD2410Component> {
  void control(size_t index) override;
 };

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/select/distance_resolution_select.cpp
+++ b/esphome/components/ld2410/select/distance_resolution_select.cpp
@@ -1,12 +1,10 @@
 #include "distance_resolution_select.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 void DistanceResolutionSelect::control(size_t index) {
  this->publish_state(index);
  this->parent_->set_distance_resolution(this->option_at(index));
 }

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/select/distance_resolution_select.h
+++ b/esphome/components/ld2410/select/distance_resolution_select.h
@@ -3,8 +3,7 @@
 #include "esphome/components/select/select.h"
 #include "../ld2410.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 class DistanceResolutionSelect : public select::Select, public Parented<LD2410Component> {
 public:
@@ -14,5 +13,4 @@ class DistanceResolutionSelect : public select::Select, public Parented<LD2410Co
  void control(size_t index) override;
 };

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/select/light_out_control_select.cpp
+++ b/esphome/components/ld2410/select/light_out_control_select.cpp
@@ -1,12 +1,10 @@
 #include "light_out_control_select.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 void LightOutControlSelect::control(size_t index) {
  this->publish_state(index);
  this->parent_->set_light_out_control();
 }

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/select/light_out_control_select.h
+++ b/esphome/components/ld2410/select/light_out_control_select.h
@@ -3,8 +3,7 @@
 #include "esphome/components/select/select.h"
 #include "../ld2410.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 class LightOutControlSelect : public select::Select, public Parented<LD2410Component> {
 public:
@@ -14,5 +13,4 @@ class LightOutControlSelect : public select::Select, public Parented<LD2410Compo
  void control(size_t index) override;
 };

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/switch/bluetooth_switch.cpp
+++ b/esphome/components/ld2410/switch/bluetooth_switch.cpp
@@ -1,12 +1,10 @@
 #include "bluetooth_switch.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 void BluetoothSwitch::write_state(bool state) {
  this->publish_state(state);
  this->parent_->set_bluetooth(state);
 }

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/switch/bluetooth_switch.h
+++ b/esphome/components/ld2410/switch/bluetooth_switch.h
@@ -3,8 +3,7 @@
 #include "esphome/components/switch/switch.h"
 #include "../ld2410.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 class BluetoothSwitch : public switch_::Switch, public Parented<LD2410Component> {
 public:
@@ -14,5 +13,4 @@ class BluetoothSwitch : public switch_::Switch, public Parented<LD2410Component>
  void write_state(bool state) override;
 };

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/switch/engineering_mode_switch.cpp
+++ b/esphome/components/ld2410/switch/engineering_mode_switch.cpp
@@ -1,12 +1,10 @@
 #include "engineering_mode_switch.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 void EngineeringModeSwitch::write_state(bool state) {
  this->publish_state(state);
  this->parent_->set_engineering_mode(state);
 }

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/switch/engineering_mode_switch.h
+++ b/esphome/components/ld2410/switch/engineering_mode_switch.h
@@ -3,8 +3,7 @@
 #include "esphome/components/switch/switch.h"
 #include "../ld2410.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {

 class EngineeringModeSwitch : public switch_::Switch, public Parented<LD2410Component> {
 public:
@@ -14,5 +13,4 @@ class EngineeringModeSwitch : public switch_::Switch, public Parented<LD2410Comp
  void write_state(bool state) override;
 };

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2412/button/factory_reset_button.cpp
+++ b/esphome/components/ld2412/button/factory_reset_button.cpp
@@ -1,9 +1,7 @@
 #include "factory_reset_button.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 void FactoryResetButton::press_action() { this->parent_->factory_reset(); }

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/button/factory_reset_button.h
+++ b/esphome/components/ld2412/button/factory_reset_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2412.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 class FactoryResetButton : public button::Button, public Parented<LD2412Component> {
 public:
@@ -14,5 +13,4 @@ class FactoryResetButton : public button::Button, public Parented<LD2412Componen
  void press_action() override;
 };

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/button/query_button.cpp
+++ b/esphome/components/ld2412/button/query_button.cpp
@@ -1,9 +1,7 @@
 #include "query_button.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 void QueryButton::press_action() { this->parent_->read_all_info(); }

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/button/query_button.h
+++ b/esphome/components/ld2412/button/query_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2412.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 class QueryButton : public button::Button, public Parented<LD2412Component> {
 public:
@@ -14,5 +13,4 @@ class QueryButton : public button::Button, public Parented<LD2412Component> {
  void press_action() override;
 };

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/button/restart_button.cpp
+++ b/esphome/components/ld2412/button/restart_button.cpp
@@ -1,9 +1,7 @@
 #include "restart_button.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 void RestartButton::press_action() { this->parent_->restart_and_read_all_info(); }

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/button/restart_button.h
+++ b/esphome/components/ld2412/button/restart_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2412.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 class RestartButton : public button::Button, public Parented<LD2412Component> {
 public:
@@ -14,5 +13,4 @@ class RestartButton : public button::Button, public Parented<LD2412Component> {
  void press_action() override;
 };

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/button/start_dynamic_background_correction_button.cpp
+++ b/esphome/components/ld2412/button/start_dynamic_background_correction_button.cpp
@@ -2,10 +2,8 @@

 #include "restart_button.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 void StartDynamicBackgroundCorrectionButton::press_action() { this->parent_->start_dynamic_background_correction(); }

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/button/start_dynamic_background_correction_button.h
+++ b/esphome/components/ld2412/button/start_dynamic_background_correction_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2412.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 class StartDynamicBackgroundCorrectionButton : public button::Button, public Parented<LD2412Component> {
 public:
@@ -14,5 +13,4 @@ class StartDynamicBackgroundCorrectionButton : public button::Button, public Par
  void press_action() override;
 };

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/ld2412.cpp
+++ b/esphome/components/ld2412/ld2412.cpp
@@ -10,8 +10,7 @@
 #include "esphome/core/application.h"
 #include "esphome/core/helpers.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 static const char *const TAG = "ld2412";

@@ -855,5 +854,4 @@ void LD2412Component::set_gate_still_sensor(uint8_t gate, sensor::Sensor *s) {
 }
 #endif

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/ld2412.h
+++ b/esphome/components/ld2412/ld2412.h
@@ -29,8 +29,7 @@

 #include <array>

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 using namespace ld24xx;

@@ -137,5 +136,4 @@ class LD2412Component : public Component, public uart::UARTDevice {
 #endif
 };

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/number/gate_threshold_number.cpp
+++ b/esphome/components/ld2412/number/gate_threshold_number.cpp
@@ -1,7 +1,6 @@
 #include "gate_threshold_number.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 GateThresholdNumber::GateThresholdNumber(uint8_t gate) : gate_(gate) {}

@@ -10,5 +9,4 @@ void GateThresholdNumber::control(float value) {
  this->parent_->set_gate_threshold();
 }

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/number/gate_threshold_number.h
+++ b/esphome/components/ld2412/number/gate_threshold_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2412.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 class GateThresholdNumber : public number::Number, public Parented<LD2412Component> {
 public:
@@ -15,5 +14,4 @@ class GateThresholdNumber : public number::Number, public Parented<LD2412Compone
  void control(float value) override;
 };

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/number/light_threshold_number.cpp
+++ b/esphome/components/ld2412/number/light_threshold_number.cpp
@@ -1,12 +1,10 @@
 #include "light_threshold_number.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 void LightThresholdNumber::control(float value) {
  this->publish_state(value);
  this->parent_->set_light_out_control();
 }

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/number/light_threshold_number.h
+++ b/esphome/components/ld2412/number/light_threshold_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2412.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 class LightThresholdNumber : public number::Number, public Parented<LD2412Component> {
 public:
@@ -14,5 +13,4 @@ class LightThresholdNumber : public number::Number, public Parented<LD2412Compon
  void control(float value) override;
 };

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/number/max_distance_timeout_number.cpp
+++ b/esphome/components/ld2412/number/max_distance_timeout_number.cpp
@@ -1,12 +1,10 @@
 #include "max_distance_timeout_number.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 void MaxDistanceTimeoutNumber::control(float value) {
  this->publish_state(value);
  this->parent_->set_basic_config();
 }

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/number/max_distance_timeout_number.h
+++ b/esphome/components/ld2412/number/max_distance_timeout_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2412.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 class MaxDistanceTimeoutNumber : public number::Number, public Parented<LD2412Component> {
 public:
@@ -14,5 +13,4 @@ class MaxDistanceTimeoutNumber : public number::Number, public Parented<LD2412Co
  void control(float value) override;
 };

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/select/baud_rate_select.cpp
+++ b/esphome/components/ld2412/select/baud_rate_select.cpp
@@ -1,12 +1,10 @@
 #include "baud_rate_select.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 void BaudRateSelect::control(size_t index) {
  this->publish_state(index);
  this->parent_->set_baud_rate(this->option_at(index));
 }

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/select/baud_rate_select.h
+++ b/esphome/components/ld2412/select/baud_rate_select.h
@@ -3,8 +3,7 @@
 #include "esphome/components/select/select.h"
 #include "../ld2412.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 class BaudRateSelect : public select::Select, public Parented<LD2412Component> {
 public:
@@ -14,5 +13,4 @@ class BaudRateSelect : public select::Select, public Parented<LD2412Component> {
  void control(size_t index) override;
 };

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/select/distance_resolution_select.cpp
+++ b/esphome/components/ld2412/select/distance_resolution_select.cpp
@@ -1,12 +1,10 @@
 #include "distance_resolution_select.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 void DistanceResolutionSelect::control(size_t index) {
  this->publish_state(index);
  this->parent_->set_distance_resolution(this->option_at(index));
 }

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/select/distance_resolution_select.h
+++ b/esphome/components/ld2412/select/distance_resolution_select.h
@@ -3,8 +3,7 @@
 #include "esphome/components/select/select.h"
 #include "../ld2412.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 class DistanceResolutionSelect : public select::Select, public Parented<LD2412Component> {
 public:
@@ -14,5 +13,4 @@ class DistanceResolutionSelect : public select::Select, public Parented<LD2412Co
  void control(size_t index) override;
 };

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/select/light_out_control_select.cpp
+++ b/esphome/components/ld2412/select/light_out_control_select.cpp
@@ -1,12 +1,10 @@
 #include "light_out_control_select.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 void LightOutControlSelect::control(size_t index) {
  this->publish_state(index);
  this->parent_->set_light_out_control();
 }

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/select/light_out_control_select.h
+++ b/esphome/components/ld2412/select/light_out_control_select.h
@@ -3,8 +3,7 @@
 #include "esphome/components/select/select.h"
 #include "../ld2412.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 class LightOutControlSelect : public select::Select, public Parented<LD2412Component> {
 public:
@@ -14,5 +13,4 @@ class LightOutControlSelect : public select::Select, public Parented<LD2412Compo
  void control(size_t index) override;
 };

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/switch/bluetooth_switch.cpp
+++ b/esphome/components/ld2412/switch/bluetooth_switch.cpp
@@ -1,12 +1,10 @@
 #include "bluetooth_switch.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 void BluetoothSwitch::write_state(bool state) {
  this->publish_state(state);
  this->parent_->set_bluetooth(state);
 }

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/switch/bluetooth_switch.h
+++ b/esphome/components/ld2412/switch/bluetooth_switch.h
@@ -3,8 +3,7 @@
 #include "esphome/components/switch/switch.h"
 #include "../ld2412.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 class BluetoothSwitch : public switch_::Switch, public Parented<LD2412Component> {
 public:
@@ -14,5 +13,4 @@ class BluetoothSwitch : public switch_::Switch, public Parented<LD2412Component>
  void write_state(bool state) override;
 };

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/switch/engineering_mode_switch.cpp
+++ b/esphome/components/ld2412/switch/engineering_mode_switch.cpp
@@ -1,12 +1,10 @@
 #include "engineering_mode_switch.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 void EngineeringModeSwitch::write_state(bool state) {
  this->publish_state(state);
  this->parent_->set_engineering_mode(state);
 }

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2412/switch/engineering_mode_switch.h
+++ b/esphome/components/ld2412/switch/engineering_mode_switch.h
@@ -3,8 +3,7 @@
 #include "esphome/components/switch/switch.h"
 #include "../ld2412.h"

-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {

 class EngineeringModeSwitch : public switch_::Switch, public Parented<LD2412Component> {
 public:
@@ -14,5 +13,4 @@ class EngineeringModeSwitch : public switch_::Switch, public Parented<LD2412Comp
  void write_state(bool state) override;
 };

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.cpp
+++ b/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.cpp
@@ -2,8 +2,7 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"

-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {

 static const char *const TAG = "ld2420.binary_sensor";

@@ -12,5 +11,4 @@ void LD2420BinarySensor::dump_config() {
  LOG_BINARY_SENSOR("  ", "Presence", this->presence_bsensor_);
 }

-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
--- a/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.h
+++ b/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.h
@@ -3,8 +3,7 @@
 #include "../ld2420.h"
 #include "esphome/components/binary_sensor/binary_sensor.h"

-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {

 class LD2420BinarySensor : public LD2420Listener, public Component, binary_sensor::BinarySensor {
 public:
@@ -21,5 +20,4 @@ class LD2420BinarySensor : public LD2420Listener, public Component, binary_senso
  binary_sensor::BinarySensor *presence_bsensor_{nullptr};
 };

-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
--- a/esphome/components/ld2420/button/reconfig_buttons.cpp
+++ b/esphome/components/ld2420/button/reconfig_buttons.cpp
@@ -4,13 +4,11 @@

 static const char *const TAG = "ld2420.button";

-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {

 void LD2420ApplyConfigButton::press_action() { this->parent_->apply_config_action(); }
 void LD2420RevertConfigButton::press_action() { this->parent_->revert_config_action(); }
 void LD2420RestartModuleButton::press_action() { this->parent_->restart_module_action(); }
 void LD2420FactoryResetButton::press_action() { this->parent_->factory_reset_action(); }

-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
--- a/esphome/components/ld2420/button/reconfig_buttons.h
+++ b/esphome/components/ld2420/button/reconfig_buttons.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2420.h"

-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {

 class LD2420ApplyConfigButton : public button::Button, public Parented<LD2420Component> {
 public:
@@ -38,5 +37,4 @@ class LD2420FactoryResetButton : public button::Button, public Parented<LD2420Co
  void press_action() override;
 };

-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
--- a/esphome/components/ld2420/ld2420.cpp
+++ b/esphome/components/ld2420/ld2420.cpp
@@ -58,8 +58,7 @@ Gate 0 high thresh = 10 00 uint16_t 0x0010, Threshold value = 60 EA 00 00 uint32
 Gate 0 low thresh = 20 00 uint16_t 0x0020, Threshold value = 60 EA 00 00 uint32_t 0x0000EA60
 */

-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {

 static const char *const TAG = "ld2420";

@@ -880,5 +879,4 @@ void LD2420Component::refresh_gate_config_numbers() {

 #endif

-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
J. Nick Koston	177026d8c4	simplify	2025-11-19 23:25:45 -06:00
J. Nick Koston	4533b8f92c	tweaks	2025-11-19 23:20:24 -06:00
J. Nick Koston	b9595c0795	cover	2025-11-19 22:49:52 -06:00
J. Nick Koston	efe2a1a506	cleanup	2025-11-19 22:32:41 -06:00
J. Nick Koston	185c1dec43	cleanup	2025-11-19 22:24:00 -06:00
J. Nick Koston	c39d17f864	cleanup	2025-11-19 22:20:12 -06:00
J. Nick Koston	b400a98fb3	[api] Store Home Assistant state subscriptions in flash instead of heap	2025-11-19 22:17:16 -06:00
B48D81EFCC	83307684a3	[stts22h] Add support for STTS22H temperature sensor (#11778 ) Co-authored-by: Jonathan Swoboda <154711427+swoboda1337@users.noreply.github.com> Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>	2025-11-20 03:58:39 +00:00
David Woodhouse	da25951f6e	[socket] Fix IPv6 address parsing for BSD sockets (#11996 )	2025-11-19 21:01:32 -06:00
Jonathan Swoboda	4398fd84d2	[graph] Fix legend border (#12000 )	2025-11-20 13:09:22 +13:00
Jonathan Swoboda	bbd6d019e5	Merge branch 'release' into dev	2025-11-19 17:37:58 -05:00
Jonathan Swoboda	625172e07d	Merge pull request #12004 from esphome/bump-2025.11.0 2025.11.0	2025-11-19 17:37:42 -05:00
Jonathan Swoboda	1e9c7d3c6d	Bump version to 2025.11.0	2025-11-19 16:02:52 -05:00
Jonathan Swoboda	4cdab4e2d8	Merge branch 'beta' into dev	2025-11-19 15:06:55 -05:00
Jonathan Swoboda	c2bc7b3cdc	Merge pull request #12003 from esphome/bump-2025.11.0b5 2025.11.0b5	2025-11-19 15:06:44 -05:00
dependabot[bot]	2c3417062a	Bump pyupgrade from 3.21.1 to 3.21.2 (#12002 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-11-19 13:47:40 -06:00
Jonathan Swoboda	c75abfb894	Bump version to 2025.11.0b5	2025-11-19 14:17:03 -05:00
Jesse Hills	1157b4aee8	[epaper_spi] Add basic `7.3in-Spectra-E6` model (#12001 )	2025-11-19 14:17:03 -05:00
J. Nick Koston	71dc2d374d	[web_server_idf] Fix pbuf_free crash by moving shutdown before close (#11995 )	2025-11-19 14:17:03 -05:00
Jonathan Swoboda	0a224f919b	[wifi] Fix positive RSSI values on 8266 (#11994 )	2025-11-19 14:17:03 -05:00
Jonathan Swoboda	7ef4b4f3d9	[text_sensor] Fix infinite loop in substitute filter (#11989 ) Co-authored-by: J. Nick Koston <nick@koston.org>	2025-11-19 14:17:03 -05:00
J. Nick Koston	13b875c763	[tests] Fix SNTP time ID conflicts in component tests for grouped testing (#11990 )	2025-11-19 14:17:03 -05:00
Jesse Hills	b02b07ffaf	[epaper_spi] Add basic `7.3in-Spectra-E6` model (#12001 )	2025-11-19 14:11:45 -05:00
J. Nick Koston	8804bc2815	[web_server_idf] Fix pbuf_free crash by moving shutdown before close (#11995 )	2025-11-20 07:58:33 +13:00
Jonathan Swoboda	61cef0a75c	[api] Fix format warnings in dump (#11999 )	2025-11-19 12:58:47 -05:00
Jonathan Swoboda	73bc5252a1	[wifi] Fix positive RSSI values on 8266 (#11994 )	2025-11-19 10:12:57 -05:00
Jonathan Swoboda	f2b10ad132	[text_sensor] Fix infinite loop in substitute filter (#11989 ) Co-authored-by: J. Nick Koston <nick@koston.org>	2025-11-19 10:12:34 -05:00
J. Nick Koston	100ea46f03	[tests] Fix SNTP time ID conflicts in component tests for grouped testing (#11990 )	2025-11-18 23:19:54 -06:00
J. Nick Koston	b3ef05e5e1	[ld24xx] Modernize namespace declarations to C++17 syntax (#11988 )	2025-11-19 04:00:39 +00:00
J. Nick Koston	45c994e4de	[light] Modernize namespace declarations to C++17 syntax (#11986 )	2025-11-18 21:56:23 -06:00
Jesse Hills	a72545639d	Merge branch 'beta' into dev	2025-11-19 13:43:25 +13:00
Jesse Hills	dfd614c00c	Merge pull request #11980 from esphome/bump-2025.11.0b4 2025.11.0b4	2025-11-19 13:22:09 +13:00
J. Nick Koston	29374837c6	[wifi, captive_portal, web_server, wifi_info] Use stack allocation for MAC address formatting (#11963 )	2025-11-18 17:06:34 -06:00
Jesse Hills	2681a14d05	Bump version to 2025.11.0b4	2025-11-19 09:17:33 +13:00
J. Nick Koston	f436f6ee2e	[wifi] Fix captive portal unusable when WiFi credentials are wrong (#11965 )	2025-11-19 09:17:33 +13:00
Jonathan Swoboda	f18bc62690	[sfa30] Fix negative temperature values (#11973 )	2025-11-19 09:17:33 +13:00
J. Nick Koston	6db73df649	[scheduler] Add defensive nullptr checks and explicit locking requirements (#11974 )	2025-11-19 09:17:33 +13:00
Jonathan Swoboda	93215f1737	[esp32] Fix Arduino build on some ESP32 S2 boards (#11972 )	2025-11-19 09:17:33 +13:00
Clyde Stubbs	70aa94b8a4	[lvgl] Apply scale to spinbox value (#11946 )	2025-11-19 09:17:33 +13:00
strange_v	e8998a79c7	[mipi_rgb] Fix GUITION-4848S040 colors (#11709 )	2025-11-19 09:17:33 +13:00
Jonathan Swoboda	3b25fdbc5f	[core] Add support for setting environment variables (#11953 )	2025-11-19 09:17:33 +13:00
J. Nick Koston	6c8577678c	[captive_portal] Warn when enabled without WiFi AP configured (#11856 )	2025-11-19 09:17:33 +13:00
J. Nick Koston	70ed9c7c4d	[wifi] Fix captive portal unusable when WiFi credentials are wrong (#11965 )	2025-11-19 08:17:21 +13:00
dependabot[bot]	81fe5deaa9	Bump github/codeql-action from 4.31.3 to 4.31.4 (#11977 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-11-19 08:12:42 +13:00
Jonathan Swoboda	72e4b16a5b	[sfa30] Fix negative temperature values (#11973 )	2025-11-18 13:29:40 -05:00
Jonathan Swoboda	fe2befcec2	[bme68x] Print error when no sensors are configured (#11976 )	2025-11-18 13:18:09 -05:00
J. Nick Koston	1888f5ffd5	[scheduler] Add defensive nullptr checks and explicit locking requirements (#11974 )	2025-11-18 18:16:18 +00:00
Jonathan Swoboda	c59af22217	[esp32] Fix Arduino build on some ESP32 S2 boards (#11972 )	2025-11-18 12:40:31 -05:00
J. Nick Koston	33983b051b	[ld24xx] Use stack allocation for MAC and version formatting (#11961 )	2025-11-18 10:51:47 -06:00
Clyde Stubbs	11d0d4d128	[lvgl] Apply scale to spinbox value (#11946 )	2025-11-18 17:27:50 +13:00
Clyde Stubbs	a4242dee64	[build] Don't clear pio cache unless requested (#11966 )	2025-11-18 15:11:49 +11:00
J. Nick Koston	0d6c9623ce	[dashboard_import] Store package import URL in .rodata instead of RAM (#11951 )	2025-11-17 20:02:16 -06:00
strange_v	0923bcd2ca	[mipi_rgb] Fix GUITION-4848S040 colors (#11709 )	2025-11-18 01:32:17 +00:00
J. Nick Koston	fdc7ae7760	[wifi] Skip redundant setter calls for default values (#11943 )	2025-11-17 17:20:32 -06:00
J. Nick Koston	1a73f49cd2	[number] Modernize to C++17 nested namespaces (#11945 )	2025-11-17 17:20:18 -06:00