Merge branch 'dev' into number-traits-set-range

apply automatic formatting fixes
Merge remote-tracking branch 'origin/dev' into number-traits-set-range
2026-10-27 00:12:11 +00:00 · 2026-10-26 05:53:09 -10:00 · 2026-10-26 15:49:36 +00:00 · 2026-10-26 05:47:58 -10:00 · 2026-10-19 08:01:39 -10:00 · 2026-10-09 18:27:29 -10:00
306 changed files with 2403 additions and 6704 deletions
@@ -17,7 +17,7 @@ runs:
  steps:
    - name: Set up Python ${{ inputs.python-version }}
      id: python
-      uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0
+      uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
      with:
        python-version: ${{ inputs.python-version }}
    - name: Restore Python virtual environment
@@ -32,7 +32,7 @@ runs:
      # detects the activated venv via ``VIRTUAL_ENV`` so the venv layout
      # downstream jobs rely on is preserved.
      if: steps.cache-venv.outputs.cache-hit != 'true'
-      uses: astral-sh/setup-uv@07a047e608db84b3d8c06cd9a7c7dcc9c355c18e # v10.3.2
+      uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
      with:
        enable-cache: true
        # Pull request saves land in per-PR scopes nothing else can
@@ -23,13 +23,13 @@ jobs:
      - name: Checkout
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
      - name: Set up Python
-        uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
        with:
          python-version: "3.12"
      - name: Set up uv
        # ``--system`` (below) installs into the setup-python interpreter;
        # no venv is created or restored by this workflow.
-        uses: astral-sh/setup-uv@07a047e608db84b3d8c06cd9a7c7dcc9c355c18e # v10.3.2
+        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
        with:
          enable-cache: true
          # Pull-request-only workflow: a save could never be shared and
@@ -62,7 +62,7 @@ jobs:
    steps:
      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
      - name: Set up Python
-        uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
        with:
          python-version: "3.12"
      - name: Set up Docker Buildx
@@ -97,7 +97,7 @@ jobs:

      - name: Log in to the GitHub container registry
        if: steps.tag.outputs.push == 'true'
-        uses: docker/login-action@81c6f93d4bc991e510b342a00b419b3bb4efc5c6 # v4.7.0
+        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -154,14 +154,14 @@ jobs:
    steps:
      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
      - name: Set up Python
-        uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
        with:
          python-version: "3.12"
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@594f3bf4285d9ea8dc53c9a0c9c4092420091003 # v4.4.0

      - name: Log in to the GitHub container registry
-        uses: docker/login-action@81c6f93d4bc991e510b342a00b419b3bb4efc5c6 # v4.7.0
+        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -34,7 +34,7 @@ jobs:
        run: echo key="${{ hashFiles('requirements.txt', 'requirements_dev.txt', 'requirements_test.txt', '.pre-commit-config.yaml') }}" >> $GITHUB_OUTPUT
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
      - name: Restore Python virtual environment
@@ -49,7 +49,7 @@ jobs:
        # detects the activated venv via ``VIRTUAL_ENV`` so downstream jobs
        # that ``. venv/bin/activate`` see an identical layout.
        if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: astral-sh/setup-uv@07a047e608db84b3d8c06cd9a7c7dcc9c355c18e # v10.3.2
+        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
        with:
          enable-cache: true
          # Pull request saves land in per-PR scopes nothing else can
@@ -422,7 +422,7 @@ jobs:
          version: 1.2
      - name: Set up Python 3.13
        id: python
-        uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
        with:
          python-version: "3.13"
      - name: Restore integration library cache
@@ -441,7 +441,7 @@ jobs:
      - name: Set up uv
        # Only needed on cache miss to populate the venv.
        if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: astral-sh/setup-uv@07a047e608db84b3d8c06cd9a7c7dcc9c355c18e # v10.3.2
+        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
        with:
          enable-cache: true
          # Pull request saves land in per-PR scopes nothing else can
@@ -462,7 +462,6 @@ jobs:
      - name: Register matcher
        run: echo "::add-matcher::.github/workflows/matchers/pytest.json"
      - name: Run integration tests
-        id: integration
        env:
          # JSON array of test paths; parsed into a bash array below to avoid
          # shell word-splitting / glob hazards.
@@ -478,32 +477,6 @@ jobs:
          # A hung test fails after 30 min: the 15 min shared build lock wait plus a cold compile
          pytest -vv --no-cov --tb=native --durations=30 -n auto --dist worksteal --timeout=1800 \
            --junitxml=junit-integration.xml "${test_files[@]}"
-      - name: Re-run the failed tests with debug symbols
-        # The first run builds without -g. A crash in the re-run prints a gdb
-        # backtrace of its core; exit 1 keeps the job red when the re-run passes.
-        if: failure() && steps.integration.outcome == 'failure'
-        timeout-minutes: 30
-        env:
-          ESPHOME_INTEGRATION_DEBUG_SYMBOLS: "1"
-          ESPHOME_INTEGRATION_CORE_DIR: /tmp/esphome-cores
-        run: |
-          . venv/bin/activate
-          # The image's package lists usually suffice; refresh them only if not
-          if ! command -v gdb >/dev/null &&
-            ! sudo DEBIAN_FRONTEND=noninteractive timeout -k 15 90 apt-get install -y -qq gdb; then
-            sudo timeout -k 15 300 apt-get update -qq &&
-              sudo DEBIAN_FRONTEND=noninteractive timeout -k 15 300 apt-get install -y -qq gdb ||
-              echo "::warning::gdb install failed; no backtraces"
-          fi
-          {
-            mkdir -p "$ESPHOME_INTEGRATION_CORE_DIR" &&
-              echo "$ESPHOME_INTEGRATION_CORE_DIR/core.%p" | sudo tee /proc/sys/kernel/core_pattern &&
-              ulimit -c unlimited
-          } || echo "::warning::core dumps not enabled; no backtraces"
-          # Under the step limit, so a hung test still reports before Actions kills the step
-          pytest -vv --no-cov --tb=native -n auto --dist worksteal --timeout=600 \
-            --lf --lfnf=none tests/integration || true
-          exit 1
      - name: Upload test artifacts
        # Tests that compare rendered output write the image they actually got here, so a
        # failure can be looked at without reproducing the whole build locally.
@@ -657,7 +630,7 @@ jobs:
            apt-get install -y libc6-dbg

      - name: Run CodSpeed benchmarks
-        uses: CodSpeedHQ/action@78102a468f96d8e0ccb92d0ec49425753fc42062 # v5.6.0
+        uses: CodSpeedHQ/action@821a40cd6c80e3cfe387caf55668287addd808da # v5.5.0
        with:
          run: |
            . venv/bin/activate
@@ -1484,7 +1457,7 @@ jobs:
          ref: main
          path: device-builder
      - name: Set up Python
-        uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
        with:
          python-version: "3.13"
      - name: Set up uv
@@ -1493,7 +1466,7 @@ jobs:
        # install step (order-of-magnitude faster on cold boots,
        # with its own wheel cache). actions/setup-python still
        # provides the interpreter.
-        uses: astral-sh/setup-uv@07a047e608db84b3d8c06cd9a7c7dcc9c355c18e # v10.3.2
+        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
        with:
          enable-cache: true
          # Pull request saves land in per-PR scopes nothing else can
@@ -56,7 +56,7 @@ jobs:

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@9b3254085494b55a0f7c4c2b3d2d52cc712ce370 # v4.39.1
+        uses: github/codeql-action/init@6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee # v4.39.0
        with:
          languages: ${{ matrix.language }}
          build-mode: ${{ matrix.build-mode }}
@@ -84,6 +84,6 @@ jobs:
          exit 1

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@9b3254085494b55a0f7c4c2b3d2d52cc712ce370 # v4.39.1
+        uses: github/codeql-action/analyze@6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee # v4.39.0
        with:
          category: "/language:${{matrix.language}}"
@@ -86,7 +86,7 @@ jobs:
    steps:
      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
      - name: Set up Python
-        uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
        with:
          python-version: "3.x"
      - name: Build
@@ -118,7 +118,7 @@ jobs:
    steps:
      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
      - name: Set up Python
-        uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
        with:
          python-version: "3.12"

@@ -126,12 +126,12 @@ jobs:
        uses: docker/setup-buildx-action@594f3bf4285d9ea8dc53c9a0c9c4092420091003 # v4.4.0

      - name: Log in to docker hub
-        uses: docker/login-action@81c6f93d4bc991e510b342a00b419b3bb4efc5c6 # v4.7.0
+        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
        with:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASSWORD }}
      - name: Log in to the GitHub container registry
-        uses: docker/login-action@81c6f93d4bc991e510b342a00b419b3bb4efc5c6 # v4.7.0
+        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -206,13 +206,13 @@ jobs:

      - name: Log in to docker hub
        if: matrix.registry == 'dockerhub'
-        uses: docker/login-action@81c6f93d4bc991e510b342a00b419b3bb4efc5c6 # v4.7.0
+        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.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@81c6f93d4bc991e510b342a00b419b3bb4efc5c6 # v4.7.0
+        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -71,7 +71,7 @@ jobs:
          token: ${{ steps.generate-token.outputs.token }}

      - name: Set up Python
-        uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
        with:
          python-version: "3.12"

@@ -37,7 +37,7 @@ jobs:
          path: lib/home-assistant

      - name: Setup Python
-        uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
        with:
          python-version: "3.14"

@@ -47,7 +47,7 @@ jobs:
        # setup-python interpreter so subsequent ``prek`` /
        # ``script/run-in-env.py`` steps find the deps without a
        # ``uv run`` prefix.
-        uses: astral-sh/setup-uv@07a047e608db84b3d8c06cd9a7c7dcc9c355c18e # v10.3.2
+        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
        with:
          enable-cache: true
          # Pin uv version so the action does not have to fetch the
@@ -31,7 +31,7 @@ jobs:
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

      - name: Setup Python
-        uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
        with:
          python-version: "3.13"

@@ -10,7 +10,7 @@ ci:
 repos:
  - repo: https://github.com/astral-sh/ruff-pre-commit
    # Ruff version.
-    rev: v0.17.2
+    rev: v0.17.1
    hooks:
      # Run the linter.
      - id: ruff
@@ -1305,7 +1305,10 @@ def upload_program(
                f"{option_string} is only supported with the esphome OTA platform; "
                "the web_server OTA path can only update the firmware image."
            )
-        return _upload_via_web_server(config, network_devices, _app_ota_image(args))
+        binary = CORE.firmware_bin
+        if getattr(args, "file", None) is not None:
+            binary = Path(args.file)
+        return _upload_via_web_server(config, network_devices, binary)

    return _upload_via_native_api(config, network_devices, args)

@@ -1361,16 +1364,6 @@ def _esphome_ota_conf(config: ConfigType) -> ConfigType | None:
    return next(iter(esphome_ota_items(config)), None)


-def _app_ota_image(args: ArgsProtocol) -> Path:
-    """The file an app update sends: ``--file`` or the build output, as the
-    target platform's ota_image hook picks it."""
-    binary = CORE.firmware_bin
-    if (file := getattr(args, "file", None)) is not None:
-        binary = Path(file)
-    ota_image = platform_hooks.get_platform_hook(CORE.target_platform, "ota_image")
-    return ota_image(binary) if ota_image is not None else binary
-
-
 def _upload_via_native_api(
    config: ConfigType, network_devices: list[str], args: ArgsProtocol
 ) -> tuple[int, str | None]:
@@ -1420,27 +1413,27 @@ def _upload_via_native_api(
                f"flash a build with the option enabled, and then retry {option_string}."
            )

+    binary = CORE.firmware_bin
    ota_type = espota2.OTA_TYPE_UPDATE_APP
-    file = getattr(args, "file", None)
    if getattr(args, "partition_table", False):
        # Fail fast if the resolved ESPHome OTA config does not enable allow_partition_access.
        # The device-side handshake also rejects this with "Device only supports app updates",
        # but checking here surfaces the misconfiguration before opening a network connection.
        check_partition_access("--partition-table")
-        binary = Path(file) if file is not None else CORE.partition_table_bin
+        binary = CORE.partition_table_bin
        ota_type = espota2.OTA_TYPE_UPDATE_PARTITION_TABLE
    elif getattr(args, "bootloader", False):
        check_partition_access("--bootloader")
        if (
-            file is None
+            getattr(args, "file", None) is None
            and (native := native_backend())
            and (hint := getattr(native, "missing_image_hint", lambda: None)())
        ):
            raise EsphomeError(hint)
-        binary = Path(file) if file is not None else CORE.bootloader_bin
+        binary = CORE.bootloader_bin
        ota_type = espota2.OTA_TYPE_UPDATE_BOOTLOADER
-    else:
-        binary = _app_ota_image(args)
+    if getattr(args, "file", None) is not None:
+        binary = Path(args.file)

    if ota_type == espota2.OTA_TYPE_UPDATE_PARTITION_TABLE:
        _validate_partition_table_binary(binary)
@@ -25,7 +25,6 @@ from esphome.framework_helpers import (
    get_project_link_flags,
 )
 from esphome.helpers import get_bool_env, mkdir_p, write_file_if_changed
-from esphome.platformio.library import lex_build_flags

 _LOGGER = logging.getLogger(__name__)

@@ -155,47 +154,6 @@ def has_discovered_components() -> bool:
    return bool(get_available_components())


-_KEY_WARNED_BUILD_FLAGS = "warned_build_flags"
-
-
-def _lexed_build_flags() -> list[str]:
-    """Shell-lex the build flag entries as the other generators do, so an
-    entry holding several flags is classified flag by flag. Warns once per
-    entry about a flag that native ESP-IDF builds do not pass on."""
-    warned: set[tuple[str, str]] = CORE.data.setdefault(KEY_ESP32, {}).setdefault(
-        _KEY_WARNED_BUILD_FLAGS, set()
-    )
-    flags: list[str] = []
-    for entry in sorted(CORE.build_flags):
-        tokens = lex_build_flags(entry, "esphome build_flags")
-        for token in tokens:
-            if (
-                (token, entry) not in warned
-                and not get_project_compile_flags([token])
-                and not get_project_link_flags([token])
-            ):
-                warned.add((token, entry))
-                _LOGGER.warning(
-                    "Build flag '%s'%s is ignored: native ESP-IDF builds only "
-                    "pass -D, -W and -Wl, flags",
-                    token,
-                    "" if token == entry else f" in '{entry}'",
-                )
-        flags += tokens
-    return flags
-
-
-def _cmake_args(flags: list[str]) -> list[str]:
-    """Quote each flag as a CMake argument so quotes, backslashes and $
-    survive."""
-    return [
-        '"{}"'.format(
-            flag.replace("\\", "\\\\").replace('"', '\\"').replace("$", "\\$")
-        )
-        for flag in flags
-    ]
-
-
 def _cmake_quote(value: str) -> str:
    """Quote a cmake arg value for a set() line. add_cmake_arg rejects
    whitespace, quotes, and '$', so only backslashes need escaping."""
@@ -336,24 +294,18 @@ def get_project_cmakelists(
    # esphome__micro-mp3) rather than just src/. Required so suppressions
    # like ``-Wno-error=maybe-uninitialized`` actually silence warnings in
    # third-party components we don't author.
-    # CMake keeps only the first copy of a repeated option; drop all but the
-    # last copy instead so the last definition wins, as on the command line.
-    project_compile_opts = list(
-        reversed(
-            dict.fromkeys(reversed(get_project_compile_flags(_lexed_build_flags())))
-        )
-    )
+    project_compile_opts = get_project_compile_flags()
    extra_compile_options = "\n".join(
-        f"idf_build_set_property(COMPILE_OPTIONS {flag} APPEND)"
-        for flag in _cmake_args(project_compile_opts)
+        f'idf_build_set_property(COMPILE_OPTIONS "{flag}" APPEND)'
+        for flag in project_compile_opts
    )

    # Flags registered via cg.add_cxx_build_flag() go on CXX_COMPILE_OPTIONS
    # (not COMPILE_OPTIONS) because GCC warns when a C++-only flag such as
    # -Wno-volatile is passed on a C compile.
    cxx_compile_options = "\n".join(
-        f"idf_build_set_property(CXX_COMPILE_OPTIONS {flag} APPEND)"
-        for flag in _cmake_args(get_project_cxx_compile_flags())
+        f'idf_build_set_property(CXX_COMPILE_OPTIONS "{flag}" APPEND)'
+        for flag in get_project_cxx_compile_flags()
    )

    cpp_standard_options = (
@@ -509,7 +461,7 @@ def get_component_cmakelists() -> str:
    # Extract linker options (-Wl, flags). Compile flags (-D, -W) are
    # emitted project-wide via idf_build_set_property in
    # get_project_cmakelists so they reach every component, not just src/.
-    link_opts = _cmake_args(get_project_link_flags(_lexed_build_flags()))
+    link_opts = get_project_link_flags()
    link_opts_str = "\n    ".join(link_opts) if link_opts else ""
    src_cmake = "\n".join(CORE.data[KEY_ESP32].get(KEY_SRC_CMAKE, []))

@@ -33,35 +33,9 @@ _CACHE_VERSION = 1
 _LAMBDA_KEY = "__esphome_lambda__"


-_CACHE_SUFFIX = ".validated.json"
-
-
 def compiled_config_path(config_filename: str) -> Path:
    """Path to the cached validated config alongside the storage sidecar."""
-    return CORE.data_dir / "storage" / f"{config_filename}{_CACHE_SUFFIX}"
-
-
-def invalidate_compiled_config() -> None:
-    """Drop every cache in the storage dir after a change to a file the
-    mtime check cannot see, such as secrets.yaml or an include; other
-    configurations may share that file."""
-    storage = compiled_config_path(CORE.config_filename).parent
-    try:
-        caches = [p for p in storage.iterdir() if p.name.endswith(_CACHE_SUFFIX)]
-    except FileNotFoundError:
-        return
-    except OSError as err:
-        raise EsphomeError(
-            f"Could not list the validated config caches in {storage}: {err}"
-        ) from err
-    for path in caches:
-        try:
-            path.unlink(missing_ok=True)
-        except OSError as err:
-            # A stale cache would present the old key on the next upload
-            raise EsphomeError(
-                f"Could not remove the validated config cache {path}: {err}"
-            ) from err
+    return CORE.data_dir / "storage" / f"{config_filename}.validated.json"


 def save_compiled_config(config: ConfigType) -> None:
@@ -297,7 +297,9 @@ void ADE7880::init_device_() {
 void ADE7880::reset_device_() {
  if (this->reset_pin_ != nullptr) {
    ESP_LOGD(TAG, "Reset device using RESET pin");
-    pulse_reset(this->reset_pin_, {.low_ms = 1});
+    this->reset_pin_->digital_write(false);
+    delay(1);
+    this->reset_pin_->digital_write(true);
  } else {
    ESP_LOGD(TAG, "Reset device using SWRST command");
    this->write_u16_register16_(CONFIG, CONFIG_SWRST);
@@ -14,80 +14,80 @@ ESPHOME_LOG_TAG(TAG, "aic3204");
    return; \
  }

-static constexpr i2c::I2CRegValue AIC3204_INIT[] PROGMEM = {
-    // Set register page to 0
-    {AIC3204_PAGE_CTRL, 0x00},
-    // Initiate SW reset (PLL is powered off as part of reset)
-    {AIC3204_SW_RST, 0x01},
-    // *** Program clock settings ***
-    // Default is CODEC_CLKIN is from MCLK pin. Don't need to change this.
-    // MDAC*NDAC*FOSR*48Khz = mClk (24.576 MHz when the XMOS is expecting 48kHz audio)
-    // (See page 51 of https://www.ti.com/lit/ml/slaa557/slaa557.pdf)
-    // We do need MDAC*DOSR/32 >= the resource compute level for the processing block
-    // So here 2*128/32 = 8, which is equal to processing block 1 's resource compute
-    // See page 5 of https://www.ti.com/lit/an/slaa404c/slaa404c.pdf for the workflow
-    // for determining these settings.
-    // Power up NDAC and set to 2
-    {AIC3204_NDAC, 0x82},
-    // Power up MDAC and set to 2
-    {AIC3204_MDAC, 0x82},
-    // Program DOSR = 128
-    {AIC3204_DOSR, 0x80},
-    // Set Audio Interface Config: I2S, 32 bits, DOUT always driving
-    {AIC3204_CODEC_IF, 0x30},
-    // For I2S Firmware only, set SCLK/MFP3 pin as Audio Data In
-    {AIC3204_SCLK_MFP3, 0x02},
-    {AIC3204_AUDIO_IF_4, 0x01},
-    {AIC3204_AUDIO_IF_5, 0x01},
-    // Program the DAC processing block to be used - PRB_P1
-    {AIC3204_DAC_SIG_PROC, 0x01},
-    // *** Select Page 1 ***
-    {AIC3204_PAGE_CTRL, 0x01},
-    // Enable the internal AVDD_LDO:
-    {AIC3204_LDO_CTRL, 0x09},
-    // *** Program Analog Blocks ***
-    // Disable Internal Crude AVdd in presence of external AVdd supply or before powering up internal AVdd LDO
-    {AIC3204_PWR_CFG, 0x08},
-    // Enable Master Analog Power Control
-    {AIC3204_LDO_CTRL, 0x01},
-    // Page 125: Common mode control register, set d6 to 1 to make the full chip common mode = 0.75 v
-    // We are using the internal AVdd regulator with a nominal output of 1.72 V (see LDO_CTRL_REGISTER on page 123)
-    // Page 86 says to only set the common mode voltage to 0.9 v if AVdd >= 1.8... but it isn't on our hardware
-    // We also adjust the HPL and HPR gains to -2dB gian later in this config flow compensate (see page 47)
-    // (All pages refer to the TLV320AIC3204 Application Reference Guide)
-    {AIC3204_CM_CTRL, 0x40},
-    // *** Set PowerTune Modes ***
-    // Set the Left & Right DAC PowerTune mode to PTM_P3/4. Use Class-AB driver.
-    {AIC3204_PLAY_CFG1, 0x00},
-    {AIC3204_PLAY_CFG2, 0x00},
-    // Set the REF charging time to 40ms
-    {AIC3204_REF_STARTUP, 0x01},
-    // HP soft stepping settings for optimal pop performance at power up
-    // Rpop used is 6k with N = 6 and soft step = 20usec. This should work with 47uF coupling
-    // capacitor. Can try N=5,6 or 7 time constants as well. Trade-off delay vs “pop” sound.
-    {AIC3204_HP_START, 0x25},
-    // Route Left DAC to HPL
-    {AIC3204_HPL_ROUTE, 0x08},
-    // Route Right DAC to HPR
-    {AIC3204_HPR_ROUTE, 0x08},
-    // Route Left DAC to LOL
-    {AIC3204_LOL_ROUTE, 0x08},
-    // Route Right DAC to LOR
-    {AIC3204_LOR_ROUTE, 0x08},
-    // Unmute HPL and set gain to -2dB (see comment before configuring the AIC3204_CM_CTRL register)
-    {AIC3204_HPL_GAIN, 0x3e},
-    // Unmute HPR and set gain to -2dB (see comment before configuring the AIC3204_CM_CTRL register)
-    {AIC3204_HPR_GAIN, 0x3e},
-    // Unmute LOL and set gain to 0dB
-    {AIC3204_LOL_DRV_GAIN, 0x00},
-    // Unmute LOR and set gain to 0dB
-    {AIC3204_LOR_DRV_GAIN, 0x00},
-    // Power up HPL and HPR, LOL and LOR drivers
-    {AIC3204_OP_PWR_CTRL, 0x3C},
-};
-
 void AIC3204::setup() {
-  ERROR_CHECK(this->write_registers(AIC3204_INIT), "Failed to initialize");
+  // Set register page to 0
+  ERROR_CHECK(this->write_byte(AIC3204_PAGE_CTRL, 0x00), "Set page 0 failed");
+  // Initiate SW reset (PLL is powered off as part of reset)
+  ERROR_CHECK(this->write_byte(AIC3204_SW_RST, 0x01), "Software reset failed");
+  // *** Program clock settings ***
+  // Default is CODEC_CLKIN is from MCLK pin. Don't need to change this.
+  // MDAC*NDAC*FOSR*48Khz = mClk (24.576 MHz when the XMOS is expecting 48kHz audio)
+  // (See page 51 of https://www.ti.com/lit/ml/slaa557/slaa557.pdf)
+  // We do need MDAC*DOSR/32 >= the resource compute level for the processing block
+  // So here 2*128/32 = 8, which is equal to processing block 1 's resource compute
+  // See page 5 of https://www.ti.com/lit/an/slaa404c/slaa404c.pdf for the workflow
+  // for determining these settings.
+
+  // Power up NDAC and set to 2
+  ERROR_CHECK(this->write_byte(AIC3204_NDAC, 0x82), "Set NDAC failed");
+  // Power up MDAC and set to 2
+  ERROR_CHECK(this->write_byte(AIC3204_MDAC, 0x82), "Set MDAC failed");
+  // Program DOSR = 128
+  ERROR_CHECK(this->write_byte(AIC3204_DOSR, 0x80), "Set DOSR failed");
+  // Set Audio Interface Config: I2S, 32 bits, DOUT always driving
+  ERROR_CHECK(this->write_byte(AIC3204_CODEC_IF, 0x30), "Set CODEC_IF failed");
+  // For I2S Firmware only, set SCLK/MFP3 pin as Audio Data In
+  ERROR_CHECK(this->write_byte(AIC3204_SCLK_MFP3, 0x02), "Set SCLK/MFP3 failed");
+  ERROR_CHECK(this->write_byte(AIC3204_AUDIO_IF_4, 0x01), "Set AUDIO_IF_4 failed");
+  ERROR_CHECK(this->write_byte(AIC3204_AUDIO_IF_5, 0x01), "Set AUDIO_IF_5 failed");
+  // Program the DAC processing block to be used - PRB_P1
+  ERROR_CHECK(this->write_byte(AIC3204_DAC_SIG_PROC, 0x01), "Set DAC_SIG_PROC failed");
+
+  // *** Select Page 1 ***
+  ERROR_CHECK(this->write_byte(AIC3204_PAGE_CTRL, 0x01), "Set page 1 failed");
+  // Enable the internal AVDD_LDO:
+  ERROR_CHECK(this->write_byte(AIC3204_LDO_CTRL, 0x09), "Set LDO_CTRL failed");
+  // *** Program Analog Blocks ***
+  // Disable Internal Crude AVdd in presence of external AVdd supply or before powering up internal AVdd LDO
+  ERROR_CHECK(this->write_byte(AIC3204_PWR_CFG, 0x08), "Set PWR_CFG failed");
+  // Enable Master Analog Power Control
+  ERROR_CHECK(this->write_byte(AIC3204_LDO_CTRL, 0x01), "Set LDO_CTRL failed");
+  // Page 125: Common mode control register, set d6 to 1 to make the full chip common mode = 0.75 v
+  // We are using the internal AVdd regulator with a nominal output of 1.72 V (see LDO_CTRL_REGISTER on page 123)
+  // Page 86 says to only set the common mode voltage to 0.9 v if AVdd >= 1.8... but it isn't on our hardware
+  // We also adjust the HPL and HPR gains to -2dB gian later in this config flow compensate (see page 47)
+  // (All pages refer to the TLV320AIC3204 Application Reference Guide)
+  ERROR_CHECK(this->write_byte(AIC3204_CM_CTRL, 0x40), "Set CM_CTRL failed");
+  // *** Set PowerTune Modes ***
+  // Set the Left & Right DAC PowerTune mode to PTM_P3/4. Use Class-AB driver.
+  ERROR_CHECK(this->write_byte(AIC3204_PLAY_CFG1, 0x00), "Set PLAY_CFG1 failed");
+  ERROR_CHECK(this->write_byte(AIC3204_PLAY_CFG2, 0x00), "Set PLAY_CFG2 failed");
+  // Set the REF charging time to 40ms
+  ERROR_CHECK(this->write_byte(AIC3204_REF_STARTUP, 0x01), "Set REF_STARTUP failed");
+  // HP soft stepping settings for optimal pop performance at power up
+  // Rpop used is 6k with N = 6 and soft step = 20usec. This should work with 47uF coupling
+  // capacitor. Can try N=5,6 or 7 time constants as well. Trade-off delay vs “pop” sound.
+  ERROR_CHECK(this->write_byte(AIC3204_HP_START, 0x25), "Set HP_START failed");
+  // Route Left DAC to HPL
+  ERROR_CHECK(this->write_byte(AIC3204_HPL_ROUTE, 0x08), "Set HPL_ROUTE failed");
+  // Route Right DAC to HPR
+  ERROR_CHECK(this->write_byte(AIC3204_HPR_ROUTE, 0x08), "Set HPR_ROUTE failed");
+  // Route Left DAC to LOL
+  ERROR_CHECK(this->write_byte(AIC3204_LOL_ROUTE, 0x08), "Set LOL_ROUTE failed");
+  // Route Right DAC to LOR
+  ERROR_CHECK(this->write_byte(AIC3204_LOR_ROUTE, 0x08), "Set LOR_ROUTE failed");
+
+  // Unmute HPL and set gain to -2dB (see comment before configuring the AIC3204_CM_CTRL register)
+  ERROR_CHECK(this->write_byte(AIC3204_HPL_GAIN, 0x3e), "Set HPL_GAIN failed");
+  // Unmute HPR and set gain to -2dB (see comment before configuring the AIC3204_CM_CTRL register)
+  ERROR_CHECK(this->write_byte(AIC3204_HPR_GAIN, 0x3e), "Set HPR_GAIN failed");
+  // Unmute LOL and set gain to 0dB
+  ERROR_CHECK(this->write_byte(AIC3204_LOL_DRV_GAIN, 0x00), "Set LOL_DRV_GAIN failed");
+  // Unmute LOR and set gain to 0dB
+  ERROR_CHECK(this->write_byte(AIC3204_LOR_DRV_GAIN, 0x00), "Set LOR_DRV_GAIN failed");
+
+  // Power up HPL and HPR, LOL and LOR drivers
+  ERROR_CHECK(this->write_byte(AIC3204_OP_PWR_CTRL, 0x3C), "Set OP_PWR_CTRL failed");

  // Wait for 2.5 sec for soft stepping to take effect before attempting power-up
  this->set_timeout(2500, [this]() {
@@ -174,10 +174,14 @@ def _register_provisioning_source(config: ConfigType) -> ConfigType:

 CONF_SUPPORTS_RESPONSE = "supports_response"

-SupportsResponseType = api_ns.namespace("enums").enum("SupportsResponseType")
-SUPPORTS_RESPONSE_OPTIONS = SupportsResponseType.options(
-    "none", "optional", "only", "status", prefix="SUPPORTS_RESPONSE_"
-)
+# Enum values in api::enums namespace
+enums_ns = api_ns.namespace("enums")
+SUPPORTS_RESPONSE_OPTIONS = {
+    "none": enums_ns.SUPPORTS_RESPONSE_NONE,
+    "optional": enums_ns.SUPPORTS_RESPONSE_OPTIONAL,
+    "only": enums_ns.SUPPORTS_RESPONSE_ONLY,
+    "status": enums_ns.SUPPORTS_RESPONSE_STATUS,
+}


 def _auto_detect_supports_response(config: ConfigType) -> ConfigType:
@@ -253,9 +253,8 @@ template<typename... Ts> class APIRespondAction final : public Action<Ts...> {
 #endif

  void play(const Ts &...x) override {
-    // Extract call_id from first argument - it's always first for optional/only/status modes.
-    // By reference: array args are non-copyable FixedVector views.
-    auto args = std::forward_as_tuple(x...);
+    // Extract call_id from first argument - it's always first for optional/only/status modes
+    auto args = std::make_tuple(x...);
    uint32_t call_id = std::get<0>(args);

    bool success = this->success_.value(x...);
@@ -309,7 +308,7 @@ template<typename... Ts> class APIUnregisterServiceCallAction final : public Act

  void play(const Ts &...x) override {
    // Extract call_id from first argument - same convention as APIRespondAction
-    auto args = std::forward_as_tuple(x...);
+    auto args = std::make_tuple(x...);
    uint32_t call_id = std::get<0>(args);
    if (call_id != 0) {
      this->parent_->unregister_active_action_call(call_id);
@@ -54,8 +54,7 @@ static const char AS7341_NAME[] PROGMEM = "AS7341";
 static constexpr uint8_t AS7341_ADC_SLOTS = 6;
 static constexpr uint8_t AS7341_SMUX_LEN = 20;
 static constexpr uint8_t AS7341_SMUX_STEPS = 2;
-static constexpr i2c::I2CRegValue AS7341_INIT[] PROGMEM = {
-    {0x70, 0x00}};  // CONFIG: SPM mode, INT_SEL and LED_SEL cleared
+static const RegValue AS7341_INIT[] PROGMEM = {{0x70, 0x00}};  // CONFIG: SPM mode, INT_SEL and LED_SEL cleared
 static const uint8_t AS7341_SMUX[] PROGMEM = {
    0x30, 0x01, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x50, 0x00,  // step 0: F1 to F4, NIR, Clear
    0x00, 0x00, 0x20, 0x04, 0x00, 0x30, 0x01, 0x50, 0x00, 0x06,  // step 0, continued
@@ -151,8 +150,8 @@ static constexpr uint8_t AS7343_ADC_SLOTS = 18;
 static constexpr uint8_t AS7343_SMUX_LEN = 10;
 static const char TCS3448_NAME[] PROGMEM = "TCS3448";
 // CFG6, FD_CFG0, CFG10, CFG8, CFG20 (auto_smux, 18 channels in 3 cycles), AGC_GAIN_MAX, FD_TIME_1, FD_TIME_2
-static constexpr i2c::I2CRegValue AS7343_INIT[] PROGMEM = {{0xF5, 0x00}, {0xDF, 0xA1}, {0x65, 0xF2}, {0xC9, 0xC8},
-                                                           {0xD6, 0x62}, {0xD7, 0x99}, {0xE0, 0x64}, {0xE2, 0x21}};
+static const RegValue AS7343_INIT[] PROGMEM = {{0xF5, 0x00}, {0xDF, 0xA1}, {0x65, 0xF2}, {0xC9, 0xC8},
+                                               {0xD6, 0x62}, {0xD7, 0x99}, {0xE0, 0x64}, {0xE2, 0x21}};
 static const uint8_t AS7343_SMUX[] PROGMEM = {0x00, 0x04, 0x65, 0x02, 0x00, 0x05, 0x00, 0x01, 0x00, 0x30,
                                              0x00, 0x00, 0x60, 0x20, 0x04, 0x50, 0x03, 0x00, 0x01, 0x05,
                                              0x05, 0x00, 0x60, 0x00, 0x30, 0x00, 0x40, 0x10, 0x20, 0x00};
@@ -231,7 +230,7 @@ static constexpr ChipInfo as7343_chip(const char *name) {
      .gain_correction = AS7343_GAIN_CORRECTION,
      .contributions = AS7343_CONTRIBUTIONS,
      .tristimulus = AS7343_TRISTIMULUS,
-      .init_count = sizeof(AS7343_INIT) / sizeof(i2c::I2CRegValue),
+      .init_count = sizeof(AS7343_INIT) / sizeof(RegValue),
      .astep_reg = 0xD4,
      .cfg0_reg = 0xBF,
      .cfg1_reg = 0xC6,
@@ -299,9 +298,9 @@ void AS734XComponent::setup() {
    this->mark_failed(LOG_STR("Wrong chip ID"));
    return;
  }
-  const i2c::I2CRegValue *init = pgm(chip->init);
+  const RegValue *init = pgm(chip->init);
  for (uint8_t i = 0, n = pgm(chip->init_count); ok && i < n; i++) {
-    i2c::I2CRegValue rv;
+    RegValue rv;
    progmem_memcpy(&rv, &init[i], sizeof(rv));
    ok = this->select_bank_(rv.reg) && this->write_byte(rv.reg, rv.value);
  }
@@ -68,10 +68,15 @@ struct ChannelTristimulus {
  float z;
 };

+struct RegValue {
+  uint8_t reg;
+  uint8_t value;
+};
+
 /// Per-chip constants, stored in flash. The pointed-to tables are in flash too.
 struct ChipInfo {
  const char *name;
-  const i2c::I2CRegValue *init;              // written in order; the bank is selected per register address
+  const RegValue *init;                      // written in order; the bank is selected per register address
  const uint8_t *smux;                       // AS7341: SMUX RAM image per step; AS7343: the three chain images
  const uint8_t *readout;                    // per step, the ADC slot of each band (0xFF: not read in this step)
  const uint16_t *wavelengths;               // per band, WIDEBAND_NM for clear and ABSENT_NM for a missing band
@@ -16,7 +16,13 @@ constexpr static const uint8_t AXS_READ_TOUCHPAD[11] = {0xb5, 0xab, 0xa5, 0x5a,
  }

 void AXS15231Touchscreen::setup() {
-  pulse_reset(this->reset_pin_, {.low_ms = 5, .high_after_ms = 10});
+  if (this->reset_pin_ != nullptr) {
+    this->reset_pin_->setup();
+    this->reset_pin_->digital_write(false);
+    delay(5);
+    this->reset_pin_->digital_write(true);
+    delay(10);
+  }
  if (this->interrupt_pin_ != nullptr) {
    this->interrupt_pin_->pin_mode(gpio::FLAG_INPUT);
    this->interrupt_pin_->setup();
@@ -78,7 +78,3 @@ async def pin_to_code(config: ConfigType) -> MockObj:
 # Called by writer.py; delegates to the shared libretiny implementation.
 def copy_files() -> None:
    libretiny.copy_files()
-
-
-# Called by the OTA upload; the shared libretiny implementation.
-ota_image = libretiny.device_ota_image
@@ -1,7 +1,7 @@
 #include "bme680_bsec.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
-#include "esphome/core/progmem.h"
+#include <string>

 namespace esphome::bme680_bsec {
 #ifdef USE_BSEC
@@ -9,7 +9,7 @@ ESPHOME_LOG_TAG(TAG, "bme680_bsec.sensor");

 static constexpr uint32_t READ_TIMEOUT_ID = 0;

-PROGMEM_STRING_TABLE(IaqAccuracyStrings, "Stabilizing", "Uncertain", "Calibrating", "Calibrated");
+static const std::string IAQ_ACCURACY_STATES[4] = {"Stabilizing", "Uncertain", "Calibrating", "Calibrated"};

 std::vector<BME680BSECComponent *>
    BME680BSECComponent::instances;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
@@ -386,11 +386,10 @@ void BME680BSECComponent::publish_(const bsec_output_t *outputs, uint8_t num_out
    switch (outputs[i].sensor_id) {
      case BSEC_OUTPUT_IAQ:
      case BSEC_OUTPUT_STATIC_IAQ: {
-        uint8_t accuracy = std::min<uint8_t>(outputs[i].accuracy, IaqAccuracyStrings::LAST_INDEX);
+        uint8_t accuracy = std::min<uint8_t>(outputs[i].accuracy, std::size(IAQ_ACCURACY_STATES) - 1);
        this->queue_push_([this, signal]() { this->publish_sensor_(this->iaq_sensor_, signal); });
        this->queue_push_([this, accuracy]() {
-          this->publish_sensor_(this->iaq_accuracy_text_sensor_,
-                                IaqAccuracyStrings::get_progmem_str(accuracy, IaqAccuracyStrings::LAST_INDEX));
+          this->publish_sensor_(this->iaq_accuracy_text_sensor_, IAQ_ACCURACY_STATES[accuracy]);
        });
        this->queue_push_([this, accuracy]() { this->publish_sensor_(this->iaq_accuracy_sensor_, accuracy, true); });

@@ -436,9 +435,8 @@ void BME680BSECComponent::publish_sensor_(sensor::Sensor *sensor, float value, b
  sensor->publish_state(value);
 }

-void BME680BSECComponent::publish_sensor_(text_sensor::TextSensor *sensor, ProgmemStr value) {
-  if (!sensor ||
-      (sensor->has_state() && ESPHOME_strcmp_P(sensor->state.c_str(), reinterpret_cast<ESPHOME_PGM_P>(value)) == 0)) {
+void BME680BSECComponent::publish_sensor_(text_sensor::TextSensor *sensor, const std::string &value) {
+  if (!sensor || (sensor->has_state() && sensor->state == value)) {
    return;
  }
  sensor->publish_state(value);
@@ -77,7 +77,7 @@ class BME680BSECComponent final : public Component, public i2c::I2CDevice {
  int64_t get_time_ns_();

  void publish_sensor_(sensor::Sensor *sensor, float value, bool change_only = false);
-  void publish_sensor_(text_sensor::TextSensor *sensor, ProgmemStr value);
+  void publish_sensor_(text_sensor::TextSensor *sensor, const std::string &value);

  void snapshot_state_();  // Fetch the current BSEC library state and save it in the bsec_state_data_ member (volatile
                           // memory)
@@ -2,7 +2,6 @@
 #include "cc1101pa.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
-#include "esphome/core/progmem.h"
 #include <cmath>
 #include <cstring>

@@ -15,9 +14,6 @@ namespace esphome::cc1101 {
 ESPHOME_LOG_TAG(TAG, "cc1101");
 static constexpr size_t TX_FIFO_SIZE = 64;

-// MDMCFG2 MOD_FORMAT values
-PROGMEM_STRING_TABLE(ModulationStrings, "2-FSK", "GFSK", "UNUSED", "ASK/OOK", "4-FSK", "UNUSED", "UNUSED", "MSK");
-
 static void split_float(float value, int mbits, uint8_t &e, uint32_t &m) {
  int e_tmp;
  float m_tmp = std::frexp(value, &e_tmp);
@@ -242,6 +238,8 @@ void CC1101Component::loop() {
 }

 void CC1101Component::dump_config() {
+  static const char *const MODULATION_NAMES[] = {"2-FSK", "GFSK",   "UNUSED", "ASK/OOK",
+                                                 "4-FSK", "UNUSED", "UNUSED", "MSK"};
  int32_t freq = static_cast<int32_t>(this->state_.FREQ2 << 16 | this->state_.FREQ1 << 8 | this->state_.FREQ0) *
                 XTAL_FREQUENCY / (1 << 16);
  float symbol_rate = (((256.0f + this->state_.DRATE_M) * (1 << this->state_.DRATE_E)) / (1 << 28)) * XTAL_FREQUENCY;
@@ -255,9 +253,8 @@ void CC1101Component::dump_config() {
                "  Symbol Rate: %.0f baud\n"
                "  Filter Bandwidth: %.1f Hz\n"
                "  Output Power: %.1f dBm",
-                this->chip_id_, freq, this->state_.CHANNR,
-                LOG_STR_ARG(ModulationStrings::get_log_str(this->state_.MOD_FORMAT & 0x07, 0)), symbol_rate, bw,
-                this->output_power_effective_);
+                this->chip_id_, freq, this->state_.CHANNR, MODULATION_NAMES[this->state_.MOD_FORMAT & 0x07],
+                symbol_rate, bw, this->output_power_effective_);
  LOG_PIN("  CS Pin: ", this->cs_);
 }

@@ -45,8 +45,9 @@ void CopyCover::control(const cover::CoverCall &call) {
  auto position = call.get_position();
  if (position.has_value())
    call2.set_position(*position);
-  if (call.get_toggle().has_value())
-    call2.set_command_toggle();
+  auto tilt2 = call.get_tilt();
+  if (tilt2.has_value())
+    call2.set_tilt(*tilt2);
  call2.perform();
 }

@@ -21,6 +21,4 @@ void CopyLock::control(const lock::LockCall &call) {
  call2.perform();
 }

-void CopyLock::open_latch() { this->source_->open(); }
-
 }  // namespace esphome::copy
@@ -13,7 +13,6 @@ class CopyLock final : public lock::Lock, public Component {

 protected:
  void control(const lock::LockCall &call) override;
-  void open_latch() override;

  lock::Lock *source_;
 };
@@ -6,7 +6,12 @@ ESPHOME_LOG_TAG(TAG, "cst226.touchscreen");

 void CST226Touchscreen::setup() {
  if (this->reset_pin_ != nullptr) {
-    pulse_reset(this->reset_pin_, {.high_before_ms = 5, .low_ms = 5});
+    this->reset_pin_->setup();
+    this->reset_pin_->digital_write(true);
+    delay(5);
+    this->reset_pin_->digital_write(false);
+    delay(5);
+    this->reset_pin_->digital_write(true);
    this->set_timeout(30, [this] { this->continue_setup_(); });
  } else {
    this->continue_setup_();
@@ -43,7 +43,9 @@ void CST328Touchscreen::setup() {
 }

 void CST328Touchscreen::reset_device_() {
-  pulse_reset(this->reset_pin_, {.low_ms = 5});
+  this->reset_pin_->digital_write(false);
+  delay(5);
+  this->reset_pin_->digital_write(true);
  this->set_timeout(CST328_TRANSITION_TIMEOUT, [this] { this->continue_setup_(); });
 }

@@ -52,7 +52,12 @@ void CST816Touchscreen::continue_setup_() {

 void CST816Touchscreen::setup() {
  if (this->reset_pin_ != nullptr) {
-    pulse_reset(this->reset_pin_, {.high_before_ms = 5, .low_ms = 5});
+    this->reset_pin_->setup();
+    this->reset_pin_->digital_write(true);
+    delay(5);
+    this->reset_pin_->digital_write(false);
+    delay(5);
+    this->reset_pin_->digital_write(true);
    this->set_timeout(30, [this] { this->continue_setup_(); });
  } else {
    this->continue_setup_();
@@ -10,7 +10,14 @@ static constexpr uint32_t REREAD_TIMEOUT_ID = 1;
 static constexpr uint32_t REREAD_DELAY_MS = 20;

 void CST9220Touchscreen::setup() {
-  pulse_reset(this->reset_pin_, {.high_before_ms = 5, .low_ms = 10});
+  if (this->reset_pin_ != nullptr) {
+    this->reset_pin_->setup();
+    this->reset_pin_->digital_write(true);
+    delay(5);
+    this->reset_pin_->digital_write(false);
+    delay(10);
+    this->reset_pin_->digital_write(true);
+  }
  // Wait for the controller to leave its bootloader before talking to it.
  this->set_timeout(30, [this] { this->continue_setup_(); });
 }
@@ -57,7 +57,6 @@ class DemoCover final : public cover::Cover, public Component {
    }
    if (call.get_stop()) {
      this->cancel_timeout(MOVE_TIMEOUT_ID);
-      this->current_operation = cover::COVER_OPERATION_IDLE;
    }

    this->publish_state();
@@ -42,7 +42,6 @@ CONFIG_SCHEMA = cv.All(


 async def to_code(config: ConfigType) -> None:
-    cg.add_define("USE_LINE_READER")
    await uart.new_uart_component(config)


@@ -11,10 +11,10 @@
 namespace esphome::dfrobot_sen0395 {

 ESPHOME_LOG_TAG(TAG, "dfrobot_sen0395");
+static constexpr char ASCII_CR = 0x0D;
+static constexpr char ASCII_LF = 0x0A;
 static constexpr float DET_RANGE_STEP_M = 0.15f;
 static constexpr float LATENCY_STEP_S = 0.025f;
-// Sent after a reset with no line end
-static constexpr char PROMPT[] PROGMEM = "leapMMW:/>";

 // What each CommandType cannot do while the sensor runs; empty for commands that do not need it stopped
 PROGMEM_STRING_TABLE(BusyActions, "", "configure range config", "configure output latency",
@@ -121,9 +121,9 @@ bool DfrobotSen0395Component::run_command_(const Command &cmd, uint32_t now) {
    return false;  // Command not done yet
  }

-  if (const char *message = this->read_message_()) {
-    if (ESPHOME_strstr_P(message, ESPHOME_PSTR("is not recognized as a CLI command")) == nullptr) {
-      if (!this->handle_reply_(cmd, message))
+  if (this->read_message_()) {
+    if (ESPHOME_strstr_P(this->read_buffer_, ESPHOME_PSTR("is not recognized as a CLI command")) == nullptr) {
+      if (!this->handle_reply_(cmd))
        return false;         // Command not done yet
      this->read_message_();  // Skip the prompt
      return true;
@@ -146,13 +146,12 @@ bool DfrobotSen0395Component::run_command_(const Command &cmd, uint32_t now) {
 }

 void DfrobotSen0395Component::read_state_() {
-  const char *message = this->read_message_();
-  if (message == nullptr)
+  if (!this->read_message_())
    return;
-  if (ESPHOME_strstr_P(message, ESPHOME_PSTR("$JYBSS,0, , , *")) != nullptr) {
+  if (ESPHOME_strstr_P(this->read_buffer_, ESPHOME_PSTR("$JYBSS,0, , , *")) != nullptr) {
    this->set_detected_(false);
    this->set_active(true);
-  } else if (ESPHOME_strstr_P(message, ESPHOME_PSTR("$JYBSS,1, , , *")) != nullptr) {
+  } else if (ESPHOME_strstr_P(this->read_buffer_, ESPHOME_PSTR("$JYBSS,1, , , *")) != nullptr) {
    this->set_detected_(true);
    this->set_active(true);
  }
@@ -207,7 +206,8 @@ void DfrobotSen0395Component::format_command(const Command &cmd, char *buf, size
  }
 }

-bool DfrobotSen0395Component::handle_reply_(const Command &cmd, const char *message) {
+bool DfrobotSen0395Component::handle_reply_(const Command &cmd) {
+  const char *message = this->read_buffer_;
  auto is = [message](ESPHOME_PGM_P text) { return ESPHOME_strcmp_P(message, text) == 0; };

  // Commands with their own replies
@@ -230,7 +230,7 @@ bool DfrobotSen0395Component::handle_reply_(const Command &cmd, const char *mess
      }
      return true;
    case CommandType::COMMAND_TYPE_RESET_SYSTEM:
-      if (!is(PROMPT))
+      if (!is(ESPHOME_PSTR("leapMMW:/>")))
        return false;
      ESP_LOGI(TAG, "Restarted sensor.");
      return true;
@@ -300,24 +300,34 @@ bool DfrobotSen0395Component::handle_reply_(const Command &cmd, const char *mess
  return true;
 }

-const char *DfrobotSen0395Component::read_message_() {
+bool DfrobotSen0395Component::read_message_() {
  while (this->available()) {
    uint8_t byte;
    this->read_byte(&byte);
+
+    if (this->read_pos_ == MMWAVE_READ_BUFFER_LENGTH)
+      this->read_pos_ = 0;
+
+    ESP_LOGVV(TAG, "Buffer pos: %u %d", this->read_pos_, byte);
+
+    if (byte == ASCII_CR)
+      continue;
    if (byte >= 0x7F)
      byte = '?';  // needs to be valid utf8 string for log functions.
-    const char *line = this->line_reader_.feed(byte);
-    if (line == nullptr && byte == '>' && this->line_reader_.length() == sizeof(PROMPT) - 1) {
-      line = this->line_reader_.partial();
-      this->line_reader_.reset();
+    this->read_buffer_[this->read_pos_] = byte;
+
+    if (this->read_pos_ == 9 && byte == '>')
+      this->read_buffer_[++this->read_pos_] = ASCII_LF;
+
+    if (this->read_buffer_[this->read_pos_] == ASCII_LF) {
+      this->read_buffer_[this->read_pos_] = 0;
+      this->read_pos_ = 0;
+      ESP_LOGV(TAG, "Message: %s", this->read_buffer_);
+      return true;  // Full message in buffer
    }
-    if (line != nullptr) {
-      ESP_LOGV(TAG, "Message: %s", line);
-      return line;
-    }
-    this->line_reader_.log_if_overflowed(TAG);
+    this->read_pos_++;
  }
-  return nullptr;
+  return false;  // No full message yet
 }

 void DfrobotSen0395Component::set_detected_(bool detected) {
@@ -4,7 +4,6 @@
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 #include "esphome/core/helpers.h"
-#include "esphome/core/line_reader.h"

 #ifdef USE_BINARY_SENSOR
 #include "esphome/components/binary_sensor/binary_sensor.h"
@@ -15,7 +14,7 @@

 namespace esphome::dfrobot_sen0395 {

-static constexpr uint8_t MMWAVE_READ_BUFFER_LENGTH = 253;  // largest LineReader size with a one byte position
+static constexpr uint8_t MMWAVE_READ_BUFFER_LENGTH = 255;
 static constexpr uint8_t COMMAND_QUEUE_SIZE = 20;

 // Keep in sync with the BusyActions table in dfrobot_sen0395.cpp
@@ -122,7 +121,8 @@ class DfrobotSen0395Component final : public uart::UARTDevice, public Component
  bool led_active_{false};
  bool uart_presence_active_{false};
  bool start_after_boot_{false};
-  LineReader<MMWAVE_READ_BUFFER_LENGTH> line_reader_;
+  char read_buffer_[MMWAVE_READ_BUFFER_LENGTH];
+  size_t read_pos_{0};
  bool cmd_sent_{false};
  uint8_t retries_left_{2};
  StaticRingBuffer<Command, COMMAND_QUEUE_SIZE> cmd_queue_;
@@ -131,13 +131,12 @@ class DfrobotSen0395Component final : public uart::UARTDevice, public Component
  int16_t det_range_steps_[8]{};
  uint16_t latency_steps_[2]{};

-  /// The next complete line, valid until the next call, or nullptr
-  const char *read_message_();
+  bool read_message_();
  void read_state_();
  /// Run the command at the front of the queue; true when it is done
  bool run_command_(const Command &cmd, uint32_t now);
  /// Handle a reply to a sent command; true when the command is done
-  bool handle_reply_(const Command &cmd, const char *message);
+  bool handle_reply_(const Command &cmd);

  void set_detected_(bool detected);
 };
@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-import logging
 from typing import Any, Protocol

 from esphome import automation, core, pins
@@ -35,8 +34,6 @@ from esphome.types import ConfigType
 DOMAIN = "display"
 IS_PLATFORM_COMPONENT = True

-_LOGGER = logging.getLogger(__name__)
-
 display_ns = cg.esphome_ns.namespace("display")
 Display = display_ns.class_("Display", cg.PollingComponent)
 DisplayBuffer = display_ns.class_("DisplayBuffer", Display)
@@ -105,21 +102,13 @@ BASIC_DISPLAY_SCHEMA = cv.Schema(
 ).extend(cv.polling_component_schema("1s"))


-def _validate_test_card(config: ConfigType) -> ConfigType:
+def _validate_test_card(config):
    if (
        config.get(CONF_SHOW_TEST_CARD, False)
-        and (update_interval := config.get(CONF_UPDATE_INTERVAL)) is not None
-        and update_interval.total_milliseconds == SCHEDULER_DONT_RUN
+        and config.get(CONF_UPDATE_INTERVAL, False) == SCHEDULER_DONT_RUN
    ):
-        # Only a warning: something else can still update the display, for example
-        # component.update, and the test card is drawn then.
-        display_id = config.get(CONF_ID)
-        _LOGGER.warning(
-            "%s`%s: True` is used with `%s: never`, so the test card is only drawn "
-            "when something updates the display (for example component.update)",
-            f"{display_id.id}: " if display_id is not None and display_id.id else "",
-            CONF_SHOW_TEST_CARD,
-            CONF_UPDATE_INTERVAL,
+        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

@@ -22,7 +22,7 @@ CONF_CUSTOM_PATTERNS = "custom_patterns"
 CONF_SKIP_CRC = "skip_crc"
 CONF_DEFAULT_OBIS = "default_obis"

-DLMS_PARSER_VERSION = "2.2.2"
+DLMS_PARSER_VERSION = "2.2.0"

 dlms_meter_component_ns = cg.esphome_ns.namespace("dlms_meter")
 DlmsMeterComponent = dlms_meter_component_ns.class_(
@@ -1,6 +1,5 @@
 #include "ds248x_one_wire_bus.h"
 #include "ds248x.h"
-#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"

 namespace esphome::ds248x {
@@ -152,7 +151,11 @@ uint64_t DS248xOneWireBus::search_int() {
    }

    // Update address based on direction taken
-    assign_bits(address, bit_mask, dir_taken);
+    if (dir_taken) {
+      address |= bit_mask;
+    } else {
+      address &= ~bit_mask;
+    }
  }

  // Search successful
@@ -18,11 +18,13 @@ E131AddressableLightEffect = e131_ns.class_(
 )
 E131Component = e131_ns.class_("E131Component", cg.Component)

-E131ListenMethod = e131_ns.enum("E131ListenMethod")
-METHODS = E131ListenMethod.options("UNICAST", "MULTICAST", prefix="E131_")
+METHODS = {"UNICAST": e131_ns.E131_UNICAST, "MULTICAST": e131_ns.E131_MULTICAST}

-E131LightChannels = e131_ns.enum("E131LightChannels")
-CHANNELS = E131LightChannels.options("MONO", "RGB", "RGBW", prefix="E131_")
+CHANNELS = {
+    "MONO": e131_ns.E131_MONO,
+    "RGB": e131_ns.E131_RGB,
+    "RGBW": e131_ns.E131_RGBW,
+}

 CONF_UNIVERSE = "universe"
 CONF_E131_ID = "e131_id"
@@ -20,7 +20,9 @@ void EKTF2232Touchscreen::setup() {

  this->attach_interrupt_(this->interrupt_pin_, gpio::INTERRUPT_FALLING_EDGE);

-  pulse_reset(this->reset_pin_, {.low_ms = 15, .high_after_ms = 15});
+  this->reset_pin_->setup();
+
+  this->hard_reset_();
  if (!this->soft_reset_()) {
    ESP_LOGE(TAG, "Failed to soft reset EKT2232!");
    this->interrupt_pin_->detach_interrupt();
@@ -94,6 +96,13 @@ bool EKTF2232Touchscreen::get_power_state() {
  return (received[1] >> 3) & 1;
 }

+void EKTF2232Touchscreen::hard_reset_() {
+  this->reset_pin_->digital_write(false);
+  delay(15);
+  this->reset_pin_->digital_write(true);
+  delay(15);
+}
+
 bool EKTF2232Touchscreen::soft_reset_() {
  auto err = this->write(SOFT_RESET_CMD, 4);
  if (err != i2c::ERROR_OK)
@@ -22,6 +22,7 @@ class EKTF2232Touchscreen final : public Touchscreen, public i2c::I2CDevice {
  bool get_power_state();

 protected:
+  void hard_reset_();
  bool soft_reset_();
  void update_touches() override;

@@ -4,18 +4,21 @@
 #include "esphome/core/application.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
-#include "esphome/core/progmem.h"

 namespace esphome::epaper_spi {

 ESPHOME_LOG_TAG(TAG, "epaper_spi");
 static constexpr size_t EPAPER_MAX_CMD_LOG_BYTES = 128;

-PROGMEM_STRING_TABLE(EPaperStateStrings, "IDLE", "UPDATE", "RESET", "RESET_END", "SHOULD_WAIT", "INITIALISE",
-                     "TRANSFER_DATA", "POWER_ON", "REFRESH_SCREEN", "POWER_OFF", "DEEP_SLEEP", "Unknown");
+static constexpr const char *const EPAPER_STATE_STRINGS[] = {
+    "IDLE",          "UPDATE",   "RESET",          "RESET_END", "SHOULD_WAIT", "INITIALISE",
+    "TRANSFER_DATA", "POWER_ON", "REFRESH_SCREEN", "POWER_OFF", "DEEP_SLEEP",
+};

-const LogString *EPaperBase::epaper_state_to_string_() {
-  return EPaperStateStrings::get_log_str(static_cast<uint8_t>(this->state_), EPaperStateStrings::LAST_INDEX);
+const char *EPaperBase::epaper_state_to_string_() {
+  if (auto idx = static_cast<unsigned>(this->state_); idx < std::size(EPAPER_STATE_STRINGS))
+    return EPAPER_STATE_STRINGS[idx];
+  return "Unknown";
 }

 void EPaperBase::setup() {
@@ -156,7 +159,7 @@ void EPaperBase::update_effective_transform_() {

 void EPaperBase::update() {
  if (this->state_ != EPaperState::IDLE) {
-    ESP_LOGE(TAG, "Display already in state %s", LOG_STR_ARG(epaper_state_to_string_()));
+    ESP_LOGE(TAG, "Display already in state %s", epaper_state_to_string_());
    return;
  }
  this->set_state_(EPaperState::UPDATE);
@@ -209,7 +212,7 @@ void EPaperBase::loop() {
        this->high_frequency_loop_.stop();
 #if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERBOSE
      if (now - this->waiting_for_idle_last_print_ >= 1000) {
-        ESP_LOGV(TAG, "Waiting for idle in state %s", LOG_STR_ARG(this->epaper_state_to_string_()));
+        ESP_LOGV(TAG, "Waiting for idle in state %s", this->epaper_state_to_string_());
        this->waiting_for_idle_last_print_ = millis();
      }
 #endif
@@ -224,7 +227,7 @@ void EPaperBase::loop() {
 // The busy pin never cleared: give up on this update so later ones are not refused, and make the next one full
 void EPaperBase::abandon_update_() {
  ESP_LOGE(TAG, "Display stayed busy for %u s in state %s; check the busy pin", (unsigned) this->busy_timeout_seconds_,
-           LOG_STR_ARG(this->epaper_state_to_string_()));
+           this->epaper_state_to_string_());
  this->status_set_warning(LOG_STR("Busy pin timeout"));
  if (this->state_ == EPaperState::TRANSFER_DATA)
    this->abort_transfer();
@@ -244,10 +247,10 @@ void EPaperBase::abandon_update_() {
 * Should a subclassed class need to override this, the method will need to be made virtual.
 */
 void EPaperBase::process_state_() {
-  ESP_LOGV(TAG, "Process state entered in state %s", LOG_STR_ARG(epaper_state_to_string_()));
+  ESP_LOGV(TAG, "Process state entered in state %s", epaper_state_to_string_());
  switch (this->state_) {
    default:
-      ESP_LOGE(TAG, "Display is in unhandled state %s", LOG_STR_ARG(epaper_state_to_string_()));
+      ESP_LOGE(TAG, "Display is in unhandled state %s", epaper_state_to_string_());
      this->set_state_(EPaperState::IDLE);
      break;
    case EPaperState::IDLE:
@@ -339,7 +342,7 @@ void EPaperBase::process_state_() {
 }

 void EPaperBase::set_state_(EPaperState state, uint16_t delay) {
-  ESP_LOGV(TAG, "Exit state %s", LOG_STR_ARG(this->epaper_state_to_string_()));
+  ESP_LOGV(TAG, "Exit state %s", this->epaper_state_to_string_());
  this->state_ = state;
  // allow subclasses to nominate delays
  if (delay == 0)
@@ -347,7 +350,7 @@ void EPaperBase::set_state_(EPaperState state, uint16_t delay) {
  this->next_delay_ = 0;
  this->delay_until_ = millis() + delay;
  this->wait_for_idle_(state > EPaperState::SHOULD_WAIT);
-  ESP_LOGV(TAG, "Enter state %s, delay %u, wait_for_idle=%s", LOG_STR_ARG(this->epaper_state_to_string_()), delay,
+  ESP_LOGV(TAG, "Enter state %s, delay %u, wait_for_idle=%s", this->epaper_state_to_string_(), delay,
           TRUEFALSE(this->waiting_for_idle_));
  // Each step of an update otherwise waits for the next loop iteration; loop() slows down again for long waits
  if (state == EPaperState::IDLE) {
@@ -125,7 +125,7 @@ class EPaperBase : public Display,
  bool is_using_partial_update_() const { return this->full_update_every_ > 1; }
  void process_state_();

-  const LogString *epaper_state_to_string_();
+  const char *epaper_state_to_string_();
  bool is_idle_() const;
  void setup_pins_() const;
  virtual bool reset();
@@ -72,7 +72,9 @@ bool EPaperJD79660::reset() {

      // As commented on SLEEP_MS_RESET1: Reset pulse must happen within time window.
      // So do not use FSM loop, and avoid other calls/logs during pulse below.
-      pulse_reset(this->reset_pin_, {.low_ms = SLEEP_MS_RESET1});
+      this->reset_pin_->digital_write(false);
+      delay(SLEEP_MS_RESET1);
+      this->reset_pin_->digital_write(true);

      this->reset_duration_ = SLEEP_MS_RESET2;
      this->step_ = FSMState::RESET_STEP2_IDLECHECK;
@@ -33,59 +33,53 @@ void ES7210::dump_config() {
                this->channel_gains_[2], this->channel_gains_[3]);
 }

-static constexpr i2c::I2CRegValue ES7210_RESET[] PROGMEM = {
-    // Software reset
-    {ES7210_RESET_REG00, 0xff},
-    {ES7210_RESET_REG00, 0x32},
-    {ES7210_CLOCK_OFF_REG01, 0x3f},
-    // Set initialization time when device powers up
-    {ES7210_TIME_CONTROL0_REG09, 0x30},
-    {ES7210_TIME_CONTROL1_REG0A, 0x30},
-    // Configure HFP for all ADC channels
-    {ES7210_ADC12_HPF2_REG23, 0x2a},
-    {ES7210_ADC12_HPF1_REG22, 0x0a},
-    {ES7210_ADC34_HPF2_REG20, 0x0a},
-    {ES7210_ADC34_HPF1_REG21, 0x2a},
-};
-
-static constexpr i2c::I2CRegValue ES7210_ANALOG[] PROGMEM = {
-    // Configure analog power
-    {ES7210_ANALOG_REG40, 0xC3},
-    // Set mic bias
-    {ES7210_MIC12_BIAS_REG41, 0x70},
-    {ES7210_MIC34_BIAS_REG42, 0x70},
-};
-
-static constexpr i2c::I2CRegValue ES7210_POWER_ON[] PROGMEM = {
-    // Power on mics 1 through 4
-    {ES7210_MIC1_POWER_REG47, 0x08},
-    {ES7210_MIC2_POWER_REG48, 0x08},
-    {ES7210_MIC3_POWER_REG49, 0x08},
-    {ES7210_MIC4_POWER_REG4A, 0x08},
-    // Power down DLL
-    {ES7210_POWER_DOWN_REG06, 0x04},
-    // Power on MIC1-4 bias & ADC1-4 & PGA1-4 Power
-    {ES7210_MIC12_POWER_REG4B, 0x0F},
-    {ES7210_MIC34_POWER_REG4C, 0x0F},
-    // Enable device
-    {ES7210_RESET_REG00, 0x71},
-    {ES7210_RESET_REG00, 0x41},
-};
-
 void ES7210::setup() {
-  ES7210_ERROR_FAILED(this->write_registers(ES7210_RESET));
+  // Software reset
+  ES7210_ERROR_FAILED(this->write_byte(ES7210_RESET_REG00, 0xff));
+  ES7210_ERROR_FAILED(this->write_byte(ES7210_RESET_REG00, 0x32));
+  ES7210_ERROR_FAILED(this->write_byte(ES7210_CLOCK_OFF_REG01, 0x3f));
+
+  // Set initialization time when device powers up
+  ES7210_ERROR_FAILED(this->write_byte(ES7210_TIME_CONTROL0_REG09, 0x30));
+  ES7210_ERROR_FAILED(this->write_byte(ES7210_TIME_CONTROL1_REG0A, 0x30));
+
+  // Configure HFP for all ADC channels
+  ES7210_ERROR_FAILED(this->write_byte(ES7210_ADC12_HPF2_REG23, 0x2a));
+  ES7210_ERROR_FAILED(this->write_byte(ES7210_ADC12_HPF1_REG22, 0x0a));
+  ES7210_ERROR_FAILED(this->write_byte(ES7210_ADC34_HPF2_REG20, 0x0a));
+  ES7210_ERROR_FAILED(this->write_byte(ES7210_ADC34_HPF1_REG21, 0x2a));

  // Secondary I2S mode settings
  ES7210_ERROR_FAILED(this->update_register(ES7210_MODE_CONFIG_REG08, 0x01, 0x00));

-  ES7210_ERROR_FAILED(this->write_registers(ES7210_ANALOG));
+  // Configure analog power
+  ES7210_ERROR_FAILED(this->write_byte(ES7210_ANALOG_REG40, 0xC3));
+
+  // Set mic bias
+  ES7210_ERROR_FAILED(this->write_byte(ES7210_MIC12_BIAS_REG41, 0x70));
+  ES7210_ERROR_FAILED(this->write_byte(ES7210_MIC34_BIAS_REG42, 0x70));

  // Configure I2S settings, sample rate, and microphone gains
  ES7210_ERROR_FAILED(this->configure_i2s_format_());
  ES7210_ERROR_FAILED(this->configure_sample_rate_());
  ES7210_ERROR_FAILED(this->configure_mic_gain_());

-  ES7210_ERROR_FAILED(this->write_registers(ES7210_POWER_ON));
+  // Power on mics 1 through 4
+  ES7210_ERROR_FAILED(this->write_byte(ES7210_MIC1_POWER_REG47, 0x08));
+  ES7210_ERROR_FAILED(this->write_byte(ES7210_MIC2_POWER_REG48, 0x08));
+  ES7210_ERROR_FAILED(this->write_byte(ES7210_MIC3_POWER_REG49, 0x08));
+  ES7210_ERROR_FAILED(this->write_byte(ES7210_MIC4_POWER_REG4A, 0x08));
+
+  // Power down DLL
+  ES7210_ERROR_FAILED(this->write_byte(ES7210_POWER_DOWN_REG06, 0x04));
+
+  // Power on MIC1-4 bias & ADC1-4 & PGA1-4 Power
+  ES7210_ERROR_FAILED(this->write_byte(ES7210_MIC12_POWER_REG4B, 0x0F));
+  ES7210_ERROR_FAILED(this->write_byte(ES7210_MIC34_POWER_REG4C, 0x0F));
+
+  // Enable device
+  ES7210_ERROR_FAILED(this->write_byte(ES7210_RESET_REG00, 0x71));
+  ES7210_ERROR_FAILED(this->write_byte(ES7210_RESET_REG00, 0x41));

  this->setup_complete_ = true;
 }
@@ -25,62 +25,56 @@ ESPHOME_LOG_TAG(TAG, "es7243e");

 void ES7243E::dump_config() { ESP_LOGCONFIG(TAG, "ES7243E audio ADC:"); }

-// clang-format off
-static constexpr i2c::I2CRegValue ES7243E_INIT[] PROGMEM = {
-    {ES7243E_CLOCK_MGR_REG01, 0x3A},
-    {ES7243E_RESET_REG00, 0x80},
-    {ES7243E_TEST_MODE_REGF9, 0x00},
-    {ES7243E_CLOCK_MGR_REG04, 0x02},
-    {ES7243E_CLOCK_MGR_REG04, 0x01},
-    {ES7243E_TEST_MODE_REGF9, 0x01},
-    {ES7243E_RESET_REG00, 0x1E},
-    {ES7243E_CLOCK_MGR_REG01, 0x00},
-    {ES7243E_CLOCK_MGR_REG02, 0x00},
-    {ES7243E_CLOCK_MGR_REG03, 0x20},
-    {ES7243E_CLOCK_MGR_REG04, 0x01},
-    {ES7243E_ADC_CTRL_REG0D, 0x00},
-    {ES7243E_CLOCK_MGR_REG05, 0x00},
-    {ES7243E_CLOCK_MGR_REG06, 0x03},  // SCLK=MCLK/4
-    {ES7243E_CLOCK_MGR_REG07, 0x00},  // LRCK=MCLK/256
-    {ES7243E_CLOCK_MGR_REG08, 0xFF},  // LRCK=MCLK/256
-    {ES7243E_CLOCK_MGR_REG09, 0xCA},
-    {ES7243E_SDP_REG0A, 0x85},
-    {ES7243E_SDP_REG0B, 0x00},
-    {ES7243E_ADC_CTRL_REG0E, 0xBF},
-    {ES7243E_ADC_CTRL_REG0F, 0x80},
-    {ES7243E_ADC_CTRL_REG14, 0x0C},
-    {ES7243E_ADC_CTRL_REG15, 0x0C},
-    {ES7243E_ANALOG_REG17, 0x02},
-    {ES7243E_ANALOG_REG18, 0x26},
-    {ES7243E_ANALOG_REG19, 0x77},
-    {ES7243E_ANALOG_REG1A, 0xF4},
-    {ES7243E_ANALOG_REG1B, 0x66},
-    {ES7243E_ANALOG_REG1C, 0x44},
-    {ES7243E_ANALOG_REG1E, 0x00},
-    {ES7243E_ANALOG_REG1F, 0x0C},
-    {ES7243E_ANALOG_REG20, 0x1A},  // PGA gain +30dB
-    {ES7243E_ANALOG_REG21, 0x1A},
-    {ES7243E_RESET_REG00, 0x80},
-    {ES7243E_CLOCK_MGR_REG01, 0x3A},
-    {ES7243E_ANALOG_REG16, 0x3F},
-    {ES7243E_ANALOG_REG16, 0x00},
-    {ES7243E_TEST_MODE_REGF9, 0x00},
-    {ES7243E_CLOCK_MGR_REG04, 0x01},
-    {ES7243E_ANALOG_REG17, 0x01},
-};
-// clang-format on
-
-static constexpr i2c::I2CRegValue ES7243E_START[] PROGMEM = {
-    {ES7243E_RESET_REG00, 0x80},
-    {ES7243E_CLOCK_MGR_REG01, 0x3A},
-    {ES7243E_ANALOG_REG16, 0x3F},
-    {ES7243E_ANALOG_REG16, 0x00},
-};
-
 void ES7243E::setup() {
-  ES7243E_ERROR_FAILED(this->write_registers(ES7243E_INIT));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_CLOCK_MGR_REG01, 0x3A));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_RESET_REG00, 0x80));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_TEST_MODE_REGF9, 0x00));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_CLOCK_MGR_REG04, 0x02));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_CLOCK_MGR_REG04, 0x01));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_TEST_MODE_REGF9, 0x01));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_RESET_REG00, 0x1E));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_CLOCK_MGR_REG01, 0x00));
+
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_CLOCK_MGR_REG02, 0x00));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_CLOCK_MGR_REG03, 0x20));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_CLOCK_MGR_REG04, 0x01));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_ADC_CTRL_REG0D, 0x00));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_CLOCK_MGR_REG05, 0x00));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_CLOCK_MGR_REG06, 0x03));  // SCLK=MCLK/4
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_CLOCK_MGR_REG07, 0x00));  // LRCK=MCLK/256
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_CLOCK_MGR_REG08, 0xFF));  // LRCK=MCLK/256
+
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_CLOCK_MGR_REG09, 0xCA));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_SDP_REG0A, 0x85));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_SDP_REG0B, 0x00));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_ADC_CTRL_REG0E, 0xBF));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_ADC_CTRL_REG0F, 0x80));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_ADC_CTRL_REG14, 0x0C));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_ADC_CTRL_REG15, 0x0C));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_ANALOG_REG17, 0x02));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_ANALOG_REG18, 0x26));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_ANALOG_REG19, 0x77));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_ANALOG_REG1A, 0xF4));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_ANALOG_REG1B, 0x66));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_ANALOG_REG1C, 0x44));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_ANALOG_REG1E, 0x00));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_ANALOG_REG1F, 0x0C));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_ANALOG_REG20, 0x1A));  // PGA gain +30dB
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_ANALOG_REG21, 0x1A));
+
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_RESET_REG00, 0x80));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_CLOCK_MGR_REG01, 0x3A));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_ANALOG_REG16, 0x3F));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_ANALOG_REG16, 0x00));
+
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_TEST_MODE_REGF9, 0x00));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_CLOCK_MGR_REG04, 0x01));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_ANALOG_REG17, 0x01));
  ES7243E_ERROR_FAILED(this->configure_mic_gain_());
-  ES7243E_ERROR_FAILED(this->write_registers(ES7243E_START));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_RESET_REG00, 0x80));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_CLOCK_MGR_REG01, 0x3A));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_ANALOG_REG16, 0x3F));
+  ES7243E_ERROR_FAILED(this->write_byte(ES7243E_ANALOG_REG16, 0x00));

  this->setup_complete_ = true;
 }
@@ -9,54 +9,70 @@ namespace esphome::es8156 {

 ESPHOME_LOG_TAG(TAG, "es8156");

-static constexpr i2c::I2CRegValue ES8156_INIT[] PROGMEM = {
-    // REG02 MODE CONFIG 1: Enable software mode for I2C control of volume/mute
-    // Bit 2: SOFT_MODE_SEL=1 (software mode enabled)
-    {ES8156_REG02_SCLK_MODE, 0x04},
-    // Analog system configuration (active-low power down bits, active-high enables)
-    // REG20 ANALOG SYSTEM: Configure analog signal path
-    {ES8156_REG20_ANALOG_SYS1, 0x2A},
-    // REG21 ANALOG SYSTEM: VSEL=0x1C (bias level ~120%), normal VREF ramp speed
-    {ES8156_REG21_ANALOG_SYS2, 0x3C},
-    // REG22 ANALOG SYSTEM: Line out mode (HPSW=0), OUT_MUTE=0 (not muted)
-    {ES8156_REG22_ANALOG_SYS3, 0x00},
-    // REG24 ANALOG SYSTEM: Low power mode for VREFBUF, HPCOM, DACVRP; DAC normal power
-    // Bits 2:0 = 0x07: LPVREFBUF=1, LPHPCOM=1, LPDACVRP=1, LPDAC=0
-    {ES8156_REG24_ANALOG_LP, 0x07},
-    // REG23 ANALOG SYSTEM: Lowest bias (IBIAS_SW=0), VMIDLVL=VDDA/2, normal impedance
-    {ES8156_REG23_ANALOG_SYS4, 0x00},
-    // Timing and interface configuration
-    // REG0A/0B TIME CONTROL: Fast state machine transitions
-    {ES8156_REG0A_TIME_CONTROL1, 0x01},
-    {ES8156_REG0B_TIME_CONTROL2, 0x01},
-    // REG11 SDP INTERFACE CONFIG: Default I2S format (24-bit, I2S mode)
-    {ES8156_REG11_DAC_SDP, 0x00},
-    // REG19 EQ CONTROL 1: EQ disabled (EQ_ON=0), EQ_BAND_NUM=2
-    {ES8156_REG19_EQ_CONTROL1, 0x20},
-    // REG0D P2S CONTROL: Parallel-to-serial converter settings
-    {ES8156_REG0D_P2S_CONTROL, 0x14},
-    // REG09 MISC CONTROL 2: Default settings
-    {ES8156_REG09_MISC_CONTROL2, 0x00},
-    // REG18 MISC CONTROL 3: Stereo channel routing, no inversion
-    // Bits 5:4 CHN_CROSS: 0=L→L/R→R, 1=L to both, 2=R to both, 3=swap L/R
-    // Bits 3:2: LCH_INV/RCH_INV channel inversion
-    {ES8156_REG18_MISC_CONTROL3, 0x00},
-    // REG08 CLOCK OFF: Enable all internal clocks (0x3F = all clock gates open)
-    {ES8156_REG08_CLOCK_ON_OFF, 0x3F},
-    // REG00 RESET CONTROL: Reset sequence
-    // First: RST_DIG=1 (assert digital reset)
-    {ES8156_REG00_RESET, 0x02},
-    // Then: CSM_ON=1 (enable chip state machine), RST_DIG=1
-    {ES8156_REG00_RESET, 0x03},
-    // REG25 ANALOG SYSTEM: Power up analog blocks
-    // VMIDSEL=2 (normal VMID operation), PDN_ANA=0, ENREFR=0, ENHPCOM=0
-    // PDN_DACVREFGEN=0, PDN_VREFBUF=0, PDN_DAC=0 (all enabled)
-    {ES8156_REG25_ANALOG_SYS5, 0x20},
-};
+// Mark the component as failed; use only in setup
+#define ES8156_ERROR_FAILED(func) \
+  if (!(func)) { \
+    this->mark_failed(LOG_STR("Failed to initialize")); \
+    return; \
+  }

 void ES8156::setup() {
-  if (!this->write_registers(ES8156_INIT))
-    this->mark_failed(LOG_STR("Failed to initialize"));
+  // REG02 MODE CONFIG 1: Enable software mode for I2C control of volume/mute
+  // Bit 2: SOFT_MODE_SEL=1 (software mode enabled)
+  ES8156_ERROR_FAILED(this->write_byte(ES8156_REG02_SCLK_MODE, 0x04));
+
+  // Analog system configuration (active-low power down bits, active-high enables)
+  // REG20 ANALOG SYSTEM: Configure analog signal path
+  ES8156_ERROR_FAILED(this->write_byte(ES8156_REG20_ANALOG_SYS1, 0x2A));
+
+  // REG21 ANALOG SYSTEM: VSEL=0x1C (bias level ~120%), normal VREF ramp speed
+  ES8156_ERROR_FAILED(this->write_byte(ES8156_REG21_ANALOG_SYS2, 0x3C));
+
+  // REG22 ANALOG SYSTEM: Line out mode (HPSW=0), OUT_MUTE=0 (not muted)
+  ES8156_ERROR_FAILED(this->write_byte(ES8156_REG22_ANALOG_SYS3, 0x00));
+
+  // REG24 ANALOG SYSTEM: Low power mode for VREFBUF, HPCOM, DACVRP; DAC normal power
+  // Bits 2:0 = 0x07: LPVREFBUF=1, LPHPCOM=1, LPDACVRP=1, LPDAC=0
+  ES8156_ERROR_FAILED(this->write_byte(ES8156_REG24_ANALOG_LP, 0x07));
+
+  // REG23 ANALOG SYSTEM: Lowest bias (IBIAS_SW=0), VMIDLVL=VDDA/2, normal impedance
+  ES8156_ERROR_FAILED(this->write_byte(ES8156_REG23_ANALOG_SYS4, 0x00));
+
+  // Timing and interface configuration
+  // REG0A/0B TIME CONTROL: Fast state machine transitions
+  ES8156_ERROR_FAILED(this->write_byte(ES8156_REG0A_TIME_CONTROL1, 0x01));
+  ES8156_ERROR_FAILED(this->write_byte(ES8156_REG0B_TIME_CONTROL2, 0x01));
+
+  // REG11 SDP INTERFACE CONFIG: Default I2S format (24-bit, I2S mode)
+  ES8156_ERROR_FAILED(this->write_byte(ES8156_REG11_DAC_SDP, 0x00));
+
+  // REG19 EQ CONTROL 1: EQ disabled (EQ_ON=0), EQ_BAND_NUM=2
+  ES8156_ERROR_FAILED(this->write_byte(ES8156_REG19_EQ_CONTROL1, 0x20));
+
+  // REG0D P2S CONTROL: Parallel-to-serial converter settings
+  ES8156_ERROR_FAILED(this->write_byte(ES8156_REG0D_P2S_CONTROL, 0x14));
+
+  // REG09 MISC CONTROL 2: Default settings
+  ES8156_ERROR_FAILED(this->write_byte(ES8156_REG09_MISC_CONTROL2, 0x00));
+
+  // REG18 MISC CONTROL 3: Stereo channel routing, no inversion
+  // Bits 5:4 CHN_CROSS: 0=L→L/R→R, 1=L to both, 2=R to both, 3=swap L/R
+  // Bits 3:2: LCH_INV/RCH_INV channel inversion
+  ES8156_ERROR_FAILED(this->write_byte(ES8156_REG18_MISC_CONTROL3, 0x00));
+
+  // REG08 CLOCK OFF: Enable all internal clocks (0x3F = all clock gates open)
+  ES8156_ERROR_FAILED(this->write_byte(ES8156_REG08_CLOCK_ON_OFF, 0x3F));
+
+  // REG00 RESET CONTROL: Reset sequence
+  // First: RST_DIG=1 (assert digital reset)
+  ES8156_ERROR_FAILED(this->write_byte(ES8156_REG00_RESET, 0x02));
+  // Then: CSM_ON=1 (enable chip state machine), RST_DIG=1
+  ES8156_ERROR_FAILED(this->write_byte(ES8156_REG00_RESET, 0x03));
+
+  // REG25 ANALOG SYSTEM: Power up analog blocks
+  // VMIDSEL=2 (normal VMID operation), PDN_ANA=0, ENREFR=0, ENHPCOM=0
+  // PDN_DACVREFGEN=0, PDN_VREFBUF=0, PDN_DAC=0 (all enabled)
+  ES8156_ERROR_FAILED(this->write_byte(ES8156_REG25_ANALOG_SYS5, 0x20));
 }

 void ES8156::dump_config() { ESP_LOGCONFIG(TAG, "ES8156 Audio Codec:"); }
@@ -22,76 +22,79 @@ ESPHOME_LOG_TAG(TAG, "es8388");
    return false; \
  }

-static constexpr i2c::I2CRegValue ES8388_INIT[] PROGMEM = {
-    // I2S worker mode
-    {ES8388_MASTERMODE, 0x00},
-    /* Chip Control and Power Management */
-    {ES8388_CONTROL2, 0x50},
-    // normal all and power up all
-    {ES8388_CHIPPOWER, 0x00},
-    // vmidsel/500k
-    // EnRef=0,Play&Record Mode,(0x17-both of mic&play)
-    {ES8388_CONTROL1, 0x12},
-    // i2s 16 bits
-    {ES8388_DACCONTROL1, 0x18},
-    // sample freq 256
-    // DACFsMode,SINGLE SPEED; DACFsRatio,256
-    {ES8388_DACCONTROL2, 0x02},
-    // 0x00 audio on LIN1&RIN1,  0x09 LIN2&RIN2
-    {ES8388_DACCONTROL16, 0x00},
-    // only left DAC to left mixer enable 0db
-    {ES8388_DACCONTROL17, 0x90},
-    // only right DAC to right mixer enable 0db
-    {ES8388_DACCONTROL20, 0x90},
-    // set internal ADC and DAC use the same LRCK clock, ADC LRCK as internal LRCK
-    {ES8388_DACCONTROL21, 0x80},
-    // vroi=0 - 1.5k VREF to analog output resistance (default)
-    {ES8388_DACCONTROL23, 0x00},
-    // power down adc and line in
-    {ES8388_ADCPOWER, 0xFF},
-    //@nightdav
-    {ES8388_ADCCONTROL1, 0x00},  // +21dB : recommended value for ALC & voice recording
-    // set to Mono Right
-    {ES8388_ADCCONTROL3, 0x02},
-    // I2S 16 Bits length and I2S serial audio data format
-    {ES8388_ADCCONTROL4, 0x0d},
-    // ADCFsMode,singel SPEED,RATIO=256
-    {ES8388_ADCCONTROL5, 0x02},
-    // ADC Volume
-    {ES8388_ADCCONTROL8, 0x00},
-    {ES8388_ADCCONTROL9, 0x00},
-    //@nightDav
-    // ALC Config (as recommended by ES8388 user guide for voice recording)
-    // Reg 0x12 = 0xe2 (ALC enable, PGA Max. Gain=23.5dB, Min. Gain=0dB)
-    {ES8388_ADCCONTROL10, 0xe2},
-    // Reg 0x13 = 0xa0 (ALC Target=-1.5dB, ALC Hold time =0 mS)
-    {ES8388_ADCCONTROL11, 0xa0},
-    // Reg 0x14 = 0x12(Decay time =820uS , Attack time = 416 uS)
-    {ES8388_ADCCONTROL12, 0x12},
-    // Reg 0x15 = 0x06(ALC mode)
-    {ES8388_ADCCONTROL13, 0x06},
-    // Reg 0x16 = 0xc3(nose gate = -40.5dB, NGG = 0x01(mute ADC))
-    {ES8388_ADCCONTROL14, 0xc3},
-    // Power on ADC
-    {ES8388_DACCONTROL21, 0x80},
-    // Start state machine
-    {ES8388_CHIPPOWER, 0xF0},
-};
-
-static constexpr i2c::I2CRegValue ES8388_UNMUTE[] PROGMEM = {
-    // unmute ADC with fade in
-    {ES8388_ADCCONTROL7, 0x60},
-    // unmute DAC with fade in
-    {ES8388_DACCONTROL3, 0x20},
-    // Power on ADC, Enable LIN&RIN, Power off MICBIAS, set int1lp to low power mode
-    {ES8388_ADCPOWER, 0x09},
-};
-
 void ES8388::setup() {
  // mute DAC
  this->set_mute_state_(true);

-  ES8388_ERROR_FAILED(this->write_registers(ES8388_INIT));
+  // I2S worker mode
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_MASTERMODE, 0x00));
+
+  /* Chip Control and Power Management */
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_CONTROL2, 0x50));
+  // normal all and power up all
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_CHIPPOWER, 0x00));
+
+  // vmidsel/500k
+  // EnRef=0,Play&Record Mode,(0x17-both of mic&play)
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_CONTROL1, 0x12));
+
+  // i2s 16 bits
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_DACCONTROL1, 0x18));
+  // sample freq 256
+  // DACFsMode,SINGLE SPEED; DACFsRatio,256
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_DACCONTROL2, 0x02));
+  // 0x00 audio on LIN1&RIN1,  0x09 LIN2&RIN2
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_DACCONTROL16, 0x00));
+  // only left DAC to left mixer enable 0db
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_DACCONTROL17, 0x90));
+  // only right DAC to right mixer enable 0db
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_DACCONTROL20, 0x90));
+  // set internal ADC and DAC use the same LRCK clock, ADC LRCK as internal LRCK
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_DACCONTROL21, 0x80));
+  // vroi=0 - 1.5k VREF to analog output resistance (default)
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_DACCONTROL23, 0x00));
+
+  // power down adc and line in
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_ADCPOWER, 0xFF));
+
+  //@nightdav
+  ES8388_ERROR_FAILED(
+      this->write_byte(ES8388_ADCCONTROL1, 0x00));  // +21dB : recommended value for ALC & voice recording
+
+  // set to Mono Right
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_ADCCONTROL3, 0x02));
+
+  // I2S 16 Bits length and I2S serial audio data format
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_ADCCONTROL4, 0x0d));
+  // ADCFsMode,singel SPEED,RATIO=256
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_ADCCONTROL5, 0x02));
+
+  // ADC Volume
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_ADCCONTROL8, 0x00));
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_ADCCONTROL9, 0x00));
+
+  //@nightDav
+  // ALC Config (as recommended by ES8388 user guide for voice recording)
+
+  // Reg 0x12 = 0xe2 (ALC enable, PGA Max. Gain=23.5dB, Min. Gain=0dB)
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_ADCCONTROL10, 0xe2));
+
+  // Reg 0x13 = 0xa0 (ALC Target=-1.5dB, ALC Hold time =0 mS)
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_ADCCONTROL11, 0xa0));
+  // Reg 0x14 = 0x12(Decay time =820uS , Attack time = 416 uS)
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_ADCCONTROL12, 0x12));
+
+  // Reg 0x15 = 0x06(ALC mode)
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_ADCCONTROL13, 0x06));
+
+  // Reg 0x16 = 0xc3(nose gate = -40.5dB, NGG = 0x01(mute ADC))
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_ADCCONTROL14, 0xc3));
+
+  // Power on ADC
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_DACCONTROL21, 0x80));
+
+  // Start state machine
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_CHIPPOWER, 0xF0));
  delay(1);
  ES8388_ERROR_FAILED(this->write_byte(ES8388_CHIPPOWER, 0x00));

@@ -101,7 +104,13 @@ void ES8388::setup() {

  this->set_mute_state_(false);

-  ES8388_ERROR_FAILED(this->write_registers(ES8388_UNMUTE));
+  // unmute ADC with fade in
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_ADCCONTROL7, 0x60));
+  // unmute DAC with fade in
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_DACCONTROL3, 0x20));
+
+  // Power on ADC, Enable LIN&RIN, Power off MICBIAS, set int1lp to low power mode
+  ES8388_ERROR_FAILED(this->write_byte(ES8388_ADCPOWER, 0x09));

 #ifdef USE_ES8388_SELECT
  if (this->dac_output_select_ != nullptr) {
@@ -143,8 +152,8 @@ void ES8388::dump_config() {
  ESP_LOGCONFIG(TAG, "ES8388 Audio Codec:");
  LOG_I2C_DEVICE(this);
 #ifdef USE_ES8388_SELECT
-  LOG_SELECT("  ", "DAC Output", this->dac_output_select_);
-  LOG_SELECT("  ", "ADC Input Mic", this->adc_input_mic_select_);
+  LOG_SELECT("  ", "DacOutputSelect", this->dac_output_select_);
+  LOG_SELECT("  ", "ADCInputMicSelect", this->adc_input_mic_select_);
 #endif
 }

@@ -24,12 +24,14 @@ ADC_INPUT_MIC_OPTIONS = AdcInputMicLine.options(
 )
 ADC_INPUT_MIC_OPTION_NAMES = list(ADC_INPUT_MIC_OPTIONS)

+DacOutputSelect = es8388_ns.class_("DacOutputSelect", select.Select)
+ADCInputMicSelect = es8388_ns.class_("ADCInputMicSelect", select.Select)

 CONFIG_SCHEMA = cv.All(
    {
        cv.GenerateID(CONF_ES8388_ID): cv.use_id(ES8388),
        cv.Optional(CONF_DAC_OUTPUT): select.select_schema(
-            select.ApplySelect,
+            DacOutputSelect,
            entity_category=ENTITY_CATEGORY_CONFIG,
            icon=ICON_CHIP,
        ).extend(
@@ -40,7 +42,7 @@ CONFIG_SCHEMA = cv.All(
            }
        ),
        cv.Optional(CONF_ADC_INPUT_MIC): select.select_schema(
-            select.ApplySelect,
+            ADCInputMicSelect,
            entity_category=ENTITY_CATEGORY_CONFIG,
            icon=ICON_CHIP,
        ).extend(
@@ -59,18 +61,12 @@ async def to_code(config: ConfigType) -> None:
    hub = await cg.get_variable(config[CONF_ES8388_ID])
    selects = select.sub_selects(config, parent=hub)
    await selects(
-        CONF_DAC_OUTPUT,
-        hub.set_dac_output_select,
-        options=DAC_OUTPUT_OPTION_NAMES,
-        apply="set_dac_output(static_cast<es8388::DacOutputLine>(index))",
-        publish="before",
+        CONF_DAC_OUTPUT, hub.set_dac_output_select, options=DAC_OUTPUT_OPTION_NAMES
    )
    await selects(
        CONF_ADC_INPUT_MIC,
        hub.set_adc_input_mic_select,
        options=ADC_INPUT_MIC_OPTION_NAMES,
-        apply="set_adc_input_mic(static_cast<es8388::AdcInputMicLine>(index))",
-        publish="before",
    )
    if (
        initial := config.get(CONF_DAC_OUTPUT, {}).get(CONF_INITIAL_OPTION)
@@ -0,0 +1,10 @@
+#include "adc_input_mic_select.h"
+
+namespace esphome::es8388 {
+
+void ADCInputMicSelect::control(size_t index) {
+  this->publish_state(index);
+  this->parent_->set_adc_input_mic(static_cast<AdcInputMicLine>(index));
+}
+
+}  // namespace esphome::es8388
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "esphome/components/es8388/es8388.h"
+#include "esphome/components/select/select.h"
+
+namespace esphome::es8388 {
+
+class ADCInputMicSelect final : public select::Select, public Parented<ES8388> {
+ protected:
+  void control(size_t index) override;
+};
+
+}  // namespace esphome::es8388
@@ -0,0 +1,10 @@
+#include "dac_output_select.h"
+
+namespace esphome::es8388 {
+
+void DacOutputSelect::control(size_t index) {
+  this->publish_state(index);
+  this->parent_->set_dac_output(static_cast<DacOutputLine>(index));
+}
+
+}  // namespace esphome::es8388
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "esphome/components/es8388/es8388.h"
+#include "esphome/components/select/select.h"
+
+namespace esphome::es8388 {
+
+class DacOutputSelect final : public select::Select, public Parented<ES8388> {
+ protected:
+  void control(size_t index) override;
+};
+
+}  // namespace esphome::es8388
@@ -2389,9 +2389,7 @@ FRAMEWORK_SCHEMA = cv.Schema(
                    cv.Schema(
                        {
                            cv.Required(CONF_NAME): cv.string_strict,
-                            cv.Optional(CONF_SOURCE): cv.All(
-                                cv.string_strict, cv.Length(min=1)
-                            ),
+                            cv.Optional(CONF_SOURCE): cv.git_ref,
                            cv.Optional(CONF_REF): cv.string,
                            cv.Optional(CONF_PATH): cv.string,
                        }
@@ -17,13 +17,8 @@
 #include "hal/rtc_io_hal.h"
 #endif

-// some variants don't map rtcio to gpio 1:1
-#if defined(USE_ESP32_VARIANT_ESP32) || defined(USE_ESP32_VARIANT_ESP32H2) || defined(USE_ESP32_VARIANT_ESP32H21)
-#define RTCIO_NEED_MAPPING 1  // NOLINT
-#endif
-
-#if defined(USE_ESP32_VARIANT_ESP32) || (SOC_RTCIO_PIN_COUNT > 0 && defined(USE_GPIO_HOLD))
-#define ISR_PIN_USE_RTC 1  // NOLINT
+#ifndef SOC_GPIO_SUPPORT_RTC_INDEPENDENT
+#define SOC_GPIO_SUPPORT_RTC_INDEPENDENT 0  // NOLINT
 #endif

 namespace esphome {
@@ -58,12 +53,10 @@ struct ISRPinArg {
 #ifdef USE_GPIO_HOLD
  bool hold;
 #endif
-#ifdef ISR_PIN_USE_RTC
+#if defined(USE_ESP32_VARIANT_ESP32)
  bool use_rtc;
-#ifdef RTCIO_NEED_MAPPING
  int rtc_pin;
 #endif
-#endif
 };

 #ifdef USE_GPIO_HOLD
@@ -76,15 +69,17 @@ static inline void refresh_hold(const ESP32InternalGPIOPin &pin) {
 static inline void IRAM_ATTR isr_refresh_hold(const ISRPinArg *arg) {
  if (!arg->hold)
    return;
-#if defined(ISR_PIN_USE_RTC) && defined(SOC_RTCIO_HOLD_SUPPORTED)
+#if defined(USE_ESP32_VARIANT_ESP32)
  if (arg->use_rtc) {
-#ifdef RTCIO_NEED_MAPPING
    rtcio_hal_hold_disable(arg->rtc_pin);
    rtcio_hal_hold_enable(arg->rtc_pin);
-#else
+    return;
+  }
+#elif defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
+  // GPIO0-21 are held from the RTC domain; the digital hold mask is zero for them
+  if (arg->pin < SOC_RTCIO_PIN_COUNT) {
    rtcio_hal_hold_disable(arg->pin);
    rtcio_hal_hold_enable(arg->pin);
-#endif
    return;
  }
 #endif
@@ -101,12 +96,10 @@ ISRInternalGPIOPin ESP32InternalGPIOPin::to_isr() const {
 #ifdef USE_GPIO_HOLD
  arg->hold = this->get_hold();
 #endif
-#ifdef ISR_PIN_USE_RTC
+#if defined(USE_ESP32_VARIANT_ESP32)
  arg->use_rtc = rtc_gpio_is_valid_gpio(this->get_pin_num());
-#ifdef RTCIO_NEED_MAPPING
  if (arg->use_rtc)
    arg->rtc_pin = rtc_io_number_get(this->get_pin_num());
-#endif
 #endif
  return ISRInternalGPIOPin((void *) arg);
 }
@@ -258,8 +251,7 @@ void IRAM_ATTR ISRInternalGPIOPin::pin_mode(gpio::Flags flags) {
  if (diff & gpio::FLAG_INPUT) {
    if (flags & gpio::FLAG_INPUT) {
      gpio_hal_input_enable(&GPIO_HAL, arg->pin);
-#ifdef USE_ESP32_VARIANT_ESP32
-      // Only ESP32 uses the RTC registers for pullup/pulldown
+#if defined(USE_ESP32_VARIANT_ESP32)
      if (arg->use_rtc) {
        if (flags & gpio::FLAG_PULLUP) {
          rtcio_hal_pullup_enable(arg->rtc_pin);
@@ -114,8 +114,7 @@ BLECharacteristicNotifyAction = esp32_ble_server_automations_ns.class_(
    "BLECharacteristicNotifyAction", automation.Action
 )
 bytebuffer_ns = cg.esphome_ns.namespace("bytebuffer")
-# Unscoped in C++; is_class keeps the generated Endian::LITTLE spelling
-Endian = bytebuffer_ns.enum("Endian", is_class=True)
+Endianness_ns = bytebuffer_ns.namespace("Endian")


 PROPERTY_MAP = {
@@ -411,7 +410,10 @@ def value_schema(default_type=UNDEFINED, templatable=True):
                ),
                cv.Optional(CONF_STRING_ENCODING, default="utf_8"): validate_encoding,
                cv.Optional(CONF_ENDIANNESS, default="LITTLE"): cv.enum(
-                    Endian.options("LITTLE", "BIG")
+                    {
+                        "LITTLE": Endianness_ns.LITTLE,
+                        "BIG": Endianness_ns.BIG,
+                    }
                ),
            },
            validate_value_type,
@@ -54,21 +54,25 @@ CAN_MODES = {
 # The supported bit rates differ between ESP32 variants.
 # See ESP-IDF Programming Guide --> API Reference --> Two-Wire Automotive Interface (TWAI)

-CAN_SPEEDS_ESP32 = CanSpeed.options(
-    "20KBPS",
-    "25KBPS",
-    "50KBPS",
-    "100KBPS",
-    "125KBPS",
-    "250KBPS",
-    "500KBPS",
-    "800KBPS",
-    "1000KBPS",
-    prefix="CAN_",
-)
+CAN_SPEEDS_ESP32 = {
+    "20KBPS": CanSpeed.CAN_20KBPS,
+    "25KBPS": CanSpeed.CAN_25KBPS,
+    "50KBPS": CanSpeed.CAN_50KBPS,
+    "100KBPS": CanSpeed.CAN_100KBPS,
+    "125KBPS": CanSpeed.CAN_125KBPS,
+    "250KBPS": CanSpeed.CAN_250KBPS,
+    "500KBPS": CanSpeed.CAN_500KBPS,
+    "800KBPS": CanSpeed.CAN_800KBPS,
+    "1000KBPS": CanSpeed.CAN_1000KBPS,
+}

 CAN_SPEEDS_ESP32_S2 = {
-    **CanSpeed.options("1KBPS", "5KBPS", "10KBPS", "12K5BPS", "16KBPS", prefix="CAN_"),
+    "1KBPS": CanSpeed.CAN_1KBPS,
+    "5KBPS": CanSpeed.CAN_5KBPS,
+    "10KBPS": CanSpeed.CAN_10KBPS,
+    "12K5BPS": CanSpeed.CAN_12K5BPS,
+    "16KBPS": CanSpeed.CAN_16KBPS,
+    "20KBPS": CanSpeed.CAN_20KBPS,
    **CAN_SPEEDS_ESP32,
 }

@@ -1,5 +1,4 @@
 #include "led_strip.h"
-#include <algorithm>
 #include <cinttypes>

 #ifdef USE_ESP32
@@ -15,8 +14,6 @@ namespace esphome::esp32_rmt_led_strip {
 ESPHOME_LOG_TAG(TAG, "esp32_rmt_led_strip");

 static const size_t RMT_SYMBOLS_PER_BYTE = 8;
-// Idle time the line must stay low between frames so the strip latches
-static constexpr uint32_t RESET_GAP_US = 50;

 // Query the RMT default clock source frequency. This varies by variant:
 // APB (80MHz) on ESP32/S2/S3/C3, PLL_F80M (80MHz) on C6/P4, XTAL (32MHz) on H2.
@@ -94,20 +91,10 @@ void ESP32RMTLEDStripLightOutput::setup() {
  this->rmt_buf_ = rmt_allocator.allocate(buffer_size * 8 + 1);
 #endif

-  const uint32_t resolution_hz = rmt_resolution_hz();
-  // Longest wire time of one frame; write_state() defers instead of blocking until it has elapsed
-  uint32_t bit_ticks = std::max(this->params_.bit0.duration0 + this->params_.bit0.duration1,
-                                this->params_.bit1.duration0 + this->params_.bit1.duration1);
-  uint64_t frame_ticks = (uint64_t) bit_ticks * buffer_size * RMT_SYMBOLS_PER_BYTE + this->params_.reset.duration0 +
-                         this->params_.reset.duration1;
-  this->frame_time_us_ = frame_ticks * 1000000 / resolution_hz + RESET_GAP_US;
-  // Seed with the interval write_state() gates on, so the first frame is not deferred
-  this->last_refresh_ = micros() - std::max(this->frame_time_us_, this->max_refresh_rate_);
-
  rmt_tx_channel_config_t channel;
  memset(&channel, 0, sizeof(channel));
  channel.clk_src = RMT_CLK_SRC_DEFAULT;
-  channel.resolution_hz = resolution_hz;
+  channel.resolution_hz = rmt_resolution_hz();
  channel.gpio_num = gpio_num_t(this->pin_);
  channel.mem_block_symbols = this->rmt_symbols_;
  channel.trans_queue_depth = 1;
@@ -170,21 +157,22 @@ void ESP32RMTLEDStripLightOutput::set_led_params(uint32_t bit0_high, uint32_t bi
 }

 void ESP32RMTLEDStripLightOutput::write_state(light::LightState *state) {
-  // Previous frame still on the wire, inside its reset gap, or refreshing too often: try again next loop
-  if (this->throttle_show_(micros(), this->last_refresh_, std::max(this->frame_time_us_, this->max_refresh_rate_)))
+  uint32_t now = micros();
+  if (this->throttle_show_(now, this->last_refresh_, this->max_refresh_rate_))
    return;
-
-  // The gate above should always cover the previous frame; never overwrite rmt_buf_ while the RMT still reads it
-  if (rmt_tx_wait_all_done(this->channel_, 0) != ESP_OK) {
-    ESP_LOGE(TAG, "RMT TX still busy");
-    this->status_set_warning();
-    this->schedule_show();
-    return;
-  }
+  this->last_refresh_ = now;
  this->mark_shown_();

  ESP_LOGVV(TAG, "Writing RGB values to bus");

+  esp_err_t error = rmt_tx_wait_all_done(this->channel_, 1000);
+  if (error != ESP_OK) {
+    ESP_LOGE(TAG, "RMT TX timeout");
+    this->status_set_warning();
+    return;
+  }
+  delayMicroseconds(50);
+
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
  memcpy(this->rmt_buf_, this->buf_, this->get_buffer_size_());
 #else
@@ -215,19 +203,13 @@ void ESP32RMTLEDStripLightOutput::write_state(light::LightState *state) {
  rmt_transmit_config_t config;
  memset(&config, 0, sizeof(config));
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
-  esp_err_t error = rmt_transmit(this->channel_, this->encoder_, this->rmt_buf_, this->get_buffer_size_(), &config);
+  error = rmt_transmit(this->channel_, this->encoder_, this->rmt_buf_, this->get_buffer_size_(), &config);
 #else
-  esp_err_t error =
-      rmt_transmit(this->channel_, this->encoder_, this->rmt_buf_, len * sizeof(rmt_symbol_word_t), &config);
+  error = rmt_transmit(this->channel_, this->encoder_, this->rmt_buf_, len * sizeof(rmt_symbol_word_t), &config);
 #endif
  if (!this->status_comm_result(error == ESP_OK, nullptr)) {
    ESP_LOGE(TAG, "RMT TX error");
-    // retry next loop iteration so the frame is not lost
-    this->schedule_show();
-    return;
  }
-  // Stamped after the transfer started so the gate above stays conservative
-  this->last_refresh_ = micros();
 }

 void ESP32RMTLEDStripLightOutput::dump_config() {
@@ -81,8 +81,6 @@ class ESP32RMTLEDStripLightOutput final : public light::AddressableLight {

  uint32_t last_refresh_{0};
  uint32_t max_refresh_rate_{0};
-  // Worst-case wire time of one frame plus the reset gap, computed in setup()
-  uint32_t frame_time_us_{0};
 };

 }  // namespace esphome::esp32_rmt_led_strip
@@ -9,23 +9,24 @@ from .. import (
    CONF_ESPECTRE_ID,
    DOMAIN,
    ESPectreComponent,
+    espectre_ns,
    supported_traffic_generator_modes,
 )

 DEPENDENCIES = ["espectre"]

+TrafficModeSelect = espectre_ns.class_(
+    "TrafficModeSelect", select.Select, cg.Parented.template(ESPectreComponent)
+)

 CONFIG_SCHEMA = select.select_schema(
-    select.ApplySelect, entity_category=ENTITY_CATEGORY_CONFIG
+    TrafficModeSelect, entity_category=ENTITY_CATEGORY_CONFIG
 ).extend({cv.GenerateID(CONF_ESPECTRE_ID): cv.use_id(ESPectreComponent)})


 async def to_code(config: ConfigType) -> None:
    options = supported_traffic_generator_modes(CORE.config[DOMAIN])
-    hub = await cg.get_variable(config[CONF_ESPECTRE_ID])
-    await select.sub_selects(config, parent=hub).create(
-        config,
-        hub.set_traffic_mode_select,
-        options=options,
-        apply="request_traffic_generator_mode(option)",
-    )
+    var = await select.new_select(config, options=options)
+    await cg.register_parented(var, config[CONF_ESPECTRE_ID])
+    parent = await cg.get_variable(config[CONF_ESPECTRE_ID])
+    cg.add(parent.set_traffic_mode_select(var))
@@ -0,0 +1,11 @@
+#include "espectre_select.h"
+
+#ifdef USE_ESPECTRE
+
+namespace esphome::espectre {
+
+void TrafficModeSelect::control(size_t index) { this->parent_->request_traffic_generator_mode(this->option_at(index)); }
+
+}  // namespace esphome::espectre
+
+#endif  // USE_ESPECTRE
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "esphome/core/defines.h"
+
+#ifdef USE_ESPECTRE
+
+#include "esphome/components/select/select.h"
+#include "../espectre.h"
+
+namespace esphome::espectre {
+
+class TrafficModeSelect final : public select::Select, public Parented<ESPectreComponent> {
+ protected:
+  void control(size_t index) override;
+};
+
+}  // namespace esphome::espectre
+
+#endif  // USE_ESPECTRE
@@ -1,14 +1,14 @@
 #include "ezo.h"
 #include "esphome/core/log.h"
 #include "esphome/core/hal.h"
-#include "esphome/core/progmem.h"

 namespace esphome::ezo {

-PROGMEM_STRING_TABLE(EzoCommandTypeStrings, "EZO_READ", "EZO_LED", "EZO_DEVICE_INFORMATION", "EZO_SLOPE",
-                     "EZO_CALIBRATION", "EZO_SLEEP", "EZO_I2C", "EZO_T", "EZO_CUSTOM");
+static const char *const EZO_COMMAND_TYPE_STRINGS[] = {"EZO_READ",  "EZO_LED",         "EZO_DEVICE_INFORMATION",
+                                                       "EZO_SLOPE", "EZO_CALIBRATION", "EZO_SLEEP",
+                                                       "EZO_I2C",   "EZO_T",           "EZO_CUSTOM"};

-PROGMEM_STRING_TABLE(EzoCalibrationTypeStrings, "LOW", "MID", "HIGH");
+static const char *const EZO_CALIBRATION_TYPE_STRINGS[] = {"LOW", "MID", "HIGH"};

 void EZOSensor::dump_config() {
  LOG_SENSOR("", "EZO", this);
@@ -103,8 +103,7 @@ void EZOSensor::loop() {
      break;
  }

-  ESP_LOGV(TAG, "Received buffer \"%s\" for command type %s", &buf[1],
-           LOG_STR_ARG(EzoCommandTypeStrings::get_log_str(to_run->command_type, EzoCommandTypeStrings::LAST_INDEX)));
+  ESP_LOGV(TAG, "Received buffer \"%s\" for command type %s", &buf[1], EZO_COMMAND_TYPE_STRINGS[to_run->command_type]);

  if (buf[0] == 1) {
    std::string payload = reinterpret_cast<char *>(&buf[1]);
@@ -169,9 +168,7 @@ void EZOSensor::add_command_(const char *command, EzoCommandType command_type, u
 void EZOSensor::set_calibration_point_(EzoCalibrationType type, float value) {
  // max 21: "Cal,"(4) + type(4) + ","(1) + float(11) + null; use 24 for safety
  char payload[24];
-  ESPHOME_snprintf_P(payload, sizeof(payload), ESPHOME_PSTR("Cal,%s,%0.2f"),
-                     LOG_STR_ARG(EzoCalibrationTypeStrings::get_log_str(type, EzoCalibrationTypeStrings::LAST_INDEX)),
-                     value);
+  snprintf(payload, sizeof(payload), "Cal,%s,%0.2f", EZO_CALIBRATION_TYPE_STRINGS[type], value);
  this->add_command_(payload, EzoCommandType::EZO_CALIBRATION, 900);
 }

@@ -179,7 +176,7 @@ void EZOSensor::set_address(uint8_t address) {
  if (address > 0 && address < 128) {
    // max 8: "I2C,"(4) + uint8(3) + null
    char payload[8];
-    ESPHOME_snprintf_P(payload, sizeof(payload), ESPHOME_PSTR("I2C,%u"), address);
+    snprintf(payload, sizeof(payload), "I2C,%u", address);
    this->new_address_ = address;
    this->add_command_(payload, EzoCommandType::EZO_I2C);
  } else {
@@ -200,7 +197,7 @@ void EZOSensor::get_t() { this->add_command_("T,?", EzoCommandType::EZO_T); }
 void EZOSensor::set_t(float value) {
  // max 14 bytes: "T,"(2) + float with "%0.2f" (up to 11 chars) + null(1); use 16 for alignment
  char payload[16];
-  ESPHOME_snprintf_P(payload, sizeof(payload), ESPHOME_PSTR("T,%0.2f"), value);
+  snprintf(payload, sizeof(payload), "T,%0.2f", value);
  this->add_command_(payload, EzoCommandType::EZO_T);
 }

@@ -223,7 +220,7 @@ void EZOSensor::set_calibration_point_high(float value) {
 void EZOSensor::set_calibration_generic(float value) {
  // exact 16 bytes: "Cal," (4) + float with "%0.2f" (up to 11 chars, e.g. "-9999999.99") + null (1) = 16
  char payload[16];
-  ESPHOME_snprintf_P(payload, sizeof(payload), ESPHOME_PSTR("Cal,%0.2f"), value);
+  snprintf(payload, sizeof(payload), "Cal,%0.2f", value);
  this->add_command_(payload, EzoCommandType::EZO_CALIBRATION, 900);
 }

@@ -34,7 +34,10 @@ void FT63X6Touchscreen::setup() {
    this->attach_interrupt_(this->interrupt_pin_, gpio::INTERRUPT_ANY_EDGE);
  }

-  pulse_reset(this->reset_pin_, {.low_ms = 10});
+  if (this->reset_pin_ != nullptr) {
+    this->reset_pin_->setup();
+    this->hard_reset_();
+  }

  // Get touch resolution
  if (this->x_raw_max_ == this->x_raw_min_) {
@@ -54,6 +57,14 @@ void FT63X6Touchscreen::setup() {
  this->write_byte(FT6X36_ADDR_TOUCHRATE_ACTIVE, 0x0E);
 }

+void FT63X6Touchscreen::hard_reset_() {
+  if (this->reset_pin_ != nullptr) {
+    this->reset_pin_->digital_write(false);
+    delay(10);
+    this->reset_pin_->digital_write(true);
+  }
+}
+
 void FT63X6Touchscreen::dump_config() {
  ESP_LOGCONFIG(TAG, "FT63X6 Touchscreen:");
  LOG_I2C_DEVICE(this);
@@ -27,6 +27,7 @@ class FT63X6Touchscreen final : public Touchscreen, public i2c::I2CDevice {
  void set_threshold(uint8_t threshold) { this->threshold_ = threshold; }

 protected:
+  void hard_reset_();
  void update_touches() override;

  InternalGPIOPin *interrupt_pin_{nullptr};
@@ -83,7 +83,13 @@ void GSL3670Touchscreen::update_touches() {
 void GSL3670Touchscreen::clear_reg_() {
  ESP_LOGD(TAG, "clear_reg");

-  pulse_reset(this->reset_pin_, {.low_ms = 1, .high_after_ms = 5});
+  // GPIO reset pulse
+  if (this->reset_pin_ != nullptr) {
+    this->reset_pin_->digital_write(false);
+    delay(1);
+    this->reset_pin_->digital_write(true);
+    delay(5);
+  }

  this->write_reg8_(0x88, 0x01);
  // delay(5);
@@ -100,7 +106,12 @@ void GSL3670Touchscreen::clear_reg_() {
 void GSL3670Touchscreen::reset_() {
  ESP_LOGD(TAG, "reset");

-  pulse_reset(this->reset_pin_, {.low_ms = 1, .high_after_ms = 5});
+  if (this->reset_pin_ != nullptr) {
+    this->reset_pin_->digital_write(false);
+    delay(1);
+    this->reset_pin_->digital_write(true);
+    delay(5);
+  }

  this->write_reg8_(0xe4, 0x04);

@@ -3,11 +3,7 @@ import logging
 from esphome import automation
 import esphome.codegen as cg
 from esphome.components import climate, logger, uart
-from esphome.components.climate import (
-    CLIMATE_MODES,
-    CLIMATE_PRESETS,
-    CLIMATE_SWING_MODES,
-)
+from esphome.components.climate import ClimateMode, ClimatePreset, ClimateSwingMode
 from esphome.components.logger import DOMAIN as LOGGER_DOMAIN
 from esphome.components.wifi import DOMAIN as WIFI_DOMAIN
 import esphome.config_validation as cv
@@ -81,19 +77,31 @@ AIRFLOW_HORIZONTAL_DIRECTION_OPTIONS = AirflowHorizontalDirection.options(
 )

 SUPPORTED_SWING_MODES_OPTIONS = {
-    k: CLIMATE_SWING_MODES[k] for k in ("OFF", "VERTICAL", "HORIZONTAL", "BOTH")
+    "OFF": ClimateSwingMode.CLIMATE_SWING_OFF,
+    "VERTICAL": ClimateSwingMode.CLIMATE_SWING_VERTICAL,
+    "HORIZONTAL": ClimateSwingMode.CLIMATE_SWING_HORIZONTAL,
+    "BOTH": ClimateSwingMode.CLIMATE_SWING_BOTH,
 }

 SUPPORTED_CLIMATE_MODES_OPTIONS = {
-    k: CLIMATE_MODES[k] for k in ("OFF", "HEAT_COOL", "COOL", "HEAT", "DRY", "FAN_ONLY")
+    "OFF": ClimateMode.CLIMATE_MODE_OFF,  # always available
+    "HEAT_COOL": ClimateMode.CLIMATE_MODE_HEAT_COOL,  # always available
+    "COOL": ClimateMode.CLIMATE_MODE_COOL,
+    "HEAT": ClimateMode.CLIMATE_MODE_HEAT,
+    "DRY": ClimateMode.CLIMATE_MODE_DRY,
+    "FAN_ONLY": ClimateMode.CLIMATE_MODE_FAN_ONLY,
 }

 SUPPORTED_CLIMATE_PRESETS_SMARTAIR2_OPTIONS = {
-    k: CLIMATE_PRESETS[k] for k in ("AWAY", "BOOST", "COMFORT")
+    "AWAY": ClimatePreset.CLIMATE_PRESET_AWAY,
+    "BOOST": ClimatePreset.CLIMATE_PRESET_BOOST,
+    "COMFORT": ClimatePreset.CLIMATE_PRESET_COMFORT,
 }

 SUPPORTED_CLIMATE_PRESETS_HON_OPTIONS = {
-    k: CLIMATE_PRESETS[k] for k in ("AWAY", "BOOST", "SLEEP")
+    "AWAY": ClimatePreset.CLIMATE_PRESET_AWAY,
+    "BOOST": ClimatePreset.CLIMATE_PRESET_BOOST,
+    "SLEEP": ClimatePreset.CLIMATE_PRESET_SLEEP,
 }

 HonControlMethod = haier_ns.enum("HonControlMethod", True)
@@ -6,7 +6,6 @@
 #include "esphome/components/wifi/wifi_component.h"
 #endif
 #include "haier_base.h"
-#include "esphome/core/progmem.h"

 using namespace esphome::climate;
 using namespace esphome::uart;
@@ -20,16 +19,28 @@ constexpr size_t PROTOCOL_INITIALIZATION_INTERVAL = 10000;
 constexpr size_t DEFAULT_MESSAGES_INTERVAL_MS = 2000;
 constexpr size_t CONTROL_MESSAGES_INTERVAL_MS = 400;

-PROGMEM_STRING_TABLE(ProtocolPhaseStrings, "SENDING_INIT_1", "SENDING_INIT_2", "SENDING_FIRST_STATUS_REQUEST",
-                     "SENDING_FIRST_ALARM_STATUS_REQUEST", "IDLE", "SENDING_STATUS_REQUEST",
-                     "SENDING_UPDATE_SIGNAL_REQUEST", "SENDING_SIGNAL_LEVEL", "SENDING_CONTROL",
-                     "SENDING_ACTION_COMMAND", "SENDING_ALARM_STATUS_REQUEST", "UNKNOWN");
-
-const LogString *HaierClimateBase::phase_to_string_(ProtocolPhases phase) {
-  static_assert(ProtocolPhaseStrings::COUNT == ((int) ProtocolPhases::NUM_PROTOCOL_PHASES) + 1,
-                "ProtocolPhaseStrings must match the enum ProtocolPhases, with UNKNOWN last");
-  // UNKNOWN (-1) wraps past the table and reads as the last entry, "UNKNOWN"
-  return ProtocolPhaseStrings::get_log_str(static_cast<uint8_t>(phase), ProtocolPhaseStrings::LAST_INDEX);
+const char *HaierClimateBase::phase_to_string_(ProtocolPhases phase) {
+  static const char *phase_names[] = {
+      "SENDING_INIT_1",
+      "SENDING_INIT_2",
+      "SENDING_FIRST_STATUS_REQUEST",
+      "SENDING_FIRST_ALARM_STATUS_REQUEST",
+      "IDLE",
+      "SENDING_STATUS_REQUEST",
+      "SENDING_UPDATE_SIGNAL_REQUEST",
+      "SENDING_SIGNAL_LEVEL",
+      "SENDING_CONTROL",
+      "SENDING_ACTION_COMMAND",
+      "SENDING_ALARM_STATUS_REQUEST",
+      "UNKNOWN"  // Should be the last!
+  };
+  static_assert(
+      (sizeof(phase_names) / sizeof(char *)) == (((int) ProtocolPhases::NUM_PROTOCOL_PHASES) + 1),
+      "Wrong phase_names array size. Please, make sure that this array is aligned with the enum ProtocolPhases");
+  int phase_index = (int) phase;
+  if ((phase_index > (int) ProtocolPhases::NUM_PROTOCOL_PHASES) || (phase_index < 0))
+    phase_index = (int) ProtocolPhases::NUM_PROTOCOL_PHASES;
+  return phase_names[phase_index];
 }

 bool check_timeout(std::chrono::steady_clock::time_point now, std::chrono::steady_clock::time_point tpoint,
@@ -60,8 +71,7 @@ HaierClimateBase::~HaierClimateBase() {}

 void HaierClimateBase::set_phase(ProtocolPhases phase) {
  if (this->protocol_phase_ != phase) {
-    ESP_LOGV(TAG, "Phase transition: %s => %s", LOG_STR_ARG(phase_to_string_(this->protocol_phase_)),
-             LOG_STR_ARG(phase_to_string_(phase)));
+    ESP_LOGV(TAG, "Phase transition: %s => %s", phase_to_string_(this->protocol_phase_), phase_to_string_(phase));
    this->protocol_phase_ = phase;
  }
 }
@@ -215,7 +225,7 @@ haier_protocol::HandlerError HaierClimateBase::report_network_status_answer_hand

 haier_protocol::HandlerError HaierClimateBase::timeout_default_handler_(haier_protocol::FrameType request_type) {
  ESP_LOGW(TAG, "Answer timeout for command %02X, phase %s", (uint8_t) request_type,
-           LOG_STR_ARG(phase_to_string_(this->protocol_phase_)));
+           phase_to_string_(this->protocol_phase_));
  if (this->protocol_phase_ > ProtocolPhases::IDLE) {
    this->set_phase(ProtocolPhases::IDLE);
  } else {
@@ -95,7 +95,7 @@ class HaierClimateBase : public esphome::Component,
    SENDING_ALARM_STATUS_REQUEST,
    NUM_PROTOCOL_PHASES
  };
-  const LogString *phase_to_string_(ProtocolPhases phase);
+  const char *phase_to_string_(ProtocolPhases phase);
  virtual void set_handlers() = 0;
  virtual void process_phase(std::chrono::steady_clock::time_point now) = 0;
  virtual haier_protocol::HaierMessage get_control_message() = 0;          // NOLINT(readability-identifier-naming)
@@ -564,7 +564,7 @@ void HonClimate::process_phase(std::chrono::steady_clock::time_point now) {
    default:
      // Shouldn't get here
      ESP_LOGE(TAG, "Wrong protocol handler state: %s (%d), resetting communication",
-               LOG_STR_ARG(phase_to_string_(this->protocol_phase_)), (int) this->protocol_phase_);
+               phase_to_string_(this->protocol_phase_), (int) this->protocol_phase_);
      this->set_phase(ProtocolPhases::SENDING_INIT_1);
      break;
  }
@@ -9,9 +9,12 @@ from ..climate import (
    CONF_HORIZONTAL_AIRFLOW,
    CONF_VERTICAL_AIRFLOW,
    HonClimate,
+    haier_ns,
 )

 CODEOWNERS = ["@paveldn"]
+VerticalAirflowSelect = haier_ns.class_("VerticalAirflowSelect", select.Select)
+HorizontalAirflowSelect = haier_ns.class_("HorizontalAirflowSelect", select.Select)

 # Same order as VERTICAL_SWING_MODES_ORDER and HORIZONTAL_SWING_MODES_ORDER in hon_climate.h
 AIRFLOW_VERTICAL_DIRECTION_OPTIONS = [
@@ -36,12 +39,12 @@ CONFIG_SCHEMA = cv.Schema(
    {
        cv.GenerateID(CONF_HAIER_ID): cv.use_id(HonClimate),
        cv.Optional(CONF_VERTICAL_AIRFLOW): select.select_schema(
-            select.ApplySelect,
+            VerticalAirflowSelect,
            icon="mdi:arrow-expand-vertical",
            entity_category=ENTITY_CATEGORY_CONFIG,
        ),
        cv.Optional(CONF_HORIZONTAL_AIRFLOW): select.select_schema(
-            select.ApplySelect,
+            HorizontalAirflowSelect,
            icon="mdi:arrow-expand-horizontal",
            entity_category=ENTITY_CATEGORY_CONFIG,
        ),
@@ -56,13 +59,9 @@ async def to_code(config: ConfigType) -> None:
        CONF_VERTICAL_AIRFLOW,
        hub.set_vertical_airflow_select,
        options=AIRFLOW_VERTICAL_DIRECTION_OPTIONS,
-        apply="set_vertical_airflow("
-        "haier::airflow_order_at(haier::VERTICAL_SWING_MODES_ORDER, index))",
    )
    await selects(
        CONF_HORIZONTAL_AIRFLOW,
        hub.set_horizontal_airflow_select,
        options=AIRFLOW_HORIZONTAL_DIRECTION_OPTIONS,
-        apply="set_horizontal_airflow("
-        "haier::airflow_order_at(haier::HORIZONTAL_SWING_MODES_ORDER, index))",
    )
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "esphome/components/select/select.h"
+#include "../hon_climate.h"
+
+namespace esphome::haier {
+
+class HorizontalAirflowSelect : public select::Select, public Parented<HonClimate> {
+ protected:
+  void control(size_t index) override {
+    this->parent_->set_horizontal_airflow(airflow_order_at(HORIZONTAL_SWING_MODES_ORDER, index));
+  }
+};
+
+}  // namespace esphome::haier
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "esphome/components/select/select.h"
+#include "../hon_climate.h"
+
+namespace esphome::haier {
+
+class VerticalAirflowSelect : public select::Select, public Parented<HonClimate> {
+ protected:
+  void control(size_t index) override {
+    this->parent_->set_vertical_airflow(airflow_order_at(VERTICAL_SWING_MODES_ORDER, index));
+  }
+};
+
+}  // namespace esphome::haier
@@ -93,7 +93,7 @@ haier_protocol::HandlerError Smartair2Climate::messages_timeout_handler_with_cyc
  if (this->protocol_phase_ >= ProtocolPhases::IDLE)
    return HaierClimateBase::timeout_default_handler_(message_type);
  ESP_LOGI(TAG, "Answer timeout for command %02X, phase %s", (uint8_t) message_type,
-           LOG_STR_ARG(phase_to_string_(this->protocol_phase_)));
+           phase_to_string_(this->protocol_phase_));
  ProtocolPhases new_phase = (ProtocolPhases) ((int) this->protocol_phase_ + 1);
  if (new_phase >= ProtocolPhases::SENDING_FIRST_ALARM_STATUS_REQUEST)
    new_phase = ProtocolPhases::SENDING_INIT_1;
@@ -217,7 +217,7 @@ void Smartair2Climate::process_phase(std::chrono::steady_clock::time_point now)
    default:
      // Shouldn't get here
      ESP_LOGE(TAG, "Wrong protocol handler state: %s (%d), resetting communication",
-               LOG_STR_ARG(phase_to_string_(this->protocol_phase_)), (int) this->protocol_phase_);
+               phase_to_string_(this->protocol_phase_), (int) this->protocol_phase_);
      this->set_phase(ProtocolPhases::SENDING_INIT_1);
      break;
  }
@@ -1,7 +1,6 @@
 #include "htu21d.h"
-#include "esphome/core/hal.h"
-#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
+#include "esphome/core/hal.h"

 namespace esphome::htu21d {

@@ -113,7 +112,11 @@ void HTU21DComponent::set_heater(bool status) {
    this->status_set_warning();
    return;
  }
-  assign_bits(raw_heater, 1 << HTU21D_REG_HTRE_BIT, status);
+  if (status) {
+    raw_heater |= (1 << HTU21D_REG_HTRE_BIT);
+  } else {
+    raw_heater &= ~(1 << HTU21D_REG_HTRE_BIT);
+  }
  if (this->write_register(HTU21D_WRITERHT_REG_CMD, &raw_heater, 1) != i2c::ERROR_OK) {
    this->status_set_warning();
    return;
@@ -40,7 +40,10 @@ RG_MODELS = {
    # 1.200 - https://rainsensors.com/wp-content/uploads/sites/3/2022/03/2022.02.17-rev-1.200-rg-9_instructions.pdf
 }

-RG15_RESOLUTION = RG15Resolution.options("low", "high", prefix="FORCE_")
+RG15_RESOLUTION = {
+    "low": RG15Resolution.FORCE_LOW,
+    "high": RG15Resolution.FORCE_HIGH,
+}

 SUPPORTED_OPTIONS = {
    CONF_ACC: ["RG_15"],
@@ -270,23 +270,21 @@ void I2SAudioMicrophone::mic_task(void *params) {

  {  // Ensures the samples vector is freed when the task stops

-    // Copied so the format cannot change while the task runs
-    const audio::AudioStreamInfo stream_info = this_microphone->audio_stream_info_;
-    const size_t bytes_to_read = stream_info.ms_to_bytes(READ_DURATION_MS);
+    const size_t bytes_to_read = this_microphone->audio_stream_info_.ms_to_bytes(READ_DURATION_MS);
    std::vector<uint8_t> samples;
    samples.reserve(bytes_to_read);

    xEventGroupSetBits(this_microphone->event_group_, MicrophoneEventGroupBits::TASK_RUNNING);

    while (!(xEventGroupGetBits(this_microphone->event_group_) & MicrophoneEventGroupBits::COMMAND_STOP)) {
-      if (this_microphone->has_data_callbacks_()) {
+      if (this_microphone->data_callbacks_.size() > 0) {
        samples.resize(bytes_to_read);
        size_t bytes_read = this_microphone->read_(samples.data(), bytes_to_read, 2 * READ_DURATION_MS);
        samples.resize(bytes_read);
        if (this_microphone->correct_dc_offset_) {
          this_microphone->fix_dc_offset_(samples);
        }
-        this_microphone->publish_audio_(samples, stream_info);
+        this_microphone->data_callbacks_.call(samples);
      } else {
        vTaskDelay(pdMS_TO_TICKS(READ_DURATION_MS));
      }
@@ -19,7 +19,12 @@ void ICNT86Touchscreen::setup() {
  }

  // Perform reset if necessary
-  pulse_reset(this->reset_pin_, {.low_ms = 10});
+  if (this->reset_pin_ != nullptr) {
+    this->reset_pin_->setup();
+    this->reset_pin_->digital_write(false);
+    delay(10);
+    this->reset_pin_->digital_write(true);
+  }

  if (this->x_raw_max_ == this->x_raw_min_) {
    this->x_raw_max_ = this->display_->get_native_width();
@@ -1,7 +1,8 @@
 """Shared base for the infrared and radio_frequency entity components."""

 import esphome.codegen as cg
-from esphome.const import CONF_API
+from esphome.components import remote_base
+from esphome.components.api import DOMAIN as API_DOMAIN
 from esphome.core import CORE
 from esphome.core.entity_helpers import queue_entity_register
 from esphome.types import ConfigType
@@ -23,10 +24,8 @@ async def attach_transmitter(var: cg.MockObj, config: ConfigType, key: str) -> N
    does. Without this call anywhere in the build a request is answered as
    soon as the frame is handed over.
    """
-    from esphome.components import remote_base
-
    await remote_base.register_transmittable(var, config, key)
-    if CONF_API in CORE.config:
+    if API_DOMAIN in CORE.config:
        cg.add_define("USE_IR_RF_TRANSMIT_COMPLETE")


@@ -2,20 +2,11 @@

 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
-#include "esphome/core/progmem.h"

 namespace esphome::kamstrup_kmp {

 ESPHOME_LOG_TAG(TAG, "kamstrup_kmp");

-// KMP units indexed by unit code; the empty first entry doubles as the fallback for unknown codes
-PROGMEM_STRING_TABLE(KmpUnits, "", "Wh", "kWh", "MWh", "GWh", "J", "kJ", "MJ", "GJ", "Cal", "kCal", "Mcal", "Gcal",
-                     "varh", "kvarh", "Mvarh", "Gvarh", "VAh", "kVAh", "MVAh", "GVAh", "kW", "kW", "MW", "GW", "kvar",
-                     "kvar", "Mvar", "Gvar", "VA", "kVA", "MVA", "GVA", "V", "A", "kV", "kA", "C", "K", "l", "m3",
-                     "l/h", "m3/h", "m3xC", "ton", "ton/h", "h", "hh:mm:ss", "yy:mm:dd", "yyyy:mm:dd", "mm:dd", "",
-                     "bar", "RTC", "ASCII", "m3 x 10", "ton x 10", "GJ x 10", "minutes", "Bitfield", "s", "ms", "days",
-                     "RTC-Q", "Datetime");
-
 void KamstrupKMPComponent::dump_config() {
  ESP_LOGCONFIG(TAG, "kamstrup_kmp:");
  LOG_UPDATE_INTERVAL(this);
@@ -246,6 +237,8 @@ void KamstrupKMPComponent::parse_command_message_(uint16_t command, const uint8_
 }

 void KamstrupKMPComponent::set_sensor_value_(uint16_t command, float value, uint8_t unit_idx) {
+  const char *unit = unit_idx < sizeof(UNITS) / sizeof(UNITS[0]) ? UNITS[unit_idx] : "";
+
  // Standard sensors
  if (command == CMD_HEAT_ENERGY && this->heat_energy_sensor_ != nullptr) {
    this->heat_energy_sensor_->publish_state(value);
@@ -270,8 +263,7 @@ void KamstrupKMPComponent::set_sensor_value_(uint16_t command, float value, uint
    }
  }

-  ESP_LOGD(TAG, "Received value for command 0x%04X: %.3f [%s]", command, value,
-           LOG_STR_ARG(KmpUnits::get_log_str(unit_idx, 0)));
+  ESP_LOGD(TAG, "Received value for command 0x%04X: %.3f [%s]", command, value, unit);
 }

 }  // namespace esphome::kamstrup_kmp
@@ -63,6 +63,16 @@ static const uint16_t CMD_TEMP_DIFF = 0x0059;
 static const uint16_t CMD_FLOW = 0x004A;
 static const uint16_t CMD_VOLUME = 0x0044;

+// KMP units
+static const char *const UNITS[] = {
+    "",      "Wh",   "kWh",  "MWh",   "GWh",     "J",       "kJ",       "MJ",       "GJ",       "Cal",
+    "kCal",  "Mcal", "Gcal", "varh",  "kvarh",   "Mvarh",   "Gvarh",    "VAh",      "kVAh",     "MVAh",
+    "GVAh",  "kW",   "kW",   "MW",    "GW",      "kvar",    "kvar",     "Mvar",     "Gvar",     "VA",
+    "kVA",   "MVA",  "GVA",  "V",     "A",       "kV",      "kA",       "C",        "K",        "l",
+    "m3",    "l/h",  "m3/h", "m3xC",  "ton",     "ton/h",   "h",        "hh:mm:ss", "yy:mm:dd", "yyyy:mm:dd",
+    "mm:dd", "",     "bar",  "RTC",   "ASCII",   "m3 x 10", "ton x 10", "GJ x 10",  "minutes",  "Bitfield",
+    "s",     "ms",   "days", "RTC-Q", "Datetime"};
+
 class KamstrupKMPComponent final : public PollingComponent, public uart::UARTDevice {
 public:
  void set_heat_energy_sensor(sensor::Sensor *sensor) { this->heat_energy_sensor_ = sensor; }
@@ -13,7 +13,11 @@ from esphome.const import (
 )
 from esphome.types import ConfigType

-from .. import CONF_LD2410_ID, LD2410Component
+from .. import CONF_LD2410_ID, LD2410Component, ld2410_ns
+
+BaudRateSelect = ld2410_ns.class_("BaudRateSelect", select.Select)
+DistanceResolutionSelect = ld2410_ns.class_("DistanceResolutionSelect", select.Select)
+LightOutControlSelect = ld2410_ns.class_("LightOutControlSelect", select.Select)

 CONF_DISTANCE_RESOLUTION = "distance_resolution"
 CONF_LIGHT_FUNCTION = "light_function"
@@ -23,22 +27,22 @@ CONFIG_SCHEMA = {
    cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase),
    cv.GenerateID(CONF_LD2410_ID): cv.use_id(LD2410Component),
    cv.Optional(CONF_DISTANCE_RESOLUTION): select.select_schema(
-        select.ApplySelect,
+        DistanceResolutionSelect,
        entity_category=ENTITY_CATEGORY_CONFIG,
        icon=ICON_RULER,
    ),
    cv.Optional(CONF_LIGHT_FUNCTION): select.select_schema(
-        select.ApplySelect,
+        LightOutControlSelect,
        entity_category=ENTITY_CATEGORY_CONFIG,
        icon=ICON_LIGHTBULB,
    ),
    cv.Optional(CONF_OUT_PIN_LEVEL): select.select_schema(
-        select.ApplySelect,
+        LightOutControlSelect,
        entity_category=ENTITY_CATEGORY_CONFIG,
        icon=ICON_SCALE,
    ),
    cv.Optional(CONF_BAUD_RATE): select.select_schema(
-        select.ApplySelect,
+        BaudRateSelect,
        entity_category=ENTITY_CATEGORY_CONFIG,
        icon=ICON_THERMOMETER,
    ),
@@ -53,30 +57,18 @@ async def to_code(config: ConfigType) -> None:
        CONF_DISTANCE_RESOLUTION,
        hub.set_distance_resolution_select,
        options=["0.2m", "0.75m"],
-        apply=(
-            "set_distance_resolution(static_cast<ld2410::DistanceResolution>("
-            "progmem_read_byte(&ld2410::DISTANCE_RESOLUTIONS[index])))"
-        ),
-        publish="before",
    )
-    light = {"apply": "set_light_out_control()", "publish": "before"}
    await selects(
-        CONF_OUT_PIN_LEVEL,
-        hub.set_out_pin_level_select,
-        options=["low", "high"],
-        **light,
+        CONF_OUT_PIN_LEVEL, hub.set_out_pin_level_select, options=["low", "high"]
    )
    await selects(
        CONF_LIGHT_FUNCTION,
        hub.set_light_function_select,
        options=["off", "below", "above"],
-        **light,
    )
    await selects(
        CONF_BAUD_RATE,
        hub.set_baud_rate_select,
-        apply="set_baud_rate(static_cast<ld2410::BaudRate>(index + 1))",
-        publish="before",
        options=[
            "9600",
            "19200",
@@ -0,0 +1,10 @@
+#include "baud_rate_select.h"
+
+namespace esphome::ld2410 {
+
+void BaudRateSelect::control(size_t index) {
+  this->publish_state(index);
+  this->parent_->set_baud_rate(static_cast<BaudRate>(index + 1));
+}
+
+}  // namespace esphome::ld2410
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "esphome/components/select/select.h"
+#include "../ld2410.h"
+
+namespace esphome::ld2410 {
+
+class BaudRateSelect final : public select::Select, public Parented<LD2410Component> {
+ public:
+  BaudRateSelect() = default;
+
+ protected:
+  void control(size_t index) override;
+};
+
+}  // namespace esphome::ld2410
@@ -0,0 +1,11 @@
+#include "distance_resolution_select.h"
+
+namespace esphome::ld2410 {
+
+void DistanceResolutionSelect::control(size_t index) {
+  this->publish_state(index);
+  this->parent_->set_distance_resolution(
+      static_cast<DistanceResolution>(progmem_read_byte(&DISTANCE_RESOLUTIONS[index])));
+}
+
+}  // namespace esphome::ld2410
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "esphome/components/select/select.h"
+#include "../ld2410.h"
+
+namespace esphome::ld2410 {
+
+class DistanceResolutionSelect final : public select::Select, public Parented<LD2410Component> {
+ public:
+  DistanceResolutionSelect() = default;
+
+ protected:
+  void control(size_t index) override;
+};
+
+}  // namespace esphome::ld2410
@@ -0,0 +1,10 @@
+#include "light_out_control_select.h"
+
+namespace esphome::ld2410 {
+
+void LightOutControlSelect::control(size_t index) {
+  this->publish_state(index);
+  this->parent_->set_light_out_control();
+}
+
+}  // namespace esphome::ld2410
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "esphome/components/select/select.h"
+#include "../ld2410.h"
+
+namespace esphome::ld2410 {
+
+class LightOutControlSelect final : public select::Select, public Parented<LD2410Component> {
+ public:
+  LightOutControlSelect() = default;
+
+ protected:
+  void control(size_t index) override;
+};
+
+}  // namespace esphome::ld2410
@@ -13,7 +13,11 @@ from esphome.const import (
 )
 from esphome.types import ConfigType

-from .. import CONF_LD2412_ID, LD2412Component
+from .. import CONF_LD2412_ID, LD2412_ns, LD2412Component
+
+BaudRateSelect = LD2412_ns.class_("BaudRateSelect", select.Select)
+DistanceResolutionSelect = LD2412_ns.class_("DistanceResolutionSelect", select.Select)
+LightOutControlSelect = LD2412_ns.class_("LightOutControlSelect", select.Select)

 CONF_DISTANCE_RESOLUTION = "distance_resolution"
 CONF_LIGHT_FUNCTION = "light_function"
@@ -23,17 +27,17 @@ CONFIG_SCHEMA = {
    cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase),
    cv.GenerateID(CONF_LD2412_ID): cv.use_id(LD2412Component),
    cv.Optional(CONF_BAUD_RATE): select.select_schema(
-        select.ApplySelect,
+        BaudRateSelect,
        entity_category=ENTITY_CATEGORY_CONFIG,
        icon=ICON_THERMOMETER,
    ),
    cv.Optional(CONF_DISTANCE_RESOLUTION): select.select_schema(
-        select.ApplySelect,
+        DistanceResolutionSelect,
        entity_category=ENTITY_CATEGORY_CONFIG,
        icon=ICON_RULER,
    ),
    cv.Optional(CONF_LIGHT_FUNCTION): select.select_schema(
-        select.ApplySelect,
+        LightOutControlSelect,
        entity_category=ENTITY_CATEGORY_CONFIG,
        icon=ICON_LIGHTBULB,
    ),
@@ -62,25 +66,16 @@ async def to_code(config: ConfigType) -> None:
            "256000",
            "460800",
        ],
-        apply="set_baud_rate(static_cast<ld2412::BaudRate>(index + 1))",
-        publish="before",
    )
    await selects(
        CONF_DISTANCE_RESOLUTION,
        hub.set_distance_resolution_select,
        options=["0.2m", "0.5m", "0.75m"],
-        apply=(
-            "set_distance_resolution(static_cast<ld2412::DistanceResolution>("
-            "progmem_read_byte(&ld2412::DISTANCE_RESOLUTIONS[index])))"
-        ),
-        publish="before",
    )
    await selects(
        CONF_LIGHT_FUNCTION,
        hub.set_light_function_select,
        options=["off", "below", "above"],
-        apply="set_light_out_control()",
-        publish="before",
    )
    # The pin level travels in the basic configuration command, not the light control one
    await selects(
@@ -0,0 +1,10 @@
+#include "baud_rate_select.h"
+
+namespace esphome::ld2412 {
+
+void BaudRateSelect::control(size_t index) {
+  this->publish_state(index);
+  this->parent_->set_baud_rate(static_cast<BaudRate>(index + 1));
+}
+
+}  // namespace esphome::ld2412
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "esphome/components/select/select.h"
+#include "../ld2412.h"
+
+namespace esphome::ld2412 {
+
+class BaudRateSelect final : public select::Select, public Parented<LD2412Component> {
+ public:
+  // User provided, not "= default": `new(p) BaudRateSelect()` would zero-fill .bss that is already zero.
+  BaudRateSelect() {}
+
+ protected:
+  void control(size_t index) override;
+};
+
+}  // namespace esphome::ld2412
@@ -0,0 +1,11 @@
+#include "distance_resolution_select.h"
+
+namespace esphome::ld2412 {
+
+void DistanceResolutionSelect::control(size_t index) {
+  this->publish_state(index);
+  this->parent_->set_distance_resolution(
+      static_cast<DistanceResolution>(progmem_read_byte(&DISTANCE_RESOLUTIONS[index])));
+}
+
+}  // namespace esphome::ld2412
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "esphome/components/select/select.h"
+#include "../ld2412.h"
+
+namespace esphome::ld2412 {
+
+class DistanceResolutionSelect final : public select::Select, public Parented<LD2412Component> {
+ public:
+  // User provided, not "= default": `new(p) DistanceResolutionSelect()` would zero-fill .bss that is already zero.
+  DistanceResolutionSelect() {}
+
+ protected:
+  void control(size_t index) override;
+};
+
+}  // namespace esphome::ld2412
@@ -0,0 +1,10 @@
+#include "light_out_control_select.h"
+
+namespace esphome::ld2412 {
+
+void LightOutControlSelect::control(size_t index) {
+  this->publish_state(index);
+  this->parent_->set_light_out_control();
+}
+
+}  // namespace esphome::ld2412
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "esphome/components/select/select.h"
+#include "../ld2412.h"
+
+namespace esphome::ld2412 {
+
+class LightOutControlSelect final : public select::Select, public Parented<LD2412Component> {
+ public:
+  // User provided, not "= default": `new(p) LightOutControlSelect()` would zero-fill .bss that is already zero.
+  LightOutControlSelect() {}
+
+ protected:
+  void control(size_t index) override;
+};
+
+}  // namespace esphome::ld2412
@@ -138,11 +138,6 @@ static uint8_t calc_checksum(const void *data, size_t size) {
  return xor_bytes(static_cast<const uint8_t *>(data), size);
 }

-// Simple mode needs simple reporting from the module; Normal and Calibrate read energy frames
-static uint16_t system_mode_for(uint8_t mode) {
-  return mode == OP_SIMPLE_MODE ? CMD_SYSTEM_MODE_SIMPLE : CMD_SYSTEM_MODE_ENERGY;
-}
-
 static int32_t get_firmware_int(const char *version_string) {
  // Convert "v1.5.4" -> 154 by skipping 'v' and '.', accumulating digits
  const char *p = (*version_string == 'v') ? version_string + 1 : version_string;
@@ -212,10 +207,13 @@ void LD2420Component::setup() {

  memcpy(&this->new_config, &this->current_config, sizeof(this->current_config));
  if (ld2420::get_firmware_int(this->firmware_ver_) < CALIBRATE_VERSION_MIN) {
+    this->set_operating_mode(OP_SIMPLE_MODE);
+    this->set_mode_(CMD_SYSTEM_MODE_SIMPLE);
    ESP_LOGW(TAG, "Firmware version %s and older supports Simple Mode only", this->firmware_ver_);
+  } else {
+    this->set_operating_mode(OP_NORMAL_MODE);
+    this->set_mode_(CMD_SYSTEM_MODE_ENERGY);
  }
-  this->set_operating_mode(OP_NORMAL_MODE);  // older firmware is held in Simple
-  this->set_mode_(system_mode_for(this->current_operating_mode));
 #ifdef USE_NUMBER
  this->init_gate_config_numbers();
 #endif
@@ -246,9 +244,7 @@ void LD2420Component::apply_config_action() {
 #endif
  this->set_system_mode(this->system_mode_);
  this->set_config_mode(false);  // Disable config mode to save new values in LD2420 nvm
-  // Applying the calibrated thresholds ends calibration; Normal and Simple stay as they are
-  if (this->current_operating_mode == OP_CALIBRATE_MODE)
-    this->set_operating_mode(OP_NORMAL_MODE);
+  this->set_operating_mode(OP_NORMAL_MODE);
 }

 void LD2420Component::factory_reset_action() {
@@ -360,22 +356,6 @@ void LD2420Component::set_operating_mode(const char *state) {
  }
 }

-void LD2420Component::change_operating_mode(OpMode mode) {
-  this->set_operating_mode(mode);
-  const uint16_t system_mode = system_mode_for(this->current_operating_mode);
-  if (system_mode == this->get_mode_())
-    return;
-  if (this->set_config_mode(true) != LD2420_ERROR_TIMEOUT) {
-    this->set_system_mode(system_mode);
-    this->set_config_mode(false);
-  }
-  if (this->get_mode_() != system_mode) {
-    // The module kept its reporting mode; show the mode that matches it
-    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
-    this->set_operating_mode(this->get_mode_() == CMD_SYSTEM_MODE_SIMPLE ? OP_SIMPLE_MODE : OP_NORMAL_MODE);
-  }
-}
-
 void LD2420Component::set_operating_mode(OpMode mode) {
  // Older firmware only supports simple mode
  if (ld2420::get_firmware_int(this->firmware_ver_) < CALIBRATE_VERSION_MIN) {
@@ -119,7 +119,6 @@ class LD2420Component final : public Component, public uart::UARTDevice {
  void handle_cmd_error(uint16_t error);
  void set_operating_mode(const char *state);
  void set_operating_mode(OpMode mode);
-  void change_operating_mode(OpMode mode);
  void auto_calibrate_sensitivity();
  void update_radar_data(uint16_t const *gate_energy, uint8_t sample_number);
  uint8_t set_config_mode(bool enable);
@@ -4,7 +4,7 @@ import esphome.config_validation as cv
 from esphome.const import ENTITY_CATEGORY_CONFIG
 from esphome.types import ConfigType

-from .. import CONF_LD2420_ID, LD2420Component
+from .. import CONF_LD2420_ID, LD2420Component, ld2420_ns

 CONF_OPERATING_MODE = "operating_mode"
 CONF_SELECTS = [
@@ -13,11 +13,12 @@ CONF_SELECTS = [
    "Simple",
 ]

+LD2420Select = ld2420_ns.class_("LD2420Select", select.Select, cg.Component)

 CONFIG_SCHEMA = {
    cv.GenerateID(CONF_LD2420_ID): cv.use_id(LD2420Component),
    cv.Required(CONF_OPERATING_MODE): select.select_schema(
-        select.ApplySelect,
+        LD2420Select,
        entity_category=ENTITY_CATEGORY_CONFIG,
    ),
 }
@@ -27,8 +28,5 @@ async def to_code(config: ConfigType) -> None:
    hub = await cg.get_variable(config[CONF_LD2420_ID])
    selects = select.sub_selects(config, parent=hub)
    await selects(
-        CONF_OPERATING_MODE,
-        hub.set_operating_mode_select,
-        options=CONF_SELECTS,
-        apply="change_operating_mode(static_cast<ld2420::OpMode>(index + 1))",
+        CONF_OPERATING_MODE, hub.set_operating_mode_select, options=CONF_SELECTS
    )
@@ -0,0 +1,14 @@
+#include "operating_mode_select.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+namespace esphome::ld2420 {
+
+ESPHOME_LOG_TAG(TAG, "ld2420.select");
+
+void LD2420Select::control(size_t index) {
+  this->publish_state(index);
+  this->parent_->set_operating_mode(static_cast<OpMode>(index + 1));
+}
+
+}  // namespace esphome::ld2420
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "../ld2420.h"
+#include "esphome/components/select/select.h"
+
+namespace esphome::ld2420 {
+
+class LD2420Select final : public Component, public select::Select, public Parented<LD2420Component> {
+ public:
+  LD2420Select() = default;
+
+ protected:
+  void control(size_t index) override;
+};
+
+}  // namespace esphome::ld2420
Author	SHA1	Message	Date
J. Nick Koston	4ac5bc6514	Merge branch 'dev' into number-traits-set-range	2026-10-26 05:53:09 -10:00
pre-commit-ci-lite[bot]	4941bc2d36	apply automatic formatting fixes	2026-10-26 15:49:36 +00:00
J. Nick Koston	09667bb79c	Merge remote-tracking branch 'origin/dev' into number-traits-set-range # Conflicts: # esphome/components/number/__init__.py	2026-10-26 05:47:58 -10:00
J. Nick Koston	8915d06b05	Merge remote-tracking branch 'origin/dev' into number-traits-set-range # Conflicts: # esphome/components/number/__init__.py	2026-10-19 08:01:39 -10:00
J. Nick Koston	7df9b5ea2f	Merge remote-tracking branch 'origin/dev' into HEAD	2026-10-09 18:27:29 -10:00
J. Nick Koston	a8ddb2535e	Merge remote-tracking branch 'origin/dev' into number-traits-set-range	2026-10-07 16:45:04 -10:00
J. Nick Koston	d4922fb446	Merge remote-tracking branch 'origin/dev' into number-traits-set-range	2026-10-04 18:07:01 -05:00
J. Nick Koston	7acbe82c27	Also guard the NumberRange size so an added field fails the build	2026-10-03 05:47:52 -05:00
J. Nick Koston	1a0b43449e	Split the field type guards into one static_assert per field clang-tidy flags the chained is_same_v checks as a redundant expression.	2026-10-02 21:42:36 -05:00
J. Nick Koston	860d819e33	Guard the NumberRange field types read from flash	2026-10-02 20:55:16 -05:00
J. Nick Koston	f8f25c1ad4	Make the render time statement a slotted dataclass	2026-10-02 17:47:47 -05:00
J. Nick Koston	22536f9338	Collapse the range statements into one render time statement	2026-10-02 17:47:06 -05:00
J. Nick Koston	c64a7fb678	Declare shared range tables in the global section The table is a lazy global statement that renders only when the range is shared, so it no longer depends on the first user's position in setup(). One helper builds the setter expressions for both paths.	2026-10-02 17:36:28 -05:00
J. Nick Koston	6793dad8ed	Only use a range table when enough numbers share it Below three users the table and set_range() cost more than the inline setters, so the choice is made at render time once every number is known. Lambda bounds (lvgl arc/bar) keep the setters. set_range reads the table with aligned loads instead of memcpy_P.	2026-10-02 17:32:24 -05:00
J. Nick Koston	3dd9a28ed2	Emit the range table with progmem_array and a generated ID	2026-10-02 17:14:31 -05:00
J. Nick Koston	5a93de82bf	[number] Set range from a shared PROGMEM table Each number used to emit three inline trait setters in setup(). Codegen now emits one PROGMEM NumberRange per distinct (min, max, step) and each number makes a single out of line set_range() call with its address.	2026-10-02 17:10:41 -05:00