Logs requests left

2025-11-02 08:01:50 +00:00 · 2024-08-28 11:23:10 +12:00
519 changed files with 5715 additions and 16985 deletions
--- a/.github/actions/build-image/action.yaml
+++ b/.github/actions/build-image/action.yaml
@@ -46,10 +46,7 @@ runs:

    - name: Build and push to ghcr by digest
      id: build-ghcr
-      uses: docker/build-push-action@v6.9.0
-      env:
-        DOCKER_BUILD_SUMMARY: false
-        DOCKER_BUILD_RECORD_UPLOAD: false
+      uses: docker/build-push-action@v6.7.0
      with:
        context: .
        file: ./docker/Dockerfile
@@ -72,10 +69,7 @@ runs:

    - name: Build and push to dockerhub by digest
      id: build-dockerhub
-      uses: docker/build-push-action@v6.9.0
-      env:
-        DOCKER_BUILD_SUMMARY: false
-        DOCKER_BUILD_RECORD_UPLOAD: false
+      uses: docker/build-push-action@v6.7.0
      with:
        context: .
        file: ./docker/Dockerfile
--- a/.github/actions/restore-python/action.yml
+++ b/.github/actions/restore-python/action.yml
@@ -17,12 +17,12 @@ runs:
  steps:
    - name: Set up Python ${{ inputs.python-version }}
      id: python
-      uses: actions/setup-python@v5.2.0
+      uses: actions/setup-python@v5.1.1
      with:
        python-version: ${{ inputs.python-version }}
    - name: Restore Python virtual environment
      id: cache-venv
-      uses: actions/cache/restore@v4.1.1
+      uses: actions/cache/restore@v4.0.2
      with:
        path: venv
        # yamllint disable-line rule:line-length
--- 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,11 +42,11 @@ 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.7.1
+        uses: docker/setup-buildx-action@v3.6.1
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v3.2.0

--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,12 +41,12 @@ 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
        id: cache-venv
-        uses: actions/cache@v4.1.1
+        uses: actions/cache@v4.0.2
        with:
          path: venv
          # yamllint disable-line rule:line-length
@@ -302,22 +302,20 @@ jobs:

      - name: Cache platformio
        if: github.ref == 'refs/heads/dev'
-        uses: actions/cache@v4.1.1
+        uses: actions/cache@v4.0.2
        with:
          path: ~/.platformio
          key: platformio-${{ matrix.pio_cache_key }}

      - name: Cache platformio
        if: github.ref != 'refs/heads/dev'
-        uses: actions/cache/restore@v4.1.1
+        uses: actions/cache/restore@v4.0.2
        with:
          path: ~/.platformio
          key: platformio-${{ matrix.pio_cache_key }}

      - name: Install clang-tidy
-        run: |
-          sudo apt-get update
-          sudo apt-get install clang-tidy-14
+        run: sudo apt-get install clang-tidy-14

      - name: Register problem matchers
        run: |
@@ -399,9 +397,7 @@ jobs:
        file: ${{ fromJson(needs.list-components.outputs.components) }}
    steps:
      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install libsdl2-dev
+        run: sudo apt-get install libsdl2-dev

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

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

      - name: Check out code from GitHub
        uses: actions/checkout@v4.1.7
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -1,91 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL Advanced"
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "30 18 * * 4"
-
-jobs:
-  analyze:
-    name: Analyze (${{ matrix.language }})
-    # Runner size impacts CodeQL analysis time. To learn more, please see:
-    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
-    #   - https://gh.io/supported-runners-and-hardware-resources
-    #   - https://gh.io/using-larger-runners (GitHub.com only)
-    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
-    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
-    permissions:
-      # required for all workflows
-      security-events: write
-
-      # required to fetch internal or private CodeQL packs
-      packages: read
-
-      # only required for workflows in private repositories
-      actions: read
-      contents: read
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          # - language: c-cpp
-          #   build-mode: autobuild
-          - language: python
-            build-mode: none
-            # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
-            # Use `c-cpp` to analyze code written in C, C++ or both
-            # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
-            # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
-            # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
-            # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
-            # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
-            # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
-        with:
-          languages: ${{ matrix.language }}
-          build-mode: ${{ matrix.build-mode }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-
-          # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-          # queries: security-extended,security-and-quality
-
-      # If the analyze step fails for one of the languages you are analyzing with
-      # "We were unable to automatically build your code", modify the matrix above
-      # to set the build mode to "manual" for that language. Then modify this step
-      # to build your code.
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-      - if: matrix.build-mode == 'manual'
-        shell: bash
-        run: |
-          echo 'If you are using a "manual" build mode for one or more of the' \
-            'languages you are analyzing, replace this with the commands to build' \
-            'your code, for example:'
-          echo '  make bootstrap'
-          echo '  make release'
-          exit 1
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
-        with:
-          category: "/language:${{matrix.language}}"
--- 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.3
+        uses: pypa/gh-action-pypi-publish@v1.9.0

  deploy-docker:
    name: Build ESPHome ${{ matrix.platform }}
@@ -85,12 +85,12 @@ 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.7.1
+        uses: docker/setup-buildx-action@v3.6.1
      - name: Set up QEMU
        if: matrix.platform != 'linux/amd64'
        uses: docker/setup-qemu-action@v3.2.0
@@ -141,7 +141,7 @@ jobs:
          echo name=$(cat /tmp/platform) >> $GITHUB_OUTPUT

      - name: Upload digests
-        uses: actions/upload-artifact@v4.4.2
+        uses: actions/upload-artifact@v4.3.4
        with:
          name: digests-${{ steps.sanitize.outputs.name }}
          path: /tmp/digests
@@ -184,7 +184,7 @@ jobs:
          merge-multiple: true

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

      - name: Log in to docker hub
        if: matrix.registry == 'dockerhub'
--- 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.5
+        uses: peter-evans/create-pull-request@v6.1.0
        with:
          commit-message: "Synchronise Device Classes from Home Assistant"
          committer: esphomebot <esphome@nabucasa.com>
--- a/20
+++ b/20
@@ -24,7 +24,6 @@ esphome/components/ade7953_i2c/* @angelnu
 esphome/components/ade7953_spi/* @angelnu
 esphome/components/ads1118/* @solomondg1
 esphome/components/ags10/* @mak-42
-esphome/components/aic3204/* @kbx81
 esphome/components/airthings_ble/* @jeromelaban
 esphome/components/airthings_wave_base/* @jeromelaban @kpfleming @ncareau
 esphome/components/airthings_wave_mini/* @ncareau
@@ -48,7 +47,6 @@ esphome/components/at581x/* @X-Ryl669
 esphome/components/atc_mithermometer/* @ahpohl
 esphome/components/atm90e26/* @danieltwagner
 esphome/components/atm90e32/* @circuitsetup @descipher
-esphome/components/audio_dac/* @kbx81
 esphome/components/b_parasite/* @rbaron
 esphome/components/ballu/* @bazuchan
 esphome/components/bang_bang/* @OttoWinter
@@ -60,10 +58,9 @@ 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
@@ -72,9 +69,6 @@ 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
@@ -88,7 +82,6 @@ esphome/components/cap1188/* @mreditor97
 esphome/components/captive_portal/* @OttoWinter
 esphome/components/ccs811/* @habbie
 esphome/components/cd74hc4067/* @asoehlke
-esphome/components/ch422g/* @clydebarrow @jesterret
 esphome/components/climate/* @esphome/core
 esphome/components/climate_ir/* @glmnet
 esphome/components/color_temperature/* @jesserockz
@@ -154,7 +147,6 @@ esphome/components/ft63x6/* @gpambrozio
 esphome/components/gcja5/* @gcormier
 esphome/components/gdk101/* @Szewcson
 esphome/components/globals/* @esphome/core
-esphome/components/gp2y1010au0f/* @zry98
 esphome/components/gp8403/* @jesserockz
 esphome/components/gpio/* @esphome/core
 esphome/components/gpio/one_wire/* @ssieb
@@ -162,7 +154,6 @@ esphome/components/gps/* @coogle
 esphome/components/graph/* @synco
 esphome/components/graphical_display_menu/* @MrMDavidson
 esphome/components/gree/* @orestismers
-esphome/components/grove_gas_mc_v2/* @YorkshireIoT
 esphome/components/grove_tb6612fng/* @max246
 esphome/components/growatt_solar/* @leeuwte
 esphome/components/gt911/* @clydebarrow @jesserockz
@@ -170,7 +161,6 @@ esphome/components/haier/* @paveldn
 esphome/components/haier/binary_sensor/* @paveldn
 esphome/components/haier/button/* @paveldn
 esphome/components/haier/sensor/* @paveldn
-esphome/components/haier/switch/* @paveldn
 esphome/components/haier/text_sensor/* @paveldn
 esphome/components/havells_solar/* @sourabhjaiswal
 esphome/components/hbridge/fan/* @WeekendWarrior
@@ -232,7 +222,6 @@ 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/ltr_als_ps/* @latonita
 esphome/components/lvgl/* @clydebarrow
 esphome/components/m5stack_8angle/* @rnauber
@@ -283,7 +272,6 @@ esphome/components/mopeka_std_check/* @Fabian-Schmidt
 esphome/components/mpl3115a2/* @kbickar
 esphome/components/mpu6886/* @fabaff
 esphome/components/ms8607/* @e28eta
-esphome/components/nau7802/* @cujomalainey
 esphome/components/network/* @esphome/core
 esphome/components/nextion/* @edwardtfn @senexcrenshaw
 esphome/components/nextion/binary_sensor/* @senexcrenshaw
@@ -292,11 +280,9 @@ esphome/components/nextion/switch/* @senexcrenshaw
 esphome/components/nextion/text_sensor/* @senexcrenshaw
 esphome/components/nfc/* @jesserockz @kbx81
 esphome/components/noblex/* @AGalfra
-esphome/components/npi19/* @bakerkj
 esphome/components/number/* @esphome/core
 esphome/components/one_wire/* @ssieb
 esphome/components/online_image/* @guillempages
-esphome/components/opentherm/* @olegtarasov
 esphome/components/ota/* @esphome/core
 esphome/components/output/* @esphome/core
 esphome/components/pca6416a/* @Mat931
@@ -397,18 +383,15 @@ 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
 esphome/components/switch/* @esphome/core
 esphome/components/t6615/* @tylermenezes
 esphome/components/tca9548a/* @andreashergert1984
-esphome/components/tca9555/* @mobrembski
 esphome/components/tcl112/* @glmnet
 esphome/components/tee501/* @Stock-M
 esphome/components/teleinfo/* @0hax
-esphome/components/tem3200/* @bakerkj
 esphome/components/template/alarm_control_panel/* @grahambrown11 @hwstar
 esphome/components/template/datetime/* @rfdarter
 esphome/components/template/event/* @nohat
@@ -439,7 +422,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
--- a/README.md
+++ b/README.md
@@ -7,5 +7,3 @@
 For issues, please go to [the issue tracker](https://github.com/esphome/issues/issues).

 For feature requests, please see [feature requests](https://github.com/esphome/feature-requests/issues).
-
-[![ESPHome - A project from the Open Home Foundation](https://www.openhomefoundation.org/badges/esphome.png)](https://www.openhomefoundation.org/)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -33,9 +33,9 @@ RUN \
        python3-venv=3.11.2-1+b1 \
        python3-wheel=0.38.4-2 \
        iputils-ping=3:20221126-1 \
-        git=1:2.39.5-0+deb12u1 \
-        curl=7.88.1-10+deb12u7 \
-        openssh-client=1:9.2p1-2+deb12u3 \
+        git=1:2.39.2-1.1 \
+        curl=7.88.1-10+deb12u6 \
+        openssh-client=1:9.2p1-2+deb12u2 \
        python3-cffi=1.15.1-5 \
        libcairo2=1.16.0-7 \
        libmagic1=1:5.44-3 \
@@ -49,7 +49,7 @@ RUN \
                zlib1g-dev=1:1.2.13.dfsg-1 \
                libjpeg-dev=1:2.1.5-2 \
                libfreetype-dev=2.12.1+dfsg-5+deb12u3 \
-                libssl-dev=3.0.14-1~deb12u2 \
+                libssl-dev=3.0.13-1~deb12u1 \
                libffi-dev=3.4.4-1 \
                libopenjp2-7=2.5.0-2 \
                libtiff6=4.5.0-6+deb12u1 \
@@ -96,19 +96,14 @@ RUN \
 # First install requirements to leverage caching when requirements don't change
 # tmpfs is for https://github.com/rust-lang/cargo/issues/8719

-COPY requirements.txt requirements_optional.txt /
+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 \
-        curl -L https://www.piwheels.org/cp311/cryptography-43.0.0-cp37-abi3-linux_armv7l.whl -o /tmp/cryptography-43.0.0-cp37-abi3-linux_armv7l.whl \
-        && pip3 install --break-system-packages --no-cache-dir /tmp/cryptography-43.0.0-cp37-abi3-linux_armv7l.whl \
-        && rm /tmp/cryptography-43.0.0-cp37-abi3-linux_armv7l.whl \
-        && export PIP_EXTRA_INDEX_URL="https://www.piwheels.org/simple"; \
+        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
-
-COPY script/platformio_install_deps.py platformio.ini /
-RUN /platformio_install_deps.py /platformio.ini --libraries
+    --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 '*'
--- a/esphome/components/aic3204/init.py
+++ b/esphome/components/aic3204/init.py
--- a/esphome/components/aic3204/aic3204.cpp
+++ b/esphome/components/aic3204/aic3204.cpp
@@ -1,173 +0,0 @@
-#include "aic3204.h"
-
-#include "esphome/core/defines.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace aic3204 {
-
-static const char *const TAG = "aic3204";
-
-#define ERROR_CHECK(err, msg) \
-  if (!(err)) { \
-    ESP_LOGE(TAG, msg); \
-    this->mark_failed(); \
-    return; \
-  }
-
-void AIC3204::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up AIC3204...");
-
-  // Set register page to 0
-  ERROR_CHECK(this->write_byte(AIC3204_PAGE_CTRL, 0x00), "Set page 0 failed");
-  // Initiate SW reset (PLL is powered off as part of reset)
-  ERROR_CHECK(this->write_byte(AIC3204_SW_RST, 0x01), "Software reset failed");
-  // *** Program clock settings ***
-  // Default is CODEC_CLKIN is from MCLK pin. Don't need to change this.
-  // MDAC*NDAC*FOSR*48Khz = mClk (24.576 MHz when the XMOS is expecting 48kHz audio)
-  // (See page 51 of https://www.ti.com/lit/ml/slaa557/slaa557.pdf)
-  // We do need MDAC*DOSR/32 >= the resource compute level for the processing block
-  // So here 2*128/32 = 8, which is equal to processing block 1 's resource compute
-  // See page 5 of https://www.ti.com/lit/an/slaa404c/slaa404c.pdf for the workflow
-  // for determining these settings.
-
-  // Power up NDAC and set to 2
-  ERROR_CHECK(this->write_byte(AIC3204_NDAC, 0x82), "Set NDAC failed");
-  // Power up MDAC and set to 2
-  ERROR_CHECK(this->write_byte(AIC3204_MDAC, 0x82), "Set MDAC failed");
-  // Program DOSR = 128
-  ERROR_CHECK(this->write_byte(AIC3204_DOSR, 0x80), "Set DOSR failed");
-  // Set Audio Interface Config: I2S, 32 bits, DOUT always driving
-  ERROR_CHECK(this->write_byte(AIC3204_CODEC_IF, 0x30), "Set CODEC_IF failed");
-  // For I2S Firmware only, set SCLK/MFP3 pin as Audio Data In
-  ERROR_CHECK(this->write_byte(AIC3204_SCLK_MFP3, 0x02), "Set SCLK/MFP3 failed");
-  ERROR_CHECK(this->write_byte(AIC3204_AUDIO_IF_4, 0x01), "Set AUDIO_IF_4 failed");
-  ERROR_CHECK(this->write_byte(AIC3204_AUDIO_IF_5, 0x01), "Set AUDIO_IF_5 failed");
-  // Program the DAC processing block to be used - PRB_P1
-  ERROR_CHECK(this->write_byte(AIC3204_DAC_SIG_PROC, 0x01), "Set DAC_SIG_PROC failed");
-
-  // *** Select Page 1 ***
-  ERROR_CHECK(this->write_byte(AIC3204_PAGE_CTRL, 0x01), "Set page 1 failed");
-  // Enable the internal AVDD_LDO:
-  ERROR_CHECK(this->write_byte(AIC3204_LDO_CTRL, 0x09), "Set LDO_CTRL failed");
-  // *** Program Analog Blocks ***
-  // Disable Internal Crude AVdd in presence of external AVdd supply or before powering up internal AVdd LDO
-  ERROR_CHECK(this->write_byte(AIC3204_PWR_CFG, 0x08), "Set PWR_CFG failed");
-  // Enable Master Analog Power Control
-  ERROR_CHECK(this->write_byte(AIC3204_LDO_CTRL, 0x01), "Set LDO_CTRL failed");
-  // Page 125: Common mode control register, set d6 to 1 to make the full chip common mode = 0.75 v
-  // We are using the internal AVdd regulator with a nominal output of 1.72 V (see LDO_CTRL_REGISTER on page 123)
-  // Page 86 says to only set the common mode voltage to 0.9 v if AVdd >= 1.8... but it isn't on our hardware
-  // We also adjust the HPL and HPR gains to -2dB gian later in this config flow compensate (see page 47)
-  // (All pages refer to the TLV320AIC3204 Application Reference Guide)
-  ERROR_CHECK(this->write_byte(AIC3204_CM_CTRL, 0x40), "Set CM_CTRL failed");
-  // *** Set PowerTune Modes ***
-  // Set the Left & Right DAC PowerTune mode to PTM_P3/4. Use Class-AB driver.
-  ERROR_CHECK(this->write_byte(AIC3204_PLAY_CFG1, 0x00), "Set PLAY_CFG1 failed");
-  ERROR_CHECK(this->write_byte(AIC3204_PLAY_CFG2, 0x00), "Set PLAY_CFG2 failed");
-  // Set the REF charging time to 40ms
-  ERROR_CHECK(this->write_byte(AIC3204_REF_STARTUP, 0x01), "Set REF_STARTUP failed");
-  // HP soft stepping settings for optimal pop performance at power up
-  // Rpop used is 6k with N = 6 and soft step = 20usec. This should work with 47uF coupling
-  // capacitor. Can try N=5,6 or 7 time constants as well. Trade-off delay vs “pop” sound.
-  ERROR_CHECK(this->write_byte(AIC3204_HP_START, 0x25), "Set HP_START failed");
-  // Route Left DAC to HPL
-  ERROR_CHECK(this->write_byte(AIC3204_HPL_ROUTE, 0x08), "Set HPL_ROUTE failed");
-  // Route Right DAC to HPR
-  ERROR_CHECK(this->write_byte(AIC3204_HPR_ROUTE, 0x08), "Set HPR_ROUTE failed");
-  // Route Left DAC to LOL
-  ERROR_CHECK(this->write_byte(AIC3204_LOL_ROUTE, 0x08), "Set LOL_ROUTE failed");
-  // Route Right DAC to LOR
-  ERROR_CHECK(this->write_byte(AIC3204_LOR_ROUTE, 0x08), "Set LOR_ROUTE failed");
-
-  // Unmute HPL and set gain to -2dB (see comment before configuring the AIC3204_CM_CTRL register)
-  ERROR_CHECK(this->write_byte(AIC3204_HPL_GAIN, 0x3e), "Set HPL_GAIN failed");
-  // Unmute HPR and set gain to -2dB (see comment before configuring the AIC3204_CM_CTRL register)
-  ERROR_CHECK(this->write_byte(AIC3204_HPR_GAIN, 0x3e), "Set HPR_GAIN failed");
-  // Unmute LOL and set gain to 0dB
-  ERROR_CHECK(this->write_byte(AIC3204_LOL_DRV_GAIN, 0x00), "Set LOL_DRV_GAIN failed");
-  // Unmute LOR and set gain to 0dB
-  ERROR_CHECK(this->write_byte(AIC3204_LOR_DRV_GAIN, 0x00), "Set LOR_DRV_GAIN failed");
-
-  // Power up HPL and HPR, LOL and LOR drivers
-  ERROR_CHECK(this->write_byte(AIC3204_OP_PWR_CTRL, 0x3C), "Set OP_PWR_CTRL failed");
-
-  // Wait for 2.5 sec for soft stepping to take effect before attempting power-up
-  this->set_timeout(2500, [this]() {
-    // *** Power Up DAC ***
-    // Select Page 0
-    ERROR_CHECK(this->write_byte(AIC3204_PAGE_CTRL, 0x00), "Set PAGE_CTRL failed");
-    // Power up the Left and Right DAC Channels. Route Left data to Left DAC and Right data to Right DAC.
-    // DAC Vol control soft step 1 step per DAC word clock.
-    ERROR_CHECK(this->write_byte(AIC3204_DAC_CH_SET1, 0xd4), "Set DAC_CH_SET1 failed");
-    // Set left and right DAC digital volume control
-    ERROR_CHECK(this->write_volume_(), "Set volume failed");
-    // Unmute left and right channels
-    ERROR_CHECK(this->write_mute_(), "Set mute failed");
-  });
-}
-
-void AIC3204::dump_config() {
-  ESP_LOGCONFIG(TAG, "AIC3204:");
-  LOG_I2C_DEVICE(this);
-
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with AIC3204 failed");
-  }
-}
-
-bool AIC3204::set_mute_off() {
-  this->is_muted_ = false;
-  return this->write_mute_();
-}
-
-bool AIC3204::set_mute_on() {
-  this->is_muted_ = true;
-  return this->write_mute_();
-}
-
-bool AIC3204::set_auto_mute_mode(uint8_t auto_mute_mode) {
-  this->auto_mute_mode_ = auto_mute_mode & 0x07;
-  ESP_LOGVV(TAG, "Setting auto_mute_mode to 0x%.2x", this->auto_mute_mode_);
-  return this->write_mute_();
-}
-
-bool AIC3204::set_volume(float volume) {
-  this->volume_ = clamp<float>(volume, 0.0, 1.0);
-  return this->write_volume_();
-}
-
-bool AIC3204::is_muted() { return this->is_muted_; }
-
-float AIC3204::volume() { return this->volume_; }
-
-bool AIC3204::write_mute_() {
-  uint8_t mute_mode_byte = this->auto_mute_mode_ << 4;  // auto-mute control is bits 4-6
-  mute_mode_byte |= this->is_muted_ ? 0x0c : 0x00;      // mute bits are 2-3
-  if (!this->write_byte(AIC3204_PAGE_CTRL, 0x00) || !this->write_byte(AIC3204_DAC_CH_SET2, mute_mode_byte)) {
-    ESP_LOGE(TAG, "Writing mute modes failed");
-    return false;
-  }
-  return true;
-}
-
-bool AIC3204::write_volume_() {
-  const int8_t dvc_min_byte = -127;
-  const int8_t dvc_max_byte = 48;
-
-  int8_t volume_byte = dvc_min_byte + (this->volume_ * (dvc_max_byte - dvc_min_byte));
-  volume_byte = clamp<int8_t>(volume_byte, dvc_min_byte, dvc_max_byte);
-
-  ESP_LOGVV(TAG, "Setting volume to 0x%.2x", volume_byte & 0xFF);
-
-  if ((!this->write_byte(AIC3204_PAGE_CTRL, 0x00)) || (!this->write_byte(AIC3204_DACL_VOL_D, volume_byte)) ||
-      (!this->write_byte(AIC3204_DACR_VOL_D, volume_byte))) {
-    ESP_LOGE(TAG, "Writing volume failed");
-    return false;
-  }
-  return true;
-}
-
-}  // namespace aic3204
-}  // namespace esphome
--- a/esphome/components/aic3204/aic3204.h
+++ b/esphome/components/aic3204/aic3204.h
@@ -1,88 +0,0 @@
-#pragma once
-
-#include "esphome/components/audio_dac/audio_dac.h"
-#include "esphome/components/i2c/i2c.h"
-#include "esphome/core/component.h"
-#include "esphome/core/defines.h"
-#include "esphome/core/hal.h"
-
-namespace esphome {
-namespace aic3204 {
-
-// TLV320AIC3204 Register Addresses
-// Page 0
-static const uint8_t AIC3204_PAGE_CTRL = 0x00;     // Register 0  - Page Control
-static const uint8_t AIC3204_SW_RST = 0x01;        // Register 1  - Software Reset
-static const uint8_t AIC3204_CLK_PLL1 = 0x04;      // Register 4  - Clock Setting Register 1, Multiplexers
-static const uint8_t AIC3204_CLK_PLL2 = 0x05;      // Register 5  - Clock Setting Register 2, P and R values
-static const uint8_t AIC3204_CLK_PLL3 = 0x06;      // Register 6  - Clock Setting Register 3, J values
-static const uint8_t AIC3204_NDAC = 0x0B;          // Register 11 - NDAC Divider Value
-static const uint8_t AIC3204_MDAC = 0x0C;          // Register 12 - MDAC Divider Value
-static const uint8_t AIC3204_DOSR = 0x0E;          // Register 14 - DOSR Divider Value (LS Byte)
-static const uint8_t AIC3204_NADC = 0x12;          // Register 18 - NADC Divider Value
-static const uint8_t AIC3204_MADC = 0x13;          // Register 19 - MADC Divider Value
-static const uint8_t AIC3204_AOSR = 0x14;          // Register 20 - AOSR Divider Value
-static const uint8_t AIC3204_CODEC_IF = 0x1B;      // Register 27 - CODEC Interface Control
-static const uint8_t AIC3204_AUDIO_IF_4 = 0x1F;    // Register 31 - Audio Interface Setting Register 4
-static const uint8_t AIC3204_AUDIO_IF_5 = 0x20;    // Register 32 - Audio Interface Setting Register 5
-static const uint8_t AIC3204_SCLK_MFP3 = 0x38;     // Register 56 - SCLK/MFP3 Function Control
-static const uint8_t AIC3204_DAC_SIG_PROC = 0x3C;  // Register 60 - DAC Sig Processing Block Control
-static const uint8_t AIC3204_ADC_SIG_PROC = 0x3D;  // Register 61 - ADC Sig Processing Block Control
-static const uint8_t AIC3204_DAC_CH_SET1 = 0x3F;   // Register 63 - DAC Channel Setup 1
-static const uint8_t AIC3204_DAC_CH_SET2 = 0x40;   // Register 64 - DAC Channel Setup 2
-static const uint8_t AIC3204_DACL_VOL_D = 0x41;    // Register 65 - DAC Left Digital Vol Control
-static const uint8_t AIC3204_DACR_VOL_D = 0x42;    // Register 66 - DAC Right Digital Vol Control
-static const uint8_t AIC3204_DRC_ENABLE = 0x44;
-static const uint8_t AIC3204_ADC_CH_SET = 0x51;    // Register 81 - ADC Channel Setup
-static const uint8_t AIC3204_ADC_FGA_MUTE = 0x52;  // Register 82 - ADC Fine Gain Adjust/Mute
-
-// Page 1
-static const uint8_t AIC3204_PWR_CFG = 0x01;       // Register 1  - Power Config
-static const uint8_t AIC3204_LDO_CTRL = 0x02;      // Register 2  - LDO Control
-static const uint8_t AIC3204_PLAY_CFG1 = 0x03;     // Register 3  - Playback Config 1
-static const uint8_t AIC3204_PLAY_CFG2 = 0x04;     // Register 4  - Playback Config 2
-static const uint8_t AIC3204_OP_PWR_CTRL = 0x09;   // Register 9  - Output Driver Power Control
-static const uint8_t AIC3204_CM_CTRL = 0x0A;       // Register 10 - Common Mode Control
-static const uint8_t AIC3204_HPL_ROUTE = 0x0C;     // Register 12 - HPL Routing Select
-static const uint8_t AIC3204_HPR_ROUTE = 0x0D;     // Register 13 - HPR Routing Select
-static const uint8_t AIC3204_LOL_ROUTE = 0x0E;     // Register 14 - LOL Routing Selection
-static const uint8_t AIC3204_LOR_ROUTE = 0x0F;     // Register 15 - LOR Routing Selection
-static const uint8_t AIC3204_HPL_GAIN = 0x10;      // Register 16 - HPL Driver Gain
-static const uint8_t AIC3204_HPR_GAIN = 0x11;      // Register 17 - HPR Driver Gain
-static const uint8_t AIC3204_LOL_DRV_GAIN = 0x12;  // Register 18 - LOL Driver Gain Setting
-static const uint8_t AIC3204_LOR_DRV_GAIN = 0x13;  // Register 19 - LOR Driver Gain Setting
-static const uint8_t AIC3204_HP_START = 0x14;      // Register 20 - Headphone Driver Startup
-static const uint8_t AIC3204_LPGA_P_ROUTE = 0x34;  // Register 52 - Left PGA Positive Input Route
-static const uint8_t AIC3204_LPGA_N_ROUTE = 0x36;  // Register 54 - Left PGA Negative Input Route
-static const uint8_t AIC3204_RPGA_P_ROUTE = 0x37;  // Register 55 - Right PGA Positive Input Route
-static const uint8_t AIC3204_RPGA_N_ROUTE = 0x39;  // Register 57 - Right PGA Negative Input Route
-static const uint8_t AIC3204_LPGA_VOL = 0x3B;      // Register 59 - Left PGA Volume
-static const uint8_t AIC3204_RPGA_VOL = 0x3C;      // Register 60 - Right PGA Volume
-static const uint8_t AIC3204_ADC_PTM = 0x3D;       // Register 61 - ADC Power Tune Config
-static const uint8_t AIC3204_AN_IN_CHRG = 0x47;    // Register 71 - Analog Input Quick Charging Config
-static const uint8_t AIC3204_REF_STARTUP = 0x7B;   // Register 123 - Reference Power Up Config
-
-class AIC3204 : public audio_dac::AudioDac, public Component, public i2c::I2CDevice {
- public:
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::DATA; }
-
-  bool set_mute_off() override;
-  bool set_mute_on() override;
-  bool set_auto_mute_mode(uint8_t auto_mute_mode);
-  bool set_volume(float volume) override;
-
-  bool is_muted() override;
-  float volume() override;
-
- protected:
-  bool write_mute_();
-  bool write_volume_();
-
-  uint8_t auto_mute_mode_{0};
-  float volume_{0};
-};
-
-}  // namespace aic3204
-}  // namespace esphome
--- a/esphome/components/aic3204/audio_dac.py
+++ b/esphome/components/aic3204/audio_dac.py
@@ -1,52 +0,0 @@
-from esphome import automation
-import esphome.codegen as cg
-from esphome.components import i2c
-from esphome.components.audio_dac import AudioDac
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_MODE
-
-CODEOWNERS = ["@kbx81"]
-DEPENDENCIES = ["i2c"]
-
-aic3204_ns = cg.esphome_ns.namespace("aic3204")
-AIC3204 = aic3204_ns.class_("AIC3204", AudioDac, cg.Component, i2c.I2CDevice)
-
-SetAutoMuteAction = aic3204_ns.class_("SetAutoMuteAction", automation.Action)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(AIC3204),
-        }
-    )
-    .extend(cv.COMPONENT_SCHEMA)
-    .extend(i2c.i2c_device_schema(0x18))
-)
-
-
-SET_AUTO_MUTE_ACTION_SCHEMA = cv.maybe_simple_value(
-    {
-        cv.GenerateID(): cv.use_id(AIC3204),
-        cv.Required(CONF_MODE): cv.templatable(cv.int_range(max=7, min=0)),
-    },
-    key=CONF_MODE,
-)
-
-
-@automation.register_action(
-    "aic3204.set_auto_mute_mode", SetAutoMuteAction, SET_AUTO_MUTE_ACTION_SCHEMA
-)
-async def aic3204_set_volume_to_code(config, action_id, template_arg, args):
-    paren = await cg.get_variable(config[CONF_ID])
-    var = cg.new_Pvariable(action_id, template_arg, paren)
-
-    template_ = await cg.templatable(config.get(CONF_MODE), args, int)
-    cg.add(var.set_auto_mute_mode(template_))
-
-    return var
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await i2c.register_i2c_device(var, config)
--- a/esphome/components/aic3204/automation.h
+++ b/esphome/components/aic3204/automation.h
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "esphome/core/automation.h"
-#include "esphome/core/component.h"
-#include "aic3204.h"
-
-namespace esphome {
-namespace aic3204 {
-
-template<typename... Ts> class SetAutoMuteAction : public Action<Ts...> {
- public:
-  explicit SetAutoMuteAction(AIC3204 *aic3204) : aic3204_(aic3204) {}
-
-  TEMPLATABLE_VALUE(uint8_t, auto_mute_mode)
-
-  void play(Ts... x) override { this->aic3204_->set_auto_mute_mode(this->auto_mute_mode_.value(x...)); }
-
- protected:
-  AIC3204 *aic3204_;
-};
-
-}  // namespace aic3204
-}  // namespace esphome
--- a/esphome/components/alarm_control_panel/init.py
+++ b/esphome/components/alarm_control_panel/init.py
@@ -9,7 +9,7 @@ from esphome.const import (
    CONF_MQTT_ID,
    CONF_ON_STATE,
    CONF_TRIGGER_ID,
-    CONF_WEB_SERVER,
+    CONF_WEB_SERVER_ID,
 )
 from esphome.core import CORE, coroutine_with_priority
 from esphome.cpp_helpers import setup_entity
@@ -195,8 +195,9 @@ async def setup_alarm_control_panel_core_(var, config):
    for conf in config.get(CONF_ON_READY, []):
        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
        await automation.build_automation(trigger, [], conf)
-    if web_server_config := config.get(CONF_WEB_SERVER):
-        await web_server.add_entity_config(var, web_server_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)
--- a/esphome/components/animation/init.py
+++ b/esphome/components/animation/init.py
@@ -1,26 +1,26 @@
 import logging

 from esphome import automation, core
-import esphome.codegen as cg
 from esphome.components import font
 import esphome.components.image as espImage
 from esphome.components.image import (
    CONF_USE_TRANSPARENCY,
    LOCAL_SCHEMA,
-    SOURCE_LOCAL,
-    SOURCE_WEB,
    WEB_SCHEMA,
+    SOURCE_WEB,
+    SOURCE_LOCAL,
 )
 import esphome.config_validation as cv
+import esphome.codegen as cg
 from esphome.const import (
    CONF_FILE,
    CONF_ID,
-    CONF_PATH,
    CONF_RAW_DATA_ID,
    CONF_REPEAT,
    CONF_RESIZE,
-    CONF_SOURCE,
    CONF_TYPE,
+    CONF_SOURCE,
+    CONF_PATH,
    CONF_URL,
 )
 from esphome.core import CORE, HexInt
@@ -172,9 +172,6 @@ async def to_code(config):
        path = CORE.relative_config_path(conf_file[CONF_PATH])
    elif conf_file[CONF_SOURCE] == SOURCE_WEB:
        path = espImage.compute_local_image_path(conf_file).as_posix()
-    else:
-        raise core.EsphomeError(f"Unknown animation source: {conf_file[CONF_SOURCE]}")
-
    try:
        image = Image.open(path)
    except Exception as e:
@@ -186,12 +183,13 @@ async def to_code(config):
        new_width_max, new_height_max = config[CONF_RESIZE]
        ratio = min(new_width_max / width, new_height_max / height)
        width, height = int(width * ratio), int(height * ratio)
-    elif width > 500 or height > 500:
-        _LOGGER.warning(
-            'The image "%s" you requested is very big. Please consider'
-            " using the resize parameter.",
-            path,
-        )
+    else:
+        if width > 500 or height > 500:
+            _LOGGER.warning(
+                'The image "%s" you requested is very big. Please consider'
+                " using the resize parameter.",
+                path,
+            )

    transparent = config[CONF_USE_TRANSPARENCY]

@@ -308,8 +306,6 @@ async def to_code(config):
            if transparent:
                alpha = image.split()[-1]
                has_alpha = alpha.getextrema()[0] < 0xFF
-            else:
-                has_alpha = False
            frame = image.convert("1", dither=Image.Dither.NONE)
            if CONF_RESIZE in config:
                frame = frame.resize([width, height])
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -62,8 +62,6 @@ service APIConnection {
  rpc unsubscribe_bluetooth_le_advertisements(UnsubscribeBluetoothLEAdvertisementsRequest) returns (void) {}

  rpc subscribe_voice_assistant(SubscribeVoiceAssistantRequest) returns (void) {}
-  rpc voice_assistant_get_configuration(VoiceAssistantConfigurationRequest) returns (VoiceAssistantConfigurationResponse) {}
-  rpc voice_assistant_set_configuration(VoiceAssistantSetConfiguration) returns (void) {}

  rpc alarm_control_panel_command (AlarmControlPanelCommandRequest) returns (void) {}
 }
@@ -1114,13 +1112,13 @@ enum MediaPlayerFormatPurpose {
  MEDIA_PLAYER_FORMAT_PURPOSE_ANNOUNCEMENT = 1;
 }
 message MediaPlayerSupportedFormat {
+  option (id) = 119;
  option (ifdef) = "USE_MEDIA_PLAYER";

  string format = 1;
  uint32 sample_rate = 2;
  uint32 num_channels = 3;
  MediaPlayerFormatPurpose purpose = 4;
-  uint32 sample_bytes = 5;
 }
 message ListEntitiesMediaPlayerResponse {
  option (id) = 63;
@@ -1556,53 +1554,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;
-}
-
-message VoiceAssistantWakeWord {
-  string id = 1;
-  string wake_word = 2;
-  repeated string trained_languages = 3;
-}
-
-message VoiceAssistantConfigurationRequest {
-  option (id) = 121;
-  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_VOICE_ASSISTANT";
-}
-
-message VoiceAssistantConfigurationResponse {
-  option (id) = 122;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_VOICE_ASSISTANT";
-
-  repeated VoiceAssistantWakeWord available_wake_words = 1;
-  repeated string active_wake_words = 2;
-  uint32 max_active_wake_words = 3;
-}
-
-message VoiceAssistantSetConfiguration {
-  option (id) = 123;
-  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_VOICE_ASSISTANT";
-
-  repeated string active_wake_words = 1;
-}
-
 // ==================== ALARM CONTROL PANEL ====================
 enum AlarmControlPanelState {
  ALARM_STATE_DISARMED = 0;
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -1,5 +1,4 @@
 #include "api_connection.h"
-#ifdef USE_API
 #include <cerrno>
 #include <cinttypes>
 #include <utility>
@@ -1033,7 +1032,6 @@ bool APIConnection::send_media_player_info(media_player::MediaPlayer *media_play
    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);
-    media_format.sample_bytes = supported_format.sample_bytes;
    msg.supported_formats.push_back(media_format);
  }

@@ -1215,52 +1213,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);
-  }
-}
-
-VoiceAssistantConfigurationResponse APIConnection::voice_assistant_get_configuration(
-    const VoiceAssistantConfigurationRequest &msg) {
-  VoiceAssistantConfigurationResponse resp;
-  if (voice_assistant::global_voice_assistant != nullptr) {
-    if (voice_assistant::global_voice_assistant->get_api_connection() != this) {
-      return resp;
-    }
-
-    auto &config = voice_assistant::global_voice_assistant->get_configuration();
-    for (auto &wake_word : config.available_wake_words) {
-      VoiceAssistantWakeWord resp_wake_word;
-      resp_wake_word.id = wake_word.id;
-      resp_wake_word.wake_word = wake_word.wake_word;
-      for (const auto &lang : wake_word.trained_languages) {
-        resp_wake_word.trained_languages.push_back(lang);
-      }
-      resp.available_wake_words.push_back(std::move(resp_wake_word));
-    }
-    for (auto &wake_word_id : config.active_wake_words) {
-      resp.active_wake_words.push_back(wake_word_id);
-    }
-    resp.max_active_wake_words = config.max_active_wake_words;
-  }
-  return resp;
-}
-
-void APIConnection::voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &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_set_configuration(msg.active_wake_words);
-  }
-}
-
 #endif

 #ifdef USE_ALARM_CONTROL_PANEL
@@ -1569,4 +1521,3 @@ void APIConnection::on_fatal_error() {

 }  // namespace api
 }  // namespace esphome
-#endif
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -1,13 +1,12 @@
 #pragma once

-#include "esphome/core/defines.h"
-#ifdef USE_API
 #include "api_frame_helper.h"
 #include "api_pb2.h"
 #include "api_pb2_service.h"
 #include "api_server.h"
 #include "esphome/core/application.h"
 #include "esphome/core/component.h"
+#include "esphome/core/defines.h"

 #include <vector>

@@ -152,10 +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;
-  VoiceAssistantConfigurationResponse voice_assistant_get_configuration(
-      const VoiceAssistantConfigurationRequest &msg) override;
-  void voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg) override;
 #endif

 #ifdef USE_ALARM_CONTROL_PANEL
@@ -269,4 +264,3 @@ class APIConnection : public APIServerConnection {

 }  // namespace api
 }  // namespace esphome
-#endif
--- a/esphome/components/api/api_frame_helper.cpp
+++ b/esphome/components/api/api_frame_helper.cpp
@@ -1,5 +1,5 @@
 #include "api_frame_helper.h"
-#ifdef USE_API
+
 #include "esphome/core/log.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
@@ -1028,4 +1028,3 @@ APIError APIPlaintextFrameHelper::shutdown(int how) {

 }  // namespace api
 }  // namespace esphome
-#endif
--- a/esphome/components/api/api_frame_helper.h
+++ b/esphome/components/api/api_frame_helper.h
@@ -5,7 +5,7 @@
 #include <vector>

 #include "esphome/core/defines.h"
-#ifdef USE_API
+
 #ifdef USE_API_NOISE
 #include "noise/protocol.h"
 #endif
@@ -190,4 +190,3 @@ class APIPlaintextFrameHelper : public APIFrameHelper {

 }  // namespace api
 }  // namespace esphome
-#endif
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -5149,10 +5149,6 @@ bool MediaPlayerSupportedFormat::decode_varint(uint32_t field_id, ProtoVarInt va
      this->purpose = value.as_enum<enums::MediaPlayerFormatPurpose>();
      return true;
    }
-    case 5: {
-      this->sample_bytes = value.as_uint32();
-      return true;
-    }
    default:
      return false;
  }
@@ -5172,7 +5168,6 @@ void MediaPlayerSupportedFormat::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_uint32(2, this->sample_rate);
  buffer.encode_uint32(3, this->num_channels);
  buffer.encode_enum<enums::MediaPlayerFormatPurpose>(4, this->purpose);
-  buffer.encode_uint32(5, this->sample_bytes);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void MediaPlayerSupportedFormat::dump_to(std::string &out) const {
@@ -5195,11 +5190,6 @@ void MediaPlayerSupportedFormat::dump_to(std::string &out) const {
  out.append("  purpose: ");
  out.append(proto_enum_to_string<enums::MediaPlayerFormatPurpose>(this->purpose));
  out.append("\n");
-
-  out.append("  sample_bytes: ");
-  sprintf(buffer, "%" PRIu32, this->sample_bytes);
-  out.append(buffer);
-  out.append("\n");
  out.append("}");
 }
 #endif
@@ -7071,193 +7061,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 VoiceAssistantWakeWord::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 1: {
-      this->id = value.as_string();
-      return true;
-    }
-    case 2: {
-      this->wake_word = value.as_string();
-      return true;
-    }
-    case 3: {
-      this->trained_languages.push_back(value.as_string());
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void VoiceAssistantWakeWord::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_string(1, this->id);
-  buffer.encode_string(2, this->wake_word);
-  for (auto &it : this->trained_languages) {
-    buffer.encode_string(3, it, true);
-  }
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void VoiceAssistantWakeWord::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("VoiceAssistantWakeWord {\n");
-  out.append("  id: ");
-  out.append("'").append(this->id).append("'");
-  out.append("\n");
-
-  out.append("  wake_word: ");
-  out.append("'").append(this->wake_word).append("'");
-  out.append("\n");
-
-  for (const auto &it : this->trained_languages) {
-    out.append("  trained_languages: ");
-    out.append("'").append(it).append("'");
-    out.append("\n");
-  }
-  out.append("}");
-}
-#endif
-void VoiceAssistantConfigurationRequest::encode(ProtoWriteBuffer buffer) const {}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void VoiceAssistantConfigurationRequest::dump_to(std::string &out) const {
-  out.append("VoiceAssistantConfigurationRequest {}");
-}
-#endif
-bool VoiceAssistantConfigurationResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 3: {
-      this->max_active_wake_words = value.as_uint32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool VoiceAssistantConfigurationResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 1: {
-      this->available_wake_words.push_back(value.as_message<VoiceAssistantWakeWord>());
-      return true;
-    }
-    case 2: {
-      this->active_wake_words.push_back(value.as_string());
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void VoiceAssistantConfigurationResponse::encode(ProtoWriteBuffer buffer) const {
-  for (auto &it : this->available_wake_words) {
-    buffer.encode_message<VoiceAssistantWakeWord>(1, it, true);
-  }
-  for (auto &it : this->active_wake_words) {
-    buffer.encode_string(2, it, true);
-  }
-  buffer.encode_uint32(3, this->max_active_wake_words);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void VoiceAssistantConfigurationResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("VoiceAssistantConfigurationResponse {\n");
-  for (const auto &it : this->available_wake_words) {
-    out.append("  available_wake_words: ");
-    it.dump_to(out);
-    out.append("\n");
-  }
-
-  for (const auto &it : this->active_wake_words) {
-    out.append("  active_wake_words: ");
-    out.append("'").append(it).append("'");
-    out.append("\n");
-  }
-
-  out.append("  max_active_wake_words: ");
-  sprintf(buffer, "%" PRIu32, this->max_active_wake_words);
-  out.append(buffer);
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool VoiceAssistantSetConfiguration::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 1: {
-      this->active_wake_words.push_back(value.as_string());
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void VoiceAssistantSetConfiguration::encode(ProtoWriteBuffer buffer) const {
-  for (auto &it : this->active_wake_words) {
-    buffer.encode_string(1, it, true);
-  }
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void VoiceAssistantSetConfiguration::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("VoiceAssistantSetConfiguration {\n");
-  for (const auto &it : this->active_wake_words) {
-    out.append("  active_wake_words: ");
-    out.append("'").append(it).append("'");
-    out.append("\n");
-  }
-  out.append("}");
-}
-#endif
 bool ListEntitiesAlarmControlPanelResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
  switch (field_id) {
    case 6: {
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -1277,7 +1277,6 @@ class MediaPlayerSupportedFormat : public ProtoMessage {
  uint32_t sample_rate{0};
  uint32_t num_channels{0};
  enums::MediaPlayerFormatPurpose purpose{};
-  uint32_t sample_bytes{0};
  void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  void dump_to(std::string &out) const override;
@@ -1826,76 +1825,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 VoiceAssistantWakeWord : public ProtoMessage {
- public:
-  std::string id{};
-  std::string wake_word{};
-  std::vector<std::string> trained_languages{};
-  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 VoiceAssistantConfigurationRequest : public ProtoMessage {
- public:
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-};
-class VoiceAssistantConfigurationResponse : public ProtoMessage {
- public:
-  std::vector<VoiceAssistantWakeWord> available_wake_words{};
-  std::vector<std::string> active_wake_words{};
-  uint32_t max_active_wake_words{0};
-  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 VoiceAssistantSetConfiguration : public ProtoMessage {
- public:
-  std::vector<std::string> active_wake_words{};
-  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 ListEntitiesAlarmControlPanelResponse : public ProtoMessage {
 public:
  std::string object_id{};
--- a/esphome/components/api/api_pb2_service.cpp
+++ b/esphome/components/api/api_pb2_service.cpp
@@ -311,6 +311,14 @@ bool APIServerConnectionBase::send_list_entities_button_response(const ListEntit
 #ifdef USE_BUTTON
 #endif
 #ifdef USE_MEDIA_PLAYER
+bool APIServerConnectionBase::send_media_player_supported_format(const MediaPlayerSupportedFormat &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_media_player_supported_format: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<MediaPlayerSupportedFormat>(msg, 119);
+}
+#endif
+#ifdef USE_MEDIA_PLAYER
 bool APIServerConnectionBase::send_list_entities_media_player_response(const ListEntitiesMediaPlayerResponse &msg) {
 #ifdef HAS_PROTO_MESSAGE_DUMP
  ESP_LOGVV(TAG, "send_list_entities_media_player_response: %s", msg.dump().c_str());
@@ -486,29 +494,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_VOICE_ASSISTANT
-#endif
-#ifdef USE_VOICE_ASSISTANT
-bool APIServerConnectionBase::send_voice_assistant_configuration_response(
-    const VoiceAssistantConfigurationResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_voice_assistant_configuration_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<VoiceAssistantConfigurationResponse>(msg, 122);
-}
-#endif
-#ifdef USE_VOICE_ASSISTANT
-#endif
 #ifdef USE_ALARM_CONTROL_PANEL
 bool APIServerConnectionBase::send_list_entities_alarm_control_panel_response(
    const ListEntitiesAlarmControlPanelResponse &msg) {
@@ -1162,35 +1147,13 @@ bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      break;
    }
    case 119: {
-#ifdef USE_VOICE_ASSISTANT
-      VoiceAssistantAnnounceRequest msg;
+#ifdef USE_MEDIA_PLAYER
+      MediaPlayerSupportedFormat 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());
+      ESP_LOGVV(TAG, "on_media_player_supported_format: %s", msg.dump().c_str());
 #endif
-      this->on_voice_assistant_announce_request(msg);
-#endif
-      break;
-    }
-    case 121: {
-#ifdef USE_VOICE_ASSISTANT
-      VoiceAssistantConfigurationRequest msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_voice_assistant_configuration_request: %s", msg.dump().c_str());
-#endif
-      this->on_voice_assistant_configuration_request(msg);
-#endif
-      break;
-    }
-    case 123: {
-#ifdef USE_VOICE_ASSISTANT
-      VoiceAssistantSetConfiguration msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_voice_assistant_set_configuration: %s", msg.dump().c_str());
-#endif
-      this->on_voice_assistant_set_configuration(msg);
+      this->on_media_player_supported_format(msg);
 #endif
      break;
    }
@@ -1681,35 +1644,6 @@ void APIServerConnection::on_subscribe_voice_assistant_request(const SubscribeVo
  this->subscribe_voice_assistant(msg);
 }
 #endif
-#ifdef USE_VOICE_ASSISTANT
-void APIServerConnection::on_voice_assistant_configuration_request(const VoiceAssistantConfigurationRequest &msg) {
-  if (!this->is_connection_setup()) {
-    this->on_no_setup_connection();
-    return;
-  }
-  if (!this->is_authenticated()) {
-    this->on_unauthenticated_access();
-    return;
-  }
-  VoiceAssistantConfigurationResponse ret = this->voice_assistant_get_configuration(msg);
-  if (!this->send_voice_assistant_configuration_response(ret)) {
-    this->on_fatal_error();
-  }
-}
-#endif
-#ifdef USE_VOICE_ASSISTANT
-void APIServerConnection::on_voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg) {
-  if (!this->is_connection_setup()) {
-    this->on_no_setup_connection();
-    return;
-  }
-  if (!this->is_authenticated()) {
-    this->on_unauthenticated_access();
-    return;
-  }
-  this->voice_assistant_set_configuration(msg);
-}
-#endif
 #ifdef USE_ALARM_CONTROL_PANEL
 void APIServerConnection::on_alarm_control_panel_command_request(const AlarmControlPanelCommandRequest &msg) {
  if (!this->is_connection_setup()) {
--- a/esphome/components/api/api_pb2_service.h
+++ b/esphome/components/api/api_pb2_service.h
@@ -145,6 +145,10 @@ class APIServerConnectionBase : public ProtoService {
 #ifdef USE_BUTTON
  virtual void on_button_command_request(const ButtonCommandRequest &value){};
 #endif
+#ifdef USE_MEDIA_PLAYER
+  bool send_media_player_supported_format(const MediaPlayerSupportedFormat &msg);
+  virtual void on_media_player_supported_format(const MediaPlayerSupportedFormat &value){};
+#endif
 #ifdef USE_MEDIA_PLAYER
  bool send_list_entities_media_player_response(const ListEntitiesMediaPlayerResponse &msg);
 #endif
@@ -247,21 +251,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_VOICE_ASSISTANT
-  virtual void on_voice_assistant_configuration_request(const VoiceAssistantConfigurationRequest &value){};
-#endif
-#ifdef USE_VOICE_ASSISTANT
-  bool send_voice_assistant_configuration_response(const VoiceAssistantConfigurationResponse &msg);
-#endif
-#ifdef USE_VOICE_ASSISTANT
-  virtual void on_voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &value){};
-#endif
 #ifdef USE_ALARM_CONTROL_PANEL
  bool send_list_entities_alarm_control_panel_response(const ListEntitiesAlarmControlPanelResponse &msg);
 #endif
@@ -434,13 +423,6 @@ class APIServerConnection : public APIServerConnectionBase {
 #ifdef USE_VOICE_ASSISTANT
  virtual void subscribe_voice_assistant(const SubscribeVoiceAssistantRequest &msg) = 0;
 #endif
-#ifdef USE_VOICE_ASSISTANT
-  virtual VoiceAssistantConfigurationResponse voice_assistant_get_configuration(
-      const VoiceAssistantConfigurationRequest &msg) = 0;
-#endif
-#ifdef USE_VOICE_ASSISTANT
-  virtual void voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg) = 0;
-#endif
 #ifdef USE_ALARM_CONTROL_PANEL
  virtual void alarm_control_panel_command(const AlarmControlPanelCommandRequest &msg) = 0;
 #endif
@@ -542,12 +524,6 @@ class APIServerConnection : public APIServerConnectionBase {
 #ifdef USE_VOICE_ASSISTANT
  void on_subscribe_voice_assistant_request(const SubscribeVoiceAssistantRequest &msg) override;
 #endif
-#ifdef USE_VOICE_ASSISTANT
-  void on_voice_assistant_configuration_request(const VoiceAssistantConfigurationRequest &msg) override;
-#endif
-#ifdef USE_VOICE_ASSISTANT
-  void on_voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg) override;
-#endif
 #ifdef USE_ALARM_CONTROL_PANEL
  void on_alarm_control_panel_command_request(const AlarmControlPanelCommandRequest &msg) override;
 #endif
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -1,5 +1,4 @@
 #include "api_server.h"
-#ifdef USE_API
 #include <cerrno>
 #include "api_connection.h"
 #include "esphome/components/network/util.h"
@@ -404,4 +403,3 @@ void APIServer::on_alarm_control_panel_update(alarm_control_panel::AlarmControlP

 }  // namespace api
 }  // namespace esphome
-#endif
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -1,7 +1,5 @@
 #pragma once

-#include "esphome/core/defines.h"
-#ifdef USE_API
 #include "api_noise_context.h"
 #include "api_pb2.h"
 #include "api_pb2_service.h"
@@ -9,6 +7,7 @@
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 #include "esphome/core/controller.h"
+#include "esphome/core/defines.h"
 #include "esphome/core/log.h"
 #include "list_entities.h"
 #include "subscribe_state.h"
@@ -154,4 +153,3 @@ template<typename... Ts> class APIConnectedCondition : public Condition<Ts...> {

 }  // namespace api
 }  // namespace esphome
-#endif
--- a/esphome/components/api/custom_api_device.h
+++ b/esphome/components/api/custom_api_device.h
@@ -1,9 +1,9 @@
 #pragma once

 #include <map>
-#include "api_server.h"
-#ifdef USE_API
 #include "user_services.h"
+#include "api_server.h"
+
 namespace esphome {
 namespace api {

@@ -216,4 +216,3 @@ class CustomAPIDevice {

 }  // namespace api
 }  // namespace esphome
-#endif
--- a/esphome/components/api/homeassistant_service.h
+++ b/esphome/components/api/homeassistant_service.h
@@ -1,10 +1,10 @@
 #pragma once

-#include "api_server.h"
-#ifdef USE_API
-#include "api_pb2.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/automation.h"
+#include "api_pb2.h"
+#include "api_server.h"
+
 #include <vector>

 namespace esphome {
@@ -81,4 +81,3 @@ template<typename... Ts> class HomeAssistantServiceCallAction : public Action<Ts

 }  // namespace api
 }  // namespace esphome
-#endif
--- a/esphome/components/api/list_entities.cpp
+++ b/esphome/components/api/list_entities.cpp
@@ -1,5 +1,4 @@
 #include "list_entities.h"
-#ifdef USE_API
 #include "api_connection.h"
 #include "esphome/core/application.h"
 #include "esphome/core/log.h"
@@ -105,4 +104,3 @@ bool ListEntitiesIterator::on_update(update::UpdateEntity *update) { return this

 }  // namespace api
 }  // namespace esphome
-#endif
--- a/esphome/components/api/list_entities.h
+++ b/esphome/components/api/list_entities.h
@@ -1,9 +1,9 @@
 #pragma once

-#include "esphome/core/defines.h"
-#ifdef USE_API
 #include "esphome/core/component.h"
 #include "esphome/core/component_iterator.h"
+#include "esphome/core/defines.h"
+
 namespace esphome {
 namespace api {

@@ -87,4 +87,3 @@ class ListEntitiesIterator : public ComponentIterator {

 }  // namespace api
 }  // namespace esphome
-#endif
--- a/esphome/components/api/subscribe_state.cpp
+++ b/esphome/components/api/subscribe_state.cpp
@@ -1,5 +1,4 @@
 #include "subscribe_state.h"
-#ifdef USE_API
 #include "api_connection.h"
 #include "esphome/core/log.h"

@@ -85,4 +84,3 @@ InitialStateIterator::InitialStateIterator(APIConnection *client) : client_(clie

 }  // namespace api
 }  // namespace esphome
-#endif
--- a/esphome/components/api/subscribe_state.h
+++ b/esphome/components/api/subscribe_state.h
@@ -1,10 +1,10 @@
 #pragma once

-#include "esphome/core/defines.h"
-#ifdef USE_API
 #include "esphome/core/component.h"
 #include "esphome/core/component_iterator.h"
 #include "esphome/core/controller.h"
+#include "esphome/core/defines.h"
+
 namespace esphome {
 namespace api {

@@ -82,4 +82,3 @@ class InitialStateIterator : public ComponentIterator {

 }  // namespace api
 }  // namespace esphome
-#endif
--- a/esphome/components/async_tcp/init.py
+++ b/esphome/components/async_tcp/init.py
@@ -1,13 +1,13 @@
 # Dummy integration to allow relying on AsyncTCP
 import esphome.codegen as cg
 import esphome.config_validation as cv
+from esphome.core import CORE, coroutine_with_priority
 from esphome.const import (
-    PLATFORM_BK72XX,
    PLATFORM_ESP32,
    PLATFORM_ESP8266,
+    PLATFORM_BK72XX,
    PLATFORM_RTL87XX,
 )
-from esphome.core import CORE, coroutine_with_priority

 CODEOWNERS = ["@OttoWinter"]

@@ -22,7 +22,7 @@ CONFIG_SCHEMA = cv.All(
 async def to_code(config):
    if CORE.is_esp32 or CORE.is_libretiny:
        # https://github.com/esphome/AsyncTCP/blob/master/library.json
-        cg.add_library("esphome/AsyncTCP-esphome", "2.1.4")
+        cg.add_library("esphome/AsyncTCP-esphome", "2.1.3")
    elif CORE.is_esp8266:
        # https://github.com/esphome/ESPAsyncTCP
        cg.add_library("esphome/ESPAsyncTCP-esphome", "2.0.0")
--- a/esphome/components/audio_dac/init.py
+++ b/esphome/components/audio_dac/init.py
@@ -1,57 +0,0 @@
-from esphome import automation
-from esphome.automation import maybe_simple_id
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_VOLUME
-from esphome.core import coroutine_with_priority
-
-CODEOWNERS = ["@kbx81"]
-IS_PLATFORM_COMPONENT = True
-
-audio_dac_ns = cg.esphome_ns.namespace("audio_dac")
-AudioDac = audio_dac_ns.class_("AudioDac")
-
-MuteOffAction = audio_dac_ns.class_("MuteOffAction", automation.Action)
-MuteOnAction = audio_dac_ns.class_("MuteOnAction", automation.Action)
-SetVolumeAction = audio_dac_ns.class_("SetVolumeAction", automation.Action)
-
-
-MUTE_ACTION_SCHEMA = maybe_simple_id(
-    {
-        cv.GenerateID(): cv.use_id(AudioDac),
-    }
-)
-
-SET_VOLUME_ACTION_SCHEMA = cv.maybe_simple_value(
-    {
-        cv.GenerateID(): cv.use_id(AudioDac),
-        cv.Required(CONF_VOLUME): cv.templatable(cv.percentage),
-    },
-    key=CONF_VOLUME,
-)
-
-
-@automation.register_action("audio_dac.mute_off", MuteOffAction, MUTE_ACTION_SCHEMA)
-@automation.register_action("audio_dac.mute_on", MuteOnAction, MUTE_ACTION_SCHEMA)
-async def audio_dac_mute_action_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)
-
-
-@automation.register_action(
-    "audio_dac.set_volume", SetVolumeAction, SET_VOLUME_ACTION_SCHEMA
-)
-async def audio_dac_set_volume_to_code(config, action_id, template_arg, args):
-    paren = await cg.get_variable(config[CONF_ID])
-    var = cg.new_Pvariable(action_id, template_arg, paren)
-
-    template_ = await cg.templatable(config.get(CONF_VOLUME), args, float)
-    cg.add(var.set_volume(template_))
-
-    return var
-
-
-@coroutine_with_priority(100.0)
-async def to_code(config):
-    cg.add_define("USE_AUDIO_DAC")
-    cg.add_global(audio_dac_ns.using)
--- a/esphome/components/audio_dac/audio_dac.h
+++ b/esphome/components/audio_dac/audio_dac.h
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "esphome/core/defines.h"
-#include "esphome/core/hal.h"
-
-namespace esphome {
-namespace audio_dac {
-
-class AudioDac {
- public:
-  virtual bool set_mute_off() = 0;
-  virtual bool set_mute_on() = 0;
-  virtual bool set_volume(float volume) = 0;
-
-  virtual bool is_muted() = 0;
-  virtual float volume() = 0;
-
- protected:
-  bool is_muted_{false};
-};
-
-}  // namespace audio_dac
-}  // namespace esphome
--- a/esphome/components/audio_dac/automation.h
+++ b/esphome/components/audio_dac/automation.h
@@ -1,43 +0,0 @@
-#pragma once
-
-#include "esphome/core/automation.h"
-#include "esphome/core/component.h"
-#include "audio_dac.h"
-
-namespace esphome {
-namespace audio_dac {
-
-template<typename... Ts> class MuteOffAction : public Action<Ts...> {
- public:
-  explicit MuteOffAction(AudioDac *audio_dac) : audio_dac_(audio_dac) {}
-
-  void play(Ts... x) override { this->audio_dac_->set_mute_off(); }
-
- protected:
-  AudioDac *audio_dac_;
-};
-
-template<typename... Ts> class MuteOnAction : public Action<Ts...> {
- public:
-  explicit MuteOnAction(AudioDac *audio_dac) : audio_dac_(audio_dac) {}
-
-  void play(Ts... x) override { this->audio_dac_->set_mute_on(); }
-
- protected:
-  AudioDac *audio_dac_;
-};
-
-template<typename... Ts> class SetVolumeAction : public Action<Ts...> {
- public:
-  explicit SetVolumeAction(AudioDac *audio_dac) : audio_dac_(audio_dac) {}
-
-  TEMPLATABLE_VALUE(float, volume)
-
-  void play(Ts... x) override { this->audio_dac_->set_volume(this->volume_.value(x...)); }
-
- protected:
-  AudioDac *audio_dac_;
-};
-
-}  // namespace audio_dac
-}  // namespace esphome
--- a/esphome/components/bang_bang/bang_bang_climate.cpp
+++ b/esphome/components/bang_bang/bang_bang_climate.cpp
@@ -157,11 +157,8 @@ void BangBangClimate::switch_to_action_(climate::ClimateAction action) {
    default:
      trig = nullptr;
  }
-  if (trig != nullptr) {
-    trig->trigger();
-  } else {
-    ESP_LOGW(TAG, "trig not set - unsupported action");
-  }
+  assert(trig != nullptr);
+  trig->trigger();
  this->action = action;
  this->prev_trigger_ = trig;
  this->publish_state();
--- a/esphome/components/bedjet/bedjet_codec.cpp
+++ b/esphome/components/bedjet/bedjet_codec.cpp
@@ -13,10 +13,8 @@ float bedjet_temp_to_f(const uint8_t temp) {

 /** Cleans up the packet before sending. */
 BedjetPacket *BedjetCodec::clean_packet_() {
-  // So far no commands require more than 2 bytes of data
-  if (this->packet_.data_length > 2) {
-    ESP_LOGW(TAG, "Packet may be malformed");
-  }
+  // So far no commands require more than 2 bytes of data.
+  assert(this->packet_.data_length <= 2);
  for (int i = this->packet_.data_length; i < 2; i++) {
    this->packet_.data[i] = '\0';
  }
--- a/esphome/components/binary_sensor/init.py
+++ b/esphome/components/binary_sensor/init.py
@@ -25,7 +25,7 @@ from esphome.const import (
    CONF_STATE,
    CONF_TIMING,
    CONF_TRIGGER_ID,
-    CONF_WEB_SERVER,
+    CONF_WEB_SERVER_ID,
    DEVICE_CLASS_BATTERY,
    DEVICE_CLASS_BATTERY_CHARGING,
    DEVICE_CLASS_CARBON_MONOXIDE,
@@ -543,8 +543,9 @@ async def setup_binary_sensor_core_(var, config):
        mqtt_ = cg.new_Pvariable(mqtt_id, var)
        await mqtt.register_mqtt_component(mqtt_, config)

-    if web_server_config := config.get(CONF_WEB_SERVER):
-        await web_server.add_entity_config(var, web_server_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)


 async def register_binary_sensor(var, config):
--- 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,185 +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):
-    var = cg.new_Pvariable(action_id, template_arg)
-    await cg.register_parented(var, config[CONF_ID])
-    return var
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await 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
@@ -41,33 +41,20 @@ static const uint32_t BL0942_REG_MODE_DEFAULT =
 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;
-
 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;
-    }
-    return;
-  }
-
  if (this->read_array((uint8_t *) &buffer, sizeof(buffer))) {
    if (this->validate_checksum_(&buffer)) {
      this->received_package_(&buffer);
    }
+  } else {
+    ESP_LOGW(TAG, "Junk on wire. Throwing away partial message");
+    while (read() >= 0)
+      ;
  }
-  this->rx_start_ = 0;
 }

 bool BL0942::validate_checksum_(DataPacket *data) {
@@ -122,23 +109,8 @@ void BL0942::update() {
 }

 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;
-  }
-
-  // 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);
+  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 */
@@ -161,17 +133,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;

@@ -197,18 +162,13 @@ void BL0942::received_package_(DataPacket *data) {

 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
@@ -93,23 +42,6 @@ class BL0942 : public PollingComponent, public uart::UARTDevice {
  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;
@@ -127,21 +59,14 @@ 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);
--- a/esphome/components/bl0942/sensor.py
+++ b/esphome/components/bl0942/sensor.py
@@ -24,12 +24,6 @@ from esphome.const import (
    UNIT_WATT,
 )

-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")
@@ -59,19 +53,19 @@ 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,
            ),
@@ -83,11 +77,6 @@ CONFIG_SCHEMA = (
                ),
            ),
            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"))
@@ -117,12 +106,3 @@ async def to_code(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
@@ -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_presence/binary_sensor.py
+++ b/esphome/components/ble_presence/binary_sensor.py
@@ -41,7 +41,7 @@ CONFIG_SCHEMA = cv.All(
            cv.Optional(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
            cv.Optional(CONF_IBEACON_MAJOR): cv.uint16_t,
            cv.Optional(CONF_IBEACON_MINOR): cv.uint16_t,
-            cv.Optional(CONF_IBEACON_UUID): esp32_ble_tracker.bt_uuid,
+            cv.Optional(CONF_IBEACON_UUID): cv.uuid,
            cv.Optional(CONF_TIMEOUT, default="5min"): cv.positive_time_period,
            cv.Optional(CONF_MIN_RSSI): cv.All(
                cv.decibel, cv.int_range(min=-100, max=-30)
@@ -83,7 +83,7 @@ async def to_code(config):
            cg.add(var.set_service_uuid128(uuid128))

    if ibeacon_uuid := config.get(CONF_IBEACON_UUID):
-        ibeacon_uuid = esp32_ble_tracker.as_reversed_hex_array(ibeacon_uuid)
+        ibeacon_uuid = esp32_ble_tracker.as_hex_array(str(ibeacon_uuid))
        cg.add(var.set_ibeacon_uuid(ibeacon_uuid))

        if (ibeacon_major := config.get(CONF_IBEACON_MAJOR)) is not None:
--- a/esphome/components/ble_rssi/sensor.py
+++ b/esphome/components/ble_rssi/sensor.py
@@ -45,7 +45,7 @@ CONFIG_SCHEMA = cv.All(
            cv.Optional(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
            cv.Optional(CONF_IBEACON_MAJOR): cv.uint16_t,
            cv.Optional(CONF_IBEACON_MINOR): cv.uint16_t,
-            cv.Optional(CONF_IBEACON_UUID): esp32_ble_tracker.bt_uuid,
+            cv.Optional(CONF_IBEACON_UUID): cv.uuid,
        }
    )
    .extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
@@ -79,7 +79,7 @@ async def to_code(config):
            cg.add(var.set_service_uuid128(uuid128))

    if ibeacon_uuid := config.get(CONF_IBEACON_UUID):
-        ibeacon_uuid = esp32_ble_tracker.as_reversed_hex_array(ibeacon_uuid)
+        ibeacon_uuid = esp32_ble_tracker.as_hex_array(str(ibeacon_uuid))
        cg.add(var.set_ibeacon_uuid(ibeacon_uuid))

        if (ibeacon_major := config.get(CONF_IBEACON_MAJOR)) is not None:
--- 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/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/button/init.py
+++ b/esphome/components/button/init.py
@@ -11,7 +11,7 @@ from esphome.const import (
    CONF_MQTT_ID,
    CONF_ON_PRESS,
    CONF_TRIGGER_ID,
-    CONF_WEB_SERVER,
+    CONF_WEB_SERVER_ID,
    DEVICE_CLASS_EMPTY,
    DEVICE_CLASS_IDENTIFY,
    DEVICE_CLASS_RESTART,
@@ -97,8 +97,9 @@ async def setup_button_core_(var, config):
        mqtt_ = cg.new_Pvariable(mqtt_id, var)
        await mqtt.register_mqtt_component(mqtt_, config)

-    if web_server_config := config.get(CONF_WEB_SERVER):
-        await web_server.add_entity_config(var, web_server_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)


 async def register_button(var, config):
--- a/esphome/components/ch422g/init.py
+++ b/esphome/components/ch422g/init.py
@@ -1,76 +0,0 @@
-from esphome import pins
-import esphome.codegen as cg
-from esphome.components import i2c
-from esphome.components.i2c import I2CBus
-import esphome.config_validation as cv
-from esphome.const import (
-    CONF_I2C_ID,
-    CONF_ID,
-    CONF_INPUT,
-    CONF_INVERTED,
-    CONF_MODE,
-    CONF_NUMBER,
-    CONF_OPEN_DRAIN,
-    CONF_OUTPUT,
-)
-
-CODEOWNERS = ["@jesterret", "@clydebarrow"]
-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"
-
-# Note that no address is configurable - each register in the CH422G has a dedicated i2c address
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(CONF_ID): cv.declare_id(CH422GComponent),
-        cv.GenerateID(CONF_I2C_ID): cv.use_id(I2CBus),
-    }
-).extend(cv.COMPONENT_SCHEMA)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    # Can't use register_i2c_device because there is no CONF_ADDRESS
-    parent = await cg.get_variable(config[CONF_I2C_ID])
-    cg.add(var.set_i2c_bus(parent))
-
-
-# This is used as a final validation step so that modes have been fully transformed.
-def pin_mode_check(pin_config, _):
-    if pin_config[CONF_MODE][CONF_INPUT] and pin_config[CONF_NUMBER] >= 8:
-        raise cv.Invalid("CH422G only supports input on pins 0-7")
-    if pin_config[CONF_MODE][CONF_OPEN_DRAIN] and pin_config[CONF_NUMBER] < 8:
-        raise cv.Invalid("CH422G only supports open drain output on pins 8-11")
-
-
-CH422G_PIN_SCHEMA = pins.gpio_base_schema(
-    CH422GGPIOPin,
-    cv.int_range(min=0, max=11),
-    modes=[CONF_INPUT, CONF_OUTPUT, CONF_OPEN_DRAIN],
-).extend(
-    {
-        cv.Required(CONF_CH422G): cv.use_id(CH422GComponent),
-    }
-)
-
-
-@pins.PIN_SCHEMA_REGISTRY.register(CONF_CH422G, CH422G_PIN_SCHEMA, pin_mode_check)
-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/esphome/components/ch422g/ch422g.cpp
+++ b/esphome/components/ch422g/ch422g.cpp
@@ -1,139 +0,0 @@
-#include "ch422g.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace ch422g {
-
-static const uint8_t CH422G_REG_MODE = 0x24;
-static const uint8_t CH422G_MODE_OUTPUT = 0x01;      // enables output mode on 0-7
-static const uint8_t CH422G_MODE_OPEN_DRAIN = 0x04;  // enables open drain mode on 8-11
-static const uint8_t CH422G_REG_IN = 0x26;           // read reg for input bits
-static const uint8_t CH422G_REG_OUT = 0x38;          // write reg for output bits 0-7
-static const uint8_t CH422G_REG_OUT_UPPER = 0x23;    // write reg for output bits 8-11
-
-static const char *const TAG = "ch422g";
-
-void CH422GComponent::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up CH422G...");
-  // set outputs before mode
-  this->write_outputs_();
-  // Set mode and check for errors
-  if (!this->set_mode_(this->mode_value_) || !this->read_inputs_()) {
-    ESP_LOGE(TAG, "CH422G not detected at 0x%02X", this->address_);
-    this->mark_failed();
-    return;
-  }
-
-  ESP_LOGCONFIG(TAG, "Initialization complete. Warning: %d, Error: %d", this->status_has_warning(),
-                this->status_has_error());
-}
-
-void CH422GComponent::loop() {
-  // Clear all the previously read flags.
-  this->pin_read_flags_ = 0x00;
-}
-
-void CH422GComponent::dump_config() {
-  ESP_LOGCONFIG(TAG, "CH422G:");
-  LOG_I2C_DEVICE(this)
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with CH422G failed!");
-  }
-}
-
-void CH422GComponent::pin_mode(uint8_t pin, gpio::Flags flags) {
-  if (pin < 8) {
-    if (flags & gpio::FLAG_OUTPUT) {
-      this->mode_value_ |= CH422G_MODE_OUTPUT;
-    }
-  } else {
-    if (flags & gpio::FLAG_OPEN_DRAIN) {
-      this->mode_value_ |= CH422G_MODE_OPEN_DRAIN;
-    }
-  }
-}
-
-bool CH422GComponent::digital_read(uint8_t pin) {
-  if (this->pin_read_flags_ == 0 || this->pin_read_flags_ & (1 << pin)) {
-    // Read values on first access or in case it's being read again in the same loop
-    this->read_inputs_();
-  }
-
-  this->pin_read_flags_ |= (1 << pin);
-  return (this->input_bits_ & (1 << pin)) != 0;
-}
-
-void CH422GComponent::digital_write(uint8_t pin, bool value) {
-  if (value) {
-    this->output_bits_ |= (1 << pin);
-  } else {
-    this->output_bits_ &= ~(1 << pin);
-  }
-  this->write_outputs_();
-}
-
-bool CH422GComponent::read_inputs_() {
-  if (this->is_failed()) {
-    return false;
-  }
-  uint8_t result;
-  // reading inputs requires the chip to be in input mode, possibly temporarily.
-  if (this->mode_value_ & CH422G_MODE_OUTPUT) {
-    this->set_mode_(this->mode_value_ & ~CH422G_MODE_OUTPUT);
-    result = this->read_reg_(CH422G_REG_IN);
-    this->set_mode_(this->mode_value_);
-  } else {
-    result = this->read_reg_(CH422G_REG_IN);
-  }
-  this->input_bits_ = result;
-  this->status_clear_warning();
-  return true;
-}
-
-// Write a register. Can't use the standard write_byte() method because there is no single pre-configured i2c address.
-bool CH422GComponent::write_reg_(uint8_t reg, uint8_t value) {
-  auto err = this->bus_->write(reg, &value, 1);
-  if (err != i2c::ERROR_OK) {
-    this->status_set_warning(str_sprintf("write failed for register 0x%X, error %d", reg, err).c_str());
-    return false;
-  }
-  this->status_clear_warning();
-  return true;
-}
-
-uint8_t CH422GComponent::read_reg_(uint8_t reg) {
-  uint8_t value;
-  auto err = this->bus_->read(reg, &value, 1);
-  if (err != i2c::ERROR_OK) {
-    this->status_set_warning(str_sprintf("read failed for register 0x%X, error %d", reg, err).c_str());
-    return 0;
-  }
-  this->status_clear_warning();
-  return value;
-}
-
-bool CH422GComponent::set_mode_(uint8_t mode) { return this->write_reg_(CH422G_REG_MODE, mode); }
-
-bool CH422GComponent::write_outputs_() {
-  return this->write_reg_(CH422G_REG_OUT, static_cast<uint8_t>(this->output_bits_)) &&
-         this->write_reg_(CH422G_REG_OUT_UPPER, static_cast<uint8_t>(this->output_bits_ >> 8));
-}
-
-float CH422GComponent::get_setup_priority() const { return setup_priority::IO; }
-
-// Run our loop() method very early in the loop, so that we cache read values
-// before other components call our digital_read() method.
-float CH422GComponent::get_loop_priority() const { return 9.0f; }  // Just after WIFI
-
-void CH422GGPIOPin::pin_mode(gpio::Flags flags) { this->parent_->pin_mode(this->pin_, flags); }
-bool CH422GGPIOPin::digital_read() { return this->parent_->digital_read(this->pin_) ^ this->inverted_; }
-
-void CH422GGPIOPin::digital_write(bool value) { this->parent_->digital_write(this->pin_, value ^ this->inverted_); }
-std::string CH422GGPIOPin::dump_summary() const { return str_sprintf("EXIO%u via CH422G", pin_); }
-void CH422GGPIOPin::set_flags(gpio::Flags flags) {
-  flags_ = flags;
-  this->parent_->pin_mode(this->pin_, flags);
-}
-
-}  // namespace ch422g
-}  // namespace esphome
--- a/esphome/components/ch422g/ch422g.h
+++ b/esphome/components/ch422g/ch422g.h
@@ -1,68 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/hal.h"
-#include "esphome/components/i2c/i2c.h"
-
-namespace esphome {
-namespace ch422g {
-
-class CH422GComponent : public Component, public i2c::I2CDevice {
- public:
-  CH422GComponent() = default;
-
-  /// Check i2c availability and setup masks
-  void setup() override;
-  /// Poll for input changes periodically
-  void loop() override;
-  /// Helper function to read the value of a pin.
-  bool digital_read(uint8_t pin);
-  /// Helper function to write the value of a pin.
-  void digital_write(uint8_t pin, bool value);
-  /// Helper function to set the pin mode of a pin.
-  void pin_mode(uint8_t pin, gpio::Flags flags);
-
-  float get_setup_priority() const override;
-  float get_loop_priority() const override;
-  void dump_config() override;
-
- protected:
-  bool write_reg_(uint8_t reg, uint8_t value);
-  uint8_t read_reg_(uint8_t reg);
-  bool set_mode_(uint8_t mode);
-  bool read_inputs_();
-  bool write_outputs_();
-
-  /// The mask to write as output state - 1 means HIGH, 0 means LOW
-  uint16_t output_bits_{0x00};
-  /// Flags to check if read previously during this loop
-  uint8_t pin_read_flags_ = {0x00};
-  /// Copy of last read values
-  uint8_t input_bits_ = {0x00};
-  /// Copy of the mode value
-  uint8_t mode_value_{};
-};
-
-/// Helper class to expose a CH422G pin as a GPIO pin.
-class CH422GGPIOPin : public GPIOPin {
- public:
-  void setup() override{};
-  void pin_mode(gpio::Flags flags) override;
-  bool digital_read() override;
-  void digital_write(bool value) override;
-  std::string dump_summary() const override;
-
-  void set_parent(CH422GComponent *parent) { parent_ = parent; }
-  void set_pin(uint8_t pin) { pin_ = pin; }
-  void set_inverted(bool inverted) { inverted_ = inverted; }
-  void set_flags(gpio::Flags flags);
-
- protected:
-  CH422GComponent *parent_{};
-  uint8_t pin_{};
-  bool inverted_{};
-  gpio::Flags flags_{};
-};
-
-}  // namespace ch422g
-}  // namespace esphome
--- a/esphome/components/climate/init.py
+++ b/esphome/components/climate/init.py
@@ -43,7 +43,7 @@ from esphome.const import (
    CONF_TEMPERATURE_STEP,
    CONF_TRIGGER_ID,
    CONF_VISUAL,
-    CONF_WEB_SERVER,
+    CONF_WEB_SERVER_ID,
 )
 from esphome.core import CORE, coroutine_with_priority
 from esphome.cpp_helpers import setup_entity
@@ -408,8 +408,9 @@ async def setup_climate_core_(var, config):
            trigger, [(ClimateCall.operator("ref"), "x")], conf
        )

-    if web_server_config := config.get(CONF_WEB_SERVER):
-        await web_server.add_entity_config(var, web_server_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)


 async def register_climate(var, config):
--- a/esphome/components/cover/init.py
+++ b/esphome/components/cover/init.py
@@ -17,7 +17,7 @@ from esphome.const import (
    CONF_TILT_COMMAND_TOPIC,
    CONF_TILT_STATE_TOPIC,
    CONF_TRIGGER_ID,
-    CONF_WEB_SERVER,
+    CONF_WEB_SERVER_ID,
    DEVICE_CLASS_AWNING,
    DEVICE_CLASS_BLIND,
    DEVICE_CLASS_CURTAIN,
@@ -137,6 +137,10 @@ async def setup_cover_core_(var, config):
        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
        await automation.build_automation(trigger, [], conf)

+    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)) is not None:
        mqtt_ = cg.new_Pvariable(mqtt_id, var)
        await mqtt.register_mqtt_component(mqtt_, config)
@@ -152,9 +156,6 @@ async def setup_cover_core_(var, config):
        if (tilt_command_topic := config.get(CONF_TILT_COMMAND_TOPIC)) is not None:
            cg.add(mqtt_.set_custom_tilt_command_topic(tilt_command_topic))

-    if web_server_config := config.get(CONF_WEB_SERVER):
-        await web_server.add_entity_config(var, web_server_config)
-

 async def register_cover(var, config):
    if not CORE.has_id(config[CONF_ID]):
--- a/esphome/components/cse7766/cse7766.cpp
+++ b/esphome/components/cse7766/cse7766.cpp
@@ -147,7 +147,6 @@ void CSE7766Component::parse_data_() {
  float power = 0.0f;
  if (power_cycle_exceeds_range) {
    // Datasheet: power cycle exceeding range means active power is 0
-    have_power = true;
    if (this->power_sensor_ != nullptr) {
      this->power_sensor_->publish_state(0.0f);
    }
@@ -179,15 +178,6 @@ void CSE7766Component::parse_data_() {
    if (this->apparent_power_sensor_ != nullptr) {
      this->apparent_power_sensor_->publish_state(apparent_power);
    }
-    if (have_power && this->reactive_power_sensor_ != nullptr) {
-      const float reactive_power = apparent_power - power;
-      if (reactive_power < 0.0f) {
-        ESP_LOGD(TAG, "Impossible reactive power: %.4f is negative", reactive_power);
-        this->reactive_power_sensor_->publish_state(0.0f);
-      } else {
-        this->reactive_power_sensor_->publish_state(reactive_power);
-      }
-    }
    if (this->power_factor_sensor_ != nullptr && (have_power || power_cycle_exceeds_range)) {
      float pf = NAN;
      if (apparent_power > 0) {
@@ -242,9 +232,8 @@ void CSE7766Component::dump_config() {
  LOG_SENSOR("  ", "Power", this->power_sensor_);
  LOG_SENSOR("  ", "Energy", this->energy_sensor_);
  LOG_SENSOR("  ", "Apparent Power", this->apparent_power_sensor_);
-  LOG_SENSOR("  ", "Reactive Power", this->reactive_power_sensor_);
  LOG_SENSOR("  ", "Power Factor", this->power_factor_sensor_);
-  this->check_uart_settings(4800, 1, uart::UART_CONFIG_PARITY_EVEN);
+  this->check_uart_settings(4800);
 }

 }  // namespace cse7766
--- a/esphome/components/cse7766/cse7766.h
+++ b/esphome/components/cse7766/cse7766.h
@@ -16,9 +16,6 @@ class CSE7766Component : public Component, public uart::UARTDevice {
  void set_apparent_power_sensor(sensor::Sensor *apparent_power_sensor) {
    apparent_power_sensor_ = apparent_power_sensor;
  }
-  void set_reactive_power_sensor(sensor::Sensor *reactive_power_sensor) {
-    reactive_power_sensor_ = reactive_power_sensor;
-  }
  void set_power_factor_sensor(sensor::Sensor *power_factor_sensor) { power_factor_sensor_ = power_factor_sensor; }

  void loop() override;
@@ -38,7 +35,6 @@ class CSE7766Component : public Component, public uart::UARTDevice {
  sensor::Sensor *power_sensor_{nullptr};
  sensor::Sensor *energy_sensor_{nullptr};
  sensor::Sensor *apparent_power_sensor_{nullptr};
-  sensor::Sensor *reactive_power_sensor_{nullptr};
  sensor::Sensor *power_factor_sensor_{nullptr};
  uint32_t cf_pulses_total_{0};
  uint16_t cf_pulses_last_{0};
--- a/esphome/components/cse7766/sensor.py
+++ b/esphome/components/cse7766/sensor.py
@@ -8,21 +8,18 @@ from esphome.const import (
    CONF_ID,
    CONF_POWER,
    CONF_POWER_FACTOR,
-    CONF_REACTIVE_POWER,
    CONF_VOLTAGE,
    DEVICE_CLASS_APPARENT_POWER,
    DEVICE_CLASS_CURRENT,
    DEVICE_CLASS_ENERGY,
    DEVICE_CLASS_POWER,
    DEVICE_CLASS_POWER_FACTOR,
-    DEVICE_CLASS_REACTIVE_POWER,
    DEVICE_CLASS_VOLTAGE,
    STATE_CLASS_MEASUREMENT,
    STATE_CLASS_TOTAL_INCREASING,
    UNIT_AMPERE,
    UNIT_VOLT,
    UNIT_VOLT_AMPS,
-    UNIT_VOLT_AMPS_REACTIVE,
    UNIT_WATT,
    UNIT_WATT_HOURS,
 )
@@ -65,12 +62,6 @@ CONFIG_SCHEMA = cv.Schema(
            device_class=DEVICE_CLASS_APPARENT_POWER,
            state_class=STATE_CLASS_MEASUREMENT,
        ),
-        cv.Optional(CONF_REACTIVE_POWER): sensor.sensor_schema(
-            unit_of_measurement=UNIT_VOLT_AMPS_REACTIVE,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_REACTIVE_POWER,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
        cv.Optional(CONF_POWER_FACTOR): sensor.sensor_schema(
            accuracy_decimals=2,
            device_class=DEVICE_CLASS_POWER_FACTOR,
@@ -79,7 +70,7 @@ CONFIG_SCHEMA = cv.Schema(
    }
 ).extend(uart.UART_DEVICE_SCHEMA)
 FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
-    "cse7766", baud_rate=4800, parity="EVEN", require_rx=True
+    "cse7766", baud_rate=4800, require_rx=True
 )


@@ -103,9 +94,6 @@ async def to_code(config):
    if apparent_power_config := config.get(CONF_APPARENT_POWER):
        sens = await sensor.new_sensor(apparent_power_config)
        cg.add(var.set_apparent_power_sensor(sens))
-    if reactive_power_config := config.get(CONF_REACTIVE_POWER):
-        sens = await sensor.new_sensor(reactive_power_config)
-        cg.add(var.set_reactive_power_sensor(sens))
    if power_factor_config := config.get(CONF_POWER_FACTOR):
        sens = await sensor.new_sensor(power_factor_config)
        cg.add(var.set_power_factor_sensor(sens))
--- a/esphome/components/cst816/touchscreen/init.py
+++ b/esphome/components/cst816/touchscreen/init.py
@@ -1,11 +1,12 @@
-from esphome import pins
 import esphome.codegen as cg
-from esphome.components import i2c, touchscreen
 import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_INTERRUPT_PIN, CONF_RESET_PIN

+from esphome import pins
+from esphome.components import i2c, touchscreen
+from esphome.const import CONF_INTERRUPT_PIN, CONF_ID, CONF_RESET_PIN
 from .. import cst816_ns

+
 CST816Touchscreen = cst816_ns.class_(
    "CST816Touchscreen",
    touchscreen.Touchscreen,
@@ -13,14 +14,11 @@ CST816Touchscreen = cst816_ns.class_(
 )

 CST816ButtonListener = cst816_ns.class_("CST816ButtonListener")
-
-CONF_SKIP_PROBE = "skip_probe"
 CONFIG_SCHEMA = touchscreen.TOUCHSCREEN_SCHEMA.extend(
    {
        cv.GenerateID(): cv.declare_id(CST816Touchscreen),
        cv.Optional(CONF_INTERRUPT_PIN): pins.internal_gpio_input_pin_schema,
        cv.Optional(CONF_RESET_PIN): pins.gpio_output_pin_schema,
-        cv.Optional(CONF_SKIP_PROBE, default=False): cv.boolean,
    }
 ).extend(i2c.i2c_device_schema(0x15))

@@ -30,7 +28,6 @@ async def to_code(config):
    await touchscreen.register_touchscreen(var, config)
    await i2c.register_i2c_device(var, config)

-    cg.add(var.set_skip_probe(config[CONF_SKIP_PROBE]))
    if interrupt_pin := config.get(CONF_INTERRUPT_PIN):
        cg.add(var.set_interrupt_pin(await cg.gpio_pin_expression(interrupt_pin)))
    if reset_pin := config.get(CONF_RESET_PIN):
--- a/esphome/components/cst816/touchscreen/cst816_touchscreen.cpp
+++ b/esphome/components/cst816/touchscreen/cst816_touchscreen.cpp
@@ -8,33 +8,32 @@ void CST816Touchscreen::continue_setup_() {
    this->interrupt_pin_->setup();
    this->attach_interrupt_(this->interrupt_pin_, gpio::INTERRUPT_FALLING_EDGE);
  }
-  if (this->read_byte(REG_CHIP_ID, &this->chip_id_)) {
-    switch (this->chip_id_) {
-      case CST820_CHIP_ID:
-      case CST826_CHIP_ID:
-      case CST716_CHIP_ID:
-      case CST816S_CHIP_ID:
-      case CST816D_CHIP_ID:
-      case CST816T_CHIP_ID:
-        break;
-      default:
-        this->mark_failed();
-        this->status_set_error(str_sprintf("Unknown chip ID 0x%02X", this->chip_id_).c_str());
-        return;
-    }
-    this->write_byte(REG_IRQ_CTL, IRQ_EN_MOTION);
-  } else if (!this->skip_probe_) {
-    this->status_set_error("Failed to read chip id");
+  if (!this->read_byte(REG_CHIP_ID, &this->chip_id_)) {
    this->mark_failed();
+    esph_log_e(TAG, "Failed to read chip id");
    return;
  }
+  switch (this->chip_id_) {
+    case CST820_CHIP_ID:
+    case CST826_CHIP_ID:
+    case CST716_CHIP_ID:
+    case CST816S_CHIP_ID:
+    case CST816D_CHIP_ID:
+    case CST816T_CHIP_ID:
+      break;
+    default:
+      this->mark_failed();
+      esph_log_e(TAG, "Unknown chip ID 0x%02X", this->chip_id_);
+      return;
+  }
+  this->write_byte(REG_IRQ_CTL, IRQ_EN_MOTION);
  if (this->x_raw_max_ == this->x_raw_min_) {
    this->x_raw_max_ = this->display_->get_native_width();
  }
  if (this->y_raw_max_ == this->y_raw_min_) {
    this->y_raw_max_ = this->display_->get_native_height();
  }
-  ESP_LOGCONFIG(TAG, "CST816 Touchscreen setup complete");
+  esph_log_config(TAG, "CST816 Touchscreen setup complete");
 }

 void CST816Touchscreen::update_button_state_(bool state) {
@@ -46,7 +45,7 @@ void CST816Touchscreen::update_button_state_(bool state) {
 }

 void CST816Touchscreen::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up CST816 Touchscreen...");
+  esph_log_config(TAG, "Setting up CST816 Touchscreen...");
  if (this->reset_pin_ != nullptr) {
    this->reset_pin_->setup();
    this->reset_pin_->digital_write(true);
@@ -74,7 +73,7 @@ void CST816Touchscreen::update_touches() {

  uint16_t x = encode_uint16(data[REG_XPOS_HIGH] & 0xF, data[REG_XPOS_LOW]);
  uint16_t y = encode_uint16(data[REG_YPOS_HIGH] & 0xF, data[REG_YPOS_LOW]);
-  ESP_LOGV(TAG, "Read touch %d/%d", x, y);
+  esph_log_v(TAG, "Read touch %d/%d", x, y);
  if (x >= this->x_raw_max_) {
    this->update_button_state_(true);
  } else {
--- a/esphome/components/cst816/touchscreen/cst816_touchscreen.h
+++ b/esphome/components/cst816/touchscreen/cst816_touchscreen.h
@@ -45,7 +45,6 @@ class CST816Touchscreen : public touchscreen::Touchscreen, public i2c::I2CDevice

  void set_interrupt_pin(InternalGPIOPin *pin) { this->interrupt_pin_ = pin; }
  void set_reset_pin(GPIOPin *pin) { this->reset_pin_ = pin; }
-  void set_skip_probe(bool skip_probe) { this->skip_probe_ = skip_probe; }

 protected:
  void continue_setup_();
@@ -54,7 +53,6 @@ class CST816Touchscreen : public touchscreen::Touchscreen, public i2c::I2CDevice
  InternalGPIOPin *interrupt_pin_{};
  GPIOPin *reset_pin_{};
  uint8_t chip_id_{};
-  bool skip_probe_{};  // if set, do not expect to be able to probe the controller on the i2c bus.
  std::vector<CST816ButtonListener *> button_listeners_;
  bool button_touched_{};
 };
--- a/esphome/components/datetime/init.py
+++ b/esphome/components/datetime/init.py
@@ -18,7 +18,7 @@ from esphome.const import (
    CONF_TIME_ID,
    CONF_TRIGGER_ID,
    CONF_TYPE,
-    CONF_WEB_SERVER,
+    CONF_WEB_SERVER_ID,
    CONF_YEAR,
 )
 from esphome.core import CORE, coroutine_with_priority
@@ -26,6 +26,7 @@ from esphome.cpp_generator import MockObjClass
 from esphome.cpp_helpers import setup_entity

 CODEOWNERS = ["@rfdarter", "@jesserockz"]
+DEPENDENCIES = ["time"]

 IS_PLATFORM_COMPONENT = True

@@ -61,28 +62,20 @@ DATETIME_MODES = [
 ]


-def _validate_time_present(config):
-    config = config.copy()
-    if CONF_ON_TIME in config and CONF_TIME_ID not in config:
-        time_id = cv.use_id(time.RealTimeClock)(None)
-        config[CONF_TIME_ID] = time_id
-    return config
-
-
-_DATETIME_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(
-    web_server.WEBSERVER_SORTING_SCHEMA,
-    cv.MQTT_COMMAND_COMPONENT_SCHEMA,
-    cv.Schema(
+_DATETIME_SCHEMA = (
+    cv.ENTITY_BASE_SCHEMA.extend(web_server.WEBSERVER_SORTING_SCHEMA)
+    .extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA)
+    .extend(
        {
            cv.Optional(CONF_ON_VALUE): automation.validate_automation(
                {
                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(DateTimeStateTrigger),
                }
            ),
-            cv.Optional(CONF_TIME_ID): cv.use_id(time.RealTimeClock),
+            cv.GenerateID(CONF_TIME_ID): cv.use_id(time.RealTimeClock),
        }
-    ),
-).add_extra(_validate_time_present)
+    )
+)


 def date_schema(class_: MockObjClass) -> cv.Schema:
@@ -138,15 +131,15 @@ async def setup_datetime_core_(var, config):
    if (mqtt_id := config.get(CONF_MQTT_ID)) is not None:
        mqtt_ = cg.new_Pvariable(mqtt_id, var)
        await mqtt.register_mqtt_component(mqtt_, config)
-    if web_server_config := config.get(CONF_WEB_SERVER):
-        await web_server.add_entity_config(var, web_server_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)
    for conf in config.get(CONF_ON_VALUE, []):
        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
        await automation.build_automation(trigger, [(cg.ESPTime, "x")], conf)

-    if CONF_TIME_ID in config:
-        rtc = await cg.get_variable(config[CONF_TIME_ID])
-        cg.add(var.set_rtc(rtc))
+    rtc = await cg.get_variable(config[CONF_TIME_ID])
+    cg.add(var.set_rtc(rtc))

    for conf in config.get(CONF_ON_TIME, []):
        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID])
@@ -193,7 +186,7 @@ async def datetime_date_set_to_code(config, action_id, template_arg, args):

    date_config = config[CONF_DATE]
    if cg.is_template(date_config):
-        template_ = await cg.templatable(date_config, args, cg.ESPTime)
+        template_ = await cg.templatable(date_config, [], cg.ESPTime)
        cg.add(action_var.set_date(template_))
    else:
        date_struct = cg.StructInitializer(
@@ -224,7 +217,7 @@ async def datetime_time_set_to_code(config, action_id, template_arg, args):

    time_config = config[CONF_TIME]
    if cg.is_template(time_config):
-        template_ = await cg.templatable(time_config, args, cg.ESPTime)
+        template_ = await cg.templatable(time_config, [], cg.ESPTime)
        cg.add(action_var.set_time(template_))
    else:
        time_struct = cg.StructInitializer(
@@ -255,7 +248,7 @@ async def datetime_datetime_set_to_code(config, action_id, template_arg, args):

    datetime_config = config[CONF_DATETIME]
    if cg.is_template(datetime_config):
-        template_ = await cg.templatable(datetime_config, args, cg.ESPTime)
+        template_ = await cg.templatable(datetime_config, [], cg.ESPTime)
        cg.add(action_var.set_datetime(template_))
    else:
        datetime_struct = cg.StructInitializer(
--- a/esphome/components/datetime/datetime_base.h
+++ b/esphome/components/datetime/datetime_base.h
@@ -4,9 +4,8 @@
 #include "esphome/core/component.h"
 #include "esphome/core/entity_base.h"
 #include "esphome/core/time.h"
-#ifdef USE_TIME
+
 #include "esphome/components/time/real_time_clock.h"
-#endif

 namespace esphome {
 namespace datetime {
@@ -20,29 +19,23 @@ class DateTimeBase : public EntityBase {

  void add_on_state_callback(std::function<void()> &&callback) { this->state_callback_.add(std::move(callback)); }

-#ifdef USE_TIME
  void set_rtc(time::RealTimeClock *rtc) { this->rtc_ = rtc; }
  time::RealTimeClock *get_rtc() const { return this->rtc_; }
-#endif

 protected:
  CallbackManager<void()> state_callback_;

-#ifdef USE_TIME
  time::RealTimeClock *rtc_;
-#endif

  bool has_state_{false};
 };

-#ifdef USE_TIME
 class DateTimeStateTrigger : public Trigger<ESPTime> {
 public:
  explicit DateTimeStateTrigger(DateTimeBase *parent) {
    parent->add_on_state_callback([this, parent]() { this->trigger(parent->state_as_esptime()); });
  }
 };
-#endif

 }  // namespace datetime
 }  // namespace esphome
--- a/esphome/components/datetime/datetime_entity.cpp
+++ b/esphome/components/datetime/datetime_entity.cpp
@@ -192,7 +192,6 @@ void DateTimeEntityRestoreState::apply(DateTimeEntity *time) {
  time->publish_state();
 }

-#ifdef USE_TIME
 static const int MAX_TIMESTAMP_DRIFT = 900;  // how far can the clock drift before we consider
                                             // there has been a drastic time synchronization

@@ -246,7 +245,6 @@ bool OnDateTimeTrigger::matches_(const ESPTime &time) const {
         time.day_of_month == this->parent_->day && time.hour == this->parent_->hour &&
         time.minute == this->parent_->minute && time.second == this->parent_->second;
 }
-#endif

 }  // namespace datetime
 }  // namespace esphome
--- a/esphome/components/datetime/datetime_entity.h
+++ b/esphome/components/datetime/datetime_entity.h
@@ -134,7 +134,6 @@ template<typename... Ts> class DateTimeSetAction : public Action<Ts...>, public
  }
 };

-#ifdef USE_TIME
 class OnDateTimeTrigger : public Trigger<>, public Component, public Parented<DateTimeEntity> {
 public:
  void loop() override;
@@ -144,7 +143,6 @@ class OnDateTimeTrigger : public Trigger<>, public Component, public Parented<Da

  optional<ESPTime> last_check_;
 };
-#endif

 }  // namespace datetime
 }  // namespace esphome
--- a/esphome/components/datetime/time_entity.cpp
+++ b/esphome/components/datetime/time_entity.cpp
@@ -94,7 +94,6 @@ void TimeEntityRestoreState::apply(TimeEntity *time) {
  time->publish_state();
 }

-#ifdef USE_TIME
 static const int MAX_TIMESTAMP_DRIFT = 900;  // how far can the clock drift before we consider
                                             // there has been a drastic time synchronization

@@ -146,7 +145,6 @@ bool OnTimeTrigger::matches_(const ESPTime &time) const {
  return time.is_valid() && time.hour == this->parent_->hour && time.minute == this->parent_->minute &&
         time.second == this->parent_->second;
 }
-#endif

 }  // namespace datetime
 }  // namespace esphome
--- a/esphome/components/datetime/time_entity.h
+++ b/esphome/components/datetime/time_entity.h
@@ -113,7 +113,6 @@ template<typename... Ts> class TimeSetAction : public Action<Ts...>, public Pare
  }
 };

-#ifdef USE_TIME
 class OnTimeTrigger : public Trigger<>, public Component, public Parented<TimeEntity> {
 public:
  void loop() override;
@@ -123,7 +122,6 @@ class OnTimeTrigger : public Trigger<>, public Component, public Parented<TimeEn

  optional<ESPTime> last_check_;
 };
-#endif

 }  // namespace datetime
 }  // namespace esphome
--- a/esphome/components/debug/debug_esp32.cpp
+++ b/esphome/components/debug/debug_esp32.cpp
@@ -16,8 +16,6 @@
 #include <esp32s2/rom/rtc.h>
 #elif defined(USE_ESP32_VARIANT_ESP32S3)
 #include <esp32s3/rom/rtc.h>
-#elif defined(USE_ESP32_VARIANT_ESP32H2)
-#include <esp32h2/rom/rtc.h>
 #endif
 #ifdef USE_ARDUINO
 #include <Esp.h>
@@ -63,7 +61,7 @@ std::string DebugComponent::get_reset_reason_() {
    case RTCWDT_SYS_RESET:
      reset_reason = "RTC Watch Dog Reset Digital Core";
      break;
-#if !defined(USE_ESP32_VARIANT_ESP32C6) && !defined(USE_ESP32_VARIANT_ESP32H2)
+#if !defined(USE_ESP32_VARIANT_ESP32C6)
    case INTRUSION_RESET:
      reset_reason = "Intrusion Reset CPU";
      break;
--- a/esphome/components/display/init.py
+++ b/esphome/components/display/init.py
@@ -1,15 +1,15 @@
-from esphome import automation, core
-from esphome.automation import maybe_simple_id
 import esphome.codegen as cg
 import esphome.config_validation as cv
+from esphome import core, automation
+from esphome.automation import maybe_simple_id
 from esphome.const import (
    CONF_AUTO_CLEAR_ENABLED,
-    CONF_FROM,
    CONF_ID,
    CONF_LAMBDA,
-    CONF_PAGE_ID,
    CONF_PAGES,
+    CONF_PAGE_ID,
    CONF_ROTATION,
+    CONF_FROM,
    CONF_TO,
    CONF_TRIGGER_ID,
 )
@@ -195,4 +195,3 @@ async def display_is_displaying_page_to_code(config, condition_id, template_arg,
@coroutine_with_priority(100.0)
 async def to_code(config):
    cg.add_global(display_ns.using)
-    cg.add_define("USE_DISPLAY")
--- a/esphome/components/dsmr/dsmr.cpp
+++ b/esphome/components/dsmr/dsmr.cpp
@@ -256,7 +256,6 @@ bool Dsmr::parse_telegram() {
  MyData data;
  ESP_LOGV(TAG, "Trying to parse telegram");
  this->stop_requesting_data_();
-
  ::dsmr::ParseResult<void> res =
      ::dsmr::P1Parser::parse(&data, this->telegram_, this->bytes_read_, false,
                              this->crc_check_);  // Parse telegram according to data definition. Ignore unknown values.
@@ -268,11 +267,6 @@ bool Dsmr::parse_telegram() {
  } else {
    this->status_clear_warning();
    this->publish_sensors(data);
-
-    // publish the telegram, after publishing the sensors so it can also trigger action based on latest values
-    if (this->s_telegram_ != nullptr) {
-      this->s_telegram_->publish_state(std::string(this->telegram_, this->bytes_read_));
-    }
    return true;
  }
 }
--- a/esphome/components/dsmr/dsmr.h
+++ b/esphome/components/dsmr/dsmr.h
@@ -85,9 +85,6 @@ class Dsmr : public Component, public uart::UARTDevice {
  void set_##s(text_sensor::TextSensor *sensor) { s_##s##_ = sensor; }
  DSMR_TEXT_SENSOR_LIST(DSMR_SET_TEXT_SENSOR, )

-  // handled outside dsmr
-  void set_telegram(text_sensor::TextSensor *sensor) { s_telegram_ = sensor; }
-
 protected:
  void receive_telegram_();
  void receive_encrypted_telegram_();
@@ -127,9 +124,6 @@ class Dsmr : public Component, public uart::UARTDevice {
  bool header_found_{false};
  bool footer_found_{false};

-  // handled outside dsmr
-  text_sensor::TextSensor *s_telegram_{nullptr};
-
 // Sensor member pointers
 #define DSMR_DECLARE_SENSOR(s) sensor::Sensor *s_##s##_{nullptr};
  DSMR_SENSOR_LIST(DSMR_DECLARE_SENSOR, )
--- a/esphome/components/dsmr/text_sensor.py
+++ b/esphome/components/dsmr/text_sensor.py
@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import text_sensor
-from esphome.const import CONF_INTERNAL
+
 from . import Dsmr, CONF_DSMR_ID

 AUTO_LOAD = ["dsmr"]
@@ -22,9 +22,6 @@ CONFIG_SCHEMA = cv.Schema(
        cv.Optional("water_equipment_id"): text_sensor.text_sensor_schema(),
        cv.Optional("sub_equipment_id"): text_sensor.text_sensor_schema(),
        cv.Optional("gas_delivered_text"): text_sensor.text_sensor_schema(),
-        cv.Optional("telegram"): text_sensor.text_sensor_schema().extend(
-            {cv.Optional(CONF_INTERNAL, default=True): cv.boolean}
-        ),
    }
 ).extend(cv.COMPONENT_SCHEMA)

@@ -40,9 +37,7 @@ async def to_code(config):
        if id and id.type == text_sensor.TextSensor:
            var = await text_sensor.new_text_sensor(conf)
            cg.add(getattr(hub, f"set_{key}")(var))
-            if key != "telegram":
-                # telegram is not handled by dsmr
-                text_sensors.append(f"F({key})")
+            text_sensors.append(f"F({key})")

    if text_sensors:
        cg.add_define(
--- a/esphome/components/esp32/init.py
+++ b/esphome/components/esp32/init.py
@@ -13,7 +13,6 @@ from esphome.const import (
    CONF_COMPONENTS,
    CONF_ESPHOME,
    CONF_FRAMEWORK,
-    CONF_IGNORE_EFUSE_CUSTOM_MAC,
    CONF_IGNORE_EFUSE_MAC_CRC,
    CONF_NAME,
    CONF_PATH,
@@ -53,7 +52,6 @@ from .const import (  # noqa
    KEY_SDKCONFIG_OPTIONS,
    KEY_SUBMODULES,
    KEY_VARIANT,
-    VARIANT_ESP32,
    VARIANT_FRIENDLY,
    VARIANTS,
 )
@@ -241,7 +239,7 @@ ARDUINO_PLATFORM_VERSION = cv.Version(5, 4, 0)
 # The default/recommended esp-idf framework version
 #  - https://github.com/espressif/esp-idf/releases
 #  - https://api.registry.platformio.org/v3/packages/platformio/tool/framework-espidf
-RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION = cv.Version(4, 4, 8)
+RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION = cv.Version(4, 4, 7)
 # The platformio/espressif32 version to use for esp-idf frameworks
 #  - https://github.com/platformio/platform-espressif32/releases
 #  - https://api.registry.platformio.org/v3/packages/platformio/platform/espressif32
@@ -377,15 +375,6 @@ def final_validate(config):
            f"Please specify {CONF_FLASH_SIZE} within esp32 configuration only"
        )

-    if (
-        config[CONF_VARIANT] != VARIANT_ESP32
-        and CONF_ADVANCED in (conf_fw := config[CONF_FRAMEWORK])
-        and CONF_IGNORE_EFUSE_MAC_CRC in conf_fw[CONF_ADVANCED]
-    ):
-        raise cv.Invalid(
-            f"{CONF_IGNORE_EFUSE_MAC_CRC} is not supported on {config[CONF_VARIANT]}"
-        )
-
    return config


@@ -395,13 +384,6 @@ ARDUINO_FRAMEWORK_SCHEMA = cv.All(
            cv.Optional(CONF_VERSION, default="recommended"): cv.string_strict,
            cv.Optional(CONF_SOURCE): cv.string_strict,
            cv.Optional(CONF_PLATFORM_VERSION): _parse_platform_version,
-            cv.Optional(CONF_ADVANCED, default={}): cv.Schema(
-                {
-                    cv.Optional(
-                        CONF_IGNORE_EFUSE_CUSTOM_MAC, default=False
-                    ): cv.boolean,
-                }
-            ),
        }
    ),
    _arduino_check_versions,
@@ -419,10 +401,7 @@ ESP_IDF_FRAMEWORK_SCHEMA = cv.All(
            },
            cv.Optional(CONF_ADVANCED, default={}): cv.Schema(
                {
-                    cv.Optional(
-                        CONF_IGNORE_EFUSE_CUSTOM_MAC, default=False
-                    ): cv.boolean,
-                    cv.Optional(CONF_IGNORE_EFUSE_MAC_CRC): cv.boolean,
+                    cv.Optional(CONF_IGNORE_EFUSE_MAC_CRC, default=False): cv.boolean,
                }
            ),
            cv.Optional(CONF_COMPONENTS, default=[]): cv.ensure_list(
@@ -501,9 +480,6 @@ async def to_code(config):
    conf = config[CONF_FRAMEWORK]
    cg.add_platformio_option("platform", conf[CONF_PLATFORM_VERSION])

-    if CONF_ADVANCED in conf and conf[CONF_ADVANCED][CONF_IGNORE_EFUSE_CUSTOM_MAC]:
-        cg.add_define("USE_ESP32_IGNORE_EFUSE_CUSTOM_MAC")
-
    add_extra_script(
        "post",
        "post_build.py",
@@ -550,8 +526,8 @@ async def to_code(config):
        for name, value in conf[CONF_SDKCONFIG_OPTIONS].items():
            add_idf_sdkconfig_option(name, RawSdkconfigValue(value))

-        if conf[CONF_ADVANCED].get(CONF_IGNORE_EFUSE_MAC_CRC):
-            add_idf_sdkconfig_option("CONFIG_ESP_MAC_IGNORE_MAC_CRC_ERROR", True)
+        if conf[CONF_ADVANCED][CONF_IGNORE_EFUSE_MAC_CRC]:
+            cg.add_define("USE_ESP32_IGNORE_EFUSE_MAC_CRC")
            if (framework_ver.major, framework_ver.minor) >= (4, 4):
                add_idf_sdkconfig_option(
                    "CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE", False
--- a/esphome/components/esp32_ble/ble_uuid.cpp
+++ b/esphome/components/esp32_ble/ble_uuid.cpp
@@ -31,13 +31,6 @@ ESPBTUUID ESPBTUUID::from_raw(const uint8_t *data) {
  memcpy(ret.uuid_.uuid.uuid128, data, ESP_UUID_LEN_128);
  return ret;
 }
-ESPBTUUID ESPBTUUID::from_raw_reversed(const uint8_t *data) {
-  ESPBTUUID ret;
-  ret.uuid_.len = ESP_UUID_LEN_128;
-  for (int i = 0; i < ESP_UUID_LEN_128; i++)
-    ret.uuid_.uuid.uuid128[ESP_UUID_LEN_128 - 1 - i] = data[i];
-  return ret;
-}
 ESPBTUUID ESPBTUUID::from_raw(const std::string &data) {
  ESPBTUUID ret;
  if (data.length() == 4) {
--- a/esphome/components/esp32_ble/ble_uuid.h
+++ b/esphome/components/esp32_ble/ble_uuid.h
@@ -20,7 +20,6 @@ class ESPBTUUID {
  static ESPBTUUID from_uint32(uint32_t uuid);

  static ESPBTUUID from_raw(const uint8_t *data);
-  static ESPBTUUID from_raw_reversed(const uint8_t *data);

  static ESPBTUUID from_raw(const std::string &data);

--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -462,16 +462,14 @@ void ESPBTDevice::parse_scan_rst(const esp_ble_gap_cb_param_t::ble_scan_result_e
    ESP_LOGVV(TAG, "  Service UUID: %s", uuid.to_string().c_str());
  }
  for (auto &data : this->manufacturer_datas_) {
-    auto ibeacon = ESPBLEiBeacon::from_manufacturer_data(data);
-    if (ibeacon.has_value()) {
-      ESP_LOGVV(TAG, "  Manufacturer iBeacon:");
-      ESP_LOGVV(TAG, "    UUID: %s", ibeacon.value().get_uuid().to_string().c_str());
-      ESP_LOGVV(TAG, "    Major: %u", ibeacon.value().get_major());
-      ESP_LOGVV(TAG, "    Minor: %u", ibeacon.value().get_minor());
-      ESP_LOGVV(TAG, "    TXPower: %d", ibeacon.value().get_signal_power());
-    } else {
-      ESP_LOGVV(TAG, "  Manufacturer ID: %s, data: %s", data.uuid.to_string().c_str(),
-                format_hex_pretty(data.data).c_str());
+    ESP_LOGVV(TAG, "  Manufacturer data: %s", format_hex_pretty(data.data).c_str());
+    if (this->get_ibeacon().has_value()) {
+      auto ibeacon = this->get_ibeacon().value();
+      ESP_LOGVV(TAG, "    iBeacon data:");
+      ESP_LOGVV(TAG, "      UUID: %s", ibeacon.get_uuid().to_string().c_str());
+      ESP_LOGVV(TAG, "      Major: %u", ibeacon.get_major());
+      ESP_LOGVV(TAG, "      Minor: %u", ibeacon.get_minor());
+      ESP_LOGVV(TAG, "      TXPower: %d", ibeacon.get_signal_power());
    }
  }
  for (auto &data : this->service_datas_) {
@@ -480,7 +478,7 @@ void ESPBTDevice::parse_scan_rst(const esp_ble_gap_cb_param_t::ble_scan_result_e
    ESP_LOGVV(TAG, "    Data: %s", format_hex_pretty(data.data).c_str());
  }

-  ESP_LOGVV(TAG, "  Adv data: %s", format_hex_pretty(param.ble_adv, param.adv_data_len + param.scan_rsp_len).c_str());
+  ESP_LOGVV(TAG, "Adv data: %s", format_hex_pretty(param.ble_adv, param.adv_data_len + param.scan_rsp_len).c_str());
 #endif
 }
 void ESPBTDevice::parse_adv_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param) {
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -44,10 +44,10 @@ class ESPBLEiBeacon {
  ESPBLEiBeacon(const uint8_t *data);
  static optional<ESPBLEiBeacon> from_manufacturer_data(const ServiceData &data);

-  uint16_t get_major() { return byteswap(this->beacon_data_.major); }
-  uint16_t get_minor() { return byteswap(this->beacon_data_.minor); }
+  uint16_t get_major() { return ((this->beacon_data_.major & 0xFF) << 8) | (this->beacon_data_.major >> 8); }
+  uint16_t get_minor() { return ((this->beacon_data_.minor & 0xFF) << 8) | (this->beacon_data_.minor >> 8); }
  int8_t get_signal_power() { return this->beacon_data_.signal_power; }
-  ESPBTUUID get_uuid() { return ESPBTUUID::from_raw_reversed(this->beacon_data_.proximity_uuid); }
+  ESPBTUUID get_uuid() { return ESPBTUUID::from_raw(this->beacon_data_.proximity_uuid); }

 protected:
  struct {
--- a/esphome/components/esp32_camera/init.py
+++ b/esphome/components/esp32_camera/init.py
@@ -140,8 +140,6 @@ CONF_TEST_PATTERN = "test_pattern"
 # framerates
 CONF_MAX_FRAMERATE = "max_framerate"
 CONF_IDLE_FRAMERATE = "idle_framerate"
-# frame buffer
-CONF_FRAME_BUFFER_COUNT = "frame_buffer_count"

 # stream trigger
 CONF_ON_STREAM_START = "on_stream_start"
@@ -215,7 +213,6 @@ CONFIG_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(
        cv.Optional(CONF_IDLE_FRAMERATE, default="0.1 fps"): cv.All(
            cv.framerate, cv.Range(min=0, max=1)
        ),
-        cv.Optional(CONF_FRAME_BUFFER_COUNT, default=1): cv.int_range(min=1, max=2),
        cv.Optional(CONF_ON_STREAM_START): automation.validate_automation(
            {
                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
@@ -288,7 +285,6 @@ async def to_code(config):
        cg.add(var.set_idle_update_interval(0))
    else:
        cg.add(var.set_idle_update_interval(1000 / config[CONF_IDLE_FRAMERATE]))
-    cg.add(var.set_frame_buffer_count(config[CONF_FRAME_BUFFER_COUNT]))
    cg.add(var.set_frame_size(config[CONF_RESOLUTION]))

    cg.add_define("USE_ESP32_CAMERA")
--- a/esphome/components/esp32_camera/esp32_camera.cpp
+++ b/esphome/components/esp32_camera/esp32_camera.cpp
@@ -127,7 +127,7 @@ void ESP32Camera::dump_config() {
  sensor_t *s = esp_camera_sensor_get();
  auto st = s->status;
  ESP_LOGCONFIG(TAG, "  JPEG Quality: %u", st.quality);
-  ESP_LOGCONFIG(TAG, "  Framebuffer Count: %u", conf.fb_count);
+  // ESP_LOGCONFIG(TAG, "  Framebuffer Count: %u", conf.fb_count);
  ESP_LOGCONFIG(TAG, "  Contrast: %d", st.contrast);
  ESP_LOGCONFIG(TAG, "  Brightness: %d", st.brightness);
  ESP_LOGCONFIG(TAG, "  Saturation: %d", st.saturation);
@@ -212,8 +212,6 @@ ESP32Camera::ESP32Camera() {
  this->config_.frame_size = FRAMESIZE_VGA;  // 640x480
  this->config_.jpeg_quality = 10;
  this->config_.fb_count = 1;
-  this->config_.grab_mode = CAMERA_GRAB_WHEN_EMPTY;
-  this->config_.fb_location = CAMERA_FB_IN_PSRAM;

  global_esp32_camera = this;
 }
@@ -335,12 +333,6 @@ void ESP32Camera::set_max_update_interval(uint32_t max_update_interval) {
 void ESP32Camera::set_idle_update_interval(uint32_t idle_update_interval) {
  this->idle_update_interval_ = idle_update_interval;
 }
-/* set frame buffer parameters */
-void ESP32Camera::set_frame_buffer_mode(camera_grab_mode_t mode) { this->config_.grab_mode = mode; }
-void ESP32Camera::set_frame_buffer_count(uint8_t fb_count) {
-  this->config_.fb_count = fb_count;
-  this->set_frame_buffer_mode(fb_count > 1 ? CAMERA_GRAB_LATEST : CAMERA_GRAB_WHEN_EMPTY);
-}

 /* ---------------- public API (specific) ---------------- */
 void ESP32Camera::add_image_callback(std::function<void(std::shared_ptr<CameraImage>)> &&callback) {
--- a/esphome/components/esp32_camera/esp32_camera.h
+++ b/esphome/components/esp32_camera/esp32_camera.h
@@ -145,9 +145,6 @@ class ESP32Camera : public Component, public EntityBase {
  /* -- framerates */
  void set_max_update_interval(uint32_t max_update_interval);
  void set_idle_update_interval(uint32_t idle_update_interval);
-  /* -- frame buffer */
-  void set_frame_buffer_mode(camera_grab_mode_t mode);
-  void set_frame_buffer_count(uint8_t fb_count);

  /* public API (derivated) */
  void setup() override;
--- a/esphome/components/esp32_can/canbus.py
+++ b/esphome/components/esp32_can/canbus.py
@@ -1,23 +1,18 @@
-from esphome import pins
 import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins
 from esphome.components import canbus
-from esphome.components.canbus import CONF_BIT_RATE, CanbusComponent, CanSpeed
+from esphome.const import CONF_ID, CONF_RX_PIN, CONF_TX_PIN
+from esphome.components.canbus import CanbusComponent, CanSpeed, CONF_BIT_RATE
+
 from esphome.components.esp32 import get_esp32_variant
 from esphome.components.esp32.const import (
    VARIANT_ESP32,
+    VARIANT_ESP32S2,
+    VARIANT_ESP32S3,
    VARIANT_ESP32C3,
    VARIANT_ESP32C6,
    VARIANT_ESP32H2,
-    VARIANT_ESP32S2,
-    VARIANT_ESP32S3,
-)
-import esphome.config_validation as cv
-from esphome.const import (
-    CONF_ID,
-    CONF_RX_PIN,
-    CONF_RX_QUEUE_LEN,
-    CONF_TX_PIN,
-    CONF_TX_QUEUE_LEN,
 )

 CODEOWNERS = ["@Sympatron"]
@@ -82,8 +77,6 @@ CONFIG_SCHEMA = canbus.CANBUS_SCHEMA.extend(
        cv.Optional(CONF_BIT_RATE, default="125KBPS"): validate_bit_rate,
        cv.Required(CONF_RX_PIN): pins.internal_gpio_input_pin_number,
        cv.Required(CONF_TX_PIN): pins.internal_gpio_output_pin_number,
-        cv.Optional(CONF_RX_QUEUE_LEN): cv.uint32_t,
-        cv.Optional(CONF_TX_QUEUE_LEN): cv.uint32_t,
    }
 )

@@ -94,7 +87,3 @@ async def to_code(config):

    cg.add(var.set_rx(config[CONF_RX_PIN]))
    cg.add(var.set_tx(config[CONF_TX_PIN]))
-    if (rx_queue_len := config.get(CONF_RX_QUEUE_LEN)) is not None:
-        cg.add(var.set_rx_queue_len(rx_queue_len))
-    if (tx_queue_len := config.get(CONF_TX_QUEUE_LEN)) is not None:
-        cg.add(var.set_tx_queue_len(tx_queue_len))
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`CODEOWNERS = ["@athom-tech", "@tarontop", "@jesserockz"]`