Merge pull request #10308 from esphome/bump-2025.8.0b4

2025.8.0b4
Bump version to 2025.8.0b4
2025-11-01 23:51:47 +00:00 · 2025-08-20 10:30:37 +12:00 · 2025-08-20 09:40:19 +12:00 · 2025-08-20 09:40:19 +12:00 · 2025-08-20 09:40:19 +12:00 · 2025-08-20 09:40:19 +12:00
250 changed files with 6730 additions and 1896 deletions
--- a/.github/actions/restore-python/action.yml
+++ b/.github/actions/restore-python/action.yml
@@ -22,7 +22,7 @@ runs:
        python-version: ${{ inputs.python-version }}
    - name: Restore Python virtual environment
      id: cache-venv
-      uses: actions/cache/restore@v4.2.3
+      uses: actions/cache/restore@v4.2.4
      with:
        path: venv
        # yamllint disable-line rule:line-length
--- 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@v4.2.2
+        uses: actions/checkout@v5.0.0

      - name: Generate a token
        id: generate-token
--- a/.github/workflows/ci-api-proto.yml
+++ b/.github/workflows/ci-api-proto.yml
@@ -21,7 +21,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Set up Python
        uses: actions/setup-python@v5.6.0
        with:
--- a/.github/workflows/ci-clang-tidy-hash.yml
+++ b/.github/workflows/ci-clang-tidy-hash.yml
@@ -20,7 +20,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0

      - name: Set up Python
        uses: actions/setup-python@v5.6.0
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -43,7 +43,7 @@ jobs:
          - "docker"
          # - "lint"
    steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v5.0.0
      - name: Set up Python
        uses: actions/setup-python@v5.6.0
        with:
--- 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@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Generate cache-key
        id: cache-key
        run: echo key="${{ hashFiles('requirements.txt', 'requirements_test.txt', '.pre-commit-config.yaml') }}" >> $GITHUB_OUTPUT
@@ -47,7 +47,7 @@ jobs:
          python-version: ${{ env.DEFAULT_PYTHON }}
      - name: Restore Python virtual environment
        id: cache-venv
-        uses: actions/cache@v4.2.3
+        uses: actions/cache@v4.2.4
        with:
          path: venv
          # yamllint disable-line rule:line-length
@@ -70,7 +70,7 @@ jobs:
    if: needs.determine-jobs.outputs.python-linters == 'true'
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Restore Python
        uses: ./.github/actions/restore-python
        with:
@@ -91,7 +91,7 @@ jobs:
      - common
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Restore Python
        uses: ./.github/actions/restore-python
        with:
@@ -136,7 +136,7 @@ jobs:
      - common
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Restore Python
        id: restore-python
        uses: ./.github/actions/restore-python
@@ -161,7 +161,7 @@ jobs:
          token: ${{ secrets.CODECOV_TOKEN }}
      - name: Save Python virtual environment cache
        if: github.ref == 'refs/heads/dev'
-        uses: actions/cache/save@v4.2.3
+        uses: actions/cache/save@v4.2.4
        with:
          path: venv
          key: ${{ runner.os }}-${{ steps.restore-python.outputs.python-version }}-venv-${{ needs.common.outputs.cache-key }}
@@ -179,7 +179,7 @@ jobs:
      component-test-count: ${{ steps.determine.outputs.component-test-count }}
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
        with:
          # Fetch enough history to find the merge base
          fetch-depth: 2
@@ -214,7 +214,7 @@ jobs:
    if: needs.determine-jobs.outputs.integration-tests == 'true'
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Set up Python 3.13
        id: python
        uses: actions/setup-python@v5.6.0
@@ -222,7 +222,7 @@ jobs:
          python-version: "3.13"
      - name: Restore Python virtual environment
        id: cache-venv
-        uses: actions/cache@v4.2.3
+        uses: actions/cache@v4.2.4
        with:
          path: venv
          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{ needs.common.outputs.cache-key }}
@@ -287,7 +287,7 @@ jobs:

    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
        with:
          # Need history for HEAD~1 to work for checking changed files
          fetch-depth: 2
@@ -300,14 +300,14 @@ jobs:

      - name: Cache platformio
        if: github.ref == 'refs/heads/dev'
-        uses: actions/cache@v4.2.3
+        uses: actions/cache@v4.2.4
        with:
          path: ~/.platformio
          key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}

      - name: Cache platformio
        if: github.ref != 'refs/heads/dev'
-        uses: actions/cache/restore@v4.2.3
+        uses: actions/cache/restore@v4.2.4
        with:
          path: ~/.platformio
          key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}
@@ -374,7 +374,7 @@ jobs:
          sudo apt-get install libsdl2-dev

      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Restore Python
        uses: ./.github/actions/restore-python
        with:
@@ -400,7 +400,7 @@ jobs:
      matrix: ${{ steps.split.outputs.components }}
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Split components into 20 groups
        id: split
        run: |
@@ -430,7 +430,7 @@ jobs:
          sudo apt-get install libsdl2-dev

      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Restore Python
        uses: ./.github/actions/restore-python
        with:
@@ -459,7 +459,7 @@ jobs:
    if: github.event_name == 'pull_request' && github.base_ref != 'beta' && github.base_ref != 'release'
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Restore Python
        uses: ./.github/actions/restore-python
        with:
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -54,7 +54,7 @@ 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@v4
+        uses: actions/checkout@v5.0.0

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
--- 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@v4.2.2
+      - uses: actions/checkout@v5.0.0
      - name: Get tag
        id: tag
        # yamllint disable rule:line-length
@@ -60,7 +60,7 @@ jobs:
      contents: read
      id-token: write
    steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v5.0.0
      - name: Set up Python
        uses: actions/setup-python@v5.6.0
        with:
@@ -92,7 +92,7 @@ jobs:
            os: "ubuntu-24.04-arm"

    steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v5.0.0
      - name: Set up Python
        uses: actions/setup-python@v5.6.0
        with:
@@ -102,12 +102,12 @@ jobs:
        uses: docker/setup-buildx-action@v3.11.1

      - name: Log in to docker hub
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v3.5.0
        with:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASSWORD }}
      - name: Log in to the GitHub container registry
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v3.5.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -168,10 +168,10 @@ jobs:
          - ghcr
          - dockerhub
    steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v5.0.0

      - name: Download digests
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v5.0.0
        with:
          pattern: digests-*
          path: /tmp/digests
@@ -182,13 +182,13 @@ jobs:

      - name: Log in to docker hub
        if: matrix.registry == 'dockerhub'
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v3.5.0
        with:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASSWORD }}
      - name: Log in to the GitHub container registry
        if: matrix.registry == 'ghcr'
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v3.5.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
--- 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@v4.2.2
+        uses: actions/checkout@v5.0.0

      - name: Checkout Home Assistant
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
        with:
          repository: home-assistant/core
          path: lib/home-assistant
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -11,7 +11,7 @@ ci:
 repos:
  - repo: https://github.com/astral-sh/ruff-pre-commit
    # Ruff version.
-    rev: v0.12.7
+    rev: v0.12.8
    hooks:
      # Run the linter.
      - id: ruff
--- a/22
+++ b/22
@@ -40,11 +40,11 @@ esphome/components/analog_threshold/* @ianchi
 esphome/components/animation/* @syndlex
 esphome/components/anova/* @buxtronix
 esphome/components/apds9306/* @aodrenah
-esphome/components/api/* @OttoWinter
+esphome/components/api/* @esphome/core
 esphome/components/as5600/* @ammmze
 esphome/components/as5600/sensor/* @ammmze
 esphome/components/as7341/* @mrgnr
-esphome/components/async_tcp/* @OttoWinter
+esphome/components/async_tcp/* @esphome/core
 esphome/components/at581x/* @X-Ryl669
 esphome/components/atc_mithermometer/* @ahpohl
 esphome/components/atm90e26/* @danieltwagner
@@ -69,7 +69,7 @@ esphome/components/bl0939/* @ziceva
 esphome/components/bl0940/* @tobias-
 esphome/components/bl0942/* @dbuezas @dwmw2
 esphome/components/ble_client/* @buxtronix @clydebarrow
-esphome/components/bluetooth_proxy/* @jesserockz
+esphome/components/bluetooth_proxy/* @bdraco @jesserockz
 esphome/components/bme280_base/* @esphome/core
 esphome/components/bme280_spi/* @apbodrov
 esphome/components/bme680_bsec/* @trvrnrth
@@ -91,7 +91,7 @@ esphome/components/bytebuffer/* @clydebarrow
 esphome/components/camera/* @DT-art1 @bdraco
 esphome/components/canbus/* @danielschramm @mvturnho
 esphome/components/cap1188/* @mreditor97
-esphome/components/captive_portal/* @OttoWinter
+esphome/components/captive_portal/* @esphome/core
 esphome/components/ccs811/* @habbie
 esphome/components/cd74hc4067/* @asoehlke
 esphome/components/ch422g/* @clydebarrow @jesterret
@@ -118,7 +118,7 @@ esphome/components/dallas_temp/* @ssieb
 esphome/components/daly_bms/* @s1lvi0
 esphome/components/dashboard_import/* @esphome/core
 esphome/components/datetime/* @jesserockz @rfdarter
-esphome/components/debug/* @OttoWinter
+esphome/components/debug/* @esphome/core
 esphome/components/delonghi/* @grob6000
 esphome/components/dfplayer/* @glmnet
 esphome/components/dfrobot_sen0395/* @niklasweber
@@ -144,9 +144,10 @@ esphome/components/es8156/* @kbx81
 esphome/components/es8311/* @kahrendt @kroimon
 esphome/components/es8388/* @P4uLT
 esphome/components/esp32/* @esphome/core
-esphome/components/esp32_ble/* @Rapsssito @jesserockz
-esphome/components/esp32_ble_client/* @jesserockz
+esphome/components/esp32_ble/* @Rapsssito @bdraco @jesserockz
+esphome/components/esp32_ble_client/* @bdraco @jesserockz
 esphome/components/esp32_ble_server/* @Rapsssito @clydebarrow @jesserockz
+esphome/components/esp32_ble_tracker/* @bdraco
 esphome/components/esp32_camera_web_server/* @ayufan
 esphome/components/esp32_can/* @Sympatron
 esphome/components/esp32_hosted/* @swoboda1337
@@ -237,7 +238,7 @@ esphome/components/integration/* @OttoWinter
 esphome/components/internal_temperature/* @Mat931
 esphome/components/interval/* @esphome/core
 esphome/components/jsn_sr04t/* @Mafus1
-esphome/components/json/* @OttoWinter
+esphome/components/json/* @esphome/core
 esphome/components/kamstrup_kmp/* @cfeenstra1024
 esphome/components/key_collector/* @ssieb
 esphome/components/key_provider/* @ssieb
@@ -245,6 +246,7 @@ esphome/components/kuntze/* @ssieb
 esphome/components/lc709203f/* @ilikecake
 esphome/components/lcd_menu/* @numo68
 esphome/components/ld2410/* @regevbr @sebcaps
+esphome/components/ld2412/* @Rihan9
 esphome/components/ld2420/* @descipher
 esphome/components/ld2450/* @hareeshmu
 esphome/components/ld24xx/* @kbx81
@@ -467,7 +469,7 @@ esphome/components/template/event/* @nohat
 esphome/components/template/fan/* @ssieb
 esphome/components/text/* @mauritskorse
 esphome/components/thermostat/* @kbx81
-esphome/components/time/* @OttoWinter
+esphome/components/time/* @esphome/core
 esphome/components/tlc5947/* @rnauber
 esphome/components/tlc5971/* @IJIJI
 esphome/components/tm1621/* @Philippe12
@@ -511,7 +513,7 @@ esphome/components/wake_on_lan/* @clydebarrow @willwill2will54
 esphome/components/watchdog/* @oarcher
 esphome/components/waveshare_epaper/* @clydebarrow
 esphome/components/web_server/ota/* @esphome/core
-esphome/components/web_server_base/* @OttoWinter
+esphome/components/web_server_base/* @esphome/core
 esphome/components/web_server_idf/* @dentra
 esphome/components/weikai/* @DrCoolZic
 esphome/components/weikai_i2c/* @DrCoolZic
--- a/2
+++ b/2
@@ -48,7 +48,7 @@ PROJECT_NAME           = ESPHome
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 2025.8.0-dev
+PROJECT_NUMBER         = 2025.8.0b4

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
--- a/docker/build.py
+++ b/docker/build.py
@@ -90,7 +90,7 @@ def main():
    def run_command(*cmd, ignore_error: bool = False):
        print(f"$ {shlex.join(list(cmd))}")
        if not args.dry_run:
-            rc = subprocess.call(list(cmd))
+            rc = subprocess.call(list(cmd), close_fds=False)
            if rc != 0 and not ignore_error:
                print("Command failed")
                sys.exit(1)
--- a/esphome/main.py
+++ b/esphome/main.py
@@ -9,6 +9,7 @@ import os
 import re
 import sys
 import time
+from typing import Protocol

 import argcomplete

@@ -44,6 +45,7 @@ from esphome.const import (
 from esphome.core import CORE, EsphomeError, coroutine
 from esphome.helpers import get_bool_env, indent, is_ip_address
 from esphome.log import AnsiFore, color, setup_log
+from esphome.types import ConfigType
 from esphome.util import (
    get_serial_ports,
    list_yaml_files,
@@ -55,6 +57,23 @@ from esphome.util import (
 _LOGGER = logging.getLogger(__name__)


+class ArgsProtocol(Protocol):
+    device: list[str] | None
+    reset: bool
+    username: str | None
+    password: str | None
+    client_id: str | None
+    topic: str | None
+    file: str | None
+    no_logs: bool
+    only_generate: bool
+    show_secrets: bool
+    dashboard: bool
+    configuration: str
+    name: str
+    upload_speed: str | None
+
+
 def choose_prompt(options, purpose: str = None):
    if not options:
        raise EsphomeError(
@@ -88,30 +107,54 @@ def choose_prompt(options, purpose: str = None):


 def choose_upload_log_host(
-    default, check_default, show_ota, show_mqtt, show_api, purpose: str = None
-):
+    default: list[str] | str | None,
+    check_default: str | None,
+    show_ota: bool,
+    show_mqtt: bool,
+    show_api: bool,
+    purpose: str | None = None,
+) -> list[str]:
+    # Convert to list for uniform handling
+    defaults = [default] if isinstance(default, str) else default or []
+
+    # If devices specified, resolve them
+    if defaults:
+        resolved: list[str] = []
+        for device in defaults:
+            if device == "SERIAL":
+                serial_ports = get_serial_ports()
+                if not serial_ports:
+                    _LOGGER.warning("No serial ports found, skipping SERIAL device")
+                    continue
+                options = [
+                    (f"{port.path} ({port.description})", port.path)
+                    for port in serial_ports
+                ]
+                resolved.append(choose_prompt(options, purpose=purpose))
+            elif device == "OTA":
+                if (show_ota and "ota" in CORE.config) or (
+                    show_api and "api" in CORE.config
+                ):
+                    resolved.append(CORE.address)
+                elif show_mqtt and has_mqtt_logging():
+                    resolved.append("MQTT")
+            else:
+                resolved.append(device)
+        return resolved
+
+    # No devices specified, show interactive chooser
    options = [
        (f"{port.path} ({port.description})", port.path) for port in get_serial_ports()
    ]
-    if default == "SERIAL":
-        return choose_prompt(options, purpose=purpose)
    if (show_ota and "ota" in CORE.config) or (show_api and "api" in CORE.config):
        options.append((f"Over The Air ({CORE.address})", CORE.address))
-        if default == "OTA":
-            return CORE.address
-    if (
-        show_mqtt
-        and (mqtt_config := CORE.config.get(CONF_MQTT))
-        and mqtt_logging_enabled(mqtt_config)
-    ):
+    if show_mqtt and has_mqtt_logging():
+        mqtt_config = CORE.config[CONF_MQTT]
        options.append((f"MQTT ({mqtt_config[CONF_BROKER]})", "MQTT"))
-        if default == "OTA":
-            return "MQTT"
-    if default is not None:
-        return default
+
    if check_default is not None and check_default in [opt[1] for opt in options]:
-        return check_default
-    return choose_prompt(options, purpose=purpose)
+        return [check_default]
+    return [choose_prompt(options, purpose=purpose)]


 def mqtt_logging_enabled(mqtt_config):
@@ -123,7 +166,14 @@ def mqtt_logging_enabled(mqtt_config):
    return log_topic.get(CONF_LEVEL, None) != "NONE"


-def get_port_type(port):
+def has_mqtt_logging() -> bool:
+    """Check if MQTT logging is available."""
+    return (mqtt_config := CORE.config.get(CONF_MQTT)) and mqtt_logging_enabled(
+        mqtt_config
+    )
+
+
+def get_port_type(port: str) -> str:
    if port.startswith("/") or port.startswith("COM"):
        return "SERIAL"
    if port == "MQTT":
@@ -131,7 +181,7 @@ def get_port_type(port):
    return "NETWORK"


-def run_miniterm(config, port, args):
+def run_miniterm(config: ConfigType, port: str, args) -> int:
    from aioesphomeapi import LogParser
    import serial

@@ -208,7 +258,7 @@ def wrap_to_code(name, comp):
    return wrapped


-def write_cpp(config):
+def write_cpp(config: ConfigType) -> int:
    if not get_bool_env(ENV_NOGITIGNORE):
        writer.write_gitignore()

@@ -216,7 +266,7 @@ def write_cpp(config):
    return write_cpp_file()


-def generate_cpp_contents(config):
+def generate_cpp_contents(config: ConfigType) -> None:
    _LOGGER.info("Generating C++ source...")

    for name, component, conf in iter_component_configs(CORE.config):
@@ -227,7 +277,7 @@ def generate_cpp_contents(config):
    CORE.flush_tasks()


-def write_cpp_file():
+def write_cpp_file() -> int:
    code_s = indent(CORE.cpp_main_section)
    writer.write_cpp(code_s)

@@ -238,7 +288,7 @@ def write_cpp_file():
    return 0


-def compile_program(args, config):
+def compile_program(args: ArgsProtocol, config: ConfigType) -> int:
    from esphome import platformio_api

    _LOGGER.info("Compiling app...")
@@ -249,7 +299,9 @@ def compile_program(args, config):
    return 0 if idedata is not None else 1


-def upload_using_esptool(config, port, file, speed):
+def upload_using_esptool(
+    config: ConfigType, port: str, file: str, speed: int
+) -> str | int:
    from esphome import platformio_api

    first_baudrate = speed or config[CONF_ESPHOME][CONF_PLATFORMIO_OPTIONS].get(
@@ -314,7 +366,7 @@ def upload_using_esptool(config, port, file, speed):
    return run_esptool(115200)


-def upload_using_platformio(config, port):
+def upload_using_platformio(config: ConfigType, port: str):
    from esphome import platformio_api

    upload_args = ["-t", "upload", "-t", "nobuild"]
@@ -323,7 +375,7 @@ def upload_using_platformio(config, port):
    return platformio_api.run_platformio_cli_run(config, CORE.verbose, *upload_args)


-def check_permissions(port):
+def check_permissions(port: str):
    if os.name == "posix" and get_port_type(port) == "SERIAL":
        # Check if we can open selected serial port
        if not os.access(port, os.F_OK):
@@ -341,7 +393,7 @@ def check_permissions(port):
            )


-def upload_program(config, args, host):
+def upload_program(config: ConfigType, args: ArgsProtocol, host: str) -> int | str:
    try:
        module = importlib.import_module("esphome.components." + CORE.target_platform)
        if getattr(module, "upload_program")(config, args, host):
@@ -356,7 +408,7 @@ def upload_program(config, args, host):
            return upload_using_esptool(config, host, file, args.upload_speed)

        if CORE.target_platform in (PLATFORM_RP2040):
-            return upload_using_platformio(config, args.device)
+            return upload_using_platformio(config, host)

        if CORE.is_libretiny:
            return upload_using_platformio(config, host)
@@ -379,9 +431,12 @@ def upload_program(config, args, host):
    remote_port = int(ota_conf[CONF_PORT])
    password = ota_conf.get(CONF_PASSWORD, "")

+    # Check if we should use MQTT for address resolution
+    # This happens when no device was specified, or the current host is "MQTT"/"OTA"
+    devices: list[str] = args.device or []
    if (
        CONF_MQTT in config  # pylint: disable=too-many-boolean-expressions
-        and (not args.device or args.device in ("MQTT", "OTA"))
+        and (not devices or host in ("MQTT", "OTA"))
        and (
            ((config[CONF_MDNS][CONF_DISABLED]) and not is_ip_address(CORE.address))
            or get_port_type(host) == "MQTT"
@@ -399,24 +454,29 @@ def upload_program(config, args, host):
    return espota2.run_ota(host, remote_port, password, CORE.firmware_bin)


-def show_logs(config, args, port):
+def show_logs(config: ConfigType, args: ArgsProtocol, devices: list[str]) -> int | None:
    if "logger" not in config:
        raise EsphomeError("Logger is not configured!")
+
+    port = devices[0]
+
    if get_port_type(port) == "SERIAL":
        check_permissions(port)
        return run_miniterm(config, port, args)
    if get_port_type(port) == "NETWORK" and "api" in config:
+        addresses_to_use = devices
        if config[CONF_MDNS][CONF_DISABLED] and CONF_MQTT in config:
            from esphome import mqtt

-            port = mqtt.get_esphome_device_ip(
+            mqtt_address = mqtt.get_esphome_device_ip(
                config, args.username, args.password, args.client_id
            )[0]
+            addresses_to_use = [mqtt_address]

        from esphome.components.api.client import run_logs

-        return run_logs(config, port)
-    if get_port_type(port) == "MQTT" and "mqtt" in config:
+        return run_logs(config, addresses_to_use)
+    if get_port_type(port) in ("NETWORK", "MQTT") and "mqtt" in config:
        from esphome import mqtt

        return mqtt.show_logs(
@@ -426,7 +486,7 @@ def show_logs(config, args, port):
    raise EsphomeError("No remote or local logging method configured (api/mqtt/logger)")


-def clean_mqtt(config, args):
+def clean_mqtt(config: ConfigType, args: ArgsProtocol) -> int | None:
    from esphome import mqtt

    return mqtt.clear_topic(
@@ -434,13 +494,13 @@ def clean_mqtt(config, args):
    )


-def command_wizard(args):
+def command_wizard(args: ArgsProtocol) -> int | None:
    from esphome import wizard

    return wizard.wizard(args.configuration)


-def command_config(args, config):
+def command_config(args: ArgsProtocol, config: ConfigType) -> int | None:
    if not CORE.verbose:
        config = strip_default_ids(config)
    output = yaml_util.dump(config, args.show_secrets)
@@ -455,7 +515,7 @@ def command_config(args, config):
    return 0


-def command_vscode(args):
+def command_vscode(args: ArgsProtocol) -> int | None:
    from esphome import vscode

    logging.disable(logging.INFO)
@@ -463,7 +523,7 @@ def command_vscode(args):
    vscode.read_config(args)


-def command_compile(args, config):
+def command_compile(args: ArgsProtocol, config: ConfigType) -> int | None:
    exit_code = write_cpp(config)
    if exit_code != 0:
        return exit_code
@@ -477,8 +537,9 @@ def command_compile(args, config):
    return 0


-def command_upload(args, config):
-    port = choose_upload_log_host(
+def command_upload(args: ArgsProtocol, config: ConfigType) -> int | None:
+    # Get devices, resolving special identifiers like OTA
+    devices = choose_upload_log_host(
        default=args.device,
        check_default=None,
        show_ota=True,
@@ -486,14 +547,22 @@ def command_upload(args, config):
        show_api=False,
        purpose="uploading",
    )
-    exit_code = upload_program(config, args, port)
-    if exit_code != 0:
-        return exit_code
-    _LOGGER.info("Successfully uploaded program.")
-    return 0
+
+    # Try each device until one succeeds
+    exit_code = 1
+    for device in devices:
+        _LOGGER.info("Uploading to %s", device)
+        exit_code = upload_program(config, args, device)
+        if exit_code == 0:
+            _LOGGER.info("Successfully uploaded program.")
+            return 0
+        if len(devices) > 1:
+            _LOGGER.warning("Failed to upload to %s", device)
+
+    return exit_code


-def command_discover(args, config):
+def command_discover(args: ArgsProtocol, config: ConfigType) -> int | None:
    if "mqtt" in config:
        from esphome import mqtt

@@ -502,8 +571,9 @@ def command_discover(args, config):
    raise EsphomeError("No discover method configured (mqtt)")


-def command_logs(args, config):
-    port = choose_upload_log_host(
+def command_logs(args: ArgsProtocol, config: ConfigType) -> int | None:
+    # Get devices, resolving special identifiers like OTA
+    devices = choose_upload_log_host(
        default=args.device,
        check_default=None,
        show_ota=False,
@@ -511,10 +581,10 @@ def command_logs(args, config):
        show_api=True,
        purpose="logging",
    )
-    return show_logs(config, args, port)
+    return show_logs(config, args, devices)


-def command_run(args, config):
+def command_run(args: ArgsProtocol, config: ConfigType) -> int | None:
    exit_code = write_cpp(config)
    if exit_code != 0:
        return exit_code
@@ -531,7 +601,8 @@ def command_run(args, config):
        program_path = idedata.raw["prog_path"]
        return run_external_process(program_path)

-    port = choose_upload_log_host(
+    # Get devices, resolving special identifiers like OTA
+    devices = choose_upload_log_host(
        default=args.device,
        check_default=None,
        show_ota=True,
@@ -539,39 +610,53 @@ def command_run(args, config):
        show_api=True,
        purpose="uploading",
    )
-    exit_code = upload_program(config, args, port)
-    if exit_code != 0:
+
+    # Try each device for upload until one succeeds
+    successful_device: str | None = None
+    for device in devices:
+        _LOGGER.info("Uploading to %s", device)
+        exit_code = upload_program(config, args, device)
+        if exit_code == 0:
+            _LOGGER.info("Successfully uploaded program.")
+            successful_device = device
+            break
+        if len(devices) > 1:
+            _LOGGER.warning("Failed to upload to %s", device)
+
+    if successful_device is None:
        return exit_code
-    _LOGGER.info("Successfully uploaded program.")
+
    if args.no_logs:
        return 0
-    port = choose_upload_log_host(
-        default=args.device,
-        check_default=port,
+
+    # For logs, prefer the device we successfully uploaded to
+    devices = choose_upload_log_host(
+        default=successful_device,
+        check_default=successful_device,
        show_ota=False,
        show_mqtt=True,
        show_api=True,
        purpose="logging",
    )
-    return show_logs(config, args, port)
+    return show_logs(config, args, devices)


-def command_clean_mqtt(args, config):
+def command_clean_mqtt(args: ArgsProtocol, config: ConfigType) -> int | None:
    return clean_mqtt(config, args)


-def command_mqtt_fingerprint(args, config):
+def command_mqtt_fingerprint(args: ArgsProtocol, config: ConfigType) -> int | None:
    from esphome import mqtt

    return mqtt.get_fingerprint(config)


-def command_version(args):
+def command_version(args: ArgsProtocol) -> int | None:
    safe_print(f"Version: {const.__version__}")
    return 0


-def command_clean(args, config):
+def command_clean(args: ArgsProtocol, config: ConfigType) -> int | None:
    try:
        writer.clean_build()
    except OSError as err:
@@ -581,13 +666,13 @@ def command_clean(args, config):
    return 0


-def command_dashboard(args):
+def command_dashboard(args: ArgsProtocol) -> int | None:
    from esphome.dashboard import dashboard

    return dashboard.start_dashboard(args)


-def command_update_all(args):
+def command_update_all(args: ArgsProtocol) -> int | None:
    import click

    success = {}
@@ -634,7 +719,7 @@ def command_update_all(args):
    return failed


-def command_idedata(args, config):
+def command_idedata(args: ArgsProtocol, config: ConfigType) -> int:
    import json

    from esphome import platformio_api
@@ -650,7 +735,7 @@ def command_idedata(args, config):
    return 0


-def command_rename(args, config):
+def command_rename(args: ArgsProtocol, config: ConfigType) -> int | None:
    for c in args.name:
        if c not in ALLOWED_NAME_CHARS:
            print(
@@ -767,6 +852,12 @@ POST_CONFIG_ACTIONS = {
    "discover": command_discover,
 }

+SIMPLE_CONFIG_ACTIONS = [
+    "clean",
+    "clean-mqtt",
+    "config",
+]
+

 def parse_args(argv):
    options_parser = argparse.ArgumentParser(add_help=False)
@@ -854,7 +945,8 @@ def parse_args(argv):
    )
    parser_upload.add_argument(
        "--device",
-        help="Manually specify the serial port/address to use, for example /dev/ttyUSB0.",
+        action="append",
+        help="Manually specify the serial port/address to use, for example /dev/ttyUSB0. Can be specified multiple times for fallback addresses.",
    )
    parser_upload.add_argument(
        "--upload_speed",
@@ -876,7 +968,8 @@ def parse_args(argv):
    )
    parser_logs.add_argument(
        "--device",
-        help="Manually specify the serial port/address to use, for example /dev/ttyUSB0.",
+        action="append",
+        help="Manually specify the serial port/address to use, for example /dev/ttyUSB0. Can be specified multiple times for fallback addresses.",
    )
    parser_logs.add_argument(
        "--reset",
@@ -905,7 +998,8 @@ def parse_args(argv):
    )
    parser_run.add_argument(
        "--device",
-        help="Manually specify the serial port/address to use, for example /dev/ttyUSB0.",
+        action="append",
+        help="Manually specify the serial port/address to use, for example /dev/ttyUSB0. Can be specified multiple times for fallback addresses.",
    )
    parser_run.add_argument(
        "--upload_speed",
@@ -1032,6 +1126,13 @@ def parse_args(argv):
    arguments = argv[1:]

    argcomplete.autocomplete(parser)
+
+    if len(arguments) > 0 and arguments[0] in SIMPLE_CONFIG_ACTIONS:
+        args, unknown_args = parser.parse_known_args(arguments)
+        if unknown_args:
+            _LOGGER.warning("Ignored unrecognized arguments: %s", unknown_args)
+        return args
+
    return parser.parse_args(arguments)


--- a/esphome/components/absolute_humidity/sensor.py
+++ b/esphome/components/absolute_humidity/sensor.py
@@ -5,7 +5,7 @@ from esphome.const import (
    CONF_EQUATION,
    CONF_HUMIDITY,
    CONF_TEMPERATURE,
-    ICON_WATER,
+    DEVICE_CLASS_ABSOLUTE_HUMIDITY,
    STATE_CLASS_MEASUREMENT,
    UNIT_GRAMS_PER_CUBIC_METER,
 )
@@ -27,8 +27,8 @@ EQUATION = {
 CONFIG_SCHEMA = (
    sensor.sensor_schema(
        unit_of_measurement=UNIT_GRAMS_PER_CUBIC_METER,
-        icon=ICON_WATER,
        accuracy_decimals=2,
+        device_class=DEVICE_CLASS_ABSOLUTE_HUMIDITY,
        state_class=STATE_CLASS_MEASUREMENT,
    )
    .extend(
--- a/esphome/components/ade7880/sensor.py
+++ b/esphome/components/ade7880/sensor.py
@@ -36,6 +36,7 @@ from esphome.const import (
    UNIT_WATT,
    UNIT_WATT_HOURS,
 )
+from esphome.types import ConfigType

 DEPENDENCIES = ["i2c"]

@@ -51,6 +52,20 @@ CONF_POWER_GAIN = "power_gain"

 CONF_NEUTRAL = "neutral"

+# Tuple of power channel phases
+POWER_PHASES = (CONF_PHASE_A, CONF_PHASE_B, CONF_PHASE_C)
+
+# Tuple of sensor types that can be configured for power channels
+POWER_SENSOR_TYPES = (
+    CONF_CURRENT,
+    CONF_VOLTAGE,
+    CONF_ACTIVE_POWER,
+    CONF_APPARENT_POWER,
+    CONF_POWER_FACTOR,
+    CONF_FORWARD_ACTIVE_ENERGY,
+    CONF_REVERSE_ACTIVE_ENERGY,
+)
+
 NEUTRAL_CHANNEL_SCHEMA = cv.Schema(
    {
        cv.GenerateID(): cv.declare_id(NeutralChannel),
@@ -150,7 +165,64 @@ POWER_CHANNEL_SCHEMA = cv.Schema(
    }
 )

-CONFIG_SCHEMA = (
+
+def prefix_sensor_name(
+    sensor_conf: ConfigType,
+    channel_name: str,
+    channel_config: ConfigType,
+    sensor_type: str,
+) -> None:
+    """Helper to prefix sensor name with channel name.
+
+    Args:
+        sensor_conf: The sensor configuration (dict or string)
+        channel_name: The channel name to prefix with
+        channel_config: The channel configuration to update
+        sensor_type: The sensor type key in the channel config
+    """
+    if isinstance(sensor_conf, dict) and CONF_NAME in sensor_conf:
+        sensor_name = sensor_conf[CONF_NAME]
+        if sensor_name and not sensor_name.startswith(channel_name):
+            sensor_conf[CONF_NAME] = f"{channel_name} {sensor_name}"
+    elif isinstance(sensor_conf, str):
+        # Simple value case - convert to dict with prefixed name
+        channel_config[sensor_type] = {CONF_NAME: f"{channel_name} {sensor_conf}"}
+
+
+def process_channel_sensors(
+    config: ConfigType, channel_key: str, sensor_types: tuple
+) -> None:
+    """Process sensors for a channel and prefix their names.
+
+    Args:
+        config: The main configuration
+        channel_key: The channel key (e.g., CONF_PHASE_A, CONF_NEUTRAL)
+        sensor_types: Tuple of sensor types to process for this channel
+    """
+    if not (channel_config := config.get(channel_key)) or not (
+        channel_name := channel_config.get(CONF_NAME)
+    ):
+        return
+
+    for sensor_type in sensor_types:
+        if sensor_conf := channel_config.get(sensor_type):
+            prefix_sensor_name(sensor_conf, channel_name, channel_config, sensor_type)
+
+
+def preprocess_channels(config: ConfigType) -> ConfigType:
+    """Preprocess channel configurations to add channel name prefix to sensor names."""
+    # Process power channels
+    for channel in POWER_PHASES:
+        process_channel_sensors(config, channel, POWER_SENSOR_TYPES)
+
+    # Process neutral channel
+    process_channel_sensors(config, CONF_NEUTRAL, (CONF_CURRENT,))
+
+    return config
+
+
+CONFIG_SCHEMA = cv.All(
+    preprocess_channels,
    cv.Schema(
        {
            cv.GenerateID(): cv.declare_id(ADE7880),
@@ -167,7 +239,7 @@ CONFIG_SCHEMA = (
        }
    )
    .extend(cv.polling_component_schema("60s"))
-    .extend(i2c.i2c_device_schema(0x38))
+    .extend(i2c.i2c_device_schema(0x38)),
 )


@@ -188,15 +260,7 @@ async def neutral_channel(config):
 async def power_channel(config):
    var = cg.new_Pvariable(config[CONF_ID])

-    for sensor_type in [
-        CONF_CURRENT,
-        CONF_VOLTAGE,
-        CONF_ACTIVE_POWER,
-        CONF_APPARENT_POWER,
-        CONF_POWER_FACTOR,
-        CONF_FORWARD_ACTIVE_ENERGY,
-        CONF_REVERSE_ACTIVE_ENERGY,
-    ]:
+    for sensor_type in POWER_SENSOR_TYPES:
        if conf := config.get(sensor_type):
            sens = await sensor.new_sensor(conf)
            cg.add(getattr(var, f"set_{sensor_type}")(sens))
@@ -216,44 +280,6 @@ async def power_channel(config):
    return var


-def final_validate(config):
-    for channel in [CONF_PHASE_A, CONF_PHASE_B, CONF_PHASE_C]:
-        if channel := config.get(channel):
-            channel_name = channel.get(CONF_NAME)
-
-            for sensor_type in [
-                CONF_CURRENT,
-                CONF_VOLTAGE,
-                CONF_ACTIVE_POWER,
-                CONF_APPARENT_POWER,
-                CONF_POWER_FACTOR,
-                CONF_FORWARD_ACTIVE_ENERGY,
-                CONF_REVERSE_ACTIVE_ENERGY,
-            ]:
-                if conf := channel.get(sensor_type):
-                    sensor_name = conf.get(CONF_NAME)
-                    if (
-                        sensor_name
-                        and channel_name
-                        and not sensor_name.startswith(channel_name)
-                    ):
-                        conf[CONF_NAME] = f"{channel_name} {sensor_name}"
-
-    if channel := config.get(CONF_NEUTRAL):
-        channel_name = channel.get(CONF_NAME)
-        if conf := channel.get(CONF_CURRENT):
-            sensor_name = conf.get(CONF_NAME)
-            if (
-                sensor_name
-                and channel_name
-                and not sensor_name.startswith(channel_name)
-            ):
-                conf[CONF_NAME] = f"{channel_name} {sensor_name}"
-
-
-FINAL_VALIDATE_SCHEMA = final_validate
-
-
 async def to_code(config):
    var = cg.new_Pvariable(config[CONF_ID])
    await cg.register_component(var, config)
--- a/esphome/components/api/init.py
+++ b/esphome/components/api/init.py
@@ -29,7 +29,7 @@ from esphome.core import CORE, coroutine_with_priority
 DOMAIN = "api"
 DEPENDENCIES = ["network"]
 AUTO_LOAD = ["socket"]
-CODEOWNERS = ["@OttoWinter"]
+CODEOWNERS = ["@esphome/core"]

 api_ns = cg.esphome_ns.namespace("api")
 APIServer = api_ns.class_("APIServer", cg.Component, cg.Controller)
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -1438,11 +1438,11 @@ message BluetoothLERawAdvertisementsResponse {
  option (ifdef) = "USE_BLUETOOTH_PROXY";
  option (no_delay) = true;

-  repeated BluetoothLERawAdvertisement advertisements = 1;
+  repeated BluetoothLERawAdvertisement advertisements = 1 [(fixed_array_with_length_define) = "BLUETOOTH_PROXY_ADVERTISEMENT_BATCH_SIZE"];
 }

 enum BluetoothDeviceRequestType {
-  BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT = 0;
+  BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT = 0 [deprecated = true]; // V1 removed, use V3 variants
  BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT = 1;
  BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR = 2;
  BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR = 3;
--- a/esphome/components/api/api_frame_helper.cpp
+++ b/esphome/components/api/api_frame_helper.cpp
@@ -156,7 +156,9 @@ APIError APIFrameHelper::write_raw_(const struct iovec *iov, int iovcnt, uint16_
  }

  // Try to send directly if no buffered data
-  ssize_t sent = this->socket_->writev(iov, iovcnt);
+  // Optimize for single iovec case (common for plaintext API)
+  ssize_t sent =
+      (iovcnt == 1) ? this->socket_->write(iov[0].iov_base, iov[0].iov_len) : this->socket_->writev(iov, iovcnt);

  if (sent == -1) {
    APIError err = this->handle_socket_write_error_();
--- a/esphome/components/api/api_options.proto
+++ b/esphome/components/api/api_options.proto
@@ -30,6 +30,7 @@ extend google.protobuf.FieldOptions {
    optional bool no_zero_copy = 50008 [default=false];
    optional bool fixed_array_skip_zero = 50009 [default=false];
    optional string fixed_array_size_define = 50010;
+    optional string fixed_array_with_length_define = 50011;

    // container_pointer: Zero-copy optimization for repeated fields.
    //
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -1843,12 +1843,14 @@ void BluetoothLERawAdvertisement::calculate_size(ProtoSize &size) const {
  size.add_length(1, this->data_len);
 }
 void BluetoothLERawAdvertisementsResponse::encode(ProtoWriteBuffer buffer) const {
-  for (auto &it : this->advertisements) {
-    buffer.encode_message(1, it, true);
+  for (uint16_t i = 0; i < this->advertisements_len; i++) {
+    buffer.encode_message(1, this->advertisements[i], true);
  }
 }
 void BluetoothLERawAdvertisementsResponse::calculate_size(ProtoSize &size) const {
-  size.add_repeated_message(1, this->advertisements);
+  for (uint16_t i = 0; i < this->advertisements_len; i++) {
+    size.add_message_object_force(1, this->advertisements[i]);
+  }
 }
 bool BluetoothDeviceRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
  switch (field_id) {
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -1788,11 +1788,12 @@ class BluetoothLERawAdvertisement : public ProtoMessage {
 class BluetoothLERawAdvertisementsResponse : public ProtoMessage {
 public:
  static constexpr uint8_t MESSAGE_TYPE = 93;
-  static constexpr uint8_t ESTIMATED_SIZE = 34;
+  static constexpr uint8_t ESTIMATED_SIZE = 136;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  const char *message_name() const override { return "bluetooth_le_raw_advertisements_response"; }
 #endif
-  std::vector<BluetoothLERawAdvertisement> advertisements{};
+  std::array<BluetoothLERawAdvertisement, BLUETOOTH_PROXY_ADVERTISEMENT_BATCH_SIZE> advertisements{};
+  uint16_t advertisements_len{0};
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(ProtoSize &size) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
--- a/esphome/components/api/api_pb2_dump.cpp
+++ b/esphome/components/api/api_pb2_dump.cpp
@@ -1534,9 +1534,9 @@ void BluetoothLERawAdvertisement::dump_to(std::string &out) const {
 }
 void BluetoothLERawAdvertisementsResponse::dump_to(std::string &out) const {
  MessageDumpHelper helper(out, "BluetoothLERawAdvertisementsResponse");
-  for (const auto &it : this->advertisements) {
+  for (uint16_t i = 0; i < this->advertisements_len; i++) {
    out.append("  advertisements: ");
-    it.dump_to(out);
+    this->advertisements[i].dump_to(out);
    out.append("\n");
  }
 }
--- a/esphome/components/api/client.py
+++ b/esphome/components/api/client.py
@@ -30,7 +30,7 @@ if TYPE_CHECKING:
 _LOGGER = logging.getLogger(__name__)


-async def async_run_logs(config: dict[str, Any], address: str) -> None:
+async def async_run_logs(config: dict[str, Any], addresses: list[str]) -> None:
    """Run the logs command in the event loop."""
    conf = config["api"]
    name = config["esphome"]["name"]
@@ -39,13 +39,21 @@ async def async_run_logs(config: dict[str, Any], address: str) -> None:
    noise_psk: str | None = None
    if (encryption := conf.get(CONF_ENCRYPTION)) and (key := encryption.get(CONF_KEY)):
        noise_psk = key
-    _LOGGER.info("Starting log output from %s using esphome API", address)
+
+    if len(addresses) == 1:
+        _LOGGER.info("Starting log output from %s using esphome API", addresses[0])
+    else:
+        _LOGGER.info(
+            "Starting log output from %s using esphome API", " or ".join(addresses)
+        )
+
    cli = APIClient(
-        address,
+        addresses[0],  # Primary address for compatibility
        port,
        password,
        client_info=f"ESPHome Logs {__version__}",
        noise_psk=noise_psk,
+        addresses=addresses,  # Pass all addresses for automatic retry
    )
    dashboard = CORE.dashboard

@@ -66,7 +74,7 @@ async def async_run_logs(config: dict[str, Any], address: str) -> None:
        await stop()


-def run_logs(config: dict[str, Any], address: str) -> None:
+def run_logs(config: dict[str, Any], addresses: list[str]) -> None:
    """Run the logs command."""
    with contextlib.suppress(KeyboardInterrupt):
-        asyncio.run(async_run_logs(config, address))
+        asyncio.run(async_run_logs(config, addresses))
--- a/esphome/components/api/custom_api_device.h
+++ b/esphome/components/api/custom_api_device.h
@@ -56,6 +56,14 @@ class CustomAPIDevice {
    auto *service = new CustomAPIDeviceService<T, Ts...>(name, arg_names, (T *) this, callback);  // NOLINT
    global_api_server->register_user_service(service);
  }
+#else
+  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) {
+    static_assert(
+        sizeof(T) == 0,
+        "register_service() requires 'custom_services: true' in the 'api:' section of your YAML configuration");
+  }
 #endif

  /** Register a custom native API service that will show up in Home Assistant.
@@ -81,6 +89,12 @@ class CustomAPIDevice {
    auto *service = new CustomAPIDeviceService<T>(name, {}, (T *) this, callback);  // NOLINT
    global_api_server->register_user_service(service);
  }
+#else
+  template<typename T> void register_service(void (T::*callback)(), const std::string &name) {
+    static_assert(
+        sizeof(T) == 0,
+        "register_service() requires 'custom_services: true' in the 'api:' section of your YAML configuration");
+  }
 #endif

 #ifdef USE_API_HOMEASSISTANT_STATES
@@ -135,6 +149,22 @@ class CustomAPIDevice {
    auto f = std::bind(callback, (T *) this, entity_id, std::placeholders::_1);
    global_api_server->subscribe_home_assistant_state(entity_id, optional<std::string>(attribute), f);
  }
+#else
+  template<typename T>
+  void subscribe_homeassistant_state(void (T::*callback)(std::string), const std::string &entity_id,
+                                     const std::string &attribute = "") {
+    static_assert(sizeof(T) == 0,
+                  "subscribe_homeassistant_state() requires 'homeassistant_states: true' in the 'api:' section "
+                  "of your YAML configuration");
+  }
+
+  template<typename T>
+  void subscribe_homeassistant_state(void (T::*callback)(std::string, std::string), const std::string &entity_id,
+                                     const std::string &attribute = "") {
+    static_assert(sizeof(T) == 0,
+                  "subscribe_homeassistant_state() requires 'homeassistant_states: true' in the 'api:' section "
+                  "of your YAML configuration");
+  }
 #endif

 #ifdef USE_API_HOMEASSISTANT_SERVICES
@@ -222,6 +252,28 @@ class CustomAPIDevice {
    }
    global_api_server->send_homeassistant_service_call(resp);
  }
+#else
+  template<typename T = void> void call_homeassistant_service(const std::string &service_name) {
+    static_assert(sizeof(T) == 0, "call_homeassistant_service() requires 'homeassistant_services: true' in the 'api:' "
+                                  "section of your YAML configuration");
+  }
+
+  template<typename T = void>
+  void call_homeassistant_service(const std::string &service_name, const std::map<std::string, std::string> &data) {
+    static_assert(sizeof(T) == 0, "call_homeassistant_service() requires 'homeassistant_services: true' in the 'api:' "
+                                  "section of your YAML configuration");
+  }
+
+  template<typename T = void> void fire_homeassistant_event(const std::string &event_name) {
+    static_assert(sizeof(T) == 0, "fire_homeassistant_event() requires 'homeassistant_services: true' in the 'api:' "
+                                  "section of your YAML configuration");
+  }
+
+  template<typename T = void>
+  void fire_homeassistant_event(const std::string &service_name, const std::map<std::string, std::string> &data) {
+    static_assert(sizeof(T) == 0, "fire_homeassistant_event() requires 'homeassistant_services: true' in the 'api:' "
+                                  "section of your YAML configuration");
+  }
 #endif
 };

--- a/esphome/components/api/proto.h
+++ b/esphome/components/api/proto.h
@@ -15,6 +15,23 @@

 namespace esphome::api {

+// Helper functions for ZigZag encoding/decoding
+inline constexpr uint32_t encode_zigzag32(int32_t value) {
+  return (static_cast<uint32_t>(value) << 1) ^ (static_cast<uint32_t>(value >> 31));
+}
+
+inline constexpr uint64_t encode_zigzag64(int64_t value) {
+  return (static_cast<uint64_t>(value) << 1) ^ (static_cast<uint64_t>(value >> 63));
+}
+
+inline constexpr int32_t decode_zigzag32(uint32_t value) {
+  return (value & 1) ? static_cast<int32_t>(~(value >> 1)) : static_cast<int32_t>(value >> 1);
+}
+
+inline constexpr int64_t decode_zigzag64(uint64_t value) {
+  return (value & 1) ? static_cast<int64_t>(~(value >> 1)) : static_cast<int64_t>(value >> 1);
+}
+
 /*
 * StringRef Ownership Model for API Protocol Messages
 * ===================================================
@@ -87,33 +104,25 @@ class ProtoVarInt {
    return {};  // Incomplete or invalid varint
  }

-  uint16_t as_uint16() const { return this->value_; }
-  uint32_t as_uint32() const { return this->value_; }
-  uint64_t as_uint64() const { return this->value_; }
-  bool as_bool() const { return this->value_; }
-  int32_t as_int32() const {
+  constexpr uint16_t as_uint16() const { return this->value_; }
+  constexpr uint32_t as_uint32() const { return this->value_; }
+  constexpr uint64_t as_uint64() const { return this->value_; }
+  constexpr bool as_bool() const { return this->value_; }
+  constexpr int32_t as_int32() const {
    // Not ZigZag encoded
    return static_cast<int32_t>(this->as_int64());
  }
-  int64_t as_int64() const {
+  constexpr int64_t as_int64() const {
    // Not ZigZag encoded
    return static_cast<int64_t>(this->value_);
  }
-  int32_t as_sint32() const {
+  constexpr int32_t as_sint32() const {
    // with ZigZag encoding
-    if (this->value_ & 1) {
-      return static_cast<int32_t>(~(this->value_ >> 1));
-    } else {
-      return static_cast<int32_t>(this->value_ >> 1);
-    }
+    return decode_zigzag32(static_cast<uint32_t>(this->value_));
  }
-  int64_t as_sint64() const {
+  constexpr int64_t as_sint64() const {
    // with ZigZag encoding
-    if (this->value_ & 1) {
-      return static_cast<int64_t>(~(this->value_ >> 1));
-    } else {
-      return static_cast<int64_t>(this->value_ >> 1);
-    }
+    return decode_zigzag64(this->value_);
  }
  /**
   * Encode the varint value to a pre-allocated buffer without bounds checking.
@@ -309,22 +318,10 @@ class ProtoWriteBuffer {
    this->encode_uint64(field_id, static_cast<uint64_t>(value), force);
  }
  void encode_sint32(uint32_t field_id, int32_t value, bool force = false) {
-    uint32_t uvalue;
-    if (value < 0) {
-      uvalue = ~(value << 1);
-    } else {
-      uvalue = value << 1;
-    }
-    this->encode_uint32(field_id, uvalue, force);
+    this->encode_uint32(field_id, encode_zigzag32(value), force);
  }
  void encode_sint64(uint32_t field_id, int64_t value, bool force = false) {
-    uint64_t uvalue;
-    if (value < 0) {
-      uvalue = ~(value << 1);
-    } else {
-      uvalue = value << 1;
-    }
-    this->encode_uint64(field_id, uvalue, force);
+    this->encode_uint64(field_id, encode_zigzag64(value), force);
  }
  void encode_message(uint32_t field_id, const ProtoMessage &value, bool force = false);
  std::vector<uint8_t> *get_buffer() const { return buffer_; }
@@ -395,7 +392,7 @@ class ProtoSize {
   * @param value The uint32_t value to calculate size for
   * @return The number of bytes needed to encode the value
   */
-  static inline uint32_t varint(uint32_t value) {
+  static constexpr uint32_t varint(uint32_t value) {
    // Optimized varint size calculation using leading zeros
    // Each 7 bits requires one byte in the varint encoding
    if (value < 128)
@@ -419,7 +416,7 @@ class ProtoSize {
   * @param value The uint64_t value to calculate size for
   * @return The number of bytes needed to encode the value
   */
-  static inline uint32_t varint(uint64_t value) {
+  static constexpr uint32_t varint(uint64_t value) {
    // Handle common case of values fitting in uint32_t (vast majority of use cases)
    if (value <= UINT32_MAX) {
      return varint(static_cast<uint32_t>(value));
@@ -450,7 +447,7 @@ class ProtoSize {
   * @param value The int32_t value to calculate size for
   * @return The number of bytes needed to encode the value
   */
-  static inline uint32_t varint(int32_t value) {
+  static constexpr uint32_t varint(int32_t value) {
    // Negative values are sign-extended to 64 bits in protocol buffers,
    // which always results in a 10-byte varint for negative int32
    if (value < 0) {
@@ -466,7 +463,7 @@ class ProtoSize {
   * @param value The int64_t value to calculate size for
   * @return The number of bytes needed to encode the value
   */
-  static inline uint32_t varint(int64_t value) {
+  static constexpr uint32_t varint(int64_t value) {
    // For int64_t, we convert to uint64_t and calculate the size
    // This works because the bit pattern determines the encoding size,
    // and we've handled negative int32 values as a special case above
@@ -480,7 +477,7 @@ class ProtoSize {
   * @param type The wire type value (from the WireType enum in the protobuf spec)
   * @return The number of bytes needed to encode the field ID and wire type
   */
-  static inline uint32_t field(uint32_t field_id, uint32_t type) {
+  static constexpr uint32_t field(uint32_t field_id, uint32_t type) {
    uint32_t tag = (field_id << 3) | (type & 0b111);
    return varint(tag);
  }
@@ -607,9 +604,8 @@ class ProtoSize {
   */
  inline void add_sint32_force(uint32_t field_id_size, int32_t value) {
    // Always calculate size when force is true
-    // ZigZag encoding for sint32: (n << 1) ^ (n >> 31)
-    uint32_t zigzag = (static_cast<uint32_t>(value) << 1) ^ (static_cast<uint32_t>(value >> 31));
-    total_size_ += field_id_size + varint(zigzag);
+    // ZigZag encoding for sint32
+    total_size_ += field_id_size + varint(encode_zigzag32(value));
  }

  /**
--- a/esphome/components/as5600/init.py
+++ b/esphome/components/as5600/init.py
@@ -7,6 +7,7 @@ from esphome.const import (
    CONF_DIRECTION,
    CONF_HYSTERESIS,
    CONF_ID,
+    CONF_POWER_MODE,
    CONF_RANGE,
 )

@@ -57,7 +58,6 @@ FAST_FILTER = {
 CONF_RAW_ANGLE = "raw_angle"
 CONF_RAW_POSITION = "raw_position"
 CONF_WATCHDOG = "watchdog"
-CONF_POWER_MODE = "power_mode"
 CONF_SLOW_FILTER = "slow_filter"
 CONF_FAST_FILTER = "fast_filter"
 CONF_START_POSITION = "start_position"
--- a/esphome/components/as5600/sensor/init.py
+++ b/esphome/components/as5600/sensor/init.py
@@ -24,7 +24,6 @@ AS5600Sensor = as5600_ns.class_("AS5600Sensor", sensor.Sensor, cg.PollingCompone
 CONF_RAW_ANGLE = "raw_angle"
 CONF_RAW_POSITION = "raw_position"
 CONF_WATCHDOG = "watchdog"
-CONF_POWER_MODE = "power_mode"
 CONF_SLOW_FILTER = "slow_filter"
 CONF_FAST_FILTER = "fast_filter"
 CONF_PWM_FREQUENCY = "pwm_frequency"
--- a/esphome/components/async_tcp/init.py
+++ b/esphome/components/async_tcp/init.py
@@ -10,7 +10,7 @@ from esphome.const import (
 )
 from esphome.core import CORE, coroutine_with_priority

-CODEOWNERS = ["@OttoWinter"]
+CODEOWNERS = ["@esphome/core"]

 CONFIG_SCHEMA = cv.All(
    cv.Schema({}),
--- a/esphome/components/atm90e32/atm90e32.cpp
+++ b/esphome/components/atm90e32/atm90e32.cpp
@@ -110,6 +110,8 @@ void ATM90E32Component::update() {

 void ATM90E32Component::setup() {
  this->spi_setup();
+  this->cs_summary_ = this->cs_->dump_summary();
+  const char *cs = this->cs_summary_.c_str();

  uint16_t mmode0 = 0x87;  // 3P4W 50Hz
  uint16_t high_thresh = 0;
@@ -130,9 +132,9 @@ void ATM90E32Component::setup() {
    mmode0 |= 0 << 1;  // sets 1st bit to 0, phase b is not counted into the all-phase sum energy/power (P/Q/S)
  }

-  this->write16_(ATM90E32_REGISTER_SOFTRESET, 0x789A);    // Perform soft reset
-  delay(6);                                               // Wait for the minimum 5ms + 1ms
-  this->write16_(ATM90E32_REGISTER_CFGREGACCEN, 0x55AA);  // enable register config access
+  this->write16_(ATM90E32_REGISTER_SOFTRESET, 0x789A, false);  // Perform soft reset
+  delay(6);                                                    // Wait for the minimum 5ms + 1ms
+  this->write16_(ATM90E32_REGISTER_CFGREGACCEN, 0x55AA);       // enable register config access
  if (!this->validate_spi_read_(0x55AA, "setup()")) {
    ESP_LOGW(TAG, "Could not initialize ATM90E32 IC, check SPI settings");
    this->mark_failed();
@@ -156,16 +158,17 @@ void ATM90E32Component::setup() {

  if (this->enable_offset_calibration_) {
    // Initialize flash storage for offset calibrations
-    uint32_t o_hash = fnv1_hash(std::string("_offset_calibration_") + this->cs_->dump_summary());
+    uint32_t o_hash = fnv1_hash(std::string("_offset_calibration_") + this->cs_summary_);
    this->offset_pref_ = global_preferences->make_preference<OffsetCalibration[3]>(o_hash, true);
    this->restore_offset_calibrations_();

    // Initialize flash storage for power offset calibrations
-    uint32_t po_hash = fnv1_hash(std::string("_power_offset_calibration_") + this->cs_->dump_summary());
+    uint32_t po_hash = fnv1_hash(std::string("_power_offset_calibration_") + this->cs_summary_);
    this->power_offset_pref_ = global_preferences->make_preference<PowerOffsetCalibration[3]>(po_hash, true);
    this->restore_power_offset_calibrations_();
  } else {
-    ESP_LOGI(TAG, "[CALIBRATION] Power & Voltage/Current offset calibration is disabled. Using config file values.");
+    ESP_LOGI(TAG, "[CALIBRATION][%s] Power & Voltage/Current offset calibration is disabled. Using config file values.",
+             cs);
    for (uint8_t phase = 0; phase < 3; ++phase) {
      this->write16_(this->voltage_offset_registers[phase],
                     static_cast<uint16_t>(this->offset_phase_[phase].voltage_offset_));
@@ -180,21 +183,18 @@ void ATM90E32Component::setup() {

  if (this->enable_gain_calibration_) {
    // Initialize flash storage for gain calibration
-    uint32_t g_hash = fnv1_hash(std::string("_gain_calibration_") + this->cs_->dump_summary());
+    uint32_t g_hash = fnv1_hash(std::string("_gain_calibration_") + this->cs_summary_);
    this->gain_calibration_pref_ = global_preferences->make_preference<GainCalibration[3]>(g_hash, true);
    this->restore_gain_calibrations_();

-    if (this->using_saved_calibrations_) {
-      ESP_LOGI(TAG, "[CALIBRATION] Successfully restored gain calibration from memory.");
-    } else {
+    if (!this->using_saved_calibrations_) {
      for (uint8_t phase = 0; phase < 3; ++phase) {
        this->write16_(voltage_gain_registers[phase], this->phase_[phase].voltage_gain_);
        this->write16_(current_gain_registers[phase], this->phase_[phase].ct_gain_);
      }
    }
  } else {
-    ESP_LOGI(TAG, "[CALIBRATION] Gain calibration is disabled. Using config file values.");
-
+    ESP_LOGI(TAG, "[CALIBRATION][%s] Gain calibration is disabled. Using config file values.", cs);
    for (uint8_t phase = 0; phase < 3; ++phase) {
      this->write16_(voltage_gain_registers[phase], this->phase_[phase].voltage_gain_);
      this->write16_(current_gain_registers[phase], this->phase_[phase].ct_gain_);
@@ -213,6 +213,122 @@ void ATM90E32Component::setup() {
  this->write16_(ATM90E32_REGISTER_CFGREGACCEN, 0x0000);  // end configuration
 }

+void ATM90E32Component::log_calibration_status_() {
+  const char *cs = this->cs_summary_.c_str();
+
+  bool offset_mismatch = false;
+  bool power_mismatch = false;
+  bool gain_mismatch = false;
+
+  for (uint8_t phase = 0; phase < 3; ++phase) {
+    offset_mismatch |= this->offset_calibration_mismatch_[phase];
+    power_mismatch |= this->power_offset_calibration_mismatch_[phase];
+    gain_mismatch |= this->gain_calibration_mismatch_[phase];
+  }
+
+  if (offset_mismatch) {
+    ESP_LOGW(TAG, "[CALIBRATION][%s] ", cs);
+    ESP_LOGW(TAG,
+             "[CALIBRATION][%s] ===================== Offset mismatch: using flash values =====================", cs);
+    ESP_LOGW(TAG, "[CALIBRATION][%s] ------------------------------------------------------------------------------",
+             cs);
+    ESP_LOGW(TAG, "[CALIBRATION][%s] | Phase |   offset_voltage   |   offset_current   |", cs);
+    ESP_LOGW(TAG, "[CALIBRATION][%s] |       |  config  |  flash  |  config  |  flash  |", cs);
+    ESP_LOGW(TAG, "[CALIBRATION][%s] ------------------------------------------------------------------------------",
+             cs);
+    for (uint8_t phase = 0; phase < 3; ++phase) {
+      ESP_LOGW(TAG, "[CALIBRATION][%s] |   %c   |  %6d  | %6d  |  %6d  | %6d  |", cs, 'A' + phase,
+               this->config_offset_phase_[phase].voltage_offset_, this->offset_phase_[phase].voltage_offset_,
+               this->config_offset_phase_[phase].current_offset_, this->offset_phase_[phase].current_offset_);
+    }
+    ESP_LOGW(TAG,
+             "[CALIBRATION][%s] ===============================================================================", cs);
+  }
+  if (power_mismatch) {
+    ESP_LOGW(TAG, "[CALIBRATION][%s] ", cs);
+    ESP_LOGW(TAG,
+             "[CALIBRATION][%s] ================= Power offset mismatch: using flash values =================", cs);
+    ESP_LOGW(TAG, "[CALIBRATION][%s] ------------------------------------------------------------------------------",
+             cs);
+    ESP_LOGW(TAG, "[CALIBRATION][%s] | Phase | offset_active_power|offset_reactive_power|", cs);
+    ESP_LOGW(TAG, "[CALIBRATION][%s] |       |  config  |  flash  |  config  |  flash  |", cs);
+    ESP_LOGW(TAG, "[CALIBRATION][%s] ------------------------------------------------------------------------------",
+             cs);
+    for (uint8_t phase = 0; phase < 3; ++phase) {
+      ESP_LOGW(TAG, "[CALIBRATION][%s] |   %c   |  %6d  | %6d  |  %6d  | %6d  |", cs, 'A' + phase,
+               this->config_power_offset_phase_[phase].active_power_offset,
+               this->power_offset_phase_[phase].active_power_offset,
+               this->config_power_offset_phase_[phase].reactive_power_offset,
+               this->power_offset_phase_[phase].reactive_power_offset);
+    }
+    ESP_LOGW(TAG,
+             "[CALIBRATION][%s] ===============================================================================", cs);
+  }
+  if (gain_mismatch) {
+    ESP_LOGW(TAG, "[CALIBRATION][%s] ", cs);
+    ESP_LOGW(TAG,
+             "[CALIBRATION][%s] ====================== Gain mismatch: using flash values =====================", cs);
+    ESP_LOGW(TAG, "[CALIBRATION][%s] ------------------------------------------------------------------------------",
+             cs);
+    ESP_LOGW(TAG, "[CALIBRATION][%s] | Phase |    voltage_gain    |    current_gain    |", cs);
+    ESP_LOGW(TAG, "[CALIBRATION][%s] |       |  config  |  flash  |  config  |  flash  |", cs);
+    ESP_LOGW(TAG, "[CALIBRATION][%s] ------------------------------------------------------------------------------",
+             cs);
+    for (uint8_t phase = 0; phase < 3; ++phase) {
+      ESP_LOGW(TAG, "[CALIBRATION][%s] |   %c   |  %6u  | %6u  |  %6u  | %6u  |", cs, 'A' + phase,
+               this->config_gain_phase_[phase].voltage_gain, this->gain_phase_[phase].voltage_gain,
+               this->config_gain_phase_[phase].current_gain, this->gain_phase_[phase].current_gain);
+    }
+    ESP_LOGW(TAG,
+             "[CALIBRATION][%s] ===============================================================================", cs);
+  }
+  if (!this->enable_offset_calibration_) {
+    ESP_LOGI(TAG, "[CALIBRATION][%s] Power & Voltage/Current offset calibration is disabled. Using config file values.",
+             cs);
+  } else if (this->restored_offset_calibration_ && !offset_mismatch) {
+    ESP_LOGI(TAG, "[CALIBRATION][%s] ", cs);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] ============== Restored offset calibration from memory ==============", cs);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] --------------------------------------------------------------", cs);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] | Phase | offset_voltage | offset_current |", cs);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] --------------------------------------------------------------", cs);
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      ESP_LOGI(TAG, "[CALIBRATION][%s] |   %c   |     %6d      |     %6d      |", cs, 'A' + phase,
+               this->offset_phase_[phase].voltage_offset_, this->offset_phase_[phase].current_offset_);
+    }
+    ESP_LOGI(TAG, "[CALIBRATION][%s] ==============================================================\\n", cs);
+  }
+
+  if (this->restored_power_offset_calibration_ && !power_mismatch) {
+    ESP_LOGI(TAG, "[CALIBRATION][%s] ", cs);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] ============ Restored power offset calibration from memory ============", cs);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] ---------------------------------------------------------------------", cs);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] | Phase | offset_active_power | offset_reactive_power |", cs);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] ---------------------------------------------------------------------", cs);
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      ESP_LOGI(TAG, "[CALIBRATION][%s] |   %c   |       %6d        |        %6d        |", cs, 'A' + phase,
+               this->power_offset_phase_[phase].active_power_offset,
+               this->power_offset_phase_[phase].reactive_power_offset);
+    }
+    ESP_LOGI(TAG, "[CALIBRATION][%s] =====================================================================\n", cs);
+  }
+  if (!this->enable_gain_calibration_) {
+    ESP_LOGI(TAG, "[CALIBRATION][%s] Gain calibration is disabled. Using config file values.", cs);
+  } else if (this->restored_gain_calibration_ && !gain_mismatch) {
+    ESP_LOGI(TAG, "[CALIBRATION][%s] ", cs);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] ============ Restoring saved gain calibrations to registers ============", cs);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] ---------------------------------------------------------------------", cs);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] | Phase | voltage_gain | current_gain |", cs);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] ---------------------------------------------------------------------", cs);
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      ESP_LOGI(TAG, "[CALIBRATION][%s] |   %c   |    %6u    |    %6u    |", cs, 'A' + phase,
+               this->gain_phase_[phase].voltage_gain, this->gain_phase_[phase].current_gain);
+    }
+    ESP_LOGI(TAG, "[CALIBRATION][%s] =====================================================================\\n", cs);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] Gain calibration loaded and verified successfully.\n", cs);
+  }
+  this->calibration_message_printed_ = true;
+}
+
 void ATM90E32Component::dump_config() {
  ESP_LOGCONFIG("", "ATM90E32:");
  LOG_PIN("  CS Pin: ", this->cs_);
@@ -255,6 +371,10 @@ void ATM90E32Component::dump_config() {
  LOG_SENSOR("  ", "Peak Current C", this->phase_[PHASEC].peak_current_sensor_);
  LOG_SENSOR("  ", "Frequency", this->freq_sensor_);
  LOG_SENSOR("  ", "Chip Temp", this->chip_temperature_sensor_);
+  if (this->restored_offset_calibration_ || this->restored_power_offset_calibration_ ||
+      this->restored_gain_calibration_ || !this->enable_offset_calibration_ || !this->enable_gain_calibration_) {
+    this->log_calibration_status_();
+  }
 }

 float ATM90E32Component::get_setup_priority() const { return setup_priority::IO; }
@@ -263,19 +383,17 @@ float ATM90E32Component::get_setup_priority() const { return setup_priority::IO;
 // Peakdetect period: 05H. Bit 15:8 are PeakDet_period in ms. 7:0 are Sag_period
 // Default is 143FH (20ms, 63ms)
 uint16_t ATM90E32Component::read16_(uint16_t a_register) {
+  this->enable();
+  delay_microseconds_safe(1);  // min delay between CS low and first SCK is 200ns - 1us is plenty
  uint8_t addrh = (1 << 7) | ((a_register >> 8) & 0x03);
  uint8_t addrl = (a_register & 0xFF);
-  uint8_t data[2];
-  uint16_t output;
-  this->enable();
-  delay_microseconds_safe(1);  // min delay between CS low and first SCK is 200ns - 1ms is plenty
-  this->write_byte(addrh);
-  this->write_byte(addrl);
-  this->read_array(data, 2);
-  this->disable();
-
-  output = (uint16_t(data[0] & 0xFF) << 8) | (data[1] & 0xFF);
+  uint8_t data[4] = {addrh, addrl, 0x00, 0x00};
+  this->transfer_array(data, 4);
+  uint16_t output = encode_uint16(data[2], data[3]);
  ESP_LOGVV(TAG, "read16_ 0x%04" PRIX16 " output 0x%04" PRIX16, a_register, output);
+  delay_microseconds_safe(1);  // allow the last clock to propagate before releasing CS
+  this->disable();
+  delay_microseconds_safe(1);  // meet minimum CS high time before next transaction
  return output;
 }

@@ -292,13 +410,19 @@ int ATM90E32Component::read32_(uint16_t addr_h, uint16_t addr_l) {
  return val;
 }

-void ATM90E32Component::write16_(uint16_t a_register, uint16_t val) {
+void ATM90E32Component::write16_(uint16_t a_register, uint16_t val, bool validate) {
  ESP_LOGVV(TAG, "write16_ 0x%04" PRIX16 " val 0x%04" PRIX16, a_register, val);
+  uint8_t addrh = ((a_register >> 8) & 0x03);
+  uint8_t addrl = (a_register & 0xFF);
+  uint8_t data[4] = {addrh, addrl, uint8_t((val >> 8) & 0xFF), uint8_t(val & 0xFF)};
  this->enable();
-  this->write_byte16(a_register);
-  this->write_byte16(val);
+  delay_microseconds_safe(1);  // ensure CS setup time
+  this->write_array(data, 4);
+  delay_microseconds_safe(1);  // allow clock to settle before raising CS
  this->disable();
-  this->validate_spi_read_(val, "write16()");
+  delay_microseconds_safe(1);  // ensure minimum CS high time
+  if (validate)
+    this->validate_spi_read_(val, "write16()");
 }

 float ATM90E32Component::get_local_phase_voltage_(uint8_t phase) { return this->phase_[phase].voltage_; }
@@ -441,8 +565,10 @@ float ATM90E32Component::get_chip_temperature_() {
 }

 void ATM90E32Component::run_gain_calibrations() {
+  const char *cs = this->cs_summary_.c_str();
  if (!this->enable_gain_calibration_) {
-    ESP_LOGW(TAG, "[CALIBRATION] Gain calibration is disabled! Enable it first with enable_gain_calibration: true");
+    ESP_LOGW(TAG, "[CALIBRATION][%s] Gain calibration is disabled! Enable it first with enable_gain_calibration: true",
+             cs);
    return;
  }

@@ -454,12 +580,14 @@ void ATM90E32Component::run_gain_calibrations() {
  float ref_currents[3] = {this->get_reference_current(0), this->get_reference_current(1),
                           this->get_reference_current(2)};

-  ESP_LOGI(TAG, "[CALIBRATION] ");
-  ESP_LOGI(TAG, "[CALIBRATION] ========================= Gain Calibration  =========================");
-  ESP_LOGI(TAG, "[CALIBRATION] ---------------------------------------------------------------------");
-  ESP_LOGI(TAG,
-           "[CALIBRATION] | Phase | V_meas (V) | I_meas (A) | V_ref | I_ref  | V_gain (old→new) | I_gain (old→new) |");
-  ESP_LOGI(TAG, "[CALIBRATION] ---------------------------------------------------------------------");
+  ESP_LOGI(TAG, "[CALIBRATION][%s] ", cs);
+  ESP_LOGI(TAG, "[CALIBRATION][%s] ========================= Gain Calibration  =========================", cs);
+  ESP_LOGI(TAG, "[CALIBRATION][%s] ---------------------------------------------------------------------", cs);
+  ESP_LOGI(
+      TAG,
+      "[CALIBRATION][%s] | Phase | V_meas (V) | I_meas (A) | V_ref | I_ref  | V_gain (old→new) | I_gain (old→new) |",
+      cs);
+  ESP_LOGI(TAG, "[CALIBRATION][%s] ---------------------------------------------------------------------", cs);

  for (uint8_t phase = 0; phase < 3; phase++) {
    float measured_voltage = this->get_phase_voltage_avg_(phase);
@@ -476,22 +604,22 @@ void ATM90E32Component::run_gain_calibrations() {

    // Voltage calibration
    if (ref_voltage <= 0.0f) {
-      ESP_LOGW(TAG, "[CALIBRATION] Phase %s - Skipping voltage calibration: reference voltage is 0.",
+      ESP_LOGW(TAG, "[CALIBRATION][%s] Phase %s - Skipping voltage calibration: reference voltage is 0.", cs,
               phase_labels[phase]);
    } else if (measured_voltage == 0.0f) {
-      ESP_LOGW(TAG, "[CALIBRATION] Phase %s - Skipping voltage calibration: measured voltage is 0.",
+      ESP_LOGW(TAG, "[CALIBRATION][%s] Phase %s - Skipping voltage calibration: measured voltage is 0.", cs,
               phase_labels[phase]);
    } else {
      uint32_t new_voltage_gain = static_cast<uint16_t>((ref_voltage / measured_voltage) * current_voltage_gain);
      if (new_voltage_gain == 0) {
-        ESP_LOGW(TAG, "[CALIBRATION] Phase %s - Voltage gain would be 0. Check reference and measured voltage.",
+        ESP_LOGW(TAG, "[CALIBRATION][%s] Phase %s - Voltage gain would be 0. Check reference and measured voltage.", cs,
                 phase_labels[phase]);
      } else {
        if (new_voltage_gain >= 65535) {
-          ESP_LOGW(
-              TAG,
-              "[CALIBRATION] Phase %s - Voltage gain exceeds 65535. You may need a higher output voltage transformer.",
-              phase_labels[phase]);
+          ESP_LOGW(TAG,
+                   "[CALIBRATION][%s] Phase %s - Voltage gain exceeds 65535. You may need a higher output voltage "
+                   "transformer.",
+                   cs, phase_labels[phase]);
          new_voltage_gain = 65535;
        }
        this->gain_phase_[phase].voltage_gain = static_cast<uint16_t>(new_voltage_gain);
@@ -501,20 +629,20 @@ void ATM90E32Component::run_gain_calibrations() {

    // Current calibration
    if (ref_current == 0.0f) {
-      ESP_LOGW(TAG, "[CALIBRATION] Phase %s - Skipping current calibration: reference current is 0.",
+      ESP_LOGW(TAG, "[CALIBRATION][%s] Phase %s - Skipping current calibration: reference current is 0.", cs,
               phase_labels[phase]);
    } else if (measured_current == 0.0f) {
-      ESP_LOGW(TAG, "[CALIBRATION] Phase %s - Skipping current calibration: measured current is 0.",
+      ESP_LOGW(TAG, "[CALIBRATION][%s] Phase %s - Skipping current calibration: measured current is 0.", cs,
               phase_labels[phase]);
    } else {
      uint32_t new_current_gain = static_cast<uint16_t>((ref_current / measured_current) * current_current_gain);
      if (new_current_gain == 0) {
-        ESP_LOGW(TAG, "[CALIBRATION] Phase %s - Current gain would be 0. Check reference and measured current.",
+        ESP_LOGW(TAG, "[CALIBRATION][%s] Phase %s - Current gain would be 0. Check reference and measured current.", cs,
                 phase_labels[phase]);
      } else {
        if (new_current_gain >= 65535) {
-          ESP_LOGW(TAG, "[CALIBRATION] Phase %s - Current gain exceeds 65535. You may need to turn up pga gain.",
-                   phase_labels[phase]);
+          ESP_LOGW(TAG, "[CALIBRATION][%s] Phase %s - Current gain exceeds 65535. You may need to turn up pga gain.",
+                   cs, phase_labels[phase]);
          new_current_gain = 65535;
        }
        this->gain_phase_[phase].current_gain = static_cast<uint16_t>(new_current_gain);
@@ -523,13 +651,13 @@ void ATM90E32Component::run_gain_calibrations() {
    }

    // Final row output
-    ESP_LOGI(TAG, "[CALIBRATION] |   %c   |  %9.2f |  %9.4f | %5.2f | %6.4f |  %5u → %-5u  |  %5u → %-5u  |",
+    ESP_LOGI(TAG, "[CALIBRATION][%s] |   %c   |  %9.2f |  %9.4f | %5.2f | %6.4f |  %5u → %-5u  |  %5u → %-5u  |", cs,
             'A' + phase, measured_voltage, measured_current, ref_voltage, ref_current, current_voltage_gain,
             did_voltage ? this->gain_phase_[phase].voltage_gain : current_voltage_gain, current_current_gain,
             did_current ? this->gain_phase_[phase].current_gain : current_current_gain);
  }

-  ESP_LOGI(TAG, "[CALIBRATION] =====================================================================\n");
+  ESP_LOGI(TAG, "[CALIBRATION][%s] =====================================================================\n", cs);

  this->save_gain_calibration_to_memory_();
  this->write_gains_to_registers_();
@@ -537,54 +665,108 @@ void ATM90E32Component::run_gain_calibrations() {
 }

 void ATM90E32Component::save_gain_calibration_to_memory_() {
+  const char *cs = this->cs_summary_.c_str();
  bool success = this->gain_calibration_pref_.save(&this->gain_phase_);
+  global_preferences->sync();
  if (success) {
    this->using_saved_calibrations_ = true;
-    ESP_LOGI(TAG, "[CALIBRATION] Gain calibration saved to memory.");
+    ESP_LOGI(TAG, "[CALIBRATION][%s] Gain calibration saved to memory.", cs);
  } else {
    this->using_saved_calibrations_ = false;
-    ESP_LOGE(TAG, "[CALIBRATION] Failed to save gain calibration to memory!");
+    ESP_LOGE(TAG, "[CALIBRATION][%s] Failed to save gain calibration to memory!", cs);
+  }
+}
+
+void ATM90E32Component::save_offset_calibration_to_memory_() {
+  const char *cs = this->cs_summary_.c_str();
+  bool success = this->offset_pref_.save(&this->offset_phase_);
+  global_preferences->sync();
+  if (success) {
+    this->using_saved_calibrations_ = true;
+    this->restored_offset_calibration_ = true;
+    for (bool &phase : this->offset_calibration_mismatch_)
+      phase = false;
+    ESP_LOGI(TAG, "[CALIBRATION][%s] Offset calibration saved to memory.", cs);
+  } else {
+    this->using_saved_calibrations_ = false;
+    ESP_LOGE(TAG, "[CALIBRATION][%s] Failed to save offset calibration to memory!", cs);
+  }
+}
+
+void ATM90E32Component::save_power_offset_calibration_to_memory_() {
+  const char *cs = this->cs_summary_.c_str();
+  bool success = this->power_offset_pref_.save(&this->power_offset_phase_);
+  global_preferences->sync();
+  if (success) {
+    this->using_saved_calibrations_ = true;
+    this->restored_power_offset_calibration_ = true;
+    for (bool &phase : this->power_offset_calibration_mismatch_)
+      phase = false;
+    ESP_LOGI(TAG, "[CALIBRATION][%s] Power offset calibration saved to memory.", cs);
+  } else {
+    this->using_saved_calibrations_ = false;
+    ESP_LOGE(TAG, "[CALIBRATION][%s] Failed to save power offset calibration to memory!", cs);
  }
 }

 void ATM90E32Component::run_offset_calibrations() {
+  const char *cs = this->cs_summary_.c_str();
  if (!this->enable_offset_calibration_) {
-    ESP_LOGW(TAG, "[CALIBRATION] Offset calibration is disabled! Enable it first with enable_offset_calibration: true");
+    ESP_LOGW(TAG,
+             "[CALIBRATION][%s] Offset calibration is disabled! Enable it first with enable_offset_calibration: true",
+             cs);
    return;
  }

+  ESP_LOGI(TAG, "[CALIBRATION][%s] ", cs);
+  ESP_LOGI(TAG, "[CALIBRATION][%s] ======================== Offset Calibration ========================", cs);
+  ESP_LOGI(TAG, "[CALIBRATION][%s] ------------------------------------------------------------------", cs);
+  ESP_LOGI(TAG, "[CALIBRATION][%s] | Phase | offset_voltage | offset_current |", cs);
+  ESP_LOGI(TAG, "[CALIBRATION][%s] ------------------------------------------------------------------", cs);
+
  for (uint8_t phase = 0; phase < 3; phase++) {
    int16_t voltage_offset = calibrate_offset(phase, true);
    int16_t current_offset = calibrate_offset(phase, false);

    this->write_offsets_to_registers_(phase, voltage_offset, current_offset);

-    ESP_LOGI(TAG, "[CALIBRATION] Phase %c - offset_voltage: %d, offset_current: %d", 'A' + phase, voltage_offset,
+    ESP_LOGI(TAG, "[CALIBRATION][%s] |   %c   |     %6d      |     %6d      |", cs, 'A' + phase, voltage_offset,
             current_offset);
  }

-  this->offset_pref_.save(&this->offset_phase_);  // Save to flash
+  ESP_LOGI(TAG, "[CALIBRATION][%s] ==================================================================\n", cs);
+
+  this->save_offset_calibration_to_memory_();
 }

 void ATM90E32Component::run_power_offset_calibrations() {
+  const char *cs = this->cs_summary_.c_str();
  if (!this->enable_offset_calibration_) {
    ESP_LOGW(
        TAG,
-        "[CALIBRATION] Offset power calibration is disabled! Enable it first with enable_offset_calibration: true");
+        "[CALIBRATION][%s] Offset power calibration is disabled! Enable it first with enable_offset_calibration: true",
+        cs);
    return;
  }

+  ESP_LOGI(TAG, "[CALIBRATION][%s] ", cs);
+  ESP_LOGI(TAG, "[CALIBRATION][%s] ===================== Power Offset Calibration =====================", cs);
+  ESP_LOGI(TAG, "[CALIBRATION][%s] ---------------------------------------------------------------------", cs);
+  ESP_LOGI(TAG, "[CALIBRATION][%s] | Phase | offset_active_power | offset_reactive_power |", cs);
+  ESP_LOGI(TAG, "[CALIBRATION][%s] ---------------------------------------------------------------------", cs);
+
  for (uint8_t phase = 0; phase < 3; ++phase) {
    int16_t active_offset = calibrate_power_offset(phase, false);
    int16_t reactive_offset = calibrate_power_offset(phase, true);

    this->write_power_offsets_to_registers_(phase, active_offset, reactive_offset);

-    ESP_LOGI(TAG, "[CALIBRATION] Phase %c - offset_active_power: %d, offset_reactive_power: %d", 'A' + phase,
-             active_offset, reactive_offset);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] |   %c   |       %6d        |        %6d        |", cs, 'A' + phase, active_offset,
+             reactive_offset);
  }
+  ESP_LOGI(TAG, "[CALIBRATION][%s] =====================================================================\n", cs);

-  this->power_offset_pref_.save(&this->power_offset_phase_);  // Save to flash
+  this->save_power_offset_calibration_to_memory_();
 }

 void ATM90E32Component::write_gains_to_registers_() {
@@ -631,102 +813,276 @@ void ATM90E32Component::write_power_offsets_to_registers_(uint8_t phase, int16_t
 }

 void ATM90E32Component::restore_gain_calibrations_() {
-  if (this->gain_calibration_pref_.load(&this->gain_phase_)) {
-    ESP_LOGI(TAG, "[CALIBRATION] Restoring saved gain calibrations to registers:");
-
-    for (uint8_t phase = 0; phase < 3; phase++) {
-      uint16_t v_gain = this->gain_phase_[phase].voltage_gain;
-      uint16_t i_gain = this->gain_phase_[phase].current_gain;
-      ESP_LOGI(TAG, "[CALIBRATION]   Phase %c - Voltage Gain: %u, Current Gain: %u", 'A' + phase, v_gain, i_gain);
-    }
-
-    this->write_gains_to_registers_();
-
-    if (this->verify_gain_writes_()) {
-      this->using_saved_calibrations_ = true;
-      ESP_LOGI(TAG, "[CALIBRATION] Gain calibration loaded and verified successfully.");
-    } else {
-      this->using_saved_calibrations_ = false;
-      ESP_LOGE(TAG, "[CALIBRATION] Gain verification failed! Calibration may not be applied correctly.");
-    }
-  } else {
-    this->using_saved_calibrations_ = false;
-    ESP_LOGW(TAG, "[CALIBRATION] No stored gain calibrations found. Using config file values.");
+  const char *cs = this->cs_summary_.c_str();
+  for (uint8_t i = 0; i < 3; ++i) {
+    this->config_gain_phase_[i].voltage_gain = this->phase_[i].voltage_gain_;
+    this->config_gain_phase_[i].current_gain = this->phase_[i].ct_gain_;
+    this->gain_phase_[i] = this->config_gain_phase_[i];
  }
+
+  if (this->gain_calibration_pref_.load(&this->gain_phase_)) {
+    bool all_zero = true;
+    bool same_as_config = true;
+    for (uint8_t phase = 0; phase < 3; ++phase) {
+      const auto &cfg = this->config_gain_phase_[phase];
+      const auto &saved = this->gain_phase_[phase];
+      if (saved.voltage_gain != 0 || saved.current_gain != 0)
+        all_zero = false;
+      if (saved.voltage_gain != cfg.voltage_gain || saved.current_gain != cfg.current_gain)
+        same_as_config = false;
+    }
+
+    if (!all_zero && !same_as_config) {
+      for (uint8_t phase = 0; phase < 3; ++phase) {
+        bool mismatch = false;
+        if (this->has_config_voltage_gain_[phase] &&
+            this->gain_phase_[phase].voltage_gain != this->config_gain_phase_[phase].voltage_gain)
+          mismatch = true;
+        if (this->has_config_current_gain_[phase] &&
+            this->gain_phase_[phase].current_gain != this->config_gain_phase_[phase].current_gain)
+          mismatch = true;
+        if (mismatch)
+          this->gain_calibration_mismatch_[phase] = true;
+      }
+
+      this->write_gains_to_registers_();
+
+      if (this->verify_gain_writes_()) {
+        this->using_saved_calibrations_ = true;
+        this->restored_gain_calibration_ = true;
+        return;
+      }
+
+      this->using_saved_calibrations_ = false;
+      ESP_LOGE(TAG, "[CALIBRATION][%s] Gain verification failed! Calibration may not be applied correctly.", cs);
+    }
+  }
+
+  this->using_saved_calibrations_ = false;
+  for (uint8_t i = 0; i < 3; ++i)
+    this->gain_phase_[i] = this->config_gain_phase_[i];
+  this->write_gains_to_registers_();
+
+  ESP_LOGW(TAG, "[CALIBRATION][%s] No stored gain calibrations found. Using config file values.", cs);
 }

 void ATM90E32Component::restore_offset_calibrations_() {
-  if (this->offset_pref_.load(&this->offset_phase_)) {
-    ESP_LOGI(TAG, "[CALIBRATION] Successfully restored offset calibration from memory.");
+  const char *cs = this->cs_summary_.c_str();
+  for (uint8_t i = 0; i < 3; ++i)
+    this->config_offset_phase_[i] = this->offset_phase_[i];

+  bool have_data = this->offset_pref_.load(&this->offset_phase_);
+  bool all_zero = true;
+  if (have_data) {
+    for (auto &phase : this->offset_phase_) {
+      if (phase.voltage_offset_ != 0 || phase.current_offset_ != 0) {
+        all_zero = false;
+        break;
+      }
+    }
+  }
+
+  if (have_data && !all_zero) {
+    this->restored_offset_calibration_ = true;
    for (uint8_t phase = 0; phase < 3; phase++) {
      auto &offset = this->offset_phase_[phase];
-      write_offsets_to_registers_(phase, offset.voltage_offset_, offset.current_offset_);
-      ESP_LOGI(TAG, "[CALIBRATION] Phase %c - offset_voltage:: %d, offset_current: %d", 'A' + phase,
-               offset.voltage_offset_, offset.current_offset_);
+      bool mismatch = false;
+      if (this->has_config_voltage_offset_[phase] &&
+          offset.voltage_offset_ != this->config_offset_phase_[phase].voltage_offset_)
+        mismatch = true;
+      if (this->has_config_current_offset_[phase] &&
+          offset.current_offset_ != this->config_offset_phase_[phase].current_offset_)
+        mismatch = true;
+      if (mismatch)
+        this->offset_calibration_mismatch_[phase] = true;
    }
  } else {
-    ESP_LOGW(TAG, "[CALIBRATION] No stored offset calibrations found. Using default values.");
+    for (uint8_t phase = 0; phase < 3; phase++)
+      this->offset_phase_[phase] = this->config_offset_phase_[phase];
+    ESP_LOGW(TAG, "[CALIBRATION][%s] No stored offset calibrations found. Using default values.", cs);
+  }
+
+  for (uint8_t phase = 0; phase < 3; phase++) {
+    write_offsets_to_registers_(phase, this->offset_phase_[phase].voltage_offset_,
+                                this->offset_phase_[phase].current_offset_);
  }
 }

 void ATM90E32Component::restore_power_offset_calibrations_() {
-  if (this->power_offset_pref_.load(&this->power_offset_phase_)) {
-    ESP_LOGI(TAG, "[CALIBRATION] Successfully restored power offset calibration from memory.");
+  const char *cs = this->cs_summary_.c_str();
+  for (uint8_t i = 0; i < 3; ++i)
+    this->config_power_offset_phase_[i] = this->power_offset_phase_[i];

+  bool have_data = this->power_offset_pref_.load(&this->power_offset_phase_);
+  bool all_zero = true;
+  if (have_data) {
+    for (auto &phase : this->power_offset_phase_) {
+      if (phase.active_power_offset != 0 || phase.reactive_power_offset != 0) {
+        all_zero = false;
+        break;
+      }
+    }
+  }
+
+  if (have_data && !all_zero) {
+    this->restored_power_offset_calibration_ = true;
    for (uint8_t phase = 0; phase < 3; ++phase) {
      auto &offset = this->power_offset_phase_[phase];
-      write_power_offsets_to_registers_(phase, offset.active_power_offset, offset.reactive_power_offset);
-      ESP_LOGI(TAG, "[CALIBRATION] Phase %c - offset_active_power: %d, offset_reactive_power: %d", 'A' + phase,
-               offset.active_power_offset, offset.reactive_power_offset);
+      bool mismatch = false;
+      if (this->has_config_active_power_offset_[phase] &&
+          offset.active_power_offset != this->config_power_offset_phase_[phase].active_power_offset)
+        mismatch = true;
+      if (this->has_config_reactive_power_offset_[phase] &&
+          offset.reactive_power_offset != this->config_power_offset_phase_[phase].reactive_power_offset)
+        mismatch = true;
+      if (mismatch)
+        this->power_offset_calibration_mismatch_[phase] = true;
    }
  } else {
-    ESP_LOGW(TAG, "[CALIBRATION] No stored power offsets found. Using default values.");
+    for (uint8_t phase = 0; phase < 3; ++phase)
+      this->power_offset_phase_[phase] = this->config_power_offset_phase_[phase];
+    ESP_LOGW(TAG, "[CALIBRATION][%s] No stored power offsets found. Using default values.", cs);
+  }
+
+  for (uint8_t phase = 0; phase < 3; ++phase) {
+    write_power_offsets_to_registers_(phase, this->power_offset_phase_[phase].active_power_offset,
+                                      this->power_offset_phase_[phase].reactive_power_offset);
  }
 }

 void ATM90E32Component::clear_gain_calibrations() {
-  ESP_LOGI(TAG, "[CALIBRATION] Clearing stored gain calibrations and restoring config-defined values");
-
-  for (int phase = 0; phase < 3; phase++) {
-    gain_phase_[phase].voltage_gain = this->phase_[phase].voltage_gain_;
-    gain_phase_[phase].current_gain = this->phase_[phase].ct_gain_;
+  const char *cs = this->cs_summary_.c_str();
+  if (!this->using_saved_calibrations_) {
+    ESP_LOGI(TAG, "[CALIBRATION][%s] No stored gain calibrations to clear. Current values:", cs);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] ----------------------------------------------------------", cs);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] | Phase | voltage_gain | current_gain |", cs);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] ----------------------------------------------------------", cs);
+    for (int phase = 0; phase < 3; phase++) {
+      ESP_LOGI(TAG, "[CALIBRATION][%s] |   %c   |    %6u    |    %6u    |", cs, 'A' + phase,
+               this->gain_phase_[phase].voltage_gain, this->gain_phase_[phase].current_gain);
+    }
+    ESP_LOGI(TAG, "[CALIBRATION][%s] ==========================================================\n", cs);
+    return;
  }

-  bool success = this->gain_calibration_pref_.save(&this->gain_phase_);
-  this->using_saved_calibrations_ = false;
+  ESP_LOGI(TAG, "[CALIBRATION][%s] Clearing stored gain calibrations and restoring config-defined values", cs);
+  ESP_LOGI(TAG, "[CALIBRATION][%s] ----------------------------------------------------------", cs);
+  ESP_LOGI(TAG, "[CALIBRATION][%s] | Phase | voltage_gain | current_gain |", cs);
+  ESP_LOGI(TAG, "[CALIBRATION][%s] ----------------------------------------------------------", cs);

-  if (success) {
-    ESP_LOGI(TAG, "[CALIBRATION] Gain calibrations cleared. Config values restored:");
-    for (int phase = 0; phase < 3; phase++) {
-      ESP_LOGI(TAG, "[CALIBRATION]   Phase %c - Voltage Gain: %u, Current Gain: %u", 'A' + phase,
-               gain_phase_[phase].voltage_gain, gain_phase_[phase].current_gain);
-    }
-  } else {
-    ESP_LOGE(TAG, "[CALIBRATION] Failed to clear gain calibrations!");
+  for (int phase = 0; phase < 3; phase++) {
+    uint16_t voltage_gain = this->phase_[phase].voltage_gain_;
+    uint16_t current_gain = this->phase_[phase].ct_gain_;
+
+    this->config_gain_phase_[phase].voltage_gain = voltage_gain;
+    this->config_gain_phase_[phase].current_gain = current_gain;
+    this->gain_phase_[phase].voltage_gain = voltage_gain;
+    this->gain_phase_[phase].current_gain = current_gain;
+
+    ESP_LOGI(TAG, "[CALIBRATION][%s] |   %c   |    %6u    |    %6u    |", cs, 'A' + phase, voltage_gain, current_gain);
+  }
+  ESP_LOGI(TAG, "[CALIBRATION][%s] ==========================================================\n", cs);
+
+  GainCalibration zero_gains[3]{{0, 0}, {0, 0}, {0, 0}};
+  bool success = this->gain_calibration_pref_.save(&zero_gains);
+  global_preferences->sync();
+
+  this->using_saved_calibrations_ = false;
+  this->restored_gain_calibration_ = false;
+  for (bool &phase : this->gain_calibration_mismatch_)
+    phase = false;
+
+  if (!success) {
+    ESP_LOGE(TAG, "[CALIBRATION][%s] Failed to clear gain calibrations!", cs);
  }

  this->write_gains_to_registers_();  // Apply them to the chip immediately
 }

 void ATM90E32Component::clear_offset_calibrations() {
-  for (uint8_t phase = 0; phase < 3; phase++) {
-    this->write_offsets_to_registers_(phase, 0, 0);
+  const char *cs = this->cs_summary_.c_str();
+  if (!this->restored_offset_calibration_) {
+    ESP_LOGI(TAG, "[CALIBRATION][%s] No stored offset calibrations to clear. Current values:", cs);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] --------------------------------------------------------------", cs);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] | Phase | offset_voltage | offset_current |", cs);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] --------------------------------------------------------------", cs);
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      ESP_LOGI(TAG, "[CALIBRATION][%s] |   %c   |     %6d      |     %6d      |", cs, 'A' + phase,
+               this->offset_phase_[phase].voltage_offset_, this->offset_phase_[phase].current_offset_);
+    }
+    ESP_LOGI(TAG, "[CALIBRATION][%s] ==============================================================\n", cs);
+    return;
  }

-  this->offset_pref_.save(&this->offset_phase_);  // Save cleared values to flash memory
+  ESP_LOGI(TAG, "[CALIBRATION][%s] Clearing stored offset calibrations and restoring config-defined values", cs);
+  ESP_LOGI(TAG, "[CALIBRATION][%s] --------------------------------------------------------------", cs);
+  ESP_LOGI(TAG, "[CALIBRATION][%s] | Phase | offset_voltage | offset_current |", cs);
+  ESP_LOGI(TAG, "[CALIBRATION][%s] --------------------------------------------------------------", cs);

-  ESP_LOGI(TAG, "[CALIBRATION] Offsets cleared.");
+  for (uint8_t phase = 0; phase < 3; phase++) {
+    int16_t voltage_offset =
+        this->has_config_voltage_offset_[phase] ? this->config_offset_phase_[phase].voltage_offset_ : 0;
+    int16_t current_offset =
+        this->has_config_current_offset_[phase] ? this->config_offset_phase_[phase].current_offset_ : 0;
+    this->write_offsets_to_registers_(phase, voltage_offset, current_offset);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] |   %c   |     %6d      |     %6d      |", cs, 'A' + phase, voltage_offset,
+             current_offset);
+  }
+  ESP_LOGI(TAG, "[CALIBRATION][%s] ==============================================================\n", cs);
+
+  OffsetCalibration zero_offsets[3]{{0, 0}, {0, 0}, {0, 0}};
+  this->offset_pref_.save(&zero_offsets);  // Clear stored values in flash
+  global_preferences->sync();
+
+  this->restored_offset_calibration_ = false;
+  for (bool &phase : this->offset_calibration_mismatch_)
+    phase = false;
+
+  ESP_LOGI(TAG, "[CALIBRATION][%s] Offsets cleared.", cs);
 }

 void ATM90E32Component::clear_power_offset_calibrations() {
-  for (uint8_t phase = 0; phase < 3; phase++) {
-    this->write_power_offsets_to_registers_(phase, 0, 0);
+  const char *cs = this->cs_summary_.c_str();
+  if (!this->restored_power_offset_calibration_) {
+    ESP_LOGI(TAG, "[CALIBRATION][%s] No stored power offsets to clear. Current values:", cs);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] ---------------------------------------------------------------------", cs);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] | Phase | offset_active_power | offset_reactive_power |", cs);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] ---------------------------------------------------------------------", cs);
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      ESP_LOGI(TAG, "[CALIBRATION][%s] |   %c   |       %6d        |        %6d        |", cs, 'A' + phase,
+               this->power_offset_phase_[phase].active_power_offset,
+               this->power_offset_phase_[phase].reactive_power_offset);
+    }
+    ESP_LOGI(TAG, "[CALIBRATION][%s] =====================================================================\n", cs);
+    return;
  }

-  this->power_offset_pref_.save(&this->power_offset_phase_);
+  ESP_LOGI(TAG, "[CALIBRATION][%s] Clearing stored power offsets and restoring config-defined values", cs);
+  ESP_LOGI(TAG, "[CALIBRATION][%s] ---------------------------------------------------------------------", cs);
+  ESP_LOGI(TAG, "[CALIBRATION][%s] | Phase | offset_active_power | offset_reactive_power |", cs);
+  ESP_LOGI(TAG, "[CALIBRATION][%s] ---------------------------------------------------------------------", cs);

-  ESP_LOGI(TAG, "[CALIBRATION] Power offsets cleared.");
+  for (uint8_t phase = 0; phase < 3; phase++) {
+    int16_t active_offset =
+        this->has_config_active_power_offset_[phase] ? this->config_power_offset_phase_[phase].active_power_offset : 0;
+    int16_t reactive_offset = this->has_config_reactive_power_offset_[phase]
+                                  ? this->config_power_offset_phase_[phase].reactive_power_offset
+                                  : 0;
+    this->write_power_offsets_to_registers_(phase, active_offset, reactive_offset);
+    ESP_LOGI(TAG, "[CALIBRATION][%s] |   %c   |       %6d        |        %6d        |", cs, 'A' + phase, active_offset,
+             reactive_offset);
+  }
+  ESP_LOGI(TAG, "[CALIBRATION][%s] =====================================================================\n", cs);
+
+  PowerOffsetCalibration zero_power_offsets[3]{{0, 0}, {0, 0}, {0, 0}};
+  this->power_offset_pref_.save(&zero_power_offsets);
+  global_preferences->sync();
+
+  this->restored_power_offset_calibration_ = false;
+  for (bool &phase : this->power_offset_calibration_mismatch_)
+    phase = false;
+
+  ESP_LOGI(TAG, "[CALIBRATION][%s] Power offsets cleared.", cs);
 }

 int16_t ATM90E32Component::calibrate_offset(uint8_t phase, bool voltage) {
@@ -747,20 +1103,21 @@ int16_t ATM90E32Component::calibrate_offset(uint8_t phase, bool voltage) {

 int16_t ATM90E32Component::calibrate_power_offset(uint8_t phase, bool reactive) {
  const uint8_t num_reads = 5;
-  uint64_t total_value = 0;
+  int64_t total_value = 0;

  for (uint8_t i = 0; i < num_reads; ++i) {
-    uint32_t reading = reactive ? this->read32_(ATM90E32_REGISTER_QMEAN + phase, ATM90E32_REGISTER_QMEANLSB + phase)
-                                : this->read32_(ATM90E32_REGISTER_PMEAN + phase, ATM90E32_REGISTER_PMEANLSB + phase);
+    int32_t reading = reactive ? this->read32_(ATM90E32_REGISTER_QMEAN + phase, ATM90E32_REGISTER_QMEANLSB + phase)
+                               : this->read32_(ATM90E32_REGISTER_PMEAN + phase, ATM90E32_REGISTER_PMEANLSB + phase);
    total_value += reading;
  }

-  const uint32_t average_value = total_value / num_reads;
-  const uint32_t power_offset = ~average_value + 1;
+  int32_t average_value = total_value / num_reads;
+  int32_t power_offset = -average_value;
  return static_cast<int16_t>(power_offset);  // Takes the lower 16 bits
 }

 bool ATM90E32Component::verify_gain_writes_() {
+  const char *cs = this->cs_summary_.c_str();
  bool success = true;
  for (uint8_t phase = 0; phase < 3; phase++) {
    uint16_t read_voltage = this->read16_(voltage_gain_registers[phase]);
@@ -768,7 +1125,7 @@ bool ATM90E32Component::verify_gain_writes_() {

    if (read_voltage != this->gain_phase_[phase].voltage_gain ||
        read_current != this->gain_phase_[phase].current_gain) {
-      ESP_LOGE(TAG, "[CALIBRATION] Mismatch detected for Phase %s!", phase_labels[phase]);
+      ESP_LOGE(TAG, "[CALIBRATION][%s] Mismatch detected for Phase %s!", cs, phase_labels[phase]);
      success = false;
    }
  }
@@ -791,16 +1148,16 @@ void ATM90E32Component::check_phase_status() {
      status += "Phase Loss; ";

    auto *sensor = this->phase_status_text_sensor_[phase];
-    const char *phase_name = sensor ? sensor->get_name().c_str() : "Unknown Phase";
+    if (sensor == nullptr)
+      continue;
+
    if (!status.empty()) {
      status.pop_back();  // remove space
      status.pop_back();  // remove semicolon
-      ESP_LOGW(TAG, "%s: %s", phase_name, status.c_str());
-      if (sensor != nullptr)
-        sensor->publish_state(status);
+      ESP_LOGW(TAG, "%s: %s", sensor->get_name().c_str(), status.c_str());
+      sensor->publish_state(status);
    } else {
-      if (sensor != nullptr)
-        sensor->publish_state("Okay");
+      sensor->publish_state("Okay");
    }
  }
 }
@@ -817,9 +1174,12 @@ void ATM90E32Component::check_freq_status() {
  } else {
    freq_status = "Normal";
  }
-  ESP_LOGW(TAG, "Frequency status: %s", freq_status.c_str());
-
  if (this->freq_status_text_sensor_ != nullptr) {
+    if (freq_status == "Normal") {
+      ESP_LOGD(TAG, "Frequency status: %s", freq_status.c_str());
+    } else {
+      ESP_LOGW(TAG, "Frequency status: %s", freq_status.c_str());
+    }
    this->freq_status_text_sensor_->publish_state(freq_status);
  }
 }
--- a/esphome/components/atm90e32/atm90e32.h
+++ b/esphome/components/atm90e32/atm90e32.h
@@ -61,15 +61,29 @@ class ATM90E32Component : public PollingComponent,
    this->phase_[phase].harmonic_active_power_sensor_ = obj;
  }
  void set_peak_current_sensor(int phase, sensor::Sensor *obj) { this->phase_[phase].peak_current_sensor_ = obj; }
-  void set_volt_gain(int phase, uint16_t gain) { this->phase_[phase].voltage_gain_ = gain; }
-  void set_ct_gain(int phase, uint16_t gain) { this->phase_[phase].ct_gain_ = gain; }
-  void set_voltage_offset(uint8_t phase, int16_t offset) { this->offset_phase_[phase].voltage_offset_ = offset; }
-  void set_current_offset(uint8_t phase, int16_t offset) { this->offset_phase_[phase].current_offset_ = offset; }
+  void set_volt_gain(int phase, uint16_t gain) {
+    this->phase_[phase].voltage_gain_ = gain;
+    this->has_config_voltage_gain_[phase] = true;
+  }
+  void set_ct_gain(int phase, uint16_t gain) {
+    this->phase_[phase].ct_gain_ = gain;
+    this->has_config_current_gain_[phase] = true;
+  }
+  void set_voltage_offset(uint8_t phase, int16_t offset) {
+    this->offset_phase_[phase].voltage_offset_ = offset;
+    this->has_config_voltage_offset_[phase] = true;
+  }
+  void set_current_offset(uint8_t phase, int16_t offset) {
+    this->offset_phase_[phase].current_offset_ = offset;
+    this->has_config_current_offset_[phase] = true;
+  }
  void set_active_power_offset(uint8_t phase, int16_t offset) {
    this->power_offset_phase_[phase].active_power_offset = offset;
+    this->has_config_active_power_offset_[phase] = true;
  }
  void set_reactive_power_offset(uint8_t phase, int16_t offset) {
    this->power_offset_phase_[phase].reactive_power_offset = offset;
+    this->has_config_reactive_power_offset_[phase] = true;
  }
  void set_freq_sensor(sensor::Sensor *freq_sensor) { freq_sensor_ = freq_sensor; }
  void set_peak_current_signed(bool flag) { peak_current_signed_ = flag; }
@@ -127,7 +141,7 @@ class ATM90E32Component : public PollingComponent,
 #endif
  uint16_t read16_(uint16_t a_register);
  int read32_(uint16_t addr_h, uint16_t addr_l);
-  void write16_(uint16_t a_register, uint16_t val);
+  void write16_(uint16_t a_register, uint16_t val, bool validate = true);
  float get_local_phase_voltage_(uint8_t phase);
  float get_local_phase_current_(uint8_t phase);
  float get_local_phase_active_power_(uint8_t phase);
@@ -159,12 +173,15 @@ class ATM90E32Component : public PollingComponent,
  void restore_offset_calibrations_();
  void restore_power_offset_calibrations_();
  void restore_gain_calibrations_();
+  void save_offset_calibration_to_memory_();
  void save_gain_calibration_to_memory_();
+  void save_power_offset_calibration_to_memory_();
  void write_offsets_to_registers_(uint8_t phase, int16_t voltage_offset, int16_t current_offset);
  void write_power_offsets_to_registers_(uint8_t phase, int16_t p_offset, int16_t q_offset);
  void write_gains_to_registers_();
  bool verify_gain_writes_();
  bool validate_spi_read_(uint16_t expected, const char *context = nullptr);
+  void log_calibration_status_();

  struct ATM90E32Phase {
    uint16_t voltage_gain_{0};
@@ -204,19 +221,33 @@ class ATM90E32Component : public PollingComponent,
    int16_t current_offset_{0};
  } offset_phase_[3];

+  OffsetCalibration config_offset_phase_[3];
+
  struct PowerOffsetCalibration {
    int16_t active_power_offset{0};
    int16_t reactive_power_offset{0};
  } power_offset_phase_[3];

+  PowerOffsetCalibration config_power_offset_phase_[3];
+
  struct GainCalibration {
    uint16_t voltage_gain{1};
    uint16_t current_gain{1};
  } gain_phase_[3];

+  GainCalibration config_gain_phase_[3];
+
+  bool has_config_voltage_offset_[3]{false, false, false};
+  bool has_config_current_offset_[3]{false, false, false};
+  bool has_config_active_power_offset_[3]{false, false, false};
+  bool has_config_reactive_power_offset_[3]{false, false, false};
+  bool has_config_voltage_gain_[3]{false, false, false};
+  bool has_config_current_gain_[3]{false, false, false};
+
  ESPPreferenceObject offset_pref_;
  ESPPreferenceObject power_offset_pref_;
  ESPPreferenceObject gain_calibration_pref_;
+  std::string cs_summary_;

  sensor::Sensor *freq_sensor_{nullptr};
 #ifdef USE_TEXT_SENSOR
@@ -231,6 +262,13 @@ class ATM90E32Component : public PollingComponent,
  bool peak_current_signed_{false};
  bool enable_offset_calibration_{false};
  bool enable_gain_calibration_{false};
+  bool restored_offset_calibration_{false};
+  bool restored_power_offset_calibration_{false};
+  bool restored_gain_calibration_{false};
+  bool calibration_message_printed_{false};
+  bool offset_calibration_mismatch_[3]{false, false, false};
+  bool power_offset_calibration_mismatch_[3]{false, false, false};
+  bool gain_calibration_mismatch_[3]{false, false, false};
 };

 }  // namespace atm90e32
--- a/esphome/components/ble_client/init.py
+++ b/esphome/components/ble_client/init.py
@@ -286,6 +286,7 @@ async def remove_bond_to_code(config, action_id, template_arg, args):
 async def to_code(config):
    # Register the loggers this component needs
    esp32_ble.register_bt_logger(BTLoggers.GATT, BTLoggers.SMP)
+    cg.add_define("USE_ESP32_BLE_UUID")

    var = cg.new_Pvariable(config[CONF_ID])
    await cg.register_component(var, config)
--- a/esphome/components/bluetooth_proxy/init.py
+++ b/esphome/components/bluetooth_proxy/init.py
@@ -1,13 +1,19 @@
+import logging
+
 import esphome.codegen as cg
 from esphome.components import esp32_ble, esp32_ble_client, esp32_ble_tracker
 from esphome.components.esp32 import add_idf_sdkconfig_option
 from esphome.components.esp32_ble import BTLoggers
 import esphome.config_validation as cv
 from esphome.const import CONF_ACTIVE, CONF_ID
+from esphome.core import CORE
+from esphome.log import AnsiFore, color

 AUTO_LOAD = ["esp32_ble_client", "esp32_ble_tracker"]
 DEPENDENCIES = ["api", "esp32"]
-CODEOWNERS = ["@jesserockz"]
+CODEOWNERS = ["@jesserockz", "@bdraco"]
+
+_LOGGER = logging.getLogger(__name__)

 CONF_CONNECTION_SLOTS = "connection_slots"
 CONF_CACHE_SERVICES = "cache_services"
@@ -41,6 +47,27 @@ def validate_connections(config):
        esp32_ble_tracker.consume_connection_slots(connection_slots, "bluetooth_proxy")(
            config
        )
+
+        # Warn about connection slot waste when using Arduino framework
+        if CORE.using_arduino and connection_slots:
+            _LOGGER.warning(
+                "Bluetooth Proxy with active connections on Arduino framework has suboptimal performance.\n"
+                "If BLE connections fail, they can waste connection slots for 10 seconds because\n"
+                "Arduino doesn't allow configuring the BLE connection timeout (fixed at 30s).\n"
+                "ESP-IDF framework allows setting it to 20s to match client timeouts.\n"
+                "\n"
+                "To switch to ESP-IDF, add this to your YAML:\n"
+                "  esp32:\n"
+                "    framework:\n"
+                "      type: esp-idf\n"
+                "\n"
+                "For detailed migration instructions, see:\n"
+                "%s",
+                color(
+                    AnsiFore.BLUE, "https://esphome.io/guides/esp32_arduino_to_idf.html"
+                ),
+            )
+
        return {
            **config,
            CONF_CONNECTIONS: [CONNECTION_SCHEMA({}) for _ in range(connection_slots)],
@@ -91,6 +118,12 @@ async def to_code(config):
    connection_count = len(config.get(CONF_CONNECTIONS, []))
    cg.add_define("BLUETOOTH_PROXY_MAX_CONNECTIONS", connection_count)

+    # Define batch size for BLE advertisements
+    # Each advertisement is up to 80 bytes when packaged (including protocol overhead)
+    # 16 advertisements × 80 bytes (worst case) = 1280 bytes out of ~1320 bytes usable payload
+    # This achieves ~97% WiFi MTU utilization while staying under the limit
+    cg.add_define("BLUETOOTH_PROXY_ADVERTISEMENT_BATCH_SIZE", 16)
+
    for connection_conf in config.get(CONF_CONNECTIONS, []):
        connection_var = cg.new_Pvariable(connection_conf[CONF_ID])
        await cg.register_component(connection_var, connection_conf)
--- a/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
@@ -12,16 +12,30 @@ namespace esphome::bluetooth_proxy {

 static const char *const TAG = "bluetooth_proxy.connection";

+// This function is allocation-free and directly packs UUIDs into the output array
+// using precalculated constants for the Bluetooth base UUID
 static void fill_128bit_uuid_array(std::array<uint64_t, 2> &out, esp_bt_uuid_t uuid_source) {
-  esp_bt_uuid_t uuid = espbt::ESPBTUUID::from_uuid(uuid_source).as_128bit().get_uuid();
-  out[0] = ((uint64_t) uuid.uuid.uuid128[15] << 56) | ((uint64_t) uuid.uuid.uuid128[14] << 48) |
-           ((uint64_t) uuid.uuid.uuid128[13] << 40) | ((uint64_t) uuid.uuid.uuid128[12] << 32) |
-           ((uint64_t) uuid.uuid.uuid128[11] << 24) | ((uint64_t) uuid.uuid.uuid128[10] << 16) |
-           ((uint64_t) uuid.uuid.uuid128[9] << 8) | ((uint64_t) uuid.uuid.uuid128[8]);
-  out[1] = ((uint64_t) uuid.uuid.uuid128[7] << 56) | ((uint64_t) uuid.uuid.uuid128[6] << 48) |
-           ((uint64_t) uuid.uuid.uuid128[5] << 40) | ((uint64_t) uuid.uuid.uuid128[4] << 32) |
-           ((uint64_t) uuid.uuid.uuid128[3] << 24) | ((uint64_t) uuid.uuid.uuid128[2] << 16) |
-           ((uint64_t) uuid.uuid.uuid128[1] << 8) | ((uint64_t) uuid.uuid.uuid128[0]);
+  // Bluetooth base UUID: 00000000-0000-1000-8000-00805F9B34FB
+  // out[0] = bytes 8-15 (big-endian)
+  // - For 128-bit UUIDs: use bytes 8-15 as-is
+  // - For 16/32-bit UUIDs: insert into bytes 12-15, use 0x00001000 for bytes 8-11
+  out[0] = uuid_source.len == ESP_UUID_LEN_128
+               ? (((uint64_t) uuid_source.uuid.uuid128[15] << 56) | ((uint64_t) uuid_source.uuid.uuid128[14] << 48) |
+                  ((uint64_t) uuid_source.uuid.uuid128[13] << 40) | ((uint64_t) uuid_source.uuid.uuid128[12] << 32) |
+                  ((uint64_t) uuid_source.uuid.uuid128[11] << 24) | ((uint64_t) uuid_source.uuid.uuid128[10] << 16) |
+                  ((uint64_t) uuid_source.uuid.uuid128[9] << 8) | ((uint64_t) uuid_source.uuid.uuid128[8]))
+               : (((uint64_t) (uuid_source.len == ESP_UUID_LEN_16 ? uuid_source.uuid.uuid16 : uuid_source.uuid.uuid32)
+                   << 32) |
+                  0x00001000ULL);  // Base UUID bytes 8-11
+  // out[1] = bytes 0-7 (big-endian)
+  // - For 128-bit UUIDs: use bytes 0-7 as-is
+  // - For 16/32-bit UUIDs: use precalculated base UUID constant
+  out[1] = uuid_source.len == ESP_UUID_LEN_128
+               ? ((uint64_t) uuid_source.uuid.uuid128[7] << 56) | ((uint64_t) uuid_source.uuid.uuid128[6] << 48) |
+                     ((uint64_t) uuid_source.uuid.uuid128[5] << 40) | ((uint64_t) uuid_source.uuid.uuid128[4] << 32) |
+                     ((uint64_t) uuid_source.uuid.uuid128[3] << 24) | ((uint64_t) uuid_source.uuid.uuid128[2] << 16) |
+                     ((uint64_t) uuid_source.uuid.uuid128[1] << 8) | ((uint64_t) uuid_source.uuid.uuid128[0])
+               : 0x800000805F9B34FBULL;  // Base UUID bytes 0-7: 80-00-00-80-5F-9B-34-FB
 }

 // Helper to fill UUID in the appropriate format based on client support and UUID type
@@ -80,9 +94,11 @@ void BluetoothConnection::dump_config() {

 void BluetoothConnection::update_allocated_slot_(uint64_t find_value, uint64_t set_value) {
  auto &allocated = this->proxy_->connections_free_response_.allocated;
-  auto *it = std::find(allocated.begin(), allocated.end(), find_value);
-  if (it != allocated.end()) {
-    *it = set_value;
+  for (auto &slot : allocated) {
+    if (slot == find_value) {
+      slot = set_value;
+      return;
+    }
  }
 }

@@ -105,13 +121,24 @@ void BluetoothConnection::set_address(uint64_t address) {
 void BluetoothConnection::loop() {
  BLEClientBase::loop();

-  // Early return if no active connection or not in service discovery phase
-  if (this->address_ == 0 || this->send_service_ < 0 || this->send_service_ > this->service_count_) {
+  // Early return if no active connection
+  if (this->address_ == 0) {
    return;
  }

-  // Handle service discovery
-  this->send_service_for_discovery_();
+  // Handle service discovery if in valid range
+  if (this->send_service_ >= 0 && this->send_service_ <= this->service_count_) {
+    this->send_service_for_discovery_();
+  }
+
+  // Check if we should disable the loop
+  // - For V3_WITH_CACHE: Services are never sent, disable after INIT state
+  // - For V3_WITHOUT_CACHE: Disable only after service discovery is complete
+  //   (send_service_ == DONE_SENDING_SERVICES, which is only set after services are sent)
+  if (this->state_ != espbt::ClientState::INIT && (this->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE ||
+                                                   this->send_service_ == DONE_SENDING_SERVICES)) {
+    this->disable_loop();
+  }
 }

 void BluetoothConnection::reset_connection_(esp_err_t reason) {
@@ -125,7 +152,7 @@ void BluetoothConnection::reset_connection_(esp_err_t reason) {
  // to detect incomplete service discovery rather than relying on us to
  // tell them about a partial list.
  this->set_address(0);
-  this->send_service_ = DONE_SENDING_SERVICES;
+  this->send_service_ = INIT_SENDING_SERVICES;
  this->proxy_->send_connections_free();
 }

@@ -133,10 +160,7 @@ void BluetoothConnection::send_service_for_discovery_() {
  if (this->send_service_ >= this->service_count_) {
    this->send_service_ = DONE_SENDING_SERVICES;
    this->proxy_->send_gatt_services_done(this->address_);
-    if (this->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE ||
-        this->connection_type_ == espbt::ConnectionType::V3_WITHOUT_CACHE) {
-      this->release_services();
-    }
+    this->release_services();
    return;
  }

@@ -185,8 +209,7 @@ void BluetoothConnection::send_service_for_discovery_() {
                                     service_result.start_handle, service_result.end_handle, 0, &total_char_count);

    if (char_count_status != ESP_GATT_OK) {
-      ESP_LOGE(TAG, "[%d] [%s] Error getting characteristic count, status=%d", this->connection_index_,
-               this->address_str().c_str(), char_count_status);
+      this->log_connection_error_("esp_ble_gattc_get_attr_count", char_count_status);
      this->send_service_ = DONE_SENDING_SERVICES;
      return;
    }
@@ -220,8 +243,7 @@ void BluetoothConnection::send_service_for_discovery_() {
          break;
        }
        if (char_status != ESP_GATT_OK) {
-          ESP_LOGE(TAG, "[%d] [%s] esp_ble_gattc_get_all_char error, status=%d", this->connection_index_,
-                   this->address_str().c_str(), char_status);
+          this->log_connection_error_("esp_ble_gattc_get_all_char", char_status);
          this->send_service_ = DONE_SENDING_SERVICES;
          return;
        }
@@ -244,8 +266,7 @@ void BluetoothConnection::send_service_for_discovery_() {
            this->gattc_if_, this->conn_id_, ESP_GATT_DB_DESCRIPTOR, 0, 0, char_result.char_handle, &total_desc_count);

        if (desc_count_status != ESP_GATT_OK) {
-          ESP_LOGE(TAG, "[%d] [%s] Error getting descriptor count for char handle %d, status=%d",
-                   this->connection_index_, this->address_str().c_str(), char_result.char_handle, desc_count_status);
+          this->log_connection_error_("esp_ble_gattc_get_attr_count", desc_count_status);
          this->send_service_ = DONE_SENDING_SERVICES;
          return;
        }
@@ -266,8 +287,7 @@ void BluetoothConnection::send_service_for_discovery_() {
            break;
          }
          if (desc_status != ESP_GATT_OK) {
-            ESP_LOGE(TAG, "[%d] [%s] esp_ble_gattc_get_all_descr error, status=%d", this->connection_index_,
-                     this->address_str().c_str(), desc_status);
+            this->log_connection_error_("esp_ble_gattc_get_all_descr", desc_status);
            this->send_service_ = DONE_SENDING_SERVICES;
            return;
          }
@@ -321,6 +341,33 @@ void BluetoothConnection::send_service_for_discovery_() {
  api_conn->send_message(resp, api::BluetoothGATTGetServicesResponse::MESSAGE_TYPE);
 }

+void BluetoothConnection::log_connection_error_(const char *operation, esp_gatt_status_t status) {
+  ESP_LOGE(TAG, "[%d] [%s] %s error, status=%d", this->connection_index_, this->address_str().c_str(), operation,
+           status);
+}
+
+void BluetoothConnection::log_connection_warning_(const char *operation, esp_err_t err) {
+  ESP_LOGW(TAG, "[%d] [%s] %s failed, err=%d", this->connection_index_, this->address_str().c_str(), operation, err);
+}
+
+void BluetoothConnection::log_gatt_not_connected_(const char *action, const char *type) {
+  ESP_LOGW(TAG, "[%d] [%s] Cannot %s GATT %s, not connected.", this->connection_index_, this->address_str().c_str(),
+           action, type);
+}
+
+void BluetoothConnection::log_gatt_operation_error_(const char *operation, uint16_t handle, esp_gatt_status_t status) {
+  ESP_LOGW(TAG, "[%d] [%s] Error %s for handle 0x%2X, status=%d", this->connection_index_, this->address_str().c_str(),
+           operation, handle, status);
+}
+
+esp_err_t BluetoothConnection::check_and_log_error_(const char *operation, esp_err_t err) {
+  if (err != ESP_OK) {
+    this->log_connection_warning_(operation, err);
+    return err;
+  }
+  return ESP_OK;
+}
+
 bool BluetoothConnection::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                                              esp_ble_gattc_cb_param_t *param) {
  if (!BLEClientBase::gattc_event_handler(event, gattc_if, param))
@@ -328,10 +375,19 @@ bool BluetoothConnection::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga

  switch (event) {
    case ESP_GATTC_DISCONNECT_EVT: {
-      this->reset_connection_(param->disconnect.reason);
+      // Don't reset connection yet - wait for CLOSE_EVT to ensure controller has freed resources
+      // This prevents race condition where we mark slot as free before controller cleanup is complete
+      ESP_LOGD(TAG, "[%d] [%s] Disconnect, reason=0x%02x", this->connection_index_, this->address_str_.c_str(),
+               param->disconnect.reason);
+      // Send disconnection notification but don't free the slot yet
+      this->proxy_->send_device_connection(this->address_, false, 0, param->disconnect.reason);
      break;
    }
    case ESP_GATTC_CLOSE_EVT: {
+      ESP_LOGD(TAG, "[%d] [%s] Close, reason=0x%02x, freeing slot", this->connection_index_, this->address_str_.c_str(),
+               param->close.reason);
+      // Now the GATT connection is fully closed and controller resources are freed
+      // Safe to mark the connection slot as available
      this->reset_connection_(param->close.reason);
      break;
    }
@@ -361,8 +417,7 @@ bool BluetoothConnection::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
    case ESP_GATTC_READ_DESCR_EVT:
    case ESP_GATTC_READ_CHAR_EVT: {
      if (param->read.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "[%d] [%s] Error reading char/descriptor at handle 0x%2X, status=%d", this->connection_index_,
-                 this->address_str_.c_str(), param->read.handle, param->read.status);
+        this->log_gatt_operation_error_("reading char/descriptor", param->read.handle, param->read.status);
        this->proxy_->send_gatt_error(this->address_, param->read.handle, param->read.status);
        break;
      }
@@ -376,8 +431,7 @@ bool BluetoothConnection::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
    case ESP_GATTC_WRITE_CHAR_EVT:
    case ESP_GATTC_WRITE_DESCR_EVT: {
      if (param->write.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "[%d] [%s] Error writing char/descriptor at handle 0x%2X, status=%d", this->connection_index_,
-                 this->address_str_.c_str(), param->write.handle, param->write.status);
+        this->log_gatt_operation_error_("writing char/descriptor", param->write.handle, param->write.status);
        this->proxy_->send_gatt_error(this->address_, param->write.handle, param->write.status);
        break;
      }
@@ -389,9 +443,8 @@ bool BluetoothConnection::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
    }
    case ESP_GATTC_UNREG_FOR_NOTIFY_EVT: {
      if (param->unreg_for_notify.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "[%d] [%s] Error unregistering notifications for handle 0x%2X, status=%d",
-                 this->connection_index_, this->address_str_.c_str(), param->unreg_for_notify.handle,
-                 param->unreg_for_notify.status);
+        this->log_gatt_operation_error_("unregistering notifications", param->unreg_for_notify.handle,
+                                        param->unreg_for_notify.status);
        this->proxy_->send_gatt_error(this->address_, param->unreg_for_notify.handle, param->unreg_for_notify.status);
        break;
      }
@@ -403,8 +456,8 @@ bool BluetoothConnection::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
    }
    case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
      if (param->reg_for_notify.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "[%d] [%s] Error registering notifications for handle 0x%2X, status=%d", this->connection_index_,
-                 this->address_str_.c_str(), param->reg_for_notify.handle, param->reg_for_notify.status);
+        this->log_gatt_operation_error_("registering notifications", param->reg_for_notify.handle,
+                                        param->reg_for_notify.status);
        this->proxy_->send_gatt_error(this->address_, param->reg_for_notify.handle, param->reg_for_notify.status);
        break;
      }
@@ -450,8 +503,7 @@ void BluetoothConnection::gap_event_handler(esp_gap_ble_cb_event_t event, esp_bl

 esp_err_t BluetoothConnection::read_characteristic(uint16_t handle) {
  if (!this->connected()) {
-    ESP_LOGW(TAG, "[%d] [%s] Cannot read GATT characteristic, not connected.", this->connection_index_,
-             this->address_str_.c_str());
+    this->log_gatt_not_connected_("read", "characteristic");
    return ESP_GATT_NOT_CONNECTED;
  }

@@ -459,18 +511,12 @@ esp_err_t BluetoothConnection::read_characteristic(uint16_t handle) {
           handle);

  esp_err_t err = esp_ble_gattc_read_char(this->gattc_if_, this->conn_id_, handle, ESP_GATT_AUTH_REQ_NONE);
-  if (err != ERR_OK) {
-    ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_read_char error, err=%d", this->connection_index_,
-             this->address_str_.c_str(), err);
-    return err;
-  }
-  return ESP_OK;
+  return this->check_and_log_error_("esp_ble_gattc_read_char", err);
 }

 esp_err_t BluetoothConnection::write_characteristic(uint16_t handle, const std::string &data, bool response) {
  if (!this->connected()) {
-    ESP_LOGW(TAG, "[%d] [%s] Cannot write GATT characteristic, not connected.", this->connection_index_,
-             this->address_str_.c_str());
+    this->log_gatt_not_connected_("write", "characteristic");
    return ESP_GATT_NOT_CONNECTED;
  }
  ESP_LOGV(TAG, "[%d] [%s] Writing GATT characteristic handle %d", this->connection_index_, this->address_str_.c_str(),
@@ -479,36 +525,24 @@ esp_err_t BluetoothConnection::write_characteristic(uint16_t handle, const std::
  esp_err_t err =
      esp_ble_gattc_write_char(this->gattc_if_, this->conn_id_, handle, data.size(), (uint8_t *) data.data(),
                               response ? ESP_GATT_WRITE_TYPE_RSP : ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
-  if (err != ERR_OK) {
-    ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_write_char error, err=%d", this->connection_index_,
-             this->address_str_.c_str(), err);
-    return err;
-  }
-  return ESP_OK;
+  return this->check_and_log_error_("esp_ble_gattc_write_char", err);
 }

 esp_err_t BluetoothConnection::read_descriptor(uint16_t handle) {
  if (!this->connected()) {
-    ESP_LOGW(TAG, "[%d] [%s] Cannot read GATT descriptor, not connected.", this->connection_index_,
-             this->address_str_.c_str());
+    this->log_gatt_not_connected_("read", "descriptor");
    return ESP_GATT_NOT_CONNECTED;
  }
  ESP_LOGV(TAG, "[%d] [%s] Reading GATT descriptor handle %d", this->connection_index_, this->address_str_.c_str(),
           handle);

  esp_err_t err = esp_ble_gattc_read_char_descr(this->gattc_if_, this->conn_id_, handle, ESP_GATT_AUTH_REQ_NONE);
-  if (err != ERR_OK) {
-    ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_read_char_descr error, err=%d", this->connection_index_,
-             this->address_str_.c_str(), err);
-    return err;
-  }
-  return ESP_OK;
+  return this->check_and_log_error_("esp_ble_gattc_read_char_descr", err);
 }

 esp_err_t BluetoothConnection::write_descriptor(uint16_t handle, const std::string &data, bool response) {
  if (!this->connected()) {
-    ESP_LOGW(TAG, "[%d] [%s] Cannot write GATT descriptor, not connected.", this->connection_index_,
-             this->address_str_.c_str());
+    this->log_gatt_not_connected_("write", "descriptor");
    return ESP_GATT_NOT_CONNECTED;
  }
  ESP_LOGV(TAG, "[%d] [%s] Writing GATT descriptor handle %d", this->connection_index_, this->address_str_.c_str(),
@@ -517,18 +551,12 @@ esp_err_t BluetoothConnection::write_descriptor(uint16_t handle, const std::stri
  esp_err_t err = esp_ble_gattc_write_char_descr(
      this->gattc_if_, this->conn_id_, handle, data.size(), (uint8_t *) data.data(),
      response ? ESP_GATT_WRITE_TYPE_RSP : ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
-  if (err != ERR_OK) {
-    ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_write_char_descr error, err=%d", this->connection_index_,
-             this->address_str_.c_str(), err);
-    return err;
-  }
-  return ESP_OK;
+  return this->check_and_log_error_("esp_ble_gattc_write_char_descr", err);
 }

 esp_err_t BluetoothConnection::notify_characteristic(uint16_t handle, bool enable) {
  if (!this->connected()) {
-    ESP_LOGW(TAG, "[%d] [%s] Cannot notify GATT characteristic, not connected.", this->connection_index_,
-             this->address_str_.c_str());
+    this->log_gatt_not_connected_("notify", "characteristic");
    return ESP_GATT_NOT_CONNECTED;
  }

@@ -536,22 +564,13 @@ esp_err_t BluetoothConnection::notify_characteristic(uint16_t handle, bool enabl
    ESP_LOGV(TAG, "[%d] [%s] Registering for GATT characteristic notifications handle %d", this->connection_index_,
             this->address_str_.c_str(), handle);
    esp_err_t err = esp_ble_gattc_register_for_notify(this->gattc_if_, this->remote_bda_, handle);
-    if (err != ESP_OK) {
-      ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_register_for_notify failed, err=%d", this->connection_index_,
-               this->address_str_.c_str(), err);
-      return err;
-    }
-  } else {
-    ESP_LOGV(TAG, "[%d] [%s] Unregistering for GATT characteristic notifications handle %d", this->connection_index_,
-             this->address_str_.c_str(), handle);
-    esp_err_t err = esp_ble_gattc_unregister_for_notify(this->gattc_if_, this->remote_bda_, handle);
-    if (err != ESP_OK) {
-      ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_unregister_for_notify failed, err=%d", this->connection_index_,
-               this->address_str_.c_str(), err);
-      return err;
-    }
+    return this->check_and_log_error_("esp_ble_gattc_register_for_notify", err);
  }
-  return ESP_OK;
+
+  ESP_LOGV(TAG, "[%d] [%s] Unregistering for GATT characteristic notifications handle %d", this->connection_index_,
+           this->address_str_.c_str(), handle);
+  esp_err_t err = esp_ble_gattc_unregister_for_notify(this->gattc_if_, this->remote_bda_, handle);
+  return this->check_and_log_error_("esp_ble_gattc_unregister_for_notify", err);
 }

 esp32_ble_tracker::AdvertisementParserType BluetoothConnection::get_advertisement_parser_type() {
--- a/esphome/components/bluetooth_proxy/bluetooth_connection.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_connection.h
@@ -33,13 +33,18 @@ class BluetoothConnection : public esp32_ble_client::BLEClientBase {
  void send_service_for_discovery_();
  void reset_connection_(esp_err_t reason);
  void update_allocated_slot_(uint64_t find_value, uint64_t set_value);
+  void log_connection_error_(const char *operation, esp_gatt_status_t status);
+  void log_connection_warning_(const char *operation, esp_err_t err);
+  void log_gatt_not_connected_(const char *action, const char *type);
+  void log_gatt_operation_error_(const char *operation, uint16_t handle, esp_gatt_status_t status);
+  esp_err_t check_and_log_error_(const char *operation, esp_err_t err);

  // Memory optimized layout for 32-bit systems
  // Group 1: Pointers (4 bytes each, naturally aligned)
  BluetoothProxy *proxy_;

  // Group 2: 2-byte types
-  int16_t send_service_{-2};  // Needs to handle negative values and service count
+  int16_t send_service_{-3};  // -3 = INIT_SENDING_SERVICES, -2 = DONE_SENDING_SERVICES, >=0 = service index

  // Group 3: 1-byte types
  bool seen_mtu_or_services_{false};
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -11,12 +11,8 @@ namespace esphome::bluetooth_proxy {

 static const char *const TAG = "bluetooth_proxy";

-// Batch size for BLE advertisements to maximize WiFi efficiency
-// Each advertisement is up to 80 bytes when packaged (including protocol overhead)
-// Most advertisements are 20-30 bytes, allowing even more to fit per packet
-// 16 advertisements × 80 bytes (worst case) = 1280 bytes out of ~1320 bytes usable payload
-// This achieves ~97% WiFi MTU utilization while staying under the limit
-static constexpr size_t FLUSH_BATCH_SIZE = 16;
+// BLUETOOTH_PROXY_ADVERTISEMENT_BATCH_SIZE is defined during code generation
+// It sets the batch size for BLE advertisements to maximize WiFi efficiency

 // Verify BLE advertisement data array size matches the BLE specification (31 bytes adv + 31 bytes scan response)
 static_assert(sizeof(((api::BluetoothLERawAdvertisement *) nullptr)->data) == 62,
@@ -25,18 +21,8 @@ static_assert(sizeof(((api::BluetoothLERawAdvertisement *) nullptr)->data) == 62
 BluetoothProxy::BluetoothProxy() { global_bluetooth_proxy = this; }

 void BluetoothProxy::setup() {
-  // Pre-allocate response object
-  this->response_ = std::make_unique<api::BluetoothLERawAdvertisementsResponse>();
-
-  // Reserve capacity but start with size 0
-  // Reserve 50% since we'll grow naturally and flush at FLUSH_BATCH_SIZE
-  this->response_->advertisements.reserve(FLUSH_BATCH_SIZE / 2);
-
-  // Don't pre-allocate pool - let it grow only if needed in busy environments
-  // Many devices in quiet areas will never need the overflow pool
-
-  this->connections_free_response_.limit = this->connections_.size();
-  this->connections_free_response_.free = this->connections_.size();
+  this->connections_free_response_.limit = BLUETOOTH_PROXY_MAX_CONNECTIONS;
+  this->connections_free_response_.free = BLUETOOTH_PROXY_MAX_CONNECTIONS;

  this->parent_->add_scanner_state_callback([this](esp32_ble_tracker::ScannerState state) {
    if (this->api_connection_ != nullptr) {
@@ -53,6 +39,26 @@ void BluetoothProxy::send_bluetooth_scanner_state_(esp32_ble_tracker::ScannerSta
  this->api_connection_->send_message(resp, api::BluetoothScannerStateResponse::MESSAGE_TYPE);
 }

+void BluetoothProxy::log_connection_request_ignored_(BluetoothConnection *connection, espbt::ClientState state) {
+  ESP_LOGW(TAG, "[%d] [%s] Connection request ignored, state: %s", connection->get_connection_index(),
+           connection->address_str().c_str(), espbt::client_state_to_string(state));
+}
+
+void BluetoothProxy::log_connection_info_(BluetoothConnection *connection, const char *message) {
+  ESP_LOGI(TAG, "[%d] [%s] Connecting %s", connection->get_connection_index(), connection->address_str().c_str(),
+           message);
+}
+
+void BluetoothProxy::log_not_connected_gatt_(const char *action, const char *type) {
+  ESP_LOGW(TAG, "Cannot %s GATT %s, not connected", action, type);
+}
+
+void BluetoothProxy::handle_gatt_not_connected_(uint64_t address, uint16_t handle, const char *action,
+                                                const char *type) {
+  this->log_not_connected_gatt_(action, type);
+  this->send_gatt_error(address, handle, ESP_GATT_NOT_CONNECTED);
+}
+
 #ifdef USE_ESP32_BLE_DEVICE
 bool BluetoothProxy::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
  // This method should never be called since bluetooth_proxy always uses raw advertisements
@@ -65,39 +71,27 @@ bool BluetoothProxy::parse_devices(const esp32_ble::BLEScanResult *scan_results,
  if (!api::global_api_server->is_connected() || this->api_connection_ == nullptr)
    return false;

-  auto &advertisements = this->response_->advertisements;
+  auto &advertisements = this->response_.advertisements;

  for (size_t i = 0; i < count; i++) {
    auto &result = scan_results[i];
    uint8_t length = result.adv_data_len + result.scan_rsp_len;

-    // Check if we need to expand the vector
-    if (this->advertisement_count_ >= advertisements.size()) {
-      if (this->advertisement_pool_.empty()) {
-        // No room in pool, need to allocate
-        advertisements.emplace_back();
-      } else {
-        // Pull from pool
-        advertisements.push_back(std::move(this->advertisement_pool_.back()));
-        this->advertisement_pool_.pop_back();
-      }
-    }
-
    // Fill in the data directly at current position
-    auto &adv = advertisements[this->advertisement_count_];
+    auto &adv = advertisements[this->response_.advertisements_len];
    adv.address = esp32_ble::ble_addr_to_uint64(result.bda);
    adv.rssi = result.rssi;
    adv.address_type = result.ble_addr_type;
    adv.data_len = length;
    std::memcpy(adv.data, result.ble_adv, length);

-    this->advertisement_count_++;
+    this->response_.advertisements_len++;

    ESP_LOGV(TAG, "Queuing raw packet from %02X:%02X:%02X:%02X:%02X:%02X, length %d. RSSI: %d dB", result.bda[0],
             result.bda[1], result.bda[2], result.bda[3], result.bda[4], result.bda[5], length, result.rssi);

-    // Flush if we have reached FLUSH_BATCH_SIZE
-    if (this->advertisement_count_ >= FLUSH_BATCH_SIZE) {
+    // Flush if we have reached BLUETOOTH_PROXY_ADVERTISEMENT_BATCH_SIZE
+    if (this->response_.advertisements_len >= BLUETOOTH_PROXY_ADVERTISEMENT_BATCH_SIZE) {
      this->flush_pending_advertisements();
    }
  }
@@ -106,40 +100,31 @@ bool BluetoothProxy::parse_devices(const esp32_ble::BLEScanResult *scan_results,
 }

 void BluetoothProxy::flush_pending_advertisements() {
-  if (this->advertisement_count_ == 0 || !api::global_api_server->is_connected() || this->api_connection_ == nullptr)
+  if (this->response_.advertisements_len == 0 || !api::global_api_server->is_connected() ||
+      this->api_connection_ == nullptr)
    return;

-  auto &advertisements = this->response_->advertisements;
-
-  // Return any items beyond advertisement_count_ to the pool
-  if (advertisements.size() > this->advertisement_count_) {
-    // Move unused items back to pool
-    this->advertisement_pool_.insert(this->advertisement_pool_.end(),
-                                     std::make_move_iterator(advertisements.begin() + this->advertisement_count_),
-                                     std::make_move_iterator(advertisements.end()));
-
-    // Resize to actual count
-    advertisements.resize(this->advertisement_count_);
-  }
-
  // Send the message
-  this->api_connection_->send_message(*this->response_, api::BluetoothLERawAdvertisementsResponse::MESSAGE_TYPE);
+  this->api_connection_->send_message(this->response_, api::BluetoothLERawAdvertisementsResponse::MESSAGE_TYPE);

-  // Reset count - existing items will be overwritten in next batch
-  this->advertisement_count_ = 0;
+  ESP_LOGV(TAG, "Sent batch of %u BLE advertisements", this->response_.advertisements_len);
+
+  // Reset the length for the next batch
+  this->response_.advertisements_len = 0;
 }

 void BluetoothProxy::dump_config() {
-  ESP_LOGCONFIG(TAG, "Bluetooth Proxy:");
  ESP_LOGCONFIG(TAG,
+                "Bluetooth Proxy:\n"
                "  Active: %s\n"
                "  Connections: %d",
-                YESNO(this->active_), this->connections_.size());
+                YESNO(this->active_), this->connection_count_);
 }

 void BluetoothProxy::loop() {
  if (!api::global_api_server->is_connected() || this->api_connection_ == nullptr) {
-    for (auto *connection : this->connections_) {
+    for (uint8_t i = 0; i < this->connection_count_; i++) {
+      auto *connection = this->connections_[i];
      if (connection->get_address() != 0 && !connection->disconnect_pending()) {
        connection->disconnect();
      }
@@ -162,7 +147,8 @@ esp32_ble_tracker::AdvertisementParserType BluetoothProxy::get_advertisement_par
 }

 BluetoothConnection *BluetoothProxy::get_connection_(uint64_t address, bool reserve) {
-  for (auto *connection : this->connections_) {
+  for (uint8_t i = 0; i < this->connection_count_; i++) {
+    auto *connection = this->connections_[i];
    if (connection->get_address() == address)
      return connection;
  }
@@ -170,9 +156,10 @@ BluetoothConnection *BluetoothProxy::get_connection_(uint64_t address, bool rese
  if (!reserve)
    return nullptr;

-  for (auto *connection : this->connections_) {
+  for (uint8_t i = 0; i < this->connection_count_; i++) {
+    auto *connection = this->connections_[i];
    if (connection->get_address() == 0) {
-      connection->send_service_ = DONE_SENDING_SERVICES;
+      connection->send_service_ = INIT_SENDING_SERVICES;
      connection->set_address(address);
      // All connections must start at INIT
      // We only set the state if we allocate the connection
@@ -189,8 +176,7 @@ BluetoothConnection *BluetoothProxy::get_connection_(uint64_t address, bool rese
 void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest &msg) {
  switch (msg.request_type) {
    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITH_CACHE:
-    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE:
-    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT: {
+    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE: {
      auto *connection = this->get_connection_(msg.address, true);
      if (connection == nullptr) {
        ESP_LOGW(TAG, "No free connections available");
@@ -199,23 +185,10 @@ void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest
      }
      if (connection->state() == espbt::ClientState::CONNECTED ||
          connection->state() == espbt::ClientState::ESTABLISHED) {
-        ESP_LOGW(TAG, "[%d] [%s] Connection already established", connection->get_connection_index(),
-                 connection->address_str().c_str());
+        this->log_connection_request_ignored_(connection, connection->state());
        this->send_device_connection(msg.address, true);
        this->send_connections_free();
        return;
-      } else if (connection->state() == espbt::ClientState::SEARCHING) {
-        ESP_LOGW(TAG, "[%d] [%s] Connection request ignored, already searching for device",
-                 connection->get_connection_index(), connection->address_str().c_str());
-        return;
-      } else if (connection->state() == espbt::ClientState::DISCOVERED) {
-        ESP_LOGW(TAG, "[%d] [%s] Connection request ignored, device already discovered",
-                 connection->get_connection_index(), connection->address_str().c_str());
-        return;
-      } else if (connection->state() == espbt::ClientState::READY_TO_CONNECT) {
-        ESP_LOGW(TAG, "[%d] [%s] Connection request ignored, waiting in line to connect",
-                 connection->get_connection_index(), connection->address_str().c_str());
-        return;
      } else if (connection->state() == espbt::ClientState::CONNECTING) {
        if (connection->disconnect_pending()) {
          ESP_LOGW(TAG, "[%d] [%s] Connection request while pending disconnect, cancelling pending disconnect",
@@ -223,29 +196,18 @@ void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest
          connection->cancel_pending_disconnect();
          return;
        }
-        ESP_LOGW(TAG, "[%d] [%s] Connection request ignored, already connecting", connection->get_connection_index(),
-                 connection->address_str().c_str());
-        return;
-      } else if (connection->state() == espbt::ClientState::DISCONNECTING) {
-        ESP_LOGW(TAG, "[%d] [%s] Connection request ignored, device is disconnecting",
-                 connection->get_connection_index(), connection->address_str().c_str());
+        this->log_connection_request_ignored_(connection, connection->state());
        return;
      } else if (connection->state() != espbt::ClientState::INIT) {
-        ESP_LOGW(TAG, "[%d] [%s] Connection already in progress", connection->get_connection_index(),
-                 connection->address_str().c_str());
+        this->log_connection_request_ignored_(connection, connection->state());
        return;
      }
      if (msg.request_type == api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITH_CACHE) {
        connection->set_connection_type(espbt::ConnectionType::V3_WITH_CACHE);
-        ESP_LOGI(TAG, "[%d] [%s] Connecting v3 with cache", connection->get_connection_index(),
-                 connection->address_str().c_str());
-      } else if (msg.request_type == api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE) {
+        this->log_connection_info_(connection, "v3 with cache");
+      } else {  // BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE
        connection->set_connection_type(espbt::ConnectionType::V3_WITHOUT_CACHE);
-        ESP_LOGI(TAG, "[%d] [%s] Connecting v3 without cache", connection->get_connection_index(),
-                 connection->address_str().c_str());
-      } else {
-        connection->set_connection_type(espbt::ConnectionType::V1);
-        ESP_LOGI(TAG, "[%d] [%s] Connecting v1", connection->get_connection_index(), connection->address_str().c_str());
+        this->log_connection_info_(connection, "v3 without cache");
      }
      if (msg.has_address_type) {
        uint64_to_bd_addr(msg.address, connection->remote_bda_);
@@ -307,14 +269,18 @@ void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest

      break;
    }
+    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT: {
+      ESP_LOGE(TAG, "V1 connections removed");
+      this->send_device_connection(msg.address, false);
+      break;
+    }
  }
 }

 void BluetoothProxy::bluetooth_gatt_read(const api::BluetoothGATTReadRequest &msg) {
  auto *connection = this->get_connection_(msg.address, false);
  if (connection == nullptr) {
-    ESP_LOGW(TAG, "Cannot read GATT characteristic, not connected");
-    this->send_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
+    this->handle_gatt_not_connected_(msg.address, msg.handle, "read", "characteristic");
    return;
  }

@@ -327,8 +293,7 @@ void BluetoothProxy::bluetooth_gatt_read(const api::BluetoothGATTReadRequest &ms
 void BluetoothProxy::bluetooth_gatt_write(const api::BluetoothGATTWriteRequest &msg) {
  auto *connection = this->get_connection_(msg.address, false);
  if (connection == nullptr) {
-    ESP_LOGW(TAG, "Cannot write GATT characteristic, not connected");
-    this->send_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
+    this->handle_gatt_not_connected_(msg.address, msg.handle, "write", "characteristic");
    return;
  }

@@ -341,8 +306,7 @@ void BluetoothProxy::bluetooth_gatt_write(const api::BluetoothGATTWriteRequest &
 void BluetoothProxy::bluetooth_gatt_read_descriptor(const api::BluetoothGATTReadDescriptorRequest &msg) {
  auto *connection = this->get_connection_(msg.address, false);
  if (connection == nullptr) {
-    ESP_LOGW(TAG, "Cannot read GATT descriptor, not connected");
-    this->send_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
+    this->handle_gatt_not_connected_(msg.address, msg.handle, "read", "descriptor");
    return;
  }

@@ -355,8 +319,7 @@ void BluetoothProxy::bluetooth_gatt_read_descriptor(const api::BluetoothGATTRead
 void BluetoothProxy::bluetooth_gatt_write_descriptor(const api::BluetoothGATTWriteDescriptorRequest &msg) {
  auto *connection = this->get_connection_(msg.address, false);
  if (connection == nullptr) {
-    ESP_LOGW(TAG, "Cannot write GATT descriptor, not connected");
-    this->send_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
+    this->handle_gatt_not_connected_(msg.address, msg.handle, "write", "descriptor");
    return;
  }

@@ -369,8 +332,7 @@ void BluetoothProxy::bluetooth_gatt_write_descriptor(const api::BluetoothGATTWri
 void BluetoothProxy::bluetooth_gatt_send_services(const api::BluetoothGATTGetServicesRequest &msg) {
  auto *connection = this->get_connection_(msg.address, false);
  if (connection == nullptr || !connection->connected()) {
-    ESP_LOGW(TAG, "Cannot get GATT services, not connected");
-    this->send_gatt_error(msg.address, 0, ESP_GATT_NOT_CONNECTED);
+    this->handle_gatt_not_connected_(msg.address, 0, "get", "services");
    return;
  }
  if (!connection->service_count_) {
@@ -378,16 +340,14 @@ void BluetoothProxy::bluetooth_gatt_send_services(const api::BluetoothGATTGetSer
    this->send_gatt_services_done(msg.address);
    return;
  }
-  if (connection->send_service_ ==
-      DONE_SENDING_SERVICES)  // Only start sending services if we're not already sending them
+  if (connection->send_service_ == INIT_SENDING_SERVICES)  // Start sending services if not started yet
    connection->send_service_ = 0;
 }

 void BluetoothProxy::bluetooth_gatt_notify(const api::BluetoothGATTNotifyRequest &msg) {
  auto *connection = this->get_connection_(msg.address, false);
  if (connection == nullptr) {
-    ESP_LOGW(TAG, "Cannot notify GATT characteristic, not connected");
-    this->send_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
+    this->handle_gatt_not_connected_(msg.address, msg.handle, "notify", "characteristic");
    return;
  }

--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
@@ -2,6 +2,7 @@

 #ifdef USE_ESP32

+#include <array>
 #include <map>
 #include <vector>

@@ -22,6 +23,7 @@ namespace esphome::bluetooth_proxy {

 static const esp_err_t ESP_GATT_NOT_CONNECTED = -1;
 static const int DONE_SENDING_SERVICES = -2;
+static const int INIT_SENDING_SERVICES = -3;

 using namespace esp32_ble_client;

@@ -63,8 +65,10 @@ class BluetoothProxy : public esp32_ble_tracker::ESPBTDeviceListener, public Com
  esp32_ble_tracker::AdvertisementParserType get_advertisement_parser_type() override;

  void register_connection(BluetoothConnection *connection) {
-    this->connections_.push_back(connection);
-    connection->proxy_ = this;
+    if (this->connection_count_ < BLUETOOTH_PROXY_MAX_CONNECTIONS) {
+      this->connections_[this->connection_count_++] = connection;
+      connection->proxy_ = this;
+    }
  }

  void bluetooth_device_request(const api::BluetoothDeviceRequest &msg);
@@ -133,17 +137,20 @@ class BluetoothProxy : public esp32_ble_tracker::ESPBTDeviceListener, public Com
  void send_bluetooth_scanner_state_(esp32_ble_tracker::ScannerState state);

  BluetoothConnection *get_connection_(uint64_t address, bool reserve);
+  void log_connection_request_ignored_(BluetoothConnection *connection, espbt::ClientState state);
+  void log_connection_info_(BluetoothConnection *connection, const char *message);
+  void log_not_connected_gatt_(const char *action, const char *type);
+  void handle_gatt_not_connected_(uint64_t address, uint16_t handle, const char *action, const char *type);

  // Memory optimized layout for 32-bit systems
  // Group 1: Pointers (4 bytes each, naturally aligned)
  api::APIConnection *api_connection_{nullptr};

-  // Group 2: Container types (typically 12 bytes on 32-bit)
-  std::vector<BluetoothConnection *> connections_{};
+  // Group 2: Fixed-size array of connection pointers
+  std::array<BluetoothConnection *, BLUETOOTH_PROXY_MAX_CONNECTIONS> connections_{};

  // BLE advertisement batching
-  std::vector<api::BluetoothLERawAdvertisement> advertisement_pool_;
-  std::unique_ptr<api::BluetoothLERawAdvertisementsResponse> response_;
+  api::BluetoothLERawAdvertisementsResponse response_;

  // Group 3: 4-byte types
  uint32_t last_advertisement_flush_time_{0};
@@ -153,7 +160,7 @@ class BluetoothProxy : public esp32_ble_tracker::ESPBTDeviceListener, public Com

  // Group 4: 1-byte types grouped together
  bool active_;
-  uint8_t advertisement_count_{0};
+  uint8_t connection_count_{0};
  // 2 bytes used, 2 bytes padding
 };

--- a/esphome/components/bme280_base/bme280_base.cpp
+++ b/esphome/components/bme280_base/bme280_base.cpp
@@ -7,6 +7,8 @@
 #include <esphome/components/sensor/sensor.h>
 #include <esphome/core/component.h>

+#define BME280_ERROR_WRONG_CHIP_ID "Wrong chip ID"
+
 namespace esphome {
 namespace bme280_base {

@@ -98,18 +100,18 @@ void BME280Component::setup() {

  if (!this->read_byte(BME280_REGISTER_CHIPID, &chip_id)) {
    this->error_code_ = COMMUNICATION_FAILED;
-    this->mark_failed();
+    this->mark_failed(ESP_LOG_MSG_COMM_FAIL);
    return;
  }
  if (chip_id != 0x60) {
    this->error_code_ = WRONG_CHIP_ID;
-    this->mark_failed();
+    this->mark_failed(BME280_ERROR_WRONG_CHIP_ID);
    return;
  }

  // Send a soft reset.
  if (!this->write_byte(BME280_REGISTER_RESET, BME280_SOFT_RESET)) {
-    this->mark_failed();
+    this->mark_failed("Reset failed");
    return;
  }
  // Wait until the NVM data has finished loading.
@@ -118,14 +120,12 @@ void BME280Component::setup() {
  do {  // NOLINT
    delay(2);
    if (!this->read_byte(BME280_REGISTER_STATUS, &status)) {
-      ESP_LOGW(TAG, "Error reading status register.");
-      this->mark_failed();
+      this->mark_failed("Error reading status register");
      return;
    }
  } while ((status & BME280_STATUS_IM_UPDATE) && (--retry));
  if (status & BME280_STATUS_IM_UPDATE) {
-    ESP_LOGW(TAG, "Timeout loading NVM.");
-    this->mark_failed();
+    this->mark_failed("Timeout loading NVM");
    return;
  }

@@ -153,26 +153,26 @@ void BME280Component::setup() {

  uint8_t humid_control_val = 0;
  if (!this->read_byte(BME280_REGISTER_CONTROLHUMID, &humid_control_val)) {
-    this->mark_failed();
+    this->mark_failed("Read humidity control");
    return;
  }
  humid_control_val &= ~0b00000111;
  humid_control_val |= this->humidity_oversampling_ & 0b111;
  if (!this->write_byte(BME280_REGISTER_CONTROLHUMID, humid_control_val)) {
-    this->mark_failed();
+    this->mark_failed("Write humidity control");
    return;
  }

  uint8_t config_register = 0;
  if (!this->read_byte(BME280_REGISTER_CONFIG, &config_register)) {
-    this->mark_failed();
+    this->mark_failed("Read config");
    return;
  }
  config_register &= ~0b11111100;
  config_register |= 0b101 << 5;  // 1000 ms standby time
  config_register |= (this->iir_filter_ & 0b111) << 2;
  if (!this->write_byte(BME280_REGISTER_CONFIG, config_register)) {
-    this->mark_failed();
+    this->mark_failed("Write config");
    return;
  }
 }
@@ -183,7 +183,7 @@ void BME280Component::dump_config() {
      ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
      break;
    case WRONG_CHIP_ID:
-      ESP_LOGE(TAG, "BME280 has wrong chip ID! Is it a BME280?");
+      ESP_LOGE(TAG, BME280_ERROR_WRONG_CHIP_ID);
      break;
    case NONE:
    default:
@@ -223,21 +223,21 @@ void BME280Component::update() {
  this->set_timeout("data", uint32_t(ceilf(meas_time)), [this]() {
    uint8_t data[8];
    if (!this->read_bytes(BME280_REGISTER_MEASUREMENTS, data, 8)) {
-      ESP_LOGW(TAG, "Error reading registers.");
+      ESP_LOGW(TAG, "Error reading registers");
      this->status_set_warning();
      return;
    }
    int32_t t_fine = 0;
    float const temperature = this->read_temperature_(data, &t_fine);
    if (std::isnan(temperature)) {
-      ESP_LOGW(TAG, "Invalid temperature, cannot read pressure & humidity values.");
+      ESP_LOGW(TAG, "Invalid temperature");
      this->status_set_warning();
      return;
    }
    float const pressure = this->read_pressure_(data, t_fine);
    float const humidity = this->read_humidity_(data, t_fine);

-    ESP_LOGV(TAG, "Got temperature=%.1f°C pressure=%.1fhPa humidity=%.1f%%", temperature, pressure, humidity);
+    ESP_LOGV(TAG, "Temperature=%.1f°C Pressure=%.1fhPa Humidity=%.1f%%", temperature, pressure, humidity);
    if (this->temperature_sensor_ != nullptr)
      this->temperature_sensor_->publish_state(temperature);
    if (this->pressure_sensor_ != nullptr)
--- a/esphome/components/bme680/bme680.cpp
+++ b/esphome/components/bme680/bme680.cpp
@@ -28,7 +28,7 @@ const float BME680_GAS_LOOKUP_TABLE_1[16] PROGMEM = {0.0, 0.0, 0.0,  0.0,  0.0,
 const float BME680_GAS_LOOKUP_TABLE_2[16] PROGMEM = {0.0,  0.0, 0.0, 0.0, 0.1, 0.7, 0.0, -0.8,
                                                     -0.1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};

-static const char *oversampling_to_str(BME680Oversampling oversampling) {
+[[maybe_unused]] static const char *oversampling_to_str(BME680Oversampling oversampling) {
  switch (oversampling) {
    case BME680_OVERSAMPLING_NONE:
      return "None";
@@ -47,7 +47,7 @@ static const char *oversampling_to_str(BME680Oversampling oversampling) {
  }
 }

-static const char *iir_filter_to_str(BME680IIRFilter filter) {
+[[maybe_unused]] static const char *iir_filter_to_str(BME680IIRFilter filter) {
  switch (filter) {
    case BME680_IIR_FILTER_OFF:
      return "OFF";
--- a/esphome/components/bmp280_base/bmp280_base.cpp
+++ b/esphome/components/bmp280_base/bmp280_base.cpp
@@ -2,6 +2,8 @@
 #include "esphome/core/hal.h"
 #include "esphome/core/log.h"

+#define BMP280_ERROR_WRONG_CHIP_ID "Wrong chip ID"
+
 namespace esphome {
 namespace bmp280_base {

@@ -63,23 +65,23 @@ void BMP280Component::setup() {
  // https://community.st.com/t5/stm32-mcus-products/issue-with-reading-bmp280-chip-id-using-spi/td-p/691855
  if (!this->read_byte(0xD0, &chip_id)) {
    this->error_code_ = COMMUNICATION_FAILED;
-    this->mark_failed();
+    this->mark_failed(ESP_LOG_MSG_COMM_FAIL);
    return;
  }
  if (!this->read_byte(0xD0, &chip_id)) {
    this->error_code_ = COMMUNICATION_FAILED;
-    this->mark_failed();
+    this->mark_failed(ESP_LOG_MSG_COMM_FAIL);
    return;
  }
  if (chip_id != 0x58) {
    this->error_code_ = WRONG_CHIP_ID;
-    this->mark_failed();
+    this->mark_failed(BMP280_ERROR_WRONG_CHIP_ID);
    return;
  }

  // Send a soft reset.
  if (!this->write_byte(BMP280_REGISTER_RESET, BMP280_SOFT_RESET)) {
-    this->mark_failed();
+    this->mark_failed("Reset failed");
    return;
  }
  // Wait until the NVM data has finished loading.
@@ -88,14 +90,12 @@ void BMP280Component::setup() {
  do {
    delay(2);
    if (!this->read_byte(BMP280_REGISTER_STATUS, &status)) {
-      ESP_LOGW(TAG, "Error reading status register.");
-      this->mark_failed();
+      this->mark_failed("Error reading status register");
      return;
    }
  } while ((status & BMP280_STATUS_IM_UPDATE) && (--retry));
  if (status & BMP280_STATUS_IM_UPDATE) {
-    ESP_LOGW(TAG, "Timeout loading NVM.");
-    this->mark_failed();
+    this->mark_failed("Timeout loading NVM");
    return;
  }

@@ -116,14 +116,14 @@ void BMP280Component::setup() {

  uint8_t config_register = 0;
  if (!this->read_byte(BMP280_REGISTER_CONFIG, &config_register)) {
-    this->mark_failed();
+    this->mark_failed("Read config");
    return;
  }
  config_register &= ~0b11111100;
  config_register |= 0b000 << 5;  // 0.5 ms standby time
  config_register |= (this->iir_filter_ & 0b111) << 2;
  if (!this->write_byte(BMP280_REGISTER_CONFIG, config_register)) {
-    this->mark_failed();
+    this->mark_failed("Write config");
    return;
  }
 }
@@ -134,7 +134,7 @@ void BMP280Component::dump_config() {
      ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
      break;
    case WRONG_CHIP_ID:
-      ESP_LOGE(TAG, "BMP280 has wrong chip ID! Is it a BME280?");
+      ESP_LOGE(TAG, BMP280_ERROR_WRONG_CHIP_ID);
      break;
    case NONE:
    default:
@@ -172,13 +172,13 @@ void BMP280Component::update() {
    int32_t t_fine = 0;
    float temperature = this->read_temperature_(&t_fine);
    if (std::isnan(temperature)) {
-      ESP_LOGW(TAG, "Invalid temperature, cannot read pressure values.");
+      ESP_LOGW(TAG, "Invalid temperature");
      this->status_set_warning();
      return;
    }
    float pressure = this->read_pressure_(t_fine);

-    ESP_LOGD(TAG, "Got temperature=%.1f°C pressure=%.1fhPa", temperature, pressure);
+    ESP_LOGV(TAG, "Temperature=%.1f°C Pressure=%.1fhPa", temperature, pressure);
    if (this->temperature_sensor_ != nullptr)
      this->temperature_sensor_->publish_state(temperature);
    if (this->pressure_sensor_ != nullptr)
--- a/esphome/components/captive_portal/init.py
+++ b/esphome/components/captive_portal/init.py
@@ -14,7 +14,7 @@ from esphome.core import CORE, coroutine_with_priority

 AUTO_LOAD = ["web_server_base", "ota.web_server"]
 DEPENDENCIES = ["wifi"]
-CODEOWNERS = ["@OttoWinter"]
+CODEOWNERS = ["@esphome/core"]

 captive_portal_ns = cg.esphome_ns.namespace("captive_portal")
 CaptivePortal = captive_portal_ns.class_("CaptivePortal", cg.Component)
--- a/esphome/components/cover/cover.cpp
+++ b/esphome/components/cover/cover.cpp
@@ -99,43 +99,39 @@ const optional<float> &CoverCall::get_tilt() const { return this->tilt_; }
 const optional<bool> &CoverCall::get_toggle() const { return this->toggle_; }
 void CoverCall::validate_() {
  auto traits = this->parent_->get_traits();
+  const char *name = this->parent_->get_name().c_str();
+
  if (this->position_.has_value()) {
    auto pos = *this->position_;
    if (!traits.get_supports_position() && pos != COVER_OPEN && pos != COVER_CLOSED) {
-      ESP_LOGW(TAG, "'%s' - This cover device does not support setting position!", this->parent_->get_name().c_str());
+      ESP_LOGW(TAG, "'%s': position unsupported", name);
      this->position_.reset();
    } else if (pos < 0.0f || pos > 1.0f) {
-      ESP_LOGW(TAG, "'%s' - Position %.2f is out of range [0.0 - 1.0]", this->parent_->get_name().c_str(), pos);
+      ESP_LOGW(TAG, "'%s': position %.2f out of range", name, pos);
      this->position_ = clamp(pos, 0.0f, 1.0f);
    }
  }
  if (this->tilt_.has_value()) {
    auto tilt = *this->tilt_;
    if (!traits.get_supports_tilt()) {
-      ESP_LOGW(TAG, "'%s' - This cover device does not support tilt!", this->parent_->get_name().c_str());
+      ESP_LOGW(TAG, "'%s': tilt unsupported", name);
      this->tilt_.reset();
    } else if (tilt < 0.0f || tilt > 1.0f) {
-      ESP_LOGW(TAG, "'%s' - Tilt %.2f is out of range [0.0 - 1.0]", this->parent_->get_name().c_str(), tilt);
+      ESP_LOGW(TAG, "'%s': tilt %.2f out of range", name, tilt);
      this->tilt_ = clamp(tilt, 0.0f, 1.0f);
    }
  }
  if (this->toggle_.has_value()) {
    if (!traits.get_supports_toggle()) {
-      ESP_LOGW(TAG, "'%s' - This cover device does not support toggle!", this->parent_->get_name().c_str());
+      ESP_LOGW(TAG, "'%s': toggle unsupported", name);
      this->toggle_.reset();
    }
  }
  if (this->stop_) {
-    if (this->position_.has_value()) {
-      ESP_LOGW(TAG, "Cannot set position when stopping a cover!");
+    if (this->position_.has_value() || this->tilt_.has_value() || this->toggle_.has_value()) {
+      ESP_LOGW(TAG, "'%s': cannot position/tilt/toggle when stopping", name);
      this->position_.reset();
-    }
-    if (this->tilt_.has_value()) {
-      ESP_LOGW(TAG, "Cannot set tilt when stopping a cover!");
      this->tilt_.reset();
-    }
-    if (this->toggle_.has_value()) {
-      ESP_LOGW(TAG, "Cannot set toggle when stopping a cover!");
      this->toggle_.reset();
    }
  }
--- a/esphome/components/debug/init.py
+++ b/esphome/components/debug/init.py
@@ -13,7 +13,7 @@ from esphome.const import (
 )
 from esphome.core import CORE

-CODEOWNERS = ["@OttoWinter"]
+CODEOWNERS = ["@esphome/core"]
 DEPENDENCIES = ["logger"]

 CONF_DEBUG_ID = "debug_id"
@@ -48,6 +48,15 @@ CONFIG_SCHEMA = cv.All(
 async def to_code(config):
    if CORE.using_zephyr:
        zephyr_add_prj_conf("HWINFO", True)
+        # gdb thread support
+        zephyr_add_prj_conf("DEBUG_THREAD_INFO", True)
+        # RTT
+        zephyr_add_prj_conf("USE_SEGGER_RTT", True)
+        zephyr_add_prj_conf("RTT_CONSOLE", True)
+        zephyr_add_prj_conf("LOG", True)
+        zephyr_add_prj_conf("LOG_BLOCK_IN_THREAD", True)
+        zephyr_add_prj_conf("LOG_BUFFER_SIZE", 4096)
+        zephyr_add_prj_conf("SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL", True)
    var = cg.new_Pvariable(config[CONF_ID])
    await cg.register_component(var, config)

--- a/esphome/components/deep_sleep/deep_sleep_esp32.cpp
+++ b/esphome/components/deep_sleep/deep_sleep_esp32.cpp
@@ -1,4 +1,5 @@
 #ifdef USE_ESP32
+#include "driver/gpio.h"
 #include "deep_sleep_component.h"
 #include "esphome/core/log.h"

@@ -74,11 +75,20 @@ void DeepSleepComponent::deep_sleep_() {
  if (this->sleep_duration_.has_value())
    esp_sleep_enable_timer_wakeup(*this->sleep_duration_);
  if (this->wakeup_pin_ != nullptr) {
+    const auto gpio_pin = gpio_num_t(this->wakeup_pin_->get_pin());
+    if (this->wakeup_pin_->get_flags() & gpio::FLAG_PULLUP) {
+      gpio_sleep_set_pull_mode(gpio_pin, GPIO_PULLUP_ONLY);
+    } else if (this->wakeup_pin_->get_flags() & gpio::FLAG_PULLDOWN) {
+      gpio_sleep_set_pull_mode(gpio_pin, GPIO_PULLDOWN_ONLY);
+    }
+    gpio_sleep_set_direction(gpio_pin, GPIO_MODE_INPUT);
+    gpio_hold_en(gpio_pin);
+    gpio_deep_sleep_hold_en();
    bool level = !this->wakeup_pin_->is_inverted();
    if (this->wakeup_pin_mode_ == WAKEUP_PIN_MODE_INVERT_WAKEUP && this->wakeup_pin_->digital_read()) {
      level = !level;
    }
-    esp_sleep_enable_ext0_wakeup(gpio_num_t(this->wakeup_pin_->get_pin()), level);
+    esp_sleep_enable_ext0_wakeup(gpio_pin, level);
  }
  if (this->ext1_wakeup_.has_value()) {
    esp_sleep_enable_ext1_wakeup(this->ext1_wakeup_->mask, this->ext1_wakeup_->wakeup_mode);
@@ -102,6 +112,15 @@ void DeepSleepComponent::deep_sleep_() {
  if (this->sleep_duration_.has_value())
    esp_sleep_enable_timer_wakeup(*this->sleep_duration_);
  if (this->wakeup_pin_ != nullptr) {
+    const auto gpio_pin = gpio_num_t(this->wakeup_pin_->get_pin());
+    if (this->wakeup_pin_->get_flags() && gpio::FLAG_PULLUP) {
+      gpio_sleep_set_pull_mode(gpio_pin, GPIO_PULLUP_ONLY);
+    } else if (this->wakeup_pin_->get_flags() && gpio::FLAG_PULLDOWN) {
+      gpio_sleep_set_pull_mode(gpio_pin, GPIO_PULLDOWN_ONLY);
+    }
+    gpio_sleep_set_direction(gpio_pin, GPIO_MODE_INPUT);
+    gpio_hold_en(gpio_pin);
+    gpio_deep_sleep_hold_en();
    bool level = !this->wakeup_pin_->is_inverted();
    if (this->wakeup_pin_mode_ == WAKEUP_PIN_MODE_INVERT_WAKEUP && this->wakeup_pin_->digital_read()) {
      level = !level;
--- a/esphome/components/display/init.py
+++ b/esphome/components/display/init.py
@@ -12,6 +12,8 @@ from esphome.const import (
    CONF_ROTATION,
    CONF_TO,
    CONF_TRIGGER_ID,
+    CONF_UPDATE_INTERVAL,
+    SCHEDULER_DONT_RUN,
 )
 from esphome.core import coroutine_with_priority

@@ -67,6 +69,18 @@ BASIC_DISPLAY_SCHEMA = cv.Schema(
    }
 ).extend(cv.polling_component_schema("1s"))

+
+def _validate_test_card(config):
+    if (
+        config.get(CONF_SHOW_TEST_CARD, False)
+        and config.get(CONF_UPDATE_INTERVAL, False) == SCHEDULER_DONT_RUN
+    ):
+        raise cv.Invalid(
+            f"`{CONF_SHOW_TEST_CARD}: True` cannot be used with `{CONF_UPDATE_INTERVAL}: never` because this combination will not show a test_card."
+        )
+    return config
+
+
 FULL_DISPLAY_SCHEMA = BASIC_DISPLAY_SCHEMA.extend(
    {
        cv.Optional(CONF_ROTATION): validate_rotation,
@@ -94,6 +108,7 @@ FULL_DISPLAY_SCHEMA = BASIC_DISPLAY_SCHEMA.extend(
        cv.Optional(CONF_SHOW_TEST_CARD): cv.boolean,
    }
 )
+FULL_DISPLAY_SCHEMA.add_extra(_validate_test_card)


 async def setup_display_core_(var, config):
@@ -200,7 +215,6 @@ async def display_is_displaying_page_to_code(config, condition_id, template_arg,
    page = await cg.get_variable(config[CONF_PAGE_ID])
    var = cg.new_Pvariable(condition_id, template_arg, paren)
    cg.add(var.set_page(page))
-
    return var


--- a/esphome/components/esp32/init.py
+++ b/esphome/components/esp32/init.py
@@ -15,6 +15,7 @@ from esphome.const import (
    CONF_FRAMEWORK,
    CONF_IGNORE_EFUSE_CUSTOM_MAC,
    CONF_IGNORE_EFUSE_MAC_CRC,
+    CONF_LOG_LEVEL,
    CONF_NAME,
    CONF_PATH,
    CONF_PLATFORM_VERSION,
@@ -79,6 +80,15 @@ CONF_ENABLE_LWIP_ASSERT = "enable_lwip_assert"
 CONF_EXECUTE_FROM_PSRAM = "execute_from_psram"
 CONF_RELEASE = "release"

+LOG_LEVELS_IDF = [
+    "NONE",
+    "ERROR",
+    "WARN",
+    "INFO",
+    "DEBUG",
+    "VERBOSE",
+]
+
 ASSERTION_LEVELS = {
    "DISABLE": "CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE",
    "ENABLE": "CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE",
@@ -623,6 +633,9 @@ ESP_IDF_FRAMEWORK_SCHEMA = cv.All(
            cv.Optional(CONF_SDKCONFIG_OPTIONS, default={}): {
                cv.string_strict: cv.string_strict
            },
+            cv.Optional(CONF_LOG_LEVEL, default="ERROR"): cv.one_of(
+                *LOG_LEVELS_IDF, upper=True
+            ),
            cv.Optional(CONF_ADVANCED, default={}): cv.Schema(
                {
                    cv.Optional(CONF_ASSERTION_LEVEL): cv.one_of(
@@ -811,8 +824,9 @@ async def to_code(config):
    cg.set_cpp_standard("gnu++20")
    cg.add_build_flag("-DUSE_ESP32")
    cg.add_define("ESPHOME_BOARD", config[CONF_BOARD])
-    cg.add_build_flag(f"-DUSE_ESP32_VARIANT_{config[CONF_VARIANT]}")
-    cg.add_define("ESPHOME_VARIANT", VARIANT_FRIENDLY[config[CONF_VARIANT]])
+    variant = config[CONF_VARIANT]
+    cg.add_build_flag(f"-DUSE_ESP32_VARIANT_{variant}")
+    cg.add_define("ESPHOME_VARIANT", VARIANT_FRIENDLY[variant])
    cg.add_define(ThreadModel.MULTI_ATOMICS)

    cg.add_platformio_option("lib_ldf_mode", "off")
@@ -846,6 +860,7 @@ async def to_code(config):
        cg.add_platformio_option(
            "platform_packages", ["espressif/toolchain-esp32ulp@2.35.0-20220830"]
        )
+        add_idf_sdkconfig_option(f"CONFIG_IDF_TARGET_{variant}", True)
        add_idf_sdkconfig_option(
            f"CONFIG_ESPTOOLPY_FLASHSIZE_{config[CONF_FLASH_SIZE]}", True
        )
@@ -937,6 +952,10 @@ async def to_code(config):
            ),
        )

+        add_idf_sdkconfig_option(
+            f"CONFIG_LOG_DEFAULT_LEVEL_{conf[CONF_LOG_LEVEL]}", True
+        )
+
        for name, value in conf[CONF_SDKCONFIG_OPTIONS].items():
            add_idf_sdkconfig_option(name, RawSdkconfigValue(value))

--- a/esphome/components/esp32_ble/init.py
+++ b/esphome/components/esp32_ble/init.py
@@ -11,7 +11,8 @@ from esphome.core.config import CONF_NAME_ADD_MAC_SUFFIX
 import esphome.final_validate as fv

 DEPENDENCIES = ["esp32"]
-CODEOWNERS = ["@jesserockz", "@Rapsssito"]
+CODEOWNERS = ["@jesserockz", "@Rapsssito", "@bdraco"]
+DOMAIN = "esp32_ble"


 class BTLoggers(Enum):
@@ -115,9 +116,11 @@ def register_bt_logger(*loggers: BTLoggers) -> None:

 CONF_BLE_ID = "ble_id"
 CONF_IO_CAPABILITY = "io_capability"
+CONF_ADVERTISING = "advertising"
 CONF_ADVERTISING_CYCLE_TIME = "advertising_cycle_time"
 CONF_DISABLE_BT_LOGS = "disable_bt_logs"
 CONF_CONNECTION_TIMEOUT = "connection_timeout"
+CONF_MAX_NOTIFICATIONS = "max_notifications"

 NO_BLUETOOTH_VARIANTS = [const.VARIANT_ESP32S2]

@@ -162,6 +165,7 @@ CONFIG_SCHEMA = cv.Schema(
            IO_CAPABILITY, lower=True
        ),
        cv.Optional(CONF_ENABLE_ON_BOOT, default=True): cv.boolean,
+        cv.Optional(CONF_ADVERTISING, default=False): cv.boolean,
        cv.Optional(
            CONF_ADVERTISING_CYCLE_TIME, default="10s"
        ): cv.positive_time_period_milliseconds,
@@ -173,6 +177,11 @@ CONFIG_SCHEMA = cv.Schema(
            cv.positive_time_period_seconds,
            cv.Range(min=TimePeriod(seconds=10), max=TimePeriod(seconds=180)),
        ),
+        cv.SplitDefault(CONF_MAX_NOTIFICATIONS, esp32_idf=12): cv.All(
+            cv.only_with_esp_idf,
+            cv.positive_int,
+            cv.Range(min=1, max=64),
+        ),
    }
 ).extend(cv.COMPONENT_SCHEMA)

@@ -272,8 +281,21 @@ async def to_code(config):
                "CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT", timeout_seconds
            )

+        # Set the maximum number of notification registrations
+        # This controls how many BLE characteristics can have notifications enabled
+        # across all connections for a single GATT client interface
+        # https://github.com/esphome/issues/issues/6808
+        if CONF_MAX_NOTIFICATIONS in config:
+            add_idf_sdkconfig_option(
+                "CONFIG_BT_GATTC_NOTIF_REG_MAX", config[CONF_MAX_NOTIFICATIONS]
+            )
+
    cg.add_define("USE_ESP32_BLE")

+    if config[CONF_ADVERTISING]:
+        cg.add_define("USE_ESP32_BLE_ADVERTISING")
+        cg.add_define("USE_ESP32_BLE_UUID")
+

@automation.register_condition("ble.enabled", BLEEnabledCondition, cv.Schema({}))
 async def ble_enabled_to_code(config, condition_id, template_arg, args):
--- a/esphome/components/esp32_ble/ble.cpp
+++ b/esphome/components/esp32_ble/ble.cpp
@@ -1,7 +1,7 @@
-#ifdef USE_ESP32
-
 #include "ble.h"

+#ifdef USE_ESP32
+
 #include "esphome/core/application.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
@@ -53,6 +53,7 @@ void ESP32BLE::disable() {

 bool ESP32BLE::is_active() { return this->state_ == BLE_COMPONENT_STATE_ACTIVE; }

+#ifdef USE_ESP32_BLE_ADVERTISING
 void ESP32BLE::advertising_start() {
  this->advertising_init_();
  if (!this->is_active())
@@ -88,6 +89,7 @@ void ESP32BLE::advertising_remove_service_uuid(ESPBTUUID uuid) {
  this->advertising_->remove_service_uuid(uuid);
  this->advertising_start();
 }
+#endif

 bool ESP32BLE::ble_pre_setup_() {
  esp_err_t err = nvs_flash_init();
@@ -98,6 +100,7 @@ bool ESP32BLE::ble_pre_setup_() {
  return true;
 }

+#ifdef USE_ESP32_BLE_ADVERTISING
 void ESP32BLE::advertising_init_() {
  if (this->advertising_ != nullptr)
    return;
@@ -107,6 +110,7 @@ void ESP32BLE::advertising_init_() {
  this->advertising_->set_min_preferred_interval(0x06);
  this->advertising_->set_appearance(this->appearance_);
 }
+#endif

 bool ESP32BLE::ble_setup_() {
  esp_err_t err;
@@ -302,7 +306,7 @@ void ESP32BLE::loop() {
      case BLEEvent::GATTS: {
        esp_gatts_cb_event_t event = ble_event->event_.gatts.gatts_event;
        esp_gatt_if_t gatts_if = ble_event->event_.gatts.gatts_if;
-        esp_ble_gatts_cb_param_t *param = ble_event->event_.gatts.gatts_param;
+        esp_ble_gatts_cb_param_t *param = &ble_event->event_.gatts.gatts_param;
        ESP_LOGV(TAG, "gatts_event [esp_gatt_if: %d] - %d", gatts_if, event);
        for (auto *gatts_handler : this->gatts_event_handlers_) {
          gatts_handler->gatts_event_handler(event, gatts_if, param);
@@ -312,7 +316,7 @@ void ESP32BLE::loop() {
      case BLEEvent::GATTC: {
        esp_gattc_cb_event_t event = ble_event->event_.gattc.gattc_event;
        esp_gatt_if_t gattc_if = ble_event->event_.gattc.gattc_if;
-        esp_ble_gattc_cb_param_t *param = ble_event->event_.gattc.gattc_param;
+        esp_ble_gattc_cb_param_t *param = &ble_event->event_.gattc.gattc_param;
        ESP_LOGV(TAG, "gattc_event [esp_gatt_if: %d] - %d", gattc_if, event);
        for (auto *gattc_handler : this->gattc_event_handlers_) {
          gattc_handler->gattc_event_handler(event, gattc_if, param);
@@ -394,9 +398,11 @@ void ESP32BLE::loop() {
    this->ble_event_pool_.release(ble_event);
    ble_event = this->ble_events_.pop();
  }
+#ifdef USE_ESP32_BLE_ADVERTISING
  if (this->advertising_ != nullptr) {
    this->advertising_->loop();
  }
+#endif

  // Log dropped events periodically
  uint16_t dropped = this->ble_events_.get_and_reset_dropped_count();
--- a/esphome/components/esp32_ble/ble.h
+++ b/esphome/components/esp32_ble/ble.h
@@ -1,14 +1,17 @@
 #pragma once

-#include "ble_advertising.h"
+#include "esphome/core/defines.h"  // Must be included before conditional includes
+
 #include "ble_uuid.h"
 #include "ble_scan_result.h"
+#ifdef USE_ESP32_BLE_ADVERTISING
+#include "ble_advertising.h"
+#endif

 #include <functional>

 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
-#include "esphome/core/defines.h"
 #include "esphome/core/helpers.h"

 #include "ble_event.h"
@@ -23,21 +26,14 @@

 namespace esphome::esp32_ble {

-// Maximum number of BLE scan results to buffer
-// Sized to handle bursts of advertisements while allowing for processing delays
-// With 16 advertisements per batch and some safety margin:
-// - Without PSRAM: 24 entries (1.5× batch size)
-// - With PSRAM: 36 entries (2.25× batch size)
-// The reduced structure size (~80 bytes vs ~400 bytes) allows for larger buffers
+// Maximum size of the BLE event queue
+// Increased to absorb the ring buffer capacity from esp32_ble_tracker
 #ifdef USE_PSRAM
-static constexpr uint8_t SCAN_RESULT_BUFFER_SIZE = 36;
+static constexpr uint8_t MAX_BLE_QUEUE_SIZE = 100;  // 64 + 36 (ring buffer size with PSRAM)
 #else
-static constexpr uint8_t SCAN_RESULT_BUFFER_SIZE = 24;
+static constexpr uint8_t MAX_BLE_QUEUE_SIZE = 88;  // 64 + 24 (ring buffer size without PSRAM)
 #endif

-// Maximum size of the BLE event queue - must be power of 2 for lock-free queue
-static constexpr size_t MAX_BLE_QUEUE_SIZE = 64;
-
 uint64_t ble_addr_to_uint64(const esp_bd_addr_t address);

 // NOLINTNEXTLINE(modernize-use-using)
@@ -113,6 +109,7 @@ class ESP32BLE : public Component {
  float get_setup_priority() const override;
  void set_name(const std::string &name) { this->name_ = name; }

+#ifdef USE_ESP32_BLE_ADVERTISING
  void advertising_start();
  void advertising_set_service_data(const std::vector<uint8_t> &data);
  void advertising_set_manufacturer_data(const std::vector<uint8_t> &data);
@@ -120,6 +117,7 @@ class ESP32BLE : public Component {
  void advertising_add_service_uuid(ESPBTUUID uuid);
  void advertising_remove_service_uuid(ESPBTUUID uuid);
  void advertising_register_raw_advertisement_callback(std::function<void(bool)> &&callback);
+#endif

  void register_gap_event_handler(GAPEventHandler *handler) { this->gap_event_handlers_.push_back(handler); }
  void register_gap_scan_event_handler(GAPScanEventHandler *handler) {
@@ -140,7 +138,9 @@ class ESP32BLE : public Component {
  bool ble_setup_();
  bool ble_dismantle_();
  bool ble_pre_setup_();
+#ifdef USE_ESP32_BLE_ADVERTISING
  void advertising_init_();
+#endif

 private:
  template<typename... Args> friend void enqueue_ble_event(Args... args);
@@ -160,7 +160,9 @@ class ESP32BLE : public Component {
  optional<std::string> name_;

  // 4-byte aligned members
-  BLEAdvertising *advertising_{};             // 4 bytes (pointer)
+#ifdef USE_ESP32_BLE_ADVERTISING
+  BLEAdvertising *advertising_{};  // 4 bytes (pointer)
+#endif
  esp_ble_io_cap_t io_cap_{ESP_IO_CAP_NONE};  // 4 bytes (enum)
  uint32_t advertising_cycle_time_{};         // 4 bytes

--- a/esphome/components/esp32_ble/ble_advertising.cpp
+++ b/esphome/components/esp32_ble/ble_advertising.cpp
@@ -1,6 +1,7 @@
 #include "ble_advertising.h"

 #ifdef USE_ESP32
+#ifdef USE_ESP32_BLE_ADVERTISING

 #include <cstdio>
 #include <cstring>
@@ -161,4 +162,5 @@ void BLEAdvertising::register_raw_advertisement_callback(std::function<void(bool

 }  // namespace esphome::esp32_ble

-#endif
+#endif  // USE_ESP32_BLE_ADVERTISING
+#endif  // USE_ESP32
--- a/esphome/components/esp32_ble/ble_advertising.h
+++ b/esphome/components/esp32_ble/ble_advertising.h
@@ -1,10 +1,13 @@
 #pragma once

+#include "esphome/core/defines.h"
+
 #include <array>
 #include <functional>
 #include <vector>

 #ifdef USE_ESP32
+#ifdef USE_ESP32_BLE_ADVERTISING

 #include <esp_bt.h>
 #include <esp_gap_ble_api.h>
@@ -56,4 +59,5 @@ class BLEAdvertising {

 }  // namespace esphome::esp32_ble

-#endif
+#endif  // USE_ESP32_BLE_ADVERTISING
+#endif  // USE_ESP32
--- a/esphome/components/esp32_ble/ble_event.h
+++ b/esphome/components/esp32_ble/ble_event.h
@@ -3,8 +3,7 @@
 #ifdef USE_ESP32

 #include <cstddef>  // for offsetof
-#include <vector>
-
+#include <cstring>  // for memcpy
 #include <esp_gap_ble_api.h>
 #include <esp_gattc_api.h>
 #include <esp_gatts_api.h>
@@ -62,10 +61,24 @@ static_assert(offsetof(esp_ble_gap_cb_param_t, read_rssi_cmpl.rssi) == sizeof(es
 static_assert(offsetof(esp_ble_gap_cb_param_t, read_rssi_cmpl.remote_addr) == sizeof(esp_bt_status_t) + sizeof(int8_t),
              "remote_addr must follow rssi in read_rssi_cmpl");

+// Param struct sizes on ESP32
+static constexpr size_t GATTC_PARAM_SIZE = 28;
+static constexpr size_t GATTS_PARAM_SIZE = 32;
+
+// Maximum size for inline storage of data
+// GATTC: 80 - 28 (param) - 8 (other fields) = 44 bytes for data
+// GATTS: 80 - 32 (param) - 8 (other fields) = 40 bytes for data
+static constexpr size_t GATTC_INLINE_DATA_SIZE = 44;
+static constexpr size_t GATTS_INLINE_DATA_SIZE = 40;
+
+// Verify param struct sizes
+static_assert(sizeof(esp_ble_gattc_cb_param_t) == GATTC_PARAM_SIZE, "GATTC param size unexpected");
+static_assert(sizeof(esp_ble_gatts_cb_param_t) == GATTS_PARAM_SIZE, "GATTS param size unexpected");
+
 // Received GAP, GATTC and GATTS events are only queued, and get processed in the main loop().
 // This class stores each event with minimal memory usage.
-// GAP events (99% of traffic) don't have the vector overhead.
-// GATTC/GATTS events use heap allocation for their param and data.
+// GAP events (99% of traffic) don't have the heap allocation overhead.
+// GATTC/GATTS events use heap allocation for their param and inline storage for small data.
 //
 // Event flow:
 // 1. ESP-IDF BLE stack calls our static handlers in the BLE task context
@@ -112,21 +125,21 @@ class BLEEvent {
    this->init_gap_data_(e, p);
  }

-  // Constructor for GATTC events - uses heap allocation
-  // IMPORTANT: The heap allocation is REQUIRED and must not be removed as an optimization.
-  // The param pointer from ESP-IDF is only valid during the callback execution.
-  // Since BLE events are processed asynchronously in the main loop, we must create
-  // our own copy to ensure the data remains valid until the event is processed.
+  // Constructor for GATTC events - param stored inline, data may use heap
+  // IMPORTANT: We MUST copy the param struct because the pointer from ESP-IDF
+  // is only valid during the callback execution. Since BLE events are processed
+  // asynchronously in the main loop, we store our own copy inline to ensure
+  // the data remains valid until the event is processed.
  BLEEvent(esp_gattc_cb_event_t e, esp_gatt_if_t i, esp_ble_gattc_cb_param_t *p) {
    this->type_ = GATTC;
    this->init_gattc_data_(e, i, p);
  }

-  // Constructor for GATTS events - uses heap allocation
-  // IMPORTANT: The heap allocation is REQUIRED and must not be removed as an optimization.
-  // The param pointer from ESP-IDF is only valid during the callback execution.
-  // Since BLE events are processed asynchronously in the main loop, we must create
-  // our own copy to ensure the data remains valid until the event is processed.
+  // Constructor for GATTS events - param stored inline, data may use heap
+  // IMPORTANT: We MUST copy the param struct because the pointer from ESP-IDF
+  // is only valid during the callback execution. Since BLE events are processed
+  // asynchronously in the main loop, we store our own copy inline to ensure
+  // the data remains valid until the event is processed.
  BLEEvent(esp_gatts_cb_event_t e, esp_gatt_if_t i, esp_ble_gatts_cb_param_t *p) {
    this->type_ = GATTS;
    this->init_gatts_data_(e, i, p);
@@ -136,25 +149,32 @@ class BLEEvent {
  ~BLEEvent() { this->release(); }

  // Default constructor for pre-allocation in pool
-  BLEEvent() : type_(GAP) {}
+  BLEEvent() : event_{}, type_(GAP) {}

  // Invoked on return to EventPool - clean up any heap-allocated data
  void release() {
-    if (this->type_ == GAP) {
-      return;
-    }
-    if (this->type_ == GATTC) {
-      delete this->event_.gattc.gattc_param;
-      delete this->event_.gattc.data;
-      this->event_.gattc.gattc_param = nullptr;
-      this->event_.gattc.data = nullptr;
-      return;
-    }
-    if (this->type_ == GATTS) {
-      delete this->event_.gatts.gatts_param;
-      delete this->event_.gatts.data;
-      this->event_.gatts.gatts_param = nullptr;
-      this->event_.gatts.data = nullptr;
+    switch (this->type_) {
+      case GAP:
+        // GAP events don't have heap allocations
+        break;
+      case GATTC:
+        // Param is now stored inline, only delete heap data if it was heap-allocated
+        if (!this->event_.gattc.is_inline && this->event_.gattc.data.heap_data != nullptr) {
+          delete[] this->event_.gattc.data.heap_data;
+        }
+        // Clear critical fields to prevent issues if type changes
+        this->event_.gattc.is_inline = false;
+        this->event_.gattc.data.heap_data = nullptr;
+        break;
+      case GATTS:
+        // Param is now stored inline, only delete heap data if it was heap-allocated
+        if (!this->event_.gatts.is_inline && this->event_.gatts.data.heap_data != nullptr) {
+          delete[] this->event_.gatts.data.heap_data;
+        }
+        // Clear critical fields to prevent issues if type changes
+        this->event_.gatts.is_inline = false;
+        this->event_.gatts.data.heap_data = nullptr;
+        break;
    }
  }

@@ -206,20 +226,30 @@ class BLEEvent {

    // NOLINTNEXTLINE(readability-identifier-naming)
    struct gattc_event {
-      esp_gattc_cb_event_t gattc_event;
-      esp_gatt_if_t gattc_if;
-      esp_ble_gattc_cb_param_t *gattc_param;  // Heap-allocated
-      std::vector<uint8_t> *data;             // Heap-allocated
-    } gattc;                                  // 16 bytes (pointers only)
+      esp_ble_gattc_cb_param_t gattc_param;  // Stored inline (28 bytes)
+      esp_gattc_cb_event_t gattc_event;      // 4 bytes
+      union {
+        uint8_t *heap_data;                           // 4 bytes when heap-allocated
+        uint8_t inline_data[GATTC_INLINE_DATA_SIZE];  // 44 bytes when stored inline
+      } data;                                         // 44 bytes total
+      uint16_t data_len;                              // 2 bytes
+      esp_gatt_if_t gattc_if;                         // 1 byte
+      bool is_inline;                                 // 1 byte - true when data is stored inline
+    } gattc;                                          // Total: 80 bytes

    // NOLINTNEXTLINE(readability-identifier-naming)
    struct gatts_event {
-      esp_gatts_cb_event_t gatts_event;
-      esp_gatt_if_t gatts_if;
-      esp_ble_gatts_cb_param_t *gatts_param;  // Heap-allocated
-      std::vector<uint8_t> *data;             // Heap-allocated
-    } gatts;                                  // 16 bytes (pointers only)
-  } event_;                                   // 80 bytes
+      esp_ble_gatts_cb_param_t gatts_param;  // Stored inline (32 bytes)
+      esp_gatts_cb_event_t gatts_event;      // 4 bytes
+      union {
+        uint8_t *heap_data;                           // 4 bytes when heap-allocated
+        uint8_t inline_data[GATTS_INLINE_DATA_SIZE];  // 40 bytes when stored inline
+      } data;                                         // 40 bytes total
+      uint16_t data_len;                              // 2 bytes
+      esp_gatt_if_t gatts_if;                         // 1 byte
+      bool is_inline;                                 // 1 byte - true when data is stored inline
+    } gatts;                                          // Total: 80 bytes
+  } event_;                                           // 80 bytes

  ble_event_t type_;

@@ -233,6 +263,29 @@ class BLEEvent {
  const esp_ble_sec_t &security() const { return event_.gap.security; }

 private:
+  // Helper to copy data with inline storage optimization
+  template<typename EventStruct, size_t InlineSize>
+  void copy_data_with_inline_storage_(EventStruct &event, const uint8_t *src_data, uint16_t len,
+                                      uint8_t **param_value_ptr) {
+    event.data_len = len;
+    if (len > 0) {
+      if (len <= InlineSize) {
+        event.is_inline = true;
+        memcpy(event.data.inline_data, src_data, len);
+        *param_value_ptr = event.data.inline_data;
+      } else {
+        event.is_inline = false;
+        event.data.heap_data = new uint8_t[len];
+        memcpy(event.data.heap_data, src_data, len);
+        *param_value_ptr = event.data.heap_data;
+      }
+    } else {
+      event.is_inline = false;
+      event.data.heap_data = nullptr;
+      *param_value_ptr = nullptr;
+    }
+  }
+
  // Initialize GAP event data
  void init_gap_data_(esp_gap_ble_cb_event_t e, esp_ble_gap_cb_param_t *p) {
    this->event_.gap.gap_event = e;
@@ -317,35 +370,38 @@ class BLEEvent {
    this->event_.gattc.gattc_if = i;

    if (p == nullptr) {
-      this->event_.gattc.gattc_param = nullptr;
-      this->event_.gattc.data = nullptr;
+      // Zero out the param struct when null
+      memset(&this->event_.gattc.gattc_param, 0, sizeof(this->event_.gattc.gattc_param));
+      this->event_.gattc.is_inline = false;
+      this->event_.gattc.data.heap_data = nullptr;
+      this->event_.gattc.data_len = 0;
      return;  // Invalid event, but we can't log in header file
    }

-    // Heap-allocate param and data
-    // Heap allocation is used because GATTC/GATTS events are rare (<1% of events)
-    // while GAP events (99%) are stored inline to minimize memory usage
-    // IMPORTANT: This heap allocation provides clear ownership semantics:
-    // - The BLEEvent owns the allocated memory for its lifetime
-    // - The data remains valid from the BLE callback context until processed in the main loop
-    // - Without this copy, we'd have use-after-free bugs as ESP-IDF reuses the callback memory
-    this->event_.gattc.gattc_param = new esp_ble_gattc_cb_param_t(*p);
+    // Copy param struct inline (no heap allocation!)
+    // GATTC/GATTS events are rare (<1% of events) but we can still store them inline
+    // along with small data payloads, eliminating all heap allocations for typical BLE operations
+    // CRITICAL: This copy is REQUIRED for memory safety - the ESP-IDF param pointer
+    // is only valid during the callback and will be reused/freed after we return
+    this->event_.gattc.gattc_param = *p;

    // Copy data for events that need it
    // The param struct contains pointers (e.g., notify.value) that point to temporary buffers.
    // We must copy this data to ensure it remains valid when the event is processed later.
    switch (e) {
      case ESP_GATTC_NOTIFY_EVT:
-        this->event_.gattc.data = new std::vector<uint8_t>(p->notify.value, p->notify.value + p->notify.value_len);
-        this->event_.gattc.gattc_param->notify.value = this->event_.gattc.data->data();
+        copy_data_with_inline_storage_<decltype(this->event_.gattc), GATTC_INLINE_DATA_SIZE>(
+            this->event_.gattc, p->notify.value, p->notify.value_len, &this->event_.gattc.gattc_param.notify.value);
        break;
      case ESP_GATTC_READ_CHAR_EVT:
      case ESP_GATTC_READ_DESCR_EVT:
-        this->event_.gattc.data = new std::vector<uint8_t>(p->read.value, p->read.value + p->read.value_len);
-        this->event_.gattc.gattc_param->read.value = this->event_.gattc.data->data();
+        copy_data_with_inline_storage_<decltype(this->event_.gattc), GATTC_INLINE_DATA_SIZE>(
+            this->event_.gattc, p->read.value, p->read.value_len, &this->event_.gattc.gattc_param.read.value);
        break;
      default:
-        this->event_.gattc.data = nullptr;
+        this->event_.gattc.is_inline = false;
+        this->event_.gattc.data.heap_data = nullptr;
+        this->event_.gattc.data_len = 0;
        break;
    }
  }
@@ -356,30 +412,33 @@ class BLEEvent {
    this->event_.gatts.gatts_if = i;

    if (p == nullptr) {
-      this->event_.gatts.gatts_param = nullptr;
-      this->event_.gatts.data = nullptr;
+      // Zero out the param struct when null
+      memset(&this->event_.gatts.gatts_param, 0, sizeof(this->event_.gatts.gatts_param));
+      this->event_.gatts.is_inline = false;
+      this->event_.gatts.data.heap_data = nullptr;
+      this->event_.gatts.data_len = 0;
      return;  // Invalid event, but we can't log in header file
    }

-    // Heap-allocate param and data
-    // Heap allocation is used because GATTC/GATTS events are rare (<1% of events)
-    // while GAP events (99%) are stored inline to minimize memory usage
-    // IMPORTANT: This heap allocation provides clear ownership semantics:
-    // - The BLEEvent owns the allocated memory for its lifetime
-    // - The data remains valid from the BLE callback context until processed in the main loop
-    // - Without this copy, we'd have use-after-free bugs as ESP-IDF reuses the callback memory
-    this->event_.gatts.gatts_param = new esp_ble_gatts_cb_param_t(*p);
+    // Copy param struct inline (no heap allocation!)
+    // GATTC/GATTS events are rare (<1% of events) but we can still store them inline
+    // along with small data payloads, eliminating all heap allocations for typical BLE operations
+    // CRITICAL: This copy is REQUIRED for memory safety - the ESP-IDF param pointer
+    // is only valid during the callback and will be reused/freed after we return
+    this->event_.gatts.gatts_param = *p;

    // Copy data for events that need it
    // The param struct contains pointers (e.g., write.value) that point to temporary buffers.
    // We must copy this data to ensure it remains valid when the event is processed later.
    switch (e) {
      case ESP_GATTS_WRITE_EVT:
-        this->event_.gatts.data = new std::vector<uint8_t>(p->write.value, p->write.value + p->write.len);
-        this->event_.gatts.gatts_param->write.value = this->event_.gatts.data->data();
+        copy_data_with_inline_storage_<decltype(this->event_.gatts), GATTS_INLINE_DATA_SIZE>(
+            this->event_.gatts, p->write.value, p->write.len, &this->event_.gatts.gatts_param.write.value);
        break;
      default:
-        this->event_.gatts.data = nullptr;
+        this->event_.gatts.is_inline = false;
+        this->event_.gatts.data.heap_data = nullptr;
+        this->event_.gatts.data_len = 0;
        break;
    }
  }
@@ -389,6 +448,15 @@ class BLEEvent {
 // The gap member in the union should be 80 bytes (including the gap_event enum)
 static_assert(sizeof(decltype(((BLEEvent *) nullptr)->event_.gap)) <= 80, "gap_event struct has grown beyond 80 bytes");

+// Verify GATTC and GATTS structs don't exceed GAP struct size
+// This ensures the union size is determined by GAP (the most common event type)
+static_assert(sizeof(decltype(((BLEEvent *) nullptr)->event_.gattc)) <=
+                  sizeof(decltype(((BLEEvent *) nullptr)->event_.gap)),
+              "gattc_event struct exceeds gap_event size - union size would increase");
+static_assert(sizeof(decltype(((BLEEvent *) nullptr)->event_.gatts)) <=
+                  sizeof(decltype(((BLEEvent *) nullptr)->event_.gap)),
+              "gatts_event struct exceeds gap_event size - union size would increase");
+
 // Verify esp_ble_sec_t fits within our union
 static_assert(sizeof(esp_ble_sec_t) <= 73, "esp_ble_sec_t is larger than BLEScanResult");

--- a/esphome/components/esp32_ble/ble_uuid.cpp
+++ b/esphome/components/esp32_ble/ble_uuid.cpp
@@ -1,6 +1,7 @@
 #include "ble_uuid.h"

 #ifdef USE_ESP32
+#ifdef USE_ESP32_BLE_UUID

 #include <cstring>
 #include <cstdio>
@@ -190,4 +191,5 @@ std::string ESPBTUUID::to_string() const {

 }  // namespace esphome::esp32_ble

-#endif
+#endif  // USE_ESP32_BLE_UUID
+#endif  // USE_ESP32
--- a/esphome/components/esp32_ble/ble_uuid.h
+++ b/esphome/components/esp32_ble/ble_uuid.h
@@ -1,9 +1,11 @@
 #pragma once

+#include "esphome/core/defines.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"

 #ifdef USE_ESP32
+#ifdef USE_ESP32_BLE_UUID

 #include <string>
 #include <esp_bt_defs.h>
@@ -42,4 +44,5 @@ class ESPBTUUID {

 }  // namespace esphome::esp32_ble

-#endif
+#endif  // USE_ESP32_BLE_UUID
+#endif  // USE_ESP32
--- a/esphome/components/esp32_ble_beacon/init.py
+++ b/esphome/components/esp32_ble_beacon/init.py
@@ -65,6 +65,8 @@ FINAL_VALIDATE_SCHEMA = esp32_ble.validate_variant


 async def to_code(config):
+    cg.add_define("USE_ESP32_BLE_UUID")
+
    uuid = config[CONF_UUID].hex
    uuid_arr = [
        cg.RawExpression(f"0x{uuid[i : i + 2]}") for i in range(0, len(uuid), 2)
@@ -82,6 +84,8 @@ async def to_code(config):
    cg.add(var.set_measured_power(config[CONF_MEASURED_POWER]))
    cg.add(var.set_tx_power(config[CONF_TX_POWER]))

+    cg.add_define("USE_ESP32_BLE_ADVERTISING")
+
    if CORE.using_esp_idf:
        add_idf_sdkconfig_option("CONFIG_BT_ENABLED", True)
        add_idf_sdkconfig_option("CONFIG_BT_BLE_42_FEATURES_SUPPORTED", True)
--- a/esphome/components/esp32_ble_client/init.py
+++ b/esphome/components/esp32_ble_client/init.py
@@ -2,7 +2,7 @@ import esphome.codegen as cg
 from esphome.components import esp32_ble_tracker

 AUTO_LOAD = ["esp32_ble_tracker"]
-CODEOWNERS = ["@jesserockz"]
+CODEOWNERS = ["@jesserockz", "@bdraco"]
 DEPENDENCIES = ["esp32"]

 esp32_ble_client_ns = cg.esphome_ns.namespace("esp32_ble_client")
--- a/esphome/components/esp32_ble_client/ble_characteristic.cpp
+++ b/esphome/components/esp32_ble_client/ble_characteristic.cpp
@@ -5,9 +5,9 @@
 #include "esphome/core/log.h"

 #ifdef USE_ESP32
+#ifdef USE_ESP32_BLE_DEVICE

-namespace esphome {
-namespace esp32_ble_client {
+namespace esphome::esp32_ble_client {

 static const char *const TAG = "esp32_ble_client";

@@ -93,7 +93,7 @@ esp_err_t BLECharacteristic::write_value(uint8_t *new_val, int16_t new_val_size)
  return write_value(new_val, new_val_size, ESP_GATT_WRITE_TYPE_NO_RSP);
 }

-}  // namespace esp32_ble_client
-}  // namespace esphome
+}  // namespace esphome::esp32_ble_client

+#endif  // USE_ESP32_BLE_DEVICE
 #endif  // USE_ESP32
--- a/esphome/components/esp32_ble_client/ble_characteristic.h
+++ b/esphome/components/esp32_ble_client/ble_characteristic.h
@@ -1,6 +1,9 @@
 #pragma once

+#include "esphome/core/defines.h"
+
 #ifdef USE_ESP32
+#ifdef USE_ESP32_BLE_DEVICE

 #include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"

@@ -8,8 +11,7 @@

 #include <vector>

-namespace esphome {
-namespace esp32_ble_client {
+namespace esphome::esp32_ble_client {

 namespace espbt = esphome::esp32_ble_tracker;

@@ -33,7 +35,7 @@ class BLECharacteristic {
  BLEService *service;
 };

-}  // namespace esp32_ble_client
-}  // namespace esphome
+}  // namespace esphome::esp32_ble_client

+#endif  // USE_ESP32_BLE_DEVICE
 #endif  // USE_ESP32
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -8,8 +8,7 @@
 #include <esp_gap_ble_api.h>
 #include <esp_gatt_defs.h>

-namespace esphome {
-namespace esp32_ble_client {
+namespace esphome::esp32_ble_client {

 static const char *const TAG = "esp32_ble_client";

@@ -79,40 +78,7 @@ void BLEClientBase::dump_config() {
                "  Address: %s\n"
                "  Auto-Connect: %s",
                this->address_str().c_str(), TRUEFALSE(this->auto_connect_));
-  std::string state_name;
-  switch (this->state()) {
-    case espbt::ClientState::INIT:
-      state_name = "INIT";
-      break;
-    case espbt::ClientState::DISCONNECTING:
-      state_name = "DISCONNECTING";
-      break;
-    case espbt::ClientState::IDLE:
-      state_name = "IDLE";
-      break;
-    case espbt::ClientState::SEARCHING:
-      state_name = "SEARCHING";
-      break;
-    case espbt::ClientState::DISCOVERED:
-      state_name = "DISCOVERED";
-      break;
-    case espbt::ClientState::READY_TO_CONNECT:
-      state_name = "READY_TO_CONNECT";
-      break;
-    case espbt::ClientState::CONNECTING:
-      state_name = "CONNECTING";
-      break;
-    case espbt::ClientState::CONNECTED:
-      state_name = "CONNECTED";
-      break;
-    case espbt::ClientState::ESTABLISHED:
-      state_name = "ESTABLISHED";
-      break;
-    default:
-      state_name = "UNKNOWN_STATE";
-      break;
-  }
-  ESP_LOGCONFIG(TAG, "  State: %s", state_name.c_str());
+  ESP_LOGCONFIG(TAG, "  State: %s", espbt::client_state_to_string(this->state()));
  if (this->status_ == ESP_GATT_NO_RESOURCES) {
    ESP_LOGE(TAG, "  Failed due to no resources. Try to reduce number of BLE clients in config.");
  } else if (this->status_ != ESP_GATT_OK) {
@@ -141,60 +107,55 @@ bool BLEClientBase::parse_device(const espbt::ESPBTDevice &device) {
 #endif

 void BLEClientBase::connect() {
-  ESP_LOGI(TAG, "[%d] [%s] 0x%02x Attempting BLE connection", this->connection_index_, this->address_str_.c_str(),
+  ESP_LOGI(TAG, "[%d] [%s] 0x%02x Connecting", this->connection_index_, this->address_str_.c_str(),
           this->remote_addr_type_);
  this->paired_ = false;

+  // Set preferred connection parameters before connecting
+  // Use FAST for all V3 connections (better latency and reliability)
+  // Use MEDIUM for V1/legacy connections (balanced performance)
+  uint16_t min_interval, max_interval, timeout;
+  const char *param_type;
+
+  if (this->connection_type_ == espbt::ConnectionType::V3_WITHOUT_CACHE ||
+      this->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE) {
+    min_interval = FAST_MIN_CONN_INTERVAL;
+    max_interval = FAST_MAX_CONN_INTERVAL;
+    timeout = FAST_CONN_TIMEOUT;
+    param_type = "fast";
+  } else {
+    min_interval = MEDIUM_MIN_CONN_INTERVAL;
+    max_interval = MEDIUM_MAX_CONN_INTERVAL;
+    timeout = MEDIUM_CONN_TIMEOUT;
+    param_type = "medium";
+  }
+
+  auto param_ret = esp_ble_gap_set_prefer_conn_params(this->remote_bda_, min_interval, max_interval,
+                                                      0,  // latency: 0
+                                                      timeout);
+  if (param_ret != ESP_OK) {
+    ESP_LOGW(TAG, "[%d] [%s] esp_ble_gap_set_prefer_conn_params failed: %d", this->connection_index_,
+             this->address_str_.c_str(), param_ret);
+  } else {
+    this->log_connection_params_(param_type);
+  }
+
+  // Now open the connection
  auto ret = esp_ble_gattc_open(this->gattc_if_, this->remote_bda_, this->remote_addr_type_, true);
  if (ret) {
-    ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_open error, status=%d", this->connection_index_, this->address_str_.c_str(),
-             ret);
+    this->log_gattc_warning_("esp_ble_gattc_open", ret);
    this->set_state(espbt::ClientState::IDLE);
  } else {
    this->set_state(espbt::ClientState::CONNECTING);
-
-    // Always set connection parameters to ensure stable operation
-    // Use FAST for all V3 connections (better latency and reliability)
-    // Use MEDIUM for V1/legacy connections (balanced performance)
-    uint16_t min_interval, max_interval, timeout;
-    const char *param_type;
-
-    if (this->connection_type_ == espbt::ConnectionType::V3_WITHOUT_CACHE ||
-        this->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE) {
-      min_interval = FAST_MIN_CONN_INTERVAL;
-      max_interval = FAST_MAX_CONN_INTERVAL;
-      timeout = FAST_CONN_TIMEOUT;
-      param_type = "fast";
-    } else {
-      min_interval = MEDIUM_MIN_CONN_INTERVAL;
-      max_interval = MEDIUM_MAX_CONN_INTERVAL;
-      timeout = MEDIUM_CONN_TIMEOUT;
-      param_type = "medium";
-    }
-
-    auto param_ret = esp_ble_gap_set_prefer_conn_params(this->remote_bda_, min_interval, max_interval,
-                                                        0,  // latency: 0
-                                                        timeout);
-    if (param_ret != ESP_OK) {
-      ESP_LOGW(TAG, "[%d] [%s] esp_ble_gap_set_prefer_conn_params failed: %d", this->connection_index_,
-               this->address_str_.c_str(), param_ret);
-    } else {
-      ESP_LOGD(TAG, "[%d] [%s] Set %s conn params", this->connection_index_, this->address_str_.c_str(), param_type);
-    }
  }
 }

 esp_err_t BLEClientBase::pair() { return esp_ble_set_encryption(this->remote_bda_, ESP_BLE_SEC_ENCRYPT); }

 void BLEClientBase::disconnect() {
-  if (this->state_ == espbt::ClientState::IDLE) {
-    ESP_LOGI(TAG, "[%d] [%s] Disconnect requested, but already idle.", this->connection_index_,
-             this->address_str_.c_str());
-    return;
-  }
-  if (this->state_ == espbt::ClientState::DISCONNECTING) {
-    ESP_LOGI(TAG, "[%d] [%s] Disconnect requested, but already disconnecting.", this->connection_index_,
-             this->address_str_.c_str());
+  if (this->state_ == espbt::ClientState::IDLE || this->state_ == espbt::ClientState::DISCONNECTING) {
+    ESP_LOGI(TAG, "[%d] [%s] Disconnect requested, but already %s", this->connection_index_, this->address_str_.c_str(),
+             espbt::client_state_to_string(this->state_));
    return;
  }
  if (this->state_ == espbt::ClientState::CONNECTING || this->conn_id_ == UNSET_CONN_ID) {
@@ -229,8 +190,7 @@ void BLEClientBase::unconditional_disconnect() {
    // In the future we might consider App.reboot() here since
    // the BLE stack is in an indeterminate state.
    //
-    ESP_LOGE(TAG, "[%d] [%s] esp_ble_gattc_close error, err=%d", this->connection_index_, this->address_str_.c_str(),
-             err);
+    this->log_gattc_warning_("esp_ble_gattc_close", err);
  }

  if (this->state_ == espbt::ClientState::SEARCHING || this->state_ == espbt::ClientState::READY_TO_CONNECT ||
@@ -243,9 +203,11 @@ void BLEClientBase::unconditional_disconnect() {
 }

 void BLEClientBase::release_services() {
+#ifdef USE_ESP32_BLE_DEVICE
  for (auto &svc : this->services_)
    delete svc;  // NOLINT(cppcoreguidelines-owning-memory)
  this->services_.clear();
+#endif
 #ifndef CONFIG_BT_GATTC_CACHE_NVS_FLASH
  esp_ble_gattc_cache_clean(this->remote_bda_);
 #endif
@@ -255,6 +217,36 @@ void BLEClientBase::log_event_(const char *name) {
  ESP_LOGD(TAG, "[%d] [%s] %s", this->connection_index_, this->address_str_.c_str(), name);
 }

+void BLEClientBase::log_gattc_event_(const char *name) {
+  ESP_LOGD(TAG, "[%d] [%s] ESP_GATTC_%s_EVT", this->connection_index_, this->address_str_.c_str(), name);
+}
+
+void BLEClientBase::log_gattc_warning_(const char *operation, esp_gatt_status_t status) {
+  ESP_LOGW(TAG, "[%d] [%s] %s error, status=%d", this->connection_index_, this->address_str_.c_str(), operation,
+           status);
+}
+
+void BLEClientBase::log_gattc_warning_(const char *operation, esp_err_t err) {
+  ESP_LOGW(TAG, "[%d] [%s] %s error, status=%d", this->connection_index_, this->address_str_.c_str(), operation, err);
+}
+
+void BLEClientBase::log_connection_params_(const char *param_type) {
+  ESP_LOGD(TAG, "[%d] [%s] %s conn params", this->connection_index_, this->address_str_.c_str(), param_type);
+}
+
+void BLEClientBase::restore_medium_conn_params_() {
+  // Restore to medium connection parameters after initial connection phase
+  // This balances performance with bandwidth usage for normal operation
+  esp_ble_conn_update_params_t conn_params = {{0}};
+  memcpy(conn_params.bda, this->remote_bda_, sizeof(esp_bd_addr_t));
+  conn_params.min_int = MEDIUM_MIN_CONN_INTERVAL;
+  conn_params.max_int = MEDIUM_MAX_CONN_INTERVAL;
+  conn_params.latency = 0;
+  conn_params.timeout = MEDIUM_CONN_TIMEOUT;
+  this->log_connection_params_("medium");
+  esp_ble_gap_update_conn_params(&conn_params);
+}
+
 bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t esp_gattc_if,
                                        esp_ble_gattc_cb_param_t *param) {
  if (event == ESP_GATTC_REG_EVT && this->app_id != param->reg.app_id)
@@ -282,30 +274,18 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
    case ESP_GATTC_OPEN_EVT: {
      if (!this->check_addr(param->open.remote_bda))
        return false;
-      this->log_event_("ESP_GATTC_OPEN_EVT");
-      this->conn_id_ = param->open.conn_id;
+      this->log_gattc_event_("OPEN");
+      // conn_id was already set in ESP_GATTC_CONNECT_EVT
      this->service_count_ = 0;
      if (this->state_ != espbt::ClientState::CONNECTING) {
        // This should not happen but lets log it in case it does
        // because it means we have a bad assumption about how the
        // ESP BT stack works.
-        if (this->state_ == espbt::ClientState::CONNECTED) {
-          ESP_LOGE(TAG, "[%d] [%s] Got ESP_GATTC_OPEN_EVT while already connected, status=%d", this->connection_index_,
-                   this->address_str_.c_str(), param->open.status);
-        } else if (this->state_ == espbt::ClientState::ESTABLISHED) {
-          ESP_LOGE(TAG, "[%d] [%s] Got ESP_GATTC_OPEN_EVT while already established, status=%d",
-                   this->connection_index_, this->address_str_.c_str(), param->open.status);
-        } else if (this->state_ == espbt::ClientState::DISCONNECTING) {
-          ESP_LOGE(TAG, "[%d] [%s] Got ESP_GATTC_OPEN_EVT while disconnecting, status=%d", this->connection_index_,
-                   this->address_str_.c_str(), param->open.status);
-        } else {
-          ESP_LOGE(TAG, "[%d] [%s] Got ESP_GATTC_OPEN_EVT while not in connecting state, status=%d",
-                   this->connection_index_, this->address_str_.c_str(), param->open.status);
-        }
+        ESP_LOGE(TAG, "[%d] [%s] Got ESP_GATTC_OPEN_EVT while in %s state, status=%d", this->connection_index_,
+                 this->address_str_.c_str(), espbt::client_state_to_string(this->state_), param->open.status);
      }
      if (param->open.status != ESP_GATT_OK && param->open.status != ESP_GATT_ALREADY_OPEN) {
-        ESP_LOGW(TAG, "[%d] [%s] Connection failed, status=%d", this->connection_index_, this->address_str_.c_str(),
-                 param->open.status);
+        this->log_gattc_warning_("Connection open", param->open.status);
        this->set_state(espbt::ClientState::IDLE);
        break;
      }
@@ -317,15 +297,12 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
        this->conn_id_ = UNSET_CONN_ID;
        break;
      }
-      auto ret = esp_ble_gattc_send_mtu_req(this->gattc_if_, param->open.conn_id);
-      if (ret) {
-        ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_send_mtu_req failed, status=%x", this->connection_index_,
-                 this->address_str_.c_str(), ret);
-      }
+      // MTU negotiation already started in ESP_GATTC_CONNECT_EVT
      this->set_state(espbt::ClientState::CONNECTED);
      ESP_LOGI(TAG, "[%d] [%s] Connection open", this->connection_index_, this->address_str_.c_str());
      if (this->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE) {
-        ESP_LOGI(TAG, "[%d] [%s] Using cached services", this->connection_index_, this->address_str_.c_str());
+        // Restore to medium connection parameters for cached connections too
+        this->restore_medium_conn_params_();
        // only set our state, subclients might have more stuff to do yet.
        this->state_ = espbt::ClientState::ESTABLISHED;
        break;
@@ -337,7 +314,16 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
    case ESP_GATTC_CONNECT_EVT: {
      if (!this->check_addr(param->connect.remote_bda))
        return false;
-      this->log_event_("ESP_GATTC_CONNECT_EVT");
+      this->log_gattc_event_("CONNECT");
+      this->conn_id_ = param->connect.conn_id;
+      // Start MTU negotiation immediately as recommended by ESP-IDF examples
+      // (gatt_client, ble_throughput) which call esp_ble_gattc_send_mtu_req in
+      // ESP_GATTC_CONNECT_EVT instead of waiting for ESP_GATTC_OPEN_EVT.
+      // This saves ~3ms in the connection process.
+      auto ret = esp_ble_gattc_send_mtu_req(this->gattc_if_, param->connect.conn_id);
+      if (ret) {
+        this->log_gattc_warning_("esp_ble_gattc_send_mtu_req", ret);
+      }
      break;
    }
    case ESP_GATTC_DISCONNECT_EVT: {
@@ -374,7 +360,7 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
    case ESP_GATTC_CLOSE_EVT: {
      if (this->conn_id_ != param->close.conn_id)
        return false;
-      this->log_event_("ESP_GATTC_CLOSE_EVT");
+      this->log_gattc_event_("CLOSE");
      this->release_services();
      this->set_state(espbt::ClientState::IDLE);
      this->conn_id_ = UNSET_CONN_ID;
@@ -386,79 +372,74 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
      this->service_count_++;
      if (this->connection_type_ == espbt::ConnectionType::V3_WITHOUT_CACHE) {
        // V3 clients don't need services initialized since
-        // they only request by handle after receiving the services.
+        // as they use the ESP APIs to get services.
        break;
      }
+#ifdef USE_ESP32_BLE_DEVICE
      BLEService *ble_service = new BLEService();  // NOLINT(cppcoreguidelines-owning-memory)
      ble_service->uuid = espbt::ESPBTUUID::from_uuid(param->search_res.srvc_id.uuid);
      ble_service->start_handle = param->search_res.start_handle;
      ble_service->end_handle = param->search_res.end_handle;
      ble_service->client = this;
      this->services_.push_back(ble_service);
+#endif
      break;
    }
    case ESP_GATTC_SEARCH_CMPL_EVT: {
      if (this->conn_id_ != param->search_cmpl.conn_id)
        return false;
-      this->log_event_("ESP_GATTC_SEARCH_CMPL_EVT");
-      for (auto &svc : this->services_) {
-        ESP_LOGV(TAG, "[%d] [%s] Service UUID: %s", this->connection_index_, this->address_str_.c_str(),
-                 svc->uuid.to_string().c_str());
-        ESP_LOGV(TAG, "[%d] [%s]  start_handle: 0x%x  end_handle: 0x%x", this->connection_index_,
-                 this->address_str_.c_str(), svc->start_handle, svc->end_handle);
-      }
-      ESP_LOGI(TAG, "[%d] [%s] Service discovery complete", this->connection_index_, this->address_str_.c_str());
-
+      this->log_gattc_event_("SEARCH_CMPL");
      // For V3 connections, restore to medium connection parameters after service discovery
      // This balances performance with bandwidth usage after the critical discovery phase
      if (this->connection_type_ == espbt::ConnectionType::V3_WITHOUT_CACHE ||
          this->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE) {
-        esp_ble_conn_update_params_t conn_params = {{0}};
-        memcpy(conn_params.bda, this->remote_bda_, sizeof(esp_bd_addr_t));
-        conn_params.min_int = MEDIUM_MIN_CONN_INTERVAL;
-        conn_params.max_int = MEDIUM_MAX_CONN_INTERVAL;
-        conn_params.latency = 0;
-        conn_params.timeout = MEDIUM_CONN_TIMEOUT;
-        ESP_LOGD(TAG, "[%d] [%s] Restored medium conn params after service discovery", this->connection_index_,
-                 this->address_str_.c_str());
-        esp_ble_gap_update_conn_params(&conn_params);
+        this->restore_medium_conn_params_();
+      } else {
+#ifdef USE_ESP32_BLE_DEVICE
+        for (auto &svc : this->services_) {
+          ESP_LOGV(TAG, "[%d] [%s] Service UUID: %s", this->connection_index_, this->address_str_.c_str(),
+                   svc->uuid.to_string().c_str());
+          ESP_LOGV(TAG, "[%d] [%s]  start_handle: 0x%x  end_handle: 0x%x", this->connection_index_,
+                   this->address_str_.c_str(), svc->start_handle, svc->end_handle);
+        }
+#endif
      }
-
+      ESP_LOGI(TAG, "[%d] [%s] Service discovery complete", this->connection_index_, this->address_str_.c_str());
      this->state_ = espbt::ClientState::ESTABLISHED;
      break;
    }
    case ESP_GATTC_READ_DESCR_EVT: {
      if (this->conn_id_ != param->write.conn_id)
        return false;
-      this->log_event_("ESP_GATTC_READ_DESCR_EVT");
+      this->log_gattc_event_("READ_DESCR");
      break;
    }
    case ESP_GATTC_WRITE_DESCR_EVT: {
      if (this->conn_id_ != param->write.conn_id)
        return false;
-      this->log_event_("ESP_GATTC_WRITE_DESCR_EVT");
+      this->log_gattc_event_("WRITE_DESCR");
      break;
    }
    case ESP_GATTC_WRITE_CHAR_EVT: {
      if (this->conn_id_ != param->write.conn_id)
        return false;
-      this->log_event_("ESP_GATTC_WRITE_CHAR_EVT");
+      this->log_gattc_event_("WRITE_CHAR");
      break;
    }
    case ESP_GATTC_READ_CHAR_EVT: {
      if (this->conn_id_ != param->read.conn_id)
        return false;
-      this->log_event_("ESP_GATTC_READ_CHAR_EVT");
+      this->log_gattc_event_("READ_CHAR");
      break;
    }
    case ESP_GATTC_NOTIFY_EVT: {
      if (this->conn_id_ != param->notify.conn_id)
        return false;
-      this->log_event_("ESP_GATTC_NOTIFY_EVT");
+      this->log_gattc_event_("NOTIFY");
      break;
    }
    case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
-      this->log_event_("ESP_GATTC_REG_FOR_NOTIFY_EVT");
+      this->log_gattc_event_("REG_FOR_NOTIFY");
      if (this->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE ||
          this->connection_type_ == espbt::ConnectionType::V3_WITHOUT_CACHE) {
        // Client is responsible for flipping the descriptor value
@@ -470,8 +451,7 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
      esp_gatt_status_t descr_status = esp_ble_gattc_get_descr_by_char_handle(
          this->gattc_if_, this->conn_id_, param->reg_for_notify.handle, NOTIFY_DESC_UUID, &desc_result, &count);
      if (descr_status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_get_descr_by_char_handle error, status=%d", this->connection_index_,
-                 this->address_str_.c_str(), descr_status);
+        this->log_gattc_warning_("esp_ble_gattc_get_descr_by_char_handle", descr_status);
        break;
      }
      esp_gattc_char_elem_t char_result;
@@ -479,8 +459,7 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
          esp_ble_gattc_get_all_char(this->gattc_if_, this->conn_id_, param->reg_for_notify.handle,
                                     param->reg_for_notify.handle, &char_result, &count, 0);
      if (char_status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_get_all_char error, status=%d", this->connection_index_,
-                 this->address_str_.c_str(), char_status);
+        this->log_gattc_warning_("esp_ble_gattc_get_all_char", char_status);
        break;
      }

@@ -494,8 +473,7 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
                                         (uint8_t *) &notify_en, ESP_GATT_WRITE_TYPE_RSP, ESP_GATT_AUTH_REQ_NONE);
      ESP_LOGD(TAG, "Wrote notify descriptor %d, properties=%d", notify_en, char_result.properties);
      if (status) {
-        ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_write_char_descr error, status=%d", this->connection_index_,
-                 this->address_str_.c_str(), status);
+        this->log_gattc_warning_("esp_ble_gattc_write_char_descr", status);
      }
      break;
    }
@@ -603,6 +581,7 @@ float BLEClientBase::parse_char_value(uint8_t *value, uint16_t length) {
  return NAN;
 }

+#ifdef USE_ESP32_BLE_DEVICE
 BLEService *BLEClientBase::get_service(espbt::ESPBTUUID uuid) {
  for (auto *svc : this->services_) {
    if (svc->uuid == uuid)
@@ -679,8 +658,8 @@ BLEDescriptor *BLEClientBase::get_descriptor(uint16_t handle) {
  }
  return nullptr;
 }
+#endif  // USE_ESP32_BLE_DEVICE

-}  // namespace esp32_ble_client
-}  // namespace esphome
+}  // namespace esphome::esp32_ble_client

 #endif  // USE_ESP32
--- a/esphome/components/esp32_ble_client/ble_client_base.h
+++ b/esphome/components/esp32_ble_client/ble_client_base.h
@@ -5,7 +5,9 @@
 #include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
 #include "esphome/core/component.h"

+#ifdef USE_ESP32_BLE_DEVICE
 #include "ble_service.h"
+#endif

 #include <array>
 #include <string>
@@ -16,8 +18,7 @@
 #include <esp_gatt_common_api.h>
 #include <esp_gattc_api.h>

-namespace esphome {
-namespace esp32_ble_client {
+namespace esphome::esp32_ble_client {

 namespace espbt = esphome::esp32_ble_tracker;

@@ -66,8 +67,9 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {
                       (uint8_t) (this->address_ >> 0) & 0xff);
    }
  }
-  std::string address_str() const { return this->address_str_; }
+  const std::string &address_str() const { return this->address_str_; }

+#ifdef USE_ESP32_BLE_DEVICE
  BLEService *get_service(espbt::ESPBTUUID uuid);
  BLEService *get_service(uint16_t uuid);
  BLECharacteristic *get_characteristic(espbt::ESPBTUUID service, espbt::ESPBTUUID chr);
@@ -78,6 +80,7 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {
  BLEDescriptor *get_descriptor(uint16_t handle);
  // Get the configuration descriptor for the given characteristic handle.
  BLEDescriptor *get_config_descriptor(uint16_t handle);
+#endif

  float parse_char_value(uint8_t *value, uint16_t length);

@@ -104,7 +107,9 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {

  // Group 2: Container types (grouped for memory optimization)
  std::string address_str_{};
+#ifdef USE_ESP32_BLE_DEVICE
  std::vector<BLEService *> services_;
+#endif

  // Group 3: 4-byte types
  int gattc_if_;
@@ -127,9 +132,13 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {
  // 6 bytes used, 2 bytes padding

  void log_event_(const char *name);
+  void log_gattc_event_(const char *name);
+  void restore_medium_conn_params_();
+  void log_gattc_warning_(const char *operation, esp_gatt_status_t status);
+  void log_gattc_warning_(const char *operation, esp_err_t err);
+  void log_connection_params_(const char *param_type);
 };

-}  // namespace esp32_ble_client
-}  // namespace esphome
+}  // namespace esphome::esp32_ble_client

 #endif  // USE_ESP32
--- a/esphome/components/esp32_ble_client/ble_descriptor.h
+++ b/esphome/components/esp32_ble_client/ble_descriptor.h
@@ -1,11 +1,13 @@
 #pragma once

+#include "esphome/core/defines.h"
+
 #ifdef USE_ESP32
+#ifdef USE_ESP32_BLE_DEVICE

 #include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"

-namespace esphome {
-namespace esp32_ble_client {
+namespace esphome::esp32_ble_client {

 namespace espbt = esphome::esp32_ble_tracker;

@@ -19,7 +21,7 @@ class BLEDescriptor {
  BLECharacteristic *characteristic;
 };

-}  // namespace esp32_ble_client
-}  // namespace esphome
+}  // namespace esphome::esp32_ble_client

+#endif  // USE_ESP32_BLE_DEVICE
 #endif  // USE_ESP32
--- a/esphome/components/esp32_ble_client/ble_service.cpp
+++ b/esphome/components/esp32_ble_client/ble_service.cpp
@@ -4,9 +4,9 @@
 #include "esphome/core/log.h"

 #ifdef USE_ESP32
+#ifdef USE_ESP32_BLE_DEVICE

-namespace esphome {
-namespace esp32_ble_client {
+namespace esphome::esp32_ble_client {

 static const char *const TAG = "esp32_ble_client";

@@ -71,7 +71,7 @@ void BLEService::parse_characteristics() {
  }
 }

-}  // namespace esp32_ble_client
-}  // namespace esphome
+}  // namespace esphome::esp32_ble_client

+#endif  // USE_ESP32_BLE_DEVICE
 #endif  // USE_ESP32
--- a/esphome/components/esp32_ble_client/ble_service.h
+++ b/esphome/components/esp32_ble_client/ble_service.h
@@ -1,6 +1,9 @@
 #pragma once

+#include "esphome/core/defines.h"
+
 #ifdef USE_ESP32
+#ifdef USE_ESP32_BLE_DEVICE

 #include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"

@@ -8,8 +11,7 @@

 #include <vector>

-namespace esphome {
-namespace esp32_ble_client {
+namespace esphome::esp32_ble_client {

 namespace espbt = esphome::esp32_ble_tracker;

@@ -30,7 +32,7 @@ class BLEService {
  BLECharacteristic *get_characteristic(uint16_t uuid);
 };

-}  // namespace esp32_ble_client
-}  // namespace esphome
+}  // namespace esphome::esp32_ble_client

+#endif  // USE_ESP32_BLE_DEVICE
 #endif  // USE_ESP32
--- a/esphome/components/esp32_ble_server/init.py
+++ b/esphome/components/esp32_ble_server/init.py
@@ -529,6 +529,7 @@ async def to_code_characteristic(service_var, char_conf):
 async def to_code(config):
    # Register the loggers this component needs
    esp32_ble.register_bt_logger(BTLoggers.GATT, BTLoggers.SMP)
+    cg.add_define("USE_ESP32_BLE_UUID")

    var = cg.new_Pvariable(config[CONF_ID])

@@ -571,6 +572,7 @@ async def to_code(config):
            config[CONF_ON_DISCONNECT],
        )
    cg.add_define("USE_ESP32_BLE_SERVER")
+    cg.add_define("USE_ESP32_BLE_ADVERTISING")
    if CORE.using_esp_idf:
        add_idf_sdkconfig_option("CONFIG_BT_ENABLED", True)

--- a/esphome/components/esp32_ble_tracker/init.py
+++ b/esphome/components/esp32_ble_tracker/init.py
@@ -36,6 +36,7 @@ from esphome.types import ConfigType

 AUTO_LOAD = ["esp32_ble"]
 DEPENDENCIES = ["esp32"]
+CODEOWNERS = ["@bdraco"]

 KEY_ESP32_BLE_TRACKER = "esp32_ble_tracker"
 KEY_USED_CONNECTION_SLOTS = "used_connection_slots"
@@ -354,11 +355,6 @@ async def to_code(config):
        add_idf_sdkconfig_option(
            "CONFIG_BTDM_CTRL_BLE_MAX_CONN", config[CONF_MAX_CONNECTIONS]
        )
-        # CONFIG_BT_GATTC_NOTIF_REG_MAX controls the number of
-        # max notifications in 5.x, setting CONFIG_BT_ACL_CONNECTIONS
-        # is enough in 4.x
-        # https://github.com/esphome/issues/issues/6808
-        add_idf_sdkconfig_option("CONFIG_BT_GATTC_NOTIF_REG_MAX", 9)

    cg.add_define("USE_OTA_STATE_CALLBACK")  # To be notified when an OTA update starts
    cg.add_define("USE_ESP32_BLE_CLIENT")
@@ -377,6 +373,7 @@ async def _add_ble_features():
    # Add feature-specific defines based on what's needed
    if BLEFeatures.ESP_BT_DEVICE in _required_features:
        cg.add_define("USE_ESP32_BLE_DEVICE")
+        cg.add_define("USE_ESP32_BLE_UUID")


 ESP32_BLE_START_SCAN_ACTION_SCHEMA = cv.Schema(
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -41,6 +41,31 @@ static const char *const TAG = "esp32_ble_tracker";

 ESP32BLETracker *global_esp32_ble_tracker = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)

+const char *client_state_to_string(ClientState state) {
+  switch (state) {
+    case ClientState::INIT:
+      return "INIT";
+    case ClientState::DISCONNECTING:
+      return "DISCONNECTING";
+    case ClientState::IDLE:
+      return "IDLE";
+    case ClientState::SEARCHING:
+      return "SEARCHING";
+    case ClientState::DISCOVERED:
+      return "DISCOVERED";
+    case ClientState::READY_TO_CONNECT:
+      return "READY_TO_CONNECT";
+    case ClientState::CONNECTING:
+      return "CONNECTING";
+    case ClientState::CONNECTED:
+      return "CONNECTED";
+    case ClientState::ESTABLISHED:
+      return "ESTABLISHED";
+    default:
+      return "UNKNOWN";
+  }
+}
+
 float ESP32BLETracker::get_setup_priority() const { return setup_priority::AFTER_BLUETOOTH; }

 void ESP32BLETracker::setup() {
@@ -49,13 +74,6 @@ void ESP32BLETracker::setup() {
    ESP_LOGE(TAG, "BLE Tracker was marked failed by ESP32BLE");
    return;
  }
-  RAMAllocator<BLEScanResult> allocator;
-  this->scan_ring_buffer_ = allocator.allocate(SCAN_RESULT_BUFFER_SIZE);
-
-  if (this->scan_ring_buffer_ == nullptr) {
-    ESP_LOGE(TAG, "Could not allocate ring buffer for BLE Tracker!");
-    this->mark_failed();
-  }

  global_esp32_ble_tracker = this;

@@ -83,124 +101,49 @@ void ESP32BLETracker::loop() {
      this->start_scan();
    }
  }
-  int connecting = 0;
-  int discovered = 0;
-  int searching = 0;
-  int disconnecting = 0;
-  for (auto *client : this->clients_) {
-    switch (client->state()) {
-      case ClientState::DISCONNECTING:
-        disconnecting++;
-        break;
-      case ClientState::DISCOVERED:
-        discovered++;
-        break;
-      case ClientState::SEARCHING:
-        searching++;
-        break;
-      case ClientState::CONNECTING:
-      case ClientState::READY_TO_CONNECT:
-        connecting++;
-        break;
-      default:
-        break;
-    }
-  }
-  if (connecting != connecting_ || discovered != discovered_ || searching != searching_ ||
-      disconnecting != disconnecting_) {
-    connecting_ = connecting;
-    discovered_ = discovered;
-    searching_ = searching;
-    disconnecting_ = disconnecting;
-    ESP_LOGD(TAG, "connecting: %d, discovered: %d, searching: %d, disconnecting: %d", connecting_, discovered_,
-             searching_, disconnecting_);
-  }
-  bool promote_to_connecting = discovered && !searching && !connecting;

-  // Process scan results from lock-free SPSC ring buffer
-  // Consumer side: This runs in the main loop thread
+  // Check for scan timeout - moved here from scheduler to avoid false reboots
+  // when the loop is blocked
  if (this->scanner_state_ == ScannerState::RUNNING) {
-    // Load our own index with relaxed ordering (we're the only writer)
-    uint8_t read_idx = this->ring_read_index_.load(std::memory_order_relaxed);
-
-    // Load producer's index with acquire to see their latest writes
-    uint8_t write_idx = this->ring_write_index_.load(std::memory_order_acquire);
-
-    while (read_idx != write_idx) {
-      // Calculate how many contiguous results we can process in one batch
-      // If write > read: process all results from read to write
-      // If write <= read (wraparound): process from read to end of buffer first
-      size_t batch_size = (write_idx > read_idx) ? (write_idx - read_idx) : (SCAN_RESULT_BUFFER_SIZE - read_idx);
-
-      // Process the batch for raw advertisements
-      if (this->raw_advertisements_) {
-        for (auto *listener : this->listeners_) {
-          listener->parse_devices(&this->scan_ring_buffer_[read_idx], batch_size);
-        }
-        for (auto *client : this->clients_) {
-          client->parse_devices(&this->scan_ring_buffer_[read_idx], batch_size);
+    switch (this->scan_timeout_state_) {
+      case ScanTimeoutState::MONITORING: {
+        uint32_t now = App.get_loop_component_start_time();
+        uint32_t timeout_ms = this->scan_duration_ * 2000;
+        // Robust time comparison that handles rollover correctly
+        // This works because unsigned arithmetic wraps around predictably
+        if ((now - this->scan_start_time_) > timeout_ms) {
+          // First time we've seen the timeout exceeded - wait one more loop iteration
+          // This ensures all components have had a chance to process pending events
+          // This is because esp32_ble may not have run yet and called
+          // gap_scan_event_handler yet when the loop unblocks
+          ESP_LOGW(TAG, "Scan timeout exceeded");
+          this->scan_timeout_state_ = ScanTimeoutState::EXCEEDED_WAIT;
        }
+        break;
      }
+      case ScanTimeoutState::EXCEEDED_WAIT:
+        // We've waited at least one full loop iteration, and scan is still running
+        ESP_LOGE(TAG, "Scan never terminated, rebooting");
+        App.reboot();
+        break;

-      // Process individual results for parsed advertisements
-      if (this->parse_advertisements_) {
-#ifdef USE_ESP32_BLE_DEVICE
-        for (size_t i = 0; i < batch_size; i++) {
-          BLEScanResult &scan_result = this->scan_ring_buffer_[read_idx + i];
-          ESPBTDevice device;
-          device.parse_scan_rst(scan_result);
-
-          bool found = false;
-          for (auto *listener : this->listeners_) {
-            if (listener->parse_device(device))
-              found = true;
-          }
-
-          for (auto *client : this->clients_) {
-            if (client->parse_device(device)) {
-              found = true;
-              if (!connecting && client->state() == ClientState::DISCOVERED) {
-                promote_to_connecting = true;
-              }
-            }
-          }
-
-          if (!found && !this->scan_continuous_) {
-            this->print_bt_device_info(device);
-          }
-        }
-#endif  // USE_ESP32_BLE_DEVICE
-      }
-
-      // Update read index for entire batch
-      read_idx = (read_idx + batch_size) % SCAN_RESULT_BUFFER_SIZE;
-
-      // Store with release to ensure reads complete before index update
-      this->ring_read_index_.store(read_idx, std::memory_order_release);
-    }
-
-    // Log dropped results periodically
-    size_t dropped = this->scan_results_dropped_.exchange(0, std::memory_order_relaxed);
-    if (dropped > 0) {
-      ESP_LOGW(TAG, "Dropped %zu BLE scan results due to buffer overflow", dropped);
+      case ScanTimeoutState::INACTIVE:
+        // This case should be unreachable - scanner and timeout states are always synchronized
+        break;
    }
  }
+
+  ClientStateCounts counts = this->count_client_states_();
+  if (counts != this->client_state_counts_) {
+    this->client_state_counts_ = counts;
+    ESP_LOGD(TAG, "connecting: %d, discovered: %d, searching: %d, disconnecting: %d",
+             this->client_state_counts_.connecting, this->client_state_counts_.discovered,
+             this->client_state_counts_.searching, this->client_state_counts_.disconnecting);
+  }
+
  if (this->scanner_state_ == ScannerState::FAILED ||
      (this->scan_set_param_failed_ && this->scanner_state_ == ScannerState::RUNNING)) {
-    this->stop_scan_();
-    if (this->scan_start_fail_count_ == std::numeric_limits<uint8_t>::max()) {
-      ESP_LOGE(TAG, "Scan could not restart after %d attempts, rebooting to restore stack (IDF)",
-               std::numeric_limits<uint8_t>::max());
-      App.reboot();
-    }
-    if (this->scan_start_failed_) {
-      ESP_LOGE(TAG, "Scan start failed: %d", this->scan_start_failed_);
-      this->scan_start_failed_ = ESP_BT_STATUS_SUCCESS;
-    }
-    if (this->scan_set_param_failed_) {
-      ESP_LOGE(TAG, "Scan set param failed: %d", this->scan_set_param_failed_);
-      this->scan_set_param_failed_ = ESP_BT_STATUS_SUCCESS;
-    }
+    this->handle_scanner_failure_();
  }
  /*

@@ -215,13 +158,12 @@ void ESP32BLETracker::loop() {
    https://github.com/espressif/esp-idf/issues/6688

  */
-  if (this->scanner_state_ == ScannerState::IDLE && !connecting && !disconnecting && !promote_to_connecting) {
+  bool promote_to_connecting = counts.discovered && !counts.searching && !counts.connecting;
+
+  if (this->scanner_state_ == ScannerState::IDLE && !counts.connecting && !counts.disconnecting &&
+      !promote_to_connecting) {
 #ifdef USE_ESP32_BLE_SOFTWARE_COEXISTENCE
-    if (this->coex_prefer_ble_) {
-      this->coex_prefer_ble_ = false;
-      ESP_LOGD(TAG, "Setting coexistence preference to balanced.");
-      esp_coex_preference_set(ESP_COEX_PREFER_BALANCE);  // Reset to default
-    }
+    this->update_coex_preference_(false);
 #endif
    if (this->scan_continuous_) {
      this->start_scan_(false);  // first = false
@@ -229,31 +171,13 @@ void ESP32BLETracker::loop() {
  }
  // If there is a discovered client and no connecting
  // clients and no clients using the scanner to search for
-  // devices, then stop scanning and promote the discovered
-  // client to ready to connect.
+  // devices, then promote the discovered client to ready to connect.
+  // We check both RUNNING and IDLE states because:
+  // - RUNNING: gap_scan_event_handler initiates stop_scan_() but promotion can happen immediately
+  // - IDLE: Scanner has already stopped (naturally or by gap_scan_event_handler)
  if (promote_to_connecting &&
      (this->scanner_state_ == ScannerState::RUNNING || this->scanner_state_ == ScannerState::IDLE)) {
-    for (auto *client : this->clients_) {
-      if (client->state() == ClientState::DISCOVERED) {
-        if (this->scanner_state_ == ScannerState::RUNNING) {
-          ESP_LOGD(TAG, "Stopping scan to make connection");
-          this->stop_scan_();
-        } else if (this->scanner_state_ == ScannerState::IDLE) {
-          ESP_LOGD(TAG, "Promoting client to connect");
-          // We only want to promote one client at a time.
-          // once the scanner is fully stopped.
-#ifdef USE_ESP32_BLE_SOFTWARE_COEXISTENCE
-          ESP_LOGD(TAG, "Setting coexistence to Bluetooth to make connection.");
-          if (!this->coex_prefer_ble_) {
-            this->coex_prefer_ble_ = true;
-            esp_coex_preference_set(ESP_COEX_PREFER_BT);  // Prioritize Bluetooth
-          }
-#endif
-          client->set_state(ClientState::READY_TO_CONNECT);
-        }
-        break;
-      }
-    }
+    this->try_promote_discovered_clients_();
  }
 }

@@ -269,16 +193,11 @@ void ESP32BLETracker::ble_before_disabled_event_handler() { this->stop_scan_();

 void ESP32BLETracker::stop_scan_() {
  if (this->scanner_state_ != ScannerState::RUNNING && this->scanner_state_ != ScannerState::FAILED) {
-    if (this->scanner_state_ == ScannerState::IDLE) {
-      ESP_LOGE(TAG, "Scan is already stopped while trying to stop.");
-    } else if (this->scanner_state_ == ScannerState::STARTING) {
-      ESP_LOGE(TAG, "Scan is starting while trying to stop.");
-    } else if (this->scanner_state_ == ScannerState::STOPPING) {
-      ESP_LOGE(TAG, "Scan is already stopping while trying to stop.");
-    }
+    ESP_LOGE(TAG, "Cannot stop scan: %s", this->scanner_state_to_string_(this->scanner_state_));
    return;
  }
-  this->cancel_timeout("scan");
+  // Reset timeout state machine when stopping scan
+  this->scan_timeout_state_ = ScanTimeoutState::INACTIVE;
  this->set_scanner_state_(ScannerState::STOPPING);
  esp_err_t err = esp_ble_gap_stop_scanning();
  if (err != ESP_OK) {
@@ -293,15 +212,7 @@ void ESP32BLETracker::start_scan_(bool first) {
    return;
  }
  if (this->scanner_state_ != ScannerState::IDLE) {
-    if (this->scanner_state_ == ScannerState::STARTING) {
-      ESP_LOGE(TAG, "Cannot start scan while already starting.");
-    } else if (this->scanner_state_ == ScannerState::RUNNING) {
-      ESP_LOGE(TAG, "Cannot start scan while already running.");
-    } else if (this->scanner_state_ == ScannerState::STOPPING) {
-      ESP_LOGE(TAG, "Cannot start scan while already stopping.");
-    } else if (this->scanner_state_ == ScannerState::FAILED) {
-      ESP_LOGE(TAG, "Cannot start scan while already failed.");
-    }
+    this->log_unexpected_state_("start scan", ScannerState::IDLE);
    return;
  }
  this->set_scanner_state_(ScannerState::STARTING);
@@ -310,18 +221,19 @@ void ESP32BLETracker::start_scan_(bool first) {
    for (auto *listener : this->listeners_)
      listener->on_scan_end();
  }
+#ifdef USE_ESP32_BLE_DEVICE
  this->already_discovered_.clear();
+#endif
  this->scan_params_.scan_type = this->scan_active_ ? BLE_SCAN_TYPE_ACTIVE : BLE_SCAN_TYPE_PASSIVE;
  this->scan_params_.own_addr_type = BLE_ADDR_TYPE_PUBLIC;
  this->scan_params_.scan_filter_policy = BLE_SCAN_FILTER_ALLOW_ALL;
  this->scan_params_.scan_interval = this->scan_interval_;
  this->scan_params_.scan_window = this->scan_window_;

-  // Start timeout before scan is started. Otherwise scan never starts if any error.
-  this->set_timeout("scan", this->scan_duration_ * 2000, []() {
-    ESP_LOGE(TAG, "Scan never terminated, rebooting to restore stack (IDF)");
-    App.reboot();
-  });
+  // Start timeout monitoring in loop() instead of using scheduler
+  // This prevents false reboots when the loop is blocked
+  this->scan_start_time_ = App.get_loop_component_start_time();
+  this->scan_timeout_state_ = ScanTimeoutState::MONITORING;

  esp_err_t err = esp_ble_gap_set_scan_params(&this->scan_params_);
  if (err != ESP_OK) {
@@ -390,44 +302,23 @@ void ESP32BLETracker::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_ga

 void ESP32BLETracker::gap_scan_event_handler(const BLEScanResult &scan_result) {
  // Note: This handler is called from the main loop context via esp32_ble's event queue.
-  // However, we still use a lock-free ring buffer to batch results efficiently.
+  // We process advertisements immediately instead of buffering them.
  ESP_LOGV(TAG, "gap_scan_result - event %d", scan_result.search_evt);

  if (scan_result.search_evt == ESP_GAP_SEARCH_INQ_RES_EVT) {
-    // Ring buffer write (Producer side)
-    // Even though we're in the main loop, the ring buffer design allows efficient batching
-    // IMPORTANT: Only this thread writes to ring_write_index_
+    // Process the scan result immediately
+    bool found_discovered_client = this->process_scan_result_(scan_result);

-    // Load our own index with relaxed ordering (we're the only writer)
-    uint8_t write_idx = this->ring_write_index_.load(std::memory_order_relaxed);
-    uint8_t next_write_idx = (write_idx + 1) % SCAN_RESULT_BUFFER_SIZE;
-
-    // Load consumer's index with acquire to see their latest updates
-    uint8_t read_idx = this->ring_read_index_.load(std::memory_order_acquire);
-
-    // Check if buffer is full
-    if (next_write_idx != read_idx) {
-      // Write to ring buffer
-      this->scan_ring_buffer_[write_idx] = scan_result;
-
-      // Store with release to ensure the write is visible before index update
-      this->ring_write_index_.store(next_write_idx, std::memory_order_release);
-    } else {
-      // Buffer full, track dropped results
-      this->scan_results_dropped_.fetch_add(1, std::memory_order_relaxed);
+    // If we found a discovered client that needs promotion, stop scanning
+    // This replaces the promote_to_connecting logic from loop()
+    if (found_discovered_client && this->scanner_state_ == ScannerState::RUNNING) {
+      ESP_LOGD(TAG, "Found discovered client, stopping scan for connection");
+      this->stop_scan_();
    }
  } else if (scan_result.search_evt == ESP_GAP_SEARCH_INQ_CMPL_EVT) {
    // Scan finished on its own
    if (this->scanner_state_ != ScannerState::RUNNING) {
-      if (this->scanner_state_ == ScannerState::STOPPING) {
-        ESP_LOGE(TAG, "Scan was not running when scan completed.");
-      } else if (this->scanner_state_ == ScannerState::STARTING) {
-        ESP_LOGE(TAG, "Scan was not started when scan completed.");
-      } else if (this->scanner_state_ == ScannerState::FAILED) {
-        ESP_LOGE(TAG, "Scan was in failed state when scan completed.");
-      } else if (this->scanner_state_ == ScannerState::IDLE) {
-        ESP_LOGE(TAG, "Scan was idle when scan completed.");
-      }
+      this->log_unexpected_state_("scan complete", ScannerState::RUNNING);
    }
    // Scan completed naturally, perform cleanup and transition to IDLE
    this->cleanup_scan_state_(false);
@@ -449,15 +340,7 @@ void ESP32BLETracker::gap_scan_start_complete_(const esp_ble_gap_cb_param_t::ble
  ESP_LOGV(TAG, "gap_scan_start_complete - status %d", param.status);
  this->scan_start_failed_ = param.status;
  if (this->scanner_state_ != ScannerState::STARTING) {
-    if (this->scanner_state_ == ScannerState::RUNNING) {
-      ESP_LOGE(TAG, "Scan was already running when start complete.");
-    } else if (this->scanner_state_ == ScannerState::STOPPING) {
-      ESP_LOGE(TAG, "Scan was stopping when start complete.");
-    } else if (this->scanner_state_ == ScannerState::FAILED) {
-      ESP_LOGE(TAG, "Scan was in failed state when start complete.");
-    } else if (this->scanner_state_ == ScannerState::IDLE) {
-      ESP_LOGE(TAG, "Scan was idle when start complete.");
-    }
+    this->log_unexpected_state_("start complete", ScannerState::STARTING);
  }
  if (param.status == ESP_BT_STATUS_SUCCESS) {
    this->scan_start_fail_count_ = 0;
@@ -475,15 +358,7 @@ void ESP32BLETracker::gap_scan_stop_complete_(const esp_ble_gap_cb_param_t::ble_
  // This allows us to safely transition to IDLE state and perform cleanup without race conditions
  ESP_LOGV(TAG, "gap_scan_stop_complete - status %d", param.status);
  if (this->scanner_state_ != ScannerState::STOPPING) {
-    if (this->scanner_state_ == ScannerState::RUNNING) {
-      ESP_LOGE(TAG, "Scan was not running when stop complete.");
-    } else if (this->scanner_state_ == ScannerState::STARTING) {
-      ESP_LOGE(TAG, "Scan was not started when stop complete.");
-    } else if (this->scanner_state_ == ScannerState::FAILED) {
-      ESP_LOGE(TAG, "Scan was in failed state when stop complete.");
-    } else if (this->scanner_state_ == ScannerState::IDLE) {
-      ESP_LOGE(TAG, "Scan was idle when stop complete.");
-    }
+    this->log_unexpected_state_("stop complete", ScannerState::STOPPING);
  }

  // Perform cleanup and transition to IDLE
@@ -764,25 +639,10 @@ void ESP32BLETracker::dump_config() {
                "  Continuous Scanning: %s",
                this->scan_duration_, this->scan_interval_ * 0.625f, this->scan_window_ * 0.625f,
                this->scan_active_ ? "ACTIVE" : "PASSIVE", YESNO(this->scan_continuous_));
-  switch (this->scanner_state_) {
-    case ScannerState::IDLE:
-      ESP_LOGCONFIG(TAG, "  Scanner State: IDLE");
-      break;
-    case ScannerState::STARTING:
-      ESP_LOGCONFIG(TAG, "  Scanner State: STARTING");
-      break;
-    case ScannerState::RUNNING:
-      ESP_LOGCONFIG(TAG, "  Scanner State: RUNNING");
-      break;
-    case ScannerState::STOPPING:
-      ESP_LOGCONFIG(TAG, "  Scanner State: STOPPING");
-      break;
-    case ScannerState::FAILED:
-      ESP_LOGCONFIG(TAG, "  Scanner State: FAILED");
-      break;
-  }
-  ESP_LOGCONFIG(TAG, "  Connecting: %d, discovered: %d, searching: %d, disconnecting: %d", connecting_, discovered_,
-                searching_, disconnecting_);
+  ESP_LOGCONFIG(TAG, "  Scanner State: %s", this->scanner_state_to_string_(this->scanner_state_));
+  ESP_LOGCONFIG(TAG, "  Connecting: %d, discovered: %d, searching: %d, disconnecting: %d",
+                this->client_state_counts_.connecting, this->client_state_counts_.discovered,
+                this->client_state_counts_.searching, this->client_state_counts_.disconnecting);
  if (this->scan_start_fail_count_) {
    ESP_LOGCONFIG(TAG, "  Scan Start Fail Count: %d", this->scan_start_fail_count_);
  }
@@ -859,12 +719,73 @@ bool ESPBTDevice::resolve_irk(const uint8_t *irk) const {
  return ecb_ciphertext[15] == (addr64 & 0xff) && ecb_ciphertext[14] == ((addr64 >> 8) & 0xff) &&
         ecb_ciphertext[13] == ((addr64 >> 16) & 0xff);
 }
+
+bool ESP32BLETracker::has_connecting_clients_() const {
+  for (auto *client : this->clients_) {
+    auto state = client->state();
+    if (state == ClientState::CONNECTING || state == ClientState::READY_TO_CONNECT) {
+      return true;
+    }
+  }
+  return false;
+}
 #endif  // USE_ESP32_BLE_DEVICE

+bool ESP32BLETracker::process_scan_result_(const BLEScanResult &scan_result) {
+  bool found_discovered_client = false;
+
+  // Process raw advertisements
+  if (this->raw_advertisements_) {
+    for (auto *listener : this->listeners_) {
+      listener->parse_devices(&scan_result, 1);
+    }
+    for (auto *client : this->clients_) {
+      client->parse_devices(&scan_result, 1);
+    }
+  }
+
+  // Process parsed advertisements
+  if (this->parse_advertisements_) {
+#ifdef USE_ESP32_BLE_DEVICE
+    ESPBTDevice device;
+    device.parse_scan_rst(scan_result);
+
+    bool found = false;
+    for (auto *listener : this->listeners_) {
+      if (listener->parse_device(device))
+        found = true;
+    }
+
+    for (auto *client : this->clients_) {
+      if (client->parse_device(device)) {
+        found = true;
+        // Check if this client is discovered and needs promotion
+        if (client->state() == ClientState::DISCOVERED) {
+          // Only check for connecting clients if we found a discovered client
+          // This matches the original logic: !connecting && client->state() == DISCOVERED
+          if (!this->has_connecting_clients_()) {
+            found_discovered_client = true;
+          }
+        }
+      }
+    }
+
+    if (!found && !this->scan_continuous_) {
+      this->print_bt_device_info(device);
+    }
+#endif  // USE_ESP32_BLE_DEVICE
+  }
+
+  return found_discovered_client;
+}
+
 void ESP32BLETracker::cleanup_scan_state_(bool is_stop_complete) {
  ESP_LOGD(TAG, "Scan %scomplete, set scanner state to IDLE.", is_stop_complete ? "stop " : "");
+#ifdef USE_ESP32_BLE_DEVICE
  this->already_discovered_.clear();
-  this->cancel_timeout("scan");
+#endif
+  // Reset timeout state machine instead of cancelling scheduler timeout
+  this->scan_timeout_state_ = ScanTimeoutState::INACTIVE;

  for (auto *listener : this->listeners_)
    listener->on_scan_end();
@@ -872,6 +793,84 @@ void ESP32BLETracker::cleanup_scan_state_(bool is_stop_complete) {
  this->set_scanner_state_(ScannerState::IDLE);
 }

+void ESP32BLETracker::handle_scanner_failure_() {
+  this->stop_scan_();
+  if (this->scan_start_fail_count_ == std::numeric_limits<uint8_t>::max()) {
+    ESP_LOGE(TAG, "Scan could not restart after %d attempts, rebooting to restore stack (IDF)",
+             std::numeric_limits<uint8_t>::max());
+    App.reboot();
+  }
+  if (this->scan_start_failed_) {
+    ESP_LOGE(TAG, "Scan start failed: %d", this->scan_start_failed_);
+    this->scan_start_failed_ = ESP_BT_STATUS_SUCCESS;
+  }
+  if (this->scan_set_param_failed_) {
+    ESP_LOGE(TAG, "Scan set param failed: %d", this->scan_set_param_failed_);
+    this->scan_set_param_failed_ = ESP_BT_STATUS_SUCCESS;
+  }
+}
+
+void ESP32BLETracker::try_promote_discovered_clients_() {
+  // Only promote the first discovered client to avoid multiple simultaneous connections
+  for (auto *client : this->clients_) {
+    if (client->state() != ClientState::DISCOVERED) {
+      continue;
+    }
+
+    if (this->scanner_state_ == ScannerState::RUNNING) {
+      ESP_LOGD(TAG, "Stopping scan to make connection");
+      this->stop_scan_();
+      // Don't wait for scan stop complete - promote immediately.
+      // This is safe because ESP-IDF processes BLE commands sequentially through its internal mailbox queue.
+      // This guarantees that the stop scan command will be fully processed before any subsequent connect command,
+      // preventing race conditions or overlapping operations.
+    }
+
+    ESP_LOGD(TAG, "Promoting client to connect");
+#ifdef USE_ESP32_BLE_SOFTWARE_COEXISTENCE
+    this->update_coex_preference_(true);
+#endif
+    client->set_state(ClientState::READY_TO_CONNECT);
+    break;
+  }
+}
+
+const char *ESP32BLETracker::scanner_state_to_string_(ScannerState state) const {
+  switch (state) {
+    case ScannerState::IDLE:
+      return "IDLE";
+    case ScannerState::STARTING:
+      return "STARTING";
+    case ScannerState::RUNNING:
+      return "RUNNING";
+    case ScannerState::STOPPING:
+      return "STOPPING";
+    case ScannerState::FAILED:
+      return "FAILED";
+    default:
+      return "UNKNOWN";
+  }
+}
+
+void ESP32BLETracker::log_unexpected_state_(const char *operation, ScannerState expected_state) const {
+  ESP_LOGE(TAG, "Unexpected state: %s on %s, expected: %s", this->scanner_state_to_string_(this->scanner_state_),
+           operation, this->scanner_state_to_string_(expected_state));
+}
+
+#ifdef USE_ESP32_BLE_SOFTWARE_COEXISTENCE
+void ESP32BLETracker::update_coex_preference_(bool force_ble) {
+  if (force_ble && !this->coex_prefer_ble_) {
+    ESP_LOGD(TAG, "Setting coexistence to Bluetooth to make connection.");
+    this->coex_prefer_ble_ = true;
+    esp_coex_preference_set(ESP_COEX_PREFER_BT);  // Prioritize Bluetooth
+  } else if (!force_ble && this->coex_prefer_ble_) {
+    ESP_LOGD(TAG, "Setting coexistence preference to balanced.");
+    this->coex_prefer_ble_ = false;
+    esp_coex_preference_set(ESP_COEX_PREFER_BALANCE);  // Reset to default
+  }
+}
+#endif
+
 }  // namespace esphome::esp32_ble_tracker

 #endif  // USE_ESP32
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -6,7 +6,6 @@
 #include "esphome/core/helpers.h"

 #include <array>
-#include <atomic>
 #include <string>
 #include <vector>

@@ -21,6 +20,7 @@

 #include "esphome/components/esp32_ble/ble.h"
 #include "esphome/components/esp32_ble/ble_uuid.h"
+#include "esphome/components/esp32_ble/ble_scan_result.h"

 namespace esphome::esp32_ble_tracker {

@@ -33,10 +33,12 @@ enum AdvertisementParserType {
  RAW_ADVERTISEMENTS,
 };

+#ifdef USE_ESP32_BLE_UUID
 struct ServiceData {
  ESPBTUUID uuid;
  adv_data_t data;
 };
+#endif

 #ifdef USE_ESP32_BLE_DEVICE
 class ESPBLEiBeacon {
@@ -136,6 +138,20 @@ class ESPBTDeviceListener {
  ESP32BLETracker *parent_{nullptr};
 };

+struct ClientStateCounts {
+  uint8_t connecting = 0;
+  uint8_t discovered = 0;
+  uint8_t searching = 0;
+  uint8_t disconnecting = 0;
+
+  bool operator==(const ClientStateCounts &other) const {
+    return connecting == other.connecting && discovered == other.discovered && searching == other.searching &&
+           disconnecting == other.disconnecting;
+  }
+
+  bool operator!=(const ClientStateCounts &other) const { return !(*this == other); }
+};
+
 enum class ClientState : uint8_t {
  // Connection is allocated
  INIT,
@@ -170,6 +186,9 @@ enum class ScannerState {
  STOPPING,
 };

+// Helper function to convert ClientState to string
+const char *client_state_to_string(ClientState state);
+
 enum class ConnectionType : uint8_t {
  // The default connection type, we hold all the services in ram
  // for the duration of the connection.
@@ -272,47 +291,92 @@ class ESP32BLETracker : public Component,
  void set_scanner_state_(ScannerState state);
  /// Common cleanup logic when transitioning scanner to IDLE state
  void cleanup_scan_state_(bool is_stop_complete);
+  /// Process a single scan result immediately
+  /// Returns true if a discovered client needs promotion to READY_TO_CONNECT
+  bool process_scan_result_(const BLEScanResult &scan_result);
+#ifdef USE_ESP32_BLE_DEVICE
+  /// Check if any clients are in connecting or ready to connect state
+  bool has_connecting_clients_() const;
+#endif
+  /// Handle scanner failure states
+  void handle_scanner_failure_();
+  /// Try to promote discovered clients to ready to connect
+  void try_promote_discovered_clients_();
+  /// Convert scanner state enum to string for logging
+  const char *scanner_state_to_string_(ScannerState state) const;
+  /// Log an unexpected scanner state
+  void log_unexpected_state_(const char *operation, ScannerState expected_state) const;
+#ifdef USE_ESP32_BLE_SOFTWARE_COEXISTENCE
+  /// Update BLE coexistence preference
+  void update_coex_preference_(bool force_ble);
+#endif
+  /// Count clients in each state
+  ClientStateCounts count_client_states_() const {
+    ClientStateCounts counts;
+    for (auto *client : this->clients_) {
+      switch (client->state()) {
+        case ClientState::DISCONNECTING:
+          counts.disconnecting++;
+          break;
+        case ClientState::DISCOVERED:
+          counts.discovered++;
+          break;
+        case ClientState::SEARCHING:
+          counts.searching++;
+          break;
+        case ClientState::CONNECTING:
+        case ClientState::READY_TO_CONNECT:
+          counts.connecting++;
+          break;
+        default:
+          break;
+      }
+    }
+    return counts;
+  }

-  uint8_t app_id_{0};
-
+  // Group 1: Large objects (12+ bytes) - vectors and callback manager
+  std::vector<ESPBTDeviceListener *> listeners_;
+  std::vector<ESPBTClient *> clients_;
+  CallbackManager<void(ScannerState)> scanner_state_callbacks_;
+#ifdef USE_ESP32_BLE_DEVICE
  /// Vector of addresses that have already been printed in print_bt_device_info
  std::vector<uint64_t> already_discovered_;
-  std::vector<ESPBTDeviceListener *> listeners_;
-  /// Client parameters.
-  std::vector<ESPBTClient *> clients_;
+#endif
+
+  // Group 2: Structs (aligned to 4 bytes)
  /// A structure holding the ESP BLE scan parameters.
  esp_ble_scan_params_t scan_params_;
+  ClientStateCounts client_state_counts_;
+
+  // Group 3: 4-byte types
  /// The interval in seconds to perform scans.
  uint32_t scan_duration_;
  uint32_t scan_interval_;
  uint32_t scan_window_;
+  esp_bt_status_t scan_start_failed_{ESP_BT_STATUS_SUCCESS};
+  esp_bt_status_t scan_set_param_failed_{ESP_BT_STATUS_SUCCESS};
+
+  // Group 4: 1-byte types (enums, uint8_t, bool)
+  uint8_t app_id_{0};
  uint8_t scan_start_fail_count_{0};
+  ScannerState scanner_state_{ScannerState::IDLE};
  bool scan_continuous_;
  bool scan_active_;
-  ScannerState scanner_state_{ScannerState::IDLE};
-  CallbackManager<void(ScannerState)> scanner_state_callbacks_;
  bool ble_was_disabled_{true};
  bool raw_advertisements_{false};
  bool parse_advertisements_{false};
-
-  // Lock-free Single-Producer Single-Consumer (SPSC) ring buffer for scan results
-  // Producer: ESP-IDF Bluetooth stack callback (gap_scan_event_handler)
-  // Consumer: ESPHome main loop (loop() method)
-  // This design ensures zero blocking in the BT callback and prevents scan result loss
-  BLEScanResult *scan_ring_buffer_;
-  std::atomic<uint8_t> ring_write_index_{0};       // Written only by BT callback (producer)
-  std::atomic<uint8_t> ring_read_index_{0};        // Written only by main loop (consumer)
-  std::atomic<uint16_t> scan_results_dropped_{0};  // Tracks buffer overflow events
-
-  esp_bt_status_t scan_start_failed_{ESP_BT_STATUS_SUCCESS};
-  esp_bt_status_t scan_set_param_failed_{ESP_BT_STATUS_SUCCESS};
-  int connecting_{0};
-  int discovered_{0};
-  int searching_{0};
-  int disconnecting_{0};
 #ifdef USE_ESP32_BLE_SOFTWARE_COEXISTENCE
  bool coex_prefer_ble_{false};
 #endif
+  // Scan timeout state machine
+  enum class ScanTimeoutState : uint8_t {
+    INACTIVE,       // No timeout monitoring
+    MONITORING,     // Actively monitoring for timeout
+    EXCEEDED_WAIT,  // Timeout exceeded, waiting one loop before reboot
+  };
+  uint32_t scan_start_time_{0};
+  ScanTimeoutState scan_timeout_state_{ScanTimeoutState::INACTIVE};
 };

 // NOLINTNEXTLINE
--- a/esphome/components/esp32_camera/init.py
+++ b/esphome/components/esp32_camera/init.py
@@ -345,7 +345,7 @@ async def to_code(config):
    cg.add_define("USE_CAMERA")

    if CORE.using_esp_idf:
-        add_idf_component(name="espressif/esp32-camera", ref="2.1.0")
+        add_idf_component(name="espressif/esp32-camera", ref="2.1.1")

    for conf in config.get(CONF_ON_STREAM_START, []):
        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
--- a/esphome/components/esp32_dac/esp32_dac.cpp
+++ b/esphome/components/esp32_dac/esp32_dac.cpp
@@ -2,11 +2,7 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"

-#ifdef USE_ESP32
-
-#ifdef USE_ARDUINO
-#include <esp32-hal-dac.h>
-#endif
+#if defined(USE_ESP32_VARIANT_ESP32) || defined(USE_ESP32_VARIANT_ESP32S2)

 namespace esphome {
 namespace esp32_dac {
@@ -23,18 +19,12 @@ void ESP32DAC::setup() {
  this->pin_->setup();
  this->turn_off();

-#ifdef USE_ESP_IDF
  const dac_channel_t channel = this->pin_->get_pin() == DAC0_PIN ? DAC_CHAN_0 : DAC_CHAN_1;
  const dac_oneshot_config_t oneshot_cfg{channel};
  dac_oneshot_new_channel(&oneshot_cfg, &this->dac_handle_);
-#endif
 }

-void ESP32DAC::on_safe_shutdown() {
-#ifdef USE_ESP_IDF
-  dac_oneshot_del_channel(this->dac_handle_);
-#endif
-}
+void ESP32DAC::on_safe_shutdown() { dac_oneshot_del_channel(this->dac_handle_); }

 void ESP32DAC::dump_config() {
  ESP_LOGCONFIG(TAG, "ESP32 DAC:");
@@ -48,15 +38,10 @@ void ESP32DAC::write_state(float state) {

  state = state * 255;

-#ifdef USE_ESP_IDF
  dac_oneshot_output_voltage(this->dac_handle_, state);
-#endif
-#ifdef USE_ARDUINO
-  dacWrite(this->pin_->get_pin(), state);
-#endif
 }

 }  // namespace esp32_dac
 }  // namespace esphome

-#endif
+#endif  // USE_ESP32_VARIANT_ESP32 || USE_ESP32_VARIANT_ESP32S2
--- a/esphome/components/esp32_dac/esp32_dac.h
+++ b/esphome/components/esp32_dac/esp32_dac.h
@@ -1,15 +1,13 @@
 #pragma once

+#include "esphome/components/output/float_output.h"
+#include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 #include "esphome/core/hal.h"
-#include "esphome/core/automation.h"
-#include "esphome/components/output/float_output.h"

-#ifdef USE_ESP32
+#if defined(USE_ESP32_VARIANT_ESP32) || defined(USE_ESP32_VARIANT_ESP32S2)

-#ifdef USE_ESP_IDF
 #include <driver/dac_oneshot.h>
-#endif

 namespace esphome {
 namespace esp32_dac {
@@ -29,12 +27,10 @@ class ESP32DAC : public output::FloatOutput, public Component {
  void write_state(float state) override;

  InternalGPIOPin *pin_;
-#ifdef USE_ESP_IDF
  dac_oneshot_handle_t dac_handle_;
-#endif
 };

 }  // namespace esp32_dac
 }  // namespace esphome

-#endif
+#endif  // USE_ESP32_VARIANT_ESP32 || USE_ESP32_VARIANT_ESP32S2
--- a/esphome/components/esp32_rmt_led_strip/led_strip.cpp
+++ b/esphome/components/esp32_rmt_led_strip/led_strip.cpp
@@ -42,9 +42,6 @@ static size_t IRAM_ATTR HOT encoder_callback(const void *data, size_t size, size
        symbols[i] = params->bit0;
      }
    }
-    if ((index + 1) >= size && params->reset.duration0 == 0 && params->reset.duration1 == 0) {
-      *done = true;
-    }
    return RMT_SYMBOLS_PER_BYTE;
  }

@@ -110,7 +107,7 @@ void ESP32RMTLEDStripLightOutput::setup() {
  memset(&encoder, 0, sizeof(encoder));
  encoder.callback = encoder_callback;
  encoder.arg = &this->params_;
-  encoder.min_chunk_size = 8;
+  encoder.min_chunk_size = RMT_SYMBOLS_PER_BYTE;
  if (rmt_new_simple_encoder(&encoder, &this->encoder_) != ESP_OK) {
    ESP_LOGE(TAG, "Encoder creation failed");
    this->mark_failed();
--- a/esphome/components/esp32_touch/esp32_touch.h
+++ b/esphome/components/esp32_touch/esp32_touch.h
@@ -171,8 +171,8 @@ class ESP32TouchComponent : public Component {
  // based on the filter configuration
  uint32_t read_touch_value(touch_pad_t pad) const;

-  // Helper to update touch state with a known state
-  void update_touch_state_(ESP32TouchBinarySensor *child, bool is_touched);
+  // Helper to update touch state with a known state and value
+  void update_touch_state_(ESP32TouchBinarySensor *child, bool is_touched, uint32_t value);

  // Helper to read touch value and update state for a given child
  bool check_and_update_touch_state_(ESP32TouchBinarySensor *child);
@@ -234,9 +234,13 @@ class ESP32TouchBinarySensor : public binary_sensor::BinarySensor {
  touch_pad_t get_touch_pad() const { return this->touch_pad_; }
  uint32_t get_threshold() const { return this->threshold_; }
  void set_threshold(uint32_t threshold) { this->threshold_ = threshold; }
-#ifdef USE_ESP32_VARIANT_ESP32
+
+  /// Get the raw touch measurement value.
+  /// @note Although this method may appear unused within the component, it is a public API
+  /// used by lambdas in user configurations for custom touch value processing.
+  /// @return The current raw touch sensor reading
  uint32_t get_value() const { return this->value_; }
-#endif
+
  uint32_t get_wakeup_threshold() const { return this->wakeup_threshold_; }

 protected:
@@ -245,9 +249,8 @@ class ESP32TouchBinarySensor : public binary_sensor::BinarySensor {
  touch_pad_t touch_pad_{TOUCH_PAD_MAX};
  uint32_t threshold_{0};
  uint32_t benchmark_{};
-#ifdef USE_ESP32_VARIANT_ESP32
+  /// Stores the last raw touch measurement value.
  uint32_t value_{0};
-#endif
  bool last_state_{false};
  const uint32_t wakeup_threshold_{0};

--- a/esphome/components/esp32_touch/esp32_touch_common.cpp
+++ b/esphome/components/esp32_touch/esp32_touch_common.cpp
@@ -100,6 +100,8 @@ void ESP32TouchComponent::process_setup_mode_logging_(uint32_t now) {
 #else
      // Read the value being used for touch detection
      uint32_t value = this->read_touch_value(child->get_touch_pad());
+      // Store the value for get_value() access in lambdas
+      child->value_ = value;
      ESP_LOGD(TAG, "Touch Pad '%s' (T%d): %d", child->get_name().c_str(), child->get_touch_pad(), value);
 #endif
    }
--- a/esphome/components/esp32_touch/esp32_touch_v2.cpp
+++ b/esphome/components/esp32_touch/esp32_touch_v2.cpp
@@ -10,8 +10,11 @@ namespace esp32_touch {

 static const char *const TAG = "esp32_touch";

-// Helper to update touch state with a known state
-void ESP32TouchComponent::update_touch_state_(ESP32TouchBinarySensor *child, bool is_touched) {
+// Helper to update touch state with a known state and value
+void ESP32TouchComponent::update_touch_state_(ESP32TouchBinarySensor *child, bool is_touched, uint32_t value) {
+  // Store the value for get_value() access in lambdas
+  child->value_ = value;
+
  // Always update timer when touched
  if (is_touched) {
    child->last_touch_time_ = App.get_loop_component_start_time();
@@ -21,9 +24,8 @@ void ESP32TouchComponent::update_touch_state_(ESP32TouchBinarySensor *child, boo
    child->last_state_ = is_touched;
    child->publish_state(is_touched);
    if (is_touched) {
-      // ESP32-S2/S3 v2: touched when value > threshold
      ESP_LOGV(TAG, "Touch Pad '%s' state: ON (value: %" PRIu32 " > threshold: %" PRIu32 ")", child->get_name().c_str(),
-               this->read_touch_value(child->touch_pad_), child->threshold_ + child->benchmark_);
+               value, child->threshold_ + child->benchmark_);
    } else {
      ESP_LOGV(TAG, "Touch Pad '%s' state: OFF", child->get_name().c_str());
    }
@@ -41,7 +43,7 @@ bool ESP32TouchComponent::check_and_update_touch_state_(ESP32TouchBinarySensor *
           child->get_name().c_str(), child->touch_pad_, value, child->threshold_, child->benchmark_);
  bool is_touched = value > child->benchmark_ + child->threshold_;

-  this->update_touch_state_(child, is_touched);
+  this->update_touch_state_(child, is_touched, value);
  return is_touched;
 }

@@ -296,7 +298,9 @@ void ESP32TouchComponent::loop() {
          this->check_and_update_touch_state_(child);
        } else if (event.intr_mask & TOUCH_PAD_INTR_MASK_ACTIVE) {
          // We only get ACTIVE interrupts now, releases are detected by timeout
-          this->update_touch_state_(child, true);  // Always touched for ACTIVE interrupts
+          // Read the current value
+          uint32_t value = this->read_touch_value(child->touch_pad_);
+          this->update_touch_state_(child, true, value);  // Always touched for ACTIVE interrupts
        }
        break;
      }
--- a/esphome/components/esphome/ota/ota_esphome.cpp
+++ b/esphome/components/esphome/ota/ota_esphome.cpp
@@ -19,7 +19,9 @@
 namespace esphome {

 static const char *const TAG = "esphome.ota";
-static constexpr u_int16_t OTA_BLOCK_SIZE = 8192;
+static constexpr uint16_t OTA_BLOCK_SIZE = 8192;
+static constexpr uint32_t OTA_SOCKET_TIMEOUT_HANDSHAKE = 10000;  // milliseconds for initial handshake
+static constexpr uint32_t OTA_SOCKET_TIMEOUT_DATA = 90000;       // milliseconds for data transfer

 void ESPHomeOTAComponent::setup() {
 #ifdef USE_OTA_STATE_CALLBACK
@@ -28,19 +30,19 @@ void ESPHomeOTAComponent::setup() {

  this->server_ = socket::socket_ip_loop_monitored(SOCK_STREAM, 0);  // monitored for incoming connections
  if (this->server_ == nullptr) {
-    ESP_LOGW(TAG, "Could not create socket");
+    this->log_socket_error_("creation");
    this->mark_failed();
    return;
  }
  int enable = 1;
  int err = this->server_->setsockopt(SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int));
  if (err != 0) {
-    ESP_LOGW(TAG, "Socket unable to set reuseaddr: errno %d", err);
+    this->log_socket_error_("reuseaddr");
    // we can still continue
  }
  err = this->server_->setblocking(false);
  if (err != 0) {
-    ESP_LOGW(TAG, "Socket unable to set nonblocking mode: errno %d", err);
+    this->log_socket_error_("non-blocking");
    this->mark_failed();
    return;
  }
@@ -49,21 +51,21 @@ void ESPHomeOTAComponent::setup() {

  socklen_t sl = socket::set_sockaddr_any((struct sockaddr *) &server, sizeof(server), this->port_);
  if (sl == 0) {
-    ESP_LOGW(TAG, "Socket unable to set sockaddr: errno %d", errno);
+    this->log_socket_error_("set sockaddr");
    this->mark_failed();
    return;
  }

  err = this->server_->bind((struct sockaddr *) &server, sizeof(server));
  if (err != 0) {
-    ESP_LOGW(TAG, "Socket unable to bind: errno %d", errno);
+    this->log_socket_error_("bind");
    this->mark_failed();
    return;
  }

  err = this->server_->listen(4);
  if (err != 0) {
-    ESP_LOGW(TAG, "Socket unable to listen: errno %d", errno);
+    this->log_socket_error_("listen");
    this->mark_failed();
    return;
  }
@@ -83,17 +85,93 @@ void ESPHomeOTAComponent::dump_config() {
 }

 void ESPHomeOTAComponent::loop() {
-  // Skip handle_() call if no client connected and no incoming connections
+  // Skip handle_handshake_() call if no client connected and no incoming connections
  // This optimization reduces idle loop overhead when OTA is not active
-  // Note: No need to check server_ for null as the component is marked failed in setup() if server_ creation fails
+  // Note: No need to check server_ for null as the component is marked failed in setup()
+  // if server_ creation fails
  if (this->client_ != nullptr || this->server_->ready()) {
-    this->handle_();
+    this->handle_handshake_();
  }
 }

 static const uint8_t FEATURE_SUPPORTS_COMPRESSION = 0x01;

-void ESPHomeOTAComponent::handle_() {
+void ESPHomeOTAComponent::handle_handshake_() {
+  /// Handle the initial OTA handshake.
+  ///
+  /// This method is non-blocking and will return immediately if no data is available.
+  /// It waits for the first magic byte (0x6C) before proceeding to handle_data_().
+  /// A 10-second timeout is enforced from initial connection.
+
+  if (this->client_ == nullptr) {
+    // We already checked server_->ready() in loop(), so we can accept directly
+    struct sockaddr_storage source_addr;
+    socklen_t addr_len = sizeof(source_addr);
+    int enable = 1;
+
+    this->client_ = this->server_->accept_loop_monitored((struct sockaddr *) &source_addr, &addr_len);
+    if (this->client_ == nullptr)
+      return;
+    int err = this->client_->setsockopt(IPPROTO_TCP, TCP_NODELAY, &enable, sizeof(int));
+    if (err != 0) {
+      this->log_socket_error_("nodelay");
+      this->cleanup_connection_();
+      return;
+    }
+    err = this->client_->setblocking(false);
+    if (err != 0) {
+      this->log_socket_error_("non-blocking");
+      this->cleanup_connection_();
+      return;
+    }
+    this->log_start_("handshake");
+    this->client_connect_time_ = App.get_loop_component_start_time();
+  }
+
+  // Check for handshake timeout
+  uint32_t now = App.get_loop_component_start_time();
+  if (now - this->client_connect_time_ > OTA_SOCKET_TIMEOUT_HANDSHAKE) {
+    ESP_LOGW(TAG, "Handshake timeout");
+    this->cleanup_connection_();
+    return;
+  }
+
+  // Try to read first byte of magic bytes
+  uint8_t first_byte;
+  ssize_t read = this->client_->read(&first_byte, 1);
+
+  if (read == -1 && (errno == EAGAIN || errno == EWOULDBLOCK)) {
+    return;  // No data yet, try again next loop
+  }
+
+  if (read <= 0) {
+    // Error or connection closed
+    if (read == -1) {
+      this->log_socket_error_("reading first byte");
+    } else {
+      ESP_LOGW(TAG, "Remote closed during handshake");
+    }
+    this->cleanup_connection_();
+    return;
+  }
+
+  // Got first byte, check if it's the magic byte
+  if (first_byte != 0x6C) {
+    ESP_LOGW(TAG, "Invalid initial byte: 0x%02X", first_byte);
+    this->cleanup_connection_();
+    return;
+  }
+
+  // First byte is valid, continue with data handling
+  this->handle_data_();
+}
+
+void ESPHomeOTAComponent::handle_data_() {
+  /// Handle the OTA data transfer and update process.
+  ///
+  /// This method is blocking and will not return until the OTA update completes,
+  /// fails, or times out. It handles authentication, receives the firmware data,
+  /// writes it to flash, and reboots on success.
  ota::OTAResponseTypes error_code = ota::OTA_RESPONSE_ERROR_UNKNOWN;
  bool update_started = false;
  size_t total = 0;
@@ -108,38 +186,14 @@ void ESPHomeOTAComponent::handle_() {
  size_t size_acknowledged = 0;
 #endif

-  if (this->client_ == nullptr) {
-    // We already checked server_->ready() in loop(), so we can accept directly
-    struct sockaddr_storage source_addr;
-    socklen_t addr_len = sizeof(source_addr);
-    this->client_ = this->server_->accept((struct sockaddr *) &source_addr, &addr_len);
-    if (this->client_ == nullptr)
-      return;
-  }
-
-  int enable = 1;
-  int err = this->client_->setsockopt(IPPROTO_TCP, TCP_NODELAY, &enable, sizeof(int));
-  if (err != 0) {
-    ESP_LOGW(TAG, "Socket could not enable TCP nodelay, errno %d", errno);
-    this->client_->close();
-    this->client_ = nullptr;
-    return;
-  }
-
-  ESP_LOGD(TAG, "Starting update from %s", this->client_->getpeername().c_str());
-  this->status_set_warning();
-#ifdef USE_OTA_STATE_CALLBACK
-  this->state_callback_.call(ota::OTA_STARTED, 0.0f, 0);
-#endif
-
-  if (!this->readall_(buf, 5)) {
-    ESP_LOGW(TAG, "Reading magic bytes failed");
+  // Read remaining 4 bytes of magic (we already read the first byte 0x6C in handle_handshake_)
+  if (!this->readall_(buf, 4)) {
+    this->log_read_error_("magic bytes");
    goto error;  // NOLINT(cppcoreguidelines-avoid-goto)
  }
-  // 0x6C, 0x26, 0xF7, 0x5C, 0x45
-  if (buf[0] != 0x6C || buf[1] != 0x26 || buf[2] != 0xF7 || buf[3] != 0x5C || buf[4] != 0x45) {
-    ESP_LOGW(TAG, "Magic bytes do not match! 0x%02X-0x%02X-0x%02X-0x%02X-0x%02X", buf[0], buf[1], buf[2], buf[3],
-             buf[4]);
+  // Check remaining magic bytes: 0x26, 0xF7, 0x5C, 0x45
+  if (buf[0] != 0x26 || buf[1] != 0xF7 || buf[2] != 0x5C || buf[3] != 0x45) {
+    ESP_LOGW(TAG, "Magic bytes mismatch! 0x6C-0x%02X-0x%02X-0x%02X-0x%02X", buf[0], buf[1], buf[2], buf[3]);
    error_code = ota::OTA_RESPONSE_ERROR_MAGIC;
    goto error;  // NOLINT(cppcoreguidelines-avoid-goto)
  }
@@ -153,7 +207,7 @@ void ESPHomeOTAComponent::handle_() {

  // Read features - 1 byte
  if (!this->readall_(buf, 1)) {
-    ESP_LOGW(TAG, "Reading features failed");
+    this->log_read_error_("features");
    goto error;  // NOLINT(cppcoreguidelines-avoid-goto)
  }
  ota_features = buf[0];  // NOLINT
@@ -232,7 +286,7 @@ void ESPHomeOTAComponent::handle_() {

  // Read size, 4 bytes MSB first
  if (!this->readall_(buf, 4)) {
-    ESP_LOGW(TAG, "Reading size failed");
+    this->log_read_error_("size");
    goto error;  // NOLINT(cppcoreguidelines-avoid-goto)
  }
  ota_size = 0;
@@ -242,6 +296,17 @@ void ESPHomeOTAComponent::handle_() {
  }
  ESP_LOGV(TAG, "Size is %u bytes", ota_size);

+  // Now that we've passed authentication and are actually
+  // starting the update, set the warning status and notify
+  // listeners. This ensures that port scanners do not
+  // accidentally trigger the update process.
+  this->log_start_("update");
+  this->status_set_warning();
+#ifdef USE_OTA_STATE_CALLBACK
+  this->state_callback_.call(ota::OTA_STARTED, 0.0f, 0);
+#endif
+
+  // This will block for a few seconds as it locks flash
  error_code = backend->begin(ota_size);
  if (error_code != ota::OTA_RESPONSE_OK)
    goto error;  // NOLINT(cppcoreguidelines-avoid-goto)
@@ -253,7 +318,7 @@ void ESPHomeOTAComponent::handle_() {

  // Read binary MD5, 32 bytes
  if (!this->readall_(buf, 32)) {
-    ESP_LOGW(TAG, "Reading binary MD5 checksum failed");
+    this->log_read_error_("MD5 checksum");
    goto error;  // NOLINT(cppcoreguidelines-avoid-goto)
  }
  sbuf[32] = '\0';
@@ -270,23 +335,22 @@ void ESPHomeOTAComponent::handle_() {
    ssize_t read = this->client_->read(buf, requested);
    if (read == -1) {
      if (errno == EAGAIN || errno == EWOULDBLOCK) {
-        App.feed_wdt();
-        delay(1);
+        this->yield_and_feed_watchdog_();
        continue;
      }
-      ESP_LOGW(TAG, "Error receiving data for update, errno %d", errno);
+      ESP_LOGW(TAG, "Read error, errno %d", errno);
      goto error;  // NOLINT(cppcoreguidelines-avoid-goto)
    } else if (read == 0) {
      // $ man recv
      // "When  a  stream socket peer has performed an orderly shutdown, the return value will
      // be 0 (the traditional "end-of-file" return)."
-      ESP_LOGW(TAG, "Remote end closed connection");
+      ESP_LOGW(TAG, "Remote closed connection");
      goto error;  // NOLINT(cppcoreguidelines-avoid-goto)
    }

    error_code = backend->write(buf, read);
    if (error_code != ota::OTA_RESPONSE_OK) {
-      ESP_LOGW(TAG, "Error writing binary data to flash!, error_code: %d", error_code);
+      ESP_LOGW(TAG, "Flash write error, code: %d", error_code);
      goto error;  // NOLINT(cppcoreguidelines-avoid-goto)
    }
    total += read;
@@ -307,8 +371,7 @@ void ESPHomeOTAComponent::handle_() {
      this->state_callback_.call(ota::OTA_IN_PROGRESS, percentage, 0);
 #endif
      // feed watchdog and give other tasks a chance to run
-      App.feed_wdt();
-      yield();
+      this->yield_and_feed_watchdog_();
    }
  }

@@ -318,7 +381,7 @@ void ESPHomeOTAComponent::handle_() {

  error_code = backend->end();
  if (error_code != ota::OTA_RESPONSE_OK) {
-    ESP_LOGW(TAG, "Error ending update! error_code: %d", error_code);
+    ESP_LOGW(TAG, "Error ending update! code: %d", error_code);
    goto error;  // NOLINT(cppcoreguidelines-avoid-goto)
  }

@@ -328,12 +391,11 @@ void ESPHomeOTAComponent::handle_() {

  // Read ACK
  if (!this->readall_(buf, 1) || buf[0] != ota::OTA_RESPONSE_OK) {
-    ESP_LOGW(TAG, "Reading back acknowledgement failed");
+    this->log_read_error_("ack");
    // do not go to error, this is not fatal
  }

-  this->client_->close();
-  this->client_ = nullptr;
+  this->cleanup_connection_();
  delay(10);
  ESP_LOGI(TAG, "Update complete");
  this->status_clear_warning();
@@ -346,8 +408,7 @@ void ESPHomeOTAComponent::handle_() {
 error:
  buf[0] = static_cast<uint8_t>(error_code);
  this->writeall_(buf, 1);
-  this->client_->close();
-  this->client_ = nullptr;
+  this->cleanup_connection_();

  if (backend != nullptr && update_started) {
    backend->abort();
@@ -364,28 +425,24 @@ bool ESPHomeOTAComponent::readall_(uint8_t *buf, size_t len) {
  uint32_t at = 0;
  while (len - at > 0) {
    uint32_t now = millis();
-    if (now - start > 1000) {
-      ESP_LOGW(TAG, "Timed out reading %d bytes of data", len);
+    if (now - start > OTA_SOCKET_TIMEOUT_DATA) {
+      ESP_LOGW(TAG, "Timeout reading %d bytes", len);
      return false;
    }

    ssize_t read = this->client_->read(buf + at, len - at);
    if (read == -1) {
-      if (errno == EAGAIN || errno == EWOULDBLOCK) {
-        App.feed_wdt();
-        delay(1);
-        continue;
+      if (errno != EAGAIN && errno != EWOULDBLOCK) {
+        ESP_LOGW(TAG, "Error reading %d bytes, errno %d", len, errno);
+        return false;
      }
-      ESP_LOGW(TAG, "Failed to read %d bytes of data, errno %d", len, errno);
-      return false;
    } else if (read == 0) {
      ESP_LOGW(TAG, "Remote closed connection");
      return false;
    } else {
      at += read;
    }
-    App.feed_wdt();
-    delay(1);
+    this->yield_and_feed_watchdog_();
  }

  return true;
@@ -395,25 +452,21 @@ bool ESPHomeOTAComponent::writeall_(const uint8_t *buf, size_t len) {
  uint32_t at = 0;
  while (len - at > 0) {
    uint32_t now = millis();
-    if (now - start > 1000) {
-      ESP_LOGW(TAG, "Timed out writing %d bytes of data", len);
+    if (now - start > OTA_SOCKET_TIMEOUT_DATA) {
+      ESP_LOGW(TAG, "Timeout writing %d bytes", len);
      return false;
    }

    ssize_t written = this->client_->write(buf + at, len - at);
    if (written == -1) {
-      if (errno == EAGAIN || errno == EWOULDBLOCK) {
-        App.feed_wdt();
-        delay(1);
-        continue;
+      if (errno != EAGAIN && errno != EWOULDBLOCK) {
+        ESP_LOGW(TAG, "Error writing %d bytes, errno %d", len, errno);
+        return false;
      }
-      ESP_LOGW(TAG, "Failed to write %d bytes of data, errno %d", len, errno);
-      return false;
    } else {
      at += written;
    }
-    App.feed_wdt();
-    delay(1);
+    this->yield_and_feed_watchdog_();
  }
  return true;
 }
@@ -421,5 +474,25 @@ bool ESPHomeOTAComponent::writeall_(const uint8_t *buf, size_t len) {
 float ESPHomeOTAComponent::get_setup_priority() const { return setup_priority::AFTER_WIFI; }
 uint16_t ESPHomeOTAComponent::get_port() const { return this->port_; }
 void ESPHomeOTAComponent::set_port(uint16_t port) { this->port_ = port; }
+
+void ESPHomeOTAComponent::log_socket_error_(const char *msg) { ESP_LOGW(TAG, "Socket %s: errno %d", msg, errno); }
+
+void ESPHomeOTAComponent::log_read_error_(const char *what) { ESP_LOGW(TAG, "Read %s failed", what); }
+
+void ESPHomeOTAComponent::log_start_(const char *phase) {
+  ESP_LOGD(TAG, "Starting %s from %s", phase, this->client_->getpeername().c_str());
+}
+
+void ESPHomeOTAComponent::cleanup_connection_() {
+  this->client_->close();
+  this->client_ = nullptr;
+  this->client_connect_time_ = 0;
+}
+
+void ESPHomeOTAComponent::yield_and_feed_watchdog_() {
+  App.feed_wdt();
+  delay(1);
+}
+
 }  // namespace esphome
 #endif
--- a/esphome/components/esphome/ota/ota_esphome.h
+++ b/esphome/components/esphome/ota/ota_esphome.h
@@ -27,15 +27,22 @@ class ESPHomeOTAComponent : public ota::OTAComponent {
  uint16_t get_port() const;

 protected:
-  void handle_();
+  void handle_handshake_();
+  void handle_data_();
  bool readall_(uint8_t *buf, size_t len);
  bool writeall_(const uint8_t *buf, size_t len);
+  void log_socket_error_(const char *msg);
+  void log_read_error_(const char *what);
+  void log_start_(const char *phase);
+  void cleanup_connection_();
+  void yield_and_feed_watchdog_();

 #ifdef USE_OTA_PASSWORD
  std::string password_;
 #endif  // USE_OTA_PASSWORD

  uint16_t port_;
+  uint32_t client_connect_time_{0};

  std::unique_ptr<socket::Socket> server_;
  std::unique_ptr<socket::Socket> client_;
--- a/esphome/components/espnow/init.py
+++ b/esphome/components/espnow/init.py
@@ -65,15 +65,6 @@ CONF_WAIT_FOR_SENT = "wait_for_sent"
 MAX_ESPNOW_PACKET_SIZE = 250  # Maximum size of the payload in bytes


-def _validate_unknown_peer(config):
-    if config[CONF_AUTO_ADD_PEER] and config.get(CONF_ON_UNKNOWN_PEER):
-        raise cv.Invalid(
-            f"'{CONF_ON_UNKNOWN_PEER}' cannot be used when '{CONF_AUTO_ADD_PEER}' is enabled.",
-            path=[CONF_ON_UNKNOWN_PEER],
-        )
-    return config
-
-
 CONFIG_SCHEMA = cv.All(
    cv.Schema(
        {
@@ -103,7 +94,6 @@ CONFIG_SCHEMA = cv.All(
        },
    ).extend(cv.COMPONENT_SCHEMA),
    cv.only_on_esp32,
-    _validate_unknown_peer,
 )


@@ -124,7 +114,6 @@ async def _trigger_to_code(config):


 async def to_code(config):
-    print(config)
    var = cg.new_Pvariable(config[CONF_ID])
    await cg.register_component(var, config)

--- a/esphome/components/espnow/automation.h
+++ b/esphome/components/espnow/automation.h
@@ -40,20 +40,20 @@ template<typename... Ts> class SendAction : public Action<Ts...>, public Parente
    this->num_running_++;
    send_callback_t send_callback = [this, x...](esp_err_t status) {
      if (status == ESP_OK) {
-        if (this->sent_.empty() && this->flags_.wait_for_sent) {
-          this->play_next_(x...);
-        } else if (!this->sent_.empty()) {
+        if (!this->sent_.empty()) {
          this->sent_.play(x...);
+        } else if (this->flags_.wait_for_sent) {
+          this->play_next_(x...);
        }
      } else {
-        if (this->error_.empty() && this->flags_.wait_for_sent) {
+        if (!this->error_.empty()) {
+          this->error_.play(x...);
+        } else if (this->flags_.wait_for_sent) {
          if (this->flags_.continue_on_error) {
            this->play_next_(x...);
          } else {
            this->stop_complex();
          }
-        } else if (!this->error_.empty()) {
-          this->error_.play(x...);
        }
      }
    };
--- a/esphome/components/espnow/espnow_component.cpp
+++ b/esphome/components/espnow/espnow_component.cpp
@@ -154,7 +154,7 @@ void ESPNowComponent::setup() {
 }

 void ESPNowComponent::enable() {
-  if (this->state_ != ESPNOW_STATE_ENABLED)
+  if (this->state_ == ESPNOW_STATE_ENABLED)
    return;

  ESP_LOGD(TAG, "Enabling");
@@ -178,11 +178,7 @@ void ESPNowComponent::enable_() {

    this->apply_wifi_channel();
  }
-#ifdef USE_WIFI
-  else {
-    this->wifi_channel_ = wifi::global_wifi_component->get_wifi_channel();
-  }
-#endif
+  this->get_wifi_channel();

  esp_err_t err = esp_now_init();
  if (err != ESP_OK) {
@@ -212,10 +208,11 @@ void ESPNowComponent::enable_() {
  esp_wifi_connectionless_module_set_wake_interval(CONFIG_ESPNOW_WAKE_INTERVAL);
 #endif

+  this->state_ = ESPNOW_STATE_ENABLED;
+
  for (auto peer : this->peers_) {
    this->add_peer(peer.address);
  }
-  this->state_ = ESPNOW_STATE_ENABLED;
 }

 void ESPNowComponent::disable() {
@@ -228,10 +225,6 @@ void ESPNowComponent::disable() {
  esp_now_unregister_recv_cb();
  esp_now_unregister_send_cb();

-  for (auto peer : this->peers_) {
-    this->del_peer(peer.address);
-  }
-
  esp_err_t err = esp_now_deinit();
  if (err != ESP_OK) {
    ESP_LOGE(TAG, "esp_now_deinit failed! 0x%x", err);
@@ -267,7 +260,6 @@ void ESPNowComponent::loop() {
    }
  }
 #endif
-
  // Process received packets
  ESPNowPacket *packet = this->receive_packet_queue_.pop();
  while (packet != nullptr) {
@@ -275,14 +267,16 @@ void ESPNowComponent::loop() {
      case ESPNowPacket::RECEIVED: {
        const ESPNowRecvInfo info = packet->get_receive_info();
        if (!esp_now_is_peer_exist(info.src_addr)) {
-          if (this->auto_add_peer_) {
-            this->add_peer(info.src_addr);
-          } else {
-            for (auto *handler : this->unknown_peer_handlers_) {
-              if (handler->on_unknown_peer(info, packet->packet_.receive.data, packet->packet_.receive.size))
-                break;  // If a handler returns true, stop processing further handlers
+          bool handled = false;
+          for (auto *handler : this->unknown_peer_handlers_) {
+            if (handler->on_unknown_peer(info, packet->packet_.receive.data, packet->packet_.receive.size)) {
+              handled = true;
+              break;  // If a handler returns true, stop processing further handlers
            }
          }
+          if (!handled && this->auto_add_peer_) {
+            this->add_peer(info.src_addr);
+          }
        }
        // Intentionally left as if instead of else in case the peer is added above
        if (esp_now_is_peer_exist(info.src_addr)) {
@@ -343,6 +337,12 @@ void ESPNowComponent::loop() {
  }
 }

+uint8_t ESPNowComponent::get_wifi_channel() {
+  wifi_second_chan_t dummy;
+  esp_wifi_get_channel(&this->wifi_channel_, &dummy);
+  return this->wifi_channel_;
+}
+
 esp_err_t ESPNowComponent::send(const uint8_t *peer_address, const uint8_t *payload, size_t size,
                                const send_callback_t &callback) {
  if (this->state_ != ESPNOW_STATE_ENABLED) {
@@ -407,7 +407,7 @@ esp_err_t ESPNowComponent::add_peer(const uint8_t *peer) {
  }

  if (memcmp(peer, this->own_address_, ESP_NOW_ETH_ALEN) == 0) {
-    this->mark_failed();
+    this->status_momentary_warning("peer-add-failed");
    return ESP_ERR_INVALID_MAC;
  }

--- a/esphome/components/espnow/espnow_component.h
+++ b/esphome/components/espnow/espnow_component.h
@@ -110,6 +110,7 @@ class ESPNowComponent : public Component {

  void set_wifi_channel(uint8_t channel) { this->wifi_channel_ = channel; }
  void apply_wifi_channel();
+  uint8_t get_wifi_channel();

  void set_auto_add_peer(bool value) { this->auto_add_peer_ = value; }

--- a/esphome/components/espnow/espnow_packet.h
+++ b/esphome/components/espnow/espnow_packet.h
@@ -49,7 +49,7 @@ class ESPNowPacket {
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0)
  // Constructor for sent data
  ESPNowPacket(const esp_now_send_info_t *info, esp_now_send_status_t status) {
-    this->init_sent_data(info->src_addr, status);
+    this->init_sent_data_(info->src_addr, status);
  }
 #else
  // Constructor for sent data
--- a/esphome/components/gpio_expander/cached_gpio.h
+++ b/esphome/components/gpio_expander/cached_gpio.h
@@ -2,10 +2,11 @@

 #include <array>
 #include <cstdint>
+#include <cstring>
+#include <limits>
 #include "esphome/core/hal.h"

-namespace esphome {
-namespace gpio_expander {
+namespace esphome::gpio_expander {

 /// @brief A class to cache the read state of a GPIO expander.
 ///        This class caches reads between GPIO Pins which are on the same bank.
@@ -17,12 +18,22 @@ namespace gpio_expander {
 ///           N - Number of pins
 template<typename T, T N> class CachedGpioExpander {
 public:
+  /// @brief Read the state of the given pin. This will invalidate the cache for the given pin number.
+  /// @param pin Pin number to read
+  /// @return Pin state
  bool digital_read(T pin) {
-    uint8_t bank = pin / (sizeof(T) * BITS_PER_BYTE);
-    if (this->read_cache_invalidated_[bank]) {
-      this->read_cache_invalidated_[bank] = false;
+    const uint8_t bank = pin / BANK_SIZE;
+    const T pin_mask = (1 << (pin % BANK_SIZE));
+    // Check if specific pin cache is valid
+    if (this->read_cache_valid_[bank] & pin_mask) {
+      // Invalidate pin
+      this->read_cache_valid_[bank] &= ~pin_mask;
+    } else {
+      // Read whole bank from hardware
      if (!this->digital_read_hw(pin))
        return false;
+      // Mark bank cache as valid except the pin that is being returned now
+      this->read_cache_valid_[bank] = std::numeric_limits<T>::max() & ~pin_mask;
    }
    return this->digital_read_cache(pin);
  }
@@ -36,18 +47,16 @@ template<typename T, T N> class CachedGpioExpander {
  virtual bool digital_read_cache(T pin) = 0;
  /// @brief Call component low level function to write GPIO state to device
  virtual void digital_write_hw(T pin, bool value) = 0;
-  const uint8_t cache_byte_size_ = N / (sizeof(T) * BITS_PER_BYTE);

  /// @brief Invalidate cache. This function should be called in component loop().
-  void reset_pin_cache_() {
-    for (T i = 0; i < this->cache_byte_size_; i++) {
-      this->read_cache_invalidated_[i] = true;
-    }
-  }
+  void reset_pin_cache_() { memset(this->read_cache_valid_, 0x00, CACHE_SIZE_BYTES); }

-  static const uint8_t BITS_PER_BYTE = 8;
-  std::array<bool, N / (sizeof(T) * BITS_PER_BYTE)> read_cache_invalidated_{};
+  static constexpr uint8_t BITS_PER_BYTE = 8;
+  static constexpr uint8_t BANK_SIZE = sizeof(T) * BITS_PER_BYTE;
+  static constexpr size_t BANKS = N / BANK_SIZE;
+  static constexpr size_t CACHE_SIZE_BYTES = BANKS * sizeof(T);
+
+  T read_cache_valid_[BANKS]{0};
 };

-}  // namespace gpio_expander
-}  // namespace esphome
+}  // namespace esphome::gpio_expander
--- a/esphome/components/gt911/touchscreen/gt911_touchscreen.cpp
+++ b/esphome/components/gt911/touchscreen/gt911_touchscreen.cpp
@@ -20,12 +20,11 @@ static const size_t MAX_BUTTONS = 4;  // max number of buttons scanned

 #define ERROR_CHECK(err) \
  if ((err) != i2c::ERROR_OK) { \
-    this->status_set_warning("Communication failure"); \
+    this->status_set_warning(ESP_LOG_MSG_COMM_FAIL); \
    return; \
  }

 void GT911Touchscreen::setup() {
-  i2c::ErrorCode err;
  if (this->reset_pin_ != nullptr) {
    this->reset_pin_->setup();
    this->reset_pin_->digital_write(false);
@@ -35,9 +34,14 @@ void GT911Touchscreen::setup() {
      this->interrupt_pin_->digital_write(false);
    }
    delay(2);
-    this->reset_pin_->digital_write(true);
-    delay(50);  // NOLINT
+    this->reset_pin_->digital_write(true);  // wait 50ms after reset
+    this->set_timeout(50, [this] { this->setup_internal_(); });
+    return;
  }
+  this->setup_internal_();
+}
+
+void GT911Touchscreen::setup_internal_() {
  if (this->interrupt_pin_ != nullptr) {
    // set pre-configured input mode
    this->interrupt_pin_->setup();
@@ -45,7 +49,7 @@ void GT911Touchscreen::setup() {

  // check the configuration of the int line.
  uint8_t data[4];
-  err = this->write(GET_SWITCHES, sizeof(GET_SWITCHES));
+  i2c::ErrorCode err = this->write(GET_SWITCHES, sizeof(GET_SWITCHES));
  if (err != i2c::ERROR_OK && this->address_ == PRIMARY_ADDRESS) {
    this->address_ = SECONDARY_ADDRESS;
    err = this->write(GET_SWITCHES, sizeof(GET_SWITCHES));
@@ -53,7 +57,7 @@ void GT911Touchscreen::setup() {
  if (err == i2c::ERROR_OK) {
    err = this->read(data, 1);
    if (err == i2c::ERROR_OK) {
-      ESP_LOGD(TAG, "Read from switches at address 0x%02X: 0x%02X", this->address_, data[0]);
+      ESP_LOGD(TAG, "Switches ADDR: 0x%02X DATA: 0x%02X", this->address_, data[0]);
      if (this->interrupt_pin_ != nullptr) {
        this->attach_interrupt_(this->interrupt_pin_,
                                (data[0] & 1) ? gpio::INTERRUPT_FALLING_EDGE : gpio::INTERRUPT_RISING_EDGE);
@@ -75,16 +79,24 @@ void GT911Touchscreen::setup() {
      }
    }
    if (err != i2c::ERROR_OK) {
-      this->mark_failed("Failed to read calibration");
+      this->mark_failed("Calibration error");
      return;
    }
  }
+
  if (err != i2c::ERROR_OK) {
-    this->mark_failed("Failed to communicate");
+    this->mark_failed(ESP_LOG_MSG_COMM_FAIL);
+    return;
  }
+  this->setup_done_ = true;
 }

 void GT911Touchscreen::update_touches() {
+  this->skip_update_ = true;  // skip send touch events by default, set to false after successful error checks
+  if (!this->setup_done_) {
+    return;
+  }
+
  i2c::ErrorCode err;
  uint8_t touch_state = 0;
  uint8_t data[MAX_TOUCHES + 1][8];  // 8 bytes each for each point, plus extra space for the key byte
@@ -97,7 +109,6 @@ void GT911Touchscreen::update_touches() {
  uint8_t num_of_touches = touch_state & 0x07;

  if ((touch_state & 0x80) == 0 || num_of_touches > MAX_TOUCHES) {
-    this->skip_update_ = true;  // skip send touch events, touchscreen is not ready yet.
    return;
  }

@@ -107,6 +118,7 @@ void GT911Touchscreen::update_touches() {
  err = this->read(data[0], sizeof(data[0]) * num_of_touches + 1);
  ERROR_CHECK(err);

+  this->skip_update_ = false;  // All error checks passed, send touch events
  for (uint8_t i = 0; i != num_of_touches; i++) {
    uint16_t id = data[i][0];
    uint16_t x = encode_uint16(data[i][2], data[i][1]);
--- a/esphome/components/gt911/touchscreen/gt911_touchscreen.h
+++ b/esphome/components/gt911/touchscreen/gt911_touchscreen.h
@@ -15,8 +15,20 @@ class GT911ButtonListener {

 class GT911Touchscreen : public touchscreen::Touchscreen, public i2c::I2CDevice {
 public:
+  /// @brief Initialize the GT911 touchscreen.
+  ///
+  /// If @ref reset_pin_ is set, the touchscreen will be hardware reset,
+  /// and the rest of the setup will be scheduled to run 50ms later using @ref set_timeout()
+  /// to allow the device to stabilize after reset.
+  ///
+  /// If @ref interrupt_pin_ is set, it will be temporarily configured during reset
+  /// to control I2C address selection.
+  ///
+  /// After the timeout, or immediately if no reset is performed, @ref setup_internal_()
+  /// is called to complete the initialization.
  void setup() override;
  void dump_config() override;
+  bool can_proceed() override { return this->setup_done_; }

  void set_interrupt_pin(InternalGPIOPin *pin) { this->interrupt_pin_ = pin; }
  void set_reset_pin(GPIOPin *pin) { this->reset_pin_ = pin; }
@@ -25,8 +37,20 @@ class GT911Touchscreen : public touchscreen::Touchscreen, public i2c::I2CDevice
 protected:
  void update_touches() override;

-  InternalGPIOPin *interrupt_pin_{};
-  GPIOPin *reset_pin_{};
+  /// @brief Perform the internal setup routine for the GT911 touchscreen.
+  ///
+  /// This function checks the I2C address, configures the interrupt pin (if available),
+  /// reads the touchscreen mode from the controller, and attempts to read calibration
+  /// data (maximum X and Y values) if not already set.
+  ///
+  /// On success, sets @ref setup_done_ to true.
+  /// On failure, calls @ref mark_failed() with an appropriate error message.
+  void setup_internal_();
+  /// @brief True if the touchscreen setup has completed successfully.
+  bool setup_done_{false};
+
+  InternalGPIOPin *interrupt_pin_{nullptr};
+  GPIOPin *reset_pin_{nullptr};
  std::vector<GT911ButtonListener *> button_listeners_;
  uint8_t button_state_{0xFF};  // last button state. Initial FF guarantees first update.
 };
--- a/esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp
+++ b/esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp
@@ -24,9 +24,6 @@ static const uint32_t READ_DURATION_MS = 16;
 static const size_t TASK_STACK_SIZE = 4096;
 static const ssize_t TASK_PRIORITY = 23;

-// Use an exponential moving average to correct a DC offset with weight factor 1/1000
-static const int32_t DC_OFFSET_MOVING_AVERAGE_COEFFICIENT_DENOMINATOR = 1000;
-
 static const char *const TAG = "i2s_audio.microphone";

 enum MicrophoneEventGroupBits : uint32_t {
@@ -381,26 +378,57 @@ void I2SAudioMicrophone::mic_task(void *params) {
 }

 void I2SAudioMicrophone::fix_dc_offset_(std::vector<uint8_t> &data) {
+  /**
+   * From https://www.musicdsp.org/en/latest/Filters/135-dc-filter.html:
+   *
+   *     y(n) = x(n) - x(n-1) + R * y(n-1)
+   *     R = 1 - (pi * 2 * frequency / samplerate)
+   *
+   * From https://en.wikipedia.org/wiki/Hearing_range:
+   *     The human range is commonly given as 20Hz up.
+   *
+   * From https://en.wikipedia.org/wiki/High-resolution_audio:
+   *     A reasonable upper bound for sample rate seems to be 96kHz.
+   *
+   * Calculate R value for 20Hz on a 96kHz sample rate:
+   *     R = 1 - (pi * 2 * 20 / 96000)
+   *     R = 0.9986910031
+   *
+   * Transform floating point to bit-shifting approximation:
+   *     output = input - prev_input + R * prev_output
+   *     output = input - prev_input + (prev_output - (prev_output >> S))
+   *
+   * Approximate bit-shift value S from R:
+   *     R = 1 - (1 >> S)
+   *     R = 1 - (1 / 2^S)
+   *     R = 1 - 2^-S
+   *     0.9986910031 = 1 - 2^-S
+   *     S = 9.57732 ~= 10
+   *
+   * Actual R from S:
+   *     R = 1 - 2^-10 = 0.9990234375
+   *
+   * Confirm this has effect outside human hearing on 96000kHz sample:
+   *     0.9990234375 = 1 - (pi * 2 * f / 96000)
+   *     f = 14.9208Hz
+   *
+   * Confirm this has effect outside human hearing on PDM 16kHz sample:
+   *     0.9990234375 = 1 - (pi * 2 * f / 16000)
+   *     f = 2.4868Hz
+   *
+   */
+  const uint8_t dc_filter_shift = 10;
  const size_t bytes_per_sample = this->audio_stream_info_.samples_to_bytes(1);
  const uint32_t total_samples = this->audio_stream_info_.bytes_to_samples(data.size());
-
-  if (total_samples == 0) {
-    return;
-  }
-
-  int64_t offset_accumulator = 0;
  for (uint32_t sample_index = 0; sample_index < total_samples; ++sample_index) {
    const uint32_t byte_index = sample_index * bytes_per_sample;
-    int32_t sample = audio::unpack_audio_sample_to_q31(&data[byte_index], bytes_per_sample);
-    offset_accumulator += sample;
-    sample -= this->dc_offset_;
-    audio::pack_q31_as_audio_sample(sample, &data[byte_index], bytes_per_sample);
+    int32_t input = audio::unpack_audio_sample_to_q31(&data[byte_index], bytes_per_sample);
+    int32_t output = input - this->dc_offset_prev_input_ +
+                     (this->dc_offset_prev_output_ - (this->dc_offset_prev_output_ >> dc_filter_shift));
+    this->dc_offset_prev_input_ = input;
+    this->dc_offset_prev_output_ = output;
+    audio::pack_q31_as_audio_sample(output, &data[byte_index], bytes_per_sample);
  }
-
-  const int32_t new_offset = offset_accumulator / total_samples;
-  this->dc_offset_ = new_offset / DC_OFFSET_MOVING_AVERAGE_COEFFICIENT_DENOMINATOR +
-                     (DC_OFFSET_MOVING_AVERAGE_COEFFICIENT_DENOMINATOR - 1) * this->dc_offset_ /
-                         DC_OFFSET_MOVING_AVERAGE_COEFFICIENT_DENOMINATOR;
 }

 size_t I2SAudioMicrophone::read_(uint8_t *buf, size_t len, TickType_t ticks_to_wait) {
--- a/esphome/components/i2s_audio/microphone/i2s_audio_microphone.h
+++ b/esphome/components/i2s_audio/microphone/i2s_audio_microphone.h
@@ -82,7 +82,8 @@ class I2SAudioMicrophone : public I2SAudioIn, public microphone::Microphone, pub

  bool correct_dc_offset_;
  bool locked_driver_{false};
-  int32_t dc_offset_{0};
+  int32_t dc_offset_prev_input_{0};
+  int32_t dc_offset_prev_output_{0};
 };

 }  // namespace i2s_audio
--- a/esphome/components/json/init.py
+++ b/esphome/components/json/init.py
@@ -2,7 +2,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.core import coroutine_with_priority

-CODEOWNERS = ["@OttoWinter"]
+CODEOWNERS = ["@esphome/core"]
 json_ns = cg.esphome_ns.namespace("json")

 CONFIG_SCHEMA = cv.All(
--- a/esphome/components/ld2410/init.py
+++ b/esphome/components/ld2410/init.py
@@ -14,18 +14,16 @@ ld2410_ns = cg.esphome_ns.namespace("ld2410")
 LD2410Component = ld2410_ns.class_("LD2410Component", cg.Component, uart.UARTDevice)

 CONF_LD2410_ID = "ld2410_id"
-
 CONF_MAX_MOVE_DISTANCE = "max_move_distance"
 CONF_MAX_STILL_DISTANCE = "max_still_distance"
-CONF_STILL_THRESHOLDS = [f"g{x}_still_threshold" for x in range(9)]
 CONF_MOVE_THRESHOLDS = [f"g{x}_move_threshold" for x in range(9)]
+CONF_STILL_THRESHOLDS = [f"g{x}_still_threshold" for x in range(9)]

 CONFIG_SCHEMA = cv.Schema(
    {
        cv.GenerateID(): cv.declare_id(LD2410Component),
-        cv.Optional(CONF_THROTTLE, default="1000ms"): cv.All(
-            cv.positive_time_period_milliseconds,
-            cv.Range(min=cv.TimePeriod(milliseconds=1)),
+        cv.Optional(CONF_THROTTLE): cv.invalid(
+            f"{CONF_THROTTLE} has been removed; use per-sensor filters, instead"
        ),
        cv.Optional(CONF_MAX_MOVE_DISTANCE): cv.invalid(
            f"The '{CONF_MAX_MOVE_DISTANCE}' option has been moved to the '{CONF_MAX_MOVE_DISTANCE}'"
@@ -75,7 +73,6 @@ 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)
-    cg.add(var.set_throttle(config[CONF_THROTTLE]))


 CALIBRATION_ACTION_SCHEMA = maybe_simple_id(
--- a/esphome/components/ld2410/binary_sensor.py
+++ b/esphome/components/ld2410/binary_sensor.py
@@ -22,19 +22,23 @@ CONFIG_SCHEMA = {
    cv.GenerateID(CONF_LD2410_ID): cv.use_id(LD2410Component),
    cv.Optional(CONF_HAS_TARGET): binary_sensor.binary_sensor_schema(
        device_class=DEVICE_CLASS_OCCUPANCY,
+        filters=[{"settle": cv.TimePeriod(milliseconds=1000)}],
        icon=ICON_ACCOUNT,
    ),
    cv.Optional(CONF_HAS_MOVING_TARGET): binary_sensor.binary_sensor_schema(
        device_class=DEVICE_CLASS_MOTION,
+        filters=[{"settle": cv.TimePeriod(milliseconds=1000)}],
        icon=ICON_MOTION_SENSOR,
    ),
    cv.Optional(CONF_HAS_STILL_TARGET): binary_sensor.binary_sensor_schema(
        device_class=DEVICE_CLASS_OCCUPANCY,
+        filters=[{"settle": cv.TimePeriod(milliseconds=1000)}],
        icon=ICON_MOTION_SENSOR,
    ),
    cv.Optional(CONF_OUT_PIN_PRESENCE_STATUS): binary_sensor.binary_sensor_schema(
        device_class=DEVICE_CLASS_PRESENCE,
        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+        filters=[{"settle": cv.TimePeriod(milliseconds=1000)}],
        icon=ICON_ACCOUNT,
    ),
 }
--- a/esphome/components/ld2410/ld2410.cpp
+++ b/esphome/components/ld2410/ld2410.cpp
@@ -188,9 +188,8 @@ void LD2410Component::dump_config() {
  ESP_LOGCONFIG(TAG,
                "LD2410:\n"
                "  Firmware version: %s\n"
-                "  MAC address: %s\n"
-                "  Throttle: %u ms",
-                version.c_str(), mac_str.c_str(), this->throttle_);
+                "  MAC address: %s",
+                version.c_str(), mac_str.c_str());
 #ifdef USE_BINARY_SENSOR
  ESP_LOGCONFIG(TAG, "Binary Sensors:");
  LOG_BINARY_SENSOR("  ", "Target", this->target_binary_sensor_);
@@ -306,11 +305,6 @@ void LD2410Component::send_command_(uint8_t command, const uint8_t *command_valu
 }

 void LD2410Component::handle_periodic_data_() {
-  // Reduce data update rate to reduce home assistant database growth
-  // Check this first to prevent unnecessary processing done in later checks/parsing
-  if (App.get_loop_component_start_time() - this->last_periodic_millis_ < this->throttle_) {
-    return;
-  }
  // 4 frame header bytes + 2 length bytes + 1 data end byte + 1 crc byte + 4 frame footer bytes
  // data header=0xAA, data footer=0x55, crc=0x00
  if (this->buffer_pos_ < 12 || !ld2410::validate_header_footer(DATA_FRAME_HEADER, this->buffer_data_) ||
@@ -318,9 +312,6 @@ void LD2410Component::handle_periodic_data_() {
      this->buffer_data_[this->buffer_pos_ - 5] != CHECK) {
    return;
  }
-  // Save the timestamp after validating the frame so, if invalid, we'll take the next frame immediately
-  this->last_periodic_millis_ = App.get_loop_component_start_time();
-
  /*
    Data Type: 7th
    0x01: Engineering mode
--- a/esphome/components/ld2410/ld2410.h
+++ b/esphome/components/ld2410/ld2410.h
@@ -93,7 +93,6 @@ class LD2410Component : public Component, public uart::UARTDevice {
  void set_gate_move_sensor(uint8_t gate, sensor::Sensor *s);
  void set_gate_still_sensor(uint8_t gate, sensor::Sensor *s);
 #endif
-  void set_throttle(uint16_t value) { this->throttle_ = value; };
  void set_bluetooth_password(const std::string &password);
  void set_engineering_mode(bool enable);
  void read_all_info();
@@ -116,8 +115,6 @@ class LD2410Component : public Component, public uart::UARTDevice {
  void query_light_control_();
  void restart_();

-  uint32_t last_periodic_millis_ = 0;
-  uint16_t throttle_ = 0;
  uint8_t light_function_ = 0;
  uint8_t light_threshold_ = 0;
  uint8_t out_pin_level_ = 0;
--- a/esphome/components/ld2410/sensor.py
+++ b/esphome/components/ld2410/sensor.py
@@ -18,42 +18,50 @@ from esphome.const import (
 from . import CONF_LD2410_ID, LD2410Component

 DEPENDENCIES = ["ld2410"]
-CONF_STILL_DISTANCE = "still_distance"
-CONF_MOVING_ENERGY = "moving_energy"
-CONF_STILL_ENERGY = "still_energy"
+
 CONF_DETECTION_DISTANCE = "detection_distance"
 CONF_MOVE_ENERGY = "move_energy"
+CONF_MOVING_ENERGY = "moving_energy"
+CONF_STILL_DISTANCE = "still_distance"
+CONF_STILL_ENERGY = "still_energy"
+

 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,
-            unit_of_measurement=UNIT_CENTIMETER,
+            filters=[{"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,
-            unit_of_measurement=UNIT_CENTIMETER,
+            filters=[{"throttle_with_priority": cv.TimePeriod(milliseconds=1000)}],
            icon=ICON_SIGNAL,
+            unit_of_measurement=UNIT_CENTIMETER,
        ),
        cv.Optional(CONF_MOVING_ENERGY): sensor.sensor_schema(
-            unit_of_measurement=UNIT_PERCENT,
+            filters=[{"throttle_with_priority": cv.TimePeriod(milliseconds=1000)}],
            icon=ICON_MOTION_SENSOR,
+            unit_of_measurement=UNIT_PERCENT,
        ),
        cv.Optional(CONF_STILL_ENERGY): sensor.sensor_schema(
-            unit_of_measurement=UNIT_PERCENT,
+            filters=[{"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)}],
            icon=ICON_LIGHTBULB,
        ),
        cv.Optional(CONF_DETECTION_DISTANCE): sensor.sensor_schema(
            device_class=DEVICE_CLASS_DISTANCE,
-            unit_of_measurement=UNIT_CENTIMETER,
+            filters=[{"throttle_with_priority": cv.TimePeriod(milliseconds=1000)}],
            icon=ICON_SIGNAL,
+            unit_of_measurement=UNIT_CENTIMETER,
        ),
    }
 )
@@ -63,14 +71,20 @@ CONFIG_SCHEMA = CONFIG_SCHEMA.extend(
        cv.Optional(f"g{x}"): cv.Schema(
            {
                cv.Optional(CONF_MOVE_ENERGY): sensor.sensor_schema(
-                    unit_of_measurement=UNIT_PERCENT,
                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                    filters=[
+                        {"throttle_with_priority": cv.TimePeriod(milliseconds=1000)}
+                    ],
                    icon=ICON_MOTION_SENSOR,
+                    unit_of_measurement=UNIT_PERCENT,
                ),
                cv.Optional(CONF_STILL_ENERGY): sensor.sensor_schema(
-                    unit_of_measurement=UNIT_PERCENT,
                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                    filters=[
+                        {"throttle_with_priority": cv.TimePeriod(milliseconds=1000)}
+                    ],
                    icon=ICON_FLASH,
+                    unit_of_measurement=UNIT_PERCENT,
                ),
            }
        )
--- a/esphome/components/ld2412/init.py
+++ b/esphome/components/ld2412/init.py
@@ -0,0 +1,46 @@
+import esphome.codegen as cg
+from esphome.components import uart
+import esphome.config_validation as cv
+from esphome.const import CONF_ID, CONF_THROTTLE
+
+AUTO_LOAD = ["ld24xx"]
+CODEOWNERS = ["@Rihan9"]
+DEPENDENCIES = ["uart"]
+MULTI_CONF = True
+
+LD2412_ns = cg.esphome_ns.namespace("ld2412")
+LD2412Component = LD2412_ns.class_("LD2412Component", cg.Component, uart.UARTDevice)
+
+CONF_LD2412_ID = "ld2412_id"
+
+CONF_MAX_MOVE_DISTANCE = "max_move_distance"
+CONF_MAX_STILL_DISTANCE = "max_still_distance"
+CONF_MOVE_THRESHOLDS = [f"g{x}_move_threshold" for x in range(9)]
+CONF_STILL_THRESHOLDS = [f"g{x}_still_threshold" for x in range(9)]
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(LD2412Component),
+            cv.Optional(CONF_THROTTLE): cv.invalid(
+                f"{CONF_THROTTLE} has been removed; use per-sensor filters, instead"
+            ),
+        }
+    )
+    .extend(uart.UART_DEVICE_SCHEMA)
+    .extend(cv.COMPONENT_SCHEMA)
+)
+
+FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
+    "ld2412",
+    require_tx=True,
+    require_rx=True,
+    parity="NONE",
+    stop_bits=1,
+)
+
+
+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)
--- a/esphome/components/ld2412/binary_sensor.py
+++ b/esphome/components/ld2412/binary_sensor.py
@@ -0,0 +1,70 @@
+import esphome.codegen as cg
+from esphome.components import binary_sensor
+import esphome.config_validation as cv
+from esphome.const import (
+    CONF_HAS_MOVING_TARGET,
+    CONF_HAS_STILL_TARGET,
+    CONF_HAS_TARGET,
+    DEVICE_CLASS_MOTION,
+    DEVICE_CLASS_OCCUPANCY,
+    DEVICE_CLASS_RUNNING,
+    ENTITY_CATEGORY_DIAGNOSTIC,
+    ICON_ACCOUNT,
+    ICON_MOTION_SENSOR,
+)
+
+from . import CONF_LD2412_ID, LD2412Component
+
+DEPENDENCIES = ["ld2412"]
+
+CONF_DYNAMIC_BACKGROUND_CORRECTION_STATUS = "dynamic_background_correction_status"
+
+CONFIG_SCHEMA = {
+    cv.GenerateID(CONF_LD2412_ID): cv.use_id(LD2412Component),
+    cv.Optional(
+        CONF_DYNAMIC_BACKGROUND_CORRECTION_STATUS
+    ): binary_sensor.binary_sensor_schema(
+        device_class=DEVICE_CLASS_RUNNING,
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+        icon=ICON_ACCOUNT,
+    ),
+    cv.Optional(CONF_HAS_TARGET): binary_sensor.binary_sensor_schema(
+        device_class=DEVICE_CLASS_OCCUPANCY,
+        filters=[{"settle": cv.TimePeriod(milliseconds=1000)}],
+        icon=ICON_ACCOUNT,
+    ),
+    cv.Optional(CONF_HAS_MOVING_TARGET): binary_sensor.binary_sensor_schema(
+        device_class=DEVICE_CLASS_MOTION,
+        filters=[{"settle": cv.TimePeriod(milliseconds=1000)}],
+        icon=ICON_MOTION_SENSOR,
+    ),
+    cv.Optional(CONF_HAS_STILL_TARGET): binary_sensor.binary_sensor_schema(
+        device_class=DEVICE_CLASS_OCCUPANCY,
+        filters=[{"settle": cv.TimePeriod(milliseconds=1000)}],
+        icon=ICON_MOTION_SENSOR,
+    ),
+}
+
+
+async def to_code(config):
+    LD2412_component = await cg.get_variable(config[CONF_LD2412_ID])
+    if dynamic_background_correction_status_config := config.get(
+        CONF_DYNAMIC_BACKGROUND_CORRECTION_STATUS
+    ):
+        sens = await binary_sensor.new_binary_sensor(
+            dynamic_background_correction_status_config
+        )
+        cg.add(
+            LD2412_component.set_dynamic_background_correction_status_binary_sensor(
+                sens
+            )
+        )
+    if has_target_config := config.get(CONF_HAS_TARGET):
+        sens = await binary_sensor.new_binary_sensor(has_target_config)
+        cg.add(LD2412_component.set_target_binary_sensor(sens))
+    if has_moving_target_config := config.get(CONF_HAS_MOVING_TARGET):
+        sens = await binary_sensor.new_binary_sensor(has_moving_target_config)
+        cg.add(LD2412_component.set_moving_target_binary_sensor(sens))
+    if has_still_target_config := config.get(CONF_HAS_STILL_TARGET):
+        sens = await binary_sensor.new_binary_sensor(has_still_target_config)
+        cg.add(LD2412_component.set_still_target_binary_sensor(sens))
--- a/esphome/components/ld2412/button/init.py
+++ b/esphome/components/ld2412/button/init.py
@@ -0,0 +1,74 @@
+import esphome.codegen as cg
+from esphome.components import button
+import esphome.config_validation as cv
+from esphome.const import (
+    CONF_FACTORY_RESET,
+    CONF_RESTART,
+    DEVICE_CLASS_RESTART,
+    ENTITY_CATEGORY_CONFIG,
+    ENTITY_CATEGORY_DIAGNOSTIC,
+    ICON_DATABASE,
+    ICON_PULSE,
+    ICON_RESTART,
+    ICON_RESTART_ALERT,
+)
+
+from .. import CONF_LD2412_ID, LD2412_ns, LD2412Component
+
+FactoryResetButton = LD2412_ns.class_("FactoryResetButton", button.Button)
+QueryButton = LD2412_ns.class_("QueryButton", button.Button)
+RestartButton = LD2412_ns.class_("RestartButton", button.Button)
+StartDynamicBackgroundCorrectionButton = LD2412_ns.class_(
+    "StartDynamicBackgroundCorrectionButton", button.Button
+)
+
+CONF_QUERY_PARAMS = "query_params"
+CONF_START_DYNAMIC_BACKGROUND_CORRECTION = "start_dynamic_background_correction"
+
+CONFIG_SCHEMA = {
+    cv.GenerateID(CONF_LD2412_ID): cv.use_id(LD2412Component),
+    cv.Optional(CONF_FACTORY_RESET): button.button_schema(
+        FactoryResetButton,
+        device_class=DEVICE_CLASS_RESTART,
+        entity_category=ENTITY_CATEGORY_CONFIG,
+        icon=ICON_RESTART_ALERT,
+    ),
+    cv.Optional(CONF_QUERY_PARAMS): button.button_schema(
+        QueryButton,
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+        icon=ICON_DATABASE,
+    ),
+    cv.Optional(CONF_RESTART): button.button_schema(
+        RestartButton,
+        device_class=DEVICE_CLASS_RESTART,
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+        icon=ICON_RESTART,
+    ),
+    cv.Optional(CONF_START_DYNAMIC_BACKGROUND_CORRECTION): button.button_schema(
+        StartDynamicBackgroundCorrectionButton,
+        entity_category=ENTITY_CATEGORY_CONFIG,
+        icon=ICON_PULSE,
+    ),
+}
+
+
+async def to_code(config):
+    LD2412_component = await cg.get_variable(config[CONF_LD2412_ID])
+    if factory_reset_config := config.get(CONF_FACTORY_RESET):
+        b = await button.new_button(factory_reset_config)
+        await cg.register_parented(b, config[CONF_LD2412_ID])
+        cg.add(LD2412_component.set_factory_reset_button(b))
+    if query_params_config := config.get(CONF_QUERY_PARAMS):
+        b = await button.new_button(query_params_config)
+        await cg.register_parented(b, config[CONF_LD2412_ID])
+        cg.add(LD2412_component.set_query_button(b))
+    if restart_config := config.get(CONF_RESTART):
+        b = await button.new_button(restart_config)
+        await cg.register_parented(b, config[CONF_LD2412_ID])
+        cg.add(LD2412_component.set_restart_button(b))
+    if start_dynamic_background_correction_config := config.get(
+        CONF_START_DYNAMIC_BACKGROUND_CORRECTION
+    ):
+        b = await button.new_button(start_dynamic_background_correction_config)
+        await cg.register_parented(b, config[CONF_LD2412_ID])
+        cg.add(LD2412_component.set_start_dynamic_background_correction_button(b))
--- a/esphome/components/ld2412/button/factory_reset_button.cpp
+++ b/esphome/components/ld2412/button/factory_reset_button.cpp
@@ -0,0 +1,9 @@
+#include "factory_reset_button.h"
+
+namespace esphome {
+namespace ld2412 {
+
+void FactoryResetButton::press_action() { this->parent_->factory_reset(); }
+
+}  // namespace ld2412
+}  // namespace esphome
--- a/esphome/components/ld2412/button/factory_reset_button.h
+++ b/esphome/components/ld2412/button/factory_reset_button.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "esphome/components/button/button.h"
+#include "../ld2412.h"
+
+namespace esphome {
+namespace ld2412 {
+
+class FactoryResetButton : public button::Button, public Parented<LD2412Component> {
+ public:
+  FactoryResetButton() = default;
+
+ protected:
+  void press_action() override;
+};
+
+}  // namespace ld2412
+}  // namespace esphome
--- a/esphome/components/ld2412/button/query_button.cpp
+++ b/esphome/components/ld2412/button/query_button.cpp
@@ -0,0 +1,9 @@
+#include "query_button.h"
+
+namespace esphome {
+namespace ld2412 {
+
+void QueryButton::press_action() { this->parent_->read_all_info(); }
+
+}  // namespace ld2412
+}  // namespace esphome
--- a/esphome/components/ld2412/button/query_button.h
+++ b/esphome/components/ld2412/button/query_button.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "esphome/components/button/button.h"
+#include "../ld2412.h"
+
+namespace esphome {
+namespace ld2412 {
+
+class QueryButton : public button::Button, public Parented<LD2412Component> {
+ public:
+  QueryButton() = default;
+
+ protected:
+  void press_action() override;
+};
+
+}  // namespace ld2412
+}  // namespace esphome
--- a/esphome/components/ld2412/button/restart_button.cpp
+++ b/esphome/components/ld2412/button/restart_button.cpp
@@ -0,0 +1,9 @@
+#include "restart_button.h"
+
+namespace esphome {
+namespace ld2412 {
+
+void RestartButton::press_action() { this->parent_->restart_and_read_all_info(); }
+
+}  // namespace ld2412
+}  // namespace esphome
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jesse Hills	c5b2c8d971	Merge pull request #10308 from esphome/bump-2025.8.0b4 2025.8.0b4	2025-08-20 10:30:37 +12:00
Jesse Hills	104906ca11	Bump version to 2025.8.0b4	2025-08-20 09:40:19 +12:00
J. Nick Koston	ad5f6f0cfe	[bluetooth_proxy] Fix connection slot race by deferring slot release until GATT close (#10303 )	2025-08-20 09:40:19 +12:00
Patrick	8356f7fcd3	[pipsolar] fix faults_present, fix update interval (#10289 )	2025-08-20 09:40:19 +12:00
Ben Winslow	225de226b0	[atm90e32] Only read 1 register per SPI transaction per datasheet. (#10258 )	2025-08-20 09:40:19 +12:00
Jesse Hills	fd07e1d979	Merge pull request #10298 from esphome/bump-2025.8.0b3 2025.8.0b3	2025-08-19 20:40:12 +12:00
Jesse Hills	23554cda06	Bump version to 2025.8.0b3	2025-08-19 13:09:22 +12:00
Ben Winslow	064385eac6	[nextion] Don't include terminating NUL in nextion text_sensor states (#10273 )	2025-08-19 13:09:22 +12:00
Jesse Hills	6502ed70de	[esp32] Write variant to sdkconfig file (#10267 )	2025-08-19 13:09:22 +12:00
J. Nick Koston	bb894c3e32	[core] Fix scheduler race condition where cancelled items still execute (#10268 )	2025-08-19 13:09:22 +12:00
Ben Winslow	c5858b7032	[core] Fix post-OTA logs display when using esphome run and MQTT (#10274 )	2025-08-19 13:09:22 +12:00
Ben Winslow	99f57ecb73	[senseair] Discard 0 ppm readings with "Out Of Range" bit set. (#10275 )	2025-08-19 13:09:22 +12:00
J. Nick Koston	cc6c892678	[esp32_ble] Store GATTC/GATTS param and small data inline to nearly eliminate heap allocations (#10249 ) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-08-19 13:09:22 +12:00
RFDarter	07a98d2525	[web_server] fix cover_all_json_generator wrong detail (#10252 )	2025-08-19 13:09:22 +12:00
J. Nick Koston	e80f616366	[esp32_ble] Optimize BLE event memory usage by eliminating std::vector overhead (#10247 ) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-08-19 13:09:22 +12:00
J. Nick Koston	46be877594	[bluetooth_proxy] Remove redundant connection type check after V1 removal (#10208 )	2025-08-19 13:09:21 +12:00
J. Nick Koston	ac8b48a53c	[core] Trigger clean build when components are removed from configuration (#10235 ) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-08-19 13:09:21 +12:00
J. Nick Koston	7fdbd8528a	[wifi] Automatically disable Enterprise WiFi support when EAP is not configured (#10242 )	2025-08-19 13:09:21 +12:00
Katherine Whitlock	80970f972b	Improve error reporting for add_library (#10226 ) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-08-19 13:09:21 +12:00
Jesse Hills	3c7865cd6f	[esp32_ble] Add ``USE_ESP32_BLE_UUID`` when advertising is desired (#10230 )	2025-08-19 13:09:21 +12:00
Jesse Hills	0a3ee7d84e	Merge pull request #10228 from esphome/bump-2025.8.0b2 2025.8.0b2	2025-08-15 08:46:15 +12:00
Jesse Hills	8d61b1e8df	Bump version to 2025.8.0b2	2025-08-14 14:00:27 +12:00
dependabot[bot]	9c897993bb	Bump esphome-dashboard from 20250514.0 to 20250814.0 (#10227 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-08-14 14:00:26 +12:00
dependabot[bot]	93f9475105	Bump aioesphomeapi from 38.2.1 to 39.0.0 (#10222 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-08-14 14:00:26 +12:00
Samuel Sieb	95cd224e3e	[psram] allow disabling (#10224 ) Co-authored-by: Samuel Sieb <samuel@sieb.net>	2025-08-14 14:00:26 +12:00
Jesse Hills	b7afeafda9	[espnow] Set state to enabled before adding initial peers (#10225 )	2025-08-14 14:00:26 +12:00
Jesse Hills	7922462bcf	[entity] Allow ``device_id`` to be blank on entities (#10217 )	2025-08-14 14:00:26 +12:00
Jesse Hills	1c2e1ab3e5	Merge pull request #10214 from esphome/bump-2025.8.0b1 2025.8.0b1	2025-08-13 23:56:34 +12:00
J. Nick Koston	68ddd98f5f	[CI] Fix CI job failures for PRs with >300 changed files (#10215 )	2025-08-13 15:49:38 +12:00
Jesse Hills	6b7ced1970	Bump version to 2025.8.0b1	2025-08-13 14:46:50 +12:00
J. Nick Koston	ed2b76050b	[bluetooth_proxy] Remove ESPBTUUID dependency to save 296 bytes of flash (#10213 )	2025-08-13 14:18:53 +12:00
Samuel Sieb	113813617d	[bme280_base, bmp280_base] add reasons to the fails, clean up logging (#10209 ) Co-authored-by: Keith Burzinski <kbx81x@gmail.com>	2025-08-13 02:05:22 +00:00
Keith Burzinski	c3a209d3f4	[ld2450] Replace ``throttle`` with native filters (#10196 ) Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>	2025-08-12 19:35:19 -05:00
John	7ffdaa1f06	[atm90e32] energy meter calibration log output enhancements & software SPI fix (#10143 ) Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>	2025-08-12 20:26:53 +12:00
dependabot[bot]	3a857950bf	Bump actions/checkout from 4 to 5 (#10198 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>	2025-08-12 20:23:41 +12:00
Rihan9	0256e0005e	[ld2412] New component (#9075 ) Co-authored-by: Keith Burzinski <kbx81x@gmail.com> Co-authored-by: J. Nick Koston <nick@koston.org>	2025-08-12 00:34:37 -05:00
Jesse Hills	c65af68e63	[core] Reset pin registry after target platform validations (#10199 )	2025-08-12 16:33:07 +12:00
dependabot[bot]	ef2121a215	Bump aioesphomeapi from 38.1.0 to 38.2.1 (#10197 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-08-11 20:47:53 -05:00
Joshua Sing	bb40b7702d	[const] Add CONF_POWER_MODE (#10173 )	2025-08-12 11:13:24 +12:00
Kevin Ahrendt	6c48f3d719	[wifi] Remove restriction from using NONE power saving mode with BLE (#10181 )	2025-08-12 11:09:58 +12:00
J. Nick Koston	ff52869b4c	[api] Add constexpr optimizations to protobuf encoding (#10192 )	2025-08-12 10:10:38 +12:00
J. Nick Koston	82b7c1224c	[core] Improve entity duplicate validation error messages (#10184 )	2025-08-12 09:58:51 +12:00
Jesse Hills	c14c4fb658	[substitutions] Add some safe built-in functions to jinja parsing (#10178 ) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-08-11 16:12:54 -05:00
J. Nick Koston	42aee53dde	[bluetooth_proxy] Replace dynamic vector with fixed array for BLE advertisements (#10174 )	2025-08-11 15:47:46 -05:00
J. Nick Koston	9aa21956c8	[api] Optimize single vector writes to use write() instead of writev() (#10193 )	2025-08-11 15:41:08 -05:00
J. Nick Koston	4c2874a32b	[esphome] Fix OTA watchdog resets during port scanning and network delays (#10152 )	2025-08-11 15:37:01 -05:00
Keith Burzinski	45b88f2da9	[sensor] Extend timeout filter with option to return last value received (#10115 )	2025-08-11 10:36:44 -05:00
dependabot[bot]	8f53961496	Bump pylint from 3.3.7 to 3.3.8 (#10177 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-08-11 01:05:14 -05:00
dependabot[bot]	5cf0e4d9dd	Bump aioesphomeapi from 38.0.0 to 38.1.0 (#10176 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-08-11 05:11:22 +00:00
Chad Matsalla	b70983ed09	[display] Disallow ``show_test_card: true` `and` `update_interval: never`` (#9927 ) Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>	2025-08-11 11:41:37 +12:00
tomaszduda23	ffa89eb2d3	[nrf52, zephyr_debug] add zephyr debug component (#8319 )	2025-08-11 11:20:45 +12:00
Clyde Stubbs	8b67d6dfec	[lvgl] fix allocation of reduced size buffer with rotation (#10147 )	2025-08-11 10:32:01 +12:00
Clyde Stubbs	581b4ef5a1	[lvgl] Various validation fixes (#10141 )	2025-08-11 10:27:54 +12:00
Jonathan Swoboda	da02f970d4	[neopixelbus] Fix neopixelbus on esp32 (#10123 )	2025-08-11 10:24:12 +12:00
Jesse Hills	2fc0a11596	[CI] Print more info for when consts are duplicated (#10166 )	2025-08-11 09:53:40 +12:00
J. Nick Koston	5a8f722316	Optimize subprocess performance with close_fds=False (#10145 )	2025-08-11 09:14:13 +12:00
J. Nick Koston	279f56141e	[ade7880] Fix duplicate sensor name validation error (#10155 )	2025-08-11 09:12:36 +12:00
J. Nick Koston	6bfe281d18	[web_server] Reduce flash usage by consolidating parameter parsing (#10154 )	2025-08-11 09:09:31 +12:00
J. Nick Koston	a1371aea37	[dashboard] Fix port fallback regression when device is offline (#10135 )	2025-08-11 09:04:40 +12:00
Jonathan Swoboda	d5c9c10b3b	[esp32] Add IDF log_level option (#10134 )	2025-08-10 17:27:08 +00:00
J. Nick Koston	cef39e7c59	[esp32_ble_tracker] Fix false reboots when event loop is blocked (#10144 )	2025-08-10 04:44:23 -05:00
Edward Firmo	2b9e1ce315	[switch] Add trigger ``on_state`` (#10108 )	2025-08-09 21:09:40 +10:00
dependabot[bot]	ff9ddb9d68	Bump tornado from 6.5.1 to 6.5.2 (#10142 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-08-08 16:03:13 -05:00
Edward Firmo	676c51ffa0	[switch] Add `control()` method to API (#10118 )	2025-08-08 05:51:19 +00:00
J. Nick Koston	7e4d09dbd8	[bluetooth_proxy] Optimize connection loop to reduce CPU usage (#10133 )	2025-08-07 16:24:26 -10:00
J. Nick Koston	58504662d8	[cover] Reduce flash usage by optimizing validation messages (#10130 )	2025-08-08 10:44:47 +10:00
J. Nick Koston	83b69519dd	[wifi] Reduce flash usage by optimizing logging (#10127 )	2025-08-08 10:43:13 +10:00
J. Nick Koston	d4d1a96f9b	[esp32_ble_client] Reduce flash usage by optimizing logging strings (#10119 )	2025-08-08 10:42:03 +10:00
J. Nick Koston	76fd104fb6	[mdns] Conditionally compile extra services to reduce flash usage (#10129 )	2025-08-08 10:32:35 +10:00
Edward Firmo	c4d1b1317a	[switch] Add `switch.control` automation action (#10105 ) Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>	2025-08-08 08:55:54 +10:00
dependabot[bot]	14bc83342f	Bump ruff from 0.12.7 to 0.12.8 (#10126 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: J. Nick Koston <nick@koston.org>	2025-08-07 20:15:14 +00:00
dependabot[bot]	a1461c5293	Bump actions/cache from 4.2.3 to 4.2.4 (#10128 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-08-07 10:09:53 -10:00
dependabot[bot]	73b2db8af5	Bump actions/cache from 4.2.3 to 4.2.4 in /.github/actions/restore-python (#10125 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-08-07 09:16:58 -10:00
J. Nick Koston	a7a119f576	[bluetooth_proxy] Remove V1 connection support (#10107 )	2025-08-07 03:52:46 -05:00
J. Nick Koston	1ba76f5f2e	[esp32_ble_client] Conditionally compile BLE service classes to reduce flash usage (#10114 )	2025-08-07 03:46:34 -05:00
J. Nick Koston	37a9ad6a0d	[esp32_ble_tracker] Optimize member variable ordering to reduce memory padding (#10113 )	2025-08-07 03:34:46 -05:00
J. Nick Koston	c0a62c0be1	[esp32_ble_client] Avoid iterating empty services vector for bluetooth_proxy connections (#10110 )	2025-08-07 03:40:12 +00:00
J. Nick Koston	bfb14e1cf9	[esp32_touch] Restore get_value() for ESP32-S2/S3 variants (#10112 )	2025-08-06 21:21:32 -05:00
mbo18	1415e02e40	Add device class absolute_humidity to the absolute humidity component (#10100 ) Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>	2025-08-07 13:48:26 +12:00
dependabot[bot]	81f907e994	Bump actions/download-artifact from 4.3.0 to 5.0.0 (#10106 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-08-07 13:47:03 +12:00
J. Nick Koston	61008bc8a9	[bluetooth_proxy] Remove unnecessary heap allocation for response object (#10104 )	2025-08-07 13:42:04 +12:00
J. Nick Koston	6d66ddd68d	[bluetooth_proxy][esp32_ble_tracker][esp32_ble_client] Consolidate duplicate logging code to reduce flash usage (#10097 )	2025-08-07 13:41:03 +12:00
J. Nick Koston	fc180251be	[bluetooth_proxy] Consolidate dump_config() log calls (#10103 )	2025-08-07 12:43:59 +12:00
J. Nick Koston	ee1d4f27ef	[esp32_ble] Conditionally compile BLE advertising to reduce flash usage (#10099 )	2025-08-07 12:29:24 +12:00
J. Nick Koston	325ec0a0ae	[esp32_ble_client] Convert to C++17 nested namespace syntax (#10111 )	2025-08-07 12:18:03 +12:00
Keith Burzinski	6071f4b02c	[ld2410] Replace ``throttle`` with native filters (#10019 )	2025-08-07 10:26:11 +12:00
dependabot[bot]	083ac8ce8e	Bump aioesphomeapi from 37.2.5 to 38.0.0 (#10109 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-08-06 10:21:29 -10:00
J. Nick Koston	4ceda31f32	[bluetooth_proxy] Replace std::find with simple loop for small fixed array (#10102 )	2025-08-07 07:53:42 +12:00
J. Nick Koston	5021cc6d5f	[esp32_ble] Make BLE notification limit configurable to fix ESP_GATT_NO_RESOURCES errors (#10098 )	2025-08-06 17:24:02 +00:00
Craig Andrews	2b3e546203	[deep_sleep] enable sleep pull up/down for wakeup pin (#9395 )	2025-08-05 23:47:45 -07:00
J. Nick Koston	1642d34d29	[esp32_ble_tracker] Simplify state machine guards with helper functions (#10092 )	2025-08-06 01:03:19 -05:00
J. Nick Koston	8ceb1b9d60	[bluetooth_proxy] Reduce flash usage by consolidating duplicate logging (#10094 )	2025-08-06 00:49:20 -05:00
Jesse Hills	d872c8a999	[light] Allow light effect schema to be a schema object already (#10091 )	2025-08-06 00:05:48 -05:00
Pawelo	99125c045f	[bme680] Eliminate warnings due to unused functions (#9735 ) Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>	2025-08-06 00:02:54 -05:00
Jonathan Swoboda	860a5ef5c0	[esp32_rmt_led_strip] Work around IDFGH-16195 (#10093 )	2025-08-05 23:28:09 -05:00
J. Nick Koston	b01f03cc24	[esp32_ble_tracker] Refactor loop() method for improved readability and performance (#10074 )	2025-08-06 14:26:11 +12:00
J. Nick Koston	cfb22e33c9	[esp32_ble_tracker] Add missing USE_ESP32_BLE_DEVICE guard for already_discovered_ member (#10085 )	2025-08-06 14:22:32 +12:00
@RubenKelevra	96bbb58f34	update espressif's esp32-camera library to 2.1.1 (#10090 )	2025-08-05 14:33:15 -10:00
Jesse Hills	3edd746c6c	[mcp23xxx] Use CachedGpioExpander (#10078 )	2025-08-06 11:01:57 +12:00
Copilot	c308e03e92	[select] Fix new_select() not forwarding constructor args while preserving keyword-only options parameter (#10036 ) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: clydebarrow <2366188+clydebarrow@users.noreply.github.com> Co-authored-by: jesserockz <3060199+jesserockz@users.noreply.github.com>	2025-08-06 08:09:36 +12:00
NP v/d Spek	bd2b3b9da5	[espnow] Small changes and fixes (#10014 ) Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>	2025-08-06 07:46:40 +12:00
Kevin Ahrendt	d443a97dd8	[speaker] Media player fixes for IDF5.4 (#10088 )	2025-08-05 14:55:40 -04:00
J. Nick Koston	58a088e06b	Add myself to multiple bluetooth codeowners (#10083 )	2025-08-05 09:00:04 +00:00
Jesse Hills	49a46883ed	[core] Update core component codeowners to ``@esphome/core`` (#10082 )	2025-08-05 06:24:24 +00:00
J. Nick Koston	bc03538e25	Support multiple --device arguments for address fallback (#10003 ) Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>	2025-08-05 16:40:46 +12:00
dependabot[bot]	969034b61a	Bump docker/login-action from 3.4.0 to 3.5.0 in the docker-actions group (#10081 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-08-05 16:18:42 +12:00
Jonathan Swoboda	06eb1b6014	[remote_transmitter] Add digital_write automation (#10069 ) Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>	2025-08-05 16:09:37 +12:00
Jesse Hills	589d00f17f	Merge branch 'release' into dev	2025-08-05 15:38:25 +12:00
Jesse Hills	68c0aa4d6d	Merge pull request #10079 from esphome/bump-2025.7.5 2025.7.5	2025-08-05 15:37:42 +12:00
dependabot[bot]	2fddb061e1	Bump aioesphomeapi from 37.2.4 to 37.2.5 (#10080 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-08-04 16:51:42 -10:00
Jesse Hills	c85eb448e4	[gpio_expander] Fix bank caching (#10077 ) Co-authored-by: J. Nick Koston <nick@koston.org> Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>	2025-08-05 13:45:52 +12:00
Jesse Hills	396c02c6de	[core] Allow extra args on cli and just ignore them (#9814 ) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-08-05 13:33:12 +12:00
Jesse Hills	52c4509208	[esp32_dac] Always use esp-idf APIs (#9833 )	2025-08-05 13:31:56 +12:00
Jesse Hills	d29cae9c3b	Bump version to 2025.7.5	2025-08-05 13:21:00 +12:00
Chris Beswick	532e3e370f	[i2s_audio] Use high-pass filter for dc offset correction (#10005 )	2025-08-05 13:21:00 +12:00
Clyde Stubbs	da573a217d	[font] Catch file load exception (#10058 ) Co-authored-by: clydeps <U5yx99dok9>	2025-08-05 13:21:00 +12:00
J. Nick Koston	a9b27d1966	[api] Fix OTA progress updates not being sent when main loop is blocked (#10049 )	2025-08-05 13:21:00 +12:00
Clyde Stubbs	0aa3c9685e	[lvgl] Bugfix for tileview (#9938 )	2025-08-05 13:21:00 +12:00
J. Nick Koston	93b28447ee	[bluetooth_proxy] Optimize memory usage with fixed-size array and const string references (#10015 )	2025-08-05 13:13:55 +12:00
J. Nick Koston	52634dac2a	[tests] Add datetime entities to host_mode_many_entities integration test (#10032 )	2025-08-05 13:12:05 +12:00
J. Nick Koston	64c94c1440	[esp32_ble_client] Fix connection parameter timing by setting preferences before connection (#10059 )	2025-08-05 13:11:32 +12:00
J. Nick Koston	f7bf1ef52c	[esp32_ble_tracker] Eliminate redundant ring buffer for lower latency (#10057 ) Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>	2025-08-05 13:10:32 +12:00
J. Nick Koston	fa8c5e880c	[esp32_ble_tracker] Optimize connection by promoting client immediately after scan stop trigger (#10061 ) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-08-05 13:10:02 +12:00
J. Nick Koston	27ba90ea95	[esp32_ble_client] Start MTU negotiation earlier following ESP-IDF examples (#10062 )	2025-08-05 12:59:23 +12:00
J. Nick Koston	469246b8d8	[bluetooth_proxy] Warn about BLE connection timeout mismatch on Arduino framework (#10063 ) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-08-05 12:58:41 +12:00
J. Nick Koston	50f15735dc	[api] Add helpful compile-time errors for Custom API Device methods (#10076 )	2025-08-05 12:57:31 +12:00
mschnaubelt	83d9c02a1b	Add CO5300 display support (#9739 )	2025-08-05 09:41:55 +10:00
Jonathan Swoboda	701e6099aa	[espnow, web_server_idf] Fix IDF 5.5 compile issues (#10068 )	2025-08-04 08:56:34 -10:00
Chris Beswick	d59476d0e1	[i2s_audio] Use high-pass filter for dc offset correction (#10005 )	2025-08-04 10:43:44 -04:00
Djordje Mandic	fbbb791b0d	[gt911] Use timeout instead of delay, shortened log msg (#10024 ) Co-authored-by: Keith Burzinski <kbx81x@gmail.com>	2025-08-04 03:37:43 -05:00