[sdl] Allow the display to act as a KeyProvider

2025-11-04 00:51:49 +00:00 · 2024-06-24 16:37:54 +12:00
852 changed files with 19100 additions and 27372 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,9 +1,7 @@
 {
  "name": "ESPHome Dev",
  "image": "ghcr.io/esphome/esphome-lint:dev",
-  "postCreateCommand": [
-    "script/devcontainer-post-create"
-  ],
+  "postCreateCommand": ["script/devcontainer-post-create"],
  "containerEnv": {
    "DEVCONTAINER": "1",
    "PIP_BREAK_SYSTEM_PACKAGES": "1",
@@ -29,9 +27,6 @@
      "extensions": [
        // python
        "ms-python.python",
-        "ms-python.pylint",
-        "ms-python.flake8",
-        "ms-python.black-formatter",
        "visualstudioexptteam.vscodeintellicode",
        // yaml
        "redhat.vscode-yaml",
@@ -43,21 +38,9 @@
      "settings": {
        "python.languageServer": "Pylance",
        "python.pythonPath": "/usr/bin/python3",
-        "pylint.args": [
-          "--rcfile=${workspaceFolder}/pyproject.toml"
-        ],
-        "flake8.args": [
-          "--config=${workspaceFolder}/.flake8"
-        ],
-        "black-formatter.args": [
-          "--config",
-          "${workspaceFolder}/pyproject.toml"
-        ],
-        "[python]": {
-          // VS will say "Value is not accepted" before building the devcontainer, but the warning
-          // should go away after build is completed.
-          "editor.defaultFormatter": "ms-python.black-formatter"
-        },
+        "python.linting.pylintEnabled": true,
+        "python.linting.enabled": true,
+        "python.formatting.provider": "black",
        "editor.formatOnPaste": false,
        "editor.formatOnSave": true,
        "editor.formatOnType": true,
--- a/.dockerignore
+++ b/.dockerignore
@@ -111,5 +111,4 @@ config/
 examples/
 Dockerfile
 .git/
-tests/
-.*
+tests/build/
--- a/.github/actions/build-image/action.yaml
+++ b/.github/actions/build-image/action.yaml
@@ -7,11 +7,11 @@ inputs:
  target:
    description: "Target to build"
    required: true
-    example: "final / lint"
-  build_type:
-    description: "Image type to build"
+    example: "docker"
+  baseimg:
+    description: "Base image type"
    required: true
-    example: "docker / hassio"
+    example: "docker"
  suffix:
    description: "Suffix to add to tags"
    required: true
@@ -46,10 +46,7 @@ runs:

    - name: Build and push to ghcr by digest
      id: build-ghcr
-      uses: docker/build-push-action@v6.7.0
-      env:
-        DOCKER_BUILD_SUMMARY: false
-        DOCKER_BUILD_RECORD_UPLOAD: false
+      uses: docker/build-push-action@v6.1.0
      with:
        context: .
        file: ./docker/Dockerfile
@@ -58,7 +55,7 @@ runs:
        cache-from: type=gha
        cache-to: ${{ steps.cache-to.outputs.value }}
        build-args: |
-          BUILD_TYPE=${{ inputs.build_type }}
+          BASEIMGTYPE=${{ inputs.baseimg }}
          BUILD_VERSION=${{ inputs.version }}
        outputs: |
          type=image,name=ghcr.io/${{ steps.tags.outputs.image_name }},push-by-digest=true,name-canonical=true,push=true
@@ -72,10 +69,7 @@ runs:

    - name: Build and push to dockerhub by digest
      id: build-dockerhub
-      uses: docker/build-push-action@v6.7.0
-      env:
-        DOCKER_BUILD_SUMMARY: false
-        DOCKER_BUILD_RECORD_UPLOAD: false
+      uses: docker/build-push-action@v6.1.0
      with:
        context: .
        file: ./docker/Dockerfile
@@ -84,7 +78,7 @@ runs:
        cache-from: type=gha
        cache-to: ${{ steps.cache-to.outputs.value }}
        build-args: |
-          BUILD_TYPE=${{ inputs.build_type }}
+          BASEIMGTYPE=${{ inputs.baseimg }}
          BUILD_VERSION=${{ inputs.version }}
        outputs: |
          type=image,name=docker.io/${{ steps.tags.outputs.image_name }},push-by-digest=true,name-canonical=true,push=true
--- a/.github/actions/restore-python/action.yml
+++ b/.github/actions/restore-python/action.yml
@@ -17,7 +17,7 @@ runs:
  steps:
    - name: Set up Python ${{ inputs.python-version }}
      id: python
-      uses: actions/setup-python@v5.2.0
+      uses: actions/setup-python@v5.1.0
      with:
        python-version: ${{ inputs.python-version }}
    - name: Restore Python virtual environment
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -13,13 +13,6 @@ updates:
    schedule:
      interval: daily
    open-pull-requests-limit: 10
-    groups:
-      docker-actions:
-        applies-to: version-updates
-        patterns:
-          - "docker/setup-qemu-action"
-          - "docker/login-action"
-          - "docker/setup-buildx-action"
  - package-ecosystem: github-actions
    directory: "/.github/actions/build-image"
    schedule:
--- a/.github/workflows/ci-api-proto.yml
+++ b/.github/workflows/ci-api-proto.yml
@@ -23,7 +23,7 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v4.1.7
      - name: Set up Python
-        uses: actions/setup-python@v5.2.0
+        uses: actions/setup-python@v5.1.0
        with:
          python-version: "3.11"

--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -42,13 +42,13 @@ jobs:
    steps:
      - uses: actions/checkout@v4.1.7
      - name: Set up Python
-        uses: actions/setup-python@v5.2.0
+        uses: actions/setup-python@v5.1.0
        with:
          python-version: "3.9"
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.6.1
+        uses: docker/setup-buildx-action@v3.3.0
      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.2.0
+        uses: docker/setup-qemu-action@v3.0.0

      - name: Set TAG
        run: |
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,6 @@ on:
    paths:
      - "**"
      - "!.github/workflows/*.yml"
-      - "!.github/actions/build-image/*"
      - ".github/workflows/ci.yml"
      - "!.yamllint"
      - "!.github/dependabot.yml"
@@ -41,7 +40,7 @@ jobs:
        run: echo key="${{ hashFiles('requirements.txt', 'requirements_optional.txt', 'requirements_test.txt') }}" >> $GITHUB_OUTPUT
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@v5.2.0
+        uses: actions/setup-python@v5.1.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
      - name: Restore Python virtual environment
@@ -249,6 +248,72 @@ jobs:
        run: script/ci-suggest-changes
        if: always()

+  compile-tests-list:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v4.1.7
+      - name: Find all YAML test files
+        id: set-matrix
+        run: echo "matrix=$(ls tests/test*.yaml | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
+
+  validate-tests:
+    name: Validate YAML test ${{ matrix.file }}
+    runs-on: ubuntu-latest
+    needs:
+      - common
+      - compile-tests-list
+    strategy:
+      fail-fast: false
+      matrix:
+        file: ${{ fromJson(needs.compile-tests-list.outputs.matrix) }}
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v4.1.7
+      - name: Restore Python
+        uses: ./.github/actions/restore-python
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+          cache-key: ${{ needs.common.outputs.cache-key }}
+      - name: Run esphome config ${{ matrix.file }}
+        run: |
+          . venv/bin/activate
+          esphome config ${{ matrix.file }}
+
+  compile-tests:
+    name: Run YAML test ${{ matrix.file }}
+    runs-on: ubuntu-latest
+    needs:
+      - common
+      - black
+      - ci-custom
+      - clang-format
+      - flake8
+      - pylint
+      - pytest
+      - pyupgrade
+      - compile-tests-list
+      - validate-tests
+    strategy:
+      fail-fast: false
+      max-parallel: 2
+      matrix:
+        file: ${{ fromJson(needs.compile-tests-list.outputs.matrix) }}
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v4.1.7
+      - name: Restore Python
+        uses: ./.github/actions/restore-python
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+          cache-key: ${{ needs.common.outputs.cache-key }}
+      - name: Run esphome compile ${{ matrix.file }}
+        run: |
+          . venv/bin/activate
+          esphome compile ${{ matrix.file }}
+
  clang-tidy:
    name: ${{ matrix.name }}
    runs-on: ubuntu-latest
@@ -397,7 +462,7 @@ jobs:
        file: ${{ fromJson(needs.list-components.outputs.components) }}
    steps:
      - name: Install dependencies
-        run: sudo apt-get install libsdl2-dev
+        run: sudo apt-get install libsodium-dev libsdl2-dev

      - name: Check out code from GitHub
        uses: actions/checkout@v4.1.7
@@ -451,7 +516,7 @@ jobs:
        run: echo ${{ matrix.components }}

      - name: Install dependencies
-        run: sudo apt-get install libsdl2-dev
+        run: sudo apt-get install libsodium-dev libsdl2-dev

      - name: Check out code from GitHub
        uses: actions/checkout@v4.1.7
@@ -469,8 +534,6 @@ jobs:
      - name: Compile config
        run: |
          . venv/bin/activate
-          mkdir build_cache
-          export PLATFORMIO_BUILD_CACHE_DIR=$PWD/build_cache
          for component in ${{ matrix.components }}; do
            ./script/test_build_components -e compile -c $component
          done
@@ -487,6 +550,7 @@ jobs:
      - pylint
      - pytest
      - pyupgrade
+      - compile-tests
      - clang-tidy
      - list-components
      - test-build-components
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -53,7 +53,7 @@ jobs:
    steps:
      - uses: actions/checkout@v4.1.7
      - name: Set up Python
-        uses: actions/setup-python@v5.2.0
+        uses: actions/setup-python@v5.1.0
        with:
          python-version: "3.x"
      - name: Set up python environment
@@ -65,7 +65,7 @@ jobs:
          pip3 install build
          python3 -m build
      - name: Publish
-        uses: pypa/gh-action-pypi-publish@v1.10.1
+        uses: pypa/gh-action-pypi-publish@v1.9.0

  deploy-docker:
    name: Build ESPHome ${{ matrix.platform }}
@@ -85,23 +85,23 @@ jobs:
    steps:
      - uses: actions/checkout@v4.1.7
      - name: Set up Python
-        uses: actions/setup-python@v5.2.0
+        uses: actions/setup-python@v5.1.0
        with:
          python-version: "3.9"

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.6.1
+        uses: docker/setup-buildx-action@v3.3.0
      - name: Set up QEMU
        if: matrix.platform != 'linux/amd64'
-        uses: docker/setup-qemu-action@v3.2.0
+        uses: docker/setup-qemu-action@v3.0.0

      - name: Log in to docker hub
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.2.0
        with:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASSWORD }}
      - name: Log in to the GitHub container registry
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.2.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -111,8 +111,8 @@ jobs:
        uses: ./.github/actions/build-image
        with:
          platform: ${{ matrix.platform }}
-          target: final
-          build_type: docker
+          target: docker
+          baseimg: docker
          suffix: ""
          version: ${{ needs.init.outputs.tag }}

@@ -120,8 +120,8 @@ jobs:
        uses: ./.github/actions/build-image
        with:
          platform: ${{ matrix.platform }}
-          target: final
-          build_type: hassio
+          target: hassio
+          baseimg: hassio
          suffix: "hassio"
          version: ${{ needs.init.outputs.tag }}

@@ -130,7 +130,7 @@ jobs:
        with:
          platform: ${{ matrix.platform }}
          target: lint
-          build_type: docker
+          baseimg: docker
          suffix: lint
          version: ${{ needs.init.outputs.tag }}

@@ -141,7 +141,7 @@ jobs:
          echo name=$(cat /tmp/platform) >> $GITHUB_OUTPUT

      - name: Upload digests
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v4.3.3
        with:
          name: digests-${{ steps.sanitize.outputs.name }}
          path: /tmp/digests
@@ -177,24 +177,24 @@ jobs:
      - uses: actions/checkout@v4.1.7

      - name: Download digests
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.1.7
        with:
          pattern: digests-*
          path: /tmp/digests
          merge-multiple: true

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.6.1
+        uses: docker/setup-buildx-action@v3.3.0

      - name: Log in to docker hub
        if: matrix.registry == 'dockerhub'
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.2.0
        with:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASSWORD }}
      - name: Log in to the GitHub container registry
        if: matrix.registry == 'ghcr'
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.2.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
--- a/.github/workflows/sync-device-classes.yml
+++ b/.github/workflows/sync-device-classes.yml
@@ -22,7 +22,7 @@ jobs:
          path: lib/home-assistant

      - name: Setup Python
-        uses: actions/setup-python@v5.2.0
+        uses: actions/setup-python@v5.1.0
        with:
          python-version: 3.12

@@ -36,7 +36,7 @@ jobs:
          python ./script/sync-device_class.py

      - name: Commit changes
-        uses: peter-evans/create-pull-request@v7.0.0
+        uses: peter-evans/create-pull-request@v6.1.0
        with:
          commit-message: "Synchronise Device Classes from Home Assistant"
          committer: esphomebot <esphome@nabucasa.com>
--- a/.gitignore
+++ b/.gitignore
@@ -138,5 +138,3 @@ sdkconfig.*
 .tests/

 /components
-/managed_components
-
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,15 +2,6 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
-  - repo: https://github.com/astral-sh/ruff-pre-commit
-    # Ruff version.
-    rev: v0.5.4
-    hooks:
-      # Run the linter.
-      - id: ruff
-        args: [--fix]
-      # Run the formatter.
-      - id: ruff-format
  - repo: https://github.com/psf/black-pre-commit-mirror
    rev: 24.4.2
    hooks:
--- a/26
+++ b/26
@@ -37,7 +37,6 @@ esphome/components/am43/sensor/* @buxtronix
 esphome/components/analog_threshold/* @ianchi
 esphome/components/animation/* @syndlex
 esphome/components/anova/* @buxtronix
-esphome/components/apds9306/* @aodrenah
 esphome/components/api/* @OttoWinter
 esphome/components/as5600/* @ammmze
 esphome/components/as5600/sensor/* @ammmze
@@ -46,7 +45,6 @@ esphome/components/async_tcp/* @OttoWinter
 esphome/components/at581x/* @X-Ryl669
 esphome/components/atc_mithermometer/* @ahpohl
 esphome/components/atm90e26/* @danieltwagner
-esphome/components/atm90e32/* @circuitsetup @descipher
 esphome/components/b_parasite/* @rbaron
 esphome/components/ballu/* @bazuchan
 esphome/components/bang_bang/* @OttoWinter
@@ -58,21 +56,15 @@ esphome/components/beken_spi_led_strip/* @Mat931
 esphome/components/bh1750/* @OttoWinter
 esphome/components/binary_sensor/* @esphome/core
 esphome/components/bk72xx/* @kuba2k2
-esphome/components/bl0906/* @athom-tech @jesserockz @tarontop
 esphome/components/bl0939/* @ziceva
 esphome/components/bl0940/* @tobias-
-esphome/components/bl0942/* @dbuezas @dwmw2
+esphome/components/bl0942/* @dbuezas
 esphome/components/ble_client/* @buxtronix @clydebarrow
 esphome/components/bluetooth_proxy/* @jesserockz
 esphome/components/bme280_base/* @esphome/core
 esphome/components/bme280_spi/* @apbodrov
 esphome/components/bme680_bsec/* @trvrnrth
-esphome/components/bme68x_bsec2/* @kbx81 @neffs
-esphome/components/bme68x_bsec2_i2c/* @kbx81 @neffs
 esphome/components/bmi160/* @flaviut
-esphome/components/bmp280_base/* @ademuri
-esphome/components/bmp280_i2c/* @ademuri
-esphome/components/bmp280_spi/* @ademuri
 esphome/components/bmp3xx/* @latonita
 esphome/components/bmp3xx_base/* @latonita @martgras
 esphome/components/bmp3xx_i2c/* @latonita
@@ -86,7 +78,6 @@ esphome/components/cap1188/* @mreditor97
 esphome/components/captive_portal/* @OttoWinter
 esphome/components/ccs811/* @habbie
 esphome/components/cd74hc4067/* @asoehlke
-esphome/components/ch422g/* @jesterret
 esphome/components/climate/* @esphome/core
 esphome/components/climate_ir/* @glmnet
 esphome/components/color_temperature/* @jesserockz
@@ -174,10 +165,7 @@ esphome/components/he60r/* @clydebarrow
 esphome/components/heatpumpir/* @rob-deutsch
 esphome/components/hitachi_ac424/* @sourabhjaiswal
 esphome/components/hm3301/* @freekode
-esphome/components/hmac_md5/* @dwmw2
-esphome/components/homeassistant/* @OttoWinter @esphome/core
-esphome/components/homeassistant/number/* @landonr
-esphome/components/homeassistant/switch/* @Links2004
+esphome/components/homeassistant/* @OttoWinter
 esphome/components/honeywell_hih_i2c/* @Benichou34
 esphome/components/honeywellabp/* @RubyBailey
 esphome/components/honeywellabp2_i2c/* @jpfaff
@@ -226,11 +214,8 @@ esphome/components/lightwaverf/* @max246
 esphome/components/lilygo_t5_47/touchscreen/* @jesserockz
 esphome/components/lock/* @esphome/core
 esphome/components/logger/* @esphome/core
-esphome/components/ltr390/* @latonita @sjtrny
-esphome/components/ltr501/* @latonita
+esphome/components/ltr390/* @sjtrny
 esphome/components/ltr_als_ps/* @latonita
-esphome/components/lvgl/* @clydebarrow
-esphome/components/m5stack_8angle/* @rnauber
 esphome/components/matrix_keypad/* @ssieb
 esphome/components/max31865/* @DAVe3283
 esphome/components/max44009/* @berfenger
@@ -288,7 +273,6 @@ esphome/components/nfc/* @jesserockz @kbx81
 esphome/components/noblex/* @AGalfra
 esphome/components/number/* @esphome/core
 esphome/components/one_wire/* @ssieb
-esphome/components/online_image/* @guillempages
 esphome/components/ota/* @esphome/core
 esphome/components/output/* @esphome/core
 esphome/components/pca6416a/* @Mat931
@@ -389,7 +373,6 @@ esphome/components/st7701s/* @clydebarrow
 esphome/components/st7735/* @SenexCrenshaw
 esphome/components/st7789v/* @kbx81
 esphome/components/st7920/* @marsjan155
-esphome/components/statsd/* @Links2004
 esphome/components/substitutions/* @esphome/core
 esphome/components/sun/* @OttoWinter
 esphome/components/sun_gtil2/* @Mat931
@@ -429,7 +412,6 @@ esphome/components/tuya/switch/* @jesserockz
 esphome/components/tuya/text_sensor/* @dentra
 esphome/components/uart/* @esphome/core
 esphome/components/uart/button/* @ssieb
-esphome/components/udp/* @clydebarrow
 esphome/components/ufire_ec/* @pvizeli
 esphome/components/ufire_ise/* @pvizeli
 esphome/components/ultrasonic/* @OttoWinter
@@ -442,7 +424,6 @@ esphome/components/veml7700/* @latonita
 esphome/components/version/* @esphome/core
 esphome/components/voice_assistant/* @jesserockz
 esphome/components/wake_on_lan/* @clydebarrow @willwill2will54
-esphome/components/watchdog/* @oarcher
 esphome/components/waveshare_epaper/* @clydebarrow
 esphome/components/web_server_base/* @OttoWinter
 esphome/components/web_server_idf/* @dentra
@@ -465,7 +446,6 @@ esphome/components/wl_134/* @hobbypunk90
 esphome/components/x9c/* @EtienneMD
 esphome/components/xgzp68xx/* @gcormier
 esphome/components/xiaomi_hhccjcy10/* @fariouche
-esphome/components/xiaomi_lywsd02mmc/* @juanluss31
 esphome/components/xiaomi_lywsd03mmc/* @ahpohl
 esphome/components/xiaomi_mhoc303/* @drug123
 esphome/components/xiaomi_mhoc401/* @vevsvevs
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,139 +1,210 @@
-ARG BUILD_VERSION=dev
-ARG BUILD_TYPE=docker
+# Build these with the build.py script
+# Example:
+#   python3 docker/build.py --tag dev --arch amd64 --build-type docker build

-FROM ghcr.io/esphome/docker-base:2024.9.0 AS base
+# One of "docker", "hassio"
+ARG BASEIMGTYPE=docker

-RUN git config --system --add safe.directory "*"

-COPY requirements.txt /
+# https://github.com/hassio-addons/addon-debian-base/releases
+FROM ghcr.io/hassio-addons/debian-base:7.2.0 AS base-hassio
+# https://hub.docker.com/_/debian?tab=tags&page=1&name=bookworm
+FROM debian:12.2-slim AS base-docker

-FROM base AS base-amd64
-FROM base AS base-arm64
-FROM base AS base-armv7
-
-RUN \
-    export cryptography_version=$(grep 'cryptography==' /requirements.txt | cut -d'=' -f3) \
-    && curl -L https://www.piwheels.org/cp311/cryptography-$cryptography_version-cp37-abi3-linux_armv7l.whl -o /tmp/cryptography-$cryptography_version-cp37-abi3-linux_armv7l.whl \
-    && uv pip install --no-cache-dir /tmp/cryptography-$cryptography_version-cp37-abi3-linux_armv7l.whl \
-    && rm /tmp/cryptography-$cryptography_version-cp37-abi3-linux_armv7l.whl
+FROM base-${BASEIMGTYPE} AS base


 ARG TARGETARCH
 ARG TARGETVARIANT

-FROM base-${TARGETARCH}${TARGETVARIANT} AS base-final
+
+# Note that --break-system-packages is used below because
+# https://peps.python.org/pep-0668/ added a safety check that prevents
+# installing packages with the same name as a system package. This is
+# not a problem for us because we are not concerned about overwriting
+# system packages because we are running in an isolated container.

 RUN \
-    uv pip install --no-cache-dir \
-    -r /requirements.txt
+    apt-get update \
+    # Use pinned versions so that we get updates with build caching
+    && apt-get install -y --no-install-recommends \
+        python3-pip=23.0.1+dfsg-1 \
+        python3-setuptools=66.1.1-1 \
+        python3-venv=3.11.2-1+b1 \
+        python3-wheel=0.38.4-2 \
+        iputils-ping=3:20221126-1 \
+        git=1:2.39.2-1.1 \
+        curl=7.88.1-10+deb12u5 \
+        openssh-client=1:9.2p1-2+deb12u2 \
+        python3-cffi=1.15.1-5 \
+        libcairo2=1.16.0-7 \
+        libmagic1=1:5.44-3 \
+        patch=2.7.6-7; \
+    if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
+        apt-get install -y --no-install-recommends \
+          build-essential=12.9 \
+          python3-dev=3.11.2-1+b1 \
+          zlib1g-dev=1:1.2.13.dfsg-1 \
+          libjpeg-dev=1:2.1.5-2 \
+          libfreetype-dev=2.12.1+dfsg-5 \
+          libssl-dev=3.0.11-1~deb12u2 \
+          libffi-dev=3.4.4-1 \
+          libopenjp2-7=2.5.0-2 \
+          libtiff6=4.5.0-6+deb12u1 \
+          cargo=0.66.0+ds1-1 \
+          pkg-config=1.8.1-1 \
+          gcc-arm-linux-gnueabihf=4:12.2.0-3; \
+    fi; \
+    rm -rf \
+        /tmp/* \
+        /var/{cache,log}/* \
+        /var/lib/apt/lists/*
+
+ENV \
+  # Fix click python3 lang warning https://click.palletsprojects.com/en/7.x/python3/
+  LANG=C.UTF-8 LC_ALL=C.UTF-8 \
+  # Store globally installed pio libs in /piolibs
+  PLATFORMIO_GLOBALLIB_DIR=/piolibs
+
+# Support legacy binaries on Debian multiarch system. There is no "correct" way
+# to do this, other than using properly built toolchains...
+# See: https://unix.stackexchange.com/questions/553743/correct-way-to-add-lib-ld-linux-so-3-in-debian
+RUN \
+    if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
+        ln -s /lib/arm-linux-gnueabihf/ld-linux-armhf.so.3 /lib/ld-linux.so.3; \
+    fi

 RUN \
+    # Ubuntu python3-pip is missing wheel
+    if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
+        export PIP_EXTRA_INDEX_URL="https://www.piwheels.org/simple"; \
+    fi; \
+    pip3 install \
+    --break-system-packages --no-cache-dir \
+    # Keep platformio version in sync with requirements.txt
+    platformio==6.1.15 \
    # Change some platformio settings
-    platformio settings set enable_telemetry No \
+    && platformio settings set enable_telemetry No \
    && platformio settings set check_platformio_interval 1000000 \
    && mkdir -p /piolibs

-COPY script/platformio_install_deps.py platformio.ini /

-RUN /platformio_install_deps.py /platformio.ini --libraries
+# First install requirements to leverage caching when requirements don't change
+# tmpfs is for https://github.com/rust-lang/cargo/issues/8719

-FROM base-final AS base-docker
+COPY requirements.txt requirements_optional.txt script/platformio_install_deps.py platformio.ini /
+RUN --mount=type=tmpfs,target=/root/.cargo if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
+        export PIP_EXTRA_INDEX_URL="https://www.piwheels.org/simple"; \
+    fi; \
+    CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse CARGO_HOME=/root/.cargo \
+    pip3 install \
+    --break-system-packages --no-cache-dir -r /requirements.txt -r /requirements_optional.txt \
+    && /platformio_install_deps.py /platformio.ini --libraries

+# Avoid unsafe git error when container user and file config volume permissions don't match
+RUN git config --system --add safe.directory '*'
+
+
+# ======================= docker-type image =======================
+FROM base AS docker
+
+# Copy esphome and install
+COPY . /esphome
+RUN if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
+        export PIP_EXTRA_INDEX_URL="https://www.piwheels.org/simple"; \
+  fi; \
+  pip3 install \
+  --break-system-packages --no-cache-dir -e /esphome
+
+# Settings for dashboard
+ENV USERNAME="" PASSWORD=""
+
+# Expose the dashboard to Docker
 EXPOSE 6052

+# Run healthcheck (heartbeat)
 HEALTHCHECK --interval=30s --timeout=30s \
-    CMD curl --fail http://localhost:6052/version -A "HealthCheck" || exit 1
+  CMD curl --fail http://localhost:6052/version -A "HealthCheck" || exit 1

 COPY docker/docker_entrypoint.sh /entrypoint.sh

+# The directory the user should mount their configuration files to
 VOLUME /config
 WORKDIR /config
+# Set entrypoint to esphome (via a script) so that the user doesn't have to type 'esphome'
+# in every docker command twice
 ENTRYPOINT ["/entrypoint.sh"]
+# When no arguments given, start the dashboard in the workdir
 CMD ["dashboard", "/config"]

-FROM base-final AS base-hassio
+
+
+
+# ======================= hassio-type image =======================
+FROM base AS hassio

 RUN \
-    set -x \
-    && apt-get update \
+    apt-get update \
+    # Use pinned versions so that we get updates with build caching
    && apt-get install -y --no-install-recommends \
        nginx-light=1.22.1-9 \
-        jq \
-        xz-utils \
    && rm -rf \
        /tmp/* \
        /var/{cache,log}/* \
-        /var/lib/apt/lists/* \
-        /usr/src/*
-
-ARG \
-    BASHIO_VERSION=0.16.2 \
-    TEMPIO_VERSION=2021.09.0 \
-    S6_OVERLAY_VERSION=3.2.0.0
-
-WORKDIR /usr/src
-
-ARG TARGETARCH
-ARG TARGETVARIANT
-
-RUN \
-    set -x \
-    && if [ "${TARGETARCH}${TARGETVARIANT}" = "armv7" ]; then \
-            export S6_ARCH="arm"; \
-            export TEMPIO_ARCH="armv7"; \
-        elif [ "${TARGETARCH}${TARGETVARIANT}" = "amd64" ]; then \
-            export S6_ARCH="x86_64"; \
-            export TEMPIO_ARCH="amd64"; \
-        elif [ "${TARGETARCH}${TARGETVARIANT}" = "arm64" ]; then \
-            export S6_ARCH="aarch64"; \
-            export TEMPIO_ARCH="aarch64"; \
-        fi \
-    \
-    && curl -L -f -s "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH}.tar.xz" \
-        | tar Jxvf - -C / \
-    && curl -L -f -s "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz" \
-        | tar Jxvf - -C / \
-    && curl -L -f -s "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz" \
-        | tar Jxvf - -C / \
-    && curl -L -f -s "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz" \
-        | tar Jxvf - -C / \
-    && mkdir -p /etc/fix-attrs.d \
-    && mkdir -p /etc/services.d \
-    \
-    && curl -L -f -s -o /usr/bin/tempio \
-        "https://github.com/home-assistant/tempio/releases/download/${TEMPIO_VERSION}/tempio_${TEMPIO_ARCH}" \
-    && chmod a+x /usr/bin/tempio \
-    \
-    && mkdir -p /usr/src/bashio \
-    && curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
-        | tar -xzf - --strip 1 -C /usr/src/bashio \
-    && mv /usr/src/bashio/lib /usr/lib/bashio \
-    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
-    \
-    && rm -rf /usr/src/*
+        /var/lib/apt/lists/*

+ARG BUILD_VERSION=dev

+# Copy root filesystem
 COPY docker/ha-addon-rootfs/ /

-WORKDIR /root
-ENTRYPOINT ["/init"]
+# Copy esphome and install
+COPY . /esphome
+RUN if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
+        export PIP_EXTRA_INDEX_URL="https://www.piwheels.org/simple"; \
+  fi; \
+  pip3 install \
+  --break-system-packages --no-cache-dir -e /esphome

-ARG BUILD_VERSION
+# Labels
 LABEL \
    io.hass.name="ESPHome" \
-    io.hass.description="Manage and program microcontrollers through YAML configuration files" \
+    io.hass.description="Manage and program ESP8266/ESP32 microcontrollers through YAML configuration files" \
    io.hass.type="addon" \
    io.hass.version="${BUILD_VERSION}"
+    # io.hass.arch is inherited from addon-debian-base


-ARG BUILD_TYPE
-FROM base-${BUILD_TYPE} AS final
-
-COPY . /esphome
-
-RUN uv pip install --no-cache-dir -e /esphome


-FROM base-final AS lint
+# ======================= lint-type image =======================
+FROM base AS lint

-# TODO:
+ENV \
+  PLATFORMIO_CORE_DIR=/esphome/.temp/platformio
+
+RUN \
+    apt-get update \
+    # Use pinned versions so that we get updates with build caching
+    && apt-get install -y --no-install-recommends \
+        clang-format-13=1:13.0.1-11+b2 \
+        clang-tidy-14=1:14.0.6-12 \
+        patch=2.7.6-7 \
+        software-properties-common=0.99.30-4 \
+        nano=7.2-1 \
+        build-essential=12.9 \
+        python3-dev=3.11.2-1+b1 \
+    && rm -rf \
+        /tmp/* \
+        /var/{cache,log}/* \
+        /var/lib/apt/lists/*
+
+COPY requirements_test.txt /
+RUN if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
+        export PIP_EXTRA_INDEX_URL="https://www.piwheels.org/simple"; \
+  fi; \
+  pip3 install \
+  --break-system-packages --no-cache-dir -r /requirements_test.txt
+
+VOLUME ["/esphome"]
+WORKDIR /esphome
--- a/docker/build.py
+++ b/docker/build.py
@@ -1,11 +1,13 @@
 #!/usr/bin/env python3
-import argparse
 from dataclasses import dataclass
-import re
-import shlex
 import subprocess
+import argparse
+from platform import machine
+import shlex
+import re
 import sys

+
 CHANNEL_DEV = "dev"
 CHANNEL_BETA = "beta"
 CHANNEL_RELEASE = "release"
@@ -55,7 +57,7 @@ manifest_parser = subparsers.add_parser(
 class DockerParams:
    build_to: str
    manifest_to: str
-    build_type: str
+    baseimgtype: str
    platform: str
    target: str

@@ -67,7 +69,7 @@ class DockerParams:
            TYPE_LINT: "esphome/esphome-lint",
        }[build_type]
        build_to = f"{prefix}-{arch}"
-        _build_type = {
+        baseimgtype = {
            TYPE_DOCKER: "docker",
            TYPE_HA_ADDON: "hassio",
            TYPE_LINT: "docker",
@@ -78,14 +80,14 @@ class DockerParams:
            ARCH_AARCH64: "linux/arm64",
        }[arch]
        target = {
-            TYPE_DOCKER: "final",
-            TYPE_HA_ADDON: "final",
+            TYPE_DOCKER: "docker",
+            TYPE_HA_ADDON: "hassio",
            TYPE_LINT: "lint",
        }[build_type]
        return cls(
            build_to=build_to,
            manifest_to=prefix,
-            build_type=_build_type,
+            baseimgtype=baseimgtype,
            platform=platform,
            target=target,
        )
@@ -147,7 +149,7 @@ def main():
            "buildx",
            "build",
            "--build-arg",
-            f"BUILD_TYPE={params.build_type}",
+            f"BASEIMGTYPE={params.baseimgtype}",
            "--build-arg",
            f"BUILD_VERSION={args.tag}",
            "--cache-from",
--- a/docker/docker_entrypoint.sh
+++ b/docker/docker_entrypoint.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash

 # If /cache is mounted, use that as PIO's coredir
 # otherwise use path in /config (so that PIO packages aren't downloaded on each compile)
--- a/esphome/main.py
+++ b/esphome/main.py
@@ -1,12 +1,12 @@
 # PYTHON_ARGCOMPLETE_OK
 import argparse
-from datetime import datetime
 import functools
 import logging
 import os
 import re
 import sys
 import time
+from datetime import datetime

 import argcomplete

@@ -38,15 +38,15 @@ from esphome.const import (
    SECRETS_FILES,
 )
 from esphome.core import CORE, EsphomeError, coroutine
-from esphome.helpers import indent, is_ip_address, get_bool_env
-from esphome.log import Fore, color, setup_log
+from esphome.helpers import indent, is_ip_address
 from esphome.util import (
-    get_serial_ports,
-    list_yaml_files,
    run_external_command,
    run_external_process,
    safe_print,
+    list_yaml_files,
+    get_serial_ports,
 )
+from esphome.log import color, setup_log, Fore

 _LOGGER = logging.getLogger(__name__)

@@ -116,7 +116,6 @@ def get_port_type(port):

 def run_miniterm(config, port):
    import serial
-
    from esphome import platformio_api

    if CONF_LOGGER not in config:
@@ -597,9 +596,8 @@ def command_update_all(args):


 def command_idedata(args, config):
-    import json
-
    from esphome import platformio_api
+    import json

    logging.disable(logging.INFO)
    logging.disable(logging.WARNING)
@@ -697,8 +695,7 @@ def command_rename(args, config):
        os.remove(new_path)
        return 1

-    if CORE.config_path != new_path:
-        os.remove(CORE.config_path)
+    os.remove(CORE.config_path)

    print(color(Fore.BOLD_GREEN, "SUCCESS"))
    print()
@@ -731,11 +728,7 @@ POST_CONFIG_ACTIONS = {
 def parse_args(argv):
    options_parser = argparse.ArgumentParser(add_help=False)
    options_parser.add_argument(
-        "-v",
-        "--verbose",
-        help="Enable verbose ESPHome logs.",
-        action="store_true",
-        default=get_bool_env("ESPHOME_VERBOSE"),
+        "-v", "--verbose", help="Enable verbose ESPHome logs.", action="store_true"
    )
    options_parser.add_argument(
        "-q", "--quiet", help="Disable all ESPHome logs.", action="store_true"
@@ -753,14 +746,7 @@ def parse_args(argv):
    )

    parser = argparse.ArgumentParser(
-        description=f"ESPHome {const.__version__}", parents=[options_parser]
-    )
-
-    parser.add_argument(
-        "--version",
-        action="version",
-        version=f"Version: {const.__version__}",
-        help="Print the ESPHome version and exit.",
+        description=f"ESPHome v{const.__version__}", parents=[options_parser]
    )

    mqtt_options = argparse.ArgumentParser(add_help=False)
@@ -961,6 +947,67 @@ def parse_args(argv):
    # a deprecation warning).
    arguments = argv[1:]

+    # On Python 3.9+ we can simply set exit_on_error=False in the constructor
+    def _raise(x):
+        raise argparse.ArgumentError(None, x)
+
+    # First, try new-style parsing, but don't exit in case of failure
+    try:
+        # duplicate parser so that we can use the original one to raise errors later on
+        current_parser = argparse.ArgumentParser(add_help=False, parents=[parser])
+        current_parser.set_defaults(deprecated_argv_suggestion=None)
+        current_parser.error = _raise
+        return current_parser.parse_args(arguments)
+    except argparse.ArgumentError:
+        pass
+
+    # Second, try compat parsing and rearrange the command-line if it succeeds
+    # Disable argparse's built-in help option and add it manually to prevent this
+    # parser from printing the help messagefor the old format when invoked with -h.
+    compat_parser = argparse.ArgumentParser(parents=[options_parser], add_help=False)
+    compat_parser.add_argument("-h", "--help", action="store_true")
+    compat_parser.add_argument("configuration", nargs="*")
+    compat_parser.add_argument(
+        "command",
+        choices=[
+            "config",
+            "compile",
+            "upload",
+            "logs",
+            "run",
+            "clean-mqtt",
+            "wizard",
+            "mqtt-fingerprint",
+            "version",
+            "clean",
+            "dashboard",
+            "vscode",
+            "update-all",
+        ],
+    )
+
+    try:
+        compat_parser.error = _raise
+        result, unparsed = compat_parser.parse_known_args(argv[1:])
+        last_option = len(arguments) - len(unparsed) - 1 - len(result.configuration)
+        unparsed = [
+            "--device" if arg in ("--upload-port", "--serial-port") else arg
+            for arg in unparsed
+        ]
+        arguments = (
+            arguments[0:last_option]
+            + [result.command]
+            + result.configuration
+            + unparsed
+        )
+        deprecated_argv_suggestion = arguments
+    except argparse.ArgumentError:
+        # old-style parsing failed, don't suggest any argument
+        deprecated_argv_suggestion = None
+
+    # Finally, run the new-style parser again with the possibly swapped arguments,
+    # and let it error out if the command is unparsable.
+    parser.set_defaults(deprecated_argv_suggestion=deprecated_argv_suggestion)
    argcomplete.autocomplete(parser)
    return parser.parse_args(arguments)

@@ -975,6 +1022,20 @@ def run_esphome(argv):
        # Show timestamp for dashboard access logs
        args.command == "dashboard",
    )
+    if args.deprecated_argv_suggestion is not None and args.command != "vscode":
+        _LOGGER.warning(
+            "Calling ESPHome with the configuration before the command is deprecated "
+            "and will be removed in the future. "
+        )
+        _LOGGER.warning("Please instead use:")
+        _LOGGER.warning("   esphome %s", " ".join(args.deprecated_argv_suggestion))
+
+    if sys.version_info < (3, 8, 0):
+        _LOGGER.error(
+            "You're running ESPHome with Python <3.8. ESPHome is no longer compatible "
+            "with this Python version. Please reinstall ESPHome with Python 3.8+"
+        )
+        return 1

    if args.command in PRE_CONFIG_ACTIONS:
        try:
--- a/esphome/automation.py
+++ b/esphome/automation.py
@@ -7,10 +7,10 @@ from esphome.const import (
    CONF_ELSE,
    CONF_ID,
    CONF_THEN,
-    CONF_TIME,
    CONF_TIMEOUT,
    CONF_TRIGGER_ID,
    CONF_TYPE_ID,
+    CONF_TIME,
    CONF_UPDATE_INTERVAL,
 )
 from esphome.schema_extractors import SCHEMA_EXTRACT, schema_extractor
--- a/esphome/codegen.py
+++ b/esphome/codegen.py
@@ -8,86 +8,85 @@
 # want to break suddenly due to a rename (this file will get backports for features).

 # pylint: disable=unused-import
-from esphome.cpp_generator import (  # noqa: F401
-    ArrayInitializer,
+from esphome.cpp_generator import (  # noqa
    Expression,
-    LineComment,
-    MockObj,
-    MockObjClass,
-    Pvariable,
    RawExpression,
    RawStatement,
-    Statement,
-    StructInitializer,
    TemplateArguments,
+    StructInitializer,
+    ArrayInitializer,
+    safe_exp,
+    Statement,
+    LineComment,
+    progmem_array,
+    static_const_array,
+    statement,
+    variable,
+    with_local_variable,
+    new_variable,
+    Pvariable,
+    new_Pvariable,
    add,
-    add_build_flag,
-    add_define,
    add_global,
    add_library,
+    add_build_flag,
+    add_define,
    add_platformio_option,
    get_variable,
    get_variable_with_full_id,
-    is_template,
-    new_Pvariable,
-    new_variable,
    process_lambda,
-    progmem_array,
-    safe_exp,
-    statement,
-    static_const_array,
+    is_template,
    templatable,
-    variable,
-    with_local_variable,
+    MockObj,
+    MockObjClass,
 )
-from esphome.cpp_helpers import (  # noqa: F401
+from esphome.cpp_helpers import (  # noqa
+    gpio_pin_expression,
+    register_component,
    build_registry_entry,
    build_registry_list,
    extract_registry_entry_config,
-    gpio_pin_expression,
-    past_safe_mode,
-    register_component,
    register_parented,
+    past_safe_mode,
 )
-from esphome.cpp_types import (  # noqa: F401
-    NAN,
-    App,
-    Application,
-    Component,
-    ComponentPtr,
-    Controller,
-    EntityBase,
-    EntityCategory,
-    ESPTime,
-    GPIOPin,
-    InternalGPIOPin,
-    JsonObject,
-    JsonObjectConst,
-    Parented,
-    PollingComponent,
-    arduino_json_ns,
-    bool_,
-    const_char_ptr,
-    double,
-    esphome_ns,
-    float_,
+from esphome.cpp_types import (  # noqa
    global_ns,
-    gpio_Flags,
-    int16,
-    int32,
-    int64,
-    int_,
+    void,
    nullptr,
-    optional,
-    size_t,
+    float_,
+    double,
+    bool_,
+    int_,
    std_ns,
    std_shared_ptr,
    std_string,
-    std_string_ref,
    std_vector,
    uint8,
    uint16,
    uint32,
    uint64,
-    void,
+    int16,
+    int32,
+    int64,
+    size_t,
+    const_char_ptr,
+    NAN,
+    esphome_ns,
+    App,
+    EntityBase,
+    Component,
+    ComponentPtr,
+    PollingComponent,
+    Application,
+    optional,
+    arduino_json_ns,
+    JsonObject,
+    JsonObjectConst,
+    Controller,
+    GPIOPin,
+    InternalGPIOPin,
+    gpio_Flags,
+    EntityCategory,
+    Parented,
+    ESPTime,
 )
--- a/esphome/components/ade7953/sensor.py
+++ b/esphome/components/ade7953/sensor.py
@@ -1,5 +1,5 @@
 import esphome.config_validation as cv

-CONFIG_SCHEMA = cv.invalid(
+CONFIG_SCHEMA = CONFIG_SCHEMA = cv.invalid(
    "The ade7953 sensor component has been renamed to ade7953_i2c."
 )
--- a/esphome/components/ade7953_spi/ade7953_spi.cpp
+++ b/esphome/components/ade7953_spi/ade7953_spi.cpp
@@ -60,7 +60,7 @@ bool AdE7953Spi::ade_read_16(uint16_t reg, uint16_t *value) {
  this->write_byte16(reg);
  this->transfer_byte(0x80);
  uint8_t recv[2];
-  this->read_array(recv, 2);
+  this->read_array(recv, 4);
  *value = encode_uint16(recv[0], recv[1]);
  this->disable();
  return false;
--- a/esphome/components/aht10/aht10.cpp
+++ b/esphome/components/aht10/aht10.cpp
@@ -93,9 +93,8 @@ void AHT10Component::restart_read_() {

 void AHT10Component::read_data_() {
  uint8_t data[6];
-  if (this->read_count_ > 1) {
+  if (this->read_count_ > 1)
    ESP_LOGD(TAG, "Read attempt %d at %ums", this->read_count_, (unsigned) (millis() - this->start_time_));
-  }
  if (this->read(data, 6) != i2c::ERROR_OK) {
    this->status_set_warning("AHT10 read failed, retrying soon");
    this->restart_read_();
@@ -120,9 +119,8 @@ void AHT10Component::read_data_() {
      return;
    }
  }
-  if (this->read_count_ > 1) {
+  if (this->read_count_ > 1)
    ESP_LOGD(TAG, "Success at %ums", (unsigned) (millis() - this->start_time_));
-  }
  uint32_t raw_temperature = ((data[3] & 0x0F) << 16) | (data[4] << 8) | data[5];
  uint32_t raw_humidity = ((data[1] << 16) | (data[2] << 8) | data[3]) >> 4;

--- a/esphome/components/airthings_wave_plus/airthings_wave_plus.cpp
+++ b/esphome/components/airthings_wave_plus/airthings_wave_plus.cpp
@@ -14,6 +14,8 @@ void AirthingsWavePlus::read_sensors(uint8_t *raw_value, uint16_t value_len) {
    ESP_LOGD(TAG, "version = %d", value->version);

    if (value->version == 1) {
+      ESP_LOGD(TAG, "ambient light = %d", value->ambientLight);
+
      if (this->humidity_sensor_ != nullptr) {
        this->humidity_sensor_->publish_state(value->humidity / 2.0f);
      }
@@ -41,10 +43,6 @@ void AirthingsWavePlus::read_sensors(uint8_t *raw_value, uint16_t value_len) {
      if ((this->tvoc_sensor_ != nullptr) && this->is_valid_voc_value_(value->voc)) {
        this->tvoc_sensor_->publish_state(value->voc);
      }
-
-      if (this->illuminance_sensor_ != nullptr) {
-        this->illuminance_sensor_->publish_state(value->ambientLight);
-      }
    } else {
      ESP_LOGE(TAG, "Invalid payload version (%d != 1, newer version or not a Wave Plus?)", value->version);
    }
@@ -70,7 +68,6 @@ void AirthingsWavePlus::dump_config() {
  LOG_SENSOR("  ", "Radon", this->radon_sensor_);
  LOG_SENSOR("  ", "Radon Long Term", this->radon_long_term_sensor_);
  LOG_SENSOR("  ", "CO2", this->co2_sensor_);
-  LOG_SENSOR("  ", "Illuminance", this->illuminance_sensor_);
 }

 AirthingsWavePlus::AirthingsWavePlus() {
--- a/esphome/components/airthings_wave_plus/airthings_wave_plus.h
+++ b/esphome/components/airthings_wave_plus/airthings_wave_plus.h
@@ -22,7 +22,6 @@ class AirthingsWavePlus : public airthings_wave_base::AirthingsWaveBase {
  void set_radon(sensor::Sensor *radon) { radon_sensor_ = radon; }
  void set_radon_long_term(sensor::Sensor *radon_long_term) { radon_long_term_sensor_ = radon_long_term; }
  void set_co2(sensor::Sensor *co2) { co2_sensor_ = co2; }
-  void set_illuminance(sensor::Sensor *illuminance) { illuminance_sensor_ = illuminance; }

 protected:
  bool is_valid_radon_value_(uint16_t radon);
@@ -33,7 +32,6 @@ class AirthingsWavePlus : public airthings_wave_base::AirthingsWaveBase {
  sensor::Sensor *radon_sensor_{nullptr};
  sensor::Sensor *radon_long_term_sensor_{nullptr};
  sensor::Sensor *co2_sensor_{nullptr};
-  sensor::Sensor *illuminance_sensor_{nullptr};

  struct WavePlusReadings {
    uint8_t version;
--- a/esphome/components/airthings_wave_plus/sensor.py
+++ b/esphome/components/airthings_wave_plus/sensor.py
@@ -12,9 +12,6 @@ from esphome.const import (
    CONF_CO2,
    UNIT_BECQUEREL_PER_CUBIC_METER,
    UNIT_PARTS_PER_MILLION,
-    CONF_ILLUMINANCE,
-    UNIT_LUX,
-    DEVICE_CLASS_ILLUMINANCE,
 )

 DEPENDENCIES = airthings_wave_base.DEPENDENCIES
@@ -48,12 +45,6 @@ CONFIG_SCHEMA = airthings_wave_base.BASE_SCHEMA.extend(
            device_class=DEVICE_CLASS_CARBON_DIOXIDE,
            state_class=STATE_CLASS_MEASUREMENT,
        ),
-        cv.Optional(CONF_ILLUMINANCE): sensor.sensor_schema(
-            unit_of_measurement=UNIT_LUX,
-            accuracy_decimals=0,
-            device_class=DEVICE_CLASS_ILLUMINANCE,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
    }
 )

@@ -71,6 +62,3 @@ async def to_code(config):
    if config_co2 := config.get(CONF_CO2):
        sens = await sensor.new_sensor(config_co2)
        cg.add(var.set_co2(sens))
-    if config_illuminance := config.get(CONF_ILLUMINANCE):
-        sens = await sensor.new_sensor(config_illuminance)
-        cg.add(var.set_illuminance(sens))
--- a/esphome/components/alarm_control_panel/init.py
+++ b/esphome/components/alarm_control_panel/init.py
@@ -1,17 +1,16 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import web_server
 from esphome import automation
 from esphome.automation import maybe_simple_id
-import esphome.codegen as cg
-from esphome.components import mqtt, web_server
-import esphome.config_validation as cv
+from esphome.core import CORE, coroutine_with_priority
 from esphome.const import (
-    CONF_CODE,
    CONF_ID,
-    CONF_MQTT_ID,
    CONF_ON_STATE,
    CONF_TRIGGER_ID,
+    CONF_CODE,
    CONF_WEB_SERVER_ID,
 )
-from esphome.core import CORE, coroutine_with_priority
 from esphome.cpp_helpers import setup_entity

 CODEOWNERS = ["@grahambrown11", "@hwstar"]
@@ -78,72 +77,67 @@ AlarmControlPanelCondition = alarm_control_panel_ns.class_(
    "AlarmControlPanelCondition", automation.Condition
 )

-ALARM_CONTROL_PANEL_SCHEMA = (
-    cv.ENTITY_BASE_SCHEMA.extend(web_server.WEBSERVER_SORTING_SCHEMA)
-    .extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA)
-    .extend(
-        {
-            cv.GenerateID(): cv.declare_id(AlarmControlPanel),
-            cv.OnlyWith(CONF_MQTT_ID, "mqtt"): cv.declare_id(
-                mqtt.MQTTAlarmControlPanelComponent
-            ),
-            cv.Optional(CONF_ON_STATE): automation.validate_automation(
-                {
-                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(StateTrigger),
-                }
-            ),
-            cv.Optional(CONF_ON_TRIGGERED): automation.validate_automation(
-                {
-                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(TriggeredTrigger),
-                }
-            ),
-            cv.Optional(CONF_ON_ARMING): automation.validate_automation(
-                {
-                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ArmingTrigger),
-                }
-            ),
-            cv.Optional(CONF_ON_PENDING): automation.validate_automation(
-                {
-                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(PendingTrigger),
-                }
-            ),
-            cv.Optional(CONF_ON_ARMED_HOME): automation.validate_automation(
-                {
-                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ArmedHomeTrigger),
-                }
-            ),
-            cv.Optional(CONF_ON_ARMED_NIGHT): automation.validate_automation(
-                {
-                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ArmedNightTrigger),
-                }
-            ),
-            cv.Optional(CONF_ON_ARMED_AWAY): automation.validate_automation(
-                {
-                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ArmedAwayTrigger),
-                }
-            ),
-            cv.Optional(CONF_ON_DISARMED): automation.validate_automation(
-                {
-                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(DisarmedTrigger),
-                }
-            ),
-            cv.Optional(CONF_ON_CLEARED): automation.validate_automation(
-                {
-                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ClearedTrigger),
-                }
-            ),
-            cv.Optional(CONF_ON_CHIME): automation.validate_automation(
-                {
-                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ChimeTrigger),
-                }
-            ),
-            cv.Optional(CONF_ON_READY): automation.validate_automation(
-                {
-                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ReadyTrigger),
-                }
-            ),
-        }
-    )
+ALARM_CONTROL_PANEL_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(
+    web_server.WEBSERVER_SORTING_SCHEMA
+).extend(
+    {
+        cv.GenerateID(): cv.declare_id(AlarmControlPanel),
+        cv.Optional(CONF_ON_STATE): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(StateTrigger),
+            }
+        ),
+        cv.Optional(CONF_ON_TRIGGERED): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(TriggeredTrigger),
+            }
+        ),
+        cv.Optional(CONF_ON_ARMING): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ArmingTrigger),
+            }
+        ),
+        cv.Optional(CONF_ON_PENDING): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(PendingTrigger),
+            }
+        ),
+        cv.Optional(CONF_ON_ARMED_HOME): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ArmedHomeTrigger),
+            }
+        ),
+        cv.Optional(CONF_ON_ARMED_NIGHT): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ArmedNightTrigger),
+            }
+        ),
+        cv.Optional(CONF_ON_ARMED_AWAY): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ArmedAwayTrigger),
+            }
+        ),
+        cv.Optional(CONF_ON_DISARMED): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(DisarmedTrigger),
+            }
+        ),
+        cv.Optional(CONF_ON_CLEARED): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ClearedTrigger),
+            }
+        ),
+        cv.Optional(CONF_ON_CHIME): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ChimeTrigger),
+            }
+        ),
+        cv.Optional(CONF_ON_READY): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ReadyTrigger),
+            }
+        ),
+    }
 )

 ALARM_CONTROL_PANEL_ACTION_SCHEMA = maybe_simple_id(
@@ -198,9 +192,6 @@ async def setup_alarm_control_panel_core_(var, config):
    if (webserver_id := config.get(CONF_WEB_SERVER_ID)) is not None:
        web_server_ = await cg.get_variable(webserver_id)
        web_server.add_entity_to_sorting_list(web_server_, var, config)
-    if mqtt_id := config.get(CONF_MQTT_ID):
-        mqtt_ = cg.new_Pvariable(mqtt_id, var)
-        await mqtt.register_mqtt_component(mqtt_, config)


 async def register_alarm_control_panel(var, config):
--- a/esphome/components/apds9306/init.py
+++ b/esphome/components/apds9306/init.py
@@ -1,4 +0,0 @@
-# Based on this datasheet:
-# https://www.mouser.ca/datasheet/2/678/AVGO_S_A0002854364_1-2574547.pdf
-
-CODEOWNERS = ["@aodrenah"]
--- a/esphome/components/apds9306/apds9306.cpp
+++ b/esphome/components/apds9306/apds9306.cpp
@@ -1,151 +0,0 @@
-// Based on this datasheet:
-// https://www.mouser.ca/datasheet/2/678/AVGO_S_A0002854364_1-2574547.pdf
-
-#include "apds9306.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace apds9306 {
-
-static const char *const TAG = "apds9306";
-
-enum {  // APDS9306 registers
-  APDS9306_MAIN_CTRL = 0x00,
-  APDS9306_ALS_MEAS_RATE = 0x04,
-  APDS9306_ALS_GAIN = 0x05,
-  APDS9306_PART_ID = 0x06,
-  APDS9306_MAIN_STATUS = 0x07,
-  APDS9306_CLEAR_DATA_0 = 0x0A,  // LSB
-  APDS9306_CLEAR_DATA_1 = 0x0B,
-  APDS9306_CLEAR_DATA_2 = 0x0C,  // MSB
-  APDS9306_ALS_DATA_0 = 0x0D,    // LSB
-  APDS9306_ALS_DATA_1 = 0x0E,
-  APDS9306_ALS_DATA_2 = 0x0F,  // MSB
-  APDS9306_INT_CFG = 0x19,
-  APDS9306_INT_PERSISTENCE = 0x1A,
-  APDS9306_ALS_THRES_UP_0 = 0x21,  // LSB
-  APDS9306_ALS_THRES_UP_1 = 0x22,
-  APDS9306_ALS_THRES_UP_2 = 0x23,   // MSB
-  APDS9306_ALS_THRES_LOW_0 = 0x24,  // LSB
-  APDS9306_ALS_THRES_LOW_1 = 0x25,
-  APDS9306_ALS_THRES_LOW_2 = 0x26,  // MSB
-  APDS9306_ALS_THRES_VAR = 0x27
-};
-
-#define APDS9306_ERROR_CHECK(func, error) \
-  if (!(func)) { \
-    ESP_LOGE(TAG, error); \
-    this->mark_failed(); \
-    return; \
-  }
-#define APDS9306_WARNING_CHECK(func, warning) \
-  if (!(func)) { \
-    ESP_LOGW(TAG, warning); \
-    this->status_set_warning(); \
-    return; \
-  }
-#define APDS9306_WRITE_BYTE(reg, value) \
-  ESP_LOGV(TAG, "Writing 0x%02x to 0x%02x", value, reg); \
-  if (!this->write_byte(reg, value)) { \
-    ESP_LOGE(TAG, "Failed writing 0x%02x to 0x%02x", value, reg); \
-    this->mark_failed(); \
-    return; \
-  }
-
-void APDS9306::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up APDS9306...");
-
-  uint8_t id;
-  if (!this->read_byte(APDS9306_PART_ID, &id)) {  // Part ID register
-    this->error_code_ = COMMUNICATION_FAILED;
-    this->mark_failed();
-    return;
-  }
-
-  if (id != 0xB1 && id != 0xB3) {  // 0xB1 for APDS9306 0xB3 for APDS9306-065
-    this->error_code_ = WRONG_ID;
-    this->mark_failed();
-    return;
-  }
-
-  // ALS resolution and measurement, see datasheet or init.py for options
-  uint8_t als_meas_rate = ((this->bit_width_ & 0x07) << 4) | (this->measurement_rate_ & 0x07);
-  APDS9306_WRITE_BYTE(APDS9306_ALS_MEAS_RATE, als_meas_rate);
-
-  // ALS gain, see datasheet or init.py for options
-  uint8_t als_gain = (this->gain_ & 0x07);
-  APDS9306_WRITE_BYTE(APDS9306_ALS_GAIN, als_gain);
-
-  // Set to standby mode
-  APDS9306_WRITE_BYTE(APDS9306_MAIN_CTRL, 0x00);
-
-  // Check for data, clear main status
-  uint8_t status;
-  APDS9306_WARNING_CHECK(this->read_byte(APDS9306_MAIN_STATUS, &status), "Reading MAIN STATUS failed.");
-
-  // Set to active mode
-  APDS9306_WRITE_BYTE(APDS9306_MAIN_CTRL, 0x02);
-
-  ESP_LOGCONFIG(TAG, "APDS9306 setup complete");
-}
-
-void APDS9306::dump_config() {
-  LOG_SENSOR("", "APDS9306", this);
-  LOG_I2C_DEVICE(this);
-
-  if (this->is_failed()) {
-    switch (this->error_code_) {
-      case COMMUNICATION_FAILED:
-        ESP_LOGE(TAG, "Communication with APDS9306 failed!");
-        break;
-      case WRONG_ID:
-        ESP_LOGE(TAG, "APDS9306 has invalid id!");
-        break;
-      default:
-        ESP_LOGE(TAG, "Setting up APDS9306 registers failed!");
-        break;
-    }
-  }
-
-  ESP_LOGCONFIG(TAG, "  Gain: %u", AMBIENT_LIGHT_GAIN_VALUES[this->gain_]);
-  ESP_LOGCONFIG(TAG, "  Measurement rate: %u", MEASUREMENT_RATE_VALUES[this->measurement_rate_]);
-  ESP_LOGCONFIG(TAG, "  Measurement Resolution/Bit width: %d", MEASUREMENT_BIT_WIDTH_VALUES[this->bit_width_]);
-
-  LOG_UPDATE_INTERVAL(this);
-}
-
-void APDS9306::update() {
-  // Check for new data
-  uint8_t status;
-  APDS9306_WARNING_CHECK(this->read_byte(APDS9306_MAIN_STATUS, &status), "Reading MAIN STATUS failed.");
-
-  this->status_clear_warning();
-
-  if (!(status &= 0b00001000)) {  // No new data
-    return;
-  }
-
-  // Set to standby mode
-  APDS9306_WRITE_BYTE(APDS9306_MAIN_CTRL, 0x00);
-
-  // Clear MAIN STATUS
-  APDS9306_WARNING_CHECK(this->read_byte(APDS9306_MAIN_STATUS, &status), "Reading MAIN STATUS failed.");
-
-  uint8_t als_data[3];
-  APDS9306_WARNING_CHECK(this->read_bytes(APDS9306_ALS_DATA_0, als_data, 3), "Reading ALS data has failed.");
-
-  // Set to active mode
-  APDS9306_WRITE_BYTE(APDS9306_MAIN_CTRL, 0x02);
-
-  uint32_t light_level = 0x00 | encode_uint24(als_data[2], als_data[1], als_data[0]);
-
-  float lux = ((float) light_level / AMBIENT_LIGHT_GAIN_VALUES[this->gain_]) *
-              (100.0f / MEASUREMENT_RATE_VALUES[this->measurement_rate_]);
-
-  ESP_LOGD(TAG, "Got illuminance=%.1flx from", lux);
-  this->publish_state(lux);
-}
-
-}  // namespace apds9306
-}  // namespace esphome
--- a/esphome/components/apds9306/apds9306.h
+++ b/esphome/components/apds9306/apds9306.h
@@ -1,66 +0,0 @@
-// Based on this datasheet:
-// https://www.mouser.ca/datasheet/2/678/AVGO_S_A0002854364_1-2574547.pdf
-
-#pragma once
-
-#include "esphome/components/i2c/i2c.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/core/component.h"
-
-namespace esphome {
-namespace apds9306 {
-
-enum MeasurementBitWidth : uint8_t {
-  MEASUREMENT_BIT_WIDTH_20 = 0,
-  MEASUREMENT_BIT_WIDTH_19 = 1,
-  MEASUREMENT_BIT_WIDTH_18 = 2,
-  MEASUREMENT_BIT_WIDTH_17 = 3,
-  MEASUREMENT_BIT_WIDTH_16 = 4,
-  MEASUREMENT_BIT_WIDTH_13 = 5,
-};
-static const uint8_t MEASUREMENT_BIT_WIDTH_VALUES[] = {20, 19, 18, 17, 16, 13};
-
-enum MeasurementRate : uint8_t {
-  MEASUREMENT_RATE_25 = 0,
-  MEASUREMENT_RATE_50 = 1,
-  MEASUREMENT_RATE_100 = 2,
-  MEASUREMENT_RATE_200 = 3,
-  MEASUREMENT_RATE_500 = 4,
-  MEASUREMENT_RATE_1000 = 5,
-  MEASUREMENT_RATE_2000 = 6,
-};
-static const uint16_t MEASUREMENT_RATE_VALUES[] = {25, 50, 100, 200, 500, 1000, 2000};
-
-enum AmbientLightGain : uint8_t {
-  AMBIENT_LIGHT_GAIN_1 = 0,
-  AMBIENT_LIGHT_GAIN_3 = 1,
-  AMBIENT_LIGHT_GAIN_6 = 2,
-  AMBIENT_LIGHT_GAIN_9 = 3,
-  AMBIENT_LIGHT_GAIN_18 = 4,
-};
-static const uint8_t AMBIENT_LIGHT_GAIN_VALUES[] = {1, 3, 6, 9, 18};
-
-class APDS9306 : public sensor::Sensor, public PollingComponent, public i2c::I2CDevice {
- public:
-  void setup() override;
-  float get_setup_priority() const override { return setup_priority::BUS; }
-  void dump_config() override;
-  void update() override;
-  void set_bit_width(MeasurementBitWidth bit_width) { this->bit_width_ = bit_width; }
-  void set_measurement_rate(MeasurementRate measurement_rate) { this->measurement_rate_ = measurement_rate; }
-  void set_ambient_light_gain(AmbientLightGain gain) { this->gain_ = gain; }
-
- protected:
-  enum ErrorCode {
-    NONE = 0,
-    COMMUNICATION_FAILED,
-    WRONG_ID,
-  } error_code_{NONE};
-
-  MeasurementBitWidth bit_width_;
-  MeasurementRate measurement_rate_;
-  AmbientLightGain gain_;
-};
-
-}  // namespace apds9306
-}  // namespace esphome
--- a/esphome/components/apds9306/sensor.py
+++ b/esphome/components/apds9306/sensor.py
@@ -1,95 +0,0 @@
-# Based on this datasheet:
-# https://www.mouser.ca/datasheet/2/678/AVGO_S_A0002854364_1-2574547.pdf
-
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import i2c, sensor
-from esphome.const import (
-    CONF_GAIN,
-    DEVICE_CLASS_ILLUMINANCE,
-    ICON_LIGHTBULB,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_LUX,
-)
-
-DEPENDENCIES = ["i2c"]
-
-CONF_APDS9306_ID = "apds9306_id"
-CONF_BIT_WIDTH = "bit_width"
-CONF_MEASUREMENT_RATE = "measurement_rate"
-
-apds9306_ns = cg.esphome_ns.namespace("apds9306")
-APDS9306 = apds9306_ns.class_(
-    "APDS9306", sensor.Sensor, cg.PollingComponent, i2c.I2CDevice
-)
-
-MeasurementBitWidth = apds9306_ns.enum("MeasurementBitWidth")
-MeasurementRate = apds9306_ns.enum("MeasurementRate")
-AmbientLightGain = apds9306_ns.enum("AmbientLightGain")
-
-MEASUREMENT_BIT_WIDTHS = {
-    20: MeasurementBitWidth.MEASUREMENT_BIT_WIDTH_20,
-    19: MeasurementBitWidth.MEASUREMENT_BIT_WIDTH_19,
-    18: MeasurementBitWidth.MEASUREMENT_BIT_WIDTH_18,
-    17: MeasurementBitWidth.MEASUREMENT_BIT_WIDTH_17,
-    16: MeasurementBitWidth.MEASUREMENT_BIT_WIDTH_16,
-    13: MeasurementBitWidth.MEASUREMENT_BIT_WIDTH_13,
-}
-
-MEASUREMENT_RATES = {
-    25: MeasurementRate.MEASUREMENT_RATE_25,
-    50: MeasurementRate.MEASUREMENT_RATE_50,
-    100: MeasurementRate.MEASUREMENT_RATE_100,
-    200: MeasurementRate.MEASUREMENT_RATE_200,
-    500: MeasurementRate.MEASUREMENT_RATE_500,
-    1000: MeasurementRate.MEASUREMENT_RATE_1000,
-    2000: MeasurementRate.MEASUREMENT_RATE_2000,
-}
-
-AMBIENT_LIGHT_GAINS = {
-    1: AmbientLightGain.AMBIENT_LIGHT_GAIN_1,
-    3: AmbientLightGain.AMBIENT_LIGHT_GAIN_3,
-    6: AmbientLightGain.AMBIENT_LIGHT_GAIN_6,
-    9: AmbientLightGain.AMBIENT_LIGHT_GAIN_9,
-    18: AmbientLightGain.AMBIENT_LIGHT_GAIN_18,
-}
-
-
-def _validate_measurement_rate(value):
-    value = cv.positive_time_period_milliseconds(value)
-    return cv.enum(MEASUREMENT_RATES, int=True)(value.total_milliseconds)
-
-
-CONFIG_SCHEMA = (
-    sensor.sensor_schema(
-        APDS9306,
-        unit_of_measurement=UNIT_LUX,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_ILLUMINANCE,
-        state_class=STATE_CLASS_MEASUREMENT,
-        icon=ICON_LIGHTBULB,
-    )
-    .extend(
-        {
-            cv.Optional(CONF_GAIN, default="1"): cv.enum(AMBIENT_LIGHT_GAINS, int=True),
-            cv.Optional(CONF_BIT_WIDTH, default="18"): cv.enum(
-                MEASUREMENT_BIT_WIDTHS, int=True
-            ),
-            cv.Optional(
-                CONF_MEASUREMENT_RATE, default="100ms"
-            ): _validate_measurement_rate,
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(i2c.i2c_device_schema(0x52))
-)
-
-
-async def to_code(config):
-    var = await sensor.new_sensor(config)
-    await cg.register_component(var, config)
-    await i2c.register_i2c_device(var, config)
-
-    cg.add(var.set_bit_width(config[CONF_BIT_WIDTH]))
-    cg.add(var.set_measurement_rate(config[CONF_MEASUREMENT_RATE]))
-    cg.add(var.set_ambient_light_gain(config[CONF_GAIN]))
--- a/esphome/components/api/init.py
+++ b/esphome/components/api/init.py
@@ -1,27 +1,25 @@
 import base64

-from esphome import automation
-from esphome.automation import Condition
 import esphome.codegen as cg
 import esphome.config_validation as cv
+from esphome import automation
+from esphome.automation import Condition
 from esphome.const import (
-    CONF_ACTION,
-    CONF_ACTIONS,
    CONF_DATA,
    CONF_DATA_TEMPLATE,
-    CONF_EVENT,
    CONF_ID,
    CONF_KEY,
-    CONF_ON_CLIENT_CONNECTED,
-    CONF_ON_CLIENT_DISCONNECTED,
    CONF_PASSWORD,
    CONF_PORT,
    CONF_REBOOT_TIMEOUT,
    CONF_SERVICE,
-    CONF_SERVICES,
-    CONF_TAG,
-    CONF_TRIGGER_ID,
    CONF_VARIABLES,
+    CONF_SERVICES,
+    CONF_TRIGGER_ID,
+    CONF_EVENT,
+    CONF_TAG,
+    CONF_ON_CLIENT_CONNECTED,
+    CONF_ON_CLIENT_DISCONNECTED,
 )
 from esphome.core import coroutine_with_priority

@@ -65,51 +63,40 @@ def validate_encryption_key(value):
    return value


-ACTIONS_SCHEMA = automation.validate_automation(
+CONFIG_SCHEMA = cv.Schema(
    {
-        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(UserServiceTrigger),
-        cv.Exclusive(CONF_SERVICE, group_of_exclusion=CONF_ACTION): cv.valid_name,
-        cv.Exclusive(CONF_ACTION, group_of_exclusion=CONF_ACTION): cv.valid_name,
-        cv.Optional(CONF_VARIABLES, default={}): cv.Schema(
+        cv.GenerateID(): cv.declare_id(APIServer),
+        cv.Optional(CONF_PORT, default=6053): cv.port,
+        cv.Optional(CONF_PASSWORD, default=""): cv.string_strict,
+        cv.Optional(
+            CONF_REBOOT_TIMEOUT, default="15min"
+        ): cv.positive_time_period_milliseconds,
+        cv.Optional(CONF_SERVICES): automation.validate_automation(
            {
-                cv.validate_id_name: cv.one_of(*SERVICE_ARG_NATIVE_TYPES, lower=True),
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(UserServiceTrigger),
+                cv.Required(CONF_SERVICE): cv.valid_name,
+                cv.Optional(CONF_VARIABLES, default={}): cv.Schema(
+                    {
+                        cv.validate_id_name: cv.one_of(
+                            *SERVICE_ARG_NATIVE_TYPES, lower=True
+                        ),
+                    }
+                ),
            }
        ),
-    },
-    cv.All(
-        cv.has_exactly_one_key(CONF_SERVICE, CONF_ACTION),
-        cv.rename_key(CONF_SERVICE, CONF_ACTION),
-    ),
-)
-
-CONFIG_SCHEMA = cv.All(
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(APIServer),
-            cv.Optional(CONF_PORT, default=6053): cv.port,
-            cv.Optional(CONF_PASSWORD, default=""): cv.string_strict,
-            cv.Optional(
-                CONF_REBOOT_TIMEOUT, default="15min"
-            ): cv.positive_time_period_milliseconds,
-            cv.Exclusive(
-                CONF_SERVICES, group_of_exclusion=CONF_ACTIONS
-            ): ACTIONS_SCHEMA,
-            cv.Exclusive(CONF_ACTIONS, group_of_exclusion=CONF_ACTIONS): ACTIONS_SCHEMA,
-            cv.Optional(CONF_ENCRYPTION): cv.Schema(
-                {
-                    cv.Required(CONF_KEY): validate_encryption_key,
-                }
-            ),
-            cv.Optional(CONF_ON_CLIENT_CONNECTED): automation.validate_automation(
-                single=True
-            ),
-            cv.Optional(CONF_ON_CLIENT_DISCONNECTED): automation.validate_automation(
-                single=True
-            ),
-        }
-    ).extend(cv.COMPONENT_SCHEMA),
-    cv.rename_key(CONF_SERVICES, CONF_ACTIONS),
-)
+        cv.Optional(CONF_ENCRYPTION): cv.Schema(
+            {
+                cv.Required(CONF_KEY): validate_encryption_key,
+            }
+        ),
+        cv.Optional(CONF_ON_CLIENT_CONNECTED): automation.validate_automation(
+            single=True
+        ),
+        cv.Optional(CONF_ON_CLIENT_DISCONNECTED): automation.validate_automation(
+            single=True
+        ),
+    }
+).extend(cv.COMPONENT_SCHEMA)


@coroutine_with_priority(40.0)
@@ -121,7 +108,7 @@ async def to_code(config):
    cg.add(var.set_password(config[CONF_PASSWORD]))
    cg.add(var.set_reboot_timeout(config[CONF_REBOOT_TIMEOUT]))

-    for conf in config.get(CONF_ACTIONS, []):
+    for conf in config.get(CONF_SERVICES, []):
        template_args = []
        func_args = []
        service_arg_names = []
@@ -132,7 +119,7 @@ async def to_code(config):
            service_arg_names.append(name)
        templ = cg.TemplateArguments(*template_args)
        trigger = cg.new_Pvariable(
-            conf[CONF_TRIGGER_ID], templ, conf[CONF_ACTION], service_arg_names
+            conf[CONF_TRIGGER_ID], templ, conf[CONF_SERVICE], service_arg_names
        )
        cg.add(var.register_user_service(trigger))
        await automation.build_automation(trigger, func_args, conf)
@@ -155,7 +142,7 @@ async def to_code(config):
        decoded = base64.b64decode(encryption_config[CONF_KEY])
        cg.add(var.set_noise_psk(list(decoded)))
        cg.add_define("USE_API_NOISE")
-        cg.add_library("esphome/noise-c", "0.1.6")
+        cg.add_library("esphome/noise-c", "0.1.4")
    else:
        cg.add_define("USE_API_PLAINTEXT")

@@ -165,43 +152,28 @@ async def to_code(config):

 KEY_VALUE_SCHEMA = cv.Schema({cv.string: cv.templatable(cv.string_strict)})

-
-HOMEASSISTANT_ACTION_ACTION_SCHEMA = cv.All(
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.use_id(APIServer),
-            cv.Exclusive(CONF_SERVICE, group_of_exclusion=CONF_ACTION): cv.templatable(
-                cv.string
-            ),
-            cv.Exclusive(CONF_ACTION, group_of_exclusion=CONF_ACTION): cv.templatable(
-                cv.string
-            ),
-            cv.Optional(CONF_DATA, default={}): KEY_VALUE_SCHEMA,
-            cv.Optional(CONF_DATA_TEMPLATE, default={}): KEY_VALUE_SCHEMA,
-            cv.Optional(CONF_VARIABLES, default={}): cv.Schema(
-                {cv.string: cv.returning_lambda}
-            ),
-        }
-    ),
-    cv.has_exactly_one_key(CONF_SERVICE, CONF_ACTION),
-    cv.rename_key(CONF_SERVICE, CONF_ACTION),
+HOMEASSISTANT_SERVICE_ACTION_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.use_id(APIServer),
+        cv.Required(CONF_SERVICE): cv.templatable(cv.string),
+        cv.Optional(CONF_DATA, default={}): KEY_VALUE_SCHEMA,
+        cv.Optional(CONF_DATA_TEMPLATE, default={}): KEY_VALUE_SCHEMA,
+        cv.Optional(CONF_VARIABLES, default={}): cv.Schema(
+            {cv.string: cv.returning_lambda}
+        ),
+    }
 )


-@automation.register_action(
-    "homeassistant.action",
-    HomeAssistantServiceCallAction,
-    HOMEASSISTANT_ACTION_ACTION_SCHEMA,
-)
@automation.register_action(
    "homeassistant.service",
    HomeAssistantServiceCallAction,
-    HOMEASSISTANT_ACTION_ACTION_SCHEMA,
+    HOMEASSISTANT_SERVICE_ACTION_SCHEMA,
 )
 async def homeassistant_service_to_code(config, action_id, template_arg, args):
    serv = await cg.get_variable(config[CONF_ID])
    var = cg.new_Pvariable(action_id, template_arg, serv, False)
-    templ = await cg.templatable(config[CONF_ACTION], args, None)
+    templ = await cg.templatable(config[CONF_SERVICE], args, None)
    cg.add(var.set_service(templ))
    for key, value in config[CONF_DATA].items():
        templ = await cg.templatable(value, args, None)
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -686,7 +686,6 @@ message SubscribeHomeAssistantStateResponse {
  option (source) = SOURCE_SERVER;
  string entity_id = 1;
  string attribute = 2;
-  bool once = 3;
 }

 message HomeAssistantStateResponse {
@@ -1107,18 +1106,6 @@ enum MediaPlayerCommand {
  MEDIA_PLAYER_COMMAND_MUTE = 3;
  MEDIA_PLAYER_COMMAND_UNMUTE = 4;
 }
-enum MediaPlayerFormatPurpose {
-  MEDIA_PLAYER_FORMAT_PURPOSE_DEFAULT = 0;
-  MEDIA_PLAYER_FORMAT_PURPOSE_ANNOUNCEMENT = 1;
-}
-message MediaPlayerSupportedFormat {
-  option (ifdef) = "USE_MEDIA_PLAYER";
-
-  string format = 1;
-  uint32 sample_rate = 2;
-  uint32 num_channels = 3;
-  MediaPlayerFormatPurpose purpose = 4;
-}
 message ListEntitiesMediaPlayerResponse {
  option (id) = 63;
  option (source) = SOURCE_SERVER;
@@ -1134,8 +1121,6 @@ message ListEntitiesMediaPlayerResponse {
  EntityCategory entity_category = 7;

  bool supports_pause = 8;
-
-  repeated MediaPlayerSupportedFormat supported_formats = 9;
 }
 message MediaPlayerStateResponse {
  option (id) = 64;
@@ -1553,23 +1538,6 @@ message VoiceAssistantTimerEventResponse {
  bool is_active = 6;
 }

-message VoiceAssistantAnnounceRequest {
-  option (id) = 119;
-  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_VOICE_ASSISTANT";
-
-  string media_id = 1;
-  string text = 2;
-}
-
-message VoiceAssistantAnnounceFinished {
-  option (id) = 120;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_VOICE_ASSISTANT";
-
-  bool success = 1;
-}
-
 // ==================== ALARM CONTROL PANEL ====================
 enum AlarmControlPanelState {
  ALARM_STATE_DISARMED = 0;
@@ -1904,11 +1872,6 @@ message UpdateStateResponse {
  string release_summary = 9;
  string release_url = 10;
 }
-enum UpdateCommand {
-  UPDATE_COMMAND_NONE = 0;
-  UPDATE_COMMAND_UPDATE = 1;
-  UPDATE_COMMAND_CHECK = 2;
-}
 message UpdateCommandRequest {
  option (id) = 118;
  option (source) = SOURCE_CLIENT;
@@ -1916,5 +1879,5 @@ message UpdateCommandRequest {
  option (no_delay) = true;

  fixed32 key = 1;
-  UpdateCommand command = 2;
+  bool install = 2;
 }
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -179,7 +179,6 @@ void APIConnection::loop() {
      SubscribeHomeAssistantStateResponse resp;
      resp.entity_id = it.entity_id;
      resp.attribute = it.attribute.value();
-      resp.once = it.once;
      if (this->send_subscribe_home_assistant_state_response(resp)) {
        state_subs_at_++;
      }
@@ -1026,15 +1025,6 @@ bool APIConnection::send_media_player_info(media_player::MediaPlayer *media_play
  auto traits = media_player->get_traits();
  msg.supports_pause = traits.get_supports_pause();

-  for (auto &supported_format : traits.get_supported_formats()) {
-    MediaPlayerSupportedFormat media_format;
-    media_format.format = supported_format.format;
-    media_format.sample_rate = supported_format.sample_rate;
-    media_format.num_channels = supported_format.num_channels;
-    media_format.purpose = static_cast<enums::MediaPlayerFormatPurpose>(supported_format.purpose);
-    msg.supported_formats.push_back(media_format);
-  }
-
  return this->send_list_entities_media_player_response(msg);
 }
 void APIConnection::media_player_command(const MediaPlayerCommandRequest &msg) {
@@ -1213,16 +1203,6 @@ void APIConnection::on_voice_assistant_timer_event_response(const VoiceAssistant
  }
 };

-void APIConnection::on_voice_assistant_announce_request(const VoiceAssistantAnnounceRequest &msg) {
-  if (voice_assistant::global_voice_assistant != nullptr) {
-    if (voice_assistant::global_voice_assistant->get_api_connection() != this) {
-      return;
-    }
-
-    voice_assistant::global_voice_assistant->on_announce(msg);
-  }
-}
-
 #endif

 #ifdef USE_ALARM_CONTROL_PANEL
@@ -1348,20 +1328,7 @@ void APIConnection::update_command(const UpdateCommandRequest &msg) {
  if (update == nullptr)
    return;

-  switch (msg.command) {
-    case enums::UPDATE_COMMAND_UPDATE:
-      update->perform();
-      break;
-    case enums::UPDATE_COMMAND_CHECK:
-      update->check();
-      break;
-    case enums::UPDATE_COMMAND_NONE:
-      ESP_LOGE(TAG, "UPDATE_COMMAND_NONE not handled. Check client is sending the correct command");
-      break;
-    default:
-      ESP_LOGW(TAG, "Unknown update command: %" PRIu32, msg.command);
-      break;
-  }
+  update->perform();
 }
 #endif

--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -151,7 +151,6 @@ class APIConnection : public APIServerConnection {
  void on_voice_assistant_event_response(const VoiceAssistantEventResponse &msg) override;
  void on_voice_assistant_audio(const VoiceAssistantAudio &msg) override;
  void on_voice_assistant_timer_event_response(const VoiceAssistantTimerEventResponse &msg) override;
-  void on_voice_assistant_announce_request(const VoiceAssistantAnnounceRequest &msg) override;
 #endif

 #ifdef USE_ALARM_CONTROL_PANEL
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -387,18 +387,6 @@ template<> const char *proto_enum_to_string<enums::MediaPlayerCommand>(enums::Me
 }
 #endif
 #ifdef HAS_PROTO_MESSAGE_DUMP
-template<> const char *proto_enum_to_string<enums::MediaPlayerFormatPurpose>(enums::MediaPlayerFormatPurpose value) {
-  switch (value) {
-    case enums::MEDIA_PLAYER_FORMAT_PURPOSE_DEFAULT:
-      return "MEDIA_PLAYER_FORMAT_PURPOSE_DEFAULT";
-    case enums::MEDIA_PLAYER_FORMAT_PURPOSE_ANNOUNCEMENT:
-      return "MEDIA_PLAYER_FORMAT_PURPOSE_ANNOUNCEMENT";
-    default:
-      return "UNKNOWN";
-  }
-}
-#endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
 template<>
 const char *proto_enum_to_string<enums::BluetoothDeviceRequestType>(enums::BluetoothDeviceRequestType value) {
  switch (value) {
@@ -579,20 +567,6 @@ template<> const char *proto_enum_to_string<enums::ValveOperation>(enums::ValveO
  }
 }
 #endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
-template<> const char *proto_enum_to_string<enums::UpdateCommand>(enums::UpdateCommand value) {
-  switch (value) {
-    case enums::UPDATE_COMMAND_NONE:
-      return "UPDATE_COMMAND_NONE";
-    case enums::UPDATE_COMMAND_UPDATE:
-      return "UPDATE_COMMAND_UPDATE";
-    case enums::UPDATE_COMMAND_CHECK:
-      return "UPDATE_COMMAND_CHECK";
-    default:
-      return "UNKNOWN";
-  }
-}
-#endif
 bool HelloRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
  switch (field_id) {
    case 2: {
@@ -3121,16 +3095,6 @@ void SubscribeHomeAssistantStatesRequest::dump_to(std::string &out) const {
  out.append("SubscribeHomeAssistantStatesRequest {}");
 }
 #endif
-bool SubscribeHomeAssistantStateResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 3: {
-      this->once = value.as_bool();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
 bool SubscribeHomeAssistantStateResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
  switch (field_id) {
    case 1: {
@@ -3148,7 +3112,6 @@ bool SubscribeHomeAssistantStateResponse::decode_length(uint32_t field_id, Proto
 void SubscribeHomeAssistantStateResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->entity_id);
  buffer.encode_string(2, this->attribute);
-  buffer.encode_bool(3, this->once);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SubscribeHomeAssistantStateResponse::dump_to(std::string &out) const {
@@ -3161,10 +3124,6 @@ void SubscribeHomeAssistantStateResponse::dump_to(std::string &out) const {
  out.append("  attribute: ");
  out.append("'").append(this->attribute).append("'");
  out.append("\n");
-
-  out.append("  once: ");
-  out.append(YESNO(this->once));
-  out.append("\n");
  out.append("}");
 }
 #endif
@@ -5135,64 +5094,6 @@ void ButtonCommandRequest::dump_to(std::string &out) const {
  out.append("}");
 }
 #endif
-bool MediaPlayerSupportedFormat::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 2: {
-      this->sample_rate = value.as_uint32();
-      return true;
-    }
-    case 3: {
-      this->num_channels = value.as_uint32();
-      return true;
-    }
-    case 4: {
-      this->purpose = value.as_enum<enums::MediaPlayerFormatPurpose>();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool MediaPlayerSupportedFormat::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 1: {
-      this->format = value.as_string();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void MediaPlayerSupportedFormat::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_string(1, this->format);
-  buffer.encode_uint32(2, this->sample_rate);
-  buffer.encode_uint32(3, this->num_channels);
-  buffer.encode_enum<enums::MediaPlayerFormatPurpose>(4, this->purpose);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void MediaPlayerSupportedFormat::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("MediaPlayerSupportedFormat {\n");
-  out.append("  format: ");
-  out.append("'").append(this->format).append("'");
-  out.append("\n");
-
-  out.append("  sample_rate: ");
-  sprintf(buffer, "%" PRIu32, this->sample_rate);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  num_channels: ");
-  sprintf(buffer, "%" PRIu32, this->num_channels);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  purpose: ");
-  out.append(proto_enum_to_string<enums::MediaPlayerFormatPurpose>(this->purpose));
-  out.append("\n");
-  out.append("}");
-}
-#endif
 bool ListEntitiesMediaPlayerResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
  switch (field_id) {
    case 6: {
@@ -5229,10 +5130,6 @@ bool ListEntitiesMediaPlayerResponse::decode_length(uint32_t field_id, ProtoLeng
      this->icon = value.as_string();
      return true;
    }
-    case 9: {
-      this->supported_formats.push_back(value.as_message<MediaPlayerSupportedFormat>());
-      return true;
-    }
    default:
      return false;
  }
@@ -5256,9 +5153,6 @@ void ListEntitiesMediaPlayerResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_bool(6, this->disabled_by_default);
  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
  buffer.encode_bool(8, this->supports_pause);
-  for (auto &it : this->supported_formats) {
-    buffer.encode_message<MediaPlayerSupportedFormat>(9, it, true);
-  }
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesMediaPlayerResponse::dump_to(std::string &out) const {
@@ -5296,12 +5190,6 @@ void ListEntitiesMediaPlayerResponse::dump_to(std::string &out) const {
  out.append("  supports_pause: ");
  out.append(YESNO(this->supports_pause));
  out.append("\n");
-
-  for (const auto &it : this->supported_formats) {
-    out.append("  supported_formats: ");
-    it.dump_to(out);
-    out.append("\n");
-  }
  out.append("}");
 }
 #endif
@@ -7061,59 +6949,6 @@ void VoiceAssistantTimerEventResponse::dump_to(std::string &out) const {
  out.append("}");
 }
 #endif
-bool VoiceAssistantAnnounceRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 1: {
-      this->media_id = value.as_string();
-      return true;
-    }
-    case 2: {
-      this->text = value.as_string();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void VoiceAssistantAnnounceRequest::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_string(1, this->media_id);
-  buffer.encode_string(2, this->text);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void VoiceAssistantAnnounceRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("VoiceAssistantAnnounceRequest {\n");
-  out.append("  media_id: ");
-  out.append("'").append(this->media_id).append("'");
-  out.append("\n");
-
-  out.append("  text: ");
-  out.append("'").append(this->text).append("'");
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool VoiceAssistantAnnounceFinished::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->success = value.as_bool();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void VoiceAssistantAnnounceFinished::encode(ProtoWriteBuffer buffer) const { buffer.encode_bool(1, this->success); }
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void VoiceAssistantAnnounceFinished::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("VoiceAssistantAnnounceFinished {\n");
-  out.append("  success: ");
-  out.append(YESNO(this->success));
-  out.append("\n");
-  out.append("}");
-}
-#endif
 bool ListEntitiesAlarmControlPanelResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
  switch (field_id) {
    case 6: {
@@ -8761,7 +8596,7 @@ void UpdateStateResponse::dump_to(std::string &out) const {
 bool UpdateCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
  switch (field_id) {
    case 2: {
-      this->command = value.as_enum<enums::UpdateCommand>();
+      this->install = value.as_bool();
      return true;
    }
    default:
@@ -8780,7 +8615,7 @@ bool UpdateCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
 }
 void UpdateCommandRequest::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_fixed32(1, this->key);
-  buffer.encode_enum<enums::UpdateCommand>(2, this->command);
+  buffer.encode_bool(2, this->install);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void UpdateCommandRequest::dump_to(std::string &out) const {
@@ -8791,8 +8626,8 @@ void UpdateCommandRequest::dump_to(std::string &out) const {
  out.append(buffer);
  out.append("\n");

-  out.append("  command: ");
-  out.append(proto_enum_to_string<enums::UpdateCommand>(this->command));
+  out.append("  install: ");
+  out.append(YESNO(this->install));
  out.append("\n");
  out.append("}");
 }
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -156,10 +156,6 @@ enum MediaPlayerCommand : uint32_t {
  MEDIA_PLAYER_COMMAND_MUTE = 3,
  MEDIA_PLAYER_COMMAND_UNMUTE = 4,
 };
-enum MediaPlayerFormatPurpose : uint32_t {
-  MEDIA_PLAYER_FORMAT_PURPOSE_DEFAULT = 0,
-  MEDIA_PLAYER_FORMAT_PURPOSE_ANNOUNCEMENT = 1,
-};
 enum BluetoothDeviceRequestType : uint32_t {
  BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT = 0,
  BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT = 1,
@@ -231,11 +227,6 @@ enum ValveOperation : uint32_t {
  VALVE_OPERATION_IS_OPENING = 1,
  VALVE_OPERATION_IS_CLOSING = 2,
 };
-enum UpdateCommand : uint32_t {
-  UPDATE_COMMAND_NONE = 0,
-  UPDATE_COMMAND_UPDATE = 1,
-  UPDATE_COMMAND_CHECK = 2,
-};

 }  // namespace enums

@@ -840,7 +831,6 @@ class SubscribeHomeAssistantStateResponse : public ProtoMessage {
 public:
  std::string entity_id{};
  std::string attribute{};
-  bool once{false};
  void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  void dump_to(std::string &out) const override;
@@ -848,7 +838,6 @@ class SubscribeHomeAssistantStateResponse : public ProtoMessage {

 protected:
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
 class HomeAssistantStateResponse : public ProtoMessage {
 public:
@@ -1271,21 +1260,6 @@ class ButtonCommandRequest : public ProtoMessage {
 protected:
  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
 };
-class MediaPlayerSupportedFormat : public ProtoMessage {
- public:
-  std::string format{};
-  uint32_t sample_rate{0};
-  uint32_t num_channels{0};
-  enums::MediaPlayerFormatPurpose purpose{};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
 class ListEntitiesMediaPlayerResponse : public ProtoMessage {
 public:
  std::string object_id{};
@@ -1296,7 +1270,6 @@ class ListEntitiesMediaPlayerResponse : public ProtoMessage {
  bool disabled_by_default{false};
  enums::EntityCategory entity_category{};
  bool supports_pause{false};
-  std::vector<MediaPlayerSupportedFormat> supported_formats{};
  void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  void dump_to(std::string &out) const override;
@@ -1825,29 +1798,6 @@ class VoiceAssistantTimerEventResponse : public ProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class VoiceAssistantAnnounceRequest : public ProtoMessage {
- public:
-  std::string media_id{};
-  std::string text{};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-};
-class VoiceAssistantAnnounceFinished : public ProtoMessage {
- public:
-  bool success{false};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
 class ListEntitiesAlarmControlPanelResponse : public ProtoMessage {
 public:
  std::string object_id{};
@@ -2225,7 +2175,7 @@ class UpdateStateResponse : public ProtoMessage {
 class UpdateCommandRequest : public ProtoMessage {
 public:
  uint32_t key{0};
-  enums::UpdateCommand command{};
+  bool install{false};
  void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  void dump_to(std::string &out) const override;
--- a/esphome/components/api/api_pb2_service.cpp
+++ b/esphome/components/api/api_pb2_service.cpp
@@ -486,16 +486,6 @@ bool APIServerConnectionBase::send_voice_assistant_audio(const VoiceAssistantAud
 #endif
 #ifdef USE_VOICE_ASSISTANT
 #endif
-#ifdef USE_VOICE_ASSISTANT
-#endif
-#ifdef USE_VOICE_ASSISTANT
-bool APIServerConnectionBase::send_voice_assistant_announce_finished(const VoiceAssistantAnnounceFinished &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_voice_assistant_announce_finished: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<VoiceAssistantAnnounceFinished>(msg, 120);
-}
-#endif
 #ifdef USE_ALARM_CONTROL_PANEL
 bool APIServerConnectionBase::send_list_entities_alarm_control_panel_response(
    const ListEntitiesAlarmControlPanelResponse &msg) {
@@ -1145,17 +1135,6 @@ bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      ESP_LOGVV(TAG, "on_update_command_request: %s", msg.dump().c_str());
 #endif
      this->on_update_command_request(msg);
-#endif
-      break;
-    }
-    case 119: {
-#ifdef USE_VOICE_ASSISTANT
-      VoiceAssistantAnnounceRequest msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_voice_assistant_announce_request: %s", msg.dump().c_str());
-#endif
-      this->on_voice_assistant_announce_request(msg);
 #endif
      break;
    }
--- a/esphome/components/api/api_pb2_service.h
+++ b/esphome/components/api/api_pb2_service.h
@@ -247,12 +247,6 @@ class APIServerConnectionBase : public ProtoService {
 #ifdef USE_VOICE_ASSISTANT
  virtual void on_voice_assistant_timer_event_response(const VoiceAssistantTimerEventResponse &value){};
 #endif
-#ifdef USE_VOICE_ASSISTANT
-  virtual void on_voice_assistant_announce_request(const VoiceAssistantAnnounceRequest &value){};
-#endif
-#ifdef USE_VOICE_ASSISTANT
-  bool send_voice_assistant_announce_finished(const VoiceAssistantAnnounceFinished &msg);
-#endif
 #ifdef USE_ALARM_CONTROL_PANEL
  bool send_list_entities_alarm_control_panel_response(const ListEntitiesAlarmControlPanelResponse &msg);
 #endif
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -359,18 +359,8 @@ void APIServer::subscribe_home_assistant_state(std::string entity_id, optional<s
      .entity_id = std::move(entity_id),
      .attribute = std::move(attribute),
      .callback = std::move(f),
-      .once = false,
  });
 }
-void APIServer::get_home_assistant_state(std::string entity_id, optional<std::string> attribute,
-                                         std::function<void(std::string)> f) {
-  this->state_subs_.push_back(HomeAssistantStateSubscription{
-      .entity_id = std::move(entity_id),
-      .attribute = std::move(attribute),
-      .callback = std::move(f),
-      .once = true,
-  });
-};
 const std::vector<APIServer::HomeAssistantStateSubscription> &APIServer::get_state_subs() const {
  return this->state_subs_;
 }
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -112,13 +112,10 @@ class APIServer : public Component, public Controller {
    std::string entity_id;
    optional<std::string> attribute;
    std::function<void(std::string)> callback;
-    bool once;
  };

  void subscribe_home_assistant_state(std::string entity_id, optional<std::string> attribute,
                                      std::function<void(std::string)> f);
-  void get_home_assistant_state(std::string entity_id, optional<std::string> attribute,
-                                std::function<void(std::string)> f);
  const std::vector<HomeAssistantStateSubscription> &get_state_subs() const;
  const std::vector<UserServiceDescriptor *> &get_user_services() const { return this->user_services_; }

--- a/esphome/components/atm90e26/sensor.py
+++ b/esphome/components/atm90e26/sensor.py
@@ -1,34 +1,34 @@
 import esphome.codegen as cg
-from esphome.components import sensor, spi
 import esphome.config_validation as cv
+from esphome.components import sensor, spi
 from esphome.const import (
-    CONF_CURRENT,
-    CONF_FORWARD_ACTIVE_ENERGY,
-    CONF_FREQUENCY,
    CONF_ID,
-    CONF_LINE_FREQUENCY,
+    CONF_REACTIVE_POWER,
+    CONF_VOLTAGE,
+    CONF_CURRENT,
    CONF_POWER,
    CONF_POWER_FACTOR,
-    CONF_REACTIVE_POWER,
+    CONF_FREQUENCY,
+    CONF_FORWARD_ACTIVE_ENERGY,
    CONF_REVERSE_ACTIVE_ENERGY,
-    CONF_VOLTAGE,
    DEVICE_CLASS_CURRENT,
    DEVICE_CLASS_ENERGY,
    DEVICE_CLASS_POWER,
    DEVICE_CLASS_POWER_FACTOR,
    DEVICE_CLASS_VOLTAGE,
-    ICON_CURRENT_AC,
    ICON_LIGHTBULB,
+    ICON_CURRENT_AC,
    STATE_CLASS_MEASUREMENT,
    STATE_CLASS_TOTAL_INCREASING,
-    UNIT_AMPERE,
    UNIT_HERTZ,
    UNIT_VOLT,
-    UNIT_VOLT_AMPS_REACTIVE,
+    UNIT_AMPERE,
    UNIT_WATT,
+    UNIT_VOLT_AMPS_REACTIVE,
    UNIT_WATT_HOURS,
 )

+CONF_LINE_FREQUENCY = "line_frequency"
 CONF_METER_CONSTANT = "meter_constant"
 CONF_PL_CONST = "pl_const"
 CONF_GAIN_PGA = "gain_pga"
--- a/esphome/components/atm90e32/init.py
+++ b/esphome/components/atm90e32/init.py
@@ -1,7 +0,0 @@
-import esphome.codegen as cg
-
-CODEOWNERS = ["@circuitsetup", "@descipher"]
-
-atm90e32_ns = cg.esphome_ns.namespace("atm90e32")
-
-CONF_ATM90E32_ID = "atm90e32_id"
--- a/esphome/components/atm90e32/atm90e32.cpp
+++ b/esphome/components/atm90e32/atm90e32.cpp
@@ -132,77 +132,10 @@ void ATM90E32Component::update() {
  this->status_clear_warning();
 }

-void ATM90E32Component::restore_calibrations_() {
-  if (enable_offset_calibration_) {
-    this->pref_.load(&this->offset_phase_);
-  }
-};
-
-void ATM90E32Component::run_offset_calibrations() {
-  // Run the calibrations and
-  // Setup voltage and current calibration offsets for PHASE A
-  this->offset_phase_[PHASEA].voltage_offset_ = calibrate_voltage_offset_phase(PHASEA);
-  this->phase_[PHASEA].voltage_offset_ = this->offset_phase_[PHASEA].voltage_offset_;
-  this->write16_(ATM90E32_REGISTER_UOFFSETA, this->phase_[PHASEA].voltage_offset_);  // C Voltage offset
-  this->offset_phase_[PHASEA].current_offset_ = calibrate_current_offset_phase(PHASEA);
-  this->phase_[PHASEA].current_offset_ = this->offset_phase_[PHASEA].current_offset_;
-  this->write16_(ATM90E32_REGISTER_IOFFSETA, this->phase_[PHASEA].current_offset_);  // C Current offset
-  // Setup voltage and current calibration offsets for PHASE B
-  this->offset_phase_[PHASEB].voltage_offset_ = calibrate_voltage_offset_phase(PHASEB);
-  this->phase_[PHASEB].voltage_offset_ = this->offset_phase_[PHASEB].voltage_offset_;
-  this->write16_(ATM90E32_REGISTER_UOFFSETB, this->phase_[PHASEB].voltage_offset_);  // C Voltage offset
-  this->offset_phase_[PHASEB].current_offset_ = calibrate_current_offset_phase(PHASEB);
-  this->phase_[PHASEB].current_offset_ = this->offset_phase_[PHASEB].current_offset_;
-  this->write16_(ATM90E32_REGISTER_IOFFSETB, this->phase_[PHASEB].current_offset_);  // C Current offset
-  // Setup voltage and current calibration offsets for PHASE C
-  this->offset_phase_[PHASEC].voltage_offset_ = calibrate_voltage_offset_phase(PHASEC);
-  this->phase_[PHASEC].voltage_offset_ = this->offset_phase_[PHASEC].voltage_offset_;
-  this->write16_(ATM90E32_REGISTER_UOFFSETC, this->phase_[PHASEC].voltage_offset_);  // C Voltage offset
-  this->offset_phase_[PHASEC].current_offset_ = calibrate_current_offset_phase(PHASEC);
-  this->phase_[PHASEC].current_offset_ = this->offset_phase_[PHASEC].current_offset_;
-  this->write16_(ATM90E32_REGISTER_IOFFSETC, this->phase_[PHASEC].current_offset_);  // C Current offset
-  this->pref_.save(&this->offset_phase_);
-  ESP_LOGI(TAG, "PhaseA Vo=%5d PhaseB Vo=%5d PhaseC Vo=%5d", this->offset_phase_[PHASEA].voltage_offset_,
-           this->offset_phase_[PHASEB].voltage_offset_, this->offset_phase_[PHASEC].voltage_offset_);
-  ESP_LOGI(TAG, "PhaseA Io=%5d PhaseB Io=%5d PhaseC Io=%5d", this->offset_phase_[PHASEA].current_offset_,
-           this->offset_phase_[PHASEB].current_offset_, this->offset_phase_[PHASEC].current_offset_);
-}
-
-void ATM90E32Component::clear_offset_calibrations() {
-  // Clear the calibrations and
-  this->offset_phase_[PHASEA].voltage_offset_ = 0;
-  this->phase_[PHASEA].voltage_offset_ = this->offset_phase_[PHASEA].voltage_offset_;
-  this->write16_(ATM90E32_REGISTER_UOFFSETA, this->phase_[PHASEA].voltage_offset_);  // C Voltage offset
-  this->offset_phase_[PHASEA].current_offset_ = 0;
-  this->phase_[PHASEA].current_offset_ = this->offset_phase_[PHASEA].current_offset_;
-  this->write16_(ATM90E32_REGISTER_IOFFSETA, this->phase_[PHASEA].current_offset_);  // C Current offset
-  this->offset_phase_[PHASEB].voltage_offset_ = 0;
-  this->phase_[PHASEB].voltage_offset_ = this->offset_phase_[PHASEB].voltage_offset_;
-  this->write16_(ATM90E32_REGISTER_UOFFSETB, this->phase_[PHASEB].voltage_offset_);  // C Voltage offset
-  this->offset_phase_[PHASEB].current_offset_ = 0;
-  this->phase_[PHASEB].current_offset_ = this->offset_phase_[PHASEB].current_offset_;
-  this->write16_(ATM90E32_REGISTER_IOFFSETB, this->phase_[PHASEB].current_offset_);  // C Current offset
-  this->offset_phase_[PHASEC].voltage_offset_ = 0;
-  this->phase_[PHASEC].voltage_offset_ = this->offset_phase_[PHASEC].voltage_offset_;
-  this->write16_(ATM90E32_REGISTER_UOFFSETC, this->phase_[PHASEC].voltage_offset_);  // C Voltage offset
-  this->offset_phase_[PHASEC].current_offset_ = 0;
-  this->phase_[PHASEC].current_offset_ = this->offset_phase_[PHASEC].current_offset_;
-  this->write16_(ATM90E32_REGISTER_IOFFSETC, this->phase_[PHASEC].current_offset_);  // C Current offset
-  this->pref_.save(&this->offset_phase_);
-  ESP_LOGI(TAG, "PhaseA Vo=%5d PhaseB Vo=%5d PhaseC Vo=%5d", this->offset_phase_[PHASEA].voltage_offset_,
-           this->offset_phase_[PHASEB].voltage_offset_, this->offset_phase_[PHASEC].voltage_offset_);
-  ESP_LOGI(TAG, "PhaseA Io=%5d PhaseB Io=%5d PhaseC Io=%5d", this->offset_phase_[PHASEA].current_offset_,
-           this->offset_phase_[PHASEB].current_offset_, this->offset_phase_[PHASEC].current_offset_);
-}
-
 void ATM90E32Component::setup() {
  ESP_LOGCONFIG(TAG, "Setting up ATM90E32 Component...");
  this->spi_setup();
-  if (this->enable_offset_calibration_) {
-    uint32_t hash = fnv1_hash(App.get_friendly_name());
-    this->pref_ = global_preferences->make_preference<Calibration[3]>(hash, true);
-    this->restore_calibrations_();
-  }
+
  uint16_t mmode0 = 0x87;  // 3P4W 50Hz
  if (line_freq_ == 60) {
    mmode0 |= 1 << 12;  // sets 12th bit to 1, 60Hz
@@ -234,12 +167,27 @@ void ATM90E32Component::setup() {
  this->write16_(ATM90E32_REGISTER_SSTARTTH, 0x1D4C);       // All Reactive Startup Power Threshold - 50%
  this->write16_(ATM90E32_REGISTER_PPHASETH, 0x02EE);       // Each Phase Active Phase Threshold - 0.002A/0.00032 = 750
  this->write16_(ATM90E32_REGISTER_QPHASETH, 0x02EE);       // Each phase Reactive Phase Threshold - 10%
+  // Setup voltage and current calibration offsets for PHASE A
+  this->phase_[PHASEA].voltage_offset_ = calibrate_voltage_offset_phase(PHASEA);
+  this->write16_(ATM90E32_REGISTER_UOFFSETA, this->phase_[PHASEA].voltage_offset_);  // A Voltage offset
+  this->phase_[PHASEA].current_offset_ = calibrate_current_offset_phase(PHASEA);
+  this->write16_(ATM90E32_REGISTER_IOFFSETA, this->phase_[PHASEA].current_offset_);  // A Current offset
  // Setup voltage and current gain for PHASE A
  this->write16_(ATM90E32_REGISTER_UGAINA, this->phase_[PHASEA].voltage_gain_);  // A Voltage rms gain
  this->write16_(ATM90E32_REGISTER_IGAINA, this->phase_[PHASEA].ct_gain_);       // A line current gain
+  // Setup voltage and current calibration offsets for PHASE B
+  this->phase_[PHASEB].voltage_offset_ = calibrate_voltage_offset_phase(PHASEB);
+  this->write16_(ATM90E32_REGISTER_UOFFSETB, this->phase_[PHASEB].voltage_offset_);  // B Voltage offset
+  this->phase_[PHASEB].current_offset_ = calibrate_current_offset_phase(PHASEB);
+  this->write16_(ATM90E32_REGISTER_IOFFSETB, this->phase_[PHASEB].current_offset_);  // B Current offset
  // Setup voltage and current gain for PHASE B
  this->write16_(ATM90E32_REGISTER_UGAINB, this->phase_[PHASEB].voltage_gain_);  // B Voltage rms gain
  this->write16_(ATM90E32_REGISTER_IGAINB, this->phase_[PHASEB].ct_gain_);       // B line current gain
+  // Setup voltage and current calibration offsets for PHASE C
+  this->phase_[PHASEC].voltage_offset_ = calibrate_voltage_offset_phase(PHASEC);
+  this->write16_(ATM90E32_REGISTER_UOFFSETC, this->phase_[PHASEC].voltage_offset_);  // C Voltage offset
+  this->phase_[PHASEC].current_offset_ = calibrate_current_offset_phase(PHASEC);
+  this->write16_(ATM90E32_REGISTER_IOFFSETC, this->phase_[PHASEC].current_offset_);  // C Current offset
  // Setup voltage and current gain for PHASE C
  this->write16_(ATM90E32_REGISTER_UGAINC, this->phase_[PHASEC].voltage_gain_);  // C Voltage rms gain
  this->write16_(ATM90E32_REGISTER_IGAINC, this->phase_[PHASEC].ct_gain_);       // C line current gain
--- a/esphome/components/atm90e32/atm90e32.h
+++ b/esphome/components/atm90e32/atm90e32.h
@@ -1,12 +1,9 @@
 #pragma once

-#include "atm90e32_reg.h"
+#include "esphome/core/component.h"
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/spi/spi.h"
-#include "esphome/core/application.h"
-#include "esphome/core/component.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/preferences.h"
+#include "atm90e32_reg.h"

 namespace esphome {
 namespace atm90e32 {
@@ -23,6 +20,7 @@ class ATM90E32Component : public PollingComponent,
  void dump_config() override;
  float get_setup_priority() const override;
  void update() override;
+
  void set_voltage_sensor(int phase, sensor::Sensor *obj) { this->phase_[phase].voltage_sensor_ = obj; }
  void set_current_sensor(int phase, sensor::Sensor *obj) { this->phase_[phase].current_sensor_ = obj; }
  void set_power_sensor(int phase, sensor::Sensor *obj) { this->phase_[phase].power_sensor_ = obj; }
@@ -50,11 +48,9 @@ class ATM90E32Component : public PollingComponent,
  void set_line_freq(int freq) { line_freq_ = freq; }
  void set_current_phases(int phases) { current_phases_ = phases; }
  void set_pga_gain(uint16_t gain) { pga_gain_ = gain; }
-  void run_offset_calibrations();
-  void clear_offset_calibrations();
-  void set_enable_offset_calibration(bool flag) { enable_offset_calibration_ = flag; }
  uint16_t calibrate_voltage_offset_phase(uint8_t /*phase*/);
  uint16_t calibrate_current_offset_phase(uint8_t /*phase*/);
+
  int32_t last_periodic_millis = millis();

 protected:
@@ -87,11 +83,10 @@ class ATM90E32Component : public PollingComponent,
  float get_chip_temperature_();
  bool get_publish_interval_flag_() { return publish_interval_flag_; };
  void set_publish_interval_flag_(bool flag) { publish_interval_flag_ = flag; };
-  void restore_calibrations_();

  struct ATM90E32Phase {
-    uint16_t voltage_gain_{0};
-    uint16_t ct_gain_{0};
+    uint16_t voltage_gain_{7305};
+    uint16_t ct_gain_{27961};
    uint16_t voltage_offset_{0};
    uint16_t current_offset_{0};
    float voltage_{0};
@@ -119,21 +114,13 @@ class ATM90E32Component : public PollingComponent,
    uint32_t cumulative_reverse_active_energy_{0};
  } phase_[3];

-  struct Calibration {
-    uint16_t voltage_offset_{0};
-    uint16_t current_offset_{0};
-  } offset_phase_[3];
-
-  ESPPreferenceObject pref_;
-
  sensor::Sensor *freq_sensor_{nullptr};
  sensor::Sensor *chip_temperature_sensor_{nullptr};
  uint16_t pga_gain_{0x15};
  int line_freq_{60};
  int current_phases_{3};
-  bool publish_interval_flag_{false};
+  bool publish_interval_flag_{true};
  bool peak_current_signed_{false};
-  bool enable_offset_calibration_{false};
 };

 }  // namespace atm90e32
--- a/esphome/components/atm90e32/atm90e32_reg.h
+++ b/esphome/components/atm90e32/atm90e32_reg.h
@@ -1,7 +1,5 @@
 #pragma once

-#include <cinttypes>
-
 namespace esphome {
 namespace atm90e32 {

--- a/esphome/components/atm90e32/button/init.py
+++ b/esphome/components/atm90e32/button/init.py
@@ -1,43 +0,0 @@
-import esphome.codegen as cg
-from esphome.components import button
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, ENTITY_CATEGORY_CONFIG, ICON_CHIP, ICON_SCALE
-
-from .. import atm90e32_ns
-from ..sensor import ATM90E32Component
-
-CONF_RUN_OFFSET_CALIBRATION = "run_offset_calibration"
-CONF_CLEAR_OFFSET_CALIBRATION = "clear_offset_calibration"
-
-ATM90E32CalibrationButton = atm90e32_ns.class_(
-    "ATM90E32CalibrationButton",
-    button.Button,
-)
-ATM90E32ClearCalibrationButton = atm90e32_ns.class_(
-    "ATM90E32ClearCalibrationButton",
-    button.Button,
-)
-
-CONFIG_SCHEMA = {
-    cv.GenerateID(CONF_ID): cv.use_id(ATM90E32Component),
-    cv.Optional(CONF_RUN_OFFSET_CALIBRATION): button.button_schema(
-        ATM90E32CalibrationButton,
-        entity_category=ENTITY_CATEGORY_CONFIG,
-        icon=ICON_SCALE,
-    ),
-    cv.Optional(CONF_CLEAR_OFFSET_CALIBRATION): button.button_schema(
-        ATM90E32ClearCalibrationButton,
-        entity_category=ENTITY_CATEGORY_CONFIG,
-        icon=ICON_CHIP,
-    ),
-}
-
-
-async def to_code(config):
-    parent = await cg.get_variable(config[CONF_ID])
-    if run_offset := config.get(CONF_RUN_OFFSET_CALIBRATION):
-        b = await button.new_button(run_offset)
-        await cg.register_parented(b, parent)
-    if clear_offset := config.get(CONF_CLEAR_OFFSET_CALIBRATION):
-        b = await button.new_button(clear_offset)
-        await cg.register_parented(b, parent)
--- a/esphome/components/atm90e32/button/atm90e32_button.cpp
+++ b/esphome/components/atm90e32/button/atm90e32_button.cpp
@@ -1,20 +0,0 @@
-#include "atm90e32_button.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace atm90e32 {
-
-static const char *const TAG = "atm90e32.button";
-
-void ATM90E32CalibrationButton::press_action() {
-  ESP_LOGI(TAG, "Running offset calibrations, Note: CTs and ACVs must be 0 during this process...");
-  this->parent_->run_offset_calibrations();
-}
-
-void ATM90E32ClearCalibrationButton::press_action() {
-  ESP_LOGI(TAG, "Offset calibrations cleared.");
-  this->parent_->clear_offset_calibrations();
-}
-
-}  // namespace atm90e32
-}  // namespace esphome
--- a/esphome/components/atm90e32/button/atm90e32_button.h
+++ b/esphome/components/atm90e32/button/atm90e32_button.h
@@ -1,27 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/atm90e32/atm90e32.h"
-#include "esphome/components/button/button.h"
-
-namespace esphome {
-namespace atm90e32 {
-
-class ATM90E32CalibrationButton : public button::Button, public Parented<ATM90E32Component> {
- public:
-  ATM90E32CalibrationButton() = default;
-
- protected:
-  void press_action() override;
-};
-
-class ATM90E32ClearCalibrationButton : public button::Button, public Parented<ATM90E32Component> {
- public:
-  ATM90E32ClearCalibrationButton() = default;
-
- protected:
-  void press_action() override;
-};
-
-}  // namespace atm90e32
-}  // namespace esphome
--- a/esphome/components/atm90e32/sensor.py
+++ b/esphome/components/atm90e32/sensor.py
@@ -1,22 +1,21 @@
 import esphome.codegen as cg
-from esphome.components import sensor, spi
 import esphome.config_validation as cv
+from esphome.components import sensor, spi
 from esphome.const import (
-    CONF_APPARENT_POWER,
-    CONF_CURRENT,
-    CONF_FORWARD_ACTIVE_ENERGY,
-    CONF_FREQUENCY,
    CONF_ID,
-    CONF_LINE_FREQUENCY,
+    CONF_REACTIVE_POWER,
+    CONF_VOLTAGE,
+    CONF_CURRENT,
    CONF_PHASE_A,
-    CONF_PHASE_ANGLE,
    CONF_PHASE_B,
    CONF_PHASE_C,
+    CONF_PHASE_ANGLE,
    CONF_POWER,
    CONF_POWER_FACTOR,
-    CONF_REACTIVE_POWER,
+    CONF_APPARENT_POWER,
+    CONF_FREQUENCY,
+    CONF_FORWARD_ACTIVE_ENERGY,
    CONF_REVERSE_ACTIVE_ENERGY,
-    CONF_VOLTAGE,
    DEVICE_CLASS_CURRENT,
    DEVICE_CLASS_ENERGY,
    DEVICE_CLASS_POWER,
@@ -24,13 +23,13 @@ from esphome.const import (
    DEVICE_CLASS_TEMPERATURE,
    DEVICE_CLASS_VOLTAGE,
    ENTITY_CATEGORY_DIAGNOSTIC,
-    ICON_CURRENT_AC,
    ICON_LIGHTBULB,
+    ICON_CURRENT_AC,
    STATE_CLASS_MEASUREMENT,
    STATE_CLASS_TOTAL_INCREASING,
    UNIT_AMPERE,
-    UNIT_CELSIUS,
    UNIT_DEGREES,
+    UNIT_CELSIUS,
    UNIT_HERTZ,
    UNIT_VOLT,
    UNIT_VOLT_AMPS_REACTIVE,
@@ -38,8 +37,7 @@ from esphome.const import (
    UNIT_WATT_HOURS,
 )

-from . import atm90e32_ns
-
+CONF_LINE_FREQUENCY = "line_frequency"
 CONF_CHIP_TEMPERATURE = "chip_temperature"
 CONF_GAIN_PGA = "gain_pga"
 CONF_CURRENT_PHASES = "current_phases"
@@ -48,7 +46,6 @@ CONF_GAIN_CT = "gain_ct"
 CONF_HARMONIC_POWER = "harmonic_power"
 CONF_PEAK_CURRENT = "peak_current"
 CONF_PEAK_CURRENT_SIGNED = "peak_current_signed"
-CONF_ENABLE_OFFSET_CALIBRATION = "enable_offset_calibration"
 UNIT_DEG = "degrees"
 LINE_FREQS = {
    "50HZ": 50,
@@ -64,6 +61,7 @@ PGA_GAINS = {
    "4X": 0x2A,
 }

+atm90e32_ns = cg.esphome_ns.namespace("atm90e32")
 ATM90E32Component = atm90e32_ns.class_(
    "ATM90E32Component", cg.PollingComponent, spi.SPIDevice
 )
@@ -166,7 +164,6 @@ CONFIG_SCHEMA = (
            ),
            cv.Optional(CONF_GAIN_PGA, default="2X"): cv.enum(PGA_GAINS, upper=True),
            cv.Optional(CONF_PEAK_CURRENT_SIGNED, default=False): cv.boolean,
-            cv.Optional(CONF_ENABLE_OFFSET_CALIBRATION, default=False): cv.boolean,
        }
    )
    .extend(cv.polling_component_schema("60s"))
@@ -230,4 +227,3 @@ async def to_code(config):
    cg.add(var.set_current_phases(config[CONF_CURRENT_PHASES]))
    cg.add(var.set_pga_gain(config[CONF_GAIN_PGA]))
    cg.add(var.set_peak_current_signed(config[CONF_PEAK_CURRENT_SIGNED]))
-    cg.add(var.set_enable_offset_calibration(config[CONF_ENABLE_OFFSET_CALIBRATION]))
--- a/esphome/components/bedjet/bedjet_codec.h
+++ b/esphome/components/bedjet/bedjet_codec.h
@@ -90,7 +90,7 @@ struct BedjetStatusPacket {
    int unused_6 : 1;       // 0x4
    bool is_dual_zone : 1;  /// Is part of a Dual Zone configuration
    int unused_7 : 1;       // 0x1
-  } dual_zone_flags;        // NOLINT(clang-diagnostic-unaligned-access)
+  } dual_zone_flags;

  uint8_t unused_4 : 8;  // Unknown 23-24 = 0x1310
  uint8_t unused_5 : 8;  // Unknown 23-24 = 0x1310
--- a/esphome/components/binary/light/binary_light_output.h
+++ b/esphome/components/binary/light/binary_light_output.h
@@ -18,11 +18,10 @@ class BinaryLightOutput : public light::LightOutput {
  void write_state(light::LightState *state) override {
    bool binary;
    state->current_values_as_binary(&binary);
-    if (binary) {
+    if (binary)
      this->output_->turn_on();
-    } else {
+    else
      this->output_->turn_off();
-    }
  }

 protected:
--- a/esphome/components/binary_sensor/init.py
+++ b/esphome/components/binary_sensor/init.py
@@ -1,8 +1,10 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.cpp_generator import MockObjClass
+from esphome.cpp_helpers import setup_entity
 from esphome import automation, core
 from esphome.automation import Condition, maybe_simple_id
-import esphome.codegen as cg
 from esphome.components import mqtt, web_server
-import esphome.config_validation as cv
 from esphome.const import (
    CONF_DELAY,
    CONF_DEVICE_CLASS,
@@ -14,7 +16,6 @@ from esphome.const import (
    CONF_INVERTED,
    CONF_MAX_LENGTH,
    CONF_MIN_LENGTH,
-    CONF_MQTT_ID,
    CONF_ON_CLICK,
    CONF_ON_DOUBLE_CLICK,
    CONF_ON_MULTI_CLICK,
@@ -25,6 +26,7 @@ from esphome.const import (
    CONF_STATE,
    CONF_TIMING,
    CONF_TRIGGER_ID,
+    CONF_MQTT_ID,
    CONF_WEB_SERVER_ID,
    DEVICE_CLASS_BATTERY,
    DEVICE_CLASS_BATTERY_CHARGING,
@@ -57,8 +59,6 @@ from esphome.const import (
    DEVICE_CLASS_WINDOW,
 )
 from esphome.core import CORE, coroutine_with_priority
-from esphome.cpp_generator import MockObjClass
-from esphome.cpp_helpers import setup_entity
 from esphome.util import Registry

 CODEOWNERS = ["@esphome/core"]
--- a/esphome/components/bl0906/init.py
+++ b/esphome/components/bl0906/init.py
@@ -1 +0,0 @@
-CODEOWNERS = ["@athom-tech", "@tarontop", "@jesserockz"]
--- a/esphome/components/bl0906/bl0906.cpp
+++ b/esphome/components/bl0906/bl0906.cpp
@@ -1,238 +0,0 @@
-#include "bl0906.h"
-#include "constants.h"
-
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace bl0906 {
-
-static const char *const TAG = "bl0906";
-
-constexpr uint32_t to_uint32_t(ube24_t input) { return input.h << 16 | input.m << 8 | input.l; }
-
-constexpr int32_t to_int32_t(sbe24_t input) { return input.h << 16 | input.m << 8 | input.l; }
-
-// The SUM byte is (Addr+Data_L+Data_M+Data_H)&0xFF negated;
-constexpr uint8_t bl0906_checksum(const uint8_t address, const DataPacket *data) {
-  return (address + data->l + data->m + data->h) ^ 0xFF;
-}
-
-void BL0906::loop() {
-  if (this->current_channel_ == UINT8_MAX) {
-    return;
-  }
-
-  while (this->available())
-    this->flush();
-
-  if (this->current_channel_ == 0) {
-    // Temperature
-    this->read_data_(BL0906_TEMPERATURE, BL0906_TREF, this->temperature_sensor_);
-  } else if (this->current_channel_ == 1) {
-    this->read_data_(BL0906_I_1_RMS, BL0906_IREF, this->current_1_sensor_);
-    this->read_data_(BL0906_WATT_1, BL0906_PREF, this->power_1_sensor_);
-    this->read_data_(BL0906_CF_1_CNT, BL0906_EREF, this->energy_1_sensor_);
-  } else if (this->current_channel_ == 2) {
-    this->read_data_(BL0906_I_2_RMS, BL0906_IREF, this->current_2_sensor_);
-    this->read_data_(BL0906_WATT_2, BL0906_PREF, this->power_2_sensor_);
-    this->read_data_(BL0906_CF_2_CNT, BL0906_EREF, this->energy_2_sensor_);
-  } else if (this->current_channel_ == 3) {
-    this->read_data_(BL0906_I_3_RMS, BL0906_IREF, this->current_3_sensor_);
-    this->read_data_(BL0906_WATT_3, BL0906_PREF, this->power_3_sensor_);
-    this->read_data_(BL0906_CF_3_CNT, BL0906_EREF, this->energy_3_sensor_);
-  } else if (this->current_channel_ == 4) {
-    this->read_data_(BL0906_I_4_RMS, BL0906_IREF, this->current_4_sensor_);
-    this->read_data_(BL0906_WATT_4, BL0906_PREF, this->power_4_sensor_);
-    this->read_data_(BL0906_CF_4_CNT, BL0906_EREF, this->energy_4_sensor_);
-  } else if (this->current_channel_ == 5) {
-    this->read_data_(BL0906_I_5_RMS, BL0906_IREF, this->current_5_sensor_);
-    this->read_data_(BL0906_WATT_5, BL0906_PREF, this->power_5_sensor_);
-    this->read_data_(BL0906_CF_5_CNT, BL0906_EREF, this->energy_5_sensor_);
-  } else if (this->current_channel_ == 6) {
-    this->read_data_(BL0906_I_6_RMS, BL0906_IREF, this->current_6_sensor_);
-    this->read_data_(BL0906_WATT_6, BL0906_PREF, this->power_6_sensor_);
-    this->read_data_(BL0906_CF_6_CNT, BL0906_EREF, this->energy_6_sensor_);
-  } else if (this->current_channel_ == UINT8_MAX - 2) {
-    // Frequency
-    this->read_data_(BL0906_FREQUENCY, BL0906_FREF, frequency_sensor_);
-    // Voltage
-    this->read_data_(BL0906_V_RMS, BL0906_UREF, voltage_sensor_);
-  } else if (this->current_channel_ == UINT8_MAX - 1) {
-    // Total power
-    this->read_data_(BL0906_WATT_SUM, BL0906_WATT, this->total_power_sensor_);
-    // Total Energy
-    this->read_data_(BL0906_CF_SUM_CNT, BL0906_CF, this->total_energy_sensor_);
-  } else {
-    this->current_channel_ = UINT8_MAX - 2;  // Go to frequency and voltage
-    return;
-  }
-  this->current_channel_++;
-  this->handle_actions_();
-}
-
-void BL0906::setup() {
-  while (this->available())
-    this->flush();
-  this->write_array(USR_WRPROT_WITABLE, sizeof(USR_WRPROT_WITABLE));
-  // Calibration (1: register address; 2: value before calibration; 3: value after calibration)
-  this->bias_correction_(BL0906_RMSOS_1, 0.01600, 0);  // Calibration current_1
-  this->bias_correction_(BL0906_RMSOS_2, 0.01500, 0);
-  this->bias_correction_(BL0906_RMSOS_3, 0.01400, 0);
-  this->bias_correction_(BL0906_RMSOS_4, 0.01300, 0);
-  this->bias_correction_(BL0906_RMSOS_5, 0.01200, 0);
-  this->bias_correction_(BL0906_RMSOS_6, 0.01200, 0);  // Calibration current_6
-
-  this->write_array(USR_WRPROT_ONLYREAD, sizeof(USR_WRPROT_ONLYREAD));
-}
-
-void BL0906::update() { this->current_channel_ = 0; }
-
-size_t BL0906::enqueue_action_(ActionCallbackFuncPtr function) {
-  this->action_queue_.push_back(function);
-  return this->action_queue_.size();
-}
-
-void BL0906::handle_actions_() {
-  if (this->action_queue_.empty()) {
-    return;
-  }
-  ActionCallbackFuncPtr ptr_func = nullptr;
-  for (int i = 0; i < this->action_queue_.size(); i++) {
-    ptr_func = this->action_queue_[i];
-    if (ptr_func) {
-      ESP_LOGI(TAG, "HandleActionCallback[%d]...", i);
-      (this->*ptr_func)();
-    }
-  }
-
-  while (this->available()) {
-    this->read();
-  }
-
-  this->action_queue_.clear();
-}
-
-// Reset energy
-void BL0906::reset_energy_() {
-  this->write_array(BL0906_INIT[0], 6);
-  delay(1);
-  this->flush();
-
-  ESP_LOGW(TAG, "RMSOS:%02X%02X%02X%02X%02X%02X", BL0906_INIT[0][0], BL0906_INIT[0][1], BL0906_INIT[0][2],
-           BL0906_INIT[0][3], BL0906_INIT[0][4], BL0906_INIT[0][5]);
-}
-
-// Read data
-void BL0906::read_data_(const uint8_t address, const float reference, sensor::Sensor *sensor) {
-  if (sensor == nullptr) {
-    return;
-  }
-  DataPacket buffer;
-  ube24_t data_u24;
-  sbe24_t data_s24;
-  float value = 0;
-
-  bool signed_result = reference == BL0906_TREF || reference == BL0906_WATT || reference == BL0906_PREF;
-
-  this->write_byte(BL0906_READ_COMMAND);
-  this->write_byte(address);
-  if (this->read_array((uint8_t *) &buffer, sizeof(buffer) - 1)) {
-    if (bl0906_checksum(address, &buffer) == buffer.checksum) {
-      if (signed_result) {
-        data_s24.l = buffer.l;
-        data_s24.m = buffer.m;
-        data_s24.h = buffer.h;
-      } else {
-        data_u24.l = buffer.l;
-        data_u24.m = buffer.m;
-        data_u24.h = buffer.h;
-      }
-    } else {
-      ESP_LOGW(TAG, "Junk on wire. Throwing away partial message");
-      while (read() >= 0)
-        ;
-      return;
-    }
-  }
-  // Power
-  if (reference == BL0906_PREF) {
-    value = (float) to_int32_t(data_s24) * reference;
-  }
-
-  // Total power
-  if (reference == BL0906_WATT) {
-    value = (float) to_int32_t(data_s24) * reference;
-  }
-
-  // Voltage, current, power, total power
-  if (reference == BL0906_UREF || reference == BL0906_IREF || reference == BL0906_EREF || reference == BL0906_CF) {
-    value = (float) to_uint32_t(data_u24) * reference;
-  }
-
-  // Frequency
-  if (reference == BL0906_FREF) {
-    value = reference / (float) to_uint32_t(data_u24);
-  }
-  // Chip temperature
-  if (reference == BL0906_TREF) {
-    value = (float) to_int32_t(data_s24);
-    value = (value - 64) * 12.5 / 59 - 40;
-  }
-  sensor->publish_state(value);
-}
-
-// RMS offset correction
-void BL0906::bias_correction_(uint8_t address, float measurements, float correction) {
-  DataPacket data;
-  float ki = 12875 * 1 * (5.1 + 5.1) * 1000 / 2000 / 1.097;  // Current coefficient
-  float i_rms0 = measurements * ki;
-  float i_rms = correction * ki;
-  int32_t value = (i_rms * i_rms - i_rms0 * i_rms0) / 256;
-  data.l = value << 24 >> 24;
-  data.m = value << 16 >> 24;
-  if (value < 0) {
-    data.h = (value << 8 >> 24) | 0b10000000;
-  }
-  data.address = bl0906_checksum(address, &data);
-  ESP_LOGV(TAG, "RMSOS:%02X%02X%02X%02X%02X%02X", BL0906_WRITE_COMMAND, address, data.l, data.m, data.h, data.address);
-  this->write_byte(BL0906_WRITE_COMMAND);
-  this->write_byte(address);
-  this->write_byte(data.l);
-  this->write_byte(data.m);
-  this->write_byte(data.h);
-  this->write_byte(data.address);
-}
-
-void BL0906::dump_config() {
-  ESP_LOGCONFIG(TAG, "BL0906:");
-  LOG_SENSOR("  ", "Voltage", this->voltage_sensor_);
-
-  LOG_SENSOR("  ", "Current1", this->current_1_sensor_);
-  LOG_SENSOR("  ", "Current2", this->current_2_sensor_);
-  LOG_SENSOR("  ", "Current3", this->current_3_sensor_);
-  LOG_SENSOR("  ", "Current4", this->current_4_sensor_);
-  LOG_SENSOR("  ", "Current5", this->current_5_sensor_);
-  LOG_SENSOR("  ", "Current6", this->current_6_sensor_);
-
-  LOG_SENSOR("  ", "Power1", this->power_1_sensor_);
-  LOG_SENSOR("  ", "Power2", this->power_2_sensor_);
-  LOG_SENSOR("  ", "Power3", this->power_3_sensor_);
-  LOG_SENSOR("  ", "Power4", this->power_4_sensor_);
-  LOG_SENSOR("  ", "Power5", this->power_5_sensor_);
-  LOG_SENSOR("  ", "Power6", this->power_6_sensor_);
-
-  LOG_SENSOR("  ", "Energy1", this->energy_1_sensor_);
-  LOG_SENSOR("  ", "Energy2", this->energy_2_sensor_);
-  LOG_SENSOR("  ", "Energy3", this->energy_3_sensor_);
-  LOG_SENSOR("  ", "Energy4", this->energy_4_sensor_);
-  LOG_SENSOR("  ", "Energy5", this->energy_5_sensor_);
-  LOG_SENSOR("  ", "Energy6", this->energy_6_sensor_);
-
-  LOG_SENSOR("  ", "Total Power", this->total_power_sensor_);
-  LOG_SENSOR("  ", "Total Energy", this->total_energy_sensor_);
-  LOG_SENSOR("  ", "Frequency", this->frequency_sensor_);
-  LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
-}
-
-}  // namespace bl0906
-}  // namespace esphome
--- a/esphome/components/bl0906/bl0906.h
+++ b/esphome/components/bl0906/bl0906.h
@@ -1,96 +0,0 @@
-#pragma once
-
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/uart/uart.h"
-#include "esphome/core/automation.h"
-#include "esphome/core/component.h"
-#include "esphome/core/datatypes.h"
-
-// https://www.belling.com.cn/media/file_object/bel_product/BL0906/datasheet/BL0906_V1.02_cn.pdf
-// https://www.belling.com.cn/media/file_object/bel_product/BL0906/guide/BL0906%20APP%20Note_V1.02.pdf
-
-namespace esphome {
-namespace bl0906 {
-
-struct DataPacket {  // NOLINT(altera-struct-pack-align)
-  uint8_t l{0};
-  uint8_t m{0};
-  uint8_t h{0};
-  uint8_t checksum;  // checksum
-  uint8_t address;
-} __attribute__((packed));
-
-struct ube24_t {  // NOLINT(readability-identifier-naming,altera-struct-pack-align)
-  uint8_t l{0};
-  uint8_t m{0};
-  uint8_t h{0};
-} __attribute__((packed));
-
-struct sbe24_t {  // NOLINT(readability-identifier-naming,altera-struct-pack-align)
-  uint8_t l{0};
-  uint8_t m{0};
-  int8_t h{0};
-} __attribute__((packed));
-
-template<typename... Ts> class ResetEnergyAction;
-
-class BL0906;
-
-using ActionCallbackFuncPtr = void (BL0906::*)();
-
-class BL0906 : public PollingComponent, public uart::UARTDevice {
-  SUB_SENSOR(voltage)
-  SUB_SENSOR(current_1)
-  SUB_SENSOR(current_2)
-  SUB_SENSOR(current_3)
-  SUB_SENSOR(current_4)
-  SUB_SENSOR(current_5)
-  SUB_SENSOR(current_6)
-  SUB_SENSOR(power_1)
-  SUB_SENSOR(power_2)
-  SUB_SENSOR(power_3)
-  SUB_SENSOR(power_4)
-  SUB_SENSOR(power_5)
-  SUB_SENSOR(power_6)
-  SUB_SENSOR(total_power)
-  SUB_SENSOR(energy_1)
-  SUB_SENSOR(energy_2)
-  SUB_SENSOR(energy_3)
-  SUB_SENSOR(energy_4)
-  SUB_SENSOR(energy_5)
-  SUB_SENSOR(energy_6)
-  SUB_SENSOR(total_energy)
-  SUB_SENSOR(frequency)
-  SUB_SENSOR(temperature)
-
- public:
-  void loop() override;
-
-  void update() override;
-  void setup() override;
-  void dump_config() override;
-
- protected:
-  template<typename... Ts> friend class ResetEnergyAction;
-
-  void reset_energy_();
-
-  void read_data_(uint8_t address, float reference, sensor::Sensor *sensor);
-
-  void bias_correction_(uint8_t address, float measurements, float correction);
-
-  uint8_t current_channel_{0};
-  size_t enqueue_action_(ActionCallbackFuncPtr function);
-  void handle_actions_();
-
- private:
-  std::vector<ActionCallbackFuncPtr> action_queue_{};
-};
-
-template<typename... Ts> class ResetEnergyAction : public Action<Ts...>, public Parented<BL0906> {
- public:
-  void play(Ts... x) override { this->parent_->enqueue_action_(&BL0906::reset_energy_); }
-};
-
-}  // namespace bl0906
-}  // namespace esphome
--- a/esphome/components/bl0906/const.py
+++ b/esphome/components/bl0906/const.py
@@ -1,4 +0,0 @@
-# const.py
-ICON_ENERGY = "mdi:lightning-bolt"
-ICON_FREQUENCY = "mdi:cosine-wave"
-ICON_VOLTAGE = "mdi:sine-wave"
--- a/esphome/components/bl0906/constants.h
+++ b/esphome/components/bl0906/constants.h
@@ -1,122 +0,0 @@
-#pragma once
-#include <cstdint>
-
-namespace esphome {
-namespace bl0906 {
-
-// Total power conversion
-static const float BL0906_WATT = 16 * 1.097 * 1.097 * (20000 + 20000 + 20000 + 20000 + 20000) /
-                                 (40.41259 * ((5.1 + 5.1) * 1000 / 2000) * 1 * 100 * 1 * 1000);
-// Total Energy conversion
-static const float BL0906_CF = 16 * 4194304 * 0.032768 * 16 /
-                               (3600000 * 16 *
-                                (40.4125 * ((5.1 + 5.1) * 1000 / 2000) * 1 * 100 * 1 * 1000 /
-                                 (1.097 * 1.097 * (20000 + 20000 + 20000 + 20000 + 20000))));
-// Frequency conversion
-static const float BL0906_FREF = 10000000;
-// Temperature conversion
-static const float BL0906_TREF = 12.5 / 59 - 40;
-// Current conversion
-static const float BL0906_IREF = 1.097 / (12875 * 1 * (5.1 + 5.1) * 1000 / 2000);
-// Voltage conversion
-static const float BL0906_UREF = 1.097 * (20000 + 20000 + 20000 + 20000 + 20000) / (13162 * 1 * 100 * 1000);
-// Power conversion
-static const float BL0906_PREF = 1.097 * 1.097 * (20000 + 20000 + 20000 + 20000 + 20000) /
-                                 (40.41259 * ((5.1 + 5.1) * 1000 / 2000) * 1 * 100 * 1 * 1000);
-// Energy conversion
-static const float BL0906_EREF = 4194304 * 0.032768 * 16 /
-                                 (3600000 * 16 *
-                                  (40.4125 * ((5.1 + 5.1) * 1000 / 2000) * 1 * 100 * 1 * 1000 /
-                                   (1.097 * 1.097 * (20000 + 20000 + 20000 + 20000 + 20000))));
-// Current coefficient
-static const float BL0906_KI = 12875 * 1 * (5.1 + 5.1) * 1000 / 2000 / 1.097;
-// Power coefficient
-static const float BL0906_KP = 40.4125 * ((5.1 + 5.1) * 1000 / 2000) * 1 * 100 * 1 * 1000 / 1.097 / 1.097 /
-                               (20000 + 20000 + 20000 + 20000 + 20000);
-
-static const uint8_t USR_WRPROT_WITABLE[6] = {0xCA, 0x9E, 0x55, 0x55, 0x00, 0xB7};
-static const uint8_t USR_WRPROT_ONLYREAD[6] = {0xCA, 0x9E, 0x00, 0x00, 0x00, 0x61};
-
-static const uint8_t BL0906_READ_COMMAND = 0x35;
-static const uint8_t BL0906_WRITE_COMMAND = 0xCA;
-
-// Register address
-// Voltage
-static const uint8_t BL0906_V_RMS = 0x16;
-
-// Total power
-static const uint8_t BL0906_WATT_SUM = 0X2C;
-
-// Current1~6
-static const uint8_t BL0906_I_1_RMS = 0x0D;  // current_1
-static const uint8_t BL0906_I_2_RMS = 0x0E;
-static const uint8_t BL0906_I_3_RMS = 0x0F;
-static const uint8_t BL0906_I_4_RMS = 0x10;
-static const uint8_t BL0906_I_5_RMS = 0x13;
-static const uint8_t BL0906_I_6_RMS = 0x14;  // current_6
-
-// Power1~6
-static const uint8_t BL0906_WATT_1 = 0X23;  // power_1
-static const uint8_t BL0906_WATT_2 = 0X24;
-static const uint8_t BL0906_WATT_3 = 0X25;
-static const uint8_t BL0906_WATT_4 = 0X26;
-static const uint8_t BL0906_WATT_5 = 0X29;
-static const uint8_t BL0906_WATT_6 = 0X2A;  // power_6
-
-// Active pulse count, unsigned
-static const uint8_t BL0906_CF_1_CNT = 0X30;  // Channel_1
-static const uint8_t BL0906_CF_2_CNT = 0X31;
-static const uint8_t BL0906_CF_3_CNT = 0X32;
-static const uint8_t BL0906_CF_4_CNT = 0X33;
-static const uint8_t BL0906_CF_5_CNT = 0X36;
-static const uint8_t BL0906_CF_6_CNT = 0X37;  // Channel_6
-
-// Total active pulse count, unsigned
-static const uint8_t BL0906_CF_SUM_CNT = 0X39;
-
-// Voltage frequency cycle
-static const uint8_t BL0906_FREQUENCY = 0X4E;
-
-// Internal temperature
-static const uint8_t BL0906_TEMPERATURE = 0X5E;
-
-// Calibration register
-// RMS gain adjustment register
-static const uint8_t BL0906_RMSGN_1 = 0x6D;  // Channel_1
-static const uint8_t BL0906_RMSGN_2 = 0x6E;
-static const uint8_t BL0906_RMSGN_3 = 0x6F;
-static const uint8_t BL0906_RMSGN_4 = 0x70;
-static const uint8_t BL0906_RMSGN_5 = 0x73;
-static const uint8_t BL0906_RMSGN_6 = 0x74;  // Channel_6
-
-// RMS offset correction register
-static const uint8_t BL0906_RMSOS_1 = 0x78;  // Channel_1
-static const uint8_t BL0906_RMSOS_2 = 0x79;
-static const uint8_t BL0906_RMSOS_3 = 0x7A;
-static const uint8_t BL0906_RMSOS_4 = 0x7B;
-static const uint8_t BL0906_RMSOS_5 = 0x7E;
-static const uint8_t BL0906_RMSOS_6 = 0x7F;  // Channel_6
-
-// Active power gain adjustment register
-static const uint8_t BL0906_WATTGN_1 = 0xB7;  // Channel_1
-static const uint8_t BL0906_WATTGN_2 = 0xB8;
-static const uint8_t BL0906_WATTGN_3 = 0xB9;
-static const uint8_t BL0906_WATTGN_4 = 0xBA;
-static const uint8_t BL0906_WATTGN_5 = 0xBD;
-static const uint8_t BL0906_WATTGN_6 = 0xBE;  // Channel_6
-
-// User write protection setting register,
-// You must first write 0x5555 to the write protection setting register before writing to other registers.
-static const uint8_t BL0906_USR_WRPROT = 0x9E;
-
-// Reset Register
-static const uint8_t BL0906_SOFT_RESET = 0x9F;
-
-const uint8_t BL0906_INIT[2][6] = {
-    // Reset to default
-    {BL0906_WRITE_COMMAND, BL0906_SOFT_RESET, 0x5A, 0x5A, 0x5A, 0x52},
-    // Enable User Operation Write
-    {BL0906_WRITE_COMMAND, BL0906_USR_WRPROT, 0x55, 0x55, 0x00, 0xB7}};
-
-}  // namespace bl0906
-}  // namespace esphome
--- a/esphome/components/bl0906/sensor.py
+++ b/esphome/components/bl0906/sensor.py
@@ -1,184 +0,0 @@
-from esphome import automation
-from esphome.automation import maybe_simple_id
-import esphome.codegen as cg
-from esphome.components import sensor, uart
-import esphome.config_validation as cv
-from esphome.const import (
-    CONF_CHANNEL,
-    CONF_CURRENT,
-    CONF_ENERGY,
-    CONF_FREQUENCY,
-    CONF_ID,
-    CONF_NAME,
-    CONF_POWER,
-    CONF_TEMPERATURE,
-    CONF_TOTAL_POWER,
-    CONF_VOLTAGE,
-    DEVICE_CLASS_CURRENT,
-    DEVICE_CLASS_ENERGY,
-    DEVICE_CLASS_FREQUENCY,
-    DEVICE_CLASS_POWER,
-    DEVICE_CLASS_TEMPERATURE,
-    DEVICE_CLASS_VOLTAGE,
-    ICON_CURRENT_AC,
-    ICON_POWER,
-    ICON_THERMOMETER,
-    STATE_CLASS_MEASUREMENT,
-    STATE_CLASS_TOTAL_INCREASING,
-    UNIT_AMPERE,
-    UNIT_CELSIUS,
-    UNIT_HERTZ,
-    UNIT_KILOWATT_HOURS,
-    UNIT_VOLT,
-    UNIT_WATT,
-)
-
-# Import ICONS not included in esphome's const.py, from the local components const.py
-from .const import ICON_ENERGY, ICON_FREQUENCY, ICON_VOLTAGE
-
-DEPENDENCIES = ["uart"]
-AUTO_LOAD = ["bl0906"]
-CONF_TOTAL_ENERGY = "total_energy"
-
-bl0906_ns = cg.esphome_ns.namespace("bl0906")
-BL0906 = bl0906_ns.class_("BL0906", cg.PollingComponent, uart.UARTDevice)
-ResetEnergyAction = bl0906_ns.class_("ResetEnergyAction", automation.Action)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(BL0906),
-            cv.Optional(CONF_FREQUENCY): sensor.sensor_schema(
-                icon=ICON_FREQUENCY,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_FREQUENCY,
-                unit_of_measurement=UNIT_HERTZ,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
-                icon=ICON_THERMOMETER,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_TEMPERATURE,
-                unit_of_measurement=UNIT_CELSIUS,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(
-                icon=ICON_VOLTAGE,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_VOLTAGE,
-                unit_of_measurement=UNIT_VOLT,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_TOTAL_POWER): sensor.sensor_schema(
-                icon=ICON_POWER,
-                accuracy_decimals=3,
-                device_class=DEVICE_CLASS_POWER,
-                unit_of_measurement=UNIT_WATT,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_TOTAL_ENERGY): sensor.sensor_schema(
-                icon=ICON_ENERGY,
-                accuracy_decimals=3,
-                device_class=DEVICE_CLASS_ENERGY,
-                state_class=STATE_CLASS_TOTAL_INCREASING,
-                unit_of_measurement=UNIT_KILOWATT_HOURS,
-            ),
-        }
-    )
-    .extend(
-        cv.Schema(
-            {
-                cv.Optional(f"{CONF_CHANNEL}_{i + 1}"): cv.Schema(
-                    {
-                        cv.Optional(CONF_CURRENT): cv.maybe_simple_value(
-                            sensor.sensor_schema(
-                                icon=ICON_CURRENT_AC,
-                                accuracy_decimals=3,
-                                device_class=DEVICE_CLASS_CURRENT,
-                                unit_of_measurement=UNIT_AMPERE,
-                                state_class=STATE_CLASS_MEASUREMENT,
-                            ),
-                            key=CONF_NAME,
-                        ),
-                        cv.Optional(CONF_POWER): cv.maybe_simple_value(
-                            sensor.sensor_schema(
-                                icon=ICON_POWER,
-                                accuracy_decimals=0,
-                                device_class=DEVICE_CLASS_POWER,
-                                unit_of_measurement=UNIT_WATT,
-                                state_class=STATE_CLASS_MEASUREMENT,
-                            ),
-                            key=CONF_NAME,
-                        ),
-                        cv.Optional(CONF_ENERGY): cv.maybe_simple_value(
-                            sensor.sensor_schema(
-                                icon=ICON_ENERGY,
-                                accuracy_decimals=3,
-                                device_class=DEVICE_CLASS_ENERGY,
-                                unit_of_measurement=UNIT_KILOWATT_HOURS,
-                                state_class=STATE_CLASS_TOTAL_INCREASING,
-                            ),
-                            key=CONF_NAME,
-                        ),
-                    }
-                )
-                for i in range(6)
-            }
-        )
-    )
-    .extend(uart.UART_DEVICE_SCHEMA)
-    .extend(cv.polling_component_schema("60s"))
-)
-
-FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
-    "bl0906", baud_rate=19200, require_tx=True, require_rx=True
-)
-
-
-@automation.register_action(
-    "bl0906.reset_energy",
-    ResetEnergyAction,
-    maybe_simple_id(
-        {
-            cv.Required(CONF_ID): cv.use_id(BL0906),
-        }
-    ),
-)
-async def reset_energy_to_code(config, action_id, template_arg, args):
-    paren = await cg.get_variable(config[CONF_ID])
-    return cg.new_Pvariable(action_id, template_arg, paren)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await uart.register_uart_device(var, config)
-    if frequency_config := config.get(CONF_FREQUENCY):
-        sens = await sensor.new_sensor(frequency_config)
-        cg.add(var.set_frequency_sensor(sens))
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature_sensor(sens))
-    if voltage_config := config.get(CONF_VOLTAGE):
-        sens = await sensor.new_sensor(voltage_config)
-        cg.add(var.set_voltage_sensor(sens))
-
-    for i in range(6):
-        if channel_config := config.get(f"{CONF_CHANNEL}_{i + 1}"):
-            if current_config := channel_config.get(CONF_CURRENT):
-                sens = await sensor.new_sensor(current_config)
-                cg.add(getattr(var, f"set_current_{i + 1}_sensor")(sens))
-            if power_config := channel_config.get(CONF_POWER):
-                sens = await sensor.new_sensor(power_config)
-                cg.add(getattr(var, f"set_power_{i + 1}_sensor")(sens))
-            if energy_config := channel_config.get(CONF_ENERGY):
-                sens = await sensor.new_sensor(energy_config)
-                cg.add(getattr(var, f"set_energy_{i + 1}_sensor")(sens))
-
-    if total_power_config := config.get(CONF_TOTAL_POWER):
-        sens = await sensor.new_sensor(total_power_config)
-        cg.add(var.set_total_power_sensor(sens))
-
-    if total_energy_config := config.get(CONF_TOTAL_ENERGY):
-        sens = await sensor.new_sensor(total_energy_config)
-        cg.add(var.set_total_energy_sensor(sens))
--- a/esphome/components/bl0942/init.py
+++ b/esphome/components/bl0942/init.py
@@ -1 +1 @@
-CODEOWNERS = ["@dbuezas", "@dwmw2"]
+CODEOWNERS = ["@dbuezas"]
--- a/esphome/components/bl0942/bl0942.cpp
+++ b/esphome/components/bl0942/bl0942.cpp
@@ -2,8 +2,6 @@
 #include "esphome/core/log.h"
 #include <cinttypes>

-// Datasheet: https://www.belling.com.cn/media/file_object/bel_product/BL0942/datasheet/BL0942_V1.06_en.pdf
-
 namespace esphome {
 namespace bl0942 {

@@ -14,64 +12,43 @@ static const uint8_t BL0942_FULL_PACKET = 0xAA;
 static const uint8_t BL0942_PACKET_HEADER = 0x55;

 static const uint8_t BL0942_WRITE_COMMAND = 0xA8;
-
-static const uint8_t BL0942_REG_I_RMSOS = 0x12;
-static const uint8_t BL0942_REG_WA_CREEP = 0x14;
-static const uint8_t BL0942_REG_I_FAST_RMS_TH = 0x15;
-static const uint8_t BL0942_REG_I_FAST_RMS_CYC = 0x16;
-static const uint8_t BL0942_REG_FREQ_CYC = 0x17;
-static const uint8_t BL0942_REG_OT_FUNX = 0x18;
-static const uint8_t BL0942_REG_MODE = 0x19;
-static const uint8_t BL0942_REG_SOFT_RESET = 0x1C;
-static const uint8_t BL0942_REG_USR_WRPROT = 0x1D;
+static const uint8_t BL0942_REG_I_FAST_RMS_CTRL = 0x10;
+static const uint8_t BL0942_REG_MODE = 0x18;
+static const uint8_t BL0942_REG_SOFT_RESET = 0x19;
+static const uint8_t BL0942_REG_USR_WRPROT = 0x1A;
 static const uint8_t BL0942_REG_TPS_CTRL = 0x1B;

-static const uint32_t BL0942_REG_MODE_RESV = 0x03;
-static const uint32_t BL0942_REG_MODE_CF_EN = 0x04;
-static const uint32_t BL0942_REG_MODE_RMS_UPDATE_SEL = 0x08;
-static const uint32_t BL0942_REG_MODE_FAST_RMS_SEL = 0x10;
-static const uint32_t BL0942_REG_MODE_AC_FREQ_SEL = 0x20;
-static const uint32_t BL0942_REG_MODE_CF_CNT_CLR_SEL = 0x40;
-static const uint32_t BL0942_REG_MODE_CF_CNT_ADD_SEL = 0x80;
-static const uint32_t BL0942_REG_MODE_UART_RATE_19200 = 0x200;
-static const uint32_t BL0942_REG_MODE_UART_RATE_38400 = 0x300;
-static const uint32_t BL0942_REG_MODE_DEFAULT =
-    BL0942_REG_MODE_RESV | BL0942_REG_MODE_CF_EN | BL0942_REG_MODE_CF_CNT_ADD_SEL;
-
-static const uint32_t BL0942_REG_SOFT_RESET_MAGIC = 0x5a5a5a;
-static const uint32_t BL0942_REG_USR_WRPROT_MAGIC = 0x55;
-
-// 23-byte packet, 11 bits per byte, 2400 baud: about 105ms
-static const uint32_t PKT_TIMEOUT_MS = 200;
+// TODO: Confirm insialisation works as intended
+const uint8_t BL0942_INIT[5][6] = {
+    // Reset to default
+    {BL0942_WRITE_COMMAND, BL0942_REG_SOFT_RESET, 0x5A, 0x5A, 0x5A, 0x38},
+    // Enable User Operation Write
+    {BL0942_WRITE_COMMAND, BL0942_REG_USR_WRPROT, 0x55, 0x00, 0x00, 0xF0},
+    // 0x0100 = CF_UNABLE energy pulse, AC_FREQ_SEL 50Hz, RMS_UPDATE_SEL 800mS
+    {BL0942_WRITE_COMMAND, BL0942_REG_MODE, 0x00, 0x10, 0x00, 0x37},
+    // 0x47FF = Over-current and leakage alarm on, Automatic temperature measurement, Interval 100mS
+    {BL0942_WRITE_COMMAND, BL0942_REG_TPS_CTRL, 0xFF, 0x47, 0x00, 0xFE},
+    // 0x181C = Half cycle, Fast RMS threshold 6172
+    {BL0942_WRITE_COMMAND, BL0942_REG_I_FAST_RMS_CTRL, 0x1C, 0x18, 0x00, 0x1B}};

 void BL0942::loop() {
  DataPacket buffer;
-  int avail = this->available();
-
-  if (!avail) {
+  if (!this->available()) {
    return;
  }
-  if (avail < sizeof(buffer)) {
-    if (!this->rx_start_) {
-      this->rx_start_ = millis();
-    } else if (millis() > this->rx_start_ + PKT_TIMEOUT_MS) {
-      ESP_LOGW(TAG, "Junk on wire. Throwing away partial message (%d bytes)", avail);
-      this->read_array((uint8_t *) &buffer, avail);
-      this->rx_start_ = 0;
+  if (read_array((uint8_t *) &buffer, sizeof(buffer))) {
+    if (validate_checksum(&buffer)) {
+      received_package_(&buffer);
    }
-    return;
+  } else {
+    ESP_LOGW(TAG, "Junk on wire. Throwing away partial message");
+    while (read() >= 0)
+      ;
  }
-
-  if (this->read_array((uint8_t *) &buffer, sizeof(buffer))) {
-    if (this->validate_checksum_(&buffer)) {
-      this->received_package_(&buffer);
-    }
-  }
-  this->rx_start_ = 0;
 }

-bool BL0942::validate_checksum_(DataPacket *data) {
-  uint8_t checksum = BL0942_READ_COMMAND | this->address_;
+bool BL0942::validate_checksum(DataPacket *data) {
+  uint8_t checksum = BL0942_READ_COMMAND;
  // Whole package but checksum
  uint8_t *raw = (uint8_t *) data;
  for (uint32_t i = 0; i < sizeof(*data) - 1; i++) {
@@ -84,73 +61,17 @@ bool BL0942::validate_checksum_(DataPacket *data) {
  return checksum == data->checksum;
 }

-void BL0942::write_reg_(uint8_t reg, uint32_t val) {
-  uint8_t pkt[6];
-
-  this->flush();
-  pkt[0] = BL0942_WRITE_COMMAND | this->address_;
-  pkt[1] = reg;
-  pkt[2] = (val & 0xff);
-  pkt[3] = (val >> 8) & 0xff;
-  pkt[4] = (val >> 16) & 0xff;
-  pkt[5] = (pkt[0] + pkt[1] + pkt[2] + pkt[3] + pkt[4]) ^ 0xff;
-  this->write_array(pkt, 6);
-  delay(1);
-}
-
-int BL0942::read_reg_(uint8_t reg) {
-  union {
-    uint8_t b[4];
-    uint32_le_t le32;
-  } resp;
-
-  this->write_byte(BL0942_READ_COMMAND | this->address_);
-  this->write_byte(reg);
-  this->flush();
-  if (this->read_array(resp.b, 4) &&
-      resp.b[3] ==
-          (uint8_t) ((BL0942_READ_COMMAND + this->address_ + reg + resp.b[0] + resp.b[1] + resp.b[2]) ^ 0xff)) {
-    resp.b[3] = 0;
-    return resp.le32;
-  }
-  return -1;
-}
-
 void BL0942::update() {
-  this->write_byte(BL0942_READ_COMMAND | this->address_);
+  this->flush();
+  this->write_byte(BL0942_READ_COMMAND);
  this->write_byte(BL0942_FULL_PACKET);
 }

 void BL0942::setup() {
-  // If either current or voltage references are set explicitly by the user,
-  // calculate the power reference from it unless that is also explicitly set.
-  if ((this->current_reference_set_ || this->voltage_reference_set_) && !this->power_reference_set_) {
-    this->power_reference_ = (this->voltage_reference_ * this->current_reference_ * 3537.0 / 305978.0) / 73989.0;
-    this->power_reference_set_ = true;
+  for (auto *i : BL0942_INIT) {
+    this->write_array(i, 6);
+    delay(1);
  }
-
-  // Similarly for energy reference, if the power reference was set by the user
-  // either implicitly or explicitly.
-  if (this->power_reference_set_ && !this->energy_reference_set_) {
-    this->energy_reference_ = this->power_reference_ * 3600000 / 419430.4;
-    this->energy_reference_set_ = true;
-  }
-
-  this->write_reg_(BL0942_REG_USR_WRPROT, BL0942_REG_USR_WRPROT_MAGIC);
-  if (this->reset_)
-    this->write_reg_(BL0942_REG_SOFT_RESET, BL0942_REG_SOFT_RESET_MAGIC);
-
-  uint32_t mode = BL0942_REG_MODE_DEFAULT;
-  mode |= BL0942_REG_MODE_RMS_UPDATE_SEL; /* 800ms refresh time */
-  if (this->line_freq_ == LINE_FREQUENCY_60HZ)
-    mode |= BL0942_REG_MODE_AC_FREQ_SEL;
-  this->write_reg_(BL0942_REG_MODE, mode);
-
-  this->write_reg_(BL0942_REG_USR_WRPROT, 0);
-
-  if (this->read_reg_(BL0942_REG_MODE) != mode)
-    this->status_set_warning("BL0942 setup failed!");
-
  this->flush();
 }

@@ -161,17 +82,10 @@ void BL0942::received_package_(DataPacket *data) {
    return;
  }

-  // cf_cnt is only 24 bits, so track overflows
-  uint32_t cf_cnt = (uint24_t) data->cf_cnt;
-  cf_cnt |= this->prev_cf_cnt_ & 0xff000000;
-  if (cf_cnt < this->prev_cf_cnt_) {
-    cf_cnt += 0x1000000;
-  }
-  this->prev_cf_cnt_ = cf_cnt;
-
  float v_rms = (uint24_t) data->v_rms / voltage_reference_;
  float i_rms = (uint24_t) data->i_rms / current_reference_;
  float watt = (int24_t) data->watt / power_reference_;
+  uint32_t cf_cnt = (uint24_t) data->cf_cnt;
  float total_energy_consumption = cf_cnt / energy_reference_;
  float frequency = 1000000.0f / data->frequency;

@@ -190,25 +104,18 @@ void BL0942::received_package_(DataPacket *data) {
  if (frequency_sensor_ != nullptr) {
    frequency_sensor_->publish_state(frequency);
  }
-  this->status_clear_warning();
+
  ESP_LOGV(TAG, "BL0942: U %fV, I %fA, P %fW, Cnt %" PRId32 ", ∫P %fkWh, frequency %fHz, status 0x%08X", v_rms, i_rms,
           watt, cf_cnt, total_energy_consumption, frequency, data->status);
 }

 void BL0942::dump_config() {  // NOLINT(readability-function-cognitive-complexity)
  ESP_LOGCONFIG(TAG, "BL0942:");
-  ESP_LOGCONFIG(TAG, "  Reset: %s", TRUEFALSE(this->reset_));
-  ESP_LOGCONFIG(TAG, "  Address: %d", this->address_);
-  ESP_LOGCONFIG(TAG, "  Nominal line frequency: %d Hz", this->line_freq_);
-  ESP_LOGCONFIG(TAG, "  Current reference: %f", this->current_reference_);
-  ESP_LOGCONFIG(TAG, "  Energy reference: %f", this->energy_reference_);
-  ESP_LOGCONFIG(TAG, "  Power reference: %f", this->power_reference_);
-  ESP_LOGCONFIG(TAG, "  Voltage reference: %f", this->voltage_reference_);
  LOG_SENSOR("", "Voltage", this->voltage_sensor_);
  LOG_SENSOR("", "Current", this->current_sensor_);
  LOG_SENSOR("", "Power", this->power_sensor_);
  LOG_SENSOR("", "Energy", this->energy_sensor_);
-  LOG_SENSOR("", "Frequency", this->frequency_sensor_);
+  LOG_SENSOR("", "frequency", this->frequency_sensor_);
 }

 }  // namespace bl0942
--- a/esphome/components/bl0942/bl0942.h
+++ b/esphome/components/bl0942/bl0942.h
@@ -8,57 +8,6 @@
 namespace esphome {
 namespace bl0942 {

-// The BL0942 IC is "calibration-free", which means that it doesn't care
-// at all about calibration, and that's left to software. It measures a
-// voltage differential on its IP/IN pins which linearly proportional to
-// the current flow, and another on its VP pin which is proportional to
-// the line voltage. It never knows the actual calibration; the values
-// it reports are solely in terms of those inputs.
-//
-// The datasheet refers to the input voltages as I(A) and V(V), both
-// in millivolts. It measures them against a reference voltage Vref,
-// which is typically 1.218V (but that absolute value is meaningless
-// without the actual calibration anyway).
-//
-// The reported I_RMS value is 305978 I(A)/Vref, and the reported V_RMS
-// value is 73989 V(V)/Vref. So we can calibrate those by applying a
-// simple meter with a resistive load.
-//
-// The chip also measures the phase difference between voltage and
-// current, and uses it to calculate the power factor (cos φ). It
-// reports the WATT value of 3537 * I_RMS * V_RMS * cos φ).
-//
-// It also integrates total energy based on the WATT value. The time for
-// one CF_CNT pulse is 1638.4*256 / WATT.
-//
-// So... how do we calibrate that?
-//
-// Using a simple resistive load and an external meter, we can measure
-// the true voltage and current for a given V_RMS and I_RMS reading,
-// to calculate BL0942_UREF and BL0942_IREF. Those are in units of
-// "305978 counts per amp" or "73989 counts per volt" respectively.
-//
-// We can derive BL0942_PREF from those. Let's eliminate the weird
-// factors and express the calibration in plain counts per volt/amp:
-// UREF1 = UREF/73989, IREF1 = IREF/305978.
-//
-// Next... the true power in Watts is V * I * cos φ, so that's equal
-// to WATT/3537 * IREF1 * UREF1. Which means
-// BL0942_PREF = BL0942_UREF * BL0942_IREF * 3537 / 305978 / 73989.
-//
-// Finally the accumulated energy. The period of a CF_CNT count is
-// 1638.4*256 / WATT seconds, or 419230.4 / WATT seconds. Which means
-// the energy represented by a CN_CNT pulse is 419230.4 WATT-seconds.
-// Factoring in the calibration, that's 419230.4 / BL0942_PREF actual
-// Watt-seconds (or Joules, as the physicists like to call them).
-//
-// But we're not being physicists today; we we're being engineers, so
-// we want to convert to kWh instead. Which we do by dividing by 1000
-// and then by 3600, so the energy in kWh is
-// CF_CNT * 419230.4 / BL0942_PREF / 3600000
-//
-// Which makes BL0952_EREF = BL0942_PREF * 3600000 / 419430.4
-
 static const float BL0942_PREF = 596;              // taken from tasmota
 static const float BL0942_UREF = 15873.35944299;   // should be 73989/1.218
 static const float BL0942_IREF = 251213.46469622;  // 305978/1.218
@@ -79,11 +28,6 @@ struct DataPacket {
  uint8_t checksum;
 } __attribute__((packed));

-enum LineFrequency : uint8_t {
-  LINE_FREQUENCY_50HZ = 50,
-  LINE_FREQUENCY_60HZ = 60,
-};
-
 class BL0942 : public PollingComponent, public uart::UARTDevice {
 public:
  void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
@@ -91,27 +35,9 @@ class BL0942 : public PollingComponent, public uart::UARTDevice {
  void set_power_sensor(sensor::Sensor *power_sensor) { power_sensor_ = power_sensor; }
  void set_energy_sensor(sensor::Sensor *energy_sensor) { energy_sensor_ = energy_sensor; }
  void set_frequency_sensor(sensor::Sensor *frequency_sensor) { frequency_sensor_ = frequency_sensor; }
-  void set_line_freq(LineFrequency freq) { this->line_freq_ = freq; }
-  void set_address(uint8_t address) { this->address_ = address; }
-  void set_reset(bool reset) { this->reset_ = reset; }
-  void set_current_reference(float current_ref) {
-    this->current_reference_ = current_ref;
-    this->current_reference_set_ = true;
-  }
-  void set_energy_reference(float energy_ref) {
-    this->energy_reference_ = energy_ref;
-    this->energy_reference_set_ = true;
-  }
-  void set_power_reference(float power_ref) {
-    this->power_reference_ = power_ref;
-    this->power_reference_set_ = true;
-  }
-  void set_voltage_reference(float voltage_ref) {
-    this->voltage_reference_ = voltage_ref;
-    this->voltage_reference_set_ = true;
-  }

  void loop() override;
+
  void update() override;
  void setup() override;
  void dump_config() override;
@@ -127,25 +53,15 @@ class BL0942 : public PollingComponent, public uart::UARTDevice {

  // Divide by this to turn into Watt
  float power_reference_ = BL0942_PREF;
-  bool power_reference_set_ = false;
  // Divide by this to turn into Volt
  float voltage_reference_ = BL0942_UREF;
-  bool voltage_reference_set_ = false;
  // Divide by this to turn into Ampere
  float current_reference_ = BL0942_IREF;
-  bool current_reference_set_ = false;
  // Divide by this to turn into kWh
  float energy_reference_ = BL0942_EREF;
-  bool energy_reference_set_ = false;
-  uint8_t address_ = 0;
-  bool reset_ = false;
-  LineFrequency line_freq_ = LINE_FREQUENCY_50HZ;
-  uint32_t rx_start_ = 0;
-  uint32_t prev_cf_cnt_ = 0;

-  bool validate_checksum_(DataPacket *data);
-  int read_reg_(uint8_t reg);
-  void write_reg_(uint8_t reg, uint32_t val);
+  static bool validate_checksum(DataPacket *data);
+
  void received_package_(DataPacket *data);
 };
 }  // namespace bl0942
--- a/esphome/components/bl0942/sensor.py
+++ b/esphome/components/bl0942/sensor.py
@@ -1,46 +1,32 @@
 import esphome.codegen as cg
-from esphome.components import sensor, uart
 import esphome.config_validation as cv
+from esphome.components import sensor, uart
 from esphome.const import (
-    CONF_ADDRESS,
    CONF_CURRENT,
    CONF_ENERGY,
-    CONF_FREQUENCY,
    CONF_ID,
-    CONF_LINE_FREQUENCY,
    CONF_POWER,
    CONF_VOLTAGE,
+    CONF_FREQUENCY,
    DEVICE_CLASS_CURRENT,
    DEVICE_CLASS_ENERGY,
-    DEVICE_CLASS_FREQUENCY,
    DEVICE_CLASS_POWER,
    DEVICE_CLASS_VOLTAGE,
+    DEVICE_CLASS_FREQUENCY,
    STATE_CLASS_MEASUREMENT,
-    STATE_CLASS_TOTAL_INCREASING,
    UNIT_AMPERE,
-    UNIT_HERTZ,
    UNIT_KILOWATT_HOURS,
    UNIT_VOLT,
    UNIT_WATT,
+    UNIT_HERTZ,
+    STATE_CLASS_TOTAL_INCREASING,
 )

-CONF_CURRENT_REFERENCE = "current_reference"
-CONF_ENERGY_REFERENCE = "energy_reference"
-CONF_POWER_REFERENCE = "power_reference"
-CONF_RESET = "reset"
-CONF_VOLTAGE_REFERENCE = "voltage_reference"
-
 DEPENDENCIES = ["uart"]

 bl0942_ns = cg.esphome_ns.namespace("bl0942")
 BL0942 = bl0942_ns.class_("BL0942", cg.PollingComponent, uart.UARTDevice)

-LineFrequency = bl0942_ns.enum("LineFrequency")
-LINE_FREQS = {
-    50: LineFrequency.LINE_FREQUENCY_50HZ,
-    60: LineFrequency.LINE_FREQUENCY_60HZ,
-}
-
 CONFIG_SCHEMA = (
    cv.Schema(
        {
@@ -59,35 +45,22 @@ CONFIG_SCHEMA = (
            ),
            cv.Optional(CONF_POWER): sensor.sensor_schema(
                unit_of_measurement=UNIT_WATT,
-                accuracy_decimals=1,
+                accuracy_decimals=0,
                device_class=DEVICE_CLASS_POWER,
                state_class=STATE_CLASS_MEASUREMENT,
            ),
            cv.Optional(CONF_ENERGY): sensor.sensor_schema(
                unit_of_measurement=UNIT_KILOWATT_HOURS,
-                accuracy_decimals=3,
+                accuracy_decimals=0,
                device_class=DEVICE_CLASS_ENERGY,
                state_class=STATE_CLASS_TOTAL_INCREASING,
            ),
            cv.Optional(CONF_FREQUENCY): sensor.sensor_schema(
                unit_of_measurement=UNIT_HERTZ,
-                accuracy_decimals=2,
+                accuracy_decimals=0,
                device_class=DEVICE_CLASS_FREQUENCY,
                state_class=STATE_CLASS_MEASUREMENT,
            ),
-            cv.Optional(CONF_LINE_FREQUENCY, default="50HZ"): cv.All(
-                cv.frequency,
-                cv.enum(
-                    LINE_FREQS,
-                    int=True,
-                ),
-            ),
-            cv.Optional(CONF_ADDRESS, default=0): cv.int_range(min=0, max=3),
-            cv.Optional(CONF_RESET, default=True): cv.boolean,
-            cv.Optional(CONF_CURRENT_REFERENCE): cv.float_,
-            cv.Optional(CONF_ENERGY_REFERENCE): cv.float_,
-            cv.Optional(CONF_POWER_REFERENCE): cv.float_,
-            cv.Optional(CONF_VOLTAGE_REFERENCE): cv.float_,
        }
    )
    .extend(cv.polling_component_schema("60s"))
@@ -115,14 +88,3 @@ async def to_code(config):
    if frequency_config := config.get(CONF_FREQUENCY):
        sens = await sensor.new_sensor(frequency_config)
        cg.add(var.set_frequency_sensor(sens))
-    cg.add(var.set_line_freq(config[CONF_LINE_FREQUENCY]))
-    cg.add(var.set_address(config[CONF_ADDRESS]))
-    cg.add(var.set_reset(config[CONF_RESET]))
-    if (current_reference := config.get(CONF_CURRENT_REFERENCE, None)) is not None:
-        cg.add(var.set_current_reference(current_reference))
-    if (voltage_reference := config.get(CONF_VOLTAGE_REFERENCE, None)) is not None:
-        cg.add(var.set_voltage_reference(voltage_reference))
-    if (power_reference := config.get(CONF_POWER_REFERENCE, None)) is not None:
-        cg.add(var.set_power_reference(power_reference))
-    if (energy_reference := config.get(CONF_ENERGY_REFERENCE, None)) is not None:
-        cg.add(var.set_energy_reference(energy_reference))
--- a/esphome/components/ble_client/init.py
+++ b/esphome/components/ble_client/init.py
@@ -1,8 +1,7 @@
-from esphome import automation
-from esphome.automation import maybe_simple_id
 import esphome.codegen as cg
-from esphome.components import esp32_ble_client, esp32_ble_tracker
 import esphome.config_validation as cv
+from esphome.automation import maybe_simple_id
+from esphome.components import esp32_ble_tracker, esp32_ble_client
 from esphome.const import (
    CONF_CHARACTERISTIC_UUID,
    CONF_ID,
@@ -14,6 +13,7 @@ from esphome.const import (
    CONF_TRIGGER_ID,
    CONF_VALUE,
 )
+from esphome import automation

 AUTO_LOAD = ["esp32_ble_client"]
 CODEOWNERS = ["@buxtronix", "@clydebarrow"]
@@ -65,7 +65,9 @@ CONF_ON_PASSKEY_NOTIFICATION = "on_passkey_notification"
 CONF_ON_NUMERIC_COMPARISON_REQUEST = "on_numeric_comparison_request"
 CONF_AUTO_CONNECT = "auto_connect"

-MULTI_CONF = True
+# Espressif platformio framework is built with MAX_BLE_CONN to 3, so
+# enforce this in yaml checks.
+MULTI_CONF = 3

 CONFIG_SCHEMA = (
    cv.Schema(
--- a/esphome/components/ble_client/output/init.py
+++ b/esphome/components/ble_client/output/init.py
@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import ble_client, esp32_ble_tracker, output
 import esphome.config_validation as cv
+from esphome.components import ble_client, esp32_ble_tracker, output
 from esphome.const import CONF_CHARACTERISTIC_UUID, CONF_ID, CONF_SERVICE_UUID

 from .. import ble_client_ns
--- a/esphome/components/ble_client/sensor/init.py
+++ b/esphome/components/ble_client/sensor/init.py
@@ -1,18 +1,17 @@
-from esphome import automation
 import esphome.codegen as cg
-from esphome.components import ble_client, esp32_ble_tracker, sensor
 import esphome.config_validation as cv
+from esphome.components import sensor, ble_client, esp32_ble_tracker
 from esphome.const import (
    CONF_CHARACTERISTIC_UUID,
    CONF_LAMBDA,
-    CONF_SERVICE_UUID,
    CONF_TRIGGER_ID,
    CONF_TYPE,
+    CONF_SERVICE_UUID,
    DEVICE_CLASS_SIGNAL_STRENGTH,
    STATE_CLASS_MEASUREMENT,
    UNIT_DECIBEL_MILLIWATT,
 )
-
+from esphome import automation
 from .. import ble_client_ns

 DEPENDENCIES = ["ble_client"]
--- a/esphome/components/ble_client/switch/init.py
+++ b/esphome/components/ble_client/switch/init.py
@@ -1,8 +1,7 @@
 import esphome.codegen as cg
-from esphome.components import ble_client, switch
 import esphome.config_validation as cv
+from esphome.components import switch, ble_client
 from esphome.const import ICON_BLUETOOTH
-
 from .. import ble_client_ns

 BLEClientSwitch = ble_client_ns.class_(
--- a/esphome/components/ble_client/text_sensor/init.py
+++ b/esphome/components/ble_client/text_sensor/init.py
@@ -1,14 +1,13 @@
-from esphome import automation
 import esphome.codegen as cg
-from esphome.components import ble_client, esp32_ble_tracker, text_sensor
 import esphome.config_validation as cv
+from esphome.components import text_sensor, ble_client, esp32_ble_tracker
 from esphome.const import (
    CONF_CHARACTERISTIC_UUID,
    CONF_ID,
-    CONF_SERVICE_UUID,
    CONF_TRIGGER_ID,
+    CONF_SERVICE_UUID,
 )
-
+from esphome import automation
 from .. import ble_client_ns

 DEPENDENCIES = ["ble_client"]
--- a/esphome/components/ble_presence/binary_sensor.py
+++ b/esphome/components/ble_presence/binary_sensor.py
@@ -1,13 +1,13 @@
 import esphome.codegen as cg
-from esphome.components import binary_sensor, esp32_ble_tracker
 import esphome.config_validation as cv
+from esphome.components import binary_sensor, esp32_ble_tracker
 from esphome.const import (
+    CONF_MAC_ADDRESS,
+    CONF_SERVICE_UUID,
    CONF_IBEACON_MAJOR,
    CONF_IBEACON_MINOR,
    CONF_IBEACON_UUID,
-    CONF_MAC_ADDRESS,
    CONF_MIN_RSSI,
-    CONF_SERVICE_UUID,
    CONF_TIMEOUT,
 )

--- a/esphome/components/ble_rssi/sensor.py
+++ b/esphome/components/ble_rssi/sensor.py
@@ -1,12 +1,12 @@
 import esphome.codegen as cg
-from esphome.components import esp32_ble_tracker, sensor
 import esphome.config_validation as cv
+from esphome.components import sensor, esp32_ble_tracker
 from esphome.const import (
    CONF_IBEACON_MAJOR,
    CONF_IBEACON_MINOR,
    CONF_IBEACON_UUID,
-    CONF_MAC_ADDRESS,
    CONF_SERVICE_UUID,
+    CONF_MAC_ADDRESS,
    DEVICE_CLASS_SIGNAL_STRENGTH,
    STATE_CLASS_MEASUREMENT,
    UNIT_DECIBEL_MILLIWATT,
--- a/esphome/components/ble_scanner/text_sensor.py
+++ b/esphome/components/ble_scanner/text_sensor.py
@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import esp32_ble_tracker, text_sensor
 import esphome.config_validation as cv
+from esphome.components import text_sensor, esp32_ble_tracker

 DEPENDENCIES = ["esp32_ble_tracker"]

--- a/esphome/components/bluetooth_proxy/init.py
+++ b/esphome/components/bluetooth_proxy/init.py
@@ -1,8 +1,8 @@
-import esphome.codegen as cg
-from esphome.components import esp32_ble_client, esp32_ble_tracker
-from esphome.components.esp32 import add_idf_sdkconfig_option
+from esphome.components import esp32_ble_tracker, esp32_ble_client
 import esphome.config_validation as cv
+import esphome.codegen as cg
 from esphome.const import CONF_ACTIVE, CONF_ID
+from esphome.components.esp32 import add_idf_sdkconfig_option

 AUTO_LOAD = ["esp32_ble_client", "esp32_ble_tracker"]
 DEPENDENCIES = ["api", "esp32"]
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -54,9 +54,6 @@ bool BluetoothProxy::parse_devices(esp_ble_gap_cb_param_t::ble_scan_result_evt_p
    }

    resp.advertisements.push_back(std::move(adv));
-
-    ESP_LOGV(TAG, "Proxying raw packet from %02X:%02X:%02X:%02X:%02X:%02X, length %d. RSSI: %d dB", result.bda[0],
-             result.bda[1], result.bda[2], result.bda[3], result.bda[4], result.bda[5], length, result.rssi);
  }
  ESP_LOGV(TAG, "Proxying %d packets", count);
  this->api_connection_->send_bluetooth_le_raw_advertisements_response(resp);
@@ -90,8 +87,6 @@ void BluetoothProxy::send_api_packet_(const esp32_ble_tracker::ESPBTDevice &devi
 void BluetoothProxy::dump_config() {
  ESP_LOGCONFIG(TAG, "Bluetooth Proxy:");
  ESP_LOGCONFIG(TAG, "  Active: %s", YESNO(this->active_));
-  ESP_LOGCONFIG(TAG, "  Connections: %d", this->connections_.size());
-  ESP_LOGCONFIG(TAG, "  Raw advertisements: %s", YESNO(this->raw_advertisements_));
 }

 int BluetoothProxy::get_bluetooth_connections_free() {
--- a/esphome/components/bme680_bsec/init.py
+++ b/esphome/components/bme680_bsec/init.py
@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import i2c, esp32
-from esphome.const import CONF_ID, CONF_SAMPLE_RATE, CONF_TEMPERATURE_OFFSET
+from esphome.const import CONF_ID, CONF_TEMPERATURE_OFFSET

 CODEOWNERS = ["@trvrnrth"]
 DEPENDENCIES = ["i2c"]
@@ -11,6 +11,7 @@ MULTI_CONF = True
 CONF_BME680_BSEC_ID = "bme680_bsec_id"
 CONF_IAQ_MODE = "iaq_mode"
 CONF_SUPPLY_VOLTAGE = "supply_voltage"
+CONF_SAMPLE_RATE = "sample_rate"
 CONF_STATE_SAVE_INTERVAL = "state_save_interval"

 bme680_bsec_ns = cg.esphome_ns.namespace("bme680_bsec")
--- a/esphome/components/bme680_bsec/sensor.py
+++ b/esphome/components/bme680_bsec/sensor.py
@@ -4,33 +4,33 @@ from esphome.components import sensor
 from esphome.const import (
    CONF_GAS_RESISTANCE,
    CONF_HUMIDITY,
-    CONF_IAQ_ACCURACY,
    CONF_PRESSURE,
-    CONF_SAMPLE_RATE,
    CONF_TEMPERATURE,
-    DEVICE_CLASS_ATMOSPHERIC_PRESSURE,
    DEVICE_CLASS_CARBON_DIOXIDE,
    DEVICE_CLASS_HUMIDITY,
-    DEVICE_CLASS_TEMPERATURE,
    DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS_PARTS,
-    ICON_GAS_CYLINDER,
-    ICON_GAUGE,
+    DEVICE_CLASS_ATMOSPHERIC_PRESSURE,
+    DEVICE_CLASS_TEMPERATURE,
    STATE_CLASS_MEASUREMENT,
    UNIT_CELSIUS,
    UNIT_HECTOPASCAL,
    UNIT_OHM,
    UNIT_PARTS_PER_MILLION,
    UNIT_PERCENT,
+    ICON_GAS_CYLINDER,
+    ICON_GAUGE,
 )
 from . import (
    BME680BSECComponent,
    CONF_BME680_BSEC_ID,
+    CONF_SAMPLE_RATE,
    SAMPLE_RATE_OPTIONS,
 )

 DEPENDENCIES = ["bme680_bsec"]

 CONF_IAQ = "iaq"
+CONF_IAQ_ACCURACY = "iaq_accuracy"
 CONF_CO2_EQUIVALENT = "co2_equivalent"
 CONF_BREATH_VOC_EQUIVALENT = "breath_voc_equivalent"
 UNIT_IAQ = "IAQ"
--- a/esphome/components/bme680_bsec/text_sensor.py
+++ b/esphome/components/bme680_bsec/text_sensor.py
@@ -1,11 +1,11 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import text_sensor
-from esphome.const import CONF_IAQ_ACCURACY
 from . import BME680BSECComponent, CONF_BME680_BSEC_ID

 DEPENDENCIES = ["bme680_bsec"]

+CONF_IAQ_ACCURACY = "iaq_accuracy"
 ICON_ACCURACY = "mdi:checkbox-marked-circle-outline"

 TYPES = [CONF_IAQ_ACCURACY]
--- a/esphome/components/bme68x_bsec2/init.py
+++ b/esphome/components/bme68x_bsec2/init.py
@@ -1,196 +0,0 @@
-import hashlib
-from pathlib import Path
-
-from esphome import core, external_files
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.const import (
-    CONF_ID,
-    CONF_MODEL,
-    CONF_RAW_DATA_ID,
-    CONF_SAMPLE_RATE,
-    CONF_TEMPERATURE_OFFSET,
-)
-
-CODEOWNERS = ["@neffs", "@kbx81"]
-
-DOMAIN = "bme68x_bsec2"
-
-BSEC2_LIBRARY_VERSION = "v1.7.2502"
-
-CONF_ALGORITHM_OUTPUT = "algorithm_output"
-CONF_BME68X_BSEC2_ID = "bme68x_bsec2_id"
-CONF_IAQ_MODE = "iaq_mode"
-CONF_OPERATING_AGE = "operating_age"
-CONF_STATE_SAVE_INTERVAL = "state_save_interval"
-CONF_SUPPLY_VOLTAGE = "supply_voltage"
-
-bme68x_bsec2_ns = cg.esphome_ns.namespace("bme68x_bsec2")
-BME68xBSEC2Component = bme68x_bsec2_ns.class_("BME68xBSEC2Component", cg.Component)
-
-
-MODEL_OPTIONS = ["bme680", "bme688"]
-
-AlgorithmOutput = bme68x_bsec2_ns.enum("AlgorithmOutput")
-ALGORITHM_OUTPUT_OPTIONS = {
-    "classification": AlgorithmOutput.ALGORITHM_OUTPUT_CLASSIFICATION,
-    "regression": AlgorithmOutput.ALGORITHM_OUTPUT_REGRESSION,
-}
-
-OperatingAge = bme68x_bsec2_ns.enum("OperatingAge")
-OPERATING_AGE_OPTIONS = {
-    "4d": OperatingAge.OPERATING_AGE_4D,
-    "28d": OperatingAge.OPERATING_AGE_28D,
-}
-
-SampleRate = bme68x_bsec2_ns.enum("SampleRate")
-SAMPLE_RATE_OPTIONS = {
-    "LP": SampleRate.SAMPLE_RATE_LP,
-    "ULP": SampleRate.SAMPLE_RATE_ULP,
-}
-
-Voltage = bme68x_bsec2_ns.enum("Voltage")
-VOLTAGE_OPTIONS = {
-    "1.8V": Voltage.VOLTAGE_1_8V,
-    "3.3V": Voltage.VOLTAGE_3_3V,
-}
-
-ALGORITHM_OUTPUT_FILE_NAME = {
-    "classification": "sel",
-    "regression": "reg",
-}
-
-SAMPLE_RATE_FILE_NAME = {
-    "LP": "3s",
-    "ULP": "300s",
-}
-
-VOLTAGE_FILE_NAME = {
-    "1.8V": "18v",
-    "3.3V": "33v",
-}
-
-
-def _compute_local_file_path(url: str) -> Path:
-    h = hashlib.new("sha256")
-    h.update(url.encode())
-    key = h.hexdigest()[:8]
-    base_dir = external_files.compute_local_file_dir(DOMAIN)
-    return base_dir / key
-
-
-def _compute_url(config: dict) -> str:
-    model = config.get(CONF_MODEL)
-    operating_age = config.get(CONF_OPERATING_AGE)
-    sample_rate = SAMPLE_RATE_FILE_NAME[config.get(CONF_SAMPLE_RATE)]
-    volts = VOLTAGE_FILE_NAME[config.get(CONF_SUPPLY_VOLTAGE)]
-    if model == "bme688":
-        algo = ALGORITHM_OUTPUT_FILE_NAME[
-            config.get(CONF_ALGORITHM_OUTPUT, "classification")
-        ]
-        filename = "bsec_selectivity"
-    else:
-        algo = "iaq"
-        filename = "bsec_iaq"
-    return f"https://raw.githubusercontent.com/boschsensortec/Bosch-BSEC2-Library/{BSEC2_LIBRARY_VERSION}/src/config/{model}/{model}_{algo}_{volts}_{sample_rate}_{operating_age}/{filename}.txt"
-
-
-def download_bme68x_blob(config):
-    url = _compute_url(config)
-    path = _compute_local_file_path(url)
-    external_files.download_content(url, path)
-
-    return config
-
-
-def validate_bme68x(config):
-    if CONF_ALGORITHM_OUTPUT not in config:
-        return config
-
-    if config[CONF_MODEL] != "bme688":
-        raise cv.Invalid(f"{CONF_ALGORITHM_OUTPUT} is only valid for BME688")
-
-    if config[CONF_ALGORITHM_OUTPUT] == "regression" and (
-        config[CONF_OPERATING_AGE] != "4d"
-        or config[CONF_SAMPLE_RATE] != "ULP"
-        or config[CONF_SUPPLY_VOLTAGE] != "1.8V"
-    ):
-        raise cv.Invalid(
-            f" To use '{CONF_ALGORITHM_OUTPUT}: regression', {CONF_OPERATING_AGE} must be '4d', {CONF_SAMPLE_RATE} must be 'ULP' and {CONF_SUPPLY_VOLTAGE} must be '1.8V'"
-        )
-    return config
-
-
-CONFIG_SCHEMA_BASE = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(BME68xBSEC2Component),
-            cv.GenerateID(CONF_RAW_DATA_ID): cv.declare_id(cg.uint8),
-            cv.Required(CONF_MODEL): cv.one_of(*MODEL_OPTIONS, lower=True),
-            cv.Optional(CONF_ALGORITHM_OUTPUT): cv.enum(
-                ALGORITHM_OUTPUT_OPTIONS, lower=True
-            ),
-            cv.Optional(CONF_OPERATING_AGE, default="28d"): cv.enum(
-                OPERATING_AGE_OPTIONS, lower=True
-            ),
-            cv.Optional(CONF_SAMPLE_RATE, default="LP"): cv.enum(
-                SAMPLE_RATE_OPTIONS, upper=True
-            ),
-            cv.Optional(CONF_SUPPLY_VOLTAGE, default="3.3V"): cv.enum(
-                VOLTAGE_OPTIONS, upper=True
-            ),
-            cv.Optional(CONF_TEMPERATURE_OFFSET, default=0): cv.temperature,
-            cv.Optional(
-                CONF_STATE_SAVE_INTERVAL, default="6hours"
-            ): cv.positive_time_period_minutes,
-        },
-    )
-    .add_extra(cv.only_with_arduino)
-    .add_extra(validate_bme68x)
-    .add_extra(download_bme68x_blob)
-)
-
-
-async def to_code_base(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-
-    if algo_output := config.get(CONF_ALGORITHM_OUTPUT):
-        cg.add(var.set_algorithm_output(algo_output))
-    cg.add(var.set_operating_age(config[CONF_OPERATING_AGE]))
-    cg.add(var.set_sample_rate(config[CONF_SAMPLE_RATE]))
-    cg.add(var.set_voltage(config[CONF_SUPPLY_VOLTAGE]))
-    cg.add(var.set_temperature_offset(config[CONF_TEMPERATURE_OFFSET]))
-    cg.add(
-        var.set_state_save_interval(config[CONF_STATE_SAVE_INTERVAL].total_milliseconds)
-    )
-
-    path = _compute_local_file_path(_compute_url(config))
-
-    try:
-        with open(path, encoding="utf-8") as f:
-            bsec2_iaq_config = f.read()
-    except Exception as e:
-        raise core.EsphomeError(f"Could not open binary configuration file {path}: {e}")
-
-    # Convert retrieved BSEC2 config to an array of ints
-    rhs = [int(x) for x in bsec2_iaq_config.split(",")]
-    # Create an array which will reside in program memory and configure the sensor instance to use it
-    bsec2_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)
-    cg.add(var.set_bsec2_configuration(bsec2_arr, len(rhs)))
-
-    # Although this component does not use SPI, the BSEC2 library requires the SPI library
-    cg.add_library("SPI", None)
-    cg.add_library(
-        "BME68x Sensor library",
-        "1.1.40407",
-    )
-    cg.add_library(
-        "BSEC2 Software Library",
-        None,
-        f"https://github.com/boschsensortec/Bosch-BSEC2-Library.git#{BSEC2_LIBRARY_VERSION}",
-    )
-
-    cg.add_define("USE_BSEC2")
-
-    return var
--- a/esphome/components/bme68x_bsec2/bme68x_bsec2.cpp
+++ b/esphome/components/bme68x_bsec2/bme68x_bsec2.cpp
@@ -1,523 +0,0 @@
-#include "esphome/core/defines.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-#ifdef USE_BSEC2
-#include "bme68x_bsec2.h"
-
-#include <string>
-
-namespace esphome {
-namespace bme68x_bsec2 {
-
-#define BME68X_BSEC2_ALGORITHM_OUTPUT_LOG(a) (a == ALGORITHM_OUTPUT_CLASSIFICATION ? "Classification" : "Regression")
-#define BME68X_BSEC2_OPERATING_AGE_LOG(o) (o == OPERATING_AGE_4D ? "4 days" : "28 days")
-#define BME68X_BSEC2_SAMPLE_RATE_LOG(r) (r == SAMPLE_RATE_DEFAULT ? "Default" : (r == SAMPLE_RATE_ULP ? "ULP" : "LP"))
-#define BME68X_BSEC2_VOLTAGE_LOG(v) (v == VOLTAGE_3_3V ? "3.3V" : "1.8V")
-
-static const char *const TAG = "bme68x_bsec2.sensor";
-
-static const std::string IAQ_ACCURACY_STATES[4] = {"Stabilizing", "Uncertain", "Calibrating", "Calibrated"};
-
-void BME68xBSEC2Component::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up BME68X via BSEC2...");
-
-  this->bsec_status_ = bsec_init_m(&this->bsec_instance_);
-  if (this->bsec_status_ != BSEC_OK) {
-    this->mark_failed();
-    ESP_LOGE(TAG, "bsec_init_m failed: status %d", this->bsec_status_);
-    return;
-  }
-
-  bsec_get_version_m(&this->bsec_instance_, &this->version_);
-
-  this->bme68x_status_ = bme68x_init(&this->bme68x_);
-  if (this->bme68x_status_ != BME68X_OK) {
-    this->mark_failed();
-    ESP_LOGE(TAG, "bme68x_init failed: status %d", this->bme68x_status_);
-    return;
-  }
-  if (this->bsec2_configuration_ != nullptr && this->bsec2_configuration_length_) {
-    this->set_config_(this->bsec2_configuration_, this->bsec2_configuration_length_);
-    if (this->bsec_status_ != BSEC_OK) {
-      this->mark_failed();
-      ESP_LOGE(TAG, "bsec_set_configuration_m failed: status %d", this->bsec_status_);
-      return;
-    }
-  }
-
-  this->update_subscription_();
-  if (this->bsec_status_ != BSEC_OK) {
-    this->mark_failed();
-    ESP_LOGE(TAG, "bsec_update_subscription_m failed: status %d", this->bsec_status_);
-    return;
-  }
-
-  this->load_state_();
-}
-
-void BME68xBSEC2Component::dump_config() {
-  ESP_LOGCONFIG(TAG, "BME68X via BSEC2:");
-
-  ESP_LOGCONFIG(TAG, "  BSEC2 version: %d.%d.%d.%d", this->version_.major, this->version_.minor,
-                this->version_.major_bugfix, this->version_.minor_bugfix);
-
-  ESP_LOGCONFIG(TAG, "  BSEC2 configuration blob:");
-  ESP_LOGCONFIG(TAG, "    Configured: %s", YESNO(this->bsec2_blob_configured_));
-  if (this->bsec2_configuration_ != nullptr && this->bsec2_configuration_length_) {
-    ESP_LOGCONFIG(TAG, "    Size: %" PRIu32, this->bsec2_configuration_length_);
-  }
-
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication failed (BSEC2 status: %d, BME68X status: %d)", this->bsec_status_,
-             this->bme68x_status_);
-  }
-
-  if (this->algorithm_output_ != ALGORITHM_OUTPUT_IAQ) {
-    ESP_LOGCONFIG(TAG, "  Algorithm output: %s", BME68X_BSEC2_ALGORITHM_OUTPUT_LOG(this->algorithm_output_));
-  }
-  ESP_LOGCONFIG(TAG, "  Operating age: %s", BME68X_BSEC2_OPERATING_AGE_LOG(this->operating_age_));
-  ESP_LOGCONFIG(TAG, "  Sample rate: %s", BME68X_BSEC2_SAMPLE_RATE_LOG(this->sample_rate_));
-  ESP_LOGCONFIG(TAG, "  Voltage: %s", BME68X_BSEC2_VOLTAGE_LOG(this->voltage_));
-  ESP_LOGCONFIG(TAG, "  State save interval: %ims", this->state_save_interval_ms_);
-  ESP_LOGCONFIG(TAG, "  Temperature offset: %.2f", this->temperature_offset_);
-
-#ifdef USE_SENSOR
-  LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
-  ESP_LOGCONFIG(TAG, "    Sample rate: %s", BME68X_BSEC2_SAMPLE_RATE_LOG(this->temperature_sample_rate_));
-  LOG_SENSOR("  ", "Pressure", this->pressure_sensor_);
-  ESP_LOGCONFIG(TAG, "    Sample rate: %s", BME68X_BSEC2_SAMPLE_RATE_LOG(this->pressure_sample_rate_));
-  LOG_SENSOR("  ", "Humidity", this->humidity_sensor_);
-  ESP_LOGCONFIG(TAG, "    Sample rate: %s", BME68X_BSEC2_SAMPLE_RATE_LOG(this->humidity_sample_rate_));
-  LOG_SENSOR("  ", "Gas resistance", this->gas_resistance_sensor_);
-  LOG_SENSOR("  ", "CO2 equivalent", this->co2_equivalent_sensor_);
-  LOG_SENSOR("  ", "Breath VOC equivalent", this->breath_voc_equivalent_sensor_);
-  LOG_SENSOR("  ", "IAQ", this->iaq_sensor_);
-  LOG_SENSOR("  ", "IAQ static", this->iaq_static_sensor_);
-  LOG_SENSOR("  ", "Numeric IAQ accuracy", this->iaq_accuracy_sensor_);
-#endif
-#ifdef USE_TEXT_SENSOR
-  LOG_TEXT_SENSOR("  ", "IAQ accuracy", this->iaq_accuracy_text_sensor_);
-#endif
-}
-
-float BME68xBSEC2Component::get_setup_priority() const { return setup_priority::DATA; }
-
-void BME68xBSEC2Component::loop() {
-  this->run_();
-
-  if (this->bsec_status_ < BSEC_OK || this->bme68x_status_ < BME68X_OK) {
-    this->status_set_error();
-  } else {
-    this->status_clear_error();
-  }
-  if (this->bsec_status_ > BSEC_OK || this->bme68x_status_ > BME68X_OK) {
-    this->status_set_warning();
-  } else {
-    this->status_clear_warning();
-  }
-  // Process a single action from the queue. These are primarily sensor state publishes
-  // that in totality take too long to send in a single call.
-  if (this->queue_.size()) {
-    auto action = std::move(this->queue_.front());
-    this->queue_.pop();
-    action();
-  }
-}
-
-void BME68xBSEC2Component::set_config_(const uint8_t *config, uint32_t len) {
-  if (len > BSEC_MAX_PROPERTY_BLOB_SIZE) {
-    ESP_LOGE(TAG, "Configuration is larger than BSEC_MAX_PROPERTY_BLOB_SIZE");
-    this->mark_failed();
-    return;
-  }
-  uint8_t work_buffer[BSEC_MAX_PROPERTY_BLOB_SIZE];
-  this->bsec_status_ = bsec_set_configuration_m(&this->bsec_instance_, config, len, work_buffer, sizeof(work_buffer));
-  if (this->bsec_status_ == BSEC_OK) {
-    this->bsec2_blob_configured_ = true;
-  }
-}
-
-float BME68xBSEC2Component::calc_sensor_sample_rate_(SampleRate sample_rate) {
-  if (sample_rate == SAMPLE_RATE_DEFAULT) {
-    sample_rate = this->sample_rate_;
-  }
-  return sample_rate == SAMPLE_RATE_ULP ? BSEC_SAMPLE_RATE_ULP : BSEC_SAMPLE_RATE_LP;
-}
-
-void BME68xBSEC2Component::update_subscription_() {
-  bsec_sensor_configuration_t virtual_sensors[BSEC_NUMBER_OUTPUTS];
-  uint8_t num_virtual_sensors = 0;
-#ifdef USE_SENSOR
-  if (this->iaq_sensor_) {
-    virtual_sensors[num_virtual_sensors].sensor_id = BSEC_OUTPUT_IAQ;
-    virtual_sensors[num_virtual_sensors].sample_rate = this->calc_sensor_sample_rate_(SAMPLE_RATE_DEFAULT);
-    num_virtual_sensors++;
-  }
-
-  if (this->iaq_static_sensor_) {
-    virtual_sensors[num_virtual_sensors].sensor_id = BSEC_OUTPUT_STATIC_IAQ;
-    virtual_sensors[num_virtual_sensors].sample_rate = this->calc_sensor_sample_rate_(SAMPLE_RATE_DEFAULT);
-    num_virtual_sensors++;
-  }
-
-  if (this->co2_equivalent_sensor_) {
-    virtual_sensors[num_virtual_sensors].sensor_id = BSEC_OUTPUT_CO2_EQUIVALENT;
-    virtual_sensors[num_virtual_sensors].sample_rate = this->calc_sensor_sample_rate_(SAMPLE_RATE_DEFAULT);
-    num_virtual_sensors++;
-  }
-
-  if (this->breath_voc_equivalent_sensor_) {
-    virtual_sensors[num_virtual_sensors].sensor_id = BSEC_OUTPUT_BREATH_VOC_EQUIVALENT;
-    virtual_sensors[num_virtual_sensors].sample_rate = this->calc_sensor_sample_rate_(SAMPLE_RATE_DEFAULT);
-    num_virtual_sensors++;
-  }
-
-  if (this->pressure_sensor_) {
-    virtual_sensors[num_virtual_sensors].sensor_id = BSEC_OUTPUT_RAW_PRESSURE;
-    virtual_sensors[num_virtual_sensors].sample_rate = this->calc_sensor_sample_rate_(this->pressure_sample_rate_);
-    num_virtual_sensors++;
-  }
-
-  if (this->gas_resistance_sensor_) {
-    virtual_sensors[num_virtual_sensors].sensor_id = BSEC_OUTPUT_RAW_GAS;
-    virtual_sensors[num_virtual_sensors].sample_rate = this->calc_sensor_sample_rate_(SAMPLE_RATE_DEFAULT);
-    num_virtual_sensors++;
-  }
-
-  if (this->temperature_sensor_) {
-    virtual_sensors[num_virtual_sensors].sensor_id = BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_TEMPERATURE;
-    virtual_sensors[num_virtual_sensors].sample_rate = this->calc_sensor_sample_rate_(this->temperature_sample_rate_);
-    num_virtual_sensors++;
-  }
-
-  if (this->humidity_sensor_) {
-    virtual_sensors[num_virtual_sensors].sensor_id = BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_HUMIDITY;
-    virtual_sensors[num_virtual_sensors].sample_rate = this->calc_sensor_sample_rate_(this->humidity_sample_rate_);
-    num_virtual_sensors++;
-  }
-#endif
-  bsec_sensor_configuration_t sensor_settings[BSEC_MAX_PHYSICAL_SENSOR];
-  uint8_t num_sensor_settings = BSEC_MAX_PHYSICAL_SENSOR;
-  this->bsec_status_ = bsec_update_subscription_m(&this->bsec_instance_, virtual_sensors, num_virtual_sensors,
-                                                  sensor_settings, &num_sensor_settings);
-}
-
-void BME68xBSEC2Component::run_() {
-  int64_t curr_time_ns = this->get_time_ns_();
-  if (curr_time_ns < this->next_call_ns_) {
-    return;
-  }
-  this->op_mode_ = this->bsec_settings_.op_mode;
-  uint8_t status;
-
-  ESP_LOGV(TAG, "Performing sensor run");
-
-  struct bme68x_conf bme68x_conf;
-  this->bsec_status_ = bsec_sensor_control_m(&this->bsec_instance_, curr_time_ns, &this->bsec_settings_);
-  if (this->bsec_status_ < BSEC_OK) {
-    ESP_LOGW(TAG, "Failed to fetch sensor control settings (BSEC2 error code %d)", this->bsec_status_);
-    return;
-  }
-  this->next_call_ns_ = this->bsec_settings_.next_call;
-
-  if (this->bsec_settings_.trigger_measurement) {
-    bme68x_get_conf(&bme68x_conf, &this->bme68x_);
-
-    bme68x_conf.os_hum = this->bsec_settings_.humidity_oversampling;
-    bme68x_conf.os_temp = this->bsec_settings_.temperature_oversampling;
-    bme68x_conf.os_pres = this->bsec_settings_.pressure_oversampling;
-    bme68x_set_conf(&bme68x_conf, &this->bme68x_);
-
-    switch (this->bsec_settings_.op_mode) {
-      case BME68X_FORCED_MODE:
-        this->bme68x_heatr_conf_.enable = BME68X_ENABLE;
-        this->bme68x_heatr_conf_.heatr_temp = this->bsec_settings_.heater_temperature;
-        this->bme68x_heatr_conf_.heatr_dur = this->bsec_settings_.heater_duration;
-
-        status = bme68x_set_op_mode(this->bsec_settings_.op_mode, &this->bme68x_);
-        status = bme68x_set_heatr_conf(BME68X_FORCED_MODE, &this->bme68x_heatr_conf_, &this->bme68x_);
-        status = bme68x_set_op_mode(BME68X_FORCED_MODE, &this->bme68x_);
-        this->op_mode_ = BME68X_FORCED_MODE;
-        this->sleep_mode_ = false;
-        ESP_LOGV(TAG, "Using forced mode");
-
-        break;
-      case BME68X_PARALLEL_MODE:
-        if (this->op_mode_ != this->bsec_settings_.op_mode) {
-          this->bme68x_heatr_conf_.enable = BME68X_ENABLE;
-          this->bme68x_heatr_conf_.heatr_temp_prof = this->bsec_settings_.heater_temperature_profile;
-          this->bme68x_heatr_conf_.heatr_dur_prof = this->bsec_settings_.heater_duration_profile;
-          this->bme68x_heatr_conf_.profile_len = this->bsec_settings_.heater_profile_len;
-          this->bme68x_heatr_conf_.shared_heatr_dur =
-              BSEC_TOTAL_HEAT_DUR -
-              (bme68x_get_meas_dur(BME68X_PARALLEL_MODE, &bme68x_conf, &this->bme68x_) / INT64_C(1000));
-
-          status = bme68x_set_heatr_conf(BME68X_PARALLEL_MODE, &this->bme68x_heatr_conf_, &this->bme68x_);
-
-          status = bme68x_set_op_mode(BME68X_PARALLEL_MODE, &this->bme68x_);
-          this->op_mode_ = BME68X_PARALLEL_MODE;
-          this->sleep_mode_ = false;
-          ESP_LOGV(TAG, "Using parallel mode");
-        }
-        break;
-      case BME68X_SLEEP_MODE:
-        if (!this->sleep_mode_) {
-          bme68x_set_op_mode(BME68X_SLEEP_MODE, &this->bme68x_);
-          this->sleep_mode_ = true;
-          ESP_LOGV(TAG, "Using sleep mode");
-        }
-        break;
-    }
-
-    uint32_t meas_dur = 0;
-    meas_dur = bme68x_get_meas_dur(this->op_mode_, &bme68x_conf, &this->bme68x_);
-    ESP_LOGV(TAG, "Queueing read in %uus", meas_dur);
-    this->set_timeout("read", meas_dur / 1000, [this, curr_time_ns]() { this->read_(curr_time_ns); });
-  } else {
-    ESP_LOGV(TAG, "Measurement not required");
-    this->read_(curr_time_ns);
-  }
-}
-
-void BME68xBSEC2Component::read_(int64_t trigger_time_ns) {
-  ESP_LOGV(TAG, "Reading data");
-
-  if (this->bsec_settings_.trigger_measurement) {
-    uint8_t current_op_mode;
-    this->bme68x_status_ = bme68x_get_op_mode(&current_op_mode, &this->bme68x_);
-
-    if (current_op_mode == BME68X_SLEEP_MODE) {
-      ESP_LOGV(TAG, "Still in sleep mode, doing nothing");
-      return;
-    }
-  }
-
-  if (!this->bsec_settings_.process_data) {
-    ESP_LOGV(TAG, "Data processing not required");
-    return;
-  }
-
-  struct bme68x_data data[3];
-  uint8_t nFields = 0;
-  this->bme68x_status_ = bme68x_get_data(this->op_mode_, &data[0], &nFields, &this->bme68x_);
-
-  if (this->bme68x_status_ != BME68X_OK) {
-    ESP_LOGW(TAG, "Failed to get sensor data (BME68X error code %d)", this->bme68x_status_);
-    return;
-  }
-  if (nFields < 1) {
-    ESP_LOGD(TAG, "BME68X did not provide new data");
-    return;
-  }
-
-  for (uint8_t i = 0; i < nFields; i++) {
-    bsec_input_t inputs[BSEC_MAX_PHYSICAL_SENSOR];  // Temperature, Pressure, Humidity & Gas Resistance
-    uint8_t num_inputs = 0;
-
-    if (BSEC_CHECK_INPUT(this->bsec_settings_.process_data, BSEC_INPUT_TEMPERATURE)) {
-      inputs[num_inputs].sensor_id = BSEC_INPUT_TEMPERATURE;
-      inputs[num_inputs].signal = data[i].temperature;
-      inputs[num_inputs].time_stamp = trigger_time_ns;
-      num_inputs++;
-    }
-    if (BSEC_CHECK_INPUT(this->bsec_settings_.process_data, BSEC_INPUT_HEATSOURCE)) {
-      inputs[num_inputs].sensor_id = BSEC_INPUT_HEATSOURCE;
-      inputs[num_inputs].signal = this->temperature_offset_;
-      inputs[num_inputs].time_stamp = trigger_time_ns;
-      num_inputs++;
-    }
-    if (BSEC_CHECK_INPUT(this->bsec_settings_.process_data, BSEC_INPUT_HUMIDITY)) {
-      inputs[num_inputs].sensor_id = BSEC_INPUT_HUMIDITY;
-      inputs[num_inputs].signal = data[i].humidity;
-      inputs[num_inputs].time_stamp = trigger_time_ns;
-      num_inputs++;
-    }
-    if (BSEC_CHECK_INPUT(this->bsec_settings_.process_data, BSEC_INPUT_PRESSURE)) {
-      inputs[num_inputs].sensor_id = BSEC_INPUT_PRESSURE;
-      inputs[num_inputs].signal = data[i].pressure;
-      inputs[num_inputs].time_stamp = trigger_time_ns;
-      num_inputs++;
-    }
-    if (BSEC_CHECK_INPUT(this->bsec_settings_.process_data, BSEC_INPUT_GASRESISTOR)) {
-      if (data[i].status & BME68X_GASM_VALID_MSK) {
-        inputs[num_inputs].sensor_id = BSEC_INPUT_GASRESISTOR;
-        inputs[num_inputs].signal = data[i].gas_resistance;
-        inputs[num_inputs].time_stamp = trigger_time_ns;
-        num_inputs++;
-      } else {
-        ESP_LOGD(TAG, "BME68X did not report gas data");
-      }
-    }
-    if (BSEC_CHECK_INPUT(this->bsec_settings_.process_data, BSEC_INPUT_PROFILE_PART) &&
-        (data[i].status & BME68X_GASM_VALID_MSK)) {
-      inputs[num_inputs].sensor_id = BSEC_INPUT_PROFILE_PART;
-      inputs[num_inputs].signal = (this->op_mode_ == BME68X_FORCED_MODE) ? 0 : data[i].gas_index;
-      inputs[num_inputs].time_stamp = trigger_time_ns;
-      num_inputs++;
-    }
-
-    if (num_inputs < 1) {
-      ESP_LOGD(TAG, "No signal inputs available for BSEC2");
-      return;
-    }
-
-    bsec_output_t outputs[BSEC_NUMBER_OUTPUTS];
-    uint8_t num_outputs = BSEC_NUMBER_OUTPUTS;
-    this->bsec_status_ = bsec_do_steps_m(&this->bsec_instance_, inputs, num_inputs, outputs, &num_outputs);
-    if (this->bsec_status_ != BSEC_OK) {
-      ESP_LOGW(TAG, "BSEC2 failed to process signals (BSEC2 error code %d)", this->bsec_status_);
-      return;
-    }
-    if (num_outputs < 1) {
-      ESP_LOGD(TAG, "No signal outputs provided by BSEC2");
-      return;
-    }
-
-    this->publish_(outputs, num_outputs);
-  }
-}
-
-void BME68xBSEC2Component::publish_(const bsec_output_t *outputs, uint8_t num_outputs) {
-  ESP_LOGV(TAG, "Publishing sensor states");
-  bool update_accuracy = false;
-  uint8_t max_accuracy = 0;
-  for (uint8_t i = 0; i < num_outputs; i++) {
-    float signal = outputs[i].signal;
-    switch (outputs[i].sensor_id) {
-      case BSEC_OUTPUT_IAQ:
-        max_accuracy = std::max(outputs[i].accuracy, max_accuracy);
-        update_accuracy = true;
-#ifdef USE_SENSOR
-        this->queue_push_([this, signal]() { this->publish_sensor_(this->iaq_sensor_, signal); });
-#endif
-        break;
-      case BSEC_OUTPUT_STATIC_IAQ:
-        max_accuracy = std::max(outputs[i].accuracy, max_accuracy);
-        update_accuracy = true;
-#ifdef USE_SENSOR
-        this->queue_push_([this, signal]() { this->publish_sensor_(this->iaq_static_sensor_, signal); });
-#endif
-        break;
-      case BSEC_OUTPUT_CO2_EQUIVALENT:
-#ifdef USE_SENSOR
-        this->queue_push_([this, signal]() { this->publish_sensor_(this->co2_equivalent_sensor_, signal); });
-#endif
-        break;
-      case BSEC_OUTPUT_BREATH_VOC_EQUIVALENT:
-#ifdef USE_SENSOR
-        this->queue_push_([this, signal]() { this->publish_sensor_(this->breath_voc_equivalent_sensor_, signal); });
-#endif
-        break;
-      case BSEC_OUTPUT_RAW_PRESSURE:
-#ifdef USE_SENSOR
-        this->queue_push_([this, signal]() { this->publish_sensor_(this->pressure_sensor_, signal / 100.0f); });
-#endif
-        break;
-      case BSEC_OUTPUT_RAW_GAS:
-#ifdef USE_SENSOR
-        this->queue_push_([this, signal]() { this->publish_sensor_(this->gas_resistance_sensor_, signal); });
-#endif
-        break;
-      case BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_TEMPERATURE:
-#ifdef USE_SENSOR
-        this->queue_push_([this, signal]() { this->publish_sensor_(this->temperature_sensor_, signal); });
-#endif
-        break;
-      case BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_HUMIDITY:
-#ifdef USE_SENSOR
-        this->queue_push_([this, signal]() { this->publish_sensor_(this->humidity_sensor_, signal); });
-#endif
-        break;
-    }
-  }
-  if (update_accuracy) {
-#ifdef USE_SENSOR
-    this->queue_push_(
-        [this, max_accuracy]() { this->publish_sensor_(this->iaq_accuracy_sensor_, max_accuracy, true); });
-#endif
-#ifdef USE_TEXT_SENSOR
-    this->queue_push_([this, max_accuracy]() {
-      this->publish_sensor_(this->iaq_accuracy_text_sensor_, IAQ_ACCURACY_STATES[max_accuracy]);
-    });
-#endif
-    // Queue up an opportunity to save state
-    this->queue_push_([this, max_accuracy]() { this->save_state_(max_accuracy); });
-  }
-}
-
-int64_t BME68xBSEC2Component::get_time_ns_() {
-  int64_t time_ms = millis();
-  if (this->last_time_ms_ > time_ms) {
-    this->millis_overflow_counter_++;
-  }
-  this->last_time_ms_ = time_ms;
-
-  return (time_ms + ((int64_t) this->millis_overflow_counter_ << 32)) * INT64_C(1000000);
-}
-
-#ifdef USE_SENSOR
-void BME68xBSEC2Component::publish_sensor_(sensor::Sensor *sensor, float value, bool change_only) {
-  if (!sensor || (change_only && sensor->has_state() && sensor->state == value)) {
-    return;
-  }
-  sensor->publish_state(value);
-}
-#endif
-
-#ifdef USE_TEXT_SENSOR
-void BME68xBSEC2Component::publish_sensor_(text_sensor::TextSensor *sensor, const std::string &value) {
-  if (!sensor || (sensor->has_state() && sensor->state == value)) {
-    return;
-  }
-  sensor->publish_state(value);
-}
-#endif
-
-void BME68xBSEC2Component::load_state_() {
-  uint32_t hash = this->get_hash();
-  this->bsec_state_ = global_preferences->make_preference<uint8_t[BSEC_MAX_STATE_BLOB_SIZE]>(hash, true);
-
-  uint8_t state[BSEC_MAX_STATE_BLOB_SIZE];
-  if (this->bsec_state_.load(&state)) {
-    ESP_LOGV(TAG, "Loading state");
-    uint8_t work_buffer[BSEC_MAX_WORKBUFFER_SIZE];
-    this->bsec_status_ =
-        bsec_set_state_m(&this->bsec_instance_, state, BSEC_MAX_STATE_BLOB_SIZE, work_buffer, sizeof(work_buffer));
-    if (this->bsec_status_ != BSEC_OK) {
-      ESP_LOGW(TAG, "Failed to load state (BSEC2 error code %d)", this->bsec_status_);
-    }
-    ESP_LOGI(TAG, "Loaded state");
-  }
-}
-
-void BME68xBSEC2Component::save_state_(uint8_t accuracy) {
-  if (accuracy < 3 || (millis() - this->last_state_save_ms_ < this->state_save_interval_ms_)) {
-    return;
-  }
-
-  ESP_LOGV(TAG, "Saving state");
-
-  uint8_t state[BSEC_MAX_STATE_BLOB_SIZE];
-  uint8_t work_buffer[BSEC_MAX_STATE_BLOB_SIZE];
-  uint32_t num_serialized_state = BSEC_MAX_STATE_BLOB_SIZE;
-
-  this->bsec_status_ = bsec_get_state_m(&this->bsec_instance_, 0, state, BSEC_MAX_STATE_BLOB_SIZE, work_buffer,
-                                        BSEC_MAX_STATE_BLOB_SIZE, &num_serialized_state);
-  if (this->bsec_status_ != BSEC_OK) {
-    ESP_LOGW(TAG, "Failed fetch state for save (BSEC2 error code %d)", this->bsec_status_);
-    return;
-  }
-
-  if (!this->bsec_state_.save(&state)) {
-    ESP_LOGW(TAG, "Failed to save state");
-    return;
-  }
-  this->last_state_save_ms_ = millis();
-
-  ESP_LOGI(TAG, "Saved state");
-}
-
-}  // namespace bme68x_bsec2
-}  // namespace esphome
-#endif
--- a/esphome/components/bme68x_bsec2/bme68x_bsec2.h
+++ b/esphome/components/bme68x_bsec2/bme68x_bsec2.h
@@ -1,163 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/defines.h"
-#include "esphome/core/preferences.h"
-
-#ifdef USE_BSEC2
-
-#ifdef USE_SENSOR
-#include "esphome/components/sensor/sensor.h"
-#endif
-
-#ifdef USE_TEXT_SENSOR
-#include "esphome/components/text_sensor/text_sensor.h"
-#endif
-
-#include <cinttypes>
-#include <queue>
-
-#include <bsec2.h>
-
-namespace esphome {
-namespace bme68x_bsec2 {
-
-enum AlgorithmOutput {
-  ALGORITHM_OUTPUT_IAQ,
-  ALGORITHM_OUTPUT_CLASSIFICATION,
-  ALGORITHM_OUTPUT_REGRESSION,
-};
-
-enum OperatingAge {
-  OPERATING_AGE_4D,
-  OPERATING_AGE_28D,
-};
-
-enum SampleRate {
-  SAMPLE_RATE_LP = 0,
-  SAMPLE_RATE_ULP = 1,
-  SAMPLE_RATE_DEFAULT = 2,
-};
-
-enum Voltage {
-  VOLTAGE_1_8V,
-  VOLTAGE_3_3V,
-};
-
-class BME68xBSEC2Component : public Component {
- public:
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override;
-  void loop() override;
-
-  void set_algorithm_output(AlgorithmOutput algorithm_output) { this->algorithm_output_ = algorithm_output; }
-  void set_operating_age(OperatingAge operating_age) { this->operating_age_ = operating_age; }
-  void set_temperature_offset(float offset) { this->temperature_offset_ = offset; }
-  void set_voltage(Voltage voltage) { this->voltage_ = voltage; }
-
-  void set_sample_rate(SampleRate sample_rate) { this->sample_rate_ = sample_rate; }
-  void set_temperature_sample_rate(SampleRate sample_rate) { this->temperature_sample_rate_ = sample_rate; }
-  void set_pressure_sample_rate(SampleRate sample_rate) { this->pressure_sample_rate_ = sample_rate; }
-  void set_humidity_sample_rate(SampleRate sample_rate) { this->humidity_sample_rate_ = sample_rate; }
-
-  void set_bsec2_configuration(const uint8_t *data, const uint32_t len) {
-    this->bsec2_configuration_ = data;
-    this->bsec2_configuration_length_ = len;
-  }
-
-  void set_state_save_interval(uint32_t interval) { this->state_save_interval_ms_ = interval; }
-
-#ifdef USE_SENSOR
-  void set_temperature_sensor(sensor::Sensor *sensor) { this->temperature_sensor_ = sensor; }
-  void set_pressure_sensor(sensor::Sensor *sensor) { this->pressure_sensor_ = sensor; }
-  void set_humidity_sensor(sensor::Sensor *sensor) { this->humidity_sensor_ = sensor; }
-  void set_gas_resistance_sensor(sensor::Sensor *sensor) { this->gas_resistance_sensor_ = sensor; }
-  void set_iaq_sensor(sensor::Sensor *sensor) { this->iaq_sensor_ = sensor; }
-  void set_iaq_static_sensor(sensor::Sensor *sensor) { this->iaq_static_sensor_ = sensor; }
-  void set_iaq_accuracy_sensor(sensor::Sensor *sensor) { this->iaq_accuracy_sensor_ = sensor; }
-  void set_co2_equivalent_sensor(sensor::Sensor *sensor) { this->co2_equivalent_sensor_ = sensor; }
-  void set_breath_voc_equivalent_sensor(sensor::Sensor *sensor) { this->breath_voc_equivalent_sensor_ = sensor; }
-#endif
-#ifdef USE_TEXT_SENSOR
-  void set_iaq_accuracy_text_sensor(text_sensor::TextSensor *sensor) { this->iaq_accuracy_text_sensor_ = sensor; }
-#endif
-  virtual uint32_t get_hash() = 0;
-
- protected:
-  void set_config_(const uint8_t *config, u_int32_t len);
-  float calc_sensor_sample_rate_(SampleRate sample_rate);
-  void update_subscription_();
-
-  void run_();
-  void read_(int64_t trigger_time_ns);
-  void publish_(const bsec_output_t *outputs, uint8_t num_outputs);
-  int64_t get_time_ns_();
-
-#ifdef USE_SENSOR
-  void publish_sensor_(sensor::Sensor *sensor, float value, bool change_only = false);
-#endif
-#ifdef USE_TEXT_SENSOR
-  void publish_sensor_(text_sensor::TextSensor *sensor, const std::string &value);
-#endif
-
-  void load_state_();
-  void save_state_(uint8_t accuracy);
-
-  void queue_push_(std::function<void()> &&f) { this->queue_.push(std::move(f)); }
-
-  struct bme68x_dev bme68x_;
-  bsec_bme_settings_t bsec_settings_;
-  bsec_version_t version_;
-  uint8_t bsec_instance_[BSEC_INSTANCE_SIZE];
-
-  struct bme68x_heatr_conf bme68x_heatr_conf_;
-  uint8_t op_mode_;  // operating mode of sensor
-  bool sleep_mode_;
-  bsec_library_return_t bsec_status_{BSEC_OK};
-  int8_t bme68x_status_{BME68X_OK};
-
-  int64_t last_time_ms_{0};
-  uint32_t millis_overflow_counter_{0};
-  int64_t next_call_ns_{0};
-
-  std::queue<std::function<void()>> queue_;
-
-  uint8_t const *bsec2_configuration_{nullptr};
-  uint32_t bsec2_configuration_length_{0};
-  bool bsec2_blob_configured_{false};
-
-  ESPPreferenceObject bsec_state_;
-  uint32_t state_save_interval_ms_{21600000};  // 6 hours - 4 times a day
-  uint32_t last_state_save_ms_ = 0;
-
-  float temperature_offset_{0};
-
-  AlgorithmOutput algorithm_output_{ALGORITHM_OUTPUT_IAQ};
-  OperatingAge operating_age_{OPERATING_AGE_28D};
-  Voltage voltage_{VOLTAGE_3_3V};
-
-  SampleRate sample_rate_{SAMPLE_RATE_LP};  // Core/gas sample rate
-  SampleRate temperature_sample_rate_{SAMPLE_RATE_DEFAULT};
-  SampleRate pressure_sample_rate_{SAMPLE_RATE_DEFAULT};
-  SampleRate humidity_sample_rate_{SAMPLE_RATE_DEFAULT};
-
-#ifdef USE_SENSOR
-  sensor::Sensor *temperature_sensor_{nullptr};
-  sensor::Sensor *pressure_sensor_{nullptr};
-  sensor::Sensor *humidity_sensor_{nullptr};
-  sensor::Sensor *gas_resistance_sensor_{nullptr};
-  sensor::Sensor *iaq_sensor_{nullptr};
-  sensor::Sensor *iaq_static_sensor_{nullptr};
-  sensor::Sensor *iaq_accuracy_sensor_{nullptr};
-  sensor::Sensor *co2_equivalent_sensor_{nullptr};
-  sensor::Sensor *breath_voc_equivalent_sensor_{nullptr};
-#endif
-#ifdef USE_TEXT_SENSOR
-  text_sensor::TextSensor *iaq_accuracy_text_sensor_{nullptr};
-#endif
-};
-
-}  // namespace bme68x_bsec2
-}  // namespace esphome
-#endif
--- a/esphome/components/bme68x_bsec2/sensor.py
+++ b/esphome/components/bme68x_bsec2/sensor.py
@@ -1,130 +0,0 @@
-import esphome.codegen as cg
-from esphome.components import sensor
-import esphome.config_validation as cv
-from esphome.const import (
-    CONF_GAS_RESISTANCE,
-    CONF_HUMIDITY,
-    CONF_IAQ_ACCURACY,
-    CONF_PRESSURE,
-    CONF_SAMPLE_RATE,
-    CONF_TEMPERATURE,
-    DEVICE_CLASS_ATMOSPHERIC_PRESSURE,
-    DEVICE_CLASS_HUMIDITY,
-    DEVICE_CLASS_TEMPERATURE,
-    ICON_GAS_CYLINDER,
-    ICON_GAUGE,
-    ICON_THERMOMETER,
-    ICON_WATER_PERCENT,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_CELSIUS,
-    UNIT_HECTOPASCAL,
-    UNIT_OHM,
-    UNIT_PARTS_PER_MILLION,
-    UNIT_PERCENT,
-)
-
-from . import CONF_BME68X_BSEC2_ID, SAMPLE_RATE_OPTIONS, BME68xBSEC2Component
-
-DEPENDENCIES = ["bme68x_bsec2"]
-
-CONF_BREATH_VOC_EQUIVALENT = "breath_voc_equivalent"
-CONF_CO2_EQUIVALENT = "co2_equivalent"
-CONF_IAQ = "iaq"
-CONF_IAQ_STATIC = "iaq_static"
-ICON_ACCURACY = "mdi:checkbox-marked-circle-outline"
-ICON_TEST_TUBE = "mdi:test-tube"
-UNIT_IAQ = "IAQ"
-
-TYPES = [
-    CONF_TEMPERATURE,
-    CONF_PRESSURE,
-    CONF_HUMIDITY,
-    CONF_GAS_RESISTANCE,
-    CONF_IAQ,
-    CONF_IAQ_STATIC,
-    CONF_IAQ_ACCURACY,
-    CONF_CO2_EQUIVALENT,
-    CONF_BREATH_VOC_EQUIVALENT,
-]
-
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(CONF_BME68X_BSEC2_ID): cv.use_id(BME68xBSEC2Component),
-        cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
-            unit_of_measurement=UNIT_CELSIUS,
-            icon=ICON_THERMOMETER,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_TEMPERATURE,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ).extend(
-            {cv.Optional(CONF_SAMPLE_RATE): cv.enum(SAMPLE_RATE_OPTIONS, upper=True)}
-        ),
-        cv.Optional(CONF_PRESSURE): sensor.sensor_schema(
-            unit_of_measurement=UNIT_HECTOPASCAL,
-            icon=ICON_GAUGE,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_ATMOSPHERIC_PRESSURE,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ).extend(
-            {cv.Optional(CONF_SAMPLE_RATE): cv.enum(SAMPLE_RATE_OPTIONS, upper=True)}
-        ),
-        cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(
-            unit_of_measurement=UNIT_PERCENT,
-            icon=ICON_WATER_PERCENT,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_HUMIDITY,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ).extend(
-            {cv.Optional(CONF_SAMPLE_RATE): cv.enum(SAMPLE_RATE_OPTIONS, upper=True)}
-        ),
-        cv.Optional(CONF_GAS_RESISTANCE): sensor.sensor_schema(
-            unit_of_measurement=UNIT_OHM,
-            icon=ICON_GAS_CYLINDER,
-            accuracy_decimals=0,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_IAQ): sensor.sensor_schema(
-            unit_of_measurement=UNIT_IAQ,
-            icon=ICON_GAUGE,
-            accuracy_decimals=0,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_IAQ_STATIC): sensor.sensor_schema(
-            unit_of_measurement=UNIT_IAQ,
-            icon=ICON_GAUGE,
-            accuracy_decimals=0,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_IAQ_ACCURACY): sensor.sensor_schema(
-            icon=ICON_ACCURACY,
-            accuracy_decimals=0,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_CO2_EQUIVALENT): sensor.sensor_schema(
-            unit_of_measurement=UNIT_PARTS_PER_MILLION,
-            icon=ICON_TEST_TUBE,
-            accuracy_decimals=1,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_BREATH_VOC_EQUIVALENT): sensor.sensor_schema(
-            unit_of_measurement=UNIT_PARTS_PER_MILLION,
-            icon=ICON_TEST_TUBE,
-            accuracy_decimals=1,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-    }
-)
-
-
-async def setup_conf(config, key, hub):
-    if conf := config.get(key):
-        sens = await sensor.new_sensor(conf)
-        cg.add(getattr(hub, f"set_{key}_sensor")(sens))
-        if sample_rate := conf.get(CONF_SAMPLE_RATE):
-            cg.add(getattr(hub, f"set_{key}_sample_rate")(sample_rate))
-
-
-async def to_code(config):
-    hub = await cg.get_variable(config[CONF_BME68X_BSEC2_ID])
-    for key in TYPES:
-        await setup_conf(config, key, hub)
--- a/esphome/components/bme68x_bsec2/text_sensor.py
+++ b/esphome/components/bme68x_bsec2/text_sensor.py
@@ -1,33 +0,0 @@
-import esphome.codegen as cg
-from esphome.components import text_sensor
-import esphome.config_validation as cv
-from esphome.const import CONF_IAQ_ACCURACY
-
-from . import CONF_BME68X_BSEC2_ID, BME68xBSEC2Component
-
-DEPENDENCIES = ["bme68x_bsec2"]
-
-ICON_ACCURACY = "mdi:checkbox-marked-circle-outline"
-
-TYPES = [CONF_IAQ_ACCURACY]
-
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(CONF_BME68X_BSEC2_ID): cv.use_id(BME68xBSEC2Component),
-        cv.Optional(CONF_IAQ_ACCURACY): text_sensor.text_sensor_schema(
-            icon=ICON_ACCURACY
-        ),
-    }
-)
-
-
-async def setup_conf(config, key, hub):
-    if conf := config.get(key):
-        sens = await text_sensor.new_text_sensor(conf)
-        cg.add(getattr(hub, f"set_{key}_text_sensor")(sens))
-
-
-async def to_code(config):
-    hub = await cg.get_variable(config[CONF_BME68X_BSEC2_ID])
-    for key in TYPES:
-        await setup_conf(config, key, hub)
--- a/esphome/components/bme68x_bsec2_i2c/init.py
+++ b/esphome/components/bme68x_bsec2_i2c/init.py
@@ -1,28 +0,0 @@
-import esphome.codegen as cg
-from esphome.components import i2c
-from esphome.components.bme68x_bsec2 import (
-    CONFIG_SCHEMA_BASE,
-    BME68xBSEC2Component,
-    to_code_base,
-)
-import esphome.config_validation as cv
-
-CODEOWNERS = ["@neffs", "@kbx81"]
-
-AUTO_LOAD = ["bme68x_bsec2"]
-DEPENDENCIES = ["i2c"]
-
-bme68x_bsec2_i2c_ns = cg.esphome_ns.namespace("bme68x_bsec2_i2c")
-BME68xBSEC2I2CComponent = bme68x_bsec2_i2c_ns.class_(
-    "BME68xBSEC2I2CComponent", BME68xBSEC2Component, i2c.I2CDevice
-)
-
-
-CONFIG_SCHEMA = CONFIG_SCHEMA_BASE.extend(
-    cv.Schema({cv.GenerateID(): cv.declare_id(BME68xBSEC2I2CComponent)})
-).extend(i2c.i2c_device_schema(0x76))
-
-
-async def to_code(config):
-    var = await to_code_base(config)
-    await i2c.register_i2c_device(var, config)
--- a/esphome/components/bme68x_bsec2_i2c/bme68x_bsec2_i2c.cpp
+++ b/esphome/components/bme68x_bsec2_i2c/bme68x_bsec2_i2c.cpp
@@ -1,53 +0,0 @@
-#include "esphome/core/defines.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-#ifdef USE_BSEC2
-#include "bme68x_bsec2_i2c.h"
-#include "esphome/components/i2c/i2c.h"
-
-#include <cinttypes>
-
-namespace esphome {
-namespace bme68x_bsec2_i2c {
-
-static const char *const TAG = "bme68x_bsec2_i2c.sensor";
-
-void BME68xBSEC2I2CComponent::setup() {
-  // must set up our bme68x_dev instance before calling setup()
-  this->bme68x_.intf_ptr = (void *) this;
-  this->bme68x_.intf = BME68X_I2C_INTF;
-  this->bme68x_.read = BME68xBSEC2I2CComponent::read_bytes_wrapper;
-  this->bme68x_.write = BME68xBSEC2I2CComponent::write_bytes_wrapper;
-  this->bme68x_.delay_us = BME68xBSEC2I2CComponent::delay_us;
-  this->bme68x_.amb_temp = 25;
-
-  BME68xBSEC2Component::setup();
-}
-
-void BME68xBSEC2I2CComponent::dump_config() {
-  LOG_I2C_DEVICE(this);
-  BME68xBSEC2Component::dump_config();
-}
-
-uint32_t BME68xBSEC2I2CComponent::get_hash() { return fnv1_hash("bme68x_bsec_state_" + to_string(this->address_)); }
-
-int8_t BME68xBSEC2I2CComponent::read_bytes_wrapper(uint8_t a_register, uint8_t *data, uint32_t len, void *intfPtr) {
-  ESP_LOGVV(TAG, "read_bytes_wrapper: reg = %u", a_register);
-  return static_cast<BME68xBSEC2I2CComponent *>(intfPtr)->read_bytes(a_register, data, len) ? 0 : -1;
-}
-
-int8_t BME68xBSEC2I2CComponent::write_bytes_wrapper(uint8_t a_register, const uint8_t *data, uint32_t len,
-                                                    void *intfPtr) {
-  ESP_LOGVV(TAG, "write_bytes_wrapper: reg = %u", a_register);
-  return static_cast<BME68xBSEC2I2CComponent *>(intfPtr)->write_bytes(a_register, data, len) ? 0 : -1;
-}
-
-void BME68xBSEC2I2CComponent::delay_us(uint32_t period, void *intfPtr) {
-  ESP_LOGVV(TAG, "Delaying for %" PRIu32 "us", period);
-  delayMicroseconds(period);
-}
-
-}  // namespace bme68x_bsec2_i2c
-}  // namespace esphome
-#endif
--- a/esphome/components/bme68x_bsec2_i2c/bme68x_bsec2_i2c.h
+++ b/esphome/components/bme68x_bsec2_i2c/bme68x_bsec2_i2c.h
@@ -1,28 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/defines.h"
-#include "esphome/core/preferences.h"
-
-#ifdef USE_BSEC2
-
-#include "esphome/components/bme68x_bsec2/bme68x_bsec2.h"
-#include "esphome/components/i2c/i2c.h"
-
-namespace esphome {
-namespace bme68x_bsec2_i2c {
-
-class BME68xBSEC2I2CComponent : public bme68x_bsec2::BME68xBSEC2Component, public i2c::I2CDevice {
-  void setup() override;
-  void dump_config() override;
-
-  uint32_t get_hash() override;
-
-  static int8_t read_bytes_wrapper(uint8_t a_register, uint8_t *data, uint32_t len, void *intfPtr);
-  static int8_t write_bytes_wrapper(uint8_t a_register, const uint8_t *data, uint32_t len, void *intfPtr);
-  static void delay_us(uint32_t period, void *intfPtr);
-};
-
-}  // namespace bme68x_bsec2_i2c
-}  // namespace esphome
-#endif
--- a/esphome/components/bmp280_base/bmp280_base.cpp
+++ b/esphome/components/bmp280_base/bmp280_base.cpp
@@ -1,9 +1,9 @@
-#include "bmp280_base.h"
+#include "bmp280.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/log.h"

 namespace esphome {
-namespace bmp280_base {
+namespace bmp280 {

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

@@ -59,14 +59,6 @@ static const char *iir_filter_to_str(BMP280IIRFilter filter) {
 void BMP280Component::setup() {
  ESP_LOGCONFIG(TAG, "Setting up BMP280...");
  uint8_t chip_id = 0;
-
-  // Read the chip id twice, to work around a bug where the first read is 0.
-  // https://community.st.com/t5/stm32-mcus-products/issue-with-reading-bmp280-chip-id-using-spi/td-p/691855
-  if (!this->read_byte(0xD0, &chip_id)) {
-    this->error_code_ = COMMUNICATION_FAILED;
-    this->mark_failed();
-    return;
-  }
  if (!this->read_byte(0xD0, &chip_id)) {
    this->error_code_ = COMMUNICATION_FAILED;
    this->mark_failed();
@@ -130,6 +122,7 @@ void BMP280Component::setup() {
 }
 void BMP280Component::dump_config() {
  ESP_LOGCONFIG(TAG, "BMP280:");
+  LOG_I2C_DEVICE(this);
  switch (this->error_code_) {
    case COMMUNICATION_FAILED:
      ESP_LOGE(TAG, "Communication with BMP280 failed!");
@@ -269,5 +262,5 @@ uint16_t BMP280Component::read_u16_le_(uint8_t a_register) {
 }
 int16_t BMP280Component::read_s16_le_(uint8_t a_register) { return this->read_u16_le_(a_register); }

-}  // namespace bmp280_base
+}  // namespace bmp280
 }  // namespace esphome
--- a/esphome/components/bmp280_base/bmp280_base.h
+++ b/esphome/components/bmp280_base/bmp280_base.h
@@ -2,9 +2,10 @@

 #include "esphome/core/component.h"
 #include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"

 namespace esphome {
-namespace bmp280_base {
+namespace bmp280 {

 /// Internal struct storing the calibration values of an BMP280.
 struct BMP280CalibrationData {
@@ -49,8 +50,8 @@ enum BMP280IIRFilter {
  BMP280_IIR_FILTER_16X = 0b100,
 };

-/// This class implements support for the BMP280 Temperature+Pressure sensor.
-class BMP280Component : public PollingComponent {
+/// This class implements support for the BMP280 Temperature+Pressure i2c sensor.
+class BMP280Component : public PollingComponent, public i2c::I2CDevice {
 public:
  void set_temperature_sensor(sensor::Sensor *temperature_sensor) { temperature_sensor_ = temperature_sensor; }
  void set_pressure_sensor(sensor::Sensor *pressure_sensor) { pressure_sensor_ = pressure_sensor; }
@@ -67,11 +68,6 @@ class BMP280Component : public PollingComponent {
  float get_setup_priority() const override;
  void update() override;

-  virtual bool read_byte(uint8_t a_register, uint8_t *data) = 0;
-  virtual bool write_byte(uint8_t a_register, uint8_t data) = 0;
-  virtual bool read_bytes(uint8_t a_register, uint8_t *data, size_t len) = 0;
-  virtual bool read_byte_16(uint8_t a_register, uint16_t *data) = 0;
-
 protected:
  /// Read the temperature value and store the calculated ambient temperature in t_fine.
  float read_temperature_(int32_t *t_fine);
@@ -94,5 +90,5 @@ class BMP280Component : public PollingComponent {
  } error_code_{NONE};
 };

-}  // namespace bmp280_base
+}  // namespace bmp280
 }  // namespace esphome
--- a/esphome/components/bmp280/sensor.py
+++ b/esphome/components/bmp280/sensor.py
@@ -1,5 +1,96 @@
+import esphome.codegen as cg
 import esphome.config_validation as cv
-
-CONFIG_SCHEMA = cv.invalid(
-    "The bmp280 sensor component has been renamed to bmp280_i2c."
+from esphome.components import i2c, sensor
+from esphome.const import (
+    CONF_ID,
+    CONF_PRESSURE,
+    CONF_TEMPERATURE,
+    DEVICE_CLASS_PRESSURE,
+    DEVICE_CLASS_TEMPERATURE,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_CELSIUS,
+    UNIT_HECTOPASCAL,
+    CONF_IIR_FILTER,
+    CONF_OVERSAMPLING,
 )
+
+DEPENDENCIES = ["i2c"]
+
+bmp280_ns = cg.esphome_ns.namespace("bmp280")
+BMP280Oversampling = bmp280_ns.enum("BMP280Oversampling")
+OVERSAMPLING_OPTIONS = {
+    "NONE": BMP280Oversampling.BMP280_OVERSAMPLING_NONE,
+    "1X": BMP280Oversampling.BMP280_OVERSAMPLING_1X,
+    "2X": BMP280Oversampling.BMP280_OVERSAMPLING_2X,
+    "4X": BMP280Oversampling.BMP280_OVERSAMPLING_4X,
+    "8X": BMP280Oversampling.BMP280_OVERSAMPLING_8X,
+    "16X": BMP280Oversampling.BMP280_OVERSAMPLING_16X,
+}
+
+BMP280IIRFilter = bmp280_ns.enum("BMP280IIRFilter")
+IIR_FILTER_OPTIONS = {
+    "OFF": BMP280IIRFilter.BMP280_IIR_FILTER_OFF,
+    "2X": BMP280IIRFilter.BMP280_IIR_FILTER_2X,
+    "4X": BMP280IIRFilter.BMP280_IIR_FILTER_4X,
+    "8X": BMP280IIRFilter.BMP280_IIR_FILTER_8X,
+    "16X": BMP280IIRFilter.BMP280_IIR_FILTER_16X,
+}
+
+BMP280Component = bmp280_ns.class_(
+    "BMP280Component", cg.PollingComponent, i2c.I2CDevice
+)
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(BMP280Component),
+            cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
+                unit_of_measurement=UNIT_CELSIUS,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_TEMPERATURE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ).extend(
+                {
+                    cv.Optional(CONF_OVERSAMPLING, default="16X"): cv.enum(
+                        OVERSAMPLING_OPTIONS, upper=True
+                    ),
+                }
+            ),
+            cv.Optional(CONF_PRESSURE): sensor.sensor_schema(
+                unit_of_measurement=UNIT_HECTOPASCAL,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_PRESSURE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ).extend(
+                {
+                    cv.Optional(CONF_OVERSAMPLING, default="16X"): cv.enum(
+                        OVERSAMPLING_OPTIONS, upper=True
+                    ),
+                }
+            ),
+            cv.Optional(CONF_IIR_FILTER, default="OFF"): cv.enum(
+                IIR_FILTER_OPTIONS, upper=True
+            ),
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+    .extend(i2c.i2c_device_schema(0x77))
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await i2c.register_i2c_device(var, config)
+
+    if temperature_config := config.get(CONF_TEMPERATURE):
+        sens = await sensor.new_sensor(temperature_config)
+        cg.add(var.set_temperature_sensor(sens))
+        cg.add(var.set_temperature_oversampling(temperature_config[CONF_OVERSAMPLING]))
+
+    if pressure_config := config.get(CONF_PRESSURE):
+        sens = await sensor.new_sensor(pressure_config)
+        cg.add(var.set_pressure_sensor(sens))
+        cg.add(var.set_pressure_oversampling(pressure_config[CONF_OVERSAMPLING]))
+
+    cg.add(var.set_iir_filter(config[CONF_IIR_FILTER]))
--- a/esphome/components/bmp280_base/init.py
+++ b/esphome/components/bmp280_base/init.py
@@ -1,88 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor
-from esphome.const import (
-    CONF_ID,
-    CONF_IIR_FILTER,
-    CONF_OVERSAMPLING,
-    CONF_PRESSURE,
-    CONF_TEMPERATURE,
-    DEVICE_CLASS_PRESSURE,
-    DEVICE_CLASS_TEMPERATURE,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_CELSIUS,
-    UNIT_HECTOPASCAL,
-)
-
-CODEOWNERS = ["@ademuri"]
-
-bmp280_ns = cg.esphome_ns.namespace("bmp280_base")
-BMP280Oversampling = bmp280_ns.enum("BMP280Oversampling")
-OVERSAMPLING_OPTIONS = {
-    "NONE": BMP280Oversampling.BMP280_OVERSAMPLING_NONE,
-    "1X": BMP280Oversampling.BMP280_OVERSAMPLING_1X,
-    "2X": BMP280Oversampling.BMP280_OVERSAMPLING_2X,
-    "4X": BMP280Oversampling.BMP280_OVERSAMPLING_4X,
-    "8X": BMP280Oversampling.BMP280_OVERSAMPLING_8X,
-    "16X": BMP280Oversampling.BMP280_OVERSAMPLING_16X,
-}
-
-BMP280IIRFilter = bmp280_ns.enum("BMP280IIRFilter")
-IIR_FILTER_OPTIONS = {
-    "OFF": BMP280IIRFilter.BMP280_IIR_FILTER_OFF,
-    "2X": BMP280IIRFilter.BMP280_IIR_FILTER_2X,
-    "4X": BMP280IIRFilter.BMP280_IIR_FILTER_4X,
-    "8X": BMP280IIRFilter.BMP280_IIR_FILTER_8X,
-    "16X": BMP280IIRFilter.BMP280_IIR_FILTER_16X,
-}
-
-CONFIG_SCHEMA_BASE = cv.Schema(
-    {
-        cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
-            unit_of_measurement=UNIT_CELSIUS,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_TEMPERATURE,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ).extend(
-            {
-                cv.Optional(CONF_OVERSAMPLING, default="16X"): cv.enum(
-                    OVERSAMPLING_OPTIONS, upper=True
-                ),
-            }
-        ),
-        cv.Optional(CONF_PRESSURE): sensor.sensor_schema(
-            unit_of_measurement=UNIT_HECTOPASCAL,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_PRESSURE,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ).extend(
-            {
-                cv.Optional(CONF_OVERSAMPLING, default="16X"): cv.enum(
-                    OVERSAMPLING_OPTIONS, upper=True
-                ),
-            }
-        ),
-        cv.Optional(CONF_IIR_FILTER, default="OFF"): cv.enum(
-            IIR_FILTER_OPTIONS, upper=True
-        ),
-    }
-).extend(cv.polling_component_schema("60s"))
-
-
-async def to_code_base(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature_sensor(sens))
-        cg.add(var.set_temperature_oversampling(temperature_config[CONF_OVERSAMPLING]))
-
-    if pressure_config := config.get(CONF_PRESSURE):
-        sens = await sensor.new_sensor(pressure_config)
-        cg.add(var.set_pressure_sensor(sens))
-        cg.add(var.set_pressure_oversampling(pressure_config[CONF_OVERSAMPLING]))
-
-    cg.add(var.set_iir_filter(config[CONF_IIR_FILTER]))
-
-    return var
--- a/esphome/components/bmp280_i2c/init.py
+++ b/esphome/components/bmp280_i2c/init.py
--- a/esphome/components/bmp280_i2c/bmp280_i2c.cpp
+++ b/esphome/components/bmp280_i2c/bmp280_i2c.cpp
@@ -1,27 +0,0 @@
-#include "bmp280_i2c.h"
-#include "esphome/core/hal.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace bmp280_i2c {
-
-bool BMP280I2CComponent::read_byte(uint8_t a_register, uint8_t *data) {
-  return I2CDevice::read_byte(a_register, data);
-};
-bool BMP280I2CComponent::write_byte(uint8_t a_register, uint8_t data) {
-  return I2CDevice::write_byte(a_register, data);
-};
-bool BMP280I2CComponent::read_bytes(uint8_t a_register, uint8_t *data, size_t len) {
-  return I2CDevice::read_bytes(a_register, data, len);
-};
-bool BMP280I2CComponent::read_byte_16(uint8_t a_register, uint16_t *data) {
-  return I2CDevice::read_byte_16(a_register, data);
-};
-
-void BMP280I2CComponent::dump_config() {
-  LOG_I2C_DEVICE(this);
-  BMP280Component::dump_config();
-}
-
-}  // namespace bmp280_i2c
-}  // namespace esphome
--- a/esphome/components/bmp280_i2c/bmp280_i2c.h
+++ b/esphome/components/bmp280_i2c/bmp280_i2c.h
@@ -1,22 +0,0 @@
-#pragma once
-
-#include "esphome/components/bmp280_base/bmp280_base.h"
-#include "esphome/components/i2c/i2c.h"
-
-namespace esphome {
-namespace bmp280_i2c {
-
-static const char *const TAG = "bmp280_i2c.sensor";
-
-/// This class implements support for the BMP280 Temperature+Pressure i2c sensor.
-class BMP280I2CComponent : public esphome::bmp280_base::BMP280Component, public i2c::I2CDevice {
- public:
-  bool read_byte(uint8_t a_register, uint8_t *data) override;
-  bool write_byte(uint8_t a_register, uint8_t data) override;
-  bool read_bytes(uint8_t a_register, uint8_t *data, size_t len) override;
-  bool read_byte_16(uint8_t a_register, uint16_t *data) override;
-  void dump_config() override;
-};
-
-}  // namespace bmp280_i2c
-}  // namespace esphome
--- a/esphome/components/bmp280_i2c/sensor.py
+++ b/esphome/components/bmp280_i2c/sensor.py
@@ -1,22 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import i2c
-from ..bmp280_base import to_code_base, CONFIG_SCHEMA_BASE
-
-AUTO_LOAD = ["bmp280_base"]
-CODEOWNERS = ["@ademuri"]
-DEPENDENCIES = ["i2c"]
-
-bmp280_ns = cg.esphome_ns.namespace("bmp280_i2c")
-BMP280I2CComponent = bmp280_ns.class_(
-    "BMP280I2CComponent", cg.PollingComponent, i2c.I2CDevice
-)
-
-CONFIG_SCHEMA = CONFIG_SCHEMA_BASE.extend(
-    i2c.i2c_device_schema(default_address=0x77)
-).extend({cv.GenerateID(): cv.declare_id(BMP280I2CComponent)})
-
-
-async def to_code(config):
-    var = await to_code_base(config)
-    await i2c.register_i2c_device(var, config)
--- a/esphome/components/bmp280_spi/init.py
+++ b/esphome/components/bmp280_spi/init.py
--- a/esphome/components/bmp280_spi/bmp280_spi.cpp
+++ b/esphome/components/bmp280_spi/bmp280_spi.cpp
@@ -1,65 +0,0 @@
-#include <cstdint>
-#include <cstddef>
-
-#include "bmp280_spi.h"
-#include <esphome/components/bmp280_base/bmp280_base.h>
-
-namespace esphome {
-namespace bmp280_spi {
-
-uint8_t set_bit(uint8_t num, uint8_t position) {
-  uint8_t mask = 1 << position;
-  return num | mask;
-}
-
-uint8_t clear_bit(uint8_t num, uint8_t position) {
-  uint8_t mask = 1 << position;
-  return num & ~mask;
-}
-
-void BMP280SPIComponent::setup() {
-  this->spi_setup();
-  BMP280Component::setup();
-};
-
-// In SPI mode, only 7 bits of the register addresses are used; the MSB of register address is not used
-// and replaced by a read/write bit (RW = ‘0’ for write and RW = ‘1’ for read).
-// Example: address 0xF7 is accessed by using SPI register address 0x77. For write access, the byte
-// 0x77 is transferred, for read access, the byte 0xF7 is transferred.
-// https://www.bosch-sensortec.com/media/boschsensortec/downloads/datasheets/bst-bmp280-ds001.pdf
-
-bool BMP280SPIComponent::read_byte(uint8_t a_register, uint8_t *data) {
-  this->enable();
-  this->transfer_byte(set_bit(a_register, 7));
-  *data = this->transfer_byte(0);
-  this->disable();
-  return true;
-}
-
-bool BMP280SPIComponent::write_byte(uint8_t a_register, uint8_t data) {
-  this->enable();
-  this->transfer_byte(clear_bit(a_register, 7));
-  this->transfer_byte(data);
-  this->disable();
-  return true;
-}
-
-bool BMP280SPIComponent::read_bytes(uint8_t a_register, uint8_t *data, size_t len) {
-  this->enable();
-  this->transfer_byte(set_bit(a_register, 7));
-  this->read_array(data, len);
-  this->disable();
-  return true;
-}
-
-bool BMP280SPIComponent::read_byte_16(uint8_t a_register, uint16_t *data) {
-  this->enable();
-  this->transfer_byte(set_bit(a_register, 7));
-  ((uint8_t *) data)[1] = this->transfer_byte(0);
-  ((uint8_t *) data)[0] = this->transfer_byte(0);
-  this->disable();
-  return true;
-}
-
-}  // namespace bmp280_spi
-}  // namespace esphome
--- a/esphome/components/bmp280_spi/bmp280_spi.h
+++ b/esphome/components/bmp280_spi/bmp280_spi.h
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "esphome/components/bmp280_base/bmp280_base.h"
-#include "esphome/components/spi/spi.h"
-
-namespace esphome {
-namespace bmp280_spi {
-
-class BMP280SPIComponent : public esphome::bmp280_base::BMP280Component,
-                           public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW,
-                                                 spi::CLOCK_PHASE_LEADING, spi::DATA_RATE_200KHZ> {
-  void setup() override;
-  bool read_byte(uint8_t a_register, uint8_t *data) override;
-  bool write_byte(uint8_t a_register, uint8_t data) override;
-  bool read_bytes(uint8_t a_register, uint8_t *data, size_t len) override;
-  bool read_byte_16(uint8_t a_register, uint16_t *data) override;
-};
-
-}  // namespace bmp280_spi
-}  // namespace esphome
--- a/esphome/components/bmp280_spi/sensor.py
+++ b/esphome/components/bmp280_spi/sensor.py
@@ -1,22 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import spi
-from ..bmp280_base import to_code_base, CONFIG_SCHEMA_BASE
-
-AUTO_LOAD = ["bmp280_base"]
-CODEOWNERS = ["@ademuri"]
-DEPENDENCIES = ["spi"]
-
-bmp280_ns = cg.esphome_ns.namespace("bmp280_spi")
-BMP280SPIComponent = bmp280_ns.class_(
-    "BMP280SPIComponent", cg.PollingComponent, spi.SPIDevice
-)
-
-CONFIG_SCHEMA = CONFIG_SCHEMA_BASE.extend(
-    spi.spi_device_schema(default_mode="mode3")
-).extend({cv.GenerateID(): cv.declare_id(BMP280SPIComponent)})
-
-
-async def to_code(config):
-    var = await to_code_base(config)
-    await spi.register_spi_device(var, config)
--- a/esphome/components/bmp3xx/sensor.py
+++ b/esphome/components/bmp3xx/sensor.py
@@ -2,6 +2,6 @@ import esphome.config_validation as cv

 CODEOWNERS = ["@latonita"]

-CONFIG_SCHEMA = cv.invalid(
+CONFIG_SCHEMA = CONFIG_SCHEMA = cv.invalid(
    "The bmp3xx sensor component has been renamed to bmp3xx_i2c."
 )
--- a/esphome/components/button/init.py
+++ b/esphome/components/button/init.py
@@ -1,16 +1,16 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
 from esphome import automation
 from esphome.automation import maybe_simple_id
-import esphome.codegen as cg
 from esphome.components import mqtt, web_server
-import esphome.config_validation as cv
 from esphome.const import (
    CONF_DEVICE_CLASS,
    CONF_ENTITY_CATEGORY,
    CONF_ICON,
    CONF_ID,
-    CONF_MQTT_ID,
    CONF_ON_PRESS,
    CONF_TRIGGER_ID,
+    CONF_MQTT_ID,
    CONF_WEB_SERVER_ID,
    DEVICE_CLASS_EMPTY,
    DEVICE_CLASS_IDENTIFY,
@@ -18,8 +18,8 @@ from esphome.const import (
    DEVICE_CLASS_UPDATE,
 )
 from esphome.core import CORE, coroutine_with_priority
-from esphome.cpp_generator import MockObjClass
 from esphome.cpp_helpers import setup_entity
+from esphome.cpp_generator import MockObjClass

 CODEOWNERS = ["@esphome/core"]
 IS_PLATFORM_COMPONENT = True
--- a/esphome/components/captive_portal/captive_portal.cpp
+++ b/esphome/components/captive_portal/captive_portal.cpp
@@ -1,5 +1,4 @@
 #include "captive_portal.h"
-#ifdef USE_CAPTIVE_PORTAL
 #include "esphome/core/log.h"
 #include "esphome/core/application.h"
 #include "esphome/components/wifi/wifi_component.h"
@@ -92,4 +91,3 @@ CaptivePortal *global_captive_portal = nullptr;  // NOLINT(cppcoreguidelines-avo

 }  // namespace captive_portal
 }  // namespace esphome
-#endif
--- a/esphome/components/captive_portal/captive_portal.h
+++ b/esphome/components/captive_portal/captive_portal.h
@@ -1,6 +1,5 @@
 #pragma once
-#include "esphome/core/defines.h"
-#ifdef USE_CAPTIVE_PORTAL
+
 #include <memory>
 #ifdef USE_ARDUINO
 #include <DNSServer.h>
@@ -72,4 +71,3 @@ extern CaptivePortal *global_captive_portal;  // NOLINT(cppcoreguidelines-avoid-

 }  // namespace captive_portal
 }  // namespace esphome
-#endif
--- a/esphome/components/ch422g/init.py
+++ b/esphome/components/ch422g/init.py
@@ -1,67 +0,0 @@
-from esphome import pins
-import esphome.codegen as cg
-from esphome.components import i2c
-import esphome.config_validation as cv
-from esphome.const import (
-    CONF_ID,
-    CONF_INPUT,
-    CONF_INVERTED,
-    CONF_MODE,
-    CONF_NUMBER,
-    CONF_OUTPUT,
-    CONF_RESTORE_VALUE,
-)
-
-CODEOWNERS = ["@jesterret"]
-DEPENDENCIES = ["i2c"]
-MULTI_CONF = True
-ch422g_ns = cg.esphome_ns.namespace("ch422g")
-
-CH422GComponent = ch422g_ns.class_("CH422GComponent", cg.Component, i2c.I2CDevice)
-CH422GGPIOPin = ch422g_ns.class_(
-    "CH422GGPIOPin", cg.GPIOPin, cg.Parented.template(CH422GComponent)
-)
-
-CONF_CH422G = "ch422g"
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.Required(CONF_ID): cv.declare_id(CH422GComponent),
-            cv.Optional(CONF_RESTORE_VALUE, default=False): cv.boolean,
-        }
-    )
-    .extend(cv.COMPONENT_SCHEMA)
-    .extend(i2c.i2c_device_schema(0x24))
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    cg.add(var.set_restore_value(config[CONF_RESTORE_VALUE]))
-    await cg.register_component(var, config)
-    await i2c.register_i2c_device(var, config)
-
-
-CH422G_PIN_SCHEMA = pins.gpio_base_schema(
-    CH422GGPIOPin,
-    cv.int_range(min=0, max=7),
-    modes=[CONF_INPUT, CONF_OUTPUT],
-).extend(
-    {
-        cv.Required(CONF_CH422G): cv.use_id(CH422GComponent),
-    }
-)
-
-
-@pins.PIN_SCHEMA_REGISTRY.register(CONF_CH422G, CH422G_PIN_SCHEMA)
-async def ch422g_pin_to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    parent = await cg.get_variable(config[CONF_CH422G])
-
-    cg.add(var.set_parent(parent))
-
-    num = config[CONF_NUMBER]
-    cg.add(var.set_pin(num))
-    cg.add(var.set_inverted(config[CONF_INVERTED]))
-    cg.add(var.set_flags(pins.gpio_flags_expr(config[CONF_MODE])))
-    return var
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`CODEOWNERS = ["@athom-tech", "@tarontop", "@jesserockz"]`