Merge branch 'dev' into libretiny_no_strlen

2026-02-20 16:35:37 -07:00 · 2025-11-24 10:22:44 -06:00
parent 4c9d903773 3c48e13c9f
commit 011992f64d
304 changed files with 3315 additions and 1204 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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
+        uses: github/codeql-action/init@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
        with:
          languages: ${{ matrix.language }}
          build-mode: ${{ matrix.build-mode }}
@@ -86,6 +86,6 @@ jobs:
          exit 1

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
+        uses: github/codeql-action/analyze@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
        with:
          category: "/language:${{matrix.language}}"
--- a/.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0

      - name: Checkout Home Assistant
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
        with:
          repository: home-assistant/core
          path: lib/home-assistant
--- a/3
+++ b/3
@@ -72,6 +72,7 @@ esphome/components/bl0942/* @dbuezas @dwmw2
 esphome/components/ble_client/* @buxtronix @clydebarrow
 esphome/components/ble_nus/* @tomaszduda23
 esphome/components/bluetooth_proxy/* @bdraco @jesserockz
+esphome/components/bm8563/* @abmantis
 esphome/components/bme280_base/* @esphome/core
 esphome/components/bme280_spi/* @apbodrov
 esphome/components/bme680_bsec/* @trvrnrth
@@ -202,6 +203,7 @@ 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
@@ -460,6 +462,7 @@ esphome/components/st7735/* @SenexCrenshaw
 esphome/components/st7789v/* @kbx81
 esphome/components/st7920/* @marsjan155
 esphome/components/statsd/* @Links2004
+esphome/components/stts22h/* @B48D81EFCC
 esphome/components/substitutions/* @esphome/core
 esphome/components/sun/* @OttoWinter
 esphome/components/sun_gtil2/* @Mat931
--- a/esphome/main.py
+++ b/esphome/main.py
@@ -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/analyze_memory/cli.py
+++ b/esphome/analyze_memory/cli.py
@@ -15,6 +15,11 @@ from . import (
 class MemoryAnalyzerCLI(MemoryAnalyzer):
    """Memory analyzer with CLI-specific report generation."""

+    # Symbol size threshold for detailed analysis
+    SYMBOL_SIZE_THRESHOLD: int = (
+        100  # Show symbols larger than this in detailed analysis
+    )
+
    # Column width constants
    COL_COMPONENT: int = 29
    COL_FLASH_TEXT: int = 14
@@ -191,14 +196,21 @@ class MemoryAnalyzerCLI(MemoryAnalyzer):
                    f"{len(symbols):>{self.COL_CORE_COUNT}} | {percentage:>{self.COL_CORE_PERCENT - 1}.1f}%"
                )

-            # Top 15 largest core symbols
+            # All core symbols above threshold
            lines.append("")
-            lines.append(f"Top 15 Largest {_COMPONENT_CORE} Symbols:")
            sorted_core_symbols = sorted(
                self._esphome_core_symbols, key=lambda x: x[2], reverse=True
            )
+            large_core_symbols = [
+                (symbol, demangled, size)
+                for symbol, demangled, size in sorted_core_symbols
+                if size > self.SYMBOL_SIZE_THRESHOLD
+            ]

-            for i, (symbol, demangled, size) in enumerate(sorted_core_symbols[:15]):
+            lines.append(
+                f"{_COMPONENT_CORE} Symbols > {self.SYMBOL_SIZE_THRESHOLD} B ({len(large_core_symbols)} symbols):"
+            )
+            for i, (symbol, demangled, size) in enumerate(large_core_symbols):
                lines.append(f"{i + 1}. {demangled} ({size:,} B)")

            lines.append("=" * self.TABLE_WIDTH)
@@ -268,13 +280,15 @@ class MemoryAnalyzerCLI(MemoryAnalyzer):
                lines.append(f"Total size: {comp_mem.flash_total:,} B")
                lines.append("")

-                # Show all symbols > 100 bytes for better visibility
+                # Show all symbols above threshold for better visibility
                large_symbols = [
-                    (sym, dem, size) for sym, dem, size in sorted_symbols if size > 100
+                    (sym, dem, size)
+                    for sym, dem, size in sorted_symbols
+                    if size > self.SYMBOL_SIZE_THRESHOLD
                ]

                lines.append(
-                    f"{comp_name} Symbols > 100 B ({len(large_symbols)} symbols):"
+                    f"{comp_name} Symbols > {self.SYMBOL_SIZE_THRESHOLD} B ({len(large_symbols)} symbols):"
                )
                for i, (symbol, demangled, size) in enumerate(large_symbols):
                    lines.append(f"{i + 1}. {demangled} ({size:,} B)")
--- a/esphome/components/api/init.py
+++ b/esphome/components/api/init.py
@@ -260,9 +260,9 @@ async def to_code(config):
        cg.add(var.set_max_connections(config[CONF_MAX_CONNECTIONS]))
    cg.add_define("API_MAX_SEND_QUEUE", config[CONF_MAX_SEND_QUEUE])

-    # Set USE_API_SERVICES if any services are enabled
+    # Set USE_API_USER_DEFINED_ACTIONS if any services are enabled
    if config.get(CONF_ACTIONS) or config[CONF_CUSTOM_SERVICES]:
-        cg.add_define("USE_API_SERVICES")
+        cg.add_define("USE_API_USER_DEFINED_ACTIONS")

    # Set USE_API_CUSTOM_SERVICES if external components need dynamic service registration
    if config[CONF_CUSTOM_SERVICES]:
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -855,21 +855,21 @@ enum ServiceArgType {
  SERVICE_ARG_TYPE_STRING_ARRAY = 7;
 }
 message ListEntitiesServicesArgument {
-  option (ifdef) = "USE_API_SERVICES";
+  option (ifdef) = "USE_API_USER_DEFINED_ACTIONS";
  string name = 1;
  ServiceArgType type = 2;
 }
 message ListEntitiesServicesResponse {
  option (id) = 41;
  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_API_SERVICES";
+  option (ifdef) = "USE_API_USER_DEFINED_ACTIONS";

  string name = 1;
  fixed32 key = 2;
  repeated ListEntitiesServicesArgument args = 3 [(fixed_vector) = true];
 }
 message ExecuteServiceArgument {
-  option (ifdef) = "USE_API_SERVICES";
+  option (ifdef) = "USE_API_USER_DEFINED_ACTIONS";
  bool bool_ = 1;
  int32 legacy_int = 2;
  float float_ = 3;
@@ -885,7 +885,7 @@ message ExecuteServiceRequest {
  option (id) = 42;
  option (source) = SOURCE_CLIENT;
  option (no_delay) = true;
-  option (ifdef) = "USE_API_SERVICES";
+  option (ifdef) = "USE_API_USER_DEFINED_ACTIONS";

  fixed32 key = 1;
  repeated ExecuteServiceArgument args = 2 [(fixed_vector) = true];
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -1451,8 +1451,11 @@ bool APIConnection::send_device_info_response(const DeviceInfoRequest &msg) {
 #ifdef USE_AREAS
  resp.set_suggested_area(StringRef(App.get_area()));
 #endif
-  // mac_address must store temporary string - will be valid during send_message call
-  std::string mac_address = get_mac_address_pretty();
+  // Stack buffer for MAC address (XX:XX:XX:XX:XX:XX\0 = 18 bytes)
+  char mac_address[18];
+  uint8_t mac[6];
+  get_mac_address_raw(mac);
+  format_mac_addr_upper(mac, mac_address);
  resp.set_mac_address(StringRef(mac_address));

  resp.set_esphome_version(ESPHOME_VERSION_REF);
@@ -1493,8 +1496,9 @@ bool APIConnection::send_device_info_response(const DeviceInfoRequest &msg) {
 #endif
 #ifdef USE_BLUETOOTH_PROXY
  resp.bluetooth_proxy_feature_flags = bluetooth_proxy::global_bluetooth_proxy->get_feature_flags();
-  // bt_mac must store temporary string - will be valid during send_message call
-  std::string bluetooth_mac = bluetooth_proxy::global_bluetooth_proxy->get_bluetooth_mac_address_pretty();
+  // Stack buffer for Bluetooth MAC address (XX:XX:XX:XX:XX:XX\0 = 18 bytes)
+  char bluetooth_mac[18];
+  bluetooth_proxy::global_bluetooth_proxy->get_bluetooth_mac_address_pretty(bluetooth_mac);
  resp.set_bluetooth_mac_address(StringRef(bluetooth_mac));
 #endif
 #ifdef USE_VOICE_ASSISTANT
@@ -1541,7 +1545,7 @@ void APIConnection::on_home_assistant_state_response(const HomeAssistantStateRes
  }
 }
 #endif
-#ifdef USE_API_SERVICES
+#ifdef USE_API_USER_DEFINED_ACTIONS
 void APIConnection::execute_service(const ExecuteServiceRequest &msg) {
  bool found = false;
  for (auto *service : this->parent_->get_user_services()) {
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -221,7 +221,7 @@ class APIConnection final : public APIServerConnection {
 #ifdef USE_API_HOMEASSISTANT_STATES
  void subscribe_home_assistant_states(const SubscribeHomeAssistantStatesRequest &msg) override;
 #endif
-#ifdef USE_API_SERVICES
+#ifdef USE_API_USER_DEFINED_ACTIONS
  void execute_service(const ExecuteServiceRequest &msg) override;
 #endif
 #ifdef USE_API_NOISE
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -995,7 +995,7 @@ bool GetTimeResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
  }
  return true;
 }
-#ifdef USE_API_SERVICES
+#ifdef USE_API_USER_DEFINED_ACTIONS
 void ListEntitiesServicesArgument::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->name_ref_);
  buffer.encode_uint32(2, static_cast<uint32_t>(this->type));
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -63,7 +63,7 @@ enum LogLevel : uint32_t {
  LOG_LEVEL_VERBOSE = 6,
  LOG_LEVEL_VERY_VERBOSE = 7,
 };
-#ifdef USE_API_SERVICES
+#ifdef USE_API_USER_DEFINED_ACTIONS
 enum ServiceArgType : uint32_t {
  SERVICE_ARG_TYPE_BOOL = 0,
  SERVICE_ARG_TYPE_INT = 1,
@@ -1239,7 +1239,7 @@ class GetTimeResponse final : public ProtoDecodableMessage {
  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
 };
-#ifdef USE_API_SERVICES
+#ifdef USE_API_USER_DEFINED_ACTIONS
 class ListEntitiesServicesArgument final : public ProtoMessage {
 public:
  StringRef name_ref_{};
--- a/esphome/components/api/api_pb2_dump.cpp
+++ b/esphome/components/api/api_pb2_dump.cpp
@@ -66,7 +66,7 @@ static void dump_field(std::string &out, const char *field_name, float value, in
 static void dump_field(std::string &out, const char *field_name, uint64_t value, int indent = 2) {
  char buffer[64];
  append_field_prefix(out, field_name, indent);
-  snprintf(buffer, 64, "%llu", value);
+  snprintf(buffer, 64, "%" PRIu64, value);
  append_with_newline(out, buffer);
 }

@@ -206,7 +206,7 @@ template<> const char *proto_enum_to_string<enums::LogLevel>(enums::LogLevel val
      return "UNKNOWN";
  }
 }
-#ifdef USE_API_SERVICES
+#ifdef USE_API_USER_DEFINED_ACTIONS
 template<> const char *proto_enum_to_string<enums::ServiceArgType>(enums::ServiceArgType value) {
  switch (value) {
    case enums::SERVICE_ARG_TYPE_BOOL:
@@ -1177,7 +1177,7 @@ void GetTimeResponse::dump_to(std::string &out) const {
  out.append(format_hex_pretty(this->timezone, this->timezone_len));
  out.append("\n");
 }
-#ifdef USE_API_SERVICES
+#ifdef USE_API_USER_DEFINED_ACTIONS
 void ListEntitiesServicesArgument::dump_to(std::string &out) const {
  MessageDumpHelper helper(out, "ListEntitiesServicesArgument");
  dump_field(out, "name", this->name_ref_);
--- a/esphome/components/api/api_pb2_service.cpp
+++ b/esphome/components/api/api_pb2_service.cpp
@@ -193,7 +193,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      break;
    }
 #endif
-#ifdef USE_API_SERVICES
+#ifdef USE_API_USER_DEFINED_ACTIONS
    case ExecuteServiceRequest::MESSAGE_TYPE: {
      ExecuteServiceRequest msg;
      msg.decode(msg_data, msg_size);
@@ -670,7 +670,7 @@ void APIServerConnection::on_subscribe_home_assistant_states_request(const Subsc
  this->subscribe_home_assistant_states(msg);
 }
 #endif
-#ifdef USE_API_SERVICES
+#ifdef USE_API_USER_DEFINED_ACTIONS
 void APIServerConnection::on_execute_service_request(const ExecuteServiceRequest &msg) { this->execute_service(msg); }
 #endif
 #ifdef USE_API_NOISE
--- a/esphome/components/api/api_pb2_service.h
+++ b/esphome/components/api/api_pb2_service.h
@@ -79,7 +79,7 @@ class APIServerConnectionBase : public ProtoService {

  virtual void on_get_time_response(const GetTimeResponse &value){};

-#ifdef USE_API_SERVICES
+#ifdef USE_API_USER_DEFINED_ACTIONS
  virtual void on_execute_service_request(const ExecuteServiceRequest &value){};
 #endif

@@ -239,7 +239,7 @@ class APIServerConnection : public APIServerConnectionBase {
 #ifdef USE_API_HOMEASSISTANT_STATES
  virtual void subscribe_home_assistant_states(const SubscribeHomeAssistantStatesRequest &msg) = 0;
 #endif
-#ifdef USE_API_SERVICES
+#ifdef USE_API_USER_DEFINED_ACTIONS
  virtual void execute_service(const ExecuteServiceRequest &msg) = 0;
 #endif
 #ifdef USE_API_NOISE
@@ -368,7 +368,7 @@ class APIServerConnection : public APIServerConnectionBase {
 #ifdef USE_API_HOMEASSISTANT_STATES
  void on_subscribe_home_assistant_states_request(const SubscribeHomeAssistantStatesRequest &msg) override;
 #endif
-#ifdef USE_API_SERVICES
+#ifdef USE_API_USER_DEFINED_ACTIONS
  void on_execute_service_request(const ExecuteServiceRequest &msg) override;
 #endif
 #ifdef USE_API_NOISE
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -12,7 +12,7 @@
 #include "esphome/core/log.h"
 #include "list_entities.h"
 #include "subscribe_state.h"
-#ifdef USE_API_SERVICES
+#ifdef USE_API_USER_DEFINED_ACTIONS
 #include "user_services.h"
 #endif

@@ -124,7 +124,7 @@ class APIServer : public Component, public Controller {
 #endif  // USE_API_HOMEASSISTANT_ACTION_RESPONSES_JSON
 #endif  // USE_API_HOMEASSISTANT_ACTION_RESPONSES
 #endif  // USE_API_HOMEASSISTANT_SERVICES
-#ifdef USE_API_SERVICES
+#ifdef USE_API_USER_DEFINED_ACTIONS
  void initialize_user_services(std::initializer_list<UserServiceDescriptor *> services) {
    this->user_services_.assign(services);
  }
@@ -166,7 +166,7 @@ class APIServer : public Component, public Controller {
                                std::function<void(std::string)> f);
  const std::vector<HomeAssistantStateSubscription> &get_state_subs() const;
 #endif
-#ifdef USE_API_SERVICES
+#ifdef USE_API_USER_DEFINED_ACTIONS
  const std::vector<UserServiceDescriptor *> &get_user_services() const { return this->user_services_; }
 #endif

@@ -206,7 +206,7 @@ class APIServer : public Component, public Controller {
 #ifdef USE_API_HOMEASSISTANT_STATES
  std::vector<HomeAssistantStateSubscription> state_subs_;
 #endif
-#ifdef USE_API_SERVICES
+#ifdef USE_API_USER_DEFINED_ACTIONS
  std::vector<UserServiceDescriptor *> user_services_;
 #endif
 #ifdef USE_API_HOMEASSISTANT_ACTION_RESPONSES
--- a/esphome/components/api/custom_api_device.h
+++ b/esphome/components/api/custom_api_device.h
@@ -3,12 +3,12 @@
 #include <map>
 #include "api_server.h"
 #ifdef USE_API
-#ifdef USE_API_SERVICES
+#ifdef USE_API_USER_DEFINED_ACTIONS
 #include "user_services.h"
 #endif
 namespace esphome::api {

-#ifdef USE_API_SERVICES
+#ifdef USE_API_USER_DEFINED_ACTIONS
 template<typename T, typename... Ts> class CustomAPIDeviceService : public UserServiceDynamic<Ts...> {
 public:
  CustomAPIDeviceService(const std::string &name, const std::array<std::string, sizeof...(Ts)> &arg_names, T *obj,
@@ -21,7 +21,7 @@ template<typename T, typename... Ts> class CustomAPIDeviceService : public UserS
  T *obj_;
  void (T::*callback_)(Ts...);
 };
-#endif  // USE_API_SERVICES
+#endif  // USE_API_USER_DEFINED_ACTIONS

 class CustomAPIDevice {
 public:
@@ -49,7 +49,7 @@ class CustomAPIDevice {
   * @param name The name of the service to register.
   * @param arg_names The name of the arguments for the service, must match the arguments of the function.
   */
-#ifdef USE_API_SERVICES
+#ifdef USE_API_USER_DEFINED_ACTIONS
  template<typename T, typename... Ts>
  void register_service(void (T::*callback)(Ts...), const std::string &name,
                        const std::array<std::string, sizeof...(Ts)> &arg_names) {
@@ -90,7 +90,7 @@ class CustomAPIDevice {
   * @param callback The member function to call when the service is triggered.
   * @param name The name of the arguments for the service, must match the arguments of the function.
   */
-#ifdef USE_API_SERVICES
+#ifdef USE_API_USER_DEFINED_ACTIONS
  template<typename T> void register_service(void (T::*callback)(), const std::string &name) {
 #ifdef USE_API_CUSTOM_SERVICES
    auto *service = new CustomAPIDeviceService<T>(name, {}, (T *) this, callback);  // NOLINT
--- a/esphome/components/api/list_entities.cpp
+++ b/esphome/components/api/list_entities.cpp
@@ -82,7 +82,7 @@ bool ListEntitiesIterator::on_end() { return this->client_->send_list_info_done(

 ListEntitiesIterator::ListEntitiesIterator(APIConnection *client) : client_(client) {}

-#ifdef USE_API_SERVICES
+#ifdef USE_API_USER_DEFINED_ACTIONS
 bool ListEntitiesIterator::on_service(UserServiceDescriptor *service) {
  auto resp = service->encode_list_service_response();
  return this->client_->send_message(resp, ListEntitiesServicesResponse::MESSAGE_TYPE);
--- a/esphome/components/api/list_entities.h
+++ b/esphome/components/api/list_entities.h
@@ -43,7 +43,7 @@ class ListEntitiesIterator : public ComponentIterator {
 #ifdef USE_TEXT_SENSOR
  bool on_text_sensor(text_sensor::TextSensor *entity) override;
 #endif
-#ifdef USE_API_SERVICES
+#ifdef USE_API_USER_DEFINED_ACTIONS
  bool on_service(UserServiceDescriptor *service) override;
 #endif
 #ifdef USE_CAMERA
--- a/esphome/components/api/user_services.h
+++ b/esphome/components/api/user_services.h
@@ -7,7 +7,7 @@
 #include "esphome/core/automation.h"
 #include "api_pb2.h"

-#ifdef USE_API_SERVICES
+#ifdef USE_API_USER_DEFINED_ACTIONS
 namespace esphome::api {

 class UserServiceDescriptor {
@@ -122,4 +122,4 @@ template<typename... Ts> class UserServiceTrigger : public UserServiceBase<Ts...
 };

 }  // namespace esphome::api
-#endif  // USE_API_SERVICES
+#endif  // USE_API_USER_DEFINED_ACTIONS
--- a/esphome/components/binary_sensor/automation.cpp
+++ b/esphome/components/binary_sensor/automation.cpp
@@ -1,12 +1,11 @@
 #include "automation.h"
 #include "esphome/core/log.h"

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

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

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

  *this->at_index_ = *this->at_index_ + 1;
 }
-void binary_sensor::MultiClickTrigger::schedule_cooldown_() {
+void 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]() {
@@ -79,7 +78,7 @@ void binary_sensor::MultiClickTrigger::schedule_cooldown_() {
  this->cancel_timeout("is_valid");
  this->cancel_timeout("is_not_valid");
 }
-void binary_sensor::MultiClickTrigger::schedule_is_valid_(uint32_t min_length) {
+void MultiClickTrigger::schedule_is_valid_(uint32_t min_length) {
  if (min_length == 0) {
    this->is_valid_ = true;
    return;
@@ -90,19 +89,19 @@ void binary_sensor::MultiClickTrigger::schedule_is_valid_(uint32_t min_length) {
    this->is_valid_ = true;
  });
 }
-void binary_sensor::MultiClickTrigger::schedule_is_not_valid_(uint32_t max_length) {
+void 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 binary_sensor::MultiClickTrigger::cancel() {
+void MultiClickTrigger::cancel() {
  ESP_LOGV(TAG, "Multi Click: Sequence explicitly cancelled.");
  this->is_valid_ = false;
  this->schedule_cooldown_();
 }
-void binary_sensor::MultiClickTrigger::trigger_() {
+void MultiClickTrigger::trigger_() {
  ESP_LOGV(TAG, "Multi Click: Hooray, multi click is valid. Triggering!");
  this->at_index_.reset();
  this->cancel_timeout("trigger");
@@ -118,5 +117,4 @@ bool match_interval(uint32_t min_length, uint32_t max_length, uint32_t length) {
    return length >= min_length && length <= max_length;
  }
 }
-}  // namespace binary_sensor
-}  // namespace esphome
+}  // namespace esphome::binary_sensor
--- a/esphome/components/binary_sensor/automation.h
+++ b/esphome/components/binary_sensor/automation.h
@@ -9,8 +9,7 @@
 #include "esphome/core/helpers.h"
 #include "esphome/components/binary_sensor/binary_sensor.h"

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

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

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

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

 static const char *const TAG = "binary_sensor";

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

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

 #include <initializer_list>

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

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

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

 #include "binary_sensor.h"

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

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

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

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

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

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

 class BinarySensor;

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

-}  // namespace binary_sensor
-
-}  // namespace esphome
+}  // namespace esphome::binary_sensor
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
@@ -130,11 +130,9 @@ class BluetoothProxy final : public esp32_ble_tracker::ESPBTDeviceListener, publ
    return flags;
  }

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

 protected:
--- a/esphome/components/bm8563/init.py
+++ b/esphome/components/bm8563/init.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@abmantis"]
--- a/esphome/components/bm8563/bm8563.cpp
+++ b/esphome/components/bm8563/bm8563.cpp
@@ -0,0 +1,198 @@
+#include "bm8563.h"
+#include "esphome/core/log.h"
+
+namespace esphome::bm8563 {
+
+static const char *const TAG = "bm8563";
+
+static constexpr uint8_t CONTROL_STATUS_1_REG = 0x00;
+static constexpr uint8_t CONTROL_STATUS_2_REG = 0x01;
+static constexpr uint8_t TIME_FIRST_REG = 0x02;  // Time uses reg 2, 3, 4
+static constexpr uint8_t DATE_FIRST_REG = 0x05;  // Date uses reg 5, 6, 7, 8
+static constexpr uint8_t TIMER_CONTROL_REG = 0x0E;
+static constexpr uint8_t TIMER_VALUE_REG = 0x0F;
+static constexpr uint8_t CLOCK_1_HZ = 0x82;
+static constexpr uint8_t CLOCK_1_60_HZ = 0x83;
+// Maximum duration: 255 minutes (at 1/60 Hz) = 15300 seconds
+static constexpr uint32_t MAX_TIMER_DURATION_S = 255 * 60;
+
+void BM8563::setup() {
+  if (!this->write_byte_16(CONTROL_STATUS_1_REG, 0)) {
+    this->mark_failed();
+    return;
+  }
+}
+
+void BM8563::update() { this->read_time(); }
+
+void BM8563::dump_config() {
+  ESP_LOGCONFIG(TAG, "BM8563:");
+  LOG_I2C_DEVICE(this);
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
+  }
+}
+
+void BM8563::start_timer(uint32_t duration_s) {
+  this->clear_irq_();
+  this->set_timer_irq_(duration_s);
+}
+
+void BM8563::write_time() {
+  auto now = time::RealTimeClock::utcnow();
+  if (!now.is_valid()) {
+    ESP_LOGE(TAG, "Invalid system time, not syncing to RTC.");
+    return;
+  }
+
+  ESP_LOGD(TAG, "Writing time: %i-%i-%i %i, %i:%i:%i", now.year, now.month, now.day_of_month, now.day_of_week, now.hour,
+           now.minute, now.second);
+
+  this->set_time_(now);
+  this->set_date_(now);
+}
+
+void BM8563::read_time() {
+  ESPTime rtc_time;
+  this->get_time_(rtc_time);
+  this->get_date_(rtc_time);
+  rtc_time.day_of_year = 1;  // unused by recalc_timestamp_utc, but needs to be valid
+  ESP_LOGD(TAG, "Read time: %i-%i-%i %i, %i:%i:%i", rtc_time.year, rtc_time.month, rtc_time.day_of_month,
+           rtc_time.day_of_week, rtc_time.hour, rtc_time.minute, rtc_time.second);
+
+  rtc_time.recalc_timestamp_utc(false);
+  if (!rtc_time.is_valid()) {
+    ESP_LOGE(TAG, "Invalid RTC time, not syncing to system clock.");
+    return;
+  }
+  time::RealTimeClock::synchronize_epoch_(rtc_time.timestamp);
+}
+
+uint8_t BM8563::bcd2_to_byte_(uint8_t value) {
+  const uint8_t tmp = ((value & 0xF0) >> 0x4) * 10;
+  return tmp + (value & 0x0F);
+}
+
+uint8_t BM8563::byte_to_bcd2_(uint8_t value) {
+  const uint8_t bcdhigh = value / 10;
+  value -= bcdhigh * 10;
+  return (bcdhigh << 4) | value;
+}
+
+void BM8563::get_time_(ESPTime &time) {
+  uint8_t buf[3] = {0};
+  this->read_register(TIME_FIRST_REG, buf, 3);
+
+  time.second = this->bcd2_to_byte_(buf[0] & 0x7f);
+  time.minute = this->bcd2_to_byte_(buf[1] & 0x7f);
+  time.hour = this->bcd2_to_byte_(buf[2] & 0x3f);
+}
+
+void BM8563::set_time_(const ESPTime &time) {
+  uint8_t buf[3] = {this->byte_to_bcd2_(time.second), this->byte_to_bcd2_(time.minute), this->byte_to_bcd2_(time.hour)};
+  this->write_register_(TIME_FIRST_REG, buf, 3);
+}
+
+void BM8563::get_date_(ESPTime &time) {
+  uint8_t buf[4] = {0};
+  this->read_register(DATE_FIRST_REG, buf, sizeof(buf));
+
+  time.day_of_month = this->bcd2_to_byte_(buf[0] & 0x3f);
+  time.day_of_week = this->bcd2_to_byte_(buf[1] & 0x07);
+  time.month = this->bcd2_to_byte_(buf[2] & 0x1f);
+
+  uint8_t year_byte = this->bcd2_to_byte_(buf[3] & 0xff);
+
+  if (buf[2] & 0x80) {
+    time.year = 1900 + year_byte;
+  } else {
+    time.year = 2000 + year_byte;
+  }
+}
+
+void BM8563::set_date_(const ESPTime &time) {
+  uint8_t buf[4] = {
+      this->byte_to_bcd2_(time.day_of_month),
+      this->byte_to_bcd2_(time.day_of_week),
+      this->byte_to_bcd2_(time.month),
+      this->byte_to_bcd2_(time.year % 100),
+  };
+
+  if (time.year < 2000) {
+    buf[2] = buf[2] | 0x80;
+  }
+
+  this->write_register_(DATE_FIRST_REG, buf, 4);
+}
+
+void BM8563::write_byte_(uint8_t reg, uint8_t value) {
+  if (!this->write_byte(reg, value)) {
+    ESP_LOGE(TAG, "Failed to write byte 0x%02X with value 0x%02X", reg, value);
+  }
+}
+
+void BM8563::write_register_(uint8_t reg, const uint8_t *data, size_t len) {
+  if (auto error = this->write_register(reg, data, len); error != i2c::ErrorCode::NO_ERROR) {
+    ESP_LOGE(TAG, "Failed to write register 0x%02X with %zu bytes", reg, len);
+  }
+}
+
+optional<uint8_t> BM8563::read_register_(uint8_t reg) {
+  uint8_t data;
+  if (auto error = this->read_register(reg, &data, 1); error != i2c::ErrorCode::NO_ERROR) {
+    ESP_LOGE(TAG, "Failed to read register 0x%02X", reg);
+    return {};
+  }
+  return data;
+}
+
+void BM8563::set_timer_irq_(uint32_t duration_s) {
+  ESP_LOGI(TAG, "Timer Duration: %u s", duration_s);
+
+  if (duration_s > MAX_TIMER_DURATION_S) {
+    ESP_LOGW(TAG, "Timer duration %u s exceeds maximum %u s", duration_s, MAX_TIMER_DURATION_S);
+    return;
+  }
+
+  if (duration_s > 255) {
+    uint8_t duration_minutes = duration_s / 60;
+    this->write_byte_(TIMER_VALUE_REG, duration_minutes);
+    this->write_byte_(TIMER_CONTROL_REG, CLOCK_1_60_HZ);
+  } else {
+    this->write_byte_(TIMER_VALUE_REG, duration_s);
+    this->write_byte_(TIMER_CONTROL_REG, CLOCK_1_HZ);
+  }
+
+  auto maybe_ctrl_status_2 = this->read_register_(CONTROL_STATUS_2_REG);
+  if (!maybe_ctrl_status_2.has_value()) {
+    ESP_LOGE(TAG, "Failed to read CONTROL_STATUS_2_REG");
+    return;
+  }
+  uint8_t ctrl_status_2_reg_value = maybe_ctrl_status_2.value();
+  ctrl_status_2_reg_value |= (1 << 0);
+  ctrl_status_2_reg_value &= ~(1 << 7);
+  this->write_byte_(CONTROL_STATUS_2_REG, ctrl_status_2_reg_value);
+}
+
+void BM8563::clear_irq_() {
+  auto maybe_data = this->read_register_(CONTROL_STATUS_2_REG);
+  if (!maybe_data.has_value()) {
+    ESP_LOGE(TAG, "Failed to read CONTROL_STATUS_2_REG");
+    return;
+  }
+  uint8_t data = maybe_data.value();
+  this->write_byte_(CONTROL_STATUS_2_REG, data & 0xf3);
+}
+
+void BM8563::disable_irq_() {
+  this->clear_irq_();
+  auto maybe_data = this->read_register_(CONTROL_STATUS_2_REG);
+  if (!maybe_data.has_value()) {
+    ESP_LOGE(TAG, "Failed to read CONTROL_STATUS_2_REG");
+    return;
+  }
+  uint8_t data = maybe_data.value();
+  this->write_byte_(CONTROL_STATUS_2_REG, data & 0xfc);
+}
+
+}  // namespace esphome::bm8563
--- a/esphome/components/bm8563/bm8563.h
+++ b/esphome/components/bm8563/bm8563.h
@@ -0,0 +1,57 @@
+#pragma once
+
+#include "esphome/components/i2c/i2c.h"
+#include "esphome/components/time/real_time_clock.h"
+
+namespace esphome::bm8563 {
+
+class BM8563 : public time::RealTimeClock, public i2c::I2CDevice {
+ public:
+  void setup() override;
+  void update() override;
+  void dump_config() override;
+
+  void write_time();
+  void read_time();
+  void start_timer(uint32_t duration_s);
+
+ private:
+  void get_time_(ESPTime &time);
+  void get_date_(ESPTime &time);
+
+  void set_time_(const ESPTime &time);
+  void set_date_(const ESPTime &time);
+
+  void set_timer_irq_(uint32_t duration_s);
+  void clear_irq_();
+  void disable_irq_();
+
+  void write_byte_(uint8_t reg, uint8_t value);
+  void write_register_(uint8_t reg, const uint8_t *data, size_t len);
+  optional<uint8_t> read_register_(uint8_t reg);
+
+  uint8_t bcd2_to_byte_(uint8_t value);
+  uint8_t byte_to_bcd2_(uint8_t value);
+};
+
+template<typename... Ts> class WriteAction : public Action<Ts...>, public Parented<BM8563> {
+ public:
+  void play(const Ts &...x) override { this->parent_->write_time(); }
+};
+
+template<typename... Ts> class ReadAction : public Action<Ts...>, public Parented<BM8563> {
+ public:
+  void play(const Ts &...x) override { this->parent_->read_time(); }
+};
+
+template<typename... Ts> class TimerAction : public Action<Ts...>, public Parented<BM8563> {
+ public:
+  TEMPLATABLE_VALUE(uint32_t, duration)
+
+  void play(const Ts &...x) override {
+    auto duration = this->duration_.value(x...);
+    this->parent_->start_timer(duration);
+  }
+};
+
+}  // namespace esphome::bm8563
--- a/esphome/components/bm8563/time.py
+++ b/esphome/components/bm8563/time.py
@@ -0,0 +1,80 @@
+from esphome import automation
+import esphome.codegen as cg
+from esphome.components import i2c, time
+import esphome.config_validation as cv
+from esphome.const import CONF_DURATION, CONF_ID
+
+DEPENDENCIES = ["i2c"]
+
+I2C_ADDR = 0x51
+
+bm8563_ns = cg.esphome_ns.namespace("bm8563")
+BM8563 = bm8563_ns.class_("BM8563", time.RealTimeClock, i2c.I2CDevice)
+WriteAction = bm8563_ns.class_("WriteAction", automation.Action)
+ReadAction = bm8563_ns.class_("ReadAction", automation.Action)
+TimerAction = bm8563_ns.class_("TimerAction", automation.Action)
+
+CONFIG_SCHEMA = (
+    time.TIME_SCHEMA.extend(
+        {
+            cv.GenerateID(): cv.declare_id(BM8563),
+        }
+    )
+    .extend(cv.COMPONENT_SCHEMA)
+    .extend(i2c.i2c_device_schema(I2C_ADDR))
+)
+
+
+@automation.register_action(
+    "bm8563.write_time",
+    WriteAction,
+    automation.maybe_simple_id(
+        {
+            cv.GenerateID(): cv.use_id(BM8563),
+        }
+    ),
+)
+async def bm8563_write_time_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    await cg.register_parented(var, config[CONF_ID])
+    return var
+
+
+@automation.register_action(
+    "bm8563.start_timer",
+    TimerAction,
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.use_id(BM8563),
+            cv.Required(CONF_DURATION): cv.templatable(cv.positive_time_period_seconds),
+        }
+    ),
+)
+async def bm8563_start_timer_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_DURATION], args, cg.uint32)
+    cg.add(var.set_duration(template_))
+    return var
+
+
+@automation.register_action(
+    "bm8563.read_time",
+    ReadAction,
+    automation.maybe_simple_id(
+        {
+            cv.GenerateID(): cv.use_id(BM8563),
+        }
+    ),
+)
+async def bm8563_read_time_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    await cg.register_parented(var, config[CONF_ID])
+    return var
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await i2c.register_i2c_device(var, config)
+    await time.register_time(var, config)
--- a/esphome/components/bme68x_bsec2/bme68x_bsec2.cpp
+++ b/esphome/components/bme68x_bsec2/bme68x_bsec2.cpp
@@ -70,6 +70,9 @@ void BME68xBSEC2Component::dump_config() {
  if (this->is_failed()) {
    ESP_LOGE(TAG, "Communication failed (BSEC2 status: %d, BME68X status: %d)", this->bsec_status_,
             this->bme68x_status_);
+    if (this->bsec_status_ == BSEC_I_SU_SUBSCRIBEDOUTPUTGATES) {
+      ESP_LOGE(TAG, "No sensors, add at least one sensor to the config");
+    }
  }

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

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


--- a/esphome/components/captive_portal/captive_portal.cpp
+++ b/esphome/components/captive_portal/captive_portal.cpp
@@ -13,14 +13,16 @@ 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(get_mac_address_pretty().c_str());
+  stream->print(mac_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":[{})", get_mac_address_pretty().c_str(), App.get_name().c_str());
+  stream->printf(R"({"mac":"%s","name":"%s","aps":[{})", mac_str, App.get_name().c_str());
 #endif

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

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

  network::IPAddress ip = wifi::global_wifi_component->wifi_soft_ap_ip();
--- a/esphome/components/captive_portal/captive_portal.h
+++ b/esphome/components/captive_portal/captive_portal.h
@@ -40,6 +40,10 @@ class CaptivePortal : public AsyncWebHandler, public Component {
  void end() {
    this->active_ = false;
    this->disable_loop();  // Stop processing DNS requests
+#ifdef USE_ESP32
+    // Disable LRU socket purging now that captive portal is done
+    this->base_->get_server()->set_lru_purge_enable(false);
+#endif
    this->base_->deinit();
    if (this->dns_server_ != nullptr) {
      this->dns_server_->stop();
--- a/esphome/components/climate_ir/init.py
+++ b/esphome/components/climate_ir/init.py
@@ -3,7 +3,12 @@ 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_SENSOR, CONF_SUPPORTS_COOL, CONF_SUPPORTS_HEAT
+from esphome.const import (
+    CONF_HUMIDITY_SENSOR,
+    CONF_SENSOR,
+    CONF_SUPPORTS_COOL,
+    CONF_SUPPORTS_HEAT,
+)
 from esphome.cpp_generator import MockObjClass

 _LOGGER = logging.getLogger(__name__)
@@ -32,6 +37,7 @@ 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)
@@ -61,6 +67,9 @@ 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,7 +11,9 @@ 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);
@@ -39,9 +41,16 @@ 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,6 +43,7 @@ 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_;
@@ -67,6 +68,7 @@ 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,8 +4,7 @@
 #include "esphome/core/automation.h"
 #include "cover.h"

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

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

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

 #include "esphome/core/log.h"

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

 static const char *const TAG = "cover";

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

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

 #include "cover_traits.h"

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

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

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

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

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

-}  // namespace cover
-}  // namespace esphome
+}  // namespace esphome::cover
--- a/esphome/components/cst816/touchscreen/cst816_touchscreen.cpp
+++ b/esphome/components/cst816/touchscreen/cst816_touchscreen.cpp
@@ -19,8 +19,9 @@ void CST816Touchscreen::continue_setup_() {
      case CST816T_CHIP_ID:
        break;
      default:
+        ESP_LOGE(TAG, "Unknown chip ID: 0x%02X", this->chip_id_);
+        this->status_set_error("Unknown chip ID");
        this->mark_failed();
-        this->status_set_error(str_sprintf("Unknown chip ID 0x%02X", this->chip_id_).c_str());
        return;
    }
    this->write_byte(REG_IRQ_CTL, IRQ_EN_MOTION);
--- 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 std::string g_package_import_url;  // NOLINT
+static const char *g_package_import_url = "";  // NOLINT

-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); }
+const char *get_package_import_url() { return g_package_import_url; }
+void set_package_import_url(const char *url) { g_package_import_url = url; }

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

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

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

 }  // namespace dashboard_import
 }  // namespace esphome
--- a/esphome/components/epaper_spi/display.py
+++ b/esphome/components/epaper_spi/display.py
@@ -102,7 +102,7 @@ def customise_schema(config):
    """
    config = cv.Schema(
        {
-            cv.Required(CONF_MODEL): cv.one_of(*MODELS, upper=True),
+            cv.Required(CONF_MODEL): cv.one_of(*MODELS, upper=True, space="-"),
        },
        extra=cv.ALLOW_EXTRA,
    )(config)
--- a/esphome/components/epaper_spi/models/spectra_e6.py
+++ b/esphome/components/epaper_spi/models/spectra_e6.py
@@ -32,11 +32,15 @@ class SpectraE6(EpaperModel):

 spectra_e6 = SpectraE6("spectra-e6")

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

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

    add_idf_sdkconfig_option(f"CONFIG_IDF_TARGET_{variant}", True)
--- a/esphome/components/esp32/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_improv/init.py
+++ b/esphome/components/esp32_improv/init.py
@@ -20,6 +20,10 @@ CONF_ON_STOP = "on_stop"
 CONF_STATUS_INDICATOR = "status_indicator"
 CONF_WIFI_TIMEOUT = "wifi_timeout"

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

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

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

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

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

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

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

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

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

  // Group all uint8_t types together (enums and bools)
--- a/esphome/components/font/init.py
+++ b/esphome/components/font/init.py
@@ -36,7 +36,6 @@ 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__)
@@ -50,7 +49,6 @@ 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"
@@ -463,7 +461,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(GlyphData),
+        cv.GenerateID(CONF_RAW_GLYPH_ID): cv.declare_id(Glyph),
    },
 )

@@ -488,6 +486,8 @@ 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,22 +583,15 @@ async def to_code(config):

    # Create the glyph table that points to data in the above array.
    glyph_initializer = [
-        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),
-        )
+        [
+            x.glyph,
+            prog_arr + (y - len(x.bitmap_data)),
+            x.advance,
+            x.offset_x,
+            x.offset_y,
+            x.width,
+            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,133 +6,245 @@

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

-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;
+#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;
  }
-  // 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;
+  return gd->data;
 }

-Font::Font(const GlyphData *data, int data_nr, int baseline, int height, int descender, int xheight, int capheight,
+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,
           uint8_t bpp)
-    : baseline_(baseline),
+    : glyphs_(ConstVector(data, data_nr)),
+      baseline_(baseline),
      height_(height),
      descender_(descender),
      linegap_(height - baseline - descender),
      xheight_(xheight),
      capheight_(capheight),
      bpp_(bpp) {
-  glyphs_.reserve(data_nr);
-  for (int i = 0; i < data_nr; ++i)
-    glyphs_.emplace_back(&data[i]);
+#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
 }
-int Font::match_next_glyph(const uint8_t *str, int *match_length) {
+
+const Glyph *Font::find_glyph(uint32_t codepoint) const {
  int lo = 0;
  int hi = this->glyphs_.size() - 1;
  while (lo != hi) {
    int mid = (lo + hi + 1) / 2;
-    if (this->glyphs_[mid].compare_to(str)) {
+    if (this->glyphs_[mid].is_less_or_equal(codepoint)) {
      lo = mid;
    } else {
      hi = mid - 1;
    }
  }
-  *match_length = this->glyphs_[lo].match_length(str);
-  if (*match_length <= 0)
-    return -1;
-  return lo;
+  auto *result = &this->glyphs_[lo];
+  if (result->code_point == codepoint)
+    return result;
+  return nullptr;
 }
+
 #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;
-  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) {
+  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) {
      // Unknown char, skip
-      if (!this->get_glyphs().empty())
-        x += this->get_glyphs()[0].glyph_data_->advance;
-      i++;
+      if (!this->glyphs_.empty())
+        x += this->glyphs_[0].advance;
      continue;
    }

-    const Glyph &glyph = this->glyphs_[glyph_n];
    if (!has_char) {
-      min_x = glyph.glyph_data_->offset_x;
+      min_x = glyph->offset_x;
    } else {
-      min_x = std::min(min_x, x + glyph.glyph_data_->offset_x);
+      min_x = std::min(min_x, x + glyph->offset_x);
    }
-    x += glyph.glyph_data_->advance;
+    x += glyph->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;
-  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) {
+  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) {
      // Unknown char, skip
-      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);
+      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);
        x_at += glyph_width;
      }
-
-      i++;
      continue;
    }

-    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;
+    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;

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

 namespace esphome {
 namespace font {

 class Font;

-struct GlyphData {
-  const uint8_t *a_char;
+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;
  const uint8_t *data;
  int advance;
  int offset_x;
@@ -22,26 +38,6 @@ struct GlyphData {
  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
@@ -50,8 +46,8 @@ class Font
 public:
  /** Construct the font with the given glyphs.
   *
-   * @param data A vector of glyphs, must be sorted lexicographically.
-   * @param data_nr The number of glyphs in data.
+   * @param data A list of glyphs, must be sorted lexicographically.
+   * @param data_nr The number of glyphs
   * @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).
@@ -59,10 +55,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 GlyphData *data, int data_nr, int baseline, int height, int descender, int xheight, int capheight,
+  Font(const Glyph *data, int data_nr, int baseline, int height, int descender, int xheight, int capheight,
       uint8_t bpp = 1);

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

 #ifdef USE_DISPLAY
  void print(int x_start, int y_start, display::Display *display, Color color, const char *text,
@@ -77,11 +73,14 @@ 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 std::vector<Glyph, RAMAllocator<Glyph>> &get_glyphs() const { return glyphs_; }
+  const ConstVector<Glyph> &get_glyphs() const { return glyphs_; }

 protected:
-  std::vector<Glyph, RAMAllocator<Glyph>> glyphs_;
+  ConstVector<Glyph> glyphs_;
  int baseline_;
  int height_;
  int descender_;
@@ -89,6 +88,14 @@ 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/graph/graph.cpp
+++ b/esphome/components/graph/graph.cpp
@@ -337,7 +337,7 @@ void Graph::draw_legend(display::Display *buff, uint16_t x_offset, uint16_t y_of
    return;

  /// Plot border
-  if (this->border_) {
+  if (legend_->border_) {
    int w = legend_->width_;
    int h = legend_->height_;
    buff->horizontal_line(x_offset, y_offset, w, color);
--- a/esphome/components/hc8/init.py
+++ b/esphome/components/hc8/init.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@omartijn"]
--- a/esphome/components/hc8/hc8.cpp
+++ b/esphome/components/hc8/hc8.cpp
@@ -0,0 +1,99 @@
+#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
@@ -0,0 +1,37 @@
+#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
@@ -0,0 +1,79 @@
+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/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.c_str()); });
+    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.c_str()); });
+    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.c_str()); });
+    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,6 +8,22 @@ 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.");
@@ -31,21 +47,6 @@ 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/jsn_sr04t/jsn_sr04t.cpp
+++ b/esphome/components/jsn_sr04t/jsn_sr04t.cpp
@@ -10,7 +10,7 @@ namespace jsn_sr04t {
 static const char *const TAG = "jsn_sr04t.sensor";

 void Jsnsr04tComponent::update() {
-  this->write_byte(0x55);
+  this->write_byte((this->model_ == AJ_SR04M) ? 0x01 : 0x55);
  ESP_LOGV(TAG, "Request read out from sensor");
 }

@@ -31,19 +31,10 @@ void Jsnsr04tComponent::loop() {
 }

 void Jsnsr04tComponent::check_buffer_() {
-  uint8_t checksum = 0;
-  switch (this->model_) {
-    case JSN_SR04T:
-      checksum = this->buffer_[0] + this->buffer_[1] + this->buffer_[2];
-      break;
-    case AJ_SR04M:
-      checksum = this->buffer_[1] + this->buffer_[2];
-      break;
-  }
-
+  uint8_t checksum = this->buffer_[0] + this->buffer_[1] + this->buffer_[2];
  if (this->buffer_[3] == checksum) {
    uint16_t distance = encode_uint16(this->buffer_[1], this->buffer_[2]);
-    if (distance > 250) {
+    if (distance > ((this->model_ == AJ_SR04M) ? 200 : 250)) {
      float meters = distance / 1000.0f;
      ESP_LOGV(TAG, "Distance from sensor: %umm, %.3fm", distance, meters);
      this->publish_state(meters);
--- a/esphome/components/ld2410/automation.h
+++ b/esphome/components/ld2410/automation.h
@@ -4,8 +4,7 @@
 #include "esphome/core/component.h"
 #include "ld2410.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 #include "esphome/core/application.h"

-namespace esphome {
-namespace ld2410 {
+namespace esphome::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,
@@ -181,15 +178,15 @@ static inline bool validate_header_footer(const uint8_t *header_footer, const ui
 }

 void LD2410Component::dump_config() {
-  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]);
+  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);
  ESP_LOGCONFIG(TAG,
                "LD2410:\n"
                "  Firmware version: %s\n"
                "  MAC address: %s",
-                version.c_str(), mac_str.c_str());
+                version_s, mac_str);
 #ifdef USE_BINARY_SENSOR
  ESP_LOGCONFIG(TAG, "Binary Sensors:");
  LOG_BINARY_SENSOR("  ", "Target", this->target_binary_sensor_);
@@ -448,12 +445,12 @@ bool LD2410Component::handle_ack_data_() {

    case CMD_QUERY_VERSION: {
      std::memcpy(this->version_, &this->buffer_data_[12], sizeof(this->version_));
-      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());
+      char version_s[20];
+      ld24xx::format_version_str(this->version_, version_s);
+      ESP_LOGV(TAG, "Firmware version: %s", version_s);
 #ifdef USE_TEXT_SENSOR
      if (this->version_text_sensor_ != nullptr) {
-        this->version_text_sensor_->publish_state(version);
+        this->version_text_sensor_->publish_state(version_s);
      }
 #endif
      break;
@@ -506,9 +503,9 @@ bool LD2410Component::handle_ack_data_() {
        std::memcpy(this->mac_address_, &this->buffer_data_[10], sizeof(this->mac_address_));
      }

-      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());
+      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);
 #ifdef USE_TEXT_SENSOR
      if (this->mac_text_sensor_ != nullptr) {
        this->mac_text_sensor_->publish_state(mac_str);
@@ -784,5 +781,4 @@ void LD2410Component::set_gate_still_sensor(uint8_t gate, sensor::Sensor *s) {
 }
 #endif

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

 #include <array>

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

 using namespace ld24xx;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
--- a/esphome/components/ld2410/sensor.py
+++ b/esphome/components/ld2410/sensor.py
@@ -31,35 +31,83 @@ CONFIG_SCHEMA = cv.Schema(
        cv.GenerateID(CONF_LD2410_ID): cv.use_id(LD2410Component),
        cv.Optional(CONF_MOVING_DISTANCE): sensor.sensor_schema(
            device_class=DEVICE_CLASS_DISTANCE,
-            filters=[{"throttle_with_priority": cv.TimePeriod(milliseconds=1000)}],
+            filters=[
+                {
+                    "timeout": {
+                        "timeout": cv.TimePeriod(milliseconds=1000),
+                        "value": "last",
+                    }
+                },
+                {"throttle_with_priority": cv.TimePeriod(milliseconds=1000)},
+            ],
            icon=ICON_SIGNAL,
            unit_of_measurement=UNIT_CENTIMETER,
        ),
        cv.Optional(CONF_STILL_DISTANCE): sensor.sensor_schema(
            device_class=DEVICE_CLASS_DISTANCE,
-            filters=[{"throttle_with_priority": cv.TimePeriod(milliseconds=1000)}],
+            filters=[
+                {
+                    "timeout": {
+                        "timeout": cv.TimePeriod(milliseconds=1000),
+                        "value": "last",
+                    }
+                },
+                {"throttle_with_priority": cv.TimePeriod(milliseconds=1000)},
+            ],
            icon=ICON_SIGNAL,
            unit_of_measurement=UNIT_CENTIMETER,
        ),
        cv.Optional(CONF_MOVING_ENERGY): sensor.sensor_schema(
-            filters=[{"throttle_with_priority": cv.TimePeriod(milliseconds=1000)}],
+            filters=[
+                {
+                    "timeout": {
+                        "timeout": cv.TimePeriod(milliseconds=1000),
+                        "value": "last",
+                    }
+                },
+                {"throttle_with_priority": cv.TimePeriod(milliseconds=1000)},
+            ],
            icon=ICON_MOTION_SENSOR,
            unit_of_measurement=UNIT_PERCENT,
        ),
        cv.Optional(CONF_STILL_ENERGY): sensor.sensor_schema(
-            filters=[{"throttle_with_priority": cv.TimePeriod(milliseconds=1000)}],
+            filters=[
+                {
+                    "timeout": {
+                        "timeout": cv.TimePeriod(milliseconds=1000),
+                        "value": "last",
+                    }
+                },
+                {"throttle_with_priority": cv.TimePeriod(milliseconds=1000)},
+            ],
            icon=ICON_FLASH,
            unit_of_measurement=UNIT_PERCENT,
        ),
        cv.Optional(CONF_LIGHT): sensor.sensor_schema(
            device_class=DEVICE_CLASS_ILLUMINANCE,
            entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
-            filters=[{"throttle_with_priority": cv.TimePeriod(milliseconds=1000)}],
+            filters=[
+                {
+                    "timeout": {
+                        "timeout": cv.TimePeriod(milliseconds=1000),
+                        "value": "last",
+                    }
+                },
+                {"throttle_with_priority": cv.TimePeriod(milliseconds=1000)},
+            ],
            icon=ICON_LIGHTBULB,
        ),
        cv.Optional(CONF_DETECTION_DISTANCE): sensor.sensor_schema(
            device_class=DEVICE_CLASS_DISTANCE,
-            filters=[{"throttle_with_priority": cv.TimePeriod(milliseconds=1000)}],
+            filters=[
+                {
+                    "timeout": {
+                        "timeout": cv.TimePeriod(milliseconds=1000),
+                        "value": "last",
+                    }
+                },
+                {"throttle_with_priority": cv.TimePeriod(milliseconds=1000)},
+            ],
            icon=ICON_SIGNAL,
            unit_of_measurement=UNIT_CENTIMETER,
        ),
@@ -73,7 +121,13 @@ CONFIG_SCHEMA = CONFIG_SCHEMA.extend(
                cv.Optional(CONF_MOVE_ENERGY): sensor.sensor_schema(
                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
                    filters=[
-                        {"throttle_with_priority": cv.TimePeriod(milliseconds=1000)}
+                        {
+                            "timeout": {
+                                "timeout": cv.TimePeriod(milliseconds=1000),
+                                "value": "last",
+                            }
+                        },
+                        {"throttle_with_priority": cv.TimePeriod(milliseconds=1000)},
                    ],
                    icon=ICON_MOTION_SENSOR,
                    unit_of_measurement=UNIT_PERCENT,
@@ -81,7 +135,13 @@ CONFIG_SCHEMA = CONFIG_SCHEMA.extend(
                cv.Optional(CONF_STILL_ENERGY): sensor.sensor_schema(
                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
                    filters=[
-                        {"throttle_with_priority": cv.TimePeriod(milliseconds=1000)}
+                        {
+                            "timeout": {
+                                "timeout": cv.TimePeriod(milliseconds=1000),
+                                "value": "last",
+                            }
+                        },
+                        {"throttle_with_priority": cv.TimePeriod(milliseconds=1000)},
                    ],
                    icon=ICON_FLASH,
                    unit_of_measurement=UNIT_PERCENT,
--- a/esphome/components/ld2410/switch/bluetooth_switch.cpp
+++ b/esphome/components/ld2410/switch/bluetooth_switch.cpp
@@ -1,12 +1,10 @@
 #include "bluetooth_switch.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
--- a/Show More
+++ b/Show More