Merge pull request #12266 from esphome/bump-2025.11.3

2025.11.3
Bump version to 2025.11.3
2026-01-15 22:44:47 -07:00 · 2025-12-03 11:36:57 -05:00 · 2025-12-03 10:50:28 -05:00 · 2025-12-03 10:50:28 -05:00 · 2025-12-03 10:50:28 -05:00 · 2025-12-03 10:50:28 -05:00
263 changed files with 2020 additions and 1836 deletions
--- a/.github/workflows/auto-label-pr.yml
+++ b/.github/workflows/auto-label-pr.yml
@@ -22,7 +22,7 @@ jobs:
    if: github.event.action != 'labeled' || github.event.sender.type != 'Bot'
    steps:
      - name: Checkout
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

      - name: Generate a token
        id: generate-token
--- a/.github/workflows/ci-api-proto.yml
+++ b/.github/workflows/ci-api-proto.yml
@@ -21,7 +21,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      - name: Set up Python
        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
--- a/.github/workflows/ci-clang-tidy-hash.yml
+++ b/.github/workflows/ci-clang-tidy-hash.yml
@@ -21,7 +21,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

      - name: Set up Python
        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -43,7 +43,7 @@ jobs:
          - "docker"
          # - "lint"
    steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      - name: Set up Python
        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
--- a/.github/workflows/ci-memory-impact-comment.yml
+++ b/.github/workflows/ci-memory-impact-comment.yml
@@ -49,7 +49,7 @@ jobs:

      - name: Check out code from base repository
        if: steps.pr.outputs.skip != 'true'
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          # Always check out from the base repository (esphome/esphome), never from forks
          # Use the PR's target branch to ensure we run trusted code from the main repo
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
      cache-key: ${{ steps.cache-key.outputs.key }}
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      - name: Generate cache-key
        id: cache-key
        run: echo key="${{ hashFiles('requirements.txt', 'requirements_test.txt', '.pre-commit-config.yaml') }}" >> $GITHUB_OUTPUT
@@ -70,7 +70,7 @@ jobs:
    if: needs.determine-jobs.outputs.python-linters == 'true'
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      - name: Restore Python
        uses: ./.github/actions/restore-python
        with:
@@ -91,7 +91,7 @@ jobs:
      - common
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      - name: Restore Python
        uses: ./.github/actions/restore-python
        with:
@@ -132,7 +132,7 @@ jobs:
      - common
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      - name: Restore Python
        id: restore-python
        uses: ./.github/actions/restore-python
@@ -183,7 +183,7 @@ jobs:
      component-test-batches: ${{ steps.determine.outputs.component-test-batches }}
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          # Fetch enough history to find the merge base
          fetch-depth: 2
@@ -237,7 +237,7 @@ jobs:
    if: needs.determine-jobs.outputs.integration-tests == 'true'
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      - name: Set up Python 3.13
        id: python
        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
@@ -273,7 +273,7 @@ jobs:
    if: github.event_name == 'pull_request' && (needs.determine-jobs.outputs.cpp-unit-tests-run-all == 'true' || needs.determine-jobs.outputs.cpp-unit-tests-components != '[]')
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

      - name: Restore Python
        uses: ./.github/actions/restore-python
@@ -321,7 +321,7 @@ jobs:

    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          # Need history for HEAD~1 to work for checking changed files
          fetch-depth: 2
@@ -400,7 +400,7 @@ jobs:
      GH_TOKEN: ${{ github.token }}
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          # Need history for HEAD~1 to work for checking changed files
          fetch-depth: 2
@@ -489,7 +489,7 @@ jobs:

    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          # Need history for HEAD~1 to work for checking changed files
          fetch-depth: 2
@@ -577,7 +577,7 @@ jobs:
          version: 1.0

      - name: Check out code from GitHub
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      - name: Restore Python
        uses: ./.github/actions/restore-python
        with:
@@ -662,7 +662,7 @@ jobs:
    if: github.event_name == 'pull_request' && !startsWith(github.base_ref, 'beta') && !startsWith(github.base_ref, 'release')
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      - name: Restore Python
        uses: ./.github/actions/restore-python
        with:
@@ -688,7 +688,7 @@ jobs:
      skip: ${{ steps.check-script.outputs.skip }}
    steps:
      - name: Check out target branch
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          ref: ${{ github.base_ref }}

@@ -840,7 +840,7 @@ jobs:
      flash_usage: ${{ steps.extract.outputs.flash_usage }}
    steps:
      - name: Check out PR branch
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      - name: Restore Python
        uses: ./.github/actions/restore-python
        with:
@@ -908,7 +908,7 @@ jobs:
      GH_TOKEN: ${{ github.token }}
    steps:
      - name: Check out code
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      - name: Restore Python
        uses: ./.github/actions/restore-python
        with:
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -54,11 +54,11 @@ jobs:
            # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
    steps:
      - name: Checkout repository
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
+        uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
        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@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
+        uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
        with:
          category: "/language:${{matrix.language}}"
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
      branch_build: ${{ steps.tag.outputs.branch_build }}
      deploy_env: ${{ steps.tag.outputs.deploy_env }}
    steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      - name: Get tag
        id: tag
        # yamllint disable rule:line-length
@@ -60,7 +60,7 @@ jobs:
      contents: read
      id-token: write
    steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      - name: Set up Python
        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
@@ -92,7 +92,7 @@ jobs:
            os: "ubuntu-24.04-arm"

    steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      - name: Set up Python
        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
@@ -168,7 +168,7 @@ jobs:
          - ghcr
          - dockerhub
    steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

      - name: Download digests
        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
--- a/.github/workflows/sync-device-classes.yml
+++ b/.github/workflows/sync-device-classes.yml
@@ -13,10 +13,10 @@ jobs:
    if: github.repository == 'esphome/esphome'
    steps:
      - name: Checkout
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

      - name: Checkout Home Assistant
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          repository: home-assistant/core
          path: lib/home-assistant
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -11,7 +11,7 @@ ci:
 repos:
  - repo: https://github.com/astral-sh/ruff-pre-commit
    # Ruff version.
-    rev: v0.14.5
+    rev: v0.14.4
    hooks:
      # Run the linter.
      - id: ruff
--- a/2
+++ b/2
@@ -202,7 +202,6 @@ esphome/components/havells_solar/* @sourabhjaiswal
 esphome/components/hbridge/fan/* @WeekendWarrior
 esphome/components/hbridge/light/* @DotNetDann
 esphome/components/hbridge/switch/* @dwmw2
-esphome/components/hc8/* @omartijn
 esphome/components/hdc2010/* @optimusprimespace @ssieb
 esphome/components/he60r/* @clydebarrow
 esphome/components/heatpumpir/* @rob-deutsch
@@ -461,7 +460,6 @@ 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/2
+++ b/2
@@ -48,7 +48,7 @@ PROJECT_NAME           = ESPHome
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 2025.12.0-dev
+PROJECT_NUMBER         = 2025.11.3

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
--- a/esphome/main.py
+++ b/esphome/main.py
@@ -1319,7 +1319,7 @@ def parse_args(argv):
        "clean-all", help="Clean all build and platform files."
    )
    parser_clean_all.add_argument(
-        "configuration", help="Your YAML configuration directory.", nargs="*"
+        "configuration", help="Your YAML file or configuration directory.", nargs="*"
    )

    parser_dashboard = subparsers.add_parser(
--- a/esphome/components/ade7953_base/ade7953_base.cpp
+++ b/esphome/components/ade7953_base/ade7953_base.cpp
@@ -25,7 +25,8 @@ void ADE7953::setup() {
    this->ade_write_8(PGA_V_8, pga_v_);
    this->ade_write_8(PGA_IA_8, pga_ia_);
    this->ade_write_8(PGA_IB_8, pga_ib_);
-    this->ade_write_32(AVGAIN_32, vgain_);
+    this->ade_write_32(AVGAIN_32, avgain_);
+    this->ade_write_32(BVGAIN_32, bvgain_);
    this->ade_write_32(AIGAIN_32, aigain_);
    this->ade_write_32(BIGAIN_32, bigain_);
    this->ade_write_32(AWGAIN_32, awgain_);
@@ -34,7 +35,8 @@ void ADE7953::setup() {
    this->ade_read_8(PGA_V_8, &pga_v_);
    this->ade_read_8(PGA_IA_8, &pga_ia_);
    this->ade_read_8(PGA_IB_8, &pga_ib_);
-    this->ade_read_32(AVGAIN_32, &vgain_);
+    this->ade_read_32(AVGAIN_32, &avgain_);
+    this->ade_read_32(BVGAIN_32, &bvgain_);
    this->ade_read_32(AIGAIN_32, &aigain_);
    this->ade_read_32(BIGAIN_32, &bigain_);
    this->ade_read_32(AWGAIN_32, &awgain_);
@@ -63,13 +65,14 @@ void ADE7953::dump_config() {
                "  PGA_V_8: 0x%X\n"
                "  PGA_IA_8: 0x%X\n"
                "  PGA_IB_8: 0x%X\n"
-                "  VGAIN_32: 0x%08jX\n"
+                "  AVGAIN_32: 0x%08jX\n"
+                "  BVGAIN_32: 0x%08jX\n"
                "  AIGAIN_32: 0x%08jX\n"
                "  BIGAIN_32: 0x%08jX\n"
                "  AWGAIN_32: 0x%08jX\n"
                "  BWGAIN_32: 0x%08jX",
-                this->use_acc_energy_regs_, pga_v_, pga_ia_, pga_ib_, (uintmax_t) vgain_, (uintmax_t) aigain_,
-                (uintmax_t) bigain_, (uintmax_t) awgain_, (uintmax_t) bwgain_);
+                this->use_acc_energy_regs_, pga_v_, pga_ia_, pga_ib_, (uintmax_t) avgain_, (uintmax_t) bvgain_,
+                (uintmax_t) aigain_, (uintmax_t) bigain_, (uintmax_t) awgain_, (uintmax_t) bwgain_);
 }

 #define ADE_PUBLISH_(name, val, factor) \
--- a/esphome/components/ade7953_base/ade7953_base.h
+++ b/esphome/components/ade7953_base/ade7953_base.h
@@ -46,7 +46,12 @@ class ADE7953 : public PollingComponent, public sensor::Sensor {
  void set_pga_ib(uint8_t pga_ib) { pga_ib_ = pga_ib; }

  // Set input gains
-  void set_vgain(uint32_t vgain) { vgain_ = vgain; }
+  void set_vgain(uint32_t vgain) {
+    // Datasheet says: "to avoid discrepancies in other registers,
+    // if AVGAIN is set then BVGAIN should be set to the same value."
+    avgain_ = vgain;
+    bvgain_ = vgain;
+  }
  void set_aigain(uint32_t aigain) { aigain_ = aigain; }
  void set_bigain(uint32_t bigain) { bigain_ = bigain; }
  void set_awgain(uint32_t awgain) { awgain_ = awgain; }
@@ -100,7 +105,8 @@ class ADE7953 : public PollingComponent, public sensor::Sensor {
  uint8_t pga_v_;
  uint8_t pga_ia_;
  uint8_t pga_ib_;
-  uint32_t vgain_;
+  uint32_t avgain_;
+  uint32_t bvgain_;
  uint32_t aigain_;
  uint32_t bigain_;
  uint32_t awgain_;
--- a/esphome/components/analog_threshold/analog_threshold_binary_sensor.cpp
+++ b/esphome/components/analog_threshold/analog_threshold_binary_sensor.cpp
@@ -12,10 +12,11 @@ void AnalogThresholdBinarySensor::setup() {
  // TRUE state is defined to be when sensor is >= threshold
  // so when undefined sensor value initialize to FALSE
  if (std::isnan(sensor_value)) {
+    this->raw_state_ = false;
    this->publish_initial_state(false);
  } else {
-    this->publish_initial_state(sensor_value >=
-                                (this->lower_threshold_.value() + this->upper_threshold_.value()) / 2.0f);
+    this->raw_state_ = sensor_value >= (this->lower_threshold_.value() + this->upper_threshold_.value()) / 2.0f;
+    this->publish_initial_state(this->raw_state_);
  }
 }

@@ -25,8 +26,10 @@ void AnalogThresholdBinarySensor::set_sensor(sensor::Sensor *analog_sensor) {
  this->sensor_->add_on_state_callback([this](float sensor_value) {
    // if there is an invalid sensor reading, ignore the change and keep the current state
    if (!std::isnan(sensor_value)) {
-      this->publish_state(sensor_value >=
-                          (this->state ? this->lower_threshold_.value() : this->upper_threshold_.value()));
+      // Use raw_state_ for hysteresis logic, not this->state which is post-filter
+      this->raw_state_ =
+          sensor_value >= (this->raw_state_ ? this->lower_threshold_.value() : this->upper_threshold_.value());
+      this->publish_state(this->raw_state_);
    }
  });
 }
--- a/esphome/components/analog_threshold/analog_threshold_binary_sensor.h
+++ b/esphome/components/analog_threshold/analog_threshold_binary_sensor.h
@@ -20,6 +20,7 @@ class AnalogThresholdBinarySensor : public Component, public binary_sensor::Bina
  sensor::Sensor *sensor_{nullptr};
  TemplatableValue<float> upper_threshold_{};
  TemplatableValue<float> lower_threshold_{};
+  bool raw_state_{false};  // Pre-filter state for hysteresis logic
 };

 }  // namespace analog_threshold
--- 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, "%" PRIu64, value);
+  snprintf(buffer, 64, "%llu", value);
  append_with_newline(out, buffer);
 }

--- a/esphome/components/binary_sensor/automation.cpp
+++ b/esphome/components/binary_sensor/automation.cpp
@@ -1,11 +1,12 @@
 #include "automation.h"
 #include "esphome/core/log.h"

-namespace esphome::binary_sensor {
+namespace esphome {
+namespace binary_sensor {

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

-void MultiClickTrigger::on_state_(bool state) {
+void binary_sensor::MultiClickTrigger::on_state_(bool state) {
  // Handle duplicate events
  if (state == this->last_state_) {
    return;
@@ -66,7 +67,7 @@ void MultiClickTrigger::on_state_(bool state) {

  *this->at_index_ = *this->at_index_ + 1;
 }
-void MultiClickTrigger::schedule_cooldown_() {
+void binary_sensor::MultiClickTrigger::schedule_cooldown_() {
  ESP_LOGV(TAG, "Multi Click: Invalid length of press, starting cooldown of %" PRIu32 " ms", this->invalid_cooldown_);
  this->is_in_cooldown_ = true;
  this->set_timeout("cooldown", this->invalid_cooldown_, [this]() {
@@ -78,7 +79,7 @@ void MultiClickTrigger::schedule_cooldown_() {
  this->cancel_timeout("is_valid");
  this->cancel_timeout("is_not_valid");
 }
-void MultiClickTrigger::schedule_is_valid_(uint32_t min_length) {
+void binary_sensor::MultiClickTrigger::schedule_is_valid_(uint32_t min_length) {
  if (min_length == 0) {
    this->is_valid_ = true;
    return;
@@ -89,19 +90,19 @@ void MultiClickTrigger::schedule_is_valid_(uint32_t min_length) {
    this->is_valid_ = true;
  });
 }
-void MultiClickTrigger::schedule_is_not_valid_(uint32_t max_length) {
+void binary_sensor::MultiClickTrigger::schedule_is_not_valid_(uint32_t max_length) {
  this->set_timeout("is_not_valid", max_length, [this]() {
    ESP_LOGV(TAG, "Multi Click: You waited too long to %s.", this->parent_->state ? "RELEASE" : "PRESS");
    this->is_valid_ = false;
    this->schedule_cooldown_();
  });
 }
-void MultiClickTrigger::cancel() {
+void binary_sensor::MultiClickTrigger::cancel() {
  ESP_LOGV(TAG, "Multi Click: Sequence explicitly cancelled.");
  this->is_valid_ = false;
  this->schedule_cooldown_();
 }
-void MultiClickTrigger::trigger_() {
+void binary_sensor::MultiClickTrigger::trigger_() {
  ESP_LOGV(TAG, "Multi Click: Hooray, multi click is valid. Triggering!");
  this->at_index_.reset();
  this->cancel_timeout("trigger");
@@ -117,4 +118,5 @@ bool match_interval(uint32_t min_length, uint32_t max_length, uint32_t length) {
    return length >= min_length && length <= max_length;
  }
 }
-}  // namespace esphome::binary_sensor
+}  // namespace binary_sensor
+}  // namespace esphome
--- a/esphome/components/binary_sensor/automation.h
+++ b/esphome/components/binary_sensor/automation.h
@@ -9,7 +9,8 @@
 #include "esphome/core/helpers.h"
 #include "esphome/components/binary_sensor/binary_sensor.h"

-namespace esphome::binary_sensor {
+namespace esphome {
+namespace binary_sensor {

 struct MultiClickTriggerEvent {
  bool state;
@@ -171,4 +172,5 @@ template<typename... Ts> class BinarySensorInvalidateAction : public Action<Ts..
  BinarySensor *sensor_;
 };

-}  // namespace esphome::binary_sensor
+}  // namespace binary_sensor
+}  // namespace esphome
--- a/esphome/components/binary_sensor/binary_sensor.cpp
+++ b/esphome/components/binary_sensor/binary_sensor.cpp
@@ -3,7 +3,9 @@
 #include "esphome/core/controller_registry.h"
 #include "esphome/core/log.h"

-namespace esphome::binary_sensor {
+namespace esphome {
+
+namespace binary_sensor {

 static const char *const TAG = "binary_sensor";

@@ -61,4 +63,6 @@ void BinarySensor::add_filters(std::initializer_list<Filter *> filters) {
 }
 bool BinarySensor::is_status_binary_sensor() const { return false; }

-}  // namespace esphome::binary_sensor
+}  // namespace binary_sensor
+
+}  // namespace esphome
--- a/esphome/components/binary_sensor/binary_sensor.h
+++ b/esphome/components/binary_sensor/binary_sensor.h
@@ -6,7 +6,9 @@

 #include <initializer_list>

-namespace esphome::binary_sensor {
+namespace esphome {
+
+namespace binary_sensor {

 class BinarySensor;
 void log_binary_sensor(const char *tag, const char *prefix, const char *type, BinarySensor *obj);
@@ -68,4 +70,5 @@ class BinarySensorInitiallyOff : public BinarySensor {
  bool has_state() const override { return true; }
 };

-}  // namespace esphome::binary_sensor
+}  // namespace binary_sensor
+}  // namespace esphome
--- a/esphome/components/binary_sensor/filter.cpp
+++ b/esphome/components/binary_sensor/filter.cpp
@@ -2,7 +2,9 @@

 #include "binary_sensor.h"

-namespace esphome::binary_sensor {
+namespace esphome {
+
+namespace binary_sensor {

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

@@ -130,4 +132,6 @@ optional<bool> SettleFilter::new_value(bool value) {

 float SettleFilter::get_setup_priority() const { return setup_priority::HARDWARE; }

-}  // namespace esphome::binary_sensor
+}  // namespace binary_sensor
+
+}  // namespace esphome
--- a/esphome/components/binary_sensor/filter.h
+++ b/esphome/components/binary_sensor/filter.h
@@ -4,7 +4,9 @@
 #include "esphome/core/component.h"
 #include "esphome/core/helpers.h"

-namespace esphome::binary_sensor {
+namespace esphome {
+
+namespace binary_sensor {

 class BinarySensor;

@@ -137,4 +139,6 @@ class SettleFilter : public Filter, public Component {
  bool steady_{true};
 };

-}  // namespace esphome::binary_sensor
+}  // namespace binary_sensor
+
+}  // namespace esphome
--- a/esphome/components/bme68x_bsec2/bme68x_bsec2.cpp
+++ b/esphome/components/bme68x_bsec2/bme68x_bsec2.cpp
@@ -70,9 +70,6 @@ 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/captive_portal.cpp
+++ b/esphome/components/captive_portal/captive_portal.cpp
@@ -13,16 +13,14 @@ static const char *const TAG = "captive_portal";
 void CaptivePortal::handle_config(AsyncWebServerRequest *request) {
  AsyncResponseStream *stream = request->beginResponseStream(ESPHOME_F("application/json"));
  stream->addHeader(ESPHOME_F("cache-control"), ESPHOME_F("public, max-age=0, must-revalidate"));
-  char mac_s[18];
-  const char *mac_str = get_mac_address_pretty_into_buffer(mac_s);
 #ifdef USE_ESP8266
  stream->print(ESPHOME_F("{\"mac\":\""));
-  stream->print(mac_str);
+  stream->print(get_mac_address_pretty().c_str());
  stream->print(ESPHOME_F("\",\"name\":\""));
  stream->print(App.get_name().c_str());
  stream->print(ESPHOME_F("\",\"aps\":[{}"));
 #else
-  stream->printf(R"({"mac":"%s","name":"%s","aps":[{})", mac_str, App.get_name().c_str());
+  stream->printf(R"({"mac":"%s","name":"%s","aps":[{})", get_mac_address_pretty().c_str(), App.get_name().c_str());
 #endif

  for (auto &scan : wifi::global_wifi_component->get_scan_result()) {
--- a/esphome/components/climate_ir/init.py
+++ b/esphome/components/climate_ir/init.py
@@ -3,12 +3,7 @@ import logging
 import esphome.codegen as cg
 from esphome.components import climate, remote_base, sensor
 import esphome.config_validation as cv
-from esphome.const import (
-    CONF_HUMIDITY_SENSOR,
-    CONF_SENSOR,
-    CONF_SUPPORTS_COOL,
-    CONF_SUPPORTS_HEAT,
-)
+from esphome.const import CONF_SENSOR, CONF_SUPPORTS_COOL, CONF_SUPPORTS_HEAT
 from esphome.cpp_generator import MockObjClass

 _LOGGER = logging.getLogger(__name__)
@@ -37,7 +32,6 @@ def climate_ir_schema(
                cv.Optional(CONF_SUPPORTS_COOL, default=True): cv.boolean,
                cv.Optional(CONF_SUPPORTS_HEAT, default=True): cv.boolean,
                cv.Optional(CONF_SENSOR): cv.use_id(sensor.Sensor),
-                cv.Optional(CONF_HUMIDITY_SENSOR): cv.use_id(sensor.Sensor),
            }
        )
        .extend(cv.COMPONENT_SCHEMA)
@@ -67,9 +61,6 @@ async def register_climate_ir(var, config):
    if sensor_id := config.get(CONF_SENSOR):
        sens = await cg.get_variable(sensor_id)
        cg.add(var.set_sensor(sens))
-    if sensor_id := config.get(CONF_HUMIDITY_SENSOR):
-        sens = await cg.get_variable(sensor_id)
-        cg.add(var.set_humidity_sensor(sens))


 async def new_climate_ir(config, *args):
--- a/esphome/components/climate_ir/climate_ir.cpp
+++ b/esphome/components/climate_ir/climate_ir.cpp
@@ -11,9 +11,7 @@ climate::ClimateTraits ClimateIR::traits() {
  if (this->sensor_ != nullptr) {
    traits.add_feature_flags(climate::CLIMATE_SUPPORTS_CURRENT_TEMPERATURE);
  }
-  if (this->humidity_sensor_ != nullptr) {
-    traits.add_feature_flags(climate::CLIMATE_SUPPORTS_CURRENT_HUMIDITY);
-  }
+
  traits.set_supported_modes({climate::CLIMATE_MODE_OFF, climate::CLIMATE_MODE_HEAT_COOL});
  if (this->supports_cool_)
    traits.add_supported_mode(climate::CLIMATE_MODE_COOL);
@@ -41,16 +39,9 @@ void ClimateIR::setup() {
      this->publish_state();
    });
    this->current_temperature = this->sensor_->state;
+  } else {
+    this->current_temperature = NAN;
  }
-  if (this->humidity_sensor_ != nullptr) {
-    this->humidity_sensor_->add_on_state_callback([this](float state) {
-      this->current_humidity = state;
-      // current humidity changed, publish state
-      this->publish_state();
-    });
-    this->current_humidity = this->humidity_sensor_->state;
-  }
-
  // restore set points
  auto restore = this->restore_state_();
  if (restore.has_value()) {
--- a/esphome/components/climate_ir/climate_ir.h
+++ b/esphome/components/climate_ir/climate_ir.h
@@ -43,7 +43,6 @@ class ClimateIR : public Component,
  void set_supports_cool(bool supports_cool) { this->supports_cool_ = supports_cool; }
  void set_supports_heat(bool supports_heat) { this->supports_heat_ = supports_heat; }
  void set_sensor(sensor::Sensor *sensor) { this->sensor_ = sensor; }
-  void set_humidity_sensor(sensor::Sensor *sensor) { this->humidity_sensor_ = sensor; }

 protected:
  float minimum_temperature_, maximum_temperature_, temperature_step_;
@@ -68,7 +67,6 @@ class ClimateIR : public Component,
  climate::ClimatePresetMask presets_{};

  sensor::Sensor *sensor_{nullptr};
-  sensor::Sensor *humidity_sensor_{nullptr};
 };

 }  // namespace climate_ir
--- a/esphome/components/cover/automation.h
+++ b/esphome/components/cover/automation.h
@@ -4,7 +4,8 @@
 #include "esphome/core/automation.h"
 #include "cover.h"

-namespace esphome::cover {
+namespace esphome {
+namespace cover {

 template<typename... Ts> class OpenAction : public Action<Ts...> {
 public:
@@ -130,4 +131,5 @@ class CoverClosedTrigger : public Trigger<> {
  }
 };

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

 #include "esphome/core/log.h"

-namespace esphome::cover {
+namespace esphome {
+namespace cover {

 static const char *const TAG = "cover";

@@ -211,4 +212,5 @@ void CoverRestoreState::apply(Cover *cover) {
  cover->publish_state();
 }

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

 #include "cover_traits.h"

-namespace esphome::cover {
+namespace esphome {
+namespace cover {

 const extern float COVER_OPEN;
 const extern float COVER_CLOSED;
@@ -156,4 +157,5 @@ class Cover : public EntityBase, public EntityBase_DeviceClass {
  ESPPreferenceObject rtc_;
 };

-}  // namespace esphome::cover
+}  // namespace cover
+}  // namespace esphome
--- a/esphome/components/cover/cover_traits.h
+++ b/esphome/components/cover/cover_traits.h
@@ -1,6 +1,7 @@
 #pragma once

-namespace esphome::cover {
+namespace esphome {
+namespace cover {

 class CoverTraits {
 public:
@@ -25,4 +26,5 @@ class CoverTraits {
  bool supports_stop_{false};
 };

-}  // namespace esphome::cover
+}  // namespace cover
+}  // namespace esphome
--- a/esphome/components/cst816/touchscreen/cst816_touchscreen.cpp
+++ b/esphome/components/cst816/touchscreen/cst816_touchscreen.cpp
@@ -19,7 +19,8 @@ void CST816Touchscreen::continue_setup_() {
      case CST816T_CHIP_ID:
        break;
      default:
-        this->status_set_error(str_sprintf("Unknown chip ID 0x%02X", this->chip_id_));
+        ESP_LOGE(TAG, "Unknown chip ID: 0x%02X", this->chip_id_);
+        this->status_set_error("Unknown chip ID");
        this->mark_failed();
        return;
    }
--- a/esphome/components/dashboard_import/dashboard_import.cpp
+++ b/esphome/components/dashboard_import/dashboard_import.cpp
@@ -3,10 +3,10 @@
 namespace esphome {
 namespace dashboard_import {

-static const char *g_package_import_url = "";  // NOLINT
+static std::string g_package_import_url;  // NOLINT

-const char *get_package_import_url() { return g_package_import_url; }
-void set_package_import_url(const char *url) { g_package_import_url = url; }
+const std::string &get_package_import_url() { return g_package_import_url; }
+void set_package_import_url(std::string url) { g_package_import_url = std::move(url); }

 }  // namespace dashboard_import
 }  // namespace esphome
--- a/esphome/components/dashboard_import/dashboard_import.h
+++ b/esphome/components/dashboard_import/dashboard_import.h
@@ -1,10 +1,12 @@
 #pragma once

+#include <string>
+
 namespace esphome {
 namespace dashboard_import {

-const char *get_package_import_url();
-void set_package_import_url(const char *url);
+const std::string &get_package_import_url();
+void set_package_import_url(std::string url);

 }  // namespace dashboard_import
 }  // namespace esphome
--- a/esphome/components/esp32/init.py
+++ b/esphome/components/esp32/init.py
@@ -854,6 +854,10 @@ def _configure_lwip_max_sockets(conf: dict) -> None:
 async def to_code(config):
    cg.add_platformio_option("board", config[CONF_BOARD])
    cg.add_platformio_option("board_upload.flash_size", config[CONF_FLASH_SIZE])
+    cg.add_platformio_option(
+        "board_upload.maximum_size",
+        int(config[CONF_FLASH_SIZE].removesuffix("MB")) * 1024 * 1024,
+    )
    cg.set_cpp_standard("gnu++20")
    cg.add_build_flag("-DUSE_ESP32")
    cg.add_define("ESPHOME_BOARD", config[CONF_BOARD])
@@ -883,6 +887,12 @@ async def to_code(config):
        CORE.relative_internal_path(".espressif")
    )

+    add_extra_script(
+        "pre",
+        "pre_build.py",
+        Path(__file__).parent / "pre_build.py.script",
+    )
+
    add_extra_script(
        "post",
        "post_build.py",
--- a/esphome/components/esp32/pre_build.py.script
+++ b/esphome/components/esp32/pre_build.py.script
@@ -0,0 +1,9 @@
+Import("env")  # noqa: F821
+
+# Remove custom_sdkconfig from the board config as it causes
+# pioarduino to enable some strange hybrid build mode that breaks IDF
+board = env.BoardConfig()
+if "espidf.custom_sdkconfig" in board:
+    del board._manifest["espidf"]["custom_sdkconfig"]
+    if not board._manifest["espidf"]:
+        del board._manifest["espidf"]
--- a/esphome/components/esp32_ble/ble.cpp
+++ b/esphome/components/esp32_ble/ble.cpp
@@ -634,13 +634,11 @@ void ESP32BLE::dump_config() {
        io_capability_s = "invalid";
        break;
    }
-    char mac_s[18];
-    format_mac_addr_upper(mac_address, mac_s);
    ESP_LOGCONFIG(TAG,
                  "BLE:\n"
                  "  MAC address: %s\n"
                  "  IO Capability: %s",
-                  mac_s, io_capability_s);
+                  format_mac_address_pretty(mac_address).c_str(), io_capability_s);
  } else {
    ESP_LOGCONFIG(TAG, "Bluetooth stack is not enabled");
  }
--- a/esphome/components/esp32_hosted/update/esp32_hosted_update.cpp
+++ b/esphome/components/esp32_hosted/update/esp32_hosted_update.cpp
@@ -22,6 +22,11 @@ constexpr size_t CHUNK_SIZE = 1500;
 void Esp32HostedUpdate::setup() {
  this->update_info_.title = "ESP32 Hosted Coprocessor";

+  // if wifi is not present, connect to the coprocessor
+#ifndef USE_WIFI
+  esp_hosted_connect_to_slave();  // NOLINT
+#endif
+
  // get coprocessor version
  esp_hosted_coprocessor_fwver_t ver_info;
  if (esp_hosted_get_coprocessor_fwversion(&ver_info) == ESP_OK) {
--- a/esphome/components/esp_ldo/esp_ldo.cpp
+++ b/esphome/components/esp_ldo/esp_ldo.cpp
@@ -14,8 +14,8 @@ void EspLdo::setup() {
  config.flags.adjustable = this->adjustable_;
  auto err = esp_ldo_acquire_channel(&config, &this->handle_);
  if (err != ESP_OK) {
-    auto msg = str_sprintf("Failed to acquire LDO channel %d with voltage %fV", this->channel_, this->voltage_);
-    this->mark_failed(msg.c_str());
+    ESP_LOGE(TAG, "Failed to acquire LDO channel %d with voltage %fV", this->channel_, this->voltage_);
+    this->mark_failed("Failed to acquire LDO channel");
  } else {
    ESP_LOGD(TAG, "Acquired LDO channel %d with voltage %fV", this->channel_, this->voltage_);
  }
--- a/esphome/components/espnow/espnow_component.cpp
+++ b/esphome/components/espnow/espnow_component.cpp
@@ -10,6 +10,7 @@

 #include <esp_event.h>
 #include <esp_mac.h>
+#include <esp_netif.h>
 #include <esp_now.h>
 #include <esp_random.h>
 #include <esp_wifi.h>
@@ -157,6 +158,12 @@ bool ESPNowComponent::is_wifi_enabled() {
 }

 void ESPNowComponent::setup() {
+#ifndef USE_WIFI
+  // Initialize LwIP stack for wake_loop_threadsafe() socket support
+  // When WiFi component is present, it handles esp_netif_init()
+  ESP_ERROR_CHECK(esp_netif_init());
+#endif
+
  if (this->enable_on_boot_) {
    this->enable_();
  } else {
--- a/esphome/components/font/init.py
+++ b/esphome/components/font/init.py
@@ -36,6 +36,7 @@ from esphome.const import (
    CONF_WEIGHT,
 )
 from esphome.core import CORE, HexInt
+from esphome.helpers import cpp_string_escape
 from esphome.types import ConfigType

 _LOGGER = logging.getLogger(__name__)
@@ -49,6 +50,7 @@ font_ns = cg.esphome_ns.namespace("font")

 Font = font_ns.class_("Font")
 Glyph = font_ns.class_("Glyph")
+GlyphData = font_ns.struct("GlyphData")

 CONF_BPP = "bpp"
 CONF_EXTRAS = "extras"
@@ -461,7 +463,7 @@ FONT_SCHEMA = cv.Schema(
            )
        ),
        cv.GenerateID(CONF_RAW_DATA_ID): cv.declare_id(cg.uint8),
-        cv.GenerateID(CONF_RAW_GLYPH_ID): cv.declare_id(Glyph),
+        cv.GenerateID(CONF_RAW_GLYPH_ID): cv.declare_id(GlyphData),
    },
 )

@@ -486,8 +488,6 @@ class GlyphInfo:


 def glyph_to_glyphinfo(glyph, font, size, bpp):
-    # Convert to 32 bit unicode codepoint
-    glyph = ord(glyph)
    scale = 256 // (1 << bpp)
    if not font.is_scalable:
        sizes = [pt_to_px(x.size) for x in font.available_sizes]
@@ -583,15 +583,22 @@ async def to_code(config):

    # Create the glyph table that points to data in the above array.
    glyph_initializer = [
-        [
-            x.glyph,
-            prog_arr + (y - len(x.bitmap_data)),
-            x.advance,
-            x.offset_x,
-            x.offset_y,
-            x.width,
-            x.height,
-        ]
+        cg.StructInitializer(
+            GlyphData,
+            (
+                "a_char",
+                cg.RawExpression(f"(const uint8_t *){cpp_string_escape(x.glyph)}"),
+            ),
+            (
+                "data",
+                cg.RawExpression(f"{str(prog_arr)} + {str(y - len(x.bitmap_data))}"),
+            ),
+            ("advance", x.advance),
+            ("offset_x", x.offset_x),
+            ("offset_y", x.offset_y),
+            ("width", x.width),
+            ("height", x.height),
+        )
        for (x, y) in zip(
            glyph_args, list(accumulate([len(x.bitmap_data) for x in glyph_args]))
        )
--- a/esphome/components/font/font.cpp
+++ b/esphome/components/font/font.cpp
@@ -6,245 +6,133 @@

 namespace esphome {
 namespace font {
+
 static const char *const TAG = "font";

-#ifdef USE_LVGL_FONT
-const uint8_t *Font::get_glyph_bitmap(const lv_font_t *font, uint32_t unicode_letter) {
-  auto *fe = (Font *) font->dsc;
-  const auto *gd = fe->get_glyph_data_(unicode_letter);
-  if (gd == nullptr) {
-    return nullptr;
+const uint8_t *Glyph::get_char() const { return this->glyph_data_->a_char; }
+// Compare the char at the string position with this char.
+// Return true if this char is less than or equal the other.
+bool Glyph::compare_to(const uint8_t *str) const {
+  // 1 -> this->char_
+  // 2 -> str
+  for (uint32_t i = 0;; i++) {
+    if (this->glyph_data_->a_char[i] == '\0')
+      return true;
+    if (str[i] == '\0')
+      return false;
+    if (this->glyph_data_->a_char[i] > str[i])
+      return false;
+    if (this->glyph_data_->a_char[i] < str[i])
+      return true;
  }
-  return gd->data;
+  // this should not happen
+  return false;
+}
+int Glyph::match_length(const uint8_t *str) const {
+  for (uint32_t i = 0;; i++) {
+    if (this->glyph_data_->a_char[i] == '\0')
+      return i;
+    if (str[i] != this->glyph_data_->a_char[i])
+      return 0;
+  }
+  // this should not happen
+  return 0;
+}
+void Glyph::scan_area(int *x1, int *y1, int *width, int *height) const {
+  *x1 = this->glyph_data_->offset_x;
+  *y1 = this->glyph_data_->offset_y;
+  *width = this->glyph_data_->width;
+  *height = this->glyph_data_->height;
 }

-bool Font::get_glyph_dsc_cb(const lv_font_t *font, lv_font_glyph_dsc_t *dsc, uint32_t unicode_letter, uint32_t next) {
-  auto *fe = (Font *) font->dsc;
-  const auto *gd = fe->get_glyph_data_(unicode_letter);
-  if (gd == nullptr) {
-    return false;
-  }
-  dsc->adv_w = gd->advance;
-  dsc->ofs_x = gd->offset_x;
-  dsc->ofs_y = fe->height_ - gd->height - gd->offset_y - fe->lv_font_.base_line;
-  dsc->box_w = gd->width;
-  dsc->box_h = gd->height;
-  dsc->is_placeholder = 0;
-  dsc->bpp = fe->get_bpp();
-  return true;
-}
-
-const Glyph *Font::get_glyph_data_(uint32_t unicode_letter) {
-  if (unicode_letter == this->last_letter_ && this->last_letter_ != 0)
-    return this->last_data_;
-  auto *glyph = this->find_glyph(unicode_letter);
-  if (glyph == nullptr) {
-    return nullptr;
-  }
-  this->last_data_ = glyph;
-  this->last_letter_ = unicode_letter;
-  return glyph;
-}
-#endif
-
-/**
- *  Attempt to extract a 32 bit Unicode codepoint from a UTF-8 string.
- *  If successful, return the codepoint and set the length to the number of bytes read.
- *  If the end of the string has been reached and a valid codepoint has not been found, return 0 and set the length to
- * 0.
- *
- * @param utf8_str The input string
- * @param length Pointer to length storage
- * @return The extracted code point
- */
-static uint32_t extract_unicode_codepoint(const char *utf8_str, size_t *length) {
-  // Safely cast to uint8_t* for correct bitwise operations on bytes
-  const uint8_t *current = reinterpret_cast<const uint8_t *>(utf8_str);
-  uint32_t code_point = 0;
-  uint8_t c1 = *current++;
-
-  // check for end of string
-  if (c1 == 0) {
-    *length = 0;
-    return 0;
-  }
-
-  // --- 1-Byte Sequence: 0xxxxxxx (ASCII) ---
-  if (c1 < 0x80) {
-    // Valid ASCII byte.
-    code_point = c1;
-    // Optimization: No need to check for continuation bytes.
-  }
-  // --- 2-Byte Sequence: 110xxxxx 10xxxxxx ---
-  else if ((c1 & 0xE0) == 0xC0) {
-    uint8_t c2 = *current++;
-
-    // Error Check 1: Check if c2 is a valid continuation byte (10xxxxxx)
-    if ((c2 & 0xC0) != 0x80) {
-      *length = 0;
-      return 0;
-    }
-
-    code_point = (c1 & 0x1F) << 6;
-    code_point |= (c2 & 0x3F);
-
-    // Error Check 2: Overlong check (2-byte must be > 0x7F)
-    if (code_point <= 0x7F) {
-      *length = 0;
-      return 0;
-    }
-  }
-  // --- 3-Byte Sequence: 1110xxxx 10xxxxxx 10xxxxxx ---
-  else if ((c1 & 0xF0) == 0xE0) {
-    uint8_t c2 = *current++;
-    uint8_t c3 = *current++;
-
-    // Error Check 1: Check continuation bytes
-    if (((c2 & 0xC0) != 0x80) || ((c3 & 0xC0) != 0x80)) {
-      *length = 0;
-      return 0;
-    }
-
-    code_point = (c1 & 0x0F) << 12;
-    code_point |= (c2 & 0x3F) << 6;
-    code_point |= (c3 & 0x3F);
-
-    // Error Check 2: Overlong check (3-byte must be > 0x7FF)
-    // Also check for surrogates (0xD800-0xDFFF)
-    if (code_point <= 0x7FF || (code_point >= 0xD800 && code_point <= 0xDFFF)) {
-      *length = 0;
-      return 0;
-    }
-  }
-  // --- 4-Byte Sequence: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx ---
-  else if ((c1 & 0xF8) == 0xF0) {
-    uint8_t c2 = *current++;
-    uint8_t c3 = *current++;
-    uint8_t c4 = *current++;
-
-    // Error Check 1: Check continuation bytes
-    if (((c2 & 0xC0) != 0x80) || ((c3 & 0xC0) != 0x80) || ((c4 & 0xC0) != 0x80)) {
-      *length = 0;
-      return 0;
-    }
-
-    code_point = (c1 & 0x07) << 18;
-    code_point |= (c2 & 0x3F) << 12;
-    code_point |= (c3 & 0x3F) << 6;
-    code_point |= (c4 & 0x3F);
-
-    // Error Check 2: Overlong check (4-byte must be > 0xFFFF)
-    // Also check for valid Unicode range (must be <= 0x10FFFF)
-    if (code_point <= 0xFFFF || code_point > 0x10FFFF) {
-      *length = 0;
-      return 0;
-    }
-  }
-  // --- Invalid leading byte (e.g., 10xxxxxx or 11111xxx) ---
-  else {
-    *length = 0;
-    return 0;
-  }
-  *length = current - reinterpret_cast<const uint8_t *>(utf8_str);
-  return code_point;
-}
-
-Font::Font(const Glyph *data, int data_nr, int baseline, int height, int descender, int xheight, int capheight,
+Font::Font(const GlyphData *data, int data_nr, int baseline, int height, int descender, int xheight, int capheight,
           uint8_t bpp)
-    : glyphs_(ConstVector(data, data_nr)),
-      baseline_(baseline),
+    : baseline_(baseline),
      height_(height),
      descender_(descender),
      linegap_(height - baseline - descender),
      xheight_(xheight),
      capheight_(capheight),
      bpp_(bpp) {
-#ifdef USE_LVGL_FONT
-  this->lv_font_.dsc = this;
-  this->lv_font_.line_height = this->get_height();
-  this->lv_font_.base_line = this->lv_font_.line_height - this->get_baseline();
-  this->lv_font_.get_glyph_dsc = get_glyph_dsc_cb;
-  this->lv_font_.get_glyph_bitmap = get_glyph_bitmap;
-  this->lv_font_.subpx = LV_FONT_SUBPX_NONE;
-  this->lv_font_.underline_position = -1;
-  this->lv_font_.underline_thickness = 1;
-#endif
+  glyphs_.reserve(data_nr);
+  for (int i = 0; i < data_nr; ++i)
+    glyphs_.emplace_back(&data[i]);
 }
-
-const Glyph *Font::find_glyph(uint32_t codepoint) const {
+int Font::match_next_glyph(const uint8_t *str, int *match_length) {
  int lo = 0;
  int hi = this->glyphs_.size() - 1;
  while (lo != hi) {
    int mid = (lo + hi + 1) / 2;
-    if (this->glyphs_[mid].is_less_or_equal(codepoint)) {
+    if (this->glyphs_[mid].compare_to(str)) {
      lo = mid;
    } else {
      hi = mid - 1;
    }
  }
-  auto *result = &this->glyphs_[lo];
-  if (result->code_point == codepoint)
-    return result;
-  return nullptr;
+  *match_length = this->glyphs_[lo].match_length(str);
+  if (*match_length <= 0)
+    return -1;
+  return lo;
 }
-
 #ifdef USE_DISPLAY
 void Font::measure(const char *str, int *width, int *x_offset, int *baseline, int *height) {
  *baseline = this->baseline_;
  *height = this->height_;
+  int i = 0;
  int min_x = 0;
  bool has_char = false;
  int x = 0;
-  for (;;) {
-    size_t length;
-    auto code_point = extract_unicode_codepoint(str, &length);
-    if (length == 0)
-      break;
-    str += length;
-    auto *glyph = this->find_glyph(code_point);
-    if (glyph == nullptr) {
+  while (str[i] != '\0') {
+    int match_length;
+    int glyph_n = this->match_next_glyph((const uint8_t *) str + i, &match_length);
+    if (glyph_n < 0) {
      // Unknown char, skip
-      if (!this->glyphs_.empty())
-        x += this->glyphs_[0].advance;
+      if (!this->get_glyphs().empty())
+        x += this->get_glyphs()[0].glyph_data_->advance;
+      i++;
      continue;
    }

+    const Glyph &glyph = this->glyphs_[glyph_n];
    if (!has_char) {
-      min_x = glyph->offset_x;
+      min_x = glyph.glyph_data_->offset_x;
    } else {
-      min_x = std::min(min_x, x + glyph->offset_x);
+      min_x = std::min(min_x, x + glyph.glyph_data_->offset_x);
    }
-    x += glyph->advance;
+    x += glyph.glyph_data_->advance;

+    i += match_length;
    has_char = true;
  }
  *x_offset = min_x;
  *width = x - min_x;
 }
-
 void Font::print(int x_start, int y_start, display::Display *display, Color color, const char *text, Color background) {
+  int i = 0;
  int x_at = x_start;
-  for (;;) {
-    size_t length;
-    auto code_point = extract_unicode_codepoint(text, &length);
-    if (length == 0)
-      break;
-    text += length;
-    auto *glyph = this->find_glyph(code_point);
-    if (glyph == nullptr) {
+  int scan_x1, scan_y1, scan_width, scan_height;
+  while (text[i] != '\0') {
+    int match_length;
+    int glyph_n = this->match_next_glyph((const uint8_t *) text + i, &match_length);
+    if (glyph_n < 0) {
      // Unknown char, skip
-      ESP_LOGW(TAG, "Codepoint 0x%08" PRIx32 " not found in font", code_point);
-      if (!this->glyphs_.empty()) {
-        uint8_t glyph_width = this->glyphs_[0].advance;
-        display->rectangle(x_at, y_start, glyph_width, this->height_, color);
+      ESP_LOGW(TAG, "Encountered character without representation in font: '%c'", text[i]);
+      if (!this->get_glyphs().empty()) {
+        uint8_t glyph_width = this->get_glyphs()[0].glyph_data_->advance;
+        display->filled_rectangle(x_at, y_start, glyph_width, this->height_, color);
        x_at += glyph_width;
      }
+
+      i++;
      continue;
    }

-    const uint8_t *data = glyph->data;
-    const int max_x = x_at + glyph->offset_x + glyph->width;
-    const int max_y = y_start + glyph->offset_y + glyph->height;
+    const Glyph &glyph = this->get_glyphs()[glyph_n];
+    glyph.scan_area(&scan_x1, &scan_y1, &scan_width, &scan_height);
+
+    const uint8_t *data = glyph.glyph_data_->data;
+    const int max_x = x_at + scan_x1 + scan_width;
+    const int max_y = y_start + scan_y1 + scan_height;

    uint8_t bitmask = 0;
    uint8_t pixel_data = 0;
@@ -257,10 +145,10 @@ void Font::print(int x_start, int y_start, display::Display *display, Color colo
    auto b_g = (float) background.g;
    auto b_b = (float) background.b;
    auto b_w = (float) background.w;
-    for (int glyph_y = y_start + glyph->offset_y; glyph_y != max_y; glyph_y++) {
-      for (int glyph_x = x_at + glyph->offset_x; glyph_x != max_x; glyph_x++) {
+    for (int glyph_y = y_start + scan_y1; glyph_y != max_y; glyph_y++) {
+      for (int glyph_x = x_at + scan_x1; glyph_x != max_x; glyph_x++) {
        uint8_t pixel = 0;
-        for (uint8_t bit_num = 0; bit_num != this->bpp_; bit_num++) {
+        for (int bit_num = 0; bit_num != this->bpp_; bit_num++) {
          if (bitmask == 0) {
            pixel_data = progmem_read_byte(data++);
            bitmask = 0x80;
@@ -280,9 +168,12 @@ void Font::print(int x_start, int y_start, display::Display *display, Color colo
        }
      }
    }
-    x_at += glyph->advance;
+    x_at += glyph.glyph_data_->advance;
+
+    i += match_length;
  }
 }
 #endif
+
 }  // namespace font
 }  // namespace esphome
--- a/esphome/components/font/font.h
+++ b/esphome/components/font/font.h
@@ -6,30 +6,14 @@
 #ifdef USE_DISPLAY
 #include "esphome/components/display/display.h"
 #endif
-#ifdef USE_LVGL_FONT
-#include <lvgl.h>
-#endif

 namespace esphome {
 namespace font {

 class Font;

-class Glyph {
- public:
-  constexpr Glyph(uint32_t code_point, const uint8_t *data, int advance, int offset_x, int offset_y, int width,
-                  int height)
-      : code_point(code_point),
-        data(data),
-        advance(advance),
-        offset_x(offset_x),
-        offset_y(offset_y),
-        width(width),
-        height(height) {}
-
-  bool is_less_or_equal(uint32_t other) const { return this->code_point <= other; }
-
-  const uint32_t code_point;
+struct GlyphData {
+  const uint8_t *a_char;
  const uint8_t *data;
  int advance;
  int offset_x;
@@ -38,6 +22,26 @@ class Glyph {
  int height;
 };

+class Glyph {
+ public:
+  Glyph(const GlyphData *data) : glyph_data_(data) {}
+
+  const uint8_t *get_char() const;
+
+  bool compare_to(const uint8_t *str) const;
+
+  int match_length(const uint8_t *str) const;
+
+  void scan_area(int *x1, int *y1, int *width, int *height) const;
+
+  const GlyphData *get_glyph_data() const { return this->glyph_data_; }
+
+ protected:
+  friend Font;
+
+  const GlyphData *glyph_data_;
+};
+
 class Font
 #ifdef USE_DISPLAY
    : public display::BaseFont
@@ -46,8 +50,8 @@ class Font
 public:
  /** Construct the font with the given glyphs.
   *
-   * @param data A list of glyphs, must be sorted lexicographically.
-   * @param data_nr The number of glyphs
+   * @param data A vector of glyphs, must be sorted lexicographically.
+   * @param data_nr The number of glyphs in data.
   * @param baseline The y-offset from the top of the text to the baseline.
   * @param height The y-offset from the top of the text to the bottom.
   * @param descender The y-offset from the baseline to the lowest stroke in the font (e.g. from letters like g or p).
@@ -55,10 +59,10 @@ class Font
   * @param capheight The height of capital letters, usually measured at the "X" glyph.
   * @param bpp The bits per pixel used for this font. Used to read data out of the glyph bitmaps.
   */
-  Font(const Glyph *data, int data_nr, int baseline, int height, int descender, int xheight, int capheight,
+  Font(const GlyphData *data, int data_nr, int baseline, int height, int descender, int xheight, int capheight,
       uint8_t bpp = 1);

-  const Glyph *find_glyph(uint32_t codepoint) const;
+  int match_next_glyph(const uint8_t *str, int *match_length);

 #ifdef USE_DISPLAY
  void print(int x_start, int y_start, display::Display *display, Color color, const char *text,
@@ -73,14 +77,11 @@ class Font
  inline int get_xheight() { return this->xheight_; }
  inline int get_capheight() { return this->capheight_; }
  inline int get_bpp() { return this->bpp_; }
-#ifdef USE_LVGL_FONT
-  const lv_font_t *get_lv_font() const { return &this->lv_font_; }
-#endif

-  const ConstVector<Glyph> &get_glyphs() const { return glyphs_; }
+  const std::vector<Glyph, RAMAllocator<Glyph>> &get_glyphs() const { return glyphs_; }

 protected:
-  ConstVector<Glyph> glyphs_;
+  std::vector<Glyph, RAMAllocator<Glyph>> glyphs_;
  int baseline_;
  int height_;
  int descender_;
@@ -88,14 +89,6 @@ class Font
  int xheight_;
  int capheight_;
  uint8_t bpp_;  // bits per pixel
-#ifdef USE_LVGL_FONT
-  lv_font_t lv_font_{};
-  static const uint8_t *get_glyph_bitmap(const lv_font_t *font, uint32_t unicode_letter);
-  static bool get_glyph_dsc_cb(const lv_font_t *font, lv_font_glyph_dsc_t *dsc, uint32_t unicode_letter, uint32_t next);
-  const Glyph *get_glyph_data_(uint32_t unicode_letter);
-  uint32_t last_letter_{};
-  const Glyph *last_data_{};
-#endif
 };

 }  // namespace font
--- a/esphome/components/hc8/init.py
+++ b/esphome/components/hc8/init.py
@@ -1 +0,0 @@
-CODEOWNERS = ["@omartijn"]
--- a/esphome/components/hc8/hc8.cpp
+++ b/esphome/components/hc8/hc8.cpp
@@ -1,99 +0,0 @@
-#include "hc8.h"
-#include "esphome/core/application.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-#include <array>
-
-namespace esphome::hc8 {
-
-static const char *const TAG = "hc8";
-static const std::array<uint8_t, 5> HC8_COMMAND_GET_PPM{0x64, 0x69, 0x03, 0x5E, 0x4E};
-static const std::array<uint8_t, 3> HC8_COMMAND_CALIBRATE_PREAMBLE{0x11, 0x03, 0x03};
-
-void HC8Component::setup() {
-  // send an initial query to the device, this will
-  // get it out of "active output mode", where it
-  // generates data every second
-  this->write_array(HC8_COMMAND_GET_PPM);
-  this->flush();
-
-  // ensure the buffer is empty
-  while (this->available())
-    this->read();
-}
-
-void HC8Component::update() {
-  uint32_t now_ms = App.get_loop_component_start_time();
-  uint32_t warmup_ms = this->warmup_seconds_ * 1000;
-  if (now_ms < warmup_ms) {
-    ESP_LOGW(TAG, "HC8 warming up, %" PRIu32 " s left", (warmup_ms - now_ms) / 1000);
-    this->status_set_warning();
-    return;
-  }
-
-  while (this->available())
-    this->read();
-
-  this->write_array(HC8_COMMAND_GET_PPM);
-  this->flush();
-
-  // the sensor is a bit slow in responding, so trying to
-  // read immediately after sending a query will timeout
-  this->set_timeout(50, [this]() {
-    std::array<uint8_t, 14> response;
-    if (!this->read_array(response.data(), response.size())) {
-      ESP_LOGW(TAG, "Reading data from HC8 failed!");
-      this->status_set_warning();
-      return;
-    }
-
-    if (response[0] != 0x64 || response[1] != 0x69) {
-      ESP_LOGW(TAG, "Invalid preamble from HC8!");
-      this->status_set_warning();
-      return;
-    }
-
-    if (crc16(response.data(), 12) != encode_uint16(response[13], response[12])) {
-      ESP_LOGW(TAG, "HC8 Checksum mismatch");
-      this->status_set_warning();
-      return;
-    }
-
-    this->status_clear_warning();
-
-    const uint16_t ppm = encode_uint16(response[5], response[4]);
-    ESP_LOGD(TAG, "HC8 Received CO₂=%uppm", ppm);
-    if (this->co2_sensor_ != nullptr)
-      this->co2_sensor_->publish_state(ppm);
-  });
-}
-
-void HC8Component::calibrate(uint16_t baseline) {
-  ESP_LOGD(TAG, "HC8 Calibrating baseline to %uppm", baseline);
-
-  std::array<uint8_t, 6> command{};
-  std::copy(begin(HC8_COMMAND_CALIBRATE_PREAMBLE), end(HC8_COMMAND_CALIBRATE_PREAMBLE), begin(command));
-  command[3] = baseline >> 8;
-  command[4] = baseline;
-  command[5] = 0;
-
-  // the last byte is a checksum over the data
-  for (uint8_t i = 0; i < 5; ++i)
-    command[5] -= command[i];
-
-  this->write_array(command);
-  this->flush();
-}
-
-float HC8Component::get_setup_priority() const { return setup_priority::DATA; }
-
-void HC8Component::dump_config() {
-  ESP_LOGCONFIG(TAG, "HC8:");
-  LOG_SENSOR("  ", "CO2", this->co2_sensor_);
-  this->check_uart_settings(9600);
-
-  ESP_LOGCONFIG(TAG, "  Warmup time: %" PRIu32 " s", this->warmup_seconds_);
-}
-
-}  // namespace esphome::hc8
--- a/esphome/components/hc8/hc8.h
+++ b/esphome/components/hc8/hc8.h
@@ -1,37 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/automation.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/uart/uart.h"
-
-#include <cinttypes>
-
-namespace esphome::hc8 {
-
-class HC8Component : public PollingComponent, public uart::UARTDevice {
- public:
-  float get_setup_priority() const override;
-
-  void setup() override;
-  void update() override;
-  void dump_config() override;
-
-  void calibrate(uint16_t baseline);
-
-  void set_co2_sensor(sensor::Sensor *co2_sensor) { co2_sensor_ = co2_sensor; }
-  void set_warmup_seconds(uint32_t seconds) { warmup_seconds_ = seconds; }
-
- protected:
-  sensor::Sensor *co2_sensor_{nullptr};
-  uint32_t warmup_seconds_{0};
-};
-
-template<typename... Ts> class HC8CalibrateAction : public Action<Ts...>, public Parented<HC8Component> {
- public:
-  TEMPLATABLE_VALUE(uint16_t, baseline)
-
-  void play(const Ts &...x) override { this->parent_->calibrate(this->baseline_.value(x...)); }
-};
-
-}  // namespace esphome::hc8
--- a/esphome/components/hc8/sensor.py
+++ b/esphome/components/hc8/sensor.py
@@ -1,79 +0,0 @@
-from esphome import automation
-import esphome.codegen as cg
-from esphome.components import sensor, uart
-import esphome.config_validation as cv
-from esphome.const import (
-    CONF_BASELINE,
-    CONF_CO2,
-    CONF_ID,
-    DEVICE_CLASS_CARBON_DIOXIDE,
-    ICON_MOLECULE_CO2,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_PARTS_PER_MILLION,
-)
-
-DEPENDENCIES = ["uart"]
-
-CONF_WARMUP_TIME = "warmup_time"
-
-hc8_ns = cg.esphome_ns.namespace("hc8")
-HC8Component = hc8_ns.class_("HC8Component", cg.PollingComponent, uart.UARTDevice)
-HC8CalibrateAction = hc8_ns.class_("HC8CalibrateAction", automation.Action)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(HC8Component),
-            cv.Optional(CONF_CO2): sensor.sensor_schema(
-                unit_of_measurement=UNIT_PARTS_PER_MILLION,
-                icon=ICON_MOLECULE_CO2,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_CARBON_DIOXIDE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(
-                CONF_WARMUP_TIME, default="75s"
-            ): cv.positive_time_period_seconds,
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(uart.UART_DEVICE_SCHEMA)
-)
-
-FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
-    "hc8",
-    baud_rate=9600,
-    require_rx=True,
-    require_tx=True,
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await uart.register_uart_device(var, config)
-
-    if co2 := config.get(CONF_CO2):
-        sens = await sensor.new_sensor(co2)
-        cg.add(var.set_co2_sensor(sens))
-
-    cg.add(var.set_warmup_seconds(config[CONF_WARMUP_TIME]))
-
-
-CALIBRATION_ACTION_SCHEMA = cv.Schema(
-    {
-        cv.Required(CONF_ID): cv.use_id(HC8Component),
-        cv.Required(CONF_BASELINE): cv.templatable(cv.uint16_t),
-    }
-)
-
-
-@automation.register_action(
-    "hc8.calibrate", HC8CalibrateAction, CALIBRATION_ACTION_SCHEMA
-)
-async def hc8_calibration_to_code(config, action_id, template_arg, args):
-    var = cg.new_Pvariable(action_id, template_arg)
-    await cg.register_parented(var, config[CONF_ID])
-    template_ = await cg.templatable(config[CONF_BASELINE], args, cg.uint16)
-    cg.add(var.set_baseline(template_))
-    return var
--- a/esphome/components/hlk_fm22x/hlk_fm22x.h
+++ b/esphome/components/hlk_fm22x/hlk_fm22x.h
@@ -189,7 +189,7 @@ template<typename... Ts> class EnrollmentAction : public Action<Ts...>, public P
  TEMPLATABLE_VALUE(std::string, name)
  TEMPLATABLE_VALUE(uint8_t, direction)

-  void play(Ts... x) override {
+  void play(const Ts &...x) override {
    auto name = this->name_.value(x...);
    auto direction = (HlkFm22xFaceDirection) this->direction_.value(x...);
    this->parent_->enroll_face(name, direction);
@@ -200,7 +200,7 @@ template<typename... Ts> class DeleteAction : public Action<Ts...>, public Paren
 public:
  TEMPLATABLE_VALUE(int16_t, face_id)

-  void play(Ts... x) override {
+  void play(const Ts &...x) override {
    auto face_id = this->face_id_.value(x...);
    this->parent_->delete_face(face_id);
  }
@@ -208,17 +208,17 @@ template<typename... Ts> class DeleteAction : public Action<Ts...>, public Paren

 template<typename... Ts> class DeleteAllAction : public Action<Ts...>, public Parented<HlkFm22xComponent> {
 public:
-  void play(Ts... x) override { this->parent_->delete_all_faces(); }
+  void play(const Ts &...x) override { this->parent_->delete_all_faces(); }
 };

 template<typename... Ts> class ScanAction : public Action<Ts...>, public Parented<HlkFm22xComponent> {
 public:
-  void play(Ts... x) override { this->parent_->scan_face(); }
+  void play(const Ts &...x) override { this->parent_->scan_face(); }
 };

 template<typename... Ts> class ResetAction : public Action<Ts...>, public Parented<HlkFm22xComponent> {
 public:
-  void play(Ts... x) override { this->parent_->reset(); }
+  void play(const Ts &...x) override { this->parent_->reset(); }
 };

 }  // namespace esphome::hlk_fm22x
--- a/esphome/components/http_request/update/http_request_update.cpp
+++ b/esphome/components/http_request/update/http_request_update.cpp
@@ -49,18 +49,18 @@ void HttpRequestUpdate::update_task(void *params) {
  auto container = this_update->request_parent_->get(this_update->source_url_);

  if (container == nullptr || container->status_code != HTTP_STATUS_OK) {
-    std::string msg = str_sprintf("Failed to fetch manifest from %s", this_update->source_url_.c_str());
+    ESP_LOGE(TAG, "Failed to fetch manifest from %s", this_update->source_url_.c_str());
    // Defer to main loop to avoid race condition on component_state_ read-modify-write
-    this_update->defer([this_update, msg]() { this_update->status_set_error(msg); });
+    this_update->defer([this_update]() { this_update->status_set_error("Failed to fetch manifest"); });
    UPDATE_RETURN;
  }

  RAMAllocator<uint8_t> allocator;
  uint8_t *data = allocator.allocate(container->content_length);
  if (data == nullptr) {
-    std::string msg = str_sprintf("Failed to allocate %zu bytes for manifest", container->content_length);
+    ESP_LOGE(TAG, "Failed to allocate %zu bytes for manifest", container->content_length);
    // Defer to main loop to avoid race condition on component_state_ read-modify-write
-    this_update->defer([this_update, msg]() { this_update->status_set_error(msg); });
+    this_update->defer([this_update]() { this_update->status_set_error("Failed to allocate memory for manifest"); });
    container->end();
    UPDATE_RETURN;
  }
@@ -121,9 +121,9 @@ void HttpRequestUpdate::update_task(void *params) {
  }

  if (!valid) {
-    std::string msg = str_sprintf("Failed to parse JSON from %s", this_update->source_url_.c_str());
+    ESP_LOGE(TAG, "Failed to parse JSON from %s", this_update->source_url_.c_str());
    // Defer to main loop to avoid race condition on component_state_ read-modify-write
-    this_update->defer([this_update, msg]() { this_update->status_set_error(msg); });
+    this_update->defer([this_update]() { this_update->status_set_error("Failed to parse manifest JSON"); });
    UPDATE_RETURN;
  }

--- a/esphome/components/i2c/i2c_bus_zephyr.cpp
+++ b/esphome/components/i2c/i2c_bus_zephyr.cpp
@@ -8,22 +8,6 @@ namespace esphome::i2c {

 static const char *const TAG = "i2c.zephyr";

-static const char *get_speed(uint32_t dev_config) {
-  switch (I2C_SPEED_GET(dev_config)) {
-    case I2C_SPEED_STANDARD:
-      return "100 kHz";
-    case I2C_SPEED_FAST:
-      return "400 kHz";
-    case I2C_SPEED_FAST_PLUS:
-      return "1 MHz";
-    case I2C_SPEED_HIGH:
-      return "3.4 MHz";
-    case I2C_SPEED_ULTRA:
-      return "5 MHz";
-  }
-  return "unknown";
-}
-
 void ZephyrI2CBus::setup() {
  if (!device_is_ready(this->i2c_dev_)) {
    ESP_LOGE(TAG, "I2C dev is not ready.");
@@ -47,6 +31,21 @@ void ZephyrI2CBus::setup() {
 }

 void ZephyrI2CBus::dump_config() {
+  auto get_speed = [](uint32_t dev_config) {
+    switch (I2C_SPEED_GET(dev_config)) {
+      case I2C_SPEED_STANDARD:
+        return "100 kHz";
+      case I2C_SPEED_FAST:
+        return "400 kHz";
+      case I2C_SPEED_FAST_PLUS:
+        return "1 MHz";
+      case I2C_SPEED_HIGH:
+        return "3.4 MHz";
+      case I2C_SPEED_ULTRA:
+        return "5 MHz";
+    }
+    return "unknown";
+  };
  ESP_LOGCONFIG(TAG,
                "I2C Bus:\n"
                "  SDA Pin: GPIO%u\n"
--- a/esphome/components/ld2410/automation.h
+++ b/esphome/components/ld2410/automation.h
@@ -4,7 +4,8 @@
 #include "esphome/core/component.h"
 #include "ld2410.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 #include "esphome/core/application.h"

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

 static const char *const TAG = "ld2410";
+static const char *const UNKNOWN_MAC = "unknown";
+static const char *const VERSION_FMT = "%u.%02X.%02X%02X%02X%02X";

 enum BaudRate : uint8_t {
  BAUD_RATE_9600 = 1,
@@ -178,15 +181,15 @@ static inline bool validate_header_footer(const uint8_t *header_footer, const ui
 }

 void LD2410Component::dump_config() {
-  char mac_s[18];
-  char version_s[20];
-  const char *mac_str = ld24xx::format_mac_str(this->mac_address_, mac_s);
-  ld24xx::format_version_str(this->version_, version_s);
+  std::string mac_str =
+      mac_address_is_valid(this->mac_address_) ? format_mac_address_pretty(this->mac_address_) : UNKNOWN_MAC;
+  std::string version = str_sprintf(VERSION_FMT, this->version_[1], this->version_[0], this->version_[5],
+                                    this->version_[4], this->version_[3], this->version_[2]);
  ESP_LOGCONFIG(TAG,
                "LD2410:\n"
                "  Firmware version: %s\n"
                "  MAC address: %s",
-                version_s, mac_str);
+                version.c_str(), mac_str.c_str());
 #ifdef USE_BINARY_SENSOR
  ESP_LOGCONFIG(TAG, "Binary Sensors:");
  LOG_BINARY_SENSOR("  ", "Target", this->target_binary_sensor_);
@@ -445,12 +448,12 @@ bool LD2410Component::handle_ack_data_() {

    case CMD_QUERY_VERSION: {
      std::memcpy(this->version_, &this->buffer_data_[12], sizeof(this->version_));
-      char version_s[20];
-      ld24xx::format_version_str(this->version_, version_s);
-      ESP_LOGV(TAG, "Firmware version: %s", version_s);
+      std::string version = str_sprintf(VERSION_FMT, this->version_[1], this->version_[0], this->version_[5],
+                                        this->version_[4], this->version_[3], this->version_[2]);
+      ESP_LOGV(TAG, "Firmware version: %s", version.c_str());
 #ifdef USE_TEXT_SENSOR
      if (this->version_text_sensor_ != nullptr) {
-        this->version_text_sensor_->publish_state(version_s);
+        this->version_text_sensor_->publish_state(version);
      }
 #endif
      break;
@@ -503,9 +506,9 @@ bool LD2410Component::handle_ack_data_() {
        std::memcpy(this->mac_address_, &this->buffer_data_[10], sizeof(this->mac_address_));
      }

-      char mac_s[18];
-      const char *mac_str = ld24xx::format_mac_str(this->mac_address_, mac_s);
-      ESP_LOGV(TAG, "MAC address: %s", mac_str);
+      std::string mac_str =
+          mac_address_is_valid(this->mac_address_) ? format_mac_address_pretty(this->mac_address_) : UNKNOWN_MAC;
+      ESP_LOGV(TAG, "MAC address: %s", mac_str.c_str());
 #ifdef USE_TEXT_SENSOR
      if (this->mac_text_sensor_ != nullptr) {
        this->mac_text_sensor_->publish_state(mac_str);
@@ -781,4 +784,5 @@ void LD2410Component::set_gate_still_sensor(uint8_t gate, sensor::Sensor *s) {
 }
 #endif

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

 #include <array>

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

 using namespace ld24xx;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 #include "restart_button.h"

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

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

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

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

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

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

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

 static const char *const TAG = "ld2412";
+static const char *const UNKNOWN_MAC = "unknown";
+static const char *const VERSION_FMT = "%u.%02X.%02X%02X%02X%02X";

 enum BaudRate : uint8_t {
  BAUD_RATE_9600 = 1,
@@ -197,15 +200,15 @@ static inline bool validate_header_footer(const uint8_t *header_footer, const ui
 }

 void LD2412Component::dump_config() {
-  char mac_s[18];
-  char version_s[20];
-  const char *mac_str = ld24xx::format_mac_str(this->mac_address_, mac_s);
-  ld24xx::format_version_str(this->version_, version_s);
+  std::string mac_str =
+      mac_address_is_valid(this->mac_address_) ? format_mac_address_pretty(this->mac_address_) : UNKNOWN_MAC;
+  std::string version = str_sprintf(VERSION_FMT, this->version_[1], this->version_[0], this->version_[5],
+                                    this->version_[4], this->version_[3], this->version_[2]);
  ESP_LOGCONFIG(TAG,
                "LD2412:\n"
                "  Firmware version: %s\n"
                "  MAC address: %s",
-                version_s, mac_str);
+                version.c_str(), mac_str.c_str());
 #ifdef USE_BINARY_SENSOR
  ESP_LOGCONFIG(TAG, "Binary Sensors:");
  LOG_BINARY_SENSOR("  ", "DynamicBackgroundCorrectionStatus",
@@ -489,12 +492,12 @@ bool LD2412Component::handle_ack_data_() {

    case CMD_QUERY_VERSION: {
      std::memcpy(this->version_, &this->buffer_data_[12], sizeof(this->version_));
-      char version_s[20];
-      ld24xx::format_version_str(this->version_, version_s);
-      ESP_LOGV(TAG, "Firmware version: %s", version_s);
+      std::string version = str_sprintf(VERSION_FMT, this->version_[1], this->version_[0], this->version_[5],
+                                        this->version_[4], this->version_[3], this->version_[2]);
+      ESP_LOGV(TAG, "Firmware version: %s", version.c_str());
 #ifdef USE_TEXT_SENSOR
      if (this->version_text_sensor_ != nullptr) {
-        this->version_text_sensor_->publish_state(version_s);
+        this->version_text_sensor_->publish_state(version);
      }
 #endif
      break;
@@ -541,9 +544,9 @@ bool LD2412Component::handle_ack_data_() {
        std::memcpy(this->mac_address_, &this->buffer_data_[10], sizeof(this->mac_address_));
      }

-      char mac_s[18];
-      const char *mac_str = ld24xx::format_mac_str(this->mac_address_, mac_s);
-      ESP_LOGV(TAG, "MAC address: %s", mac_str);
+      std::string mac_str =
+          mac_address_is_valid(this->mac_address_) ? format_mac_address_pretty(this->mac_address_) : UNKNOWN_MAC;
+      ESP_LOGV(TAG, "MAC address: %s", mac_str.c_str());
 #ifdef USE_TEXT_SENSOR
      if (this->mac_text_sensor_ != nullptr) {
        this->mac_text_sensor_->publish_state(mac_str);
@@ -854,4 +857,5 @@ void LD2412Component::set_gate_still_sensor(uint8_t gate, sensor::Sensor *s) {
 }
 #endif

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

 #include <array>

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

 using namespace ld24xx;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jonathan Swoboda	cfd88376b9	Merge pull request #12266 from esphome/bump-2025.11.3 2025.11.3	2025-12-03 11:36:57 -05:00
Jonathan Swoboda	577a6b2941	Bump version to 2025.11.3	2025-12-03 10:50:28 -05:00
Jonathan Swoboda	de68b56c4a	[rtl87xx] Fix FreeRTOS version for RTL8720C boards (#12261 ) Co-authored-by: Claude <noreply@anthropic.com>	2025-12-03 10:50:28 -05:00
Jonathan Swoboda	ccd23e692b	[analog_threshold] Fix oscillation when using invert filter (#12251 ) Co-authored-by: Claude <noreply@anthropic.com>	2025-12-03 10:50:28 -05:00
Jonathan Swoboda	1f5a44be3d	[rtl87xx] Fix AsyncTCP compilation by upgrading FreeRTOS to 8.2.3 (#12230 ) Co-authored-by: Claude <noreply@anthropic.com>	2025-12-03 10:50:28 -05:00
Jonathan Swoboda	1d1e47c757	[core] Fix clean all windows (#12217 ) Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: J. Nick Koston <nick@home-assistant.io>	2025-12-03 10:50:28 -05:00
Darsey Litzenberger	3fbed1fa79	[ade7953] Apply voltage_gain setting to both channels (#12180 )	2025-12-03 10:50:28 -05:00
Jonathan Swoboda	5c71520635	[mopeka_pro_check] Fix negative temperatures (#12198 ) Co-authored-by: Claude <noreply@anthropic.com>	2025-12-03 10:50:28 -05:00
J. Nick Koston	9d6c81ec23	[hlk_fm22x] Fix Action::play method signatures (#12192 )	2025-12-03 10:50:28 -05:00
Clyde Stubbs	73fa9230e6	[helpers] Add conversion from FixedVector to std::vector (#12179 )	2025-12-03 10:50:28 -05:00
J. Nick Koston	48caff13c9	[espnow] Initialize LwIP stack when running without WiFi component (#12169 )	2025-12-03 10:50:28 -05:00
J. Nick Koston	71bb94524e	[usb_uart] Wake main loop immediately when USB data arrives (#12148 )	2025-12-03 10:50:28 -05:00
Clyde Stubbs	a3199792c6	[build] Don't clear pio cache unless requested (#11966 )	2025-12-03 10:50:28 -05:00
Jonathan Swoboda	50c1720c16	Merge pull request #12149 from esphome/bump-2025.11.2 2025.11.2	2025-11-27 18:19:05 -05:00
Jonathan Swoboda	4115dd7222	Bump version to 2025.11.2	2025-11-27 17:23:28 -05:00
J. Nick Koston	d5e2543751	[scheduler] Fix use-after-move crash in heap operations (#12124 )	2025-11-27 17:23:28 -05:00
Clyde Stubbs	b4b34aee13	[wifi] Restore blocking setup until connected for RP2040 (#12142 )	2025-11-27 17:23:28 -05:00
Jonathan Swoboda	6645994700	[esp32] Fix hosted update when there is no wifi (#12123 )	2025-11-27 17:23:28 -05:00
Clyde Stubbs	ae140f52e3	[lvgl] Fix position of errors in widget config (#12111 ) Co-authored-by: J. Nick Koston <nick@koston.org>	2025-11-27 17:23:28 -05:00
Clyde Stubbs	46ae6d35a2	[lvgl] Allow multiple widgets per grid cell (#12091 )	2025-11-27 17:23:27 -05:00
J. Nick Koston	278f12fb99	[script] Fix script.wait hanging when triggered from on_boot (#12102 )	2025-11-27 17:23:27 -05:00
Jonathan Swoboda	acdcd56395	[esp32] Fix platformio flash size print (#12099 ) Co-authored-by: J. Nick Koston <nick+github@koston.org>	2025-11-27 17:23:27 -05:00
Edward Firmo	9289fc36f7	[nextion] Do not set alternative baud rate when not specified or `<= 0` (#12097 )	2025-11-27 17:23:27 -05:00
Jonathan Swoboda	3775b54554	Merge pull request #12086 from esphome/bump-2025.11.1 2025.11.1	2025-11-24 17:29:53 -05:00
Jonathan Swoboda	9186144dcd	Bump version to 2025.11.1	2025-11-24 16:24:38 -05:00
Jesse Hills	25bcd0ea25	[online_image] Fix some large PNGs causing watchdog timeout (#12025 ) Co-authored-by: guillempages <guillempages@users.noreply.github.com>	2025-11-24 16:24:38 -05:00
J. Nick Koston	50d08a2eba	[esp_ldo,mipi_dsi,mipi_rgb] Fix dangling pointer bugs in mark_failed() (#12077 )	2025-11-24 16:24:38 -05:00
J. Nick Koston	3a7a0c66ab	[script][wait_until] Fix FIFO ordering and reentrancy bugs (#12049 ) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-11-24 16:24:38 -05:00
Jonathan Swoboda	83525b7a92	[core] Add support for passing yaml files to clean-all (#12039 )	2025-11-24 16:24:38 -05:00
Jonathan Swoboda	f31f023c89	[esp32] Fix C2 builds (#12050 )	2025-11-24 16:24:37 -05:00
J. Nick Koston	f8efefffaa	[cst816][http_request] Fix status_set_error() dangling pointer bugs (#12033 )	2025-11-24 16:24:37 -05:00
Jonathan Swoboda	d698083ede	[jsn_sr04t] Fix model AJ_SR04M (#11992 )	2025-11-24 16:24:37 -05:00
Jonathan Swoboda	11ba6440d7	[cst816][packet_transport][udp][wake_on_lan] Fix error messages (#12019 )	2025-11-24 16:24:37 -05:00
Jonathan Swoboda	89ee37a2d5	[ltr501][ltr_als_ps] Rename enum to avoid collision with lwip defines (#12017 )	2025-11-24 16:24:37 -05:00
J. Nick Koston	45b8c1e267	[network] Fix IPAddress constructor causing comparison failures and garbage output (#12005 )	2025-11-24 16:24:37 -05:00
Jonathan Swoboda	fbe091f167	[graph] Fix legend border (#12000 )	2025-11-24 16:24:37 -05:00