Bump api minor version

[project] Split Project name and manufacturer config
2025-11-02 16:11:53 +00:00 · 2024-12-06 16:36:38 +13:00 · 2024-12-06 16:32:07 +13:00
3421 changed files with 50323 additions and 53007 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -31,7 +31,7 @@
        "ms-python.python",
        "ms-python.pylint",
        "ms-python.flake8",
-        "charliermarsh.ruff",
+        "ms-python.black-formatter",
        "visualstudioexptteam.vscodeintellicode",
        // yaml
        "redhat.vscode-yaml",
@@ -49,11 +49,14 @@
        "flake8.args": [
          "--config=${workspaceFolder}/.flake8"
        ],
-        "ruff.configuration": "${workspaceFolder}/pyproject.toml",
+        "black-formatter.args": [
+          "--config",
+          "${workspaceFolder}/pyproject.toml"
+        ],
        "[python]": {
          // VS will say "Value is not accepted" before building the devcontainer, but the warning
          // should go away after build is completed.
-          "editor.defaultFormatter": "charliermarsh.ruff"
+          "editor.defaultFormatter": "ms-python.black-formatter"
        },
        "editor.formatOnPaste": false,
        "editor.formatOnSave": true,
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+---
+# These are supported funding model platforms
+
+custom: https://www.nabucasa.com
--- a/.github/actions/build-image/action.yaml
+++ b/.github/actions/build-image/action.yaml
@@ -46,7 +46,7 @@ runs:

    - name: Build and push to ghcr by digest
      id: build-ghcr
-      uses: docker/build-push-action@v6.15.0
+      uses: docker/build-push-action@v6.10.0
      env:
        DOCKER_BUILD_SUMMARY: false
        DOCKER_BUILD_RECORD_UPLOAD: false
@@ -72,7 +72,7 @@ runs:

    - name: Build and push to dockerhub by digest
      id: build-dockerhub
-      uses: docker/build-push-action@v6.15.0
+      uses: docker/build-push-action@v6.10.0
      env:
        DOCKER_BUILD_SUMMARY: false
        DOCKER_BUILD_RECORD_UPLOAD: false
--- 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.5.0
+      uses: actions/setup-python@v5.3.0
      with:
        python-version: ${{ inputs.python-version }}
    - name: Restore Python virtual environment
      id: cache-venv
-      uses: actions/cache/restore@v4.2.3
+      uses: actions/cache/restore@v4.2.0
      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.5.0
+        uses: actions/setup-python@v5.3.0
        with:
          python-version: "3.11"

--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -33,20 +33,22 @@ concurrency:
 jobs:
  check-docker:
    name: Build docker containers
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
    strategy:
      fail-fast: false
      matrix:
-        os: ["ubuntu-latest", "ubuntu-24.04-arm"]
+        arch: [amd64, armv7, aarch64]
        build_type: ["ha-addon", "docker", "lint"]
    steps:
      - uses: actions/checkout@v4.1.7
      - name: Set up Python
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.3.0
        with:
          python-version: "3.9"
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.10.0
+        uses: docker/setup-buildx-action@v3.7.1
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3.2.0

      - name: Set TAG
        run: |
@@ -56,6 +58,6 @@ jobs:
        run: |
          docker/build.py \
            --tag "${TAG}" \
-            --arch "${{ matrix.os == 'ubuntu-24.04-arm' && 'aarch64' || 'amd64' }}" \
+            --arch "${{ matrix.arch }}" \
            --build-type "${{ matrix.build_type }}" \
            build
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,6 @@ on:
      - ".github/workflows/ci.yml"
      - "!.yamllint"
      - "!.github/dependabot.yml"
-      - "!docker/**"
  merge_group:

 permissions:
@@ -42,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.5.0
+        uses: actions/setup-python@v5.3.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
      - name: Restore Python virtual environment
        id: cache-venv
-        uses: actions/cache@v4.2.3
+        uses: actions/cache@v4.2.0
        with:
          path: venv
          # yamllint disable-line rule:line-length
@@ -61,8 +60,8 @@ jobs:
          pip install -r requirements.txt -r requirements_optional.txt -r requirements_test.txt
          pip install -e .

-  ruff:
-    name: Check ruff
+  black:
+    name: Check black
    runs-on: ubuntu-24.04
    needs:
      - common
@@ -74,10 +73,10 @@ jobs:
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          cache-key: ${{ needs.common.outputs.cache-key }}
-      - name: Run Ruff
+      - name: Run black
        run: |
          . venv/bin/activate
-          ruff format esphome tests
+          black --verbose esphome tests
      - name: Suggested changes
        run: script/ci-suggest-changes
        if: always()
@@ -255,7 +254,7 @@ jobs:
    runs-on: ubuntu-24.04
    needs:
      - common
-      - ruff
+      - black
      - ci-custom
      - clang-format
      - flake8
@@ -303,14 +302,14 @@ jobs:

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

      - name: Cache platformio
        if: github.ref != 'refs/heads/dev'
-        uses: actions/cache/restore@v4.2.3
+        uses: actions/cache/restore@v4.2.0
        with:
          path: ~/.platformio
          key: platformio-${{ matrix.pio_cache_key }}
@@ -482,7 +481,7 @@ jobs:
    runs-on: ubuntu-24.04
    needs:
      - common
-      - ruff
+      - black
      - ci-custom
      - clang-format
      - flake8
--- a/.github/workflows/matchers/lint-python.json
+++ b/.github/workflows/matchers/lint-python.json
@@ -1,11 +1,11 @@
 {
  "problemMatcher": [
    {
-      "owner": "ruff",
+      "owner": "black",
      "severity": "error",
      "pattern": [
        {
-          "regexp": "^(.*): (Please format this file with the ruff formatter)",
+          "regexp": "^(.*): (Please format this file with the black formatter)",
          "file": 1,
          "message": 2
        }
--- 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.5.0
+        uses: actions/setup-python@v5.3.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.12.4
+        uses: pypa/gh-action-pypi-publish@v1.12.2

  deploy-docker:
    name: Build ESPHome ${{ matrix.platform }}
@@ -80,27 +80,28 @@ jobs:
      matrix:
        platform:
          - linux/amd64
+          - linux/arm/v7
          - linux/arm64
    steps:
      - uses: actions/checkout@v4.1.7
      - name: Set up Python
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.3.0
        with:
          python-version: "3.9"

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

      - name: Log in to docker hub
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v3.3.0
        with:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASSWORD }}
      - name: Log in to the GitHub container registry
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v3.3.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -140,7 +141,7 @@ jobs:
          echo name=$(cat /tmp/platform) >> $GITHUB_OUTPUT

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

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

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

      - name: Log in to docker hub
        if: matrix.registry == 'dockerhub'
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v3.3.0
        with:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASSWORD }}
      - name: Log in to the GitHub container registry
        if: matrix.registry == 'ghcr'
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v3.3.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -17,7 +17,7 @@ jobs:
  stale:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/stale@v9.1.0
+      - uses: actions/stale@v9.0.0
        with:
          days-before-pr-stale: 90
          days-before-pr-close: 7
@@ -37,7 +37,7 @@ jobs:
  close-issues:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/stale@v9.1.0
+      - uses: actions/stale@v9.0.0
        with:
          days-before-pr-stale: -1
          days-before-pr-close: -1
--- 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.5.0
+        uses: actions/setup-python@v5.3.0
        with:
          python-version: 3.12

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

      - name: Commit changes
-        uses: peter-evans/create-pull-request@v7.0.8
+        uses: peter-evans/create-pull-request@v7.0.5
        with:
          commit-message: "Synchronise Device Classes from Home Assistant"
-          committer: esphomebot <esphome@openhomefoundation.org>
-          author: esphomebot <esphome@openhomefoundation.org>
+          committer: esphomebot <esphome@nabucasa.com>
+          author: esphomebot <esphome@nabucasa.com>
          branch: sync/device-classes
          delete-branch: true
          title: "Synchronise Device Classes from Home Assistant"
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,19 +4,27 @@
 repos:
  - repo: https://github.com/astral-sh/ruff-pre-commit
    # Ruff version.
-    rev: v0.11.0
+    rev: v0.5.4
    hooks:
      # Run the linter.
      - id: ruff
        args: [--fix]
      # Run the formatter.
      - id: ruff-format
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 24.4.2
+    hooks:
+      - id: black
+        args:
+          - --safe
+          - --quiet
+        files: ^((esphome|script|tests)/.+)?[^/]+\.py$
  - repo: https://github.com/PyCQA/flake8
-    rev: 7.2.0
+    rev: 6.1.0
    hooks:
      - id: flake8
        additional_dependencies:
-          - flake8-docstrings==1.7.0
+          - flake8-docstrings==1.5.0
          - pydocstyle==5.1.1
        files: ^(esphome|tests)/.+\.py$
  - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -45,6 +53,6 @@ repos:
    hooks:
      - id: pylint
        name: pylint
-        entry: python3 script/run-in-env.py pylint
-        language: system
+        entry: script/run-in-env.sh pylint
+        language: script
        types: [python]
--- a/21
+++ b/21
@@ -49,7 +49,6 @@ esphome/components/atc_mithermometer/* @ahpohl
 esphome/components/atm90e26/* @danieltwagner
 esphome/components/atm90e32/* @circuitsetup @descipher
 esphome/components/audio/* @kahrendt
-esphome/components/audio_adc/* @kbx81
 esphome/components/audio_dac/* @kbx81
 esphome/components/axs15231/* @clydebarrow
 esphome/components/b_parasite/* @rbaron
@@ -93,7 +92,6 @@ esphome/components/captive_portal/* @OttoWinter
 esphome/components/ccs811/* @habbie
 esphome/components/cd74hc4067/* @asoehlke
 esphome/components/ch422g/* @clydebarrow @jesterret
-esphome/components/chsc6x/* @kkosik20
 esphome/components/climate/* @esphome/core
 esphome/components/climate_ir/* @glmnet
 esphome/components/color_temperature/* @jesserockz
@@ -133,9 +131,6 @@ esphome/components/ens160_base/* @latonita @vincentscode
 esphome/components/ens160_i2c/* @latonita
 esphome/components/ens160_spi/* @latonita
 esphome/components/ens210/* @itn3rd77
-esphome/components/es7210/* @kahrendt
-esphome/components/es7243e/* @kbx81
-esphome/components/es8156/* @kbx81
 esphome/components/es8311/* @kahrendt @kroimon
 esphome/components/esp32/* @esphome/core
 esphome/components/esp32_ble/* @Rapsssito @jesserockz
@@ -149,7 +144,6 @@ esphome/components/esp32_rmt_led_strip/* @jesserockz
 esphome/components/esp8266/* @esphome/core
 esphome/components/ethernet_info/* @gtjadsonsantos
 esphome/components/event/* @nohat
-esphome/components/event_emitter/* @Rapsssito
 esphome/components/exposure_notifications/* @OttoWinter
 esphome/components/ezo/* @ssieb
 esphome/components/ezo_pmp/* @carlos-sarmiento
@@ -235,7 +229,6 @@ esphome/components/kuntze/* @ssieb
 esphome/components/lcd_menu/* @numo68
 esphome/components/ld2410/* @regevbr @sebcaps
 esphome/components/ld2420/* @descipher
-esphome/components/ld2450/* @hareeshmu
 esphome/components/ledc/* @OttoWinter
 esphome/components/libretiny/* @kuba2k2
 esphome/components/libretiny_pwm/* @kuba2k2
@@ -244,7 +237,6 @@ esphome/components/lightwaverf/* @max246
 esphome/components/lilygo_t5_47/touchscreen/* @jesserockz
 esphome/components/lock/* @esphome/core
 esphome/components/logger/* @esphome/core
-esphome/components/logger/select/* @clydebarrow
 esphome/components/ltr390/* @latonita @sjtrny
 esphome/components/ltr501/* @latonita
 esphome/components/ltr_als_ps/* @latonita
@@ -266,7 +258,6 @@ esphome/components/mcp23x17_base/* @jesserockz
 esphome/components/mcp23xxx_base/* @jesserockz
 esphome/components/mcp2515/* @danielschramm @mvturnho
 esphome/components/mcp3204/* @rsumner
-esphome/components/mcp4461/* @p1ngb4ck
 esphome/components/mcp4728/* @berfenger
 esphome/components/mcp47a1/* @jesserockz
 esphome/components/mcp9600/* @mreditor97
@@ -281,7 +272,6 @@ esphome/components/mics_4514/* @jesserockz
 esphome/components/midea/* @dudanov
 esphome/components/midea_ir/* @dudanov
 esphome/components/mitsubishi/* @RubyBailey
-esphome/components/mixer/speaker/* @kahrendt
 esphome/components/mlx90393/* @functionpointer
 esphome/components/mlx90614/* @jesserockz
 esphome/components/mmc5603/* @benhoff
@@ -300,7 +290,6 @@ esphome/components/mopeka_std_check/* @Fabian-Schmidt
 esphome/components/mpl3115a2/* @kbickar
 esphome/components/mpu6886/* @fabaff
 esphome/components/ms8607/* @e28eta
-esphome/components/msa3xx/* @latonita
 esphome/components/nau7802/* @cujomalainey
 esphome/components/network/* @esphome/core
 esphome/components/nextion/* @edwardtfn @senexcrenshaw
@@ -313,7 +302,7 @@ esphome/components/noblex/* @AGalfra
 esphome/components/npi19/* @bakerkj
 esphome/components/number/* @esphome/core
 esphome/components/one_wire/* @ssieb
-esphome/components/online_image/* @clydebarrow @guillempages
+esphome/components/online_image/* @guillempages
 esphome/components/opentherm/* @olegtarasov
 esphome/components/ota/* @esphome/core
 esphome/components/output/* @esphome/core
@@ -349,7 +338,7 @@ esphome/components/radon_eye_rd200/* @jeffeb3
 esphome/components/rc522/* @glmnet
 esphome/components/rc522_i2c/* @glmnet
 esphome/components/rc522_spi/* @glmnet
-esphome/components/resampler/speaker/* @kahrendt
+esphome/components/resistance_sampler/* @jesserockz
 esphome/components/restart/* @esphome/core
 esphome/components/rf_bridge/* @jesserockz
 esphome/components/rgbct/* @jesserockz
@@ -362,11 +351,10 @@ esphome/components/rtttl/* @glmnet
 esphome/components/safe_mode/* @jsuanet @kbx81 @paulmonigatti
 esphome/components/scd4x/* @martgras @sjtrny
 esphome/components/script/* @esphome/core
-esphome/components/sdl/* @bdm310 @clydebarrow
+esphome/components/sdl/* @clydebarrow
 esphome/components/sdm_meter/* @jesserockz @polyfaces
 esphome/components/sdp3x/* @Azimath
 esphome/components/seeed_mr24hpc1/* @limengdu
-esphome/components/seeed_mr60bha2/* @limengdu
 esphome/components/seeed_mr60fda2/* @limengdu
 esphome/components/selec_meter/* @sourabhjaiswal
 esphome/components/select/* @esphome/core
@@ -394,7 +382,6 @@ esphome/components/sn74hc165/* @jesserockz
 esphome/components/socket/* @esphome/core
 esphome/components/sonoff_d1/* @anatoly-savchenkov
 esphome/components/speaker/* @jesserockz @kahrendt
-esphome/components/speaker/media_player/* @kahrendt @synesthesiam
 esphome/components/spi/* @clydebarrow @esphome/core
 esphome/components/spi_device/* @clydebarrow
 esphome/components/spi_led_strip/* @clydebarrow
@@ -449,7 +436,6 @@ esphome/components/tmp102/* @timsavage
 esphome/components/tmp1075/* @sybrenstuvel
 esphome/components/tmp117/* @Azimath
 esphome/components/tof10120/* @wstrzalka
-esphome/components/tormatic/* @ti-mo
 esphome/components/toshiba/* @kbx81
 esphome/components/touchscreen/* @jesserockz @nielsnl68
 esphome/components/tsl2591/* @wjcarpenter
@@ -506,6 +492,5 @@ esphome/components/xiaomi_mhoc401/* @vevsvevs
 esphome/components/xiaomi_rtcgq02lm/* @jesserockz
 esphome/components/xl9535/* @mreditor97
 esphome/components/xpt2046/touchscreen/* @nielsnl68 @numo68
-esphome/components/xxtea/* @clydebarrow
 esphome/components/zhlt01/* @cfeenstra1024
 esphome/components/zio_ultrasonic/* @kahrendt
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe

 ## Enforcement

-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at esphome@openhomefoundation.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at esphome@nabucasa.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,14 +1,12 @@
-# Contributing to ESPHome [![Discord Chat](https://img.shields.io/discord/429907082951524364.svg)](https://discord.gg/KhAMKrd) [![GitHub release](https://img.shields.io/github/release/esphome/esphome.svg)](https://GitHub.com/esphome/esphome/releases/)
+# Contributing to ESPHome

-We welcome contributions to the ESPHome suite of code and documentation!
+For a detailed guide, please see https://esphome.io/guides/contributing.html#contributing-to-esphome

-Please read our [contributing guide](https://esphome.io/guides/contributing.html) if you wish to contribute to the
-project and be sure to join us on [Discord](https://discord.gg/KhAMKrd).
+Things to note when contributing:

-**See also:**
-
-[Documentation](https://esphome.io) -- [Issues](https://github.com/esphome/issues/issues) -- [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/)
+ - Please test your changes :)
+ - If a new feature is added or an existing user-facing feature is changed, you should also
+   update the [docs](https://github.com/esphome/esphome-docs). See [contributing to esphome-docs](https://esphome.io/guides/contributing.html#contributing-to-esphomedocs)
+   for more information.
+ - Please also update the tests in the `tests/` folder. You can do so by just adding a line in one of the YAML files
+   which checks if your new feature compiles correctly.
--- a/README.md
+++ b/README.md
@@ -1,16 +1,11 @@
 # ESPHome [![Discord Chat](https://img.shields.io/discord/429907082951524364.svg)](https://discord.gg/KhAMKrd) [![GitHub release](https://img.shields.io/github/release/esphome/esphome.svg)](https://GitHub.com/esphome/esphome/releases/)

-<a href="https://esphome.io/">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://esphome.io/_static/logo-text-on-dark.svg", alt="ESPHome Logo">
-    <img src="https://esphome.io/_static/logo-text-on-light.svg" alt="ESPHome Logo">
-  </picture>
-</a>
+[![ESPHome Logo](https://esphome.io/_images/logo-text.png)](https://esphome.io/)

---
+**Documentation:** https://esphome.io/

-[Documentation](https://esphome.io) -- [Issues](https://github.com/esphome/issues/issues) -- [Feature requests](https://github.com/esphome/feature-requests/issues)
+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
@@ -29,13 +29,13 @@ RUN \
    # Use pinned versions so that we get updates with build caching
    && apt-get install -y --no-install-recommends \
        python3-pip=23.0.1+dfsg-1 \
-        python3-setuptools=66.1.1-1+deb12u1 \
+        python3-setuptools=66.1.1-1 \
        python3-venv=3.11.2-1+b1 \
        python3-wheel=0.38.4-2 \
        iputils-ping=3:20221126-1+deb12u1 \
-        git=1:2.39.5-0+deb12u2 \
-        curl=7.88.1-10+deb12u12 \
-        openssh-client=1:9.2p1-2+deb12u5 \
+        git=1:2.39.5-0+deb12u1 \
+        curl=7.88.1-10+deb12u8 \
+        openssh-client=1:9.2p1-2+deb12u3 \
        python3-cffi=1.15.1-5 \
        libcairo2=1.16.0-7 \
        libmagic1=1:5.44-3 \
@@ -51,11 +51,23 @@ ENV \
  # Store globally installed pio libs in /piolibs
  PLATFORMIO_GLOBALLIB_DIR=/piolibs

+# Support legacy binaries on Debian multiarch system. There is no "correct" way
+# to do this, other than using properly built toolchains...
+# See: https://unix.stackexchange.com/questions/553743/correct-way-to-add-lib-ld-linux-so-3-in-debian
 RUN \
+    if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
+        ln -s /lib/arm-linux-gnueabihf/ld-linux-armhf.so.3 /lib/ld-linux.so.3; \
+    fi
+
+RUN \
+    # Ubuntu python3-pip is missing wheel
+    if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
+        export PIP_EXTRA_INDEX_URL="https://www.piwheels.org/simple"; \
+    fi; \
    pip3 install \
    --break-system-packages --no-cache-dir \
    # Keep platformio version in sync with requirements.txt
-    platformio==6.1.18 \
+    platformio==6.1.16 \
    # Change some platformio settings
    && platformio settings set enable_telemetry No \
    && platformio settings set check_platformio_interval 1000000 \
@@ -70,13 +82,21 @@ RUN --mount=type=tmpfs,target=/root/.cargo <<END-OF-RUN
 # Fail on any non-zero status
 set -e

+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";
+fi
+
 # install build tools in case wheels are not available
 BUILD_DEPS="
    build-essential=12.9
    python3-dev=3.11.2-1+b1
    zlib1g-dev=1:1.2.13.dfsg-1
    libjpeg-dev=1:2.1.5-2
-    libfreetype-dev=2.12.1+dfsg-5+deb12u4
+    libfreetype-dev=2.12.1+dfsg-5+deb12u3
    libssl-dev=3.0.15-1~deb12u1
    libffi-dev=3.4.4-1
    cargo=0.66.0+ds1-1
@@ -84,9 +104,9 @@ BUILD_DEPS="
 "
 LIB_DEPS="
    libtiff6=4.5.0-6+deb12u1
-    libopenjp2-7=2.5.0-2+deb12u1
+    libopenjp2-7=2.5.0-2
 "
-if [ "$TARGETARCH$TARGETVARIANT" = "arm64" ]
+if [ "$TARGETARCH$TARGETVARIANT" = "arm64" ] || [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]
 then
    apt-get update
    apt-get install -y --no-install-recommends $BUILD_DEPS $LIB_DEPS
@@ -95,7 +115,7 @@ 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

-if [ "$TARGETARCH$TARGETVARIANT" = "arm64" ]
+if [ "$TARGETARCH$TARGETVARIANT" = "arm64" ] || [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]
 then
    apt-get remove -y --purge --auto-remove $BUILD_DEPS
    rm -rf /tmp/* /var/{cache,log}/* /var/lib/apt/lists/*
@@ -115,7 +135,11 @@ FROM base AS docker

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

 # Settings for dashboard
 ENV USERNAME="" PASSWORD=""
@@ -145,7 +169,7 @@ ARG BUILD_VERSION=dev
 LABEL \
    org.opencontainers.image.authors="The ESPHome Authors" \
    org.opencontainers.image.title="ESPHome" \
-    org.opencontainers.image.description="ESPHome is a system to configure your microcontrollers by simple yet powerful configuration files and control them remotely through Home Automation systems" \
+    org.opencontainers.image.description="Manage and program ESP8266/ESP32 microcontrollers through YAML configuration files" \
    org.opencontainers.image.url="https://esphome.io/" \
    org.opencontainers.image.documentation="https://esphome.io/" \
    org.opencontainers.image.source="https://github.com/esphome/esphome" \
@@ -160,7 +184,7 @@ RUN \
    apt-get update \
    # Use pinned versions so that we get updates with build caching
    && apt-get install -y --no-install-recommends \
-        nginx-light=1.22.1-9+deb12u1 \
+        nginx-light=1.22.1-9 \
    && rm -rf \
        /tmp/* \
        /var/{cache,log}/* \
@@ -173,12 +197,16 @@ COPY docker/ha-addon-rootfs/ /

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

 # Labels
 LABEL \
    io.hass.name="ESPHome" \
-    io.hass.description="ESPHome is a system to configure your microcontrollers by simple yet powerful configuration files and control them remotely through Home Automation systems" \
+    io.hass.description="Manage and program ESP8266/ESP32 microcontrollers through YAML configuration files" \
    io.hass.type="addon" \
    io.hass.version="${BUILD_VERSION}"
    # io.hass.arch is inherited from addon-debian-base
@@ -204,14 +232,21 @@ RUN \
        nano=7.2-1+deb12u1 \
        build-essential=12.9 \
        python3-dev=3.11.2-1+b1 \
-        clang-tidy-18=1:18.1.8~++20240731024826+3b5b5c1ec4a3-1~exp1~20240731144843.145 \
-    && rm -rf \
+    && if [ "$TARGETARCH$TARGETVARIANT" != "armv7" ]; then \
+    # move this up after armv7 is retired
+    apt-get install -y --no-install-recommends clang-tidy-18=1:18.1.8~++20240731024826+3b5b5c1ec4a3-1~exp1~20240731144843.145 ; \
+    fi; \
+    rm -rf \
        /tmp/* \
        /var/{cache,log}/* \
        /var/lib/apt/lists/*

 COPY requirements_test.txt /
-RUN pip3 install --break-system-packages --no-cache-dir -r /requirements_test.txt
+RUN if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
+        export PIP_EXTRA_INDEX_URL="https://www.piwheels.org/simple"; \
+  fi; \
+  pip3 install \
+  --break-system-packages --no-cache-dir -r /requirements_test.txt

 VOLUME ["/esphome"]
 WORKDIR /esphome
--- a/docker/build.py
+++ b/docker/build.py
@@ -1,19 +1,22 @@
 #!/usr/bin/env python3
-import argparse
 from dataclasses import dataclass
-import re
-import shlex
 import subprocess
+import argparse
+from platform import machine
+import shlex
+import re
 import sys

+
 CHANNEL_DEV = "dev"
 CHANNEL_BETA = "beta"
 CHANNEL_RELEASE = "release"
 CHANNELS = [CHANNEL_DEV, CHANNEL_BETA, CHANNEL_RELEASE]

 ARCH_AMD64 = "amd64"
+ARCH_ARMV7 = "armv7"
 ARCH_AARCH64 = "aarch64"
-ARCHS = [ARCH_AMD64, ARCH_AARCH64]
+ARCHS = [ARCH_AMD64, ARCH_ARMV7, ARCH_AARCH64]

 TYPE_DOCKER = "docker"
 TYPE_HA_ADDON = "ha-addon"
@@ -73,6 +76,7 @@ class DockerParams:
        }[build_type]
        platform = {
            ARCH_AMD64: "linux/amd64",
+            ARCH_ARMV7: "linux/arm/v7",
            ARCH_AARCH64: "linux/arm64",
        }[arch]
        target = {
--- a/docker/generate_tags.py
+++ b/docker/generate_tags.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
-import argparse
 import re
+import argparse

 CHANNEL_DEV = "dev"
 CHANNEL_BETA = "beta"
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/run
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/run
@@ -23,6 +23,10 @@ if bashio::config.true 'streamer_mode'; then
    export ESPHOME_STREAMER_MODE=true
 fi

+if bashio::config.true 'status_use_ping'; then
+    export ESPHOME_DASHBOARD_USE_PING=true
+fi
+
 if bashio::config.has_value 'relative_url'; then
    export ESPHOME_DASHBOARD_RELATIVE_URL=$(bashio::config 'relative_url')
 fi
--- a/esphome/main.py
+++ b/esphome/main.py
@@ -2,7 +2,6 @@
 import argparse
 from datetime import datetime
 import functools
-import importlib
 import logging
 import os
 import re
@@ -67,7 +66,7 @@ def choose_prompt(options, purpose: str = None):
        return options[0][1]

    safe_print(
-        f"Found multiple options{f' for {purpose}' if purpose else ''}, please choose one:"
+        f'Found multiple options{f" for {purpose}" if purpose else ""}, please choose one:'
    )
    for i, (desc, _) in enumerate(options):
        safe_print(f"  [{i + 1}] {desc}")
@@ -133,7 +132,7 @@ def get_port_type(port):
    return "NETWORK"


-def run_miniterm(config, port, args):
+def run_miniterm(config, port):
    import serial

    from esphome import platformio_api
@@ -154,7 +153,7 @@ def run_miniterm(config, port, args):

    # We can't set to False by default since it leads to toggling and hence
    # ESP32 resets on some platforms.
-    if config["logger"][CONF_DEASSERT_RTS_DTR] or args.reset:
+    if config["logger"][CONF_DEASSERT_RTS_DTR]:
        ser.dtr = False
        ser.rts = False

@@ -244,11 +243,11 @@ def compile_program(args, config):
    return 0 if idedata is not None else 1


-def upload_using_esptool(config, port, file, speed):
+def upload_using_esptool(config, port, file):
    from esphome import platformio_api

-    first_baudrate = speed or config[CONF_ESPHOME][CONF_PLATFORMIO_OPTIONS].get(
-        "upload_speed", os.getenv("ESPHOME_UPLOAD_SPEED", "460800")
+    first_baudrate = config[CONF_ESPHOME][CONF_PLATFORMIO_OPTIONS].get(
+        "upload_speed", 460800
    )

    if file is not None:
@@ -337,18 +336,11 @@ def check_permissions(port):


 def upload_program(config, args, host):
-    try:
-        module = importlib.import_module("esphome.components." + CORE.target_platform)
-        if getattr(module, "upload_program")(config, args, host):
-            return 0
-    except AttributeError:
-        pass
-
    if get_port_type(host) == "SERIAL":
        check_permissions(host)
        if CORE.target_platform in (PLATFORM_ESP32, PLATFORM_ESP8266):
            file = getattr(args, "file", None)
-            return upload_using_esptool(config, host, file, args.upload_speed)
+            return upload_using_esptool(config, host, file)

        if CORE.target_platform in (PLATFORM_RP2040):
            return upload_using_platformio(config, args.device)
@@ -397,7 +389,7 @@ def show_logs(config, args, port):
        raise EsphomeError("Logger is not configured!")
    if get_port_type(port) == "SERIAL":
        check_permissions(port)
-        return run_miniterm(config, port, args)
+        return run_miniterm(config, port)
    if get_port_type(port) == "NETWORK" and "api" in config:
        if config[CONF_MDNS][CONF_DISABLED] and CONF_MQTT in config:
            from esphome import mqtt
@@ -766,14 +758,6 @@ def parse_args(argv):
    options_parser.add_argument(
        "-q", "--quiet", help="Disable all ESPHome logs.", action="store_true"
    )
-    options_parser.add_argument(
-        "-l",
-        "--log-level",
-        help="Set the log level.",
-        default=os.getenv("ESPHOME_LOG_LEVEL", "INFO"),
-        action="store",
-        choices=["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"],
-    )
    options_parser.add_argument(
        "--dashboard", help=argparse.SUPPRESS, action="store_true"
    )
@@ -842,10 +826,6 @@ def parse_args(argv):
        "--device",
        help="Manually specify the serial port/address to use, for example /dev/ttyUSB0.",
    )
-    parser_upload.add_argument(
-        "--upload_speed",
-        help="Override the default or configured upload speed.",
-    )
    parser_upload.add_argument(
        "--file",
        help="Manually specify the binary file to upload.",
@@ -864,13 +844,6 @@ def parse_args(argv):
        "--device",
        help="Manually specify the serial port/address to use, for example /dev/ttyUSB0.",
    )
-    parser_logs.add_argument(
-        "--reset",
-        "-r",
-        action="store_true",
-        help="Reset the device before starting serial logs.",
-        default=os.getenv("ESPHOME_SERIAL_LOGGING_RESET"),
-    )

    parser_discover = subparsers.add_parser(
        "discover",
@@ -893,20 +866,9 @@ def parse_args(argv):
        "--device",
        help="Manually specify the serial port/address to use, for example /dev/ttyUSB0.",
    )
-    parser_run.add_argument(
-        "--upload_speed",
-        help="Override the default or configured upload speed.",
-    )
    parser_run.add_argument(
        "--no-logs", help="Disable starting logs.", action="store_true"
    )
-    parser_run.add_argument(
-        "--reset",
-        "-r",
-        action="store_true",
-        help="Reset the device before starting serial logs.",
-        default=os.getenv("ESPHOME_SERIAL_LOGGING_RESET"),
-    )

    parser_clean = subparsers.add_parser(
        "clean-mqtt",
@@ -1025,16 +987,11 @@ def run_esphome(argv):
    args = parse_args(argv)
    CORE.dashboard = args.dashboard

-    # Override log level if verbose is set
-    if args.verbose:
-        args.log_level = "DEBUG"
-    elif args.quiet:
-        args.log_level = "CRITICAL"
-
    setup_log(
-        log_level=args.log_level,
+        args.verbose,
+        args.quiet,
        # Show timestamp for dashboard access logs
-        include_timestamp=args.command == "dashboard",
+        args.command == "dashboard",
    )

    if args.command in PRE_CONFIG_ACTIONS:
--- a/esphome/components/a01nyub/sensor.py
+++ b/esphome/components/a01nyub/sensor.py
@@ -1,10 +1,10 @@
 import esphome.codegen as cg
 from esphome.components import sensor, uart
 from esphome.const import (
-    DEVICE_CLASS_DISTANCE,
-    ICON_ARROW_EXPAND_VERTICAL,
    STATE_CLASS_MEASUREMENT,
    UNIT_METER,
+    ICON_ARROW_EXPAND_VERTICAL,
+    DEVICE_CLASS_DISTANCE,
 )

 CODEOWNERS = ["@MrSuicideParrot"]
--- a/esphome/components/a02yyuw/sensor.py
+++ b/esphome/components/a02yyuw/sensor.py
@@ -1,9 +1,9 @@
 import esphome.codegen as cg
 from esphome.components import sensor, uart
 from esphome.const import (
-    DEVICE_CLASS_DISTANCE,
-    ICON_ARROW_EXPAND_VERTICAL,
    STATE_CLASS_MEASUREMENT,
+    ICON_ARROW_EXPAND_VERTICAL,
+    DEVICE_CLASS_DISTANCE,
    UNIT_MILLIMETER,
 )

--- a/esphome/components/a4988/stepper.py
+++ b/esphome/components/a4988/stepper.py
@@ -1,9 +1,10 @@
 from esphome import pins
-import esphome.codegen as cg
 from esphome.components import stepper
 import esphome.config_validation as cv
+import esphome.codegen as cg
 from esphome.const import CONF_DIR_PIN, CONF_ID, CONF_SLEEP_PIN, CONF_STEP_PIN

+
 a4988_ns = cg.esphome_ns.namespace("a4988")
 A4988 = a4988_ns.class_("A4988", stepper.Stepper, cg.Component)

--- a/esphome/components/absolute_humidity/sensor.py
+++ b/esphome/components/absolute_humidity/sensor.py
@@ -1,12 +1,12 @@
 import esphome.codegen as cg
-from esphome.components import sensor
 import esphome.config_validation as cv
+from esphome.components import sensor
 from esphome.const import (
-    CONF_EQUATION,
    CONF_HUMIDITY,
    CONF_TEMPERATURE,
-    ICON_WATER,
    STATE_CLASS_MEASUREMENT,
+    CONF_EQUATION,
+    ICON_WATER,
    UNIT_GRAMS_PER_CUBIC_METER,
 )

--- a/esphome/components/ac_dimmer/output.py
+++ b/esphome/components/ac_dimmer/output.py
@@ -1,8 +1,8 @@
-from esphome import pins
 import esphome.codegen as cg
-from esphome.components import output
 import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_METHOD, CONF_MIN_POWER
+from esphome import pins
+from esphome.components import output
+from esphome.const import CONF_ID, CONF_MIN_POWER, CONF_METHOD

 CODEOWNERS = ["@glmnet"]

--- a/esphome/components/adalight/init.py
+++ b/esphome/components/adalight/init.py
@@ -1,8 +1,8 @@
 import esphome.codegen as cg
-from esphome.components import uart
-from esphome.components.light.effects import register_addressable_effect
-from esphome.components.light.types import AddressableLightEffect
 import esphome.config_validation as cv
+from esphome.components import uart
+from esphome.components.light.types import AddressableLightEffect
+from esphome.components.light.effects import register_addressable_effect
 from esphome.const import CONF_NAME, CONF_UART_ID

 DEPENDENCIES = ["uart"]
--- a/esphome/components/adc/init.py
+++ b/esphome/components/adc/init.py
@@ -1,6 +1,11 @@
-from esphome import pins
 import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins
+from esphome.const import CONF_ANALOG, CONF_INPUT, CONF_NUMBER
+
+from esphome.core import CORE
 from esphome.components.esp32 import get_esp32_variant
+from esphome.const import PLATFORM_ESP8266
 from esphome.components.esp32.const import (
    VARIANT_ESP32,
    VARIANT_ESP32C2,
@@ -10,9 +15,6 @@ from esphome.components.esp32.const import (
    VARIANT_ESP32S2,
    VARIANT_ESP32S3,
 )
-import esphome.config_validation as cv
-from esphome.const import CONF_ANALOG, CONF_INPUT, CONF_NUMBER, PLATFORM_ESP8266
-from esphome.core import CORE

 CODEOWNERS = ["@esphome/core"]

@@ -36,14 +38,6 @@ ATTENUATION_MODES = {
    "auto": "auto",
 }

-sampling_mode = adc_ns.enum("SamplingMode", is_class=True)
-
-SAMPLING_MODES = {
-    "avg": sampling_mode.AVG,
-    "min": sampling_mode.MIN,
-    "max": sampling_mode.MAX,
-}
-
 adc1_channel_t = cg.global_ns.enum("adc1_channel_t")
 adc2_channel_t = cg.global_ns.enum("adc2_channel_t")

@@ -108,11 +102,11 @@ ESP32_VARIANT_ADC1_PIN_TO_CHANNEL = {
        6: adc1_channel_t.ADC1_CHANNEL_6,
    },
    VARIANT_ESP32H2: {
-        1: adc1_channel_t.ADC1_CHANNEL_0,
-        2: adc1_channel_t.ADC1_CHANNEL_1,
-        3: adc1_channel_t.ADC1_CHANNEL_2,
-        4: adc1_channel_t.ADC1_CHANNEL_3,
-        5: adc1_channel_t.ADC1_CHANNEL_4,
+        0: adc1_channel_t.ADC1_CHANNEL_0,
+        1: adc1_channel_t.ADC1_CHANNEL_1,
+        2: adc1_channel_t.ADC1_CHANNEL_2,
+        3: adc1_channel_t.ADC1_CHANNEL_3,
+        4: adc1_channel_t.ADC1_CHANNEL_4,
    },
 }

--- a/esphome/components/adc/adc_sensor_esp32.cpp
+++ b/esphome/components/adc/adc_sensor_esp32.cpp
@@ -1,13 +1,30 @@
-#ifdef USE_ESP32
-
 #include "adc_sensor.h"
+#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"

+#ifdef USE_ESP8266
+#ifdef USE_ADC_SENSOR_VCC
+#include <Esp.h>
+ADC_MODE(ADC_VCC)
+#else
+#include <Arduino.h>
+#endif
+#endif
+
+#ifdef USE_RP2040
+#ifdef CYW43_USES_VSYS_PIN
+#include "pico/cyw43_arch.h"
+#endif
+#include <hardware/adc.h>
+#endif
+
 namespace esphome {
 namespace adc {

-static const char *const TAG = "adc.esp32";
+static const char *const TAG = "adc";

+// 13-bit for S2, 12-bit for all other ESP32 variants
+#ifdef USE_ESP32
 static const adc_bits_width_t ADC_WIDTH_MAX_SOC_BITS = static_cast<adc_bits_width_t>(ADC_WIDTH_MAX - 1);

 #ifndef SOC_ADC_RTC_MAX_BITWIDTH
@@ -15,15 +32,24 @@ static const adc_bits_width_t ADC_WIDTH_MAX_SOC_BITS = static_cast<adc_bits_widt
 static const int32_t SOC_ADC_RTC_MAX_BITWIDTH = 13;
 #else
 static const int32_t SOC_ADC_RTC_MAX_BITWIDTH = 12;
-#endif  // USE_ESP32_VARIANT_ESP32S2
-#endif  // SOC_ADC_RTC_MAX_BITWIDTH
+#endif
+#endif

-static const int ADC_MAX = (1 << SOC_ADC_RTC_MAX_BITWIDTH) - 1;
-static const int ADC_HALF = (1 << SOC_ADC_RTC_MAX_BITWIDTH) >> 1;
+static const int ADC_MAX = (1 << SOC_ADC_RTC_MAX_BITWIDTH) - 1;    // 4095 (12 bit) or 8191 (13 bit)
+static const int ADC_HALF = (1 << SOC_ADC_RTC_MAX_BITWIDTH) >> 1;  // 2048 (12 bit) or 4096 (13 bit)
+#endif

-void ADCSensor::setup() {
+#ifdef USE_RP2040
+extern "C"
+#endif
+    void
+    ADCSensor::setup() {
  ESP_LOGCONFIG(TAG, "Setting up ADC '%s'...", this->get_name().c_str());
+#if !defined(USE_ADC_SENSOR_VCC) && !defined(USE_RP2040)
+  this->pin_->setup();
+#endif

+#ifdef USE_ESP32
  if (this->channel1_ != ADC1_CHANNEL_MAX) {
    adc1_config_width(ADC_WIDTH_MAX_SOC_BITS);
    if (!this->autorange_) {
@@ -35,6 +61,7 @@ void ADCSensor::setup() {
    }
  }

+  // load characteristics for each attenuation
  for (int32_t i = 0; i <= ADC_ATTEN_DB_12_COMPAT; i++) {
    auto adc_unit = this->channel1_ != ADC1_CHANNEL_MAX ? ADC_UNIT_1 : ADC_UNIT_2;
    auto cal_value = esp_adc_cal_characterize(adc_unit, (adc_atten_t) i, ADC_WIDTH_MAX_SOC_BITS,
@@ -52,10 +79,31 @@ void ADCSensor::setup() {
        break;
    }
  }
+
+#endif  // USE_ESP32
+
+#ifdef USE_RP2040
+  static bool initialized = false;
+  if (!initialized) {
+    adc_init();
+    initialized = true;
+  }
+#endif
+
+  ESP_LOGCONFIG(TAG, "ADC '%s' setup finished!", this->get_name().c_str());
 }

 void ADCSensor::dump_config() {
  LOG_SENSOR("", "ADC Sensor", this);
+#if defined(USE_ESP8266) || defined(USE_LIBRETINY)
+#ifdef USE_ADC_SENSOR_VCC
+  ESP_LOGCONFIG(TAG, "  Pin: VCC");
+#else
+  LOG_PIN("  Pin: ", this->pin_);
+#endif
+#endif  // USE_ESP8266 || USE_LIBRETINY
+
+#ifdef USE_ESP32
  LOG_PIN("  Pin: ", this->pin_);
  if (this->autorange_) {
    ESP_LOGCONFIG(TAG, "  Attenuation: auto");
@@ -77,15 +125,58 @@ void ADCSensor::dump_config() {
        break;
    }
  }
+#endif  // USE_ESP32
+
+#ifdef USE_RP2040
+  if (this->is_temperature_) {
+    ESP_LOGCONFIG(TAG, "  Pin: Temperature");
+  } else {
+#ifdef USE_ADC_SENSOR_VCC
+    ESP_LOGCONFIG(TAG, "  Pin: VCC");
+#else
+    LOG_PIN("  Pin: ", this->pin_);
+#endif  // USE_ADC_SENSOR_VCC
+  }
+#endif  // USE_RP2040
  ESP_LOGCONFIG(TAG, "  Samples: %i", this->sample_count_);
-  ESP_LOGCONFIG(TAG, "  Sampling mode: %s", LOG_STR_ARG(sampling_mode_to_str(this->sampling_mode_)));
  LOG_UPDATE_INTERVAL(this);
 }

+float ADCSensor::get_setup_priority() const { return setup_priority::DATA; }
+void ADCSensor::update() {
+  float value_v = this->sample();
+  ESP_LOGV(TAG, "'%s': Got voltage=%.4fV", this->get_name().c_str(), value_v);
+  this->publish_state(value_v);
+}
+
+void ADCSensor::set_sample_count(uint8_t sample_count) {
+  if (sample_count != 0) {
+    this->sample_count_ = sample_count;
+  }
+}
+
+#ifdef USE_ESP8266
+float ADCSensor::sample() {
+  uint32_t raw = 0;
+  for (uint8_t sample = 0; sample < this->sample_count_; sample++) {
+#ifdef USE_ADC_SENSOR_VCC
+    raw += ESP.getVcc();  // NOLINT(readability-static-accessed-through-instance)
+#else
+    raw += analogRead(this->pin_->get_pin());  // NOLINT
+#endif
+  }
+  raw = (raw + (this->sample_count_ >> 1)) / this->sample_count_;  // NOLINT(clang-analyzer-core.DivideZero)
+  if (this->output_raw_) {
+    return raw;
+  }
+  return raw / 1024.0f;
+}
+#endif
+
+#ifdef USE_ESP32
 float ADCSensor::sample() {
  if (!this->autorange_) {
-    auto aggr = Aggregator(this->sampling_mode_);
-
+    uint32_t sum = 0;
    for (uint8_t sample = 0; sample < this->sample_count_; sample++) {
      int raw = -1;
      if (this->channel1_ != ADC1_CHANNEL_MAX) {
@@ -96,14 +187,13 @@ float ADCSensor::sample() {
      if (raw == -1) {
        return NAN;
      }
-
-      aggr.add_sample(raw);
+      sum += raw;
    }
+    sum = (sum + (this->sample_count_ >> 1)) / this->sample_count_;  // NOLINT(clang-analyzer-core.DivideZero)
    if (this->output_raw_) {
-      return aggr.aggregate();
+      return sum;
    }
-    uint32_t mv =
-        esp_adc_cal_raw_to_voltage(aggr.aggregate(), &this->cal_characteristics_[(int32_t) this->attenuation_]);
+    uint32_t mv = esp_adc_cal_raw_to_voltage(sum, &this->cal_characteristics_[(int32_t) this->attenuation_]);
    return mv / 1000.0f;
  }

@@ -150,17 +240,93 @@ float ADCSensor::sample() {
  uint32_t mv2 = esp_adc_cal_raw_to_voltage(raw2, &this->cal_characteristics_[(int32_t) ADC_ATTEN_DB_2_5]);
  uint32_t mv0 = esp_adc_cal_raw_to_voltage(raw0, &this->cal_characteristics_[(int32_t) ADC_ATTEN_DB_0]);

+  // Contribution of each value, in range 0-2048 (12 bit ADC) or 0-4096 (13 bit ADC)
  uint32_t c12 = std::min(raw12, ADC_HALF);
  uint32_t c6 = ADC_HALF - std::abs(raw6 - ADC_HALF);
  uint32_t c2 = ADC_HALF - std::abs(raw2 - ADC_HALF);
  uint32_t c0 = std::min(ADC_MAX - raw0, ADC_HALF);
+  // max theoretical csum value is 4096*4 = 16384
  uint32_t csum = c12 + c6 + c2 + c0;

+  // each mv is max 3900; so max value is 3900*4096*4, fits in unsigned32
  uint32_t mv_scaled = (mv12 * c12) + (mv6 * c6) + (mv2 * c2) + (mv0 * c0);
  return mv_scaled / (float) (csum * 1000U);
 }
+#endif  // USE_ESP32
+
+#ifdef USE_RP2040
+float ADCSensor::sample() {
+  if (this->is_temperature_) {
+    adc_set_temp_sensor_enabled(true);
+    delay(1);
+    adc_select_input(4);
+    uint32_t raw = 0;
+    for (uint8_t sample = 0; sample < this->sample_count_; sample++) {
+      raw += adc_read();
+    }
+    raw = (raw + (this->sample_count_ >> 1)) / this->sample_count_;  // NOLINT(clang-analyzer-core.DivideZero)
+    adc_set_temp_sensor_enabled(false);
+    if (this->output_raw_) {
+      return raw;
+    }
+    return raw * 3.3f / 4096.0f;
+  } else {
+    uint8_t pin = this->pin_->get_pin();
+#ifdef CYW43_USES_VSYS_PIN
+    if (pin == PICO_VSYS_PIN) {
+      // Measuring VSYS on Raspberry Pico W needs to be wrapped with
+      // `cyw43_thread_enter()`/`cyw43_thread_exit()` as discussed in
+      // https://github.com/raspberrypi/pico-sdk/issues/1222, since Wifi chip and
+      // VSYS ADC both share GPIO29
+      cyw43_thread_enter();
+    }
+#endif  // CYW43_USES_VSYS_PIN
+
+    adc_gpio_init(pin);
+    adc_select_input(pin - 26);
+
+    uint32_t raw = 0;
+    for (uint8_t sample = 0; sample < this->sample_count_; sample++) {
+      raw += adc_read();
+    }
+    raw = (raw + (this->sample_count_ >> 1)) / this->sample_count_;  // NOLINT(clang-analyzer-core.DivideZero)
+
+#ifdef CYW43_USES_VSYS_PIN
+    if (pin == PICO_VSYS_PIN) {
+      cyw43_thread_exit();
+    }
+#endif  // CYW43_USES_VSYS_PIN
+
+    if (this->output_raw_) {
+      return raw;
+    }
+    float coeff = pin == PICO_VSYS_PIN ? 3.0 : 1.0;
+    return raw * 3.3f / 4096.0f * coeff;
+  }
+}
+#endif
+
+#ifdef USE_LIBRETINY
+float ADCSensor::sample() {
+  uint32_t raw = 0;
+  if (this->output_raw_) {
+    for (uint8_t sample = 0; sample < this->sample_count_; sample++) {
+      raw += analogRead(this->pin_->get_pin());  // NOLINT
+    }
+    raw = (raw + (this->sample_count_ >> 1)) / this->sample_count_;  // NOLINT(clang-analyzer-core.DivideZero)
+    return raw;
+  }
+  for (uint8_t sample = 0; sample < this->sample_count_; sample++) {
+    raw += analogReadVoltage(this->pin_->get_pin());  // NOLINT
+  }
+  raw = (raw + (this->sample_count_ >> 1)) / this->sample_count_;  // NOLINT(clang-analyzer-core.DivideZero)
+  return raw / 1000.0f;
+}
+#endif  // USE_LIBRETINY
+
+#ifdef USE_ESP8266
+std::string ADCSensor::unique_id() { return get_mac_address() + "-adc"; }
+#endif

 }  // namespace adc
 }  // namespace esphome
-
-#endif  // USE_ESP32
--- a/esphome/components/adc/adc_sensor.h
+++ b/esphome/components/adc/adc_sensor.h
@@ -3,12 +3,13 @@
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/voltage_sampler/voltage_sampler.h"
 #include "esphome/core/component.h"
+#include "esphome/core/defines.h"
 #include "esphome/core/hal.h"

 #ifdef USE_ESP32
 #include <esp_adc_cal.h>
 #include "driver/adc.h"
-#endif  // USE_ESP32
+#endif

 namespace esphome {
 namespace adc {
@@ -28,21 +29,6 @@ static const adc_atten_t ADC_ATTEN_DB_12_COMPAT = ADC_ATTEN_DB_11;
 #endif
 #endif  // USE_ESP32

-enum class SamplingMode : uint8_t { AVG = 0, MIN = 1, MAX = 2 };
-const LogString *sampling_mode_to_str(SamplingMode mode);
-
-class Aggregator {
- public:
-  void add_sample(uint32_t value);
-  uint32_t aggregate();
-  Aggregator(SamplingMode mode);
-
- protected:
-  SamplingMode mode_{SamplingMode::AVG};
-  uint32_t aggr_{0};
-  uint32_t samples_{0};
-};
-
 class ADCSensor : public sensor::Sensor, public PollingComponent, public voltage_sampler::VoltageSampler {
 public:
 #ifdef USE_ESP32
@@ -57,7 +43,7 @@ class ADCSensor : public sensor::Sensor, public PollingComponent, public voltage
    this->channel1_ = ADC1_CHANNEL_MAX;
  }
  void set_autorange(bool autorange) { this->autorange_ = autorange; }
-#endif  // USE_ESP32
+#endif

  /// Update ADC values
  void update() override;
@@ -69,26 +55,24 @@ class ADCSensor : public sensor::Sensor, public PollingComponent, public voltage
  void set_pin(InternalGPIOPin *pin) { this->pin_ = pin; }
  void set_output_raw(bool output_raw) { this->output_raw_ = output_raw; }
  void set_sample_count(uint8_t sample_count);
-  void set_sampling_mode(SamplingMode sampling_mode);
  float sample() override;

 #ifdef USE_ESP8266
  std::string unique_id() override;
-#endif  // USE_ESP8266
+#endif

 #ifdef USE_RP2040
  void set_is_temperature() { this->is_temperature_ = true; }
-#endif  // USE_RP2040
+#endif

 protected:
  InternalGPIOPin *pin_;
  bool output_raw_{false};
  uint8_t sample_count_{1};
-  SamplingMode sampling_mode_{SamplingMode::AVG};

 #ifdef USE_RP2040
  bool is_temperature_{false};
-#endif  // USE_RP2040
+#endif

 #ifdef USE_ESP32
  adc_atten_t attenuation_{ADC_ATTEN_DB_0};
@@ -99,8 +83,8 @@ class ADCSensor : public sensor::Sensor, public PollingComponent, public voltage
  esp_adc_cal_characteristics_t cal_characteristics_[SOC_ADC_ATTEN_NUM] = {};
 #else
  esp_adc_cal_characteristics_t cal_characteristics_[ADC_ATTEN_MAX] = {};
-#endif  // ESP_IDF_VERSION_MAJOR
-#endif  // USE_ESP32
+#endif
+#endif
 };

 }  // namespace adc
--- a/esphome/components/adc/adc_sensor_common.cpp
+++ b/esphome/components/adc/adc_sensor_common.cpp
@@ -1,79 +0,0 @@
-#include "adc_sensor.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace adc {
-
-static const char *const TAG = "adc.common";
-
-const LogString *sampling_mode_to_str(SamplingMode mode) {
-  switch (mode) {
-    case SamplingMode::AVG:
-      return LOG_STR("average");
-    case SamplingMode::MIN:
-      return LOG_STR("minimum");
-    case SamplingMode::MAX:
-      return LOG_STR("maximum");
-  }
-  return LOG_STR("unknown");
-}
-
-Aggregator::Aggregator(SamplingMode mode) {
-  this->mode_ = mode;
-  // set to max uint if mode is "min"
-  if (mode == SamplingMode::MIN) {
-    this->aggr_ = UINT32_MAX;
-  }
-}
-
-void Aggregator::add_sample(uint32_t value) {
-  this->samples_ += 1;
-
-  switch (this->mode_) {
-    case SamplingMode::AVG:
-      this->aggr_ += value;
-      break;
-
-    case SamplingMode::MIN:
-      if (value < this->aggr_) {
-        this->aggr_ = value;
-      }
-      break;
-
-    case SamplingMode::MAX:
-      if (value > this->aggr_) {
-        this->aggr_ = value;
-      }
-  }
-}
-
-uint32_t Aggregator::aggregate() {
-  if (this->mode_ == SamplingMode::AVG) {
-    if (this->samples_ == 0) {
-      return this->aggr_;
-    }
-
-    return (this->aggr_ + (this->samples_ >> 1)) / this->samples_;  // NOLINT(clang-analyzer-core.DivideZero)
-  }
-
-  return this->aggr_;
-}
-
-void ADCSensor::update() {
-  float value_v = this->sample();
-  ESP_LOGV(TAG, "'%s': Got voltage=%.4fV", this->get_name().c_str(), value_v);
-  this->publish_state(value_v);
-}
-
-void ADCSensor::set_sample_count(uint8_t sample_count) {
-  if (sample_count != 0) {
-    this->sample_count_ = sample_count;
-  }
-}
-
-void ADCSensor::set_sampling_mode(SamplingMode sampling_mode) { this->sampling_mode_ = sampling_mode; }
-
-float ADCSensor::get_setup_priority() const { return setup_priority::DATA; }
-
-}  // namespace adc
-}  // namespace esphome
--- a/esphome/components/adc/adc_sensor_esp8266.cpp
+++ b/esphome/components/adc/adc_sensor_esp8266.cpp
@@ -1,62 +0,0 @@
-#ifdef USE_ESP8266
-
-#include "adc_sensor.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-#ifdef USE_ADC_SENSOR_VCC
-#include <Esp.h>
-ADC_MODE(ADC_VCC)
-#else
-#include <Arduino.h>
-#endif  // USE_ADC_SENSOR_VCC
-
-namespace esphome {
-namespace adc {
-
-static const char *const TAG = "adc.esp8266";
-
-void ADCSensor::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up ADC '%s'...", this->get_name().c_str());
-#ifndef USE_ADC_SENSOR_VCC
-  this->pin_->setup();
-#endif
-}
-
-void ADCSensor::dump_config() {
-  LOG_SENSOR("", "ADC Sensor", this);
-#ifdef USE_ADC_SENSOR_VCC
-  ESP_LOGCONFIG(TAG, "  Pin: VCC");
-#else
-  LOG_PIN("  Pin: ", this->pin_);
-#endif  // USE_ADC_SENSOR_VCC
-  ESP_LOGCONFIG(TAG, "  Samples: %i", this->sample_count_);
-  ESP_LOGCONFIG(TAG, "  Sampling mode: %s", LOG_STR_ARG(sampling_mode_to_str(this->sampling_mode_)));
-  LOG_UPDATE_INTERVAL(this);
-}
-
-float ADCSensor::sample() {
-  auto aggr = Aggregator(this->sampling_mode_);
-
-  for (uint8_t sample = 0; sample < this->sample_count_; sample++) {
-    uint32_t raw = 0;
-#ifdef USE_ADC_SENSOR_VCC
-    raw = ESP.getVcc();  // NOLINT(readability-static-accessed-through-instance)
-#else
-    raw = analogRead(this->pin_->get_pin());  // NOLINT
-#endif  // USE_ADC_SENSOR_VCC
-    aggr.add_sample(raw);
-  }
-
-  if (this->output_raw_) {
-    return aggr.aggregate();
-  }
-  return aggr.aggregate() / 1024.0f;
-}
-
-std::string ADCSensor::unique_id() { return get_mac_address() + "-adc"; }
-
-}  // namespace adc
-}  // namespace esphome
-
-#endif  // USE_ESP8266
--- a/esphome/components/adc/adc_sensor_libretiny.cpp
+++ b/esphome/components/adc/adc_sensor_libretiny.cpp
@@ -1,53 +0,0 @@
-#ifdef USE_LIBRETINY
-
-#include "adc_sensor.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace adc {
-
-static const char *const TAG = "adc.libretiny";
-
-void ADCSensor::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up ADC '%s'...", this->get_name().c_str());
-#ifndef USE_ADC_SENSOR_VCC
-  this->pin_->setup();
-#endif  // !USE_ADC_SENSOR_VCC
-}
-
-void ADCSensor::dump_config() {
-  LOG_SENSOR("", "ADC Sensor", this);
-#ifdef USE_ADC_SENSOR_VCC
-  ESP_LOGCONFIG(TAG, "  Pin: VCC");
-#else   // USE_ADC_SENSOR_VCC
-  LOG_PIN("  Pin: ", this->pin_);
-#endif  // USE_ADC_SENSOR_VCC
-  ESP_LOGCONFIG(TAG, "  Samples: %i", this->sample_count_);
-  ESP_LOGCONFIG(TAG, "  Sampling mode: %s", LOG_STR_ARG(sampling_mode_to_str(this->sampling_mode_)));
-  LOG_UPDATE_INTERVAL(this);
-}
-
-float ADCSensor::sample() {
-  uint32_t raw = 0;
-  auto aggr = Aggregator(this->sampling_mode_);
-
-  if (this->output_raw_) {
-    for (uint8_t sample = 0; sample < this->sample_count_; sample++) {
-      raw = analogRead(this->pin_->get_pin());  // NOLINT
-      aggr.add_sample(raw);
-    }
-    return aggr.aggregate();
-  }
-
-  for (uint8_t sample = 0; sample < this->sample_count_; sample++) {
-    raw = analogReadVoltage(this->pin_->get_pin());  // NOLINT
-    aggr.add_sample(raw);
-  }
-
-  return aggr.aggregate() / 1000.0f;
-}
-
-}  // namespace adc
-}  // namespace esphome
-
-#endif  // USE_LIBRETINY
--- a/esphome/components/adc/adc_sensor_rp2040.cpp
+++ b/esphome/components/adc/adc_sensor_rp2040.cpp
@@ -1,96 +0,0 @@
-#ifdef USE_RP2040
-
-#include "adc_sensor.h"
-#include "esphome/core/log.h"
-
-#ifdef CYW43_USES_VSYS_PIN
-#include "pico/cyw43_arch.h"
-#endif  // CYW43_USES_VSYS_PIN
-#include <hardware/adc.h>
-
-namespace esphome {
-namespace adc {
-
-static const char *const TAG = "adc.rp2040";
-
-void ADCSensor::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up ADC '%s'...", this->get_name().c_str());
-  static bool initialized = false;
-  if (!initialized) {
-    adc_init();
-    initialized = true;
-  }
-}
-
-void ADCSensor::dump_config() {
-  LOG_SENSOR("", "ADC Sensor", this);
-  if (this->is_temperature_) {
-    ESP_LOGCONFIG(TAG, "  Pin: Temperature");
-  } else {
-#ifdef USE_ADC_SENSOR_VCC
-    ESP_LOGCONFIG(TAG, "  Pin: VCC");
-#else
-    LOG_PIN("  Pin: ", this->pin_);
-#endif  // USE_ADC_SENSOR_VCC
-  }
-  ESP_LOGCONFIG(TAG, "  Samples: %i", this->sample_count_);
-  ESP_LOGCONFIG(TAG, "  Sampling mode: %s", LOG_STR_ARG(sampling_mode_to_str(this->sampling_mode_)));
-  LOG_UPDATE_INTERVAL(this);
-}
-
-float ADCSensor::sample() {
-  uint32_t raw = 0;
-  auto aggr = Aggregator(this->sampling_mode_);
-
-  if (this->is_temperature_) {
-    adc_set_temp_sensor_enabled(true);
-    delay(1);
-    adc_select_input(4);
-
-    for (uint8_t sample = 0; sample < this->sample_count_; sample++) {
-      raw = adc_read();
-      aggr.add_sample(raw);
-    }
-    adc_set_temp_sensor_enabled(false);
-    if (this->output_raw_) {
-      return aggr.aggregate();
-    }
-    return aggr.aggregate() * 3.3f / 4096.0f;
-  }
-
-  uint8_t pin = this->pin_->get_pin();
-#ifdef CYW43_USES_VSYS_PIN
-  if (pin == PICO_VSYS_PIN) {
-    // Measuring VSYS on Raspberry Pico W needs to be wrapped with
-    // `cyw43_thread_enter()`/`cyw43_thread_exit()` as discussed in
-    // https://github.com/raspberrypi/pico-sdk/issues/1222, since Wifi chip and
-    // VSYS ADC both share GPIO29
-    cyw43_thread_enter();
-  }
-#endif  // CYW43_USES_VSYS_PIN
-
-  adc_gpio_init(pin);
-  adc_select_input(pin - 26);
-
-  for (uint8_t sample = 0; sample < this->sample_count_; sample++) {
-    raw = adc_read();
-    aggr.add_sample(raw);
-  }
-
-#ifdef CYW43_USES_VSYS_PIN
-  if (pin == PICO_VSYS_PIN) {
-    cyw43_thread_exit();
-  }
-#endif  // CYW43_USES_VSYS_PIN
-
-  if (this->output_raw_) {
-    return aggr.aggregate();
-  }
-  float coeff = pin == PICO_VSYS_PIN ? 3.0f : 1.0f;
-  return aggr.aggregate() * 3.3f / 4096.0f * coeff;
-}
-
-}  // namespace adc
-}  // namespace esphome
-
-#endif  // USE_RP2040
--- a/esphome/components/adc/sensor.py
+++ b/esphome/components/adc/sensor.py
@@ -1,9 +1,11 @@
 import logging

 import esphome.codegen as cg
+import esphome.config_validation as cv
+import esphome.final_validate as fv
+from esphome.core import CORE
 from esphome.components import sensor, voltage_sampler
 from esphome.components.esp32 import get_esp32_variant
-import esphome.config_validation as cv
 from esphome.const import (
    CONF_ATTENUATION,
    CONF_ID,
@@ -15,14 +17,10 @@ from esphome.const import (
    STATE_CLASS_MEASUREMENT,
    UNIT_VOLT,
 )
-from esphome.core import CORE
-import esphome.final_validate as fv
-
 from . import (
    ATTENUATION_MODES,
    ESP32_VARIANT_ADC1_PIN_TO_CHANNEL,
    ESP32_VARIANT_ADC2_PIN_TO_CHANNEL,
-    SAMPLING_MODES,
    adc_ns,
    validate_adc_pin,
 )
@@ -32,11 +30,9 @@ _LOGGER = logging.getLogger(__name__)
 AUTO_LOAD = ["voltage_sampler"]

 CONF_SAMPLES = "samples"
-CONF_SAMPLING_MODE = "sampling_mode"


 _attenuation = cv.enum(ATTENUATION_MODES, lower=True)
-_sampling_mode = cv.enum(SAMPLING_MODES, lower=True)


 def validate_config(config):
@@ -92,7 +88,6 @@ CONFIG_SCHEMA = cv.All(
                cv.only_on_esp32, _attenuation
            ),
            cv.Optional(CONF_SAMPLES, default=1): cv.int_range(min=1, max=255),
-            cv.Optional(CONF_SAMPLING_MODE, default="avg"): _sampling_mode,
        }
    )
    .extend(cv.polling_component_schema("60s")),
@@ -117,7 +112,6 @@ async def to_code(config):

    cg.add(var.set_output_raw(config[CONF_RAW]))
    cg.add(var.set_sample_count(config[CONF_SAMPLES]))
-    cg.add(var.set_sampling_mode(config[CONF_SAMPLING_MODE]))

    if attenuation := config.get(CONF_ATTENUATION):
        if attenuation == "auto":
--- a/esphome/components/adc128s102/init.py
+++ b/esphome/components/adc128s102/init.py
@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import spi
 import esphome.config_validation as cv
+from esphome.components import spi
 from esphome.const import CONF_ID

 DEPENDENCIES = ["spi"]
--- a/esphome/components/adc128s102/sensor/init.py
+++ b/esphome/components/adc128s102/sensor/init.py
@@ -1,9 +1,9 @@
 import esphome.codegen as cg
-from esphome.components import sensor, voltage_sampler
 import esphome.config_validation as cv
-from esphome.const import CONF_CHANNEL, CONF_ID
+from esphome.components import sensor, voltage_sampler
+from esphome.const import CONF_ID, CONF_CHANNEL

-from .. import ADC128S102, adc128s102_ns
+from .. import adc128s102_ns, ADC128S102

 AUTO_LOAD = ["voltage_sampler"]
 DEPENDENCIES = ["adc128s102"]
--- a/esphome/components/addressable_light/display.py
+++ b/esphome/components/addressable_light/display.py
@@ -1,15 +1,15 @@
 import esphome.codegen as cg
-from esphome.components import display, light
 import esphome.config_validation as cv
+from esphome.components import display, light
 from esphome.const import (
-    CONF_ADDRESSABLE_LIGHT_ID,
-    CONF_HEIGHT,
    CONF_ID,
    CONF_LAMBDA,
    CONF_PAGES,
-    CONF_PIXEL_MAPPER,
-    CONF_UPDATE_INTERVAL,
+    CONF_ADDRESSABLE_LIGHT_ID,
+    CONF_HEIGHT,
    CONF_WIDTH,
+    CONF_UPDATE_INTERVAL,
+    CONF_PIXEL_MAPPER,
 )

 CODEOWNERS = ["@justfalter"]
--- a/esphome/components/ade7880/sensor.py
+++ b/esphome/components/ade7880/sensor.py
@@ -1,7 +1,7 @@
-from esphome import pins
 import esphome.codegen as cg
-from esphome.components import i2c, sensor
 import esphome.config_validation as cv
+from esphome.components import sensor, i2c
+from esphome import pins
 from esphome.const import (
    CONF_ACTIVE_POWER,
    CONF_APPARENT_POWER,
--- a/esphome/components/ade7953_base/init.py
+++ b/esphome/components/ade7953_base/init.py
@@ -1,27 +1,27 @@
-from esphome import pins
 import esphome.codegen as cg
-from esphome.components import sensor
 import esphome.config_validation as cv
+from esphome.components import sensor
+from esphome import pins
 from esphome.const import (
-    CONF_FREQUENCY,
    CONF_IRQ_PIN,
    CONF_VOLTAGE,
+    CONF_FREQUENCY,
    CONF_VOLTAGE_GAIN,
-    DEVICE_CLASS_APPARENT_POWER,
    DEVICE_CLASS_CURRENT,
-    DEVICE_CLASS_FREQUENCY,
+    DEVICE_CLASS_APPARENT_POWER,
    DEVICE_CLASS_POWER,
-    DEVICE_CLASS_POWER_FACTOR,
    DEVICE_CLASS_REACTIVE_POWER,
+    DEVICE_CLASS_POWER_FACTOR,
    DEVICE_CLASS_VOLTAGE,
+    DEVICE_CLASS_FREQUENCY,
    STATE_CLASS_MEASUREMENT,
-    UNIT_AMPERE,
-    UNIT_HERTZ,
-    UNIT_PERCENT,
    UNIT_VOLT,
+    UNIT_HERTZ,
+    UNIT_AMPERE,
    UNIT_VOLT_AMPS,
-    UNIT_VOLT_AMPS_REACTIVE,
    UNIT_WATT,
+    UNIT_VOLT_AMPS_REACTIVE,
+    UNIT_PERCENT,
 )

 CONF_CURRENT_A = "current_a"
--- a/esphome/components/ade7953_i2c/sensor.py
+++ b/esphome/components/ade7953_i2c/sensor.py
@@ -1,8 +1,9 @@
 import esphome.codegen as cg
-from esphome.components import ade7953_base, i2c
 import esphome.config_validation as cv
+from esphome.components import i2c, ade7953_base
 from esphome.const import CONF_ID

+
 DEPENDENCIES = ["i2c"]
 AUTO_LOAD = ["ade7953_base"]

--- a/esphome/components/ade7953_spi/sensor.py
+++ b/esphome/components/ade7953_spi/sensor.py
@@ -1,8 +1,9 @@
 import esphome.codegen as cg
-from esphome.components import ade7953_base, spi
 import esphome.config_validation as cv
+from esphome.components import spi, ade7953_base
 from esphome.const import CONF_ID

+
 DEPENDENCIES = ["spi"]
 AUTO_LOAD = ["ade7953_base"]

--- a/esphome/components/ads1115/init.py
+++ b/esphome/components/ads1115/init.py
@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import i2c
 import esphome.config_validation as cv
+from esphome.components import i2c
 from esphome.const import CONF_ID

 DEPENDENCIES = ["i2c"]
--- a/esphome/components/ads1115/ads1115.cpp
+++ b/esphome/components/ads1115/ads1115.cpp
@@ -9,6 +9,8 @@ static const char *const TAG = "ads1115";
 static const uint8_t ADS1115_REGISTER_CONVERSION = 0x00;
 static const uint8_t ADS1115_REGISTER_CONFIG = 0x01;

+static const uint8_t ADS1115_DATA_RATE_860_SPS = 0b111;  // 3300_SPS for ADS1015
+
 void ADS1115Component::setup() {
  ESP_LOGCONFIG(TAG, "Setting up ADS1115...");
  uint16_t value;
@@ -41,9 +43,9 @@ void ADS1115Component::setup() {
    config |= 0b0000000100000000;
  }

-  // Set data rate - 860 samples per second
+  // Set data rate - 860 samples per second (we're in singleshot mode)
  //        0bxxxxxxxx100xxxxx
-  config |= ADS1115_860SPS << 5;
+  config |= ADS1115_DATA_RATE_860_SPS << 5;

  // Set comparator mode - hysteresis
  //        0bxxxxxxxxxxx0xxxx
@@ -75,7 +77,7 @@ void ADS1115Component::dump_config() {
  }
 }
 float ADS1115Component::request_measurement(ADS1115Multiplexer multiplexer, ADS1115Gain gain,
-                                            ADS1115Resolution resolution, ADS1115Samplerate samplerate) {
+                                            ADS1115Resolution resolution) {
  uint16_t config = this->prev_config_;
  // Multiplexer
  //        0bxBBBxxxxxxxxxxxx
@@ -87,11 +89,6 @@ float ADS1115Component::request_measurement(ADS1115Multiplexer multiplexer, ADS1
  config &= 0b1111000111111111;
  config |= (gain & 0b111) << 9;

-  // Sample rate
-  //        0bxxxxxxxxBBBxxxxx
-  config &= 0b1111111100011111;
-  config |= (samplerate & 0b111) << 5;
-
  if (!this->continuous_mode_) {
    // Start conversion
    config |= 0b1000000000000000;
@@ -104,54 +101,8 @@ float ADS1115Component::request_measurement(ADS1115Multiplexer multiplexer, ADS1
    }
    this->prev_config_ = config;

-    // Delay calculated as: ceil((1000/SPS)+.5)
-    if (resolution == ADS1015_12_BITS) {
-      switch (samplerate) {
-        case ADS1115_8SPS:
-          delay(9);
-          break;
-        case ADS1115_16SPS:
-          delay(5);
-          break;
-        case ADS1115_32SPS:
-          delay(3);
-          break;
-        case ADS1115_64SPS:
-        case ADS1115_128SPS:
-          delay(2);
-          break;
-        default:
-          delay(1);
-          break;
-      }
-    } else {
-      switch (samplerate) {
-        case ADS1115_8SPS:
-          delay(126);  // NOLINT
-          break;
-        case ADS1115_16SPS:
-          delay(63);  // NOLINT
-          break;
-        case ADS1115_32SPS:
-          delay(32);
-          break;
-        case ADS1115_64SPS:
-          delay(17);
-          break;
-        case ADS1115_128SPS:
-          delay(9);
-          break;
-        case ADS1115_250SPS:
-          delay(5);
-          break;
-        case ADS1115_475SPS:
-          delay(3);
-          break;
-        case ADS1115_860SPS:
-          delay(2);
-          break;
-      }
-    }
+    // about 1.2 ms with 860 samples per second
+    delay(2);

    // in continuous mode, conversion will always be running, rely on the delay
    // to ensure conversion is taking place with the correct settings
--- a/esphome/components/ads1115/ads1115.h
+++ b/esphome/components/ads1115/ads1115.h
@@ -33,17 +33,6 @@ enum ADS1115Resolution {
  ADS1015_12_BITS = 12,
 };

-enum ADS1115Samplerate {
-  ADS1115_8SPS = 0b000,
-  ADS1115_16SPS = 0b001,
-  ADS1115_32SPS = 0b010,
-  ADS1115_64SPS = 0b011,
-  ADS1115_128SPS = 0b100,
-  ADS1115_250SPS = 0b101,
-  ADS1115_475SPS = 0b110,
-  ADS1115_860SPS = 0b111
-};
-
 class ADS1115Component : public Component, public i2c::I2CDevice {
 public:
  void setup() override;
@@ -53,8 +42,7 @@ class ADS1115Component : public Component, public i2c::I2CDevice {
  void set_continuous_mode(bool continuous_mode) { continuous_mode_ = continuous_mode; }

  /// Helper method to request a measurement from a sensor.
-  float request_measurement(ADS1115Multiplexer multiplexer, ADS1115Gain gain, ADS1115Resolution resolution,
-                            ADS1115Samplerate samplerate);
+  float request_measurement(ADS1115Multiplexer multiplexer, ADS1115Gain gain, ADS1115Resolution resolution);

 protected:
  uint16_t prev_config_{0};
--- a/esphome/components/ads1115/sensor/init.py
+++ b/esphome/components/ads1115/sensor/init.py
@@ -1,18 +1,16 @@
 import esphome.codegen as cg
-from esphome.components import sensor, voltage_sampler
 import esphome.config_validation as cv
+from esphome.components import sensor, voltage_sampler
 from esphome.const import (
    CONF_GAIN,
-    CONF_ID,
    CONF_MULTIPLEXER,
    CONF_RESOLUTION,
-    CONF_SAMPLE_RATE,
    DEVICE_CLASS_VOLTAGE,
    STATE_CLASS_MEASUREMENT,
    UNIT_VOLT,
+    CONF_ID,
 )
-
-from .. import CONF_ADS1115_ID, ADS1115Component, ads1115_ns
+from .. import ads1115_ns, ADS1115Component, CONF_ADS1115_ID

 AUTO_LOAD = ["voltage_sampler"]
 DEPENDENCIES = ["ads1115"]
@@ -45,17 +43,6 @@ RESOLUTION = {
    "12_BITS": ADS1115Resolution.ADS1015_12_BITS,
 }

-ADS1115Samplerate = ads1115_ns.enum("ADS1115Samplerate")
-SAMPLERATE = {
-    "8": ADS1115Samplerate.ADS1115_8SPS,
-    "16": ADS1115Samplerate.ADS1115_16SPS,
-    "32": ADS1115Samplerate.ADS1115_32SPS,
-    "64": ADS1115Samplerate.ADS1115_64SPS,
-    "128": ADS1115Samplerate.ADS1115_128SPS,
-    "250": ADS1115Samplerate.ADS1115_250SPS,
-    "475": ADS1115Samplerate.ADS1115_475SPS,
-    "860": ADS1115Samplerate.ADS1115_860SPS,
-}

 ADS1115Sensor = ads1115_ns.class_(
    "ADS1115Sensor", sensor.Sensor, cg.PollingComponent, voltage_sampler.VoltageSampler
@@ -77,9 +64,6 @@ CONFIG_SCHEMA = (
            cv.Optional(CONF_RESOLUTION, default="16_BITS"): cv.enum(
                RESOLUTION, upper=True, space="_"
            ),
-            cv.Optional(CONF_SAMPLE_RATE, default="860"): cv.enum(
-                SAMPLERATE, string=True
-            ),
        }
    )
    .extend(cv.polling_component_schema("60s"))
@@ -95,4 +79,3 @@ async def to_code(config):
    cg.add(var.set_multiplexer(config[CONF_MULTIPLEXER]))
    cg.add(var.set_gain(config[CONF_GAIN]))
    cg.add(var.set_resolution(config[CONF_RESOLUTION]))
-    cg.add(var.set_samplerate(config[CONF_SAMPLE_RATE]))
--- a/esphome/components/ads1115/sensor/ads1115_sensor.cpp
+++ b/esphome/components/ads1115/sensor/ads1115_sensor.cpp
@@ -8,7 +8,7 @@ namespace ads1115 {
 static const char *const TAG = "ads1115.sensor";

 float ADS1115Sensor::sample() {
-  return this->parent_->request_measurement(this->multiplexer_, this->gain_, this->resolution_, this->samplerate_);
+  return this->parent_->request_measurement(this->multiplexer_, this->gain_, this->resolution_);
 }

 void ADS1115Sensor::update() {
@@ -24,7 +24,6 @@ void ADS1115Sensor::dump_config() {
  ESP_LOGCONFIG(TAG, "    Multiplexer: %u", this->multiplexer_);
  ESP_LOGCONFIG(TAG, "    Gain: %u", this->gain_);
  ESP_LOGCONFIG(TAG, "    Resolution: %u", this->resolution_);
-  ESP_LOGCONFIG(TAG, "    Sample rate: %u", this->samplerate_);
 }

 }  // namespace ads1115
--- a/esphome/components/ads1115/sensor/ads1115_sensor.h
+++ b/esphome/components/ads1115/sensor/ads1115_sensor.h
@@ -21,7 +21,6 @@ class ADS1115Sensor : public sensor::Sensor,
  void set_multiplexer(ADS1115Multiplexer multiplexer) { this->multiplexer_ = multiplexer; }
  void set_gain(ADS1115Gain gain) { this->gain_ = gain; }
  void set_resolution(ADS1115Resolution resolution) { this->resolution_ = resolution; }
-  void set_samplerate(ADS1115Samplerate samplerate) { this->samplerate_ = samplerate; }
  float sample() override;

  void dump_config() override;
@@ -30,7 +29,6 @@ class ADS1115Sensor : public sensor::Sensor,
  ADS1115Multiplexer multiplexer_;
  ADS1115Gain gain_;
  ADS1115Resolution resolution_;
-  ADS1115Samplerate samplerate_;
 };

 }  // namespace ads1115
--- a/esphome/components/ads1118/init.py
+++ b/esphome/components/ads1118/init.py
@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import spi
 import esphome.config_validation as cv
+from esphome.components import spi
 from esphome.const import CONF_ID

 CODEOWNERS = ["@solomondg1"]
--- a/esphome/components/ads1118/sensor/init.py
+++ b/esphome/components/ads1118/sensor/init.py
@@ -1,18 +1,17 @@
 import esphome.codegen as cg
-from esphome.components import sensor, voltage_sampler
 import esphome.config_validation as cv
+from esphome.components import sensor, voltage_sampler
 from esphome.const import (
    CONF_GAIN,
    CONF_MULTIPLEXER,
-    CONF_TYPE,
-    DEVICE_CLASS_TEMPERATURE,
    DEVICE_CLASS_VOLTAGE,
+    DEVICE_CLASS_TEMPERATURE,
    STATE_CLASS_MEASUREMENT,
    UNIT_CELSIUS,
    UNIT_VOLT,
+    CONF_TYPE,
 )
-
-from .. import ADS1118, CONF_ADS1118_ID, ads1118_ns
+from .. import ads1118_ns, ADS1118, CONF_ADS1118_ID

 AUTO_LOAD = ["voltage_sampler"]
 DEPENDENCIES = ["ads1118"]
--- a/esphome/components/ags10/sensor.py
+++ b/esphome/components/ags10/sensor.py
@@ -1,21 +1,21 @@
-from esphome import automation
 import esphome.codegen as cg
-from esphome.components import i2c, sensor
+from esphome import automation
 import esphome.config_validation as cv
+from esphome.components import i2c, sensor
 from esphome.const import (
-    CONF_ADDRESS,
    CONF_ID,
-    CONF_MODE,
-    CONF_TVOC,
-    CONF_VALUE,
-    CONF_VERSION,
-    DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS_PARTS,
-    ENTITY_CATEGORY_DIAGNOSTIC,
    ICON_RADIATOR,
    ICON_RESTART,
+    DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS_PARTS,
+    ENTITY_CATEGORY_DIAGNOSTIC,
    STATE_CLASS_MEASUREMENT,
    UNIT_OHM,
    UNIT_PARTS_PER_BILLION,
+    CONF_ADDRESS,
+    CONF_TVOC,
+    CONF_VERSION,
+    CONF_MODE,
+    CONF_VALUE,
 )

 CONF_RESISTANCE = "resistance"
--- a/esphome/components/aht10/sensor.py
+++ b/esphome/components/aht10/sensor.py
@@ -1,16 +1,16 @@
 import esphome.codegen as cg
-from esphome.components import i2c, sensor
 import esphome.config_validation as cv
+from esphome.components import i2c, sensor
 from esphome.const import (
    CONF_HUMIDITY,
    CONF_ID,
    CONF_TEMPERATURE,
-    CONF_VARIANT,
    DEVICE_CLASS_HUMIDITY,
    DEVICE_CLASS_TEMPERATURE,
    STATE_CLASS_MEASUREMENT,
    UNIT_CELSIUS,
    UNIT_PERCENT,
+    CONF_VARIANT,
 )

 DEPENDENCIES = ["i2c"]
--- a/esphome/components/airthings_ble/init.py
+++ b/esphome/components/airthings_ble/init.py
@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import esp32_ble_tracker
 import esphome.config_validation as cv
+from esphome.components import esp32_ble_tracker
 from esphome.const import CONF_ID

 DEPENDENCIES = ["esp32_ble_tracker"]
--- a/esphome/components/airthings_wave_base/init.py
+++ b/esphome/components/airthings_wave_base/init.py
@@ -1,17 +1,18 @@
 import esphome.codegen as cg
-from esphome.components import ble_client, sensor
 import esphome.config_validation as cv
+from esphome.components import sensor, ble_client
+
 from esphome.const import (
    CONF_BATTERY_VOLTAGE,
    CONF_HUMIDITY,
    CONF_PRESSURE,
    CONF_TEMPERATURE,
    CONF_TVOC,
+    DEVICE_CLASS_VOLTAGE,
    DEVICE_CLASS_HUMIDITY,
    DEVICE_CLASS_PRESSURE,
    DEVICE_CLASS_TEMPERATURE,
    DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS_PARTS,
-    DEVICE_CLASS_VOLTAGE,
    ENTITY_CATEGORY_DIAGNOSTIC,
    STATE_CLASS_MEASUREMENT,
    UNIT_CELSIUS,
--- a/esphome/components/airthings_wave_mini/sensor.py
+++ b/esphome/components/airthings_wave_mini/sensor.py
@@ -1,7 +1,10 @@
 import esphome.codegen as cg
-from esphome.components import airthings_wave_base
 import esphome.config_validation as cv
-from esphome.const import CONF_ID
+from esphome.components import airthings_wave_base
+
+from esphome.const import (
+    CONF_ID,
+)

 DEPENDENCIES = airthings_wave_base.DEPENDENCIES

--- a/esphome/components/airthings_wave_plus/sensor.py
+++ b/esphome/components/airthings_wave_plus/sensor.py
@@ -1,19 +1,20 @@
 import esphome.codegen as cg
-from esphome.components import airthings_wave_base, sensor
 import esphome.config_validation as cv
+from esphome.components import sensor, airthings_wave_base
+
 from esphome.const import (
-    CONF_CO2,
+    DEVICE_CLASS_CARBON_DIOXIDE,
+    STATE_CLASS_MEASUREMENT,
+    ICON_RADIOACTIVE,
    CONF_ID,
-    CONF_ILLUMINANCE,
    CONF_RADON,
    CONF_RADON_LONG_TERM,
-    DEVICE_CLASS_CARBON_DIOXIDE,
-    DEVICE_CLASS_ILLUMINANCE,
-    ICON_RADIOACTIVE,
-    STATE_CLASS_MEASUREMENT,
+    CONF_CO2,
    UNIT_BECQUEREL_PER_CUBIC_METER,
-    UNIT_LUX,
    UNIT_PARTS_PER_MILLION,
+    CONF_ILLUMINANCE,
+    UNIT_LUX,
+    DEVICE_CLASS_ILLUMINANCE,
 )

 DEPENDENCIES = airthings_wave_base.DEPENDENCIES
--- a/esphome/components/alpha3/sensor.py
+++ b/esphome/components/alpha3/sensor.py
@@ -1,20 +1,20 @@
 import esphome.codegen as cg
-from esphome.components import ble_client, sensor
 import esphome.config_validation as cv
+from esphome.components import sensor, ble_client
 from esphome.const import (
+    CONF_ID,
    CONF_CURRENT,
    CONF_FLOW,
    CONF_HEAD,
-    CONF_ID,
    CONF_POWER,
    CONF_SPEED,
    CONF_VOLTAGE,
    UNIT_AMPERE,
-    UNIT_CUBIC_METER_PER_HOUR,
-    UNIT_METER,
-    UNIT_REVOLUTIONS_PER_MINUTE,
    UNIT_VOLT,
    UNIT_WATT,
+    UNIT_METER,
+    UNIT_CUBIC_METER_PER_HOUR,
+    UNIT_REVOLUTIONS_PER_MINUTE,
 )

 alpha3_ns = cg.esphome_ns.namespace("alpha3")
--- a/esphome/components/am2315c/sensor.py
+++ b/esphome/components/am2315c/sensor.py
@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import i2c, sensor
 import esphome.config_validation as cv
+from esphome.components import i2c, sensor
 from esphome.const import (
    CONF_HUMIDITY,
    CONF_ID,
--- a/esphome/components/am2320/sensor.py
+++ b/esphome/components/am2320/sensor.py
@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import i2c, sensor
 import esphome.config_validation as cv
+from esphome.components import i2c, sensor
 from esphome.const import (
    CONF_HUMIDITY,
    CONF_ID,
--- a/esphome/components/am43/cover/init.py
+++ b/esphome/components/am43/cover/init.py
@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import ble_client, cover
 import esphome.config_validation as cv
+from esphome.components import cover, ble_client
 from esphome.const import CONF_ID, CONF_PIN

 CODEOWNERS = ["@buxtronix"]
--- a/esphome/components/am43/sensor/init.py
+++ b/esphome/components/am43/sensor/init.py
@@ -1,12 +1,12 @@
 import esphome.codegen as cg
-from esphome.components import ble_client, sensor
 import esphome.config_validation as cv
+from esphome.components import sensor, ble_client
 from esphome.const import (
-    CONF_BATTERY_LEVEL,
    CONF_ID,
-    CONF_ILLUMINANCE,
+    CONF_BATTERY_LEVEL,
    DEVICE_CLASS_BATTERY,
    ENTITY_CATEGORY_DIAGNOSTIC,
+    CONF_ILLUMINANCE,
    ICON_BRIGHTNESS_5,
    UNIT_PERCENT,
 )
--- a/esphome/components/analog_threshold/binary_sensor.py
+++ b/esphome/components/analog_threshold/binary_sensor.py
@@ -1,7 +1,10 @@
 import esphome.codegen as cg
-from esphome.components import binary_sensor, sensor
 import esphome.config_validation as cv
-from esphome.const import CONF_SENSOR_ID, CONF_THRESHOLD
+from esphome.components import binary_sensor, sensor
+from esphome.const import (
+    CONF_SENSOR_ID,
+    CONF_THRESHOLD,
+)

 analog_threshold_ns = cg.esphome_ns.namespace("analog_threshold")

--- a/esphome/components/animation/init.py
+++ b/esphome/components/animation/init.py
@@ -1,10 +1,28 @@
 import logging

-from esphome import automation
+from esphome import automation, core
 import esphome.codegen as cg
 import esphome.components.image as espImage
+from esphome.components.image import (
+    CONF_USE_TRANSPARENCY,
+    LOCAL_SCHEMA,
+    SOURCE_LOCAL,
+    SOURCE_WEB,
+    WEB_SCHEMA,
+)
 import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_REPEAT
+from esphome.const import (
+    CONF_FILE,
+    CONF_ID,
+    CONF_PATH,
+    CONF_RAW_DATA_ID,
+    CONF_REPEAT,
+    CONF_RESIZE,
+    CONF_SOURCE,
+    CONF_TYPE,
+    CONF_URL,
+)
+from esphome.core import CORE, HexInt

 _LOGGER = logging.getLogger(__name__)

@@ -12,7 +30,6 @@ AUTO_LOAD = ["image"]
 CODEOWNERS = ["@syndlex"]
 DEPENDENCIES = ["display"]
 MULTI_CONF = True
-MULTI_CONF_NO_DEFAULT = True

 CONF_LOOP = "loop"
 CONF_START_FRAME = "start_frame"
@@ -34,20 +51,87 @@ SetFrameAction = animation_ns.class_(
    "AnimationSetFrameAction", automation.Action, cg.Parented.template(Animation_)
 )

-CONFIG_SCHEMA = espImage.IMAGE_SCHEMA.extend(
+TYPED_FILE_SCHEMA = cv.typed_schema(
    {
-        cv.Required(CONF_ID): cv.declare_id(Animation_),
-        cv.Optional(CONF_LOOP): cv.All(
-            {
-                cv.Optional(CONF_START_FRAME, default=0): cv.positive_int,
-                cv.Optional(CONF_END_FRAME): cv.positive_int,
-                cv.Optional(CONF_REPEAT): cv.positive_int,
-            }
-        ),
+        SOURCE_LOCAL: LOCAL_SCHEMA,
+        SOURCE_WEB: WEB_SCHEMA,
    },
+    key=CONF_SOURCE,
 )


+def _file_schema(value):
+    if isinstance(value, str):
+        return validate_file_shorthand(value)
+    return TYPED_FILE_SCHEMA(value)
+
+
+FILE_SCHEMA = cv.Schema(_file_schema)
+
+
+def validate_file_shorthand(value):
+    value = cv.string_strict(value)
+    if value.startswith("http://") or value.startswith("https://"):
+        return FILE_SCHEMA(
+            {
+                CONF_SOURCE: SOURCE_WEB,
+                CONF_URL: value,
+            }
+        )
+    return FILE_SCHEMA(
+        {
+            CONF_SOURCE: SOURCE_LOCAL,
+            CONF_PATH: value,
+        }
+    )
+
+
+def validate_cross_dependencies(config):
+    """
+    Validate fields whose possible values depend on other fields.
+    For example, validate that explicitly transparent image types
+    have "use_transparency" set to True.
+    Also set the default value for those kind of dependent fields.
+    """
+    image_type = config[CONF_TYPE]
+    is_transparent_type = image_type in ["TRANSPARENT_BINARY", "RGBA"]
+    # If the use_transparency option was not specified, set the default depending on the image type
+    if CONF_USE_TRANSPARENCY not in config:
+        config[CONF_USE_TRANSPARENCY] = is_transparent_type
+
+    if is_transparent_type and not config[CONF_USE_TRANSPARENCY]:
+        raise cv.Invalid(f"Image type {image_type} must always be transparent.")
+
+    return config
+
+
+ANIMATION_SCHEMA = cv.Schema(
+    cv.All(
+        {
+            cv.Required(CONF_ID): cv.declare_id(Animation_),
+            cv.Required(CONF_FILE): FILE_SCHEMA,
+            cv.Optional(CONF_RESIZE): cv.dimensions,
+            cv.Optional(CONF_TYPE, default="BINARY"): cv.enum(
+                espImage.IMAGE_TYPE, upper=True
+            ),
+            # Not setting default here on purpose; the default depends on the image type,
+            # and thus will be set in the "validate_cross_dependencies" validator.
+            cv.Optional(CONF_USE_TRANSPARENCY): cv.boolean,
+            cv.Optional(CONF_LOOP): cv.All(
+                {
+                    cv.Optional(CONF_START_FRAME, default=0): cv.positive_int,
+                    cv.Optional(CONF_END_FRAME): cv.positive_int,
+                    cv.Optional(CONF_REPEAT): cv.positive_int,
+                }
+            ),
+            cv.GenerateID(CONF_RAW_DATA_ID): cv.declare_id(cg.uint8),
+        },
+        validate_cross_dependencies,
+    )
+)
+
+CONFIG_SCHEMA = ANIMATION_SCHEMA
+
 NEXT_FRAME_SCHEMA = automation.maybe_simple_id(
    {
        cv.GenerateID(): cv.use_id(Animation_),
@@ -80,26 +164,180 @@ async def animation_action_to_code(config, action_id, template_arg, args):


 async def to_code(config):
-    (
-        prog_arr,
-        width,
-        height,
-        image_type,
-        trans_value,
-        frame_count,
-    ) = await espImage.write_image(config, all_frames=True)
+    from PIL import Image

+    conf_file = config[CONF_FILE]
+    if conf_file[CONF_SOURCE] == SOURCE_LOCAL:
+        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:
+        raise core.EsphomeError(f"Could not load image file {path}: {e}")
+
+    width, height = image.size
+    frames = image.n_frames
+    if CONF_RESIZE in 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,
+        )
+
+    transparent = config[CONF_USE_TRANSPARENCY]
+
+    if config[CONF_TYPE] == "GRAYSCALE":
+        data = [0 for _ in range(height * width * frames)]
+        pos = 0
+        for frameIndex in range(frames):
+            image.seek(frameIndex)
+            frame = image.convert("LA", dither=Image.Dither.NONE)
+            if CONF_RESIZE in config:
+                frame = frame.resize([width, height])
+            pixels = list(frame.getdata())
+            if len(pixels) != height * width:
+                raise core.EsphomeError(
+                    f"Unexpected number of pixels in {path} frame {frameIndex}: ({len(pixels)} != {height * width})"
+                )
+            for pix, a in pixels:
+                if transparent:
+                    if pix == 1:
+                        pix = 0
+                    if a < 0x80:
+                        pix = 1
+
+                data[pos] = pix
+                pos += 1
+
+    elif config[CONF_TYPE] == "RGBA":
+        data = [0 for _ in range(height * width * 4 * frames)]
+        pos = 0
+        for frameIndex in range(frames):
+            image.seek(frameIndex)
+            frame = image.convert("RGBA")
+            if CONF_RESIZE in config:
+                frame = frame.resize([width, height])
+            pixels = list(frame.getdata())
+            if len(pixels) != height * width:
+                raise core.EsphomeError(
+                    f"Unexpected number of pixels in {path} frame {frameIndex}: ({len(pixels)} != {height * width})"
+                )
+            for pix in pixels:
+                data[pos] = pix[0]
+                pos += 1
+                data[pos] = pix[1]
+                pos += 1
+                data[pos] = pix[2]
+                pos += 1
+                data[pos] = pix[3]
+                pos += 1
+
+    elif config[CONF_TYPE] == "RGB24":
+        data = [0 for _ in range(height * width * 3 * frames)]
+        pos = 0
+        for frameIndex in range(frames):
+            image.seek(frameIndex)
+            frame = image.convert("RGBA")
+            if CONF_RESIZE in config:
+                frame = frame.resize([width, height])
+            pixels = list(frame.getdata())
+            if len(pixels) != height * width:
+                raise core.EsphomeError(
+                    f"Unexpected number of pixels in {path} frame {frameIndex}: ({len(pixels)} != {height * width})"
+                )
+            for r, g, b, a in pixels:
+                if transparent:
+                    if r == 0 and g == 0 and b == 1:
+                        b = 0
+                    if a < 0x80:
+                        r = 0
+                        g = 0
+                        b = 1
+
+                data[pos] = r
+                pos += 1
+                data[pos] = g
+                pos += 1
+                data[pos] = b
+                pos += 1
+
+    elif config[CONF_TYPE] in ["RGB565", "TRANSPARENT_IMAGE"]:
+        bytes_per_pixel = 3 if transparent else 2
+        data = [0 for _ in range(height * width * bytes_per_pixel * frames)]
+        pos = 0
+        for frameIndex in range(frames):
+            image.seek(frameIndex)
+            frame = image.convert("RGBA")
+            if CONF_RESIZE in config:
+                frame = frame.resize([width, height])
+            pixels = list(frame.getdata())
+            if len(pixels) != height * width:
+                raise core.EsphomeError(
+                    f"Unexpected number of pixels in {path} frame {frameIndex}: ({len(pixels)} != {height * width})"
+                )
+            for r, g, b, a in pixels:
+                R = r >> 3
+                G = g >> 2
+                B = b >> 3
+                rgb = (R << 11) | (G << 5) | B
+                data[pos] = rgb >> 8
+                pos += 1
+                data[pos] = rgb & 0xFF
+                pos += 1
+                if transparent:
+                    data[pos] = a
+                    pos += 1
+
+    elif config[CONF_TYPE] in ["BINARY", "TRANSPARENT_BINARY"]:
+        width8 = ((width + 7) // 8) * 8
+        data = [0 for _ in range((height * width8 // 8) * frames)]
+        for frameIndex in range(frames):
+            image.seek(frameIndex)
+            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])
+                if transparent:
+                    alpha = alpha.resize([width, height])
+            for x, y in [(i, j) for i in range(width) for j in range(height)]:
+                if transparent and has_alpha:
+                    if not alpha.getpixel((x, y)):
+                        continue
+                elif frame.getpixel((x, y)):
+                    continue
+
+                pos = x + y * width8 + (height * width8 * frameIndex)
+                data[pos // 8] |= 0x80 >> (pos % 8)
+    else:
+        raise core.EsphomeError(
+            f"Animation f{config[CONF_ID]} has not supported type {config[CONF_TYPE]}."
+        )
+
+    rhs = [HexInt(x) for x in data]
+    prog_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)
    var = cg.new_Pvariable(
        config[CONF_ID],
        prog_arr,
        width,
        height,
-        frame_count,
-        image_type,
-        trans_value,
+        frames,
+        espImage.IMAGE_TYPE[config[CONF_TYPE]],
    )
+    cg.add(var.set_transparency(transparent))
    if loop_config := config.get(CONF_LOOP):
        start = loop_config[CONF_START_FRAME]
-        end = loop_config.get(CONF_END_FRAME, frame_count)
+        end = loop_config.get(CONF_END_FRAME, frames)
        count = loop_config.get(CONF_REPEAT, -1)
        cg.add(var.set_loop(start, end, count))
--- a/esphome/components/animation/animation.cpp
+++ b/esphome/components/animation/animation.cpp
@@ -6,8 +6,8 @@ namespace esphome {
 namespace animation {

 Animation::Animation(const uint8_t *data_start, int width, int height, uint32_t animation_frame_count,
-                     image::ImageType type, image::Transparency transparent)
-    : Image(data_start, width, height, type, transparent),
+                     image::ImageType type)
+    : Image(data_start, width, height, type),
      animation_data_start_(data_start),
      current_frame_(0),
      animation_frame_count_(animation_frame_count),
--- a/esphome/components/animation/animation.h
+++ b/esphome/components/animation/animation.h
@@ -8,8 +8,7 @@ namespace animation {

 class Animation : public image::Image {
 public:
-  Animation(const uint8_t *data_start, int width, int height, uint32_t animation_frame_count, image::ImageType type,
-            image::Transparency transparent);
+  Animation(const uint8_t *data_start, int width, int height, uint32_t animation_frame_count, image::ImageType type);

  uint32_t get_animation_frame_count() const;
  int get_current_frame() const;
--- a/esphome/components/anova/climate.py
+++ b/esphome/components/anova/climate.py
@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import ble_client, climate
 import esphome.config_validation as cv
+from esphome.components import climate, ble_client
 from esphome.const import CONF_ID, CONF_UNIT_OF_MEASUREMENT

 UNITS = {
--- a/esphome/components/apds9306/sensor.py
+++ b/esphome/components/apds9306/sensor.py
@@ -2,8 +2,8 @@
 # https://www.mouser.ca/datasheet/2/678/AVGO_S_A0002854364_1-2574547.pdf

 import esphome.codegen as cg
-from esphome.components import i2c, sensor
 import esphome.config_validation as cv
+from esphome.components import i2c, sensor
 from esphome.const import (
    CONF_GAIN,
    DEVICE_CLASS_ILLUMINANCE,
--- a/esphome/components/apds9960/init.py
+++ b/esphome/components/apds9960/init.py
@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import i2c
 import esphome.config_validation as cv
+from esphome.components import i2c
 from esphome.const import CONF_ID

 DEPENDENCIES = ["i2c"]
--- a/esphome/components/apds9960/binary_sensor.py
+++ b/esphome/components/apds9960/binary_sensor.py
@@ -1,8 +1,7 @@
 import esphome.codegen as cg
-from esphome.components import binary_sensor
 import esphome.config_validation as cv
+from esphome.components import binary_sensor
 from esphome.const import CONF_DIRECTION, DEVICE_CLASS_MOVING
-
 from . import APDS9960, CONF_APDS9960_ID

 DEPENDENCIES = ["apds9960"]
--- a/esphome/components/apds9960/sensor.py
+++ b/esphome/components/apds9960/sensor.py
@@ -1,13 +1,12 @@
 import esphome.codegen as cg
-from esphome.components import sensor
 import esphome.config_validation as cv
+from esphome.components import sensor
 from esphome.const import (
    CONF_TYPE,
-    ICON_LIGHTBULB,
    STATE_CLASS_MEASUREMENT,
    UNIT_PERCENT,
+    ICON_LIGHTBULB,
 )
-
 from . import APDS9960, CONF_APDS9960_ID

 DEPENDENCIES = ["apds9960"]
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -213,6 +213,7 @@ message DeviceInfoResponse {
  // The esphome project details if set
  string project_name = 8;
  string project_version = 9;
+  string project_manufacturer = 18;

  uint32 webserver_port = 10;

@@ -227,9 +228,6 @@ message DeviceInfoResponse {
  uint32 voice_assistant_feature_flags = 17;

  string suggested_area = 16;
-
-  // The Bluetooth mac address of the device. For example "AC:BC:32:89:0E:AA"
-  string bluetooth_mac_address = 18;
 }

 message ListEntitiesRequest {
@@ -1384,7 +1382,6 @@ message BluetoothConnectionsFreeResponse {

  uint32 free = 1;
  uint32 limit = 2;
-  repeated uint64 allocated = 3;
 }

 message BluetoothGATTErrorResponse {
@@ -1567,8 +1564,6 @@ message VoiceAssistantAnnounceRequest {

  string media_id = 1;
  string text = 2;
-  string preannounce_media_id = 3;
-  bool start_conversation = 4;
 }

 message VoiceAssistantAnnounceFinished {
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -28,38 +28,8 @@ namespace api {
 static const char *const TAG = "api.connection";
 static const int ESP32_CAMERA_STOP_STREAM = 5000;

-// helper for allowing only unique entries in the queue
-void DeferredMessageQueue::dmq_push_back_with_dedup_(void *source, send_message_t *send_message) {
-  DeferredMessage item(source, send_message);
-
-  auto iter = std::find_if(this->deferred_queue_.begin(), this->deferred_queue_.end(),
-                           [&item](const DeferredMessage &test) -> bool { return test == item; });
-
-  if (iter != this->deferred_queue_.end()) {
-    (*iter) = item;
-  } else {
-    this->deferred_queue_.push_back(item);
-  }
-}
-
-void DeferredMessageQueue::process_queue() {
-  while (!deferred_queue_.empty()) {
-    DeferredMessage &de = deferred_queue_.front();
-    if (de.send_message_(this->api_connection_, de.source_)) {
-      // O(n) but memory efficiency is more important than speed here which is why std::vector was chosen
-      deferred_queue_.erase(deferred_queue_.begin());
-    } else {
-      break;
-    }
-  }
-}
-
-void DeferredMessageQueue::defer(void *source, send_message_t *send_message) {
-  this->dmq_push_back_with_dedup_(source, send_message);
-}
-
 APIConnection::APIConnection(std::unique_ptr<socket::Socket> sock, APIServer *parent)
-    : parent_(parent), deferred_message_queue_(this), initial_state_iterator_(this), list_entities_iterator_(this) {
+    : parent_(parent), initial_state_iterator_(this), list_entities_iterator_(this) {
  this->proto_write_buffer_.reserve(64);

 #if defined(USE_API_PLAINTEXT)
@@ -146,12 +116,8 @@ void APIConnection::loop() {
      return;
  }

-  this->deferred_message_queue_.process_queue();
-
-  if (!this->list_entities_iterator_.completed())
-    this->list_entities_iterator_.advance();
-  if (!this->initial_state_iterator_.completed() && this->list_entities_iterator_.completed())
-    this->initial_state_iterator_.advance();
+  this->list_entities_iterator_.advance();
+  this->initial_state_iterator_.advance();

  static uint32_t keepalive = 60000;
  static uint8_t max_ping_retries = 60;
@@ -244,31 +210,13 @@ bool APIConnection::send_binary_sensor_state(binary_sensor::BinarySensor *binary
  if (!this->state_subscription_)
    return false;

-  if (!APIConnection::try_send_binary_sensor_state(this, binary_sensor, state)) {
-    this->deferred_message_queue_.defer(binary_sensor, try_send_binary_sensor_state);
-  }
-
-  return true;
-}
-void APIConnection::send_binary_sensor_info(binary_sensor::BinarySensor *binary_sensor) {
-  if (!APIConnection::try_send_binary_sensor_info(this, binary_sensor)) {
-    this->deferred_message_queue_.defer(binary_sensor, try_send_binary_sensor_info);
-  }
-}
-bool APIConnection::try_send_binary_sensor_state(APIConnection *api, void *v_binary_sensor) {
-  binary_sensor::BinarySensor *binary_sensor = reinterpret_cast<binary_sensor::BinarySensor *>(v_binary_sensor);
-  return APIConnection::try_send_binary_sensor_state(api, binary_sensor, binary_sensor->state);
-}
-bool APIConnection::try_send_binary_sensor_state(APIConnection *api, binary_sensor::BinarySensor *binary_sensor,
-                                                 bool state) {
  BinarySensorStateResponse resp;
  resp.key = binary_sensor->get_object_id_hash();
  resp.state = state;
  resp.missing_state = !binary_sensor->has_state();
-  return api->send_binary_sensor_state_response(resp);
+  return this->send_binary_sensor_state_response(resp);
 }
-bool APIConnection::try_send_binary_sensor_info(APIConnection *api, void *v_binary_sensor) {
-  binary_sensor::BinarySensor *binary_sensor = reinterpret_cast<binary_sensor::BinarySensor *>(v_binary_sensor);
+bool APIConnection::send_binary_sensor_info(binary_sensor::BinarySensor *binary_sensor) {
  ListEntitiesBinarySensorResponse msg;
  msg.object_id = binary_sensor->get_object_id();
  msg.key = binary_sensor->get_object_id_hash();
@@ -280,7 +228,7 @@ bool APIConnection::try_send_binary_sensor_info(APIConnection *api, void *v_bina
  msg.disabled_by_default = binary_sensor->is_disabled_by_default();
  msg.icon = binary_sensor->get_icon();
  msg.entity_category = static_cast<enums::EntityCategory>(binary_sensor->get_entity_category());
-  return api->send_list_entities_binary_sensor_response(msg);
+  return this->send_list_entities_binary_sensor_response(msg);
 }
 #endif

@@ -289,19 +237,6 @@ bool APIConnection::send_cover_state(cover::Cover *cover) {
  if (!this->state_subscription_)
    return false;

-  if (!APIConnection::try_send_cover_state(this, cover)) {
-    this->deferred_message_queue_.defer(cover, try_send_cover_state);
-  }
-
-  return true;
-}
-void APIConnection::send_cover_info(cover::Cover *cover) {
-  if (!APIConnection::try_send_cover_info(this, cover)) {
-    this->deferred_message_queue_.defer(cover, try_send_cover_info);
-  }
-}
-bool APIConnection::try_send_cover_state(APIConnection *api, void *v_cover) {
-  cover::Cover *cover = reinterpret_cast<cover::Cover *>(v_cover);
  auto traits = cover->get_traits();
  CoverStateResponse resp{};
  resp.key = cover->get_object_id_hash();
@@ -311,10 +246,9 @@ bool APIConnection::try_send_cover_state(APIConnection *api, void *v_cover) {
  if (traits.get_supports_tilt())
    resp.tilt = cover->tilt;
  resp.current_operation = static_cast<enums::CoverOperation>(cover->current_operation);
-  return api->send_cover_state_response(resp);
+  return this->send_cover_state_response(resp);
 }
-bool APIConnection::try_send_cover_info(APIConnection *api, void *v_cover) {
-  cover::Cover *cover = reinterpret_cast<cover::Cover *>(v_cover);
+bool APIConnection::send_cover_info(cover::Cover *cover) {
  auto traits = cover->get_traits();
  ListEntitiesCoverResponse msg;
  msg.key = cover->get_object_id_hash();
@@ -330,7 +264,7 @@ bool APIConnection::try_send_cover_info(APIConnection *api, void *v_cover) {
  msg.disabled_by_default = cover->is_disabled_by_default();
  msg.icon = cover->get_icon();
  msg.entity_category = static_cast<enums::EntityCategory>(cover->get_entity_category());
-  return api->send_list_entities_cover_response(msg);
+  return this->send_list_entities_cover_response(msg);
 }
 void APIConnection::cover_command(const CoverCommandRequest &msg) {
  cover::Cover *cover = App.get_cover_by_key(msg.key);
@@ -366,19 +300,6 @@ bool APIConnection::send_fan_state(fan::Fan *fan) {
  if (!this->state_subscription_)
    return false;

-  if (!APIConnection::try_send_fan_state(this, fan)) {
-    this->deferred_message_queue_.defer(fan, try_send_fan_state);
-  }
-
-  return true;
-}
-void APIConnection::send_fan_info(fan::Fan *fan) {
-  if (!APIConnection::try_send_fan_info(this, fan)) {
-    this->deferred_message_queue_.defer(fan, try_send_fan_info);
-  }
-}
-bool APIConnection::try_send_fan_state(APIConnection *api, void *v_fan) {
-  fan::Fan *fan = reinterpret_cast<fan::Fan *>(v_fan);
  auto traits = fan->get_traits();
  FanStateResponse resp{};
  resp.key = fan->get_object_id_hash();
@@ -392,10 +313,9 @@ bool APIConnection::try_send_fan_state(APIConnection *api, void *v_fan) {
    resp.direction = static_cast<enums::FanDirection>(fan->direction);
  if (traits.supports_preset_modes())
    resp.preset_mode = fan->preset_mode;
-  return api->send_fan_state_response(resp);
+  return this->send_fan_state_response(resp);
 }
-bool APIConnection::try_send_fan_info(APIConnection *api, void *v_fan) {
-  fan::Fan *fan = reinterpret_cast<fan::Fan *>(v_fan);
+bool APIConnection::send_fan_info(fan::Fan *fan) {
  auto traits = fan->get_traits();
  ListEntitiesFanResponse msg;
  msg.key = fan->get_object_id_hash();
@@ -412,7 +332,7 @@ bool APIConnection::try_send_fan_info(APIConnection *api, void *v_fan) {
  msg.disabled_by_default = fan->is_disabled_by_default();
  msg.icon = fan->get_icon();
  msg.entity_category = static_cast<enums::EntityCategory>(fan->get_entity_category());
-  return api->send_list_entities_fan_response(msg);
+  return this->send_list_entities_fan_response(msg);
 }
 void APIConnection::fan_command(const FanCommandRequest &msg) {
  fan::Fan *fan = App.get_fan_by_key(msg.key);
@@ -441,19 +361,6 @@ bool APIConnection::send_light_state(light::LightState *light) {
  if (!this->state_subscription_)
    return false;

-  if (!APIConnection::try_send_light_state(this, light)) {
-    this->deferred_message_queue_.defer(light, try_send_light_state);
-  }
-
-  return true;
-}
-void APIConnection::send_light_info(light::LightState *light) {
-  if (!APIConnection::try_send_light_info(this, light)) {
-    this->deferred_message_queue_.defer(light, try_send_light_info);
-  }
-}
-bool APIConnection::try_send_light_state(APIConnection *api, void *v_light) {
-  light::LightState *light = reinterpret_cast<light::LightState *>(v_light);
  auto traits = light->get_traits();
  auto values = light->remote_values;
  auto color_mode = values.get_color_mode();
@@ -473,10 +380,9 @@ bool APIConnection::try_send_light_state(APIConnection *api, void *v_light) {
  resp.warm_white = values.get_warm_white();
  if (light->supports_effects())
    resp.effect = light->get_effect_name();
-  return api->send_light_state_response(resp);
+  return this->send_light_state_response(resp);
 }
-bool APIConnection::try_send_light_info(APIConnection *api, void *v_light) {
-  light::LightState *light = reinterpret_cast<light::LightState *>(v_light);
+bool APIConnection::send_light_info(light::LightState *light) {
  auto traits = light->get_traits();
  ListEntitiesLightResponse msg;
  msg.key = light->get_object_id_hash();
@@ -509,7 +415,7 @@ bool APIConnection::try_send_light_info(APIConnection *api, void *v_light) {
    for (auto *effect : light->get_effects())
      msg.effects.push_back(effect->get_name());
  }
-  return api->send_list_entities_light_response(msg);
+  return this->send_list_entities_light_response(msg);
 }
 void APIConnection::light_command(const LightCommandRequest &msg) {
  light::LightState *light = App.get_light_by_key(msg.key);
@@ -553,30 +459,13 @@ bool APIConnection::send_sensor_state(sensor::Sensor *sensor, float state) {
  if (!this->state_subscription_)
    return false;

-  if (!APIConnection::try_send_sensor_state(this, sensor, state)) {
-    this->deferred_message_queue_.defer(sensor, try_send_sensor_state);
-  }
-
-  return true;
-}
-void APIConnection::send_sensor_info(sensor::Sensor *sensor) {
-  if (!APIConnection::try_send_sensor_info(this, sensor)) {
-    this->deferred_message_queue_.defer(sensor, try_send_sensor_info);
-  }
-}
-bool APIConnection::try_send_sensor_state(APIConnection *api, void *v_sensor) {
-  sensor::Sensor *sensor = reinterpret_cast<sensor::Sensor *>(v_sensor);
-  return APIConnection::try_send_sensor_state(api, sensor, sensor->state);
-}
-bool APIConnection::try_send_sensor_state(APIConnection *api, sensor::Sensor *sensor, float state) {
  SensorStateResponse resp{};
  resp.key = sensor->get_object_id_hash();
  resp.state = state;
  resp.missing_state = !sensor->has_state();
-  return api->send_sensor_state_response(resp);
+  return this->send_sensor_state_response(resp);
 }
-bool APIConnection::try_send_sensor_info(APIConnection *api, void *v_sensor) {
-  sensor::Sensor *sensor = reinterpret_cast<sensor::Sensor *>(v_sensor);
+bool APIConnection::send_sensor_info(sensor::Sensor *sensor) {
  ListEntitiesSensorResponse msg;
  msg.key = sensor->get_object_id_hash();
  msg.object_id = sensor->get_object_id();
@@ -593,7 +482,7 @@ bool APIConnection::try_send_sensor_info(APIConnection *api, void *v_sensor) {
  msg.state_class = static_cast<enums::SensorStateClass>(sensor->get_state_class());
  msg.disabled_by_default = sensor->is_disabled_by_default();
  msg.entity_category = static_cast<enums::EntityCategory>(sensor->get_entity_category());
-  return api->send_list_entities_sensor_response(msg);
+  return this->send_list_entities_sensor_response(msg);
 }
 #endif

@@ -602,29 +491,12 @@ bool APIConnection::send_switch_state(switch_::Switch *a_switch, bool state) {
  if (!this->state_subscription_)
    return false;

-  if (!APIConnection::try_send_switch_state(this, a_switch, state)) {
-    this->deferred_message_queue_.defer(a_switch, try_send_switch_state);
-  }
-
-  return true;
-}
-void APIConnection::send_switch_info(switch_::Switch *a_switch) {
-  if (!APIConnection::try_send_switch_info(this, a_switch)) {
-    this->deferred_message_queue_.defer(a_switch, try_send_switch_info);
-  }
-}
-bool APIConnection::try_send_switch_state(APIConnection *api, void *v_a_switch) {
-  switch_::Switch *a_switch = reinterpret_cast<switch_::Switch *>(v_a_switch);
-  return APIConnection::try_send_switch_state(api, a_switch, a_switch->state);
-}
-bool APIConnection::try_send_switch_state(APIConnection *api, switch_::Switch *a_switch, bool state) {
  SwitchStateResponse resp{};
  resp.key = a_switch->get_object_id_hash();
  resp.state = state;
-  return api->send_switch_state_response(resp);
+  return this->send_switch_state_response(resp);
 }
-bool APIConnection::try_send_switch_info(APIConnection *api, void *v_a_switch) {
-  switch_::Switch *a_switch = reinterpret_cast<switch_::Switch *>(v_a_switch);
+bool APIConnection::send_switch_info(switch_::Switch *a_switch) {
  ListEntitiesSwitchResponse msg;
  msg.key = a_switch->get_object_id_hash();
  msg.object_id = a_switch->get_object_id();
@@ -636,7 +508,7 @@ bool APIConnection::try_send_switch_info(APIConnection *api, void *v_a_switch) {
  msg.disabled_by_default = a_switch->is_disabled_by_default();
  msg.entity_category = static_cast<enums::EntityCategory>(a_switch->get_entity_category());
  msg.device_class = a_switch->get_device_class();
-  return api->send_list_entities_switch_response(msg);
+  return this->send_list_entities_switch_response(msg);
 }
 void APIConnection::switch_command(const SwitchCommandRequest &msg) {
  switch_::Switch *a_switch = App.get_switch_by_key(msg.key);
@@ -656,31 +528,13 @@ bool APIConnection::send_text_sensor_state(text_sensor::TextSensor *text_sensor,
  if (!this->state_subscription_)
    return false;

-  if (!APIConnection::try_send_text_sensor_state(this, text_sensor, std::move(state))) {
-    this->deferred_message_queue_.defer(text_sensor, try_send_text_sensor_state);
-  }
-
-  return true;
-}
-void APIConnection::send_text_sensor_info(text_sensor::TextSensor *text_sensor) {
-  if (!APIConnection::try_send_text_sensor_info(this, text_sensor)) {
-    this->deferred_message_queue_.defer(text_sensor, try_send_text_sensor_info);
-  }
-}
-bool APIConnection::try_send_text_sensor_state(APIConnection *api, void *v_text_sensor) {
-  text_sensor::TextSensor *text_sensor = reinterpret_cast<text_sensor::TextSensor *>(v_text_sensor);
-  return APIConnection::try_send_text_sensor_state(api, text_sensor, text_sensor->state);
-}
-bool APIConnection::try_send_text_sensor_state(APIConnection *api, text_sensor::TextSensor *text_sensor,
-                                               std::string state) {
  TextSensorStateResponse resp{};
  resp.key = text_sensor->get_object_id_hash();
  resp.state = std::move(state);
  resp.missing_state = !text_sensor->has_state();
-  return api->send_text_sensor_state_response(resp);
+  return this->send_text_sensor_state_response(resp);
 }
-bool APIConnection::try_send_text_sensor_info(APIConnection *api, void *v_text_sensor) {
-  text_sensor::TextSensor *text_sensor = reinterpret_cast<text_sensor::TextSensor *>(v_text_sensor);
+bool APIConnection::send_text_sensor_info(text_sensor::TextSensor *text_sensor) {
  ListEntitiesTextSensorResponse msg;
  msg.key = text_sensor->get_object_id_hash();
  msg.object_id = text_sensor->get_object_id();
@@ -692,7 +546,7 @@ bool APIConnection::try_send_text_sensor_info(APIConnection *api, void *v_text_s
  msg.disabled_by_default = text_sensor->is_disabled_by_default();
  msg.entity_category = static_cast<enums::EntityCategory>(text_sensor->get_entity_category());
  msg.device_class = text_sensor->get_device_class();
-  return api->send_list_entities_text_sensor_response(msg);
+  return this->send_list_entities_text_sensor_response(msg);
 }
 #endif

@@ -701,19 +555,6 @@ bool APIConnection::send_climate_state(climate::Climate *climate) {
  if (!this->state_subscription_)
    return false;

-  if (!APIConnection::try_send_climate_state(this, climate)) {
-    this->deferred_message_queue_.defer(climate, try_send_climate_state);
-  }
-
-  return true;
-}
-void APIConnection::send_climate_info(climate::Climate *climate) {
-  if (!APIConnection::try_send_climate_info(this, climate)) {
-    this->deferred_message_queue_.defer(climate, try_send_climate_info);
-  }
-}
-bool APIConnection::try_send_climate_state(APIConnection *api, void *v_climate) {
-  climate::Climate *climate = reinterpret_cast<climate::Climate *>(v_climate);
  auto traits = climate->get_traits();
  ClimateStateResponse resp{};
  resp.key = climate->get_object_id_hash();
@@ -742,10 +583,9 @@ bool APIConnection::try_send_climate_state(APIConnection *api, void *v_climate)
    resp.current_humidity = climate->current_humidity;
  if (traits.get_supports_target_humidity())
    resp.target_humidity = climate->target_humidity;
-  return api->send_climate_state_response(resp);
+  return this->send_climate_state_response(resp);
 }
-bool APIConnection::try_send_climate_info(APIConnection *api, void *v_climate) {
-  climate::Climate *climate = reinterpret_cast<climate::Climate *>(v_climate);
+bool APIConnection::send_climate_info(climate::Climate *climate) {
  auto traits = climate->get_traits();
  ListEntitiesClimateResponse msg;
  msg.key = climate->get_object_id_hash();
@@ -786,7 +626,7 @@ bool APIConnection::try_send_climate_info(APIConnection *api, void *v_climate) {
    msg.supported_custom_presets.push_back(custom_preset);
  for (auto swing_mode : traits.get_supported_swing_modes())
    msg.supported_swing_modes.push_back(static_cast<enums::ClimateSwingMode>(swing_mode));
-  return api->send_list_entities_climate_response(msg);
+  return this->send_list_entities_climate_response(msg);
 }
 void APIConnection::climate_command(const ClimateCommandRequest &msg) {
  climate::Climate *climate = App.get_climate_by_key(msg.key);
@@ -823,30 +663,13 @@ bool APIConnection::send_number_state(number::Number *number, float state) {
  if (!this->state_subscription_)
    return false;

-  if (!APIConnection::try_send_number_state(this, number, state)) {
-    this->deferred_message_queue_.defer(number, try_send_number_state);
-  }
-
-  return true;
-}
-void APIConnection::send_number_info(number::Number *number) {
-  if (!APIConnection::try_send_number_info(this, number)) {
-    this->deferred_message_queue_.defer(number, try_send_number_info);
-  }
-}
-bool APIConnection::try_send_number_state(APIConnection *api, void *v_number) {
-  number::Number *number = reinterpret_cast<number::Number *>(v_number);
-  return APIConnection::try_send_number_state(api, number, number->state);
-}
-bool APIConnection::try_send_number_state(APIConnection *api, number::Number *number, float state) {
  NumberStateResponse resp{};
  resp.key = number->get_object_id_hash();
  resp.state = state;
  resp.missing_state = !number->has_state();
-  return api->send_number_state_response(resp);
+  return this->send_number_state_response(resp);
 }
-bool APIConnection::try_send_number_info(APIConnection *api, void *v_number) {
-  number::Number *number = reinterpret_cast<number::Number *>(v_number);
+bool APIConnection::send_number_info(number::Number *number) {
  ListEntitiesNumberResponse msg;
  msg.key = number->get_object_id_hash();
  msg.object_id = number->get_object_id();
@@ -864,7 +687,7 @@ bool APIConnection::try_send_number_info(APIConnection *api, void *v_number) {
  msg.max_value = number->traits.get_max_value();
  msg.step = number->traits.get_step();

-  return api->send_list_entities_number_response(msg);
+  return this->send_list_entities_number_response(msg);
 }
 void APIConnection::number_command(const NumberCommandRequest &msg) {
  number::Number *number = App.get_number_by_key(msg.key);
@@ -882,29 +705,15 @@ bool APIConnection::send_date_state(datetime::DateEntity *date) {
  if (!this->state_subscription_)
    return false;

-  if (!APIConnection::try_send_date_state(this, date)) {
-    this->deferred_message_queue_.defer(date, try_send_date_state);
-  }
-
-  return true;
-}
-void APIConnection::send_date_info(datetime::DateEntity *date) {
-  if (!APIConnection::try_send_date_info(this, date)) {
-    this->deferred_message_queue_.defer(date, try_send_date_info);
-  }
-}
-bool APIConnection::try_send_date_state(APIConnection *api, void *v_date) {
-  datetime::DateEntity *date = reinterpret_cast<datetime::DateEntity *>(v_date);
  DateStateResponse resp{};
  resp.key = date->get_object_id_hash();
  resp.missing_state = !date->has_state();
  resp.year = date->year;
  resp.month = date->month;
  resp.day = date->day;
-  return api->send_date_state_response(resp);
+  return this->send_date_state_response(resp);
 }
-bool APIConnection::try_send_date_info(APIConnection *api, void *v_date) {
-  datetime::DateEntity *date = reinterpret_cast<datetime::DateEntity *>(v_date);
+bool APIConnection::send_date_info(datetime::DateEntity *date) {
  ListEntitiesDateResponse msg;
  msg.key = date->get_object_id_hash();
  msg.object_id = date->get_object_id();
@@ -915,7 +724,7 @@ bool APIConnection::try_send_date_info(APIConnection *api, void *v_date) {
  msg.disabled_by_default = date->is_disabled_by_default();
  msg.entity_category = static_cast<enums::EntityCategory>(date->get_entity_category());

-  return api->send_list_entities_date_response(msg);
+  return this->send_list_entities_date_response(msg);
 }
 void APIConnection::date_command(const DateCommandRequest &msg) {
  datetime::DateEntity *date = App.get_date_by_key(msg.key);
@@ -933,29 +742,15 @@ bool APIConnection::send_time_state(datetime::TimeEntity *time) {
  if (!this->state_subscription_)
    return false;

-  if (!APIConnection::try_send_time_state(this, time)) {
-    this->deferred_message_queue_.defer(time, try_send_time_state);
-  }
-
-  return true;
-}
-void APIConnection::send_time_info(datetime::TimeEntity *time) {
-  if (!APIConnection::try_send_time_info(this, time)) {
-    this->deferred_message_queue_.defer(time, try_send_time_info);
-  }
-}
-bool APIConnection::try_send_time_state(APIConnection *api, void *v_time) {
-  datetime::TimeEntity *time = reinterpret_cast<datetime::TimeEntity *>(v_time);
  TimeStateResponse resp{};
  resp.key = time->get_object_id_hash();
  resp.missing_state = !time->has_state();
  resp.hour = time->hour;
  resp.minute = time->minute;
  resp.second = time->second;
-  return api->send_time_state_response(resp);
+  return this->send_time_state_response(resp);
 }
-bool APIConnection::try_send_time_info(APIConnection *api, void *v_time) {
-  datetime::TimeEntity *time = reinterpret_cast<datetime::TimeEntity *>(v_time);
+bool APIConnection::send_time_info(datetime::TimeEntity *time) {
  ListEntitiesTimeResponse msg;
  msg.key = time->get_object_id_hash();
  msg.object_id = time->get_object_id();
@@ -966,7 +761,7 @@ bool APIConnection::try_send_time_info(APIConnection *api, void *v_time) {
  msg.disabled_by_default = time->is_disabled_by_default();
  msg.entity_category = static_cast<enums::EntityCategory>(time->get_entity_category());

-  return api->send_list_entities_time_response(msg);
+  return this->send_list_entities_time_response(msg);
 }
 void APIConnection::time_command(const TimeCommandRequest &msg) {
  datetime::TimeEntity *time = App.get_time_by_key(msg.key);
@@ -984,19 +779,6 @@ bool APIConnection::send_datetime_state(datetime::DateTimeEntity *datetime) {
  if (!this->state_subscription_)
    return false;

-  if (!APIConnection::try_send_datetime_state(this, datetime)) {
-    this->deferred_message_queue_.defer(datetime, try_send_datetime_state);
-  }
-
-  return true;
-}
-void APIConnection::send_datetime_info(datetime::DateTimeEntity *datetime) {
-  if (!APIConnection::try_send_datetime_info(this, datetime)) {
-    this->deferred_message_queue_.defer(datetime, try_send_datetime_info);
-  }
-}
-bool APIConnection::try_send_datetime_state(APIConnection *api, void *v_datetime) {
-  datetime::DateTimeEntity *datetime = reinterpret_cast<datetime::DateTimeEntity *>(v_datetime);
  DateTimeStateResponse resp{};
  resp.key = datetime->get_object_id_hash();
  resp.missing_state = !datetime->has_state();
@@ -1004,10 +786,9 @@ bool APIConnection::try_send_datetime_state(APIConnection *api, void *v_datetime
    ESPTime state = datetime->state_as_esptime();
    resp.epoch_seconds = state.timestamp;
  }
-  return api->send_date_time_state_response(resp);
+  return this->send_date_time_state_response(resp);
 }
-bool APIConnection::try_send_datetime_info(APIConnection *api, void *v_datetime) {
-  datetime::DateTimeEntity *datetime = reinterpret_cast<datetime::DateTimeEntity *>(v_datetime);
+bool APIConnection::send_datetime_info(datetime::DateTimeEntity *datetime) {
  ListEntitiesDateTimeResponse msg;
  msg.key = datetime->get_object_id_hash();
  msg.object_id = datetime->get_object_id();
@@ -1018,7 +799,7 @@ bool APIConnection::try_send_datetime_info(APIConnection *api, void *v_datetime)
  msg.disabled_by_default = datetime->is_disabled_by_default();
  msg.entity_category = static_cast<enums::EntityCategory>(datetime->get_entity_category());

-  return api->send_list_entities_date_time_response(msg);
+  return this->send_list_entities_date_time_response(msg);
 }
 void APIConnection::datetime_command(const DateTimeCommandRequest &msg) {
  datetime::DateTimeEntity *datetime = App.get_datetime_by_key(msg.key);
@@ -1036,30 +817,13 @@ bool APIConnection::send_text_state(text::Text *text, std::string state) {
  if (!this->state_subscription_)
    return false;

-  if (!APIConnection::try_send_text_state(this, text, std::move(state))) {
-    this->deferred_message_queue_.defer(text, try_send_text_state);
-  }
-
-  return true;
-}
-void APIConnection::send_text_info(text::Text *text) {
-  if (!APIConnection::try_send_text_info(this, text)) {
-    this->deferred_message_queue_.defer(text, try_send_text_info);
-  }
-}
-bool APIConnection::try_send_text_state(APIConnection *api, void *v_text) {
-  text::Text *text = reinterpret_cast<text::Text *>(v_text);
-  return APIConnection::try_send_text_state(api, text, text->state);
-}
-bool APIConnection::try_send_text_state(APIConnection *api, text::Text *text, std::string state) {
  TextStateResponse resp{};
  resp.key = text->get_object_id_hash();
  resp.state = std::move(state);
  resp.missing_state = !text->has_state();
-  return api->send_text_state_response(resp);
+  return this->send_text_state_response(resp);
 }
-bool APIConnection::try_send_text_info(APIConnection *api, void *v_text) {
-  text::Text *text = reinterpret_cast<text::Text *>(v_text);
+bool APIConnection::send_text_info(text::Text *text) {
  ListEntitiesTextResponse msg;
  msg.key = text->get_object_id_hash();
  msg.object_id = text->get_object_id();
@@ -1073,7 +837,7 @@ bool APIConnection::try_send_text_info(APIConnection *api, void *v_text) {
  msg.max_length = text->traits.get_max_length();
  msg.pattern = text->traits.get_pattern();

-  return api->send_list_entities_text_response(msg);
+  return this->send_list_entities_text_response(msg);
 }
 void APIConnection::text_command(const TextCommandRequest &msg) {
  text::Text *text = App.get_text_by_key(msg.key);
@@ -1091,30 +855,13 @@ bool APIConnection::send_select_state(select::Select *select, std::string state)
  if (!this->state_subscription_)
    return false;

-  if (!APIConnection::try_send_select_state(this, select, std::move(state))) {
-    this->deferred_message_queue_.defer(select, try_send_select_state);
-  }
-
-  return true;
-}
-void APIConnection::send_select_info(select::Select *select) {
-  if (!APIConnection::try_send_select_info(this, select)) {
-    this->deferred_message_queue_.defer(select, try_send_select_info);
-  }
-}
-bool APIConnection::try_send_select_state(APIConnection *api, void *v_select) {
-  select::Select *select = reinterpret_cast<select::Select *>(v_select);
-  return APIConnection::try_send_select_state(api, select, select->state);
-}
-bool APIConnection::try_send_select_state(APIConnection *api, select::Select *select, std::string state) {
  SelectStateResponse resp{};
  resp.key = select->get_object_id_hash();
  resp.state = std::move(state);
  resp.missing_state = !select->has_state();
-  return api->send_select_state_response(resp);
+  return this->send_select_state_response(resp);
 }
-bool APIConnection::try_send_select_info(APIConnection *api, void *v_select) {
-  select::Select *select = reinterpret_cast<select::Select *>(v_select);
+bool APIConnection::send_select_info(select::Select *select) {
  ListEntitiesSelectResponse msg;
  msg.key = select->get_object_id_hash();
  msg.object_id = select->get_object_id();
@@ -1128,7 +875,7 @@ bool APIConnection::try_send_select_info(APIConnection *api, void *v_select) {
  for (const auto &option : select->traits.get_options())
    msg.options.push_back(option);

-  return api->send_list_entities_select_response(msg);
+  return this->send_list_entities_select_response(msg);
 }
 void APIConnection::select_command(const SelectCommandRequest &msg) {
  select::Select *select = App.get_select_by_key(msg.key);
@@ -1142,13 +889,7 @@ void APIConnection::select_command(const SelectCommandRequest &msg) {
 #endif

 #ifdef USE_BUTTON
-void APIConnection::send_button_info(button::Button *button) {
-  if (!APIConnection::try_send_button_info(this, button)) {
-    this->deferred_message_queue_.defer(button, try_send_button_info);
-  }
-}
-bool APIConnection::try_send_button_info(APIConnection *api, void *v_button) {
-  button::Button *button = reinterpret_cast<button::Button *>(v_button);
+bool APIConnection::send_button_info(button::Button *button) {
  ListEntitiesButtonResponse msg;
  msg.key = button->get_object_id_hash();
  msg.object_id = button->get_object_id();
@@ -1159,7 +900,7 @@ bool APIConnection::try_send_button_info(APIConnection *api, void *v_button) {
  msg.disabled_by_default = button->is_disabled_by_default();
  msg.entity_category = static_cast<enums::EntityCategory>(button->get_entity_category());
  msg.device_class = button->get_device_class();
-  return api->send_list_entities_button_response(msg);
+  return this->send_list_entities_button_response(msg);
 }
 void APIConnection::button_command(const ButtonCommandRequest &msg) {
  button::Button *button = App.get_button_by_key(msg.key);
@@ -1175,29 +916,12 @@ bool APIConnection::send_lock_state(lock::Lock *a_lock, lock::LockState state) {
  if (!this->state_subscription_)
    return false;

-  if (!APIConnection::try_send_lock_state(this, a_lock, state)) {
-    this->deferred_message_queue_.defer(a_lock, try_send_lock_state);
-  }
-
-  return true;
-}
-void APIConnection::send_lock_info(lock::Lock *a_lock) {
-  if (!APIConnection::try_send_lock_info(this, a_lock)) {
-    this->deferred_message_queue_.defer(a_lock, try_send_lock_info);
-  }
-}
-bool APIConnection::try_send_lock_state(APIConnection *api, void *v_a_lock) {
-  lock::Lock *a_lock = reinterpret_cast<lock::Lock *>(v_a_lock);
-  return APIConnection::try_send_lock_state(api, a_lock, a_lock->state);
-}
-bool APIConnection::try_send_lock_state(APIConnection *api, lock::Lock *a_lock, lock::LockState state) {
  LockStateResponse resp{};
  resp.key = a_lock->get_object_id_hash();
  resp.state = static_cast<enums::LockState>(state);
-  return api->send_lock_state_response(resp);
+  return this->send_lock_state_response(resp);
 }
-bool APIConnection::try_send_lock_info(APIConnection *api, void *v_a_lock) {
-  lock::Lock *a_lock = reinterpret_cast<lock::Lock *>(v_a_lock);
+bool APIConnection::send_lock_info(lock::Lock *a_lock) {
  ListEntitiesLockResponse msg;
  msg.key = a_lock->get_object_id_hash();
  msg.object_id = a_lock->get_object_id();
@@ -1210,7 +934,7 @@ bool APIConnection::try_send_lock_info(APIConnection *api, void *v_a_lock) {
  msg.entity_category = static_cast<enums::EntityCategory>(a_lock->get_entity_category());
  msg.supports_open = a_lock->traits.get_supports_open();
  msg.requires_code = a_lock->traits.get_requires_code();
-  return api->send_list_entities_lock_response(msg);
+  return this->send_list_entities_lock_response(msg);
 }
 void APIConnection::lock_command(const LockCommandRequest &msg) {
  lock::Lock *a_lock = App.get_lock_by_key(msg.key);
@@ -1236,27 +960,13 @@ bool APIConnection::send_valve_state(valve::Valve *valve) {
  if (!this->state_subscription_)
    return false;

-  if (!APIConnection::try_send_valve_state(this, valve)) {
-    this->deferred_message_queue_.defer(valve, try_send_valve_state);
-  }
-
-  return true;
-}
-void APIConnection::send_valve_info(valve::Valve *valve) {
-  if (!APIConnection::try_send_valve_info(this, valve)) {
-    this->deferred_message_queue_.defer(valve, try_send_valve_info);
-  }
-}
-bool APIConnection::try_send_valve_state(APIConnection *api, void *v_valve) {
-  valve::Valve *valve = reinterpret_cast<valve::Valve *>(v_valve);
  ValveStateResponse resp{};
  resp.key = valve->get_object_id_hash();
  resp.position = valve->position;
  resp.current_operation = static_cast<enums::ValveOperation>(valve->current_operation);
-  return api->send_valve_state_response(resp);
+  return this->send_valve_state_response(resp);
 }
-bool APIConnection::try_send_valve_info(APIConnection *api, void *v_valve) {
-  valve::Valve *valve = reinterpret_cast<valve::Valve *>(v_valve);
+bool APIConnection::send_valve_info(valve::Valve *valve) {
  auto traits = valve->get_traits();
  ListEntitiesValveResponse msg;
  msg.key = valve->get_object_id_hash();
@@ -1271,7 +981,7 @@ bool APIConnection::try_send_valve_info(APIConnection *api, void *v_valve) {
  msg.assumed_state = traits.get_is_assumed_state();
  msg.supports_position = traits.get_supports_position();
  msg.supports_stop = traits.get_supports_stop();
-  return api->send_list_entities_valve_response(msg);
+  return this->send_list_entities_valve_response(msg);
 }
 void APIConnection::valve_command(const ValveCommandRequest &msg) {
  valve::Valve *valve = App.get_valve_by_key(msg.key);
@@ -1292,19 +1002,6 @@ bool APIConnection::send_media_player_state(media_player::MediaPlayer *media_pla
  if (!this->state_subscription_)
    return false;

-  if (!APIConnection::try_send_media_player_state(this, media_player)) {
-    this->deferred_message_queue_.defer(media_player, try_send_media_player_state);
-  }
-
-  return true;
-}
-void APIConnection::send_media_player_info(media_player::MediaPlayer *media_player) {
-  if (!APIConnection::try_send_media_player_info(this, media_player)) {
-    this->deferred_message_queue_.defer(media_player, try_send_media_player_info);
-  }
-}
-bool APIConnection::try_send_media_player_state(APIConnection *api, void *v_media_player) {
-  media_player::MediaPlayer *media_player = reinterpret_cast<media_player::MediaPlayer *>(v_media_player);
  MediaPlayerStateResponse resp{};
  resp.key = media_player->get_object_id_hash();

@@ -1314,10 +1011,9 @@ bool APIConnection::try_send_media_player_state(APIConnection *api, void *v_medi
  resp.state = static_cast<enums::MediaPlayerState>(report_state);
  resp.volume = media_player->volume;
  resp.muted = media_player->is_muted();
-  return api->send_media_player_state_response(resp);
+  return this->send_media_player_state_response(resp);
 }
-bool APIConnection::try_send_media_player_info(APIConnection *api, void *v_media_player) {
-  media_player::MediaPlayer *media_player = reinterpret_cast<media_player::MediaPlayer *>(v_media_player);
+bool APIConnection::send_media_player_info(media_player::MediaPlayer *media_player) {
  ListEntitiesMediaPlayerResponse msg;
  msg.key = media_player->get_object_id_hash();
  msg.object_id = media_player->get_object_id();
@@ -1341,7 +1037,7 @@ bool APIConnection::try_send_media_player_info(APIConnection *api, void *v_media
    msg.supported_formats.push_back(media_format);
  }

-  return api->send_list_entities_media_player_response(msg);
+  return this->send_list_entities_media_player_response(msg);
 }
 void APIConnection::media_player_command(const MediaPlayerCommandRequest &msg) {
  media_player::MediaPlayer *media_player = App.get_media_player_by_key(msg.key);
@@ -1366,7 +1062,7 @@ void APIConnection::media_player_command(const MediaPlayerCommandRequest &msg) {
 #endif

 #ifdef USE_ESP32_CAMERA
-void APIConnection::set_camera_state(std::shared_ptr<esp32_camera::CameraImage> image) {
+void APIConnection::send_camera_state(std::shared_ptr<esp32_camera::CameraImage> image) {
  if (!this->state_subscription_)
    return;
  if (this->image_reader_.available())
@@ -1375,13 +1071,7 @@ void APIConnection::set_camera_state(std::shared_ptr<esp32_camera::CameraImage>
      image->was_requested_by(esphome::esp32_camera::IDLE))
    this->image_reader_.set_image(std::move(image));
 }
-void APIConnection::send_camera_info(esp32_camera::ESP32Camera *camera) {
-  if (!APIConnection::try_send_camera_info(this, camera)) {
-    this->deferred_message_queue_.defer(camera, try_send_camera_info);
-  }
-}
-bool APIConnection::try_send_camera_info(APIConnection *api, void *v_camera) {
-  esp32_camera::ESP32Camera *camera = reinterpret_cast<esp32_camera::ESP32Camera *>(v_camera);
+bool APIConnection::send_camera_info(esp32_camera::ESP32Camera *camera) {
  ListEntitiesCameraResponse msg;
  msg.key = camera->get_object_id_hash();
  msg.object_id = camera->get_object_id();
@@ -1391,7 +1081,7 @@ bool APIConnection::try_send_camera_info(APIConnection *api, void *v_camera) {
  msg.disabled_by_default = camera->is_disabled_by_default();
  msg.icon = camera->get_icon();
  msg.entity_category = static_cast<enums::EntityCategory>(camera->get_entity_category());
-  return api->send_list_entities_camera_response(msg);
+  return this->send_list_entities_camera_response(msg);
 }
 void APIConnection::camera_image(const CameraImageRequest &msg) {
  if (esp32_camera::global_esp32_camera == nullptr)
@@ -1578,28 +1268,12 @@ bool APIConnection::send_alarm_control_panel_state(alarm_control_panel::AlarmCon
  if (!this->state_subscription_)
    return false;

-  if (!APIConnection::try_send_alarm_control_panel_state(this, a_alarm_control_panel)) {
-    this->deferred_message_queue_.defer(a_alarm_control_panel, try_send_alarm_control_panel_state);
-  }
-
-  return true;
-}
-void APIConnection::send_alarm_control_panel_info(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel) {
-  if (!APIConnection::try_send_alarm_control_panel_info(this, a_alarm_control_panel)) {
-    this->deferred_message_queue_.defer(a_alarm_control_panel, try_send_alarm_control_panel_info);
-  }
-}
-bool APIConnection::try_send_alarm_control_panel_state(APIConnection *api, void *v_a_alarm_control_panel) {
-  alarm_control_panel::AlarmControlPanel *a_alarm_control_panel =
-      reinterpret_cast<alarm_control_panel::AlarmControlPanel *>(v_a_alarm_control_panel);
  AlarmControlPanelStateResponse resp{};
  resp.key = a_alarm_control_panel->get_object_id_hash();
  resp.state = static_cast<enums::AlarmControlPanelState>(a_alarm_control_panel->get_state());
-  return api->send_alarm_control_panel_state_response(resp);
+  return this->send_alarm_control_panel_state_response(resp);
 }
-bool APIConnection::try_send_alarm_control_panel_info(APIConnection *api, void *v_a_alarm_control_panel) {
-  alarm_control_panel::AlarmControlPanel *a_alarm_control_panel =
-      reinterpret_cast<alarm_control_panel::AlarmControlPanel *>(v_a_alarm_control_panel);
+bool APIConnection::send_alarm_control_panel_info(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel) {
  ListEntitiesAlarmControlPanelResponse msg;
  msg.key = a_alarm_control_panel->get_object_id_hash();
  msg.object_id = a_alarm_control_panel->get_object_id();
@@ -1611,7 +1285,7 @@ bool APIConnection::try_send_alarm_control_panel_info(APIConnection *api, void *
  msg.supported_features = a_alarm_control_panel->get_supported_features();
  msg.requires_code = a_alarm_control_panel->get_requires_code();
  msg.requires_code_to_arm = a_alarm_control_panel->get_requires_code_to_arm();
-  return api->send_list_entities_alarm_control_panel_response(msg);
+  return this->send_list_entities_alarm_control_panel_response(msg);
 }
 void APIConnection::alarm_control_panel_command(const AlarmControlPanelCommandRequest &msg) {
  alarm_control_panel::AlarmControlPanel *a_alarm_control_panel = App.get_alarm_control_panel_by_key(msg.key);
@@ -1648,28 +1322,13 @@ void APIConnection::alarm_control_panel_command(const AlarmControlPanelCommandRe
 #endif

 #ifdef USE_EVENT
-void APIConnection::send_event(event::Event *event, std::string event_type) {
-  if (!APIConnection::try_send_event(this, event, std::move(event_type))) {
-    this->deferred_message_queue_.defer(event, try_send_event);
-  }
-}
-void APIConnection::send_event_info(event::Event *event) {
-  if (!APIConnection::try_send_event_info(this, event)) {
-    this->deferred_message_queue_.defer(event, try_send_event_info);
-  }
-}
-bool APIConnection::try_send_event(APIConnection *api, void *v_event) {
-  event::Event *event = reinterpret_cast<event::Event *>(v_event);
-  return APIConnection::try_send_event(api, event, *(event->last_event_type));
-}
-bool APIConnection::try_send_event(APIConnection *api, event::Event *event, std::string event_type) {
+bool APIConnection::send_event(event::Event *event, std::string event_type) {
  EventResponse resp{};
  resp.key = event->get_object_id_hash();
  resp.event_type = std::move(event_type);
-  return api->send_event_response(resp);
+  return this->send_event_response(resp);
 }
-bool APIConnection::try_send_event_info(APIConnection *api, void *v_event) {
-  event::Event *event = reinterpret_cast<event::Event *>(v_event);
+bool APIConnection::send_event_info(event::Event *event) {
  ListEntitiesEventResponse msg;
  msg.key = event->get_object_id_hash();
  msg.object_id = event->get_object_id();
@@ -1682,7 +1341,7 @@ bool APIConnection::try_send_event_info(APIConnection *api, void *v_event) {
  msg.device_class = event->get_device_class();
  for (const auto &event_type : event->get_event_types())
    msg.event_types.push_back(event_type);
-  return api->send_list_entities_event_response(msg);
+  return this->send_list_entities_event_response(msg);
 }
 #endif

@@ -1691,19 +1350,6 @@ bool APIConnection::send_update_state(update::UpdateEntity *update) {
  if (!this->state_subscription_)
    return false;

-  if (!APIConnection::try_send_update_state(this, update)) {
-    this->deferred_message_queue_.defer(update, try_send_update_state);
-  }
-
-  return true;
-}
-void APIConnection::send_update_info(update::UpdateEntity *update) {
-  if (!APIConnection::try_send_update_info(this, update)) {
-    this->deferred_message_queue_.defer(update, try_send_update_info);
-  }
-}
-bool APIConnection::try_send_update_state(APIConnection *api, void *v_update) {
-  update::UpdateEntity *update = reinterpret_cast<update::UpdateEntity *>(v_update);
  UpdateStateResponse resp{};
  resp.key = update->get_object_id_hash();
  resp.missing_state = !update->has_state();
@@ -1720,10 +1366,9 @@ bool APIConnection::try_send_update_state(APIConnection *api, void *v_update) {
    resp.release_url = update->update_info.release_url;
  }

-  return api->send_update_state_response(resp);
+  return this->send_update_state_response(resp);
 }
-bool APIConnection::try_send_update_info(APIConnection *api, void *v_update) {
-  update::UpdateEntity *update = reinterpret_cast<update::UpdateEntity *>(v_update);
+bool APIConnection::send_update_info(update::UpdateEntity *update) {
  ListEntitiesUpdateResponse msg;
  msg.key = update->get_object_id_hash();
  msg.object_id = update->get_object_id();
@@ -1734,7 +1379,7 @@ bool APIConnection::try_send_update_info(APIConnection *api, void *v_update) {
  msg.disabled_by_default = update->is_disabled_by_default();
  msg.entity_category = static_cast<enums::EntityCategory>(update->get_entity_category());
  msg.device_class = update->get_device_class();
-  return api->send_list_entities_update_response(msg);
+  return this->send_list_entities_update_response(msg);
 }
 void APIConnection::update_command(const UpdateCommandRequest &msg) {
  update::UpdateEntity *update = App.get_update_by_key(msg.key);
@@ -1758,7 +1403,7 @@ void APIConnection::update_command(const UpdateCommandRequest &msg) {
 }
 #endif

-bool APIConnection::try_send_log_message(int level, const char *tag, const char *line) {
+bool APIConnection::send_log_message(int level, const char *tag, const char *line) {
  if (this->log_subscription_ < level)
    return false;

@@ -1784,7 +1429,7 @@ HelloResponse APIConnection::hello(const HelloRequest &msg) {

  HelloResponse resp;
  resp.api_version_major = 1;
-  resp.api_version_minor = 10;
+  resp.api_version_minor = 11;
  resp.server_info = App.get_name() + " (esphome v" ESPHOME_VERSION ")";
  resp.name = App.get_name();

@@ -1834,7 +1479,13 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
  resp.has_deep_sleep = deep_sleep::global_has_deep_sleep;
 #endif
 #ifdef ESPHOME_PROJECT_NAME
-  resp.project_name = ESPHOME_PROJECT_NAME;
+  if (this->client_api_version_major_ > 1 ||
+      (this->client_api_version_major_ == 1 && this->client_api_version_minor_ >= 11)) {
+    resp.project_name = ESPHOME_PROJECT_NAME;
+    resp.project_manufacturer = ESPHOME_PROJECT_MANUFACTURER;
+  } else {
+    resp.project_name = ESPHOME_PROJECT_MANUFACTURER "." ESPHOME_PROJECT_NAME;
+  }
  resp.project_version = ESPHOME_PROJECT_VERSION;
 #endif
 #ifdef USE_WEBSERVER
@@ -1843,7 +1494,6 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
 #ifdef USE_BLUETOOTH_PROXY
  resp.legacy_bluetooth_proxy_version = bluetooth_proxy::global_bluetooth_proxy->get_legacy_version();
  resp.bluetooth_proxy_feature_flags = bluetooth_proxy::global_bluetooth_proxy->get_feature_flags();
-  resp.bluetooth_mac_address = bluetooth_proxy::global_bluetooth_proxy->get_bluetooth_mac_address_pretty();
 #endif
 #ifdef USE_VOICE_ASSISTANT
  resp.legacy_voice_assistant_version = voice_assistant::global_voice_assistant->get_legacy_version();
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -14,46 +14,6 @@
 namespace esphome {
 namespace api {

-using send_message_t = bool(APIConnection *, void *);
-
-/*
-  This class holds a pointer to the source component that wants to publish a message, and a pointer to a function that
-  will lazily publish that message.  The two pointers allow dedup in the deferred queue if multiple publishes for the
-  same component are backed up, and take up only 8 bytes of memory.  The entry in the deferred queue (a std::vector) is
-  the DeferredMessage instance itself (not a pointer to one elsewhere in heap) so still only 8 bytes per entry.  Even
-  100 backed up messages (you'd have to have at least 100 sensors publishing because of dedup) would take up only 0.8
-  kB.
-*/
-class DeferredMessageQueue {
-  struct DeferredMessage {
-    friend class DeferredMessageQueue;
-
-   protected:
-    void *source_;
-    send_message_t *send_message_;
-
-   public:
-    DeferredMessage(void *source, send_message_t *send_message) : source_(source), send_message_(send_message) {}
-    bool operator==(const DeferredMessage &test) const {
-      return (source_ == test.source_ && send_message_ == test.send_message_);
-    }
-  } __attribute__((packed));
-
- protected:
-  // vector is used very specifically for its zero memory overhead even though items are popped from the front (memory
-  // footprint is more important than speed here)
-  std::vector<DeferredMessage> deferred_queue_;
-  APIConnection *api_connection_;
-
-  // helper for allowing only unique entries in the queue
-  void dmq_push_back_with_dedup_(void *source, send_message_t *send_message);
-
- public:
-  DeferredMessageQueue(APIConnection *api_connection) : api_connection_(api_connection) {}
-  void process_queue();
-  void defer(void *source, send_message_t *send_message);
-};
-
 class APIConnection : public APIServerConnection {
 public:
  APIConnection(std::unique_ptr<socket::Socket> socket, APIServer *parent);
@@ -68,140 +28,96 @@ class APIConnection : public APIServerConnection {
  }
 #ifdef USE_BINARY_SENSOR
  bool send_binary_sensor_state(binary_sensor::BinarySensor *binary_sensor, bool state);
-  void send_binary_sensor_info(binary_sensor::BinarySensor *binary_sensor);
-  static bool try_send_binary_sensor_state(APIConnection *api, void *v_binary_sensor);
-  static bool try_send_binary_sensor_state(APIConnection *api, binary_sensor::BinarySensor *binary_sensor, bool state);
-  static bool try_send_binary_sensor_info(APIConnection *api, void *v_binary_sensor);
+  bool send_binary_sensor_info(binary_sensor::BinarySensor *binary_sensor);
 #endif
 #ifdef USE_COVER
  bool send_cover_state(cover::Cover *cover);
-  void send_cover_info(cover::Cover *cover);
-  static bool try_send_cover_state(APIConnection *api, void *v_cover);
-  static bool try_send_cover_info(APIConnection *api, void *v_cover);
+  bool send_cover_info(cover::Cover *cover);
  void cover_command(const CoverCommandRequest &msg) override;
 #endif
 #ifdef USE_FAN
  bool send_fan_state(fan::Fan *fan);
-  void send_fan_info(fan::Fan *fan);
-  static bool try_send_fan_state(APIConnection *api, void *v_fan);
-  static bool try_send_fan_info(APIConnection *api, void *v_fan);
+  bool send_fan_info(fan::Fan *fan);
  void fan_command(const FanCommandRequest &msg) override;
 #endif
 #ifdef USE_LIGHT
  bool send_light_state(light::LightState *light);
-  void send_light_info(light::LightState *light);
-  static bool try_send_light_state(APIConnection *api, void *v_light);
-  static bool try_send_light_info(APIConnection *api, void *v_light);
+  bool send_light_info(light::LightState *light);
  void light_command(const LightCommandRequest &msg) override;
 #endif
 #ifdef USE_SENSOR
  bool send_sensor_state(sensor::Sensor *sensor, float state);
-  void send_sensor_info(sensor::Sensor *sensor);
-  static bool try_send_sensor_state(APIConnection *api, void *v_sensor);
-  static bool try_send_sensor_state(APIConnection *api, sensor::Sensor *sensor, float state);
-  static bool try_send_sensor_info(APIConnection *api, void *v_sensor);
+  bool send_sensor_info(sensor::Sensor *sensor);
 #endif
 #ifdef USE_SWITCH
  bool send_switch_state(switch_::Switch *a_switch, bool state);
-  void send_switch_info(switch_::Switch *a_switch);
-  static bool try_send_switch_state(APIConnection *api, void *v_a_switch);
-  static bool try_send_switch_state(APIConnection *api, switch_::Switch *a_switch, bool state);
-  static bool try_send_switch_info(APIConnection *api, void *v_a_switch);
+  bool send_switch_info(switch_::Switch *a_switch);
  void switch_command(const SwitchCommandRequest &msg) override;
 #endif
 #ifdef USE_TEXT_SENSOR
  bool send_text_sensor_state(text_sensor::TextSensor *text_sensor, std::string state);
-  void send_text_sensor_info(text_sensor::TextSensor *text_sensor);
-  static bool try_send_text_sensor_state(APIConnection *api, void *v_text_sensor);
-  static bool try_send_text_sensor_state(APIConnection *api, text_sensor::TextSensor *text_sensor, std::string state);
-  static bool try_send_text_sensor_info(APIConnection *api, void *v_text_sensor);
+  bool send_text_sensor_info(text_sensor::TextSensor *text_sensor);
 #endif
 #ifdef USE_ESP32_CAMERA
-  void set_camera_state(std::shared_ptr<esp32_camera::CameraImage> image);
-  void send_camera_info(esp32_camera::ESP32Camera *camera);
-  static bool try_send_camera_info(APIConnection *api, void *v_camera);
+  void send_camera_state(std::shared_ptr<esp32_camera::CameraImage> image);
+  bool send_camera_info(esp32_camera::ESP32Camera *camera);
  void camera_image(const CameraImageRequest &msg) override;
 #endif
 #ifdef USE_CLIMATE
  bool send_climate_state(climate::Climate *climate);
-  void send_climate_info(climate::Climate *climate);
-  static bool try_send_climate_state(APIConnection *api, void *v_climate);
-  static bool try_send_climate_info(APIConnection *api, void *v_climate);
+  bool send_climate_info(climate::Climate *climate);
  void climate_command(const ClimateCommandRequest &msg) override;
 #endif
 #ifdef USE_NUMBER
  bool send_number_state(number::Number *number, float state);
-  void send_number_info(number::Number *number);
-  static bool try_send_number_state(APIConnection *api, void *v_number);
-  static bool try_send_number_state(APIConnection *api, number::Number *number, float state);
-  static bool try_send_number_info(APIConnection *api, void *v_number);
+  bool send_number_info(number::Number *number);
  void number_command(const NumberCommandRequest &msg) override;
 #endif
 #ifdef USE_DATETIME_DATE
  bool send_date_state(datetime::DateEntity *date);
-  void send_date_info(datetime::DateEntity *date);
-  static bool try_send_date_state(APIConnection *api, void *v_date);
-  static bool try_send_date_info(APIConnection *api, void *v_date);
+  bool send_date_info(datetime::DateEntity *date);
  void date_command(const DateCommandRequest &msg) override;
 #endif
 #ifdef USE_DATETIME_TIME
  bool send_time_state(datetime::TimeEntity *time);
-  void send_time_info(datetime::TimeEntity *time);
-  static bool try_send_time_state(APIConnection *api, void *v_time);
-  static bool try_send_time_info(APIConnection *api, void *v_time);
+  bool send_time_info(datetime::TimeEntity *time);
  void time_command(const TimeCommandRequest &msg) override;
 #endif
 #ifdef USE_DATETIME_DATETIME
  bool send_datetime_state(datetime::DateTimeEntity *datetime);
-  void send_datetime_info(datetime::DateTimeEntity *datetime);
-  static bool try_send_datetime_state(APIConnection *api, void *v_datetime);
-  static bool try_send_datetime_info(APIConnection *api, void *v_datetime);
+  bool send_datetime_info(datetime::DateTimeEntity *datetime);
  void datetime_command(const DateTimeCommandRequest &msg) override;
 #endif
 #ifdef USE_TEXT
  bool send_text_state(text::Text *text, std::string state);
-  void send_text_info(text::Text *text);
-  static bool try_send_text_state(APIConnection *api, void *v_text);
-  static bool try_send_text_state(APIConnection *api, text::Text *text, std::string state);
-  static bool try_send_text_info(APIConnection *api, void *v_text);
+  bool send_text_info(text::Text *text);
  void text_command(const TextCommandRequest &msg) override;
 #endif
 #ifdef USE_SELECT
  bool send_select_state(select::Select *select, std::string state);
-  void send_select_info(select::Select *select);
-  static bool try_send_select_state(APIConnection *api, void *v_select);
-  static bool try_send_select_state(APIConnection *api, select::Select *select, std::string state);
-  static bool try_send_select_info(APIConnection *api, void *v_select);
+  bool send_select_info(select::Select *select);
  void select_command(const SelectCommandRequest &msg) override;
 #endif
 #ifdef USE_BUTTON
-  void send_button_info(button::Button *button);
-  static bool try_send_button_info(APIConnection *api, void *v_button);
+  bool send_button_info(button::Button *button);
  void button_command(const ButtonCommandRequest &msg) override;
 #endif
 #ifdef USE_LOCK
  bool send_lock_state(lock::Lock *a_lock, lock::LockState state);
-  void send_lock_info(lock::Lock *a_lock);
-  static bool try_send_lock_state(APIConnection *api, void *v_a_lock);
-  static bool try_send_lock_state(APIConnection *api, lock::Lock *a_lock, lock::LockState state);
-  static bool try_send_lock_info(APIConnection *api, void *v_a_lock);
+  bool send_lock_info(lock::Lock *a_lock);
  void lock_command(const LockCommandRequest &msg) override;
 #endif
 #ifdef USE_VALVE
  bool send_valve_state(valve::Valve *valve);
-  void send_valve_info(valve::Valve *valve);
-  static bool try_send_valve_state(APIConnection *api, void *v_valve);
-  static bool try_send_valve_info(APIConnection *api, void *v_valve);
+  bool send_valve_info(valve::Valve *valve);
  void valve_command(const ValveCommandRequest &msg) override;
 #endif
 #ifdef USE_MEDIA_PLAYER
  bool send_media_player_state(media_player::MediaPlayer *media_player);
-  void send_media_player_info(media_player::MediaPlayer *media_player);
-  static bool try_send_media_player_state(APIConnection *api, void *v_media_player);
-  static bool try_send_media_player_info(APIConnection *api, void *v_media_player);
+  bool send_media_player_info(media_player::MediaPlayer *media_player);
  void media_player_command(const MediaPlayerCommandRequest &msg) override;
 #endif
-  bool try_send_log_message(int level, const char *tag, const char *line);
+  bool send_log_message(int level, const char *tag, const char *line);
  void send_homeassistant_service_call(const HomeassistantServiceResponse &call) {
    if (!this->service_call_subscription_)
      return;
@@ -244,25 +160,18 @@ class APIConnection : public APIServerConnection {

 #ifdef USE_ALARM_CONTROL_PANEL
  bool send_alarm_control_panel_state(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel);
-  void send_alarm_control_panel_info(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel);
-  static bool try_send_alarm_control_panel_state(APIConnection *api, void *v_a_alarm_control_panel);
-  static bool try_send_alarm_control_panel_info(APIConnection *api, void *v_a_alarm_control_panel);
+  bool send_alarm_control_panel_info(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel);
  void alarm_control_panel_command(const AlarmControlPanelCommandRequest &msg) override;
 #endif

 #ifdef USE_EVENT
-  void send_event(event::Event *event, std::string event_type);
-  void send_event_info(event::Event *event);
-  static bool try_send_event(APIConnection *api, void *v_event);
-  static bool try_send_event(APIConnection *api, event::Event *event, std::string event_type);
-  static bool try_send_event_info(APIConnection *api, void *v_event);
+  bool send_event(event::Event *event, std::string event_type);
+  bool send_event_info(event::Event *event);
 #endif

 #ifdef USE_UPDATE
  bool send_update_state(update::UpdateEntity *update);
-  void send_update_info(update::UpdateEntity *update);
-  static bool try_send_update_state(APIConnection *api, void *v_update);
-  static bool try_send_update_info(APIConnection *api, void *v_update);
+  bool send_update_info(update::UpdateEntity *update);
  void update_command(const UpdateCommandRequest &msg) override;
 #endif

@@ -353,7 +262,6 @@ class APIConnection : public APIServerConnection {
  bool service_call_subscription_{false};
  bool next_close_ = false;
  APIServer *parent_;
-  DeferredMessageQueue deferred_message_queue_;
  InitialStateIterator initial_state_iterator_;
  ListEntitiesIterator list_entities_iterator_;
  int state_subs_at_ = -1;
--- a/esphome/components/api/api_frame_helper.cpp
+++ b/esphome/components/api/api_frame_helper.cpp
@@ -311,10 +311,6 @@ APIError APINoiseFrameHelper::state_action_() {
    const std::string &name = App.get_name();
    const uint8_t *name_ptr = reinterpret_cast<const uint8_t *>(name.c_str());
    msg.insert(msg.end(), name_ptr, name_ptr + name.size() + 1);
-    // node mac, terminated by null byte
-    const std::string &mac = get_mac_address();
-    const uint8_t *mac_ptr = reinterpret_cast<const uint8_t *>(mac.c_str());
-    msg.insert(msg.end(), mac_ptr, mac_ptr + mac.size() + 1);

    aerr = write_frame_(msg.data(), msg.size());
    if (aerr != APIError::OK)
@@ -897,28 +893,8 @@ APIError APIPlaintextFrameHelper::read_packet(ReadPacketBuffer *buffer) {

  ParsedFrame frame;
  aerr = try_read_frame_(&frame);
-  if (aerr != APIError::OK) {
-    if (aerr == APIError::BAD_INDICATOR) {
-      // Make sure to tell the remote that we don't
-      // understand the indicator byte so it knows
-      // we do not support it.
-      struct iovec iov[1];
-      // The \x00 first byte is the marker for plaintext.
-      //
-      // The remote will know how to handle the indicator byte,
-      // but it likely won't understand the rest of the message.
-      //
-      // We must send at least 3 bytes to be read, so we add
-      // a message after the indicator byte to ensures its long
-      // enough and can aid in debugging.
-      const char msg[] = "\x00"
-                         "Bad indicator byte";
-      iov[0].iov_base = (void *) msg;
-      iov[0].iov_len = 19;
-      write_raw_(iov, 1);
-    }
+  if (aerr != APIError::OK)
    return aerr;
-  }

  buffer->container = std::move(frame.msg);
  buffer->data_offset = 0;
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -826,6 +826,10 @@ bool DeviceInfoResponse::decode_length(uint32_t field_id, ProtoLengthDelimited v
      this->project_version = value.as_string();
      return true;
    }
+    case 18: {
+      this->project_manufacturer = value.as_string();
+      return true;
+    }
    case 12: {
      this->manufacturer = value.as_string();
      return true;
@@ -838,10 +842,6 @@ bool DeviceInfoResponse::decode_length(uint32_t field_id, ProtoLengthDelimited v
      this->suggested_area = value.as_string();
      return true;
    }
-    case 18: {
-      this->bluetooth_mac_address = value.as_string();
-      return true;
-    }
    default:
      return false;
  }
@@ -856,6 +856,7 @@ void DeviceInfoResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_bool(7, this->has_deep_sleep);
  buffer.encode_string(8, this->project_name);
  buffer.encode_string(9, this->project_version);
+  buffer.encode_string(18, this->project_manufacturer);
  buffer.encode_uint32(10, this->webserver_port);
  buffer.encode_uint32(11, this->legacy_bluetooth_proxy_version);
  buffer.encode_uint32(15, this->bluetooth_proxy_feature_flags);
@@ -864,7 +865,6 @@ void DeviceInfoResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_uint32(14, this->legacy_voice_assistant_version);
  buffer.encode_uint32(17, this->voice_assistant_feature_flags);
  buffer.encode_string(16, this->suggested_area);
-  buffer.encode_string(18, this->bluetooth_mac_address);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void DeviceInfoResponse::dump_to(std::string &out) const {
@@ -906,6 +906,10 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
  out.append("'").append(this->project_version).append("'");
  out.append("\n");

+  out.append("  project_manufacturer: ");
+  out.append("'").append(this->project_manufacturer).append("'");
+  out.append("\n");
+
  out.append("  webserver_port: ");
  sprintf(buffer, "%" PRIu32, this->webserver_port);
  out.append(buffer);
@@ -942,10 +946,6 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
  out.append("  suggested_area: ");
  out.append("'").append(this->suggested_area).append("'");
  out.append("\n");
-
-  out.append("  bluetooth_mac_address: ");
-  out.append("'").append(this->bluetooth_mac_address).append("'");
-  out.append("\n");
  out.append("}");
 }
 #endif
@@ -6439,10 +6439,6 @@ bool BluetoothConnectionsFreeResponse::decode_varint(uint32_t field_id, ProtoVar
      this->limit = value.as_uint32();
      return true;
    }
-    case 3: {
-      this->allocated.push_back(value.as_uint64());
-      return true;
-    }
    default:
      return false;
  }
@@ -6450,9 +6446,6 @@ bool BluetoothConnectionsFreeResponse::decode_varint(uint32_t field_id, ProtoVar
 void BluetoothConnectionsFreeResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_uint32(1, this->free);
  buffer.encode_uint32(2, this->limit);
-  for (auto &it : this->allocated) {
-    buffer.encode_uint64(3, it, true);
-  }
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BluetoothConnectionsFreeResponse::dump_to(std::string &out) const {
@@ -6467,13 +6460,6 @@ void BluetoothConnectionsFreeResponse::dump_to(std::string &out) const {
  sprintf(buffer, "%" PRIu32, this->limit);
  out.append(buffer);
  out.append("\n");
-
-  for (const auto &it : this->allocated) {
-    out.append("  allocated: ");
-    sprintf(buffer, "%llu", it);
-    out.append(buffer);
-    out.append("\n");
-  }
  out.append("}");
 }
 #endif
@@ -7094,16 +7080,6 @@ void VoiceAssistantTimerEventResponse::dump_to(std::string &out) const {
  out.append("}");
 }
 #endif
-bool VoiceAssistantAnnounceRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 4: {
-      this->start_conversation = value.as_bool();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
 bool VoiceAssistantAnnounceRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
  switch (field_id) {
    case 1: {
@@ -7114,10 +7090,6 @@ bool VoiceAssistantAnnounceRequest::decode_length(uint32_t field_id, ProtoLength
      this->text = value.as_string();
      return true;
    }
-    case 3: {
-      this->preannounce_media_id = value.as_string();
-      return true;
-    }
    default:
      return false;
  }
@@ -7125,8 +7097,6 @@ bool VoiceAssistantAnnounceRequest::decode_length(uint32_t field_id, ProtoLength
 void VoiceAssistantAnnounceRequest::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->media_id);
  buffer.encode_string(2, this->text);
-  buffer.encode_string(3, this->preannounce_media_id);
-  buffer.encode_bool(4, this->start_conversation);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void VoiceAssistantAnnounceRequest::dump_to(std::string &out) const {
@@ -7139,14 +7109,6 @@ void VoiceAssistantAnnounceRequest::dump_to(std::string &out) const {
  out.append("  text: ");
  out.append("'").append(this->text).append("'");
  out.append("\n");
-
-  out.append("  preannounce_media_id: ");
-  out.append("'").append(this->preannounce_media_id).append("'");
-  out.append("\n");
-
-  out.append("  start_conversation: ");
-  out.append(YESNO(this->start_conversation));
-  out.append("\n");
  out.append("}");
 }
 #endif
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -346,6 +346,7 @@ class DeviceInfoResponse : public ProtoMessage {
  bool has_deep_sleep{false};
  std::string project_name{};
  std::string project_version{};
+  std::string project_manufacturer{};
  uint32_t webserver_port{0};
  uint32_t legacy_bluetooth_proxy_version{0};
  uint32_t bluetooth_proxy_feature_flags{0};
@@ -354,7 +355,6 @@ class DeviceInfoResponse : public ProtoMessage {
  uint32_t legacy_voice_assistant_version{0};
  uint32_t voice_assistant_feature_flags{0};
  std::string suggested_area{};
-  std::string bluetooth_mac_address{};
  void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  void dump_to(std::string &out) const override;
@@ -1625,7 +1625,6 @@ class BluetoothConnectionsFreeResponse : public ProtoMessage {
 public:
  uint32_t free{0};
  uint32_t limit{0};
-  std::vector<uint64_t> allocated{};
  void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  void dump_to(std::string &out) const override;
@@ -1832,8 +1831,6 @@ class VoiceAssistantAnnounceRequest : public ProtoMessage {
 public:
  std::string media_id{};
  std::string text{};
-  std::string preannounce_media_id{};
-  bool start_conversation{false};
  void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  void dump_to(std::string &out) const override;
@@ -1841,7 +1838,6 @@ class VoiceAssistantAnnounceRequest : public ProtoMessage {

 protected:
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
 class VoiceAssistantAnnounceFinished : public ProtoMessage {
 public:
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -72,7 +72,7 @@ void APIServer::setup() {
    logger::global_logger->add_on_log_callback([this](int level, const char *tag, const char *message) {
      for (auto &c : this->clients_) {
        if (!c->remove_)
-          c->try_send_log_message(level, tag, message);
+          c->send_log_message(level, tag, message);
      }
    });
  }
@@ -86,7 +86,7 @@ void APIServer::setup() {
        [this](const std::shared_ptr<esp32_camera::CameraImage> &image) {
          for (auto &c : this->clients_) {
            if (!c->remove_)
-              c->set_camera_state(image);
+              c->send_camera_state(image);
          }
        });
  }
--- a/esphome/components/api/client.py
+++ b/esphome/components/api/client.py
@@ -1,11 +1,12 @@
 from __future__ import annotations

 import asyncio
-from datetime import datetime
 import logging
-from typing import TYPE_CHECKING, Any
+from datetime import datetime
+from typing import Any

 from aioesphomeapi import APIClient
+from aioesphomeapi.api_pb2 import SubscribeLogsResponse
 from aioesphomeapi.log_runner import async_run

 from esphome.const import CONF_KEY, CONF_PASSWORD, CONF_PORT, __version__
@@ -13,12 +14,6 @@ from esphome.core import CORE

 from . import CONF_ENCRYPTION

-if TYPE_CHECKING:
-    from aioesphomeapi.api_pb2 import (
-        SubscribeLogsResponse,  # pylint: disable=no-name-in-module
-    )
-
-
 _LOGGER = logging.getLogger(__name__)


--- a/esphome/components/api/list_entities.cpp
+++ b/esphome/components/api/list_entities.cpp
@@ -10,63 +10,37 @@ namespace api {

 #ifdef USE_BINARY_SENSOR
 bool ListEntitiesIterator::on_binary_sensor(binary_sensor::BinarySensor *binary_sensor) {
-  this->client_->send_binary_sensor_info(binary_sensor);
-  return true;
+  return this->client_->send_binary_sensor_info(binary_sensor);
 }
 #endif
 #ifdef USE_COVER
-bool ListEntitiesIterator::on_cover(cover::Cover *cover) {
-  this->client_->send_cover_info(cover);
-  return true;
-}
+bool ListEntitiesIterator::on_cover(cover::Cover *cover) { return this->client_->send_cover_info(cover); }
 #endif
 #ifdef USE_FAN
-bool ListEntitiesIterator::on_fan(fan::Fan *fan) {
-  this->client_->send_fan_info(fan);
-  return true;
-}
+bool ListEntitiesIterator::on_fan(fan::Fan *fan) { return this->client_->send_fan_info(fan); }
 #endif
 #ifdef USE_LIGHT
-bool ListEntitiesIterator::on_light(light::LightState *light) {
-  this->client_->send_light_info(light);
-  return true;
-}
+bool ListEntitiesIterator::on_light(light::LightState *light) { return this->client_->send_light_info(light); }
 #endif
 #ifdef USE_SENSOR
-bool ListEntitiesIterator::on_sensor(sensor::Sensor *sensor) {
-  this->client_->send_sensor_info(sensor);
-  return true;
-}
+bool ListEntitiesIterator::on_sensor(sensor::Sensor *sensor) { return this->client_->send_sensor_info(sensor); }
 #endif
 #ifdef USE_SWITCH
-bool ListEntitiesIterator::on_switch(switch_::Switch *a_switch) {
-  this->client_->send_switch_info(a_switch);
-  return true;
-}
+bool ListEntitiesIterator::on_switch(switch_::Switch *a_switch) { return this->client_->send_switch_info(a_switch); }
 #endif
 #ifdef USE_BUTTON
-bool ListEntitiesIterator::on_button(button::Button *button) {
-  this->client_->send_button_info(button);
-  return true;
-}
+bool ListEntitiesIterator::on_button(button::Button *button) { return this->client_->send_button_info(button); }
 #endif
 #ifdef USE_TEXT_SENSOR
 bool ListEntitiesIterator::on_text_sensor(text_sensor::TextSensor *text_sensor) {
-  this->client_->send_text_sensor_info(text_sensor);
-  return true;
+  return this->client_->send_text_sensor_info(text_sensor);
 }
 #endif
 #ifdef USE_LOCK
-bool ListEntitiesIterator::on_lock(lock::Lock *a_lock) {
-  this->client_->send_lock_info(a_lock);
-  return true;
-}
+bool ListEntitiesIterator::on_lock(lock::Lock *a_lock) { return this->client_->send_lock_info(a_lock); }
 #endif
 #ifdef USE_VALVE
-bool ListEntitiesIterator::on_valve(valve::Valve *valve) {
-  this->client_->send_valve_info(valve);
-  return true;
-}
+bool ListEntitiesIterator::on_valve(valve::Valve *valve) { return this->client_->send_valve_info(valve); }
 #endif

 bool ListEntitiesIterator::on_end() { return this->client_->send_list_info_done(); }
@@ -78,83 +52,55 @@ bool ListEntitiesIterator::on_service(UserServiceDescriptor *service) {

 #ifdef USE_ESP32_CAMERA
 bool ListEntitiesIterator::on_camera(esp32_camera::ESP32Camera *camera) {
-  this->client_->send_camera_info(camera);
-  return true;
+  return this->client_->send_camera_info(camera);
 }
 #endif

 #ifdef USE_CLIMATE
-bool ListEntitiesIterator::on_climate(climate::Climate *climate) {
-  this->client_->send_climate_info(climate);
-  return true;
-}
+bool ListEntitiesIterator::on_climate(climate::Climate *climate) { return this->client_->send_climate_info(climate); }
 #endif

 #ifdef USE_NUMBER
-bool ListEntitiesIterator::on_number(number::Number *number) {
-  this->client_->send_number_info(number);
-  return true;
-}
+bool ListEntitiesIterator::on_number(number::Number *number) { return this->client_->send_number_info(number); }
 #endif

 #ifdef USE_DATETIME_DATE
-bool ListEntitiesIterator::on_date(datetime::DateEntity *date) {
-  this->client_->send_date_info(date);
-  return true;
-}
+bool ListEntitiesIterator::on_date(datetime::DateEntity *date) { return this->client_->send_date_info(date); }
 #endif

 #ifdef USE_DATETIME_TIME
-bool ListEntitiesIterator::on_time(datetime::TimeEntity *time) {
-  this->client_->send_time_info(time);
-  return true;
-}
+bool ListEntitiesIterator::on_time(datetime::TimeEntity *time) { return this->client_->send_time_info(time); }
 #endif

 #ifdef USE_DATETIME_DATETIME
 bool ListEntitiesIterator::on_datetime(datetime::DateTimeEntity *datetime) {
-  this->client_->send_datetime_info(datetime);
-  return true;
+  return this->client_->send_datetime_info(datetime);
 }
 #endif

 #ifdef USE_TEXT
-bool ListEntitiesIterator::on_text(text::Text *text) {
-  this->client_->send_text_info(text);
-  return true;
-}
+bool ListEntitiesIterator::on_text(text::Text *text) { return this->client_->send_text_info(text); }
 #endif

 #ifdef USE_SELECT
-bool ListEntitiesIterator::on_select(select::Select *select) {
-  this->client_->send_select_info(select);
-  return true;
-}
+bool ListEntitiesIterator::on_select(select::Select *select) { return this->client_->send_select_info(select); }
 #endif

 #ifdef USE_MEDIA_PLAYER
 bool ListEntitiesIterator::on_media_player(media_player::MediaPlayer *media_player) {
-  this->client_->send_media_player_info(media_player);
-  return true;
+  return this->client_->send_media_player_info(media_player);
 }
 #endif
 #ifdef USE_ALARM_CONTROL_PANEL
 bool ListEntitiesIterator::on_alarm_control_panel(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel) {
-  this->client_->send_alarm_control_panel_info(a_alarm_control_panel);
-  return true;
+  return this->client_->send_alarm_control_panel_info(a_alarm_control_panel);
 }
 #endif
 #ifdef USE_EVENT
-bool ListEntitiesIterator::on_event(event::Event *event) {
-  this->client_->send_event_info(event);
-  return true;
-}
+bool ListEntitiesIterator::on_event(event::Event *event) { return this->client_->send_event_info(event); }
 #endif
 #ifdef USE_UPDATE
-bool ListEntitiesIterator::on_update(update::UpdateEntity *update) {
-  this->client_->send_update_info(update);
-  return true;
-}
+bool ListEntitiesIterator::on_update(update::UpdateEntity *update) { return this->client_->send_update_info(update); }
 #endif

 }  // namespace api
--- a/esphome/components/api/list_entities.h
+++ b/esphome/components/api/list_entities.h
@@ -80,7 +80,6 @@ class ListEntitiesIterator : public ComponentIterator {
  bool on_update(update::UpdateEntity *update) override;
 #endif
  bool on_end() override;
-  bool completed() { return this->state_ == IteratorState::NONE; }

 protected:
  APIConnection *client_;
--- a/esphome/components/api/subscribe_state.h
+++ b/esphome/components/api/subscribe_state.h
@@ -76,8 +76,6 @@ class InitialStateIterator : public ComponentIterator {
 #ifdef USE_UPDATE
  bool on_update(update::UpdateEntity *update) override;
 #endif
-  bool completed() { return this->state_ == IteratorState::NONE; }
-
 protected:
  APIConnection *client_;
 };
--- a/esphome/components/as3935/init.py
+++ b/esphome/components/as3935/init.py
@@ -1,17 +1,17 @@
-from esphome import pins
 import esphome.codegen as cg
 import esphome.config_validation as cv
+from esphome import pins
 from esphome.const import (
-    CONF_CALIBRATION,
    CONF_CAPACITANCE,
    CONF_DIV_RATIO,
    CONF_INDOOR,
    CONF_IRQ_PIN,
    CONF_LIGHTNING_THRESHOLD,
    CONF_MASK_DISTURBER,
+    CONF_CALIBRATION,
+    CONF_TUNE_ANTENNA,
    CONF_NOISE_LEVEL,
    CONF_SPIKE_REJECTION,
-    CONF_TUNE_ANTENNA,
    CONF_WATCHDOG_THRESHOLD,
 )

--- a/esphome/components/as3935/binary_sensor.py
+++ b/esphome/components/as3935/binary_sensor.py
@@ -1,7 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import binary_sensor
 import esphome.config_validation as cv
-
+from esphome.components import binary_sensor
 from . import AS3935, CONF_AS3935_ID

 DEPENDENCIES = ["as3935"]
--- a/esphome/components/as3935/sensor.py
+++ b/esphome/components/as3935/sensor.py
@@ -1,14 +1,13 @@
 import esphome.codegen as cg
-from esphome.components import sensor
 import esphome.config_validation as cv
+from esphome.components import sensor
 from esphome.const import (
    CONF_DISTANCE,
    CONF_LIGHTNING_ENERGY,
-    ICON_FLASH,
-    ICON_SIGNAL_DISTANCE_VARIANT,
    UNIT_KILOMETER,
+    ICON_SIGNAL_DISTANCE_VARIANT,
+    ICON_FLASH,
 )
-
 from . import AS3935, CONF_AS3935_ID

 DEPENDENCIES = ["as3935"]
--- a/esphome/components/as3935_i2c/init.py
+++ b/esphome/components/as3935_i2c/init.py
@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import as3935, i2c
 import esphome.config_validation as cv
+from esphome.components import as3935, i2c
 from esphome.const import CONF_ID

 AUTO_LOAD = ["as3935"]
--- a/esphome/components/as3935_spi/init.py
+++ b/esphome/components/as3935_spi/init.py
@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import as3935, spi
 import esphome.config_validation as cv
+from esphome.components import as3935, spi
 from esphome.const import CONF_ID

 AUTO_LOAD = ["as3935"]
--- a/esphome/components/as5600/init.py
+++ b/esphome/components/as5600/init.py
@@ -1,12 +1,12 @@
 from esphome import pins
 import esphome.codegen as cg
-from esphome.components import i2c
 import esphome.config_validation as cv
+from esphome.components import i2c
 from esphome.const import (
+    CONF_ID,
    CONF_DIR_PIN,
    CONF_DIRECTION,
    CONF_HYSTERESIS,
-    CONF_ID,
    CONF_RANGE,
 )

--- a/esphome/components/as5600/sensor/init.py
+++ b/esphome/components/as5600/sensor/init.py
@@ -1,20 +1,19 @@
 import esphome.codegen as cg
-from esphome.components import sensor
 import esphome.config_validation as cv
+from esphome.components import sensor
 from esphome.const import (
-    CONF_ANGLE,
-    CONF_GAIN,
    CONF_ID,
-    CONF_MAGNITUDE,
-    CONF_POSITION,
-    CONF_STATUS,
-    ENTITY_CATEGORY_DIAGNOSTIC,
+    STATE_CLASS_MEASUREMENT,
    ICON_MAGNET,
    ICON_ROTATE_RIGHT,
-    STATE_CLASS_MEASUREMENT,
+    CONF_GAIN,
+    ENTITY_CATEGORY_DIAGNOSTIC,
+    CONF_MAGNITUDE,
+    CONF_STATUS,
+    CONF_POSITION,
+    CONF_ANGLE,
 )
-
-from .. import AS5600Component, as5600_ns
+from .. import as5600_ns, AS5600Component

 CODEOWNERS = ["@ammmze"]
 DEPENDENCIES = ["as5600"]
--- a/esphome/components/as7341/sensor.py
+++ b/esphome/components/as7341/sensor.py
@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import i2c, sensor
 import esphome.config_validation as cv
+from esphome.components import i2c, sensor
 from esphome.const import (
    CONF_GAIN,
    CONF_ID,
@@ -9,6 +9,7 @@ from esphome.const import (
    STATE_CLASS_MEASUREMENT,
 )

+
 CODEOWNERS = ["@mrgnr"]
 DEPENDENCIES = ["i2c"]

--- a/esphome/components/at581x/init.py
+++ b/esphome/components/at581x/init.py
@@ -1,9 +1,13 @@
-from esphome import automation, core
-from esphome.automation import maybe_simple_id
 import esphome.codegen as cg
-from esphome.components import i2c
 import esphome.config_validation as cv
-from esphome.const import CONF_FREQUENCY, CONF_ID
+from esphome import automation, core
+from esphome.components import i2c
+from esphome.automation import maybe_simple_id
+from esphome.const import (
+    CONF_ID,
+    CONF_FREQUENCY,
+)
+

 CODEOWNERS = ["@X-Ryl669"]
 DEPENDENCIES = ["i2c"]
--- a/esphome/components/at581x/switch/init.py
+++ b/esphome/components/at581x/switch/init.py
@@ -1,8 +1,10 @@
 import esphome.codegen as cg
 from esphome.components import switch
 import esphome.config_validation as cv
-from esphome.const import DEVICE_CLASS_SWITCH, ICON_WIFI
-
+from esphome.const import (
+    DEVICE_CLASS_SWITCH,
+    ICON_WIFI,
+)
 from .. import CONF_AT581X_ID, AT581XComponent, at581x_ns

 DEPENDENCIES = ["at581x"]
--- a/esphome/components/atc_mithermometer/sensor.py
+++ b/esphome/components/atc_mithermometer/sensor.py
@@ -1,14 +1,14 @@
 import esphome.codegen as cg
-from esphome.components import esp32_ble_tracker, sensor
 import esphome.config_validation as cv
+from esphome.components import sensor, esp32_ble_tracker
 from esphome.const import (
    CONF_BATTERY_LEVEL,
    CONF_BATTERY_VOLTAGE,
-    CONF_HUMIDITY,
-    CONF_ID,
    CONF_MAC_ADDRESS,
+    CONF_HUMIDITY,
    CONF_SIGNAL_STRENGTH,
    CONF_TEMPERATURE,
+    CONF_ID,
    DEVICE_CLASS_BATTERY,
    DEVICE_CLASS_HUMIDITY,
    DEVICE_CLASS_SIGNAL_STRENGTH,
--- a/esphome/components/audio/init.py
+++ b/esphome/components/audio/init.py
@@ -1,121 +1,9 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome.const import CONF_BITS_PER_SAMPLE, CONF_NUM_CHANNELS, CONF_SAMPLE_RATE
-import esphome.final_validate as fv

 CODEOWNERS = ["@kahrendt"]
 audio_ns = cg.esphome_ns.namespace("audio")

-AudioFile = audio_ns.struct("AudioFile")
-AudioFileType = audio_ns.enum("AudioFileType", is_class=True)
-AUDIO_FILE_TYPE_ENUM = {
-    "NONE": AudioFileType.NONE,
-    "WAV": AudioFileType.WAV,
-    "MP3": AudioFileType.MP3,
-    "FLAC": AudioFileType.FLAC,
-}
-
-
-CONF_MIN_BITS_PER_SAMPLE = "min_bits_per_sample"
-CONF_MAX_BITS_PER_SAMPLE = "max_bits_per_sample"
-CONF_MIN_CHANNELS = "min_channels"
-CONF_MAX_CHANNELS = "max_channels"
-CONF_MIN_SAMPLE_RATE = "min_sample_rate"
-CONF_MAX_SAMPLE_RATE = "max_sample_rate"
-
-
 CONFIG_SCHEMA = cv.All(
    cv.Schema({}),
 )
-
-AUDIO_COMPONENT_SCHEMA = cv.Schema(
-    {
-        cv.Optional(CONF_BITS_PER_SAMPLE): cv.int_range(8, 32),
-        cv.Optional(CONF_NUM_CHANNELS): cv.int_range(1, 2),
-        cv.Optional(CONF_SAMPLE_RATE): cv.int_range(8000, 48000),
-    }
-)
-
-
-_UNDEF = object()
-
-
-def set_stream_limits(
-    min_bits_per_sample: int = _UNDEF,
-    max_bits_per_sample: int = _UNDEF,
-    min_channels: int = _UNDEF,
-    max_channels: int = _UNDEF,
-    min_sample_rate: int = _UNDEF,
-    max_sample_rate: int = _UNDEF,
-):
-    def set_limits_in_config(config):
-        if min_bits_per_sample is not _UNDEF:
-            config[CONF_MIN_BITS_PER_SAMPLE] = min_bits_per_sample
-        if max_bits_per_sample is not _UNDEF:
-            config[CONF_MAX_BITS_PER_SAMPLE] = max_bits_per_sample
-        if min_channels is not _UNDEF:
-            config[CONF_MIN_CHANNELS] = min_channels
-        if max_channels is not _UNDEF:
-            config[CONF_MAX_CHANNELS] = max_channels
-        if min_sample_rate is not _UNDEF:
-            config[CONF_MIN_SAMPLE_RATE] = min_sample_rate
-        if max_sample_rate is not _UNDEF:
-            config[CONF_MAX_SAMPLE_RATE] = max_sample_rate
-
-    return set_limits_in_config
-
-
-def final_validate_audio_schema(
-    name: str,
-    *,
-    audio_device: str,
-    bits_per_sample: int,
-    channels: int,
-    sample_rate: int,
-):
-    def validate_audio_compatiblity(audio_config):
-        audio_schema = {}
-
-        try:
-            cv.int_range(
-                min=audio_config.get(CONF_MIN_BITS_PER_SAMPLE),
-                max=audio_config.get(CONF_MAX_BITS_PER_SAMPLE),
-            )(bits_per_sample)
-        except cv.Invalid as exc:
-            raise cv.Invalid(
-                f"Invalid configuration for the {name} component. The {CONF_BITS_PER_SAMPLE} {str(exc)}"
-            ) from exc
-
-        try:
-            cv.int_range(
-                min=audio_config.get(CONF_MIN_CHANNELS),
-                max=audio_config.get(CONF_MAX_CHANNELS),
-            )(channels)
-        except cv.Invalid as exc:
-            raise cv.Invalid(
-                f"Invalid configuration for the {name} component. The {CONF_NUM_CHANNELS} {str(exc)}"
-            ) from exc
-
-        try:
-            cv.int_range(
-                min=audio_config.get(CONF_MIN_SAMPLE_RATE),
-                max=audio_config.get(CONF_MAX_SAMPLE_RATE),
-            )(sample_rate)
-            return cv.Schema(audio_schema, extra=cv.ALLOW_EXTRA)(audio_config)
-        except cv.Invalid as exc:
-            raise cv.Invalid(
-                f"Invalid configuration for the {name} component. The {CONF_SAMPLE_RATE} {str(exc)}"
-            ) from exc
-
-    return cv.Schema(
-        {
-            cv.Required(audio_device): fv.id_declaration_match_schema(
-                validate_audio_compatiblity
-            )
-        },
-        extra=cv.ALLOW_EXTRA,
-    )
-
-
-async def to_code(config):
-    cg.add_library("esphome/esp-audio-libs", "1.1.3")
--- a/esphome/components/audio/audio.cpp
+++ b/esphome/components/audio/audio.cpp
@@ -1,67 +0,0 @@
-#include "audio.h"
-
-namespace esphome {
-namespace audio {
-
-// Euclidean's algorithm for finding the greatest common divisor
-static uint32_t gcd(uint32_t a, uint32_t b) {
-  while (b != 0) {
-    uint32_t t = b;
-    b = a % b;
-    a = t;
-  }
-  return a;
-}
-
-AudioStreamInfo::AudioStreamInfo(uint8_t bits_per_sample, uint8_t channels, uint32_t sample_rate)
-    : bits_per_sample_(bits_per_sample), channels_(channels), sample_rate_(sample_rate) {
-  this->ms_sample_rate_gcd_ = gcd(1000, this->sample_rate_);
-  this->bytes_per_sample_ = (this->bits_per_sample_ + 7) / 8;
-}
-
-uint32_t AudioStreamInfo::frames_to_microseconds(uint32_t frames) const {
-  return (frames * 1000000 + (this->sample_rate_ >> 1)) / this->sample_rate_;
-}
-
-uint32_t AudioStreamInfo::frames_to_milliseconds_with_remainder(uint32_t *total_frames) const {
-  uint32_t unprocessable_frames = *total_frames % (this->sample_rate_ / this->ms_sample_rate_gcd_);
-  uint32_t frames_for_ms_calculation = *total_frames - unprocessable_frames;
-
-  uint32_t playback_ms = (frames_for_ms_calculation * 1000) / this->sample_rate_;
-  *total_frames = unprocessable_frames;
-  return playback_ms;
-}
-
-bool AudioStreamInfo::operator==(const AudioStreamInfo &rhs) const {
-  return (this->bits_per_sample_ == rhs.get_bits_per_sample()) && (this->channels_ == rhs.get_channels()) &&
-         (this->sample_rate_ == rhs.get_sample_rate());
-}
-
-const char *audio_file_type_to_string(AudioFileType file_type) {
-  switch (file_type) {
-#ifdef USE_AUDIO_FLAC_SUPPORT
-    case AudioFileType::FLAC:
-      return "FLAC";
-#endif
-#ifdef USE_AUDIO_MP3_SUPPORT
-    case AudioFileType::MP3:
-      return "MP3";
-#endif
-    case AudioFileType::WAV:
-      return "WAV";
-    default:
-      return "unknown";
-  }
-}
-
-void scale_audio_samples(const int16_t *audio_samples, int16_t *output_buffer, int16_t scale_factor,
-                         size_t samples_to_scale) {
-  // Note the assembly dsps_mulc function has audio glitches if the input and output buffers are the same.
-  for (int i = 0; i < samples_to_scale; i++) {
-    int32_t acc = (int32_t) audio_samples[i] * (int32_t) scale_factor;
-    output_buffer[i] = (int16_t) (acc >> 15);
-  }
-}
-
-}  // namespace audio
-}  // namespace esphome
--- a/esphome/components/audio/audio.h
+++ b/esphome/components/audio/audio.h
@@ -1,139 +1,21 @@
 #pragma once

-#include "esphome/core/defines.h"
-
 #include <cstddef>
 #include <cstdint>

 namespace esphome {
 namespace audio {

-class AudioStreamInfo {
-  /* Class to respresent important parameters of the audio stream that also provides helper function to convert between
-   * various audio related units.
-   *
-   *  - An audio sample represents a unit of audio for one channel.
-   *  - A frame represents a unit of audio with a sample for every channel.
-   *
-   * In gneneral, converting between bytes, samples, and frames shouldn't result in rounding errors so long as frames
-   * are used as the main unit when transferring audio data. Durations may result in rounding for certain sample rates;
-   * e.g., 44.1 KHz. The ``frames_to_milliseconds_with_remainder`` function should be used for accuracy, as it takes
-   * into account the remainder rather than just ignoring any rounding.
-   */
- public:
-  AudioStreamInfo()
-      : AudioStreamInfo(16, 1, 16000){};  // Default values represent ESPHome's audio components historical values
-  AudioStreamInfo(uint8_t bits_per_sample, uint8_t channels, uint32_t sample_rate);
-
-  uint8_t get_bits_per_sample() const { return this->bits_per_sample_; }
-  uint8_t get_channels() const { return this->channels_; }
-  uint32_t get_sample_rate() const { return this->sample_rate_; }
-
-  /// @brief Convert bytes to duration in milliseconds.
-  /// @param bytes Number of bytes to convert
-  /// @return Duration in milliseconds that will store `bytes` bytes of audio. May round down for certain sample rates
-  ///         or values of `bytes`.
-  uint32_t bytes_to_ms(size_t bytes) const {
-    return bytes * 1000 / (this->sample_rate_ * this->bytes_per_sample_ * this->channels_);
+struct AudioStreamInfo {
+  bool operator==(const AudioStreamInfo &rhs) const {
+    return (channels == rhs.channels) && (bits_per_sample == rhs.bits_per_sample) && (sample_rate == rhs.sample_rate);
  }
-
-  /// @brief Convert bytes to frames.
-  /// @param bytes Number of bytes to convert
-  /// @return Audio frames that will store `bytes` bytes.
-  uint32_t bytes_to_frames(size_t bytes) const { return (bytes / (this->bytes_per_sample_ * this->channels_)); }
-
-  /// @brief Convert bytes to samples.
-  /// @param bytes Number of bytes to convert
-  /// @return Audio samples that will store `bytes` bytes.
-  uint32_t bytes_to_samples(size_t bytes) const { return (bytes / this->bytes_per_sample_); }
-
-  /// @brief Converts frames to bytes.
-  /// @param frames Number of frames to convert.
-  /// @return Number of bytes that will store `frames` frames of audio.
-  size_t frames_to_bytes(uint32_t frames) const { return frames * this->bytes_per_sample_ * this->channels_; }
-
-  /// @brief Converts samples to bytes.
-  /// @param samples Number of samples to convert.
-  /// @return Number of bytes that will store `samples` samples of audio.
-  size_t samples_to_bytes(uint32_t samples) const { return samples * this->bytes_per_sample_; }
-
-  /// @brief Converts duration to frames.
-  /// @param ms Duration in milliseconds
-  /// @return Audio frames that will store `ms` milliseconds of audio.  May round down for certain sample rates.
-  uint32_t ms_to_frames(uint32_t ms) const { return (ms * this->sample_rate_) / 1000; }
-
-  /// @brief Converts duration to samples.
-  /// @param ms Duration in milliseconds
-  /// @return Audio samples that will store `ms` milliseconds of audio.  May round down for certain sample rates.
-  uint32_t ms_to_samples(uint32_t ms) const { return (ms * this->channels_ * this->sample_rate_) / 1000; }
-
-  /// @brief Converts duration to bytes. May round down for certain sample rates.
-  /// @param ms Duration in milliseconds
-  /// @return Bytes that will store `ms` milliseconds of audio.  May round down for certain sample rates.
-  size_t ms_to_bytes(uint32_t ms) const {
-    return (ms * this->bytes_per_sample_ * this->channels_ * this->sample_rate_) / 1000;
-  }
-
-  /// @brief Computes the duration, in microseconds, the given amount of frames represents.
-  /// @param frames Number of audio frames
-  /// @return Duration in microseconds `frames` respresents. May be slightly inaccurate due to integer divison rounding
-  ///         for certain sample rates.
-  uint32_t frames_to_microseconds(uint32_t frames) const;
-
-  /// @brief Computes the duration, in milliseconds, the given amount of frames represents. Avoids
-  /// accumulating rounding errors by updating `frames` with the remainder after converting.
-  /// @param frames Pointer to uint32_t with the number of audio frames. Replaced with the remainder.
-  /// @return Duration in milliseconds `frames` represents. Always less than or equal to the actual value due to
-  ///         rounding.
-  uint32_t frames_to_milliseconds_with_remainder(uint32_t *frames) const;
-
-  // Class comparison operators
-  bool operator==(const AudioStreamInfo &rhs) const;
  bool operator!=(const AudioStreamInfo &rhs) const { return !operator==(rhs); }
-
- protected:
-  uint8_t bits_per_sample_;
-  uint8_t channels_;
-  uint32_t sample_rate_;
-
-  // The greatest common divisor between 1000 ms = 1 second and the sample rate. Used to avoid accumulating error when
-  // converting from frames to duration. Computed at construction.
-  uint32_t ms_sample_rate_gcd_;
-
-  // Conversion factor derived from the number of bits per sample. Assumes audio data is aligned to the byte. Computed
-  // at construction.
-  size_t bytes_per_sample_;
+  size_t get_bytes_per_sample() const { return bits_per_sample / 8; }
+  uint8_t channels = 1;
+  uint8_t bits_per_sample = 16;
+  uint32_t sample_rate = 16000;
 };

-enum class AudioFileType : uint8_t {
-  NONE = 0,
-#ifdef USE_AUDIO_FLAC_SUPPORT
-  FLAC,
-#endif
-#ifdef USE_AUDIO_MP3_SUPPORT
-  MP3,
-#endif
-  WAV,
-};
-
-struct AudioFile {
-  const uint8_t *data;
-  size_t length;
-  AudioFileType file_type;
-};
-
-/// @brief Helper function to convert file type to a const char string
-/// @param file_type
-/// @return const char pointer to the readable file type
-const char *audio_file_type_to_string(AudioFileType file_type);
-
-/// @brief Scales Q15 fixed point audio samples. Scales in place if audio_samples == output_buffer.
-/// @param audio_samples PCM int16 audio samples
-/// @param output_buffer Buffer to store the scaled samples
-/// @param scale_factor Q15 fixed point scaling factor
-/// @param samples_to_scale Number of samples to scale
-void scale_audio_samples(const int16_t *audio_samples, int16_t *output_buffer, int16_t scale_factor,
-                         size_t samples_to_scale);
-
 }  // namespace audio
 }  // namespace esphome
--- a/esphome/components/audio/audio_decoder.cpp
+++ b/esphome/components/audio/audio_decoder.cpp
@@ -1,393 +0,0 @@
-#include "audio_decoder.h"
-
-#ifdef USE_ESP32
-
-#include "esphome/core/hal.h"
-
-namespace esphome {
-namespace audio {
-
-static const uint32_t DECODING_TIMEOUT_MS = 50;    // The decode function will yield after this duration
-static const uint32_t READ_WRITE_TIMEOUT_MS = 20;  // Timeout for transferring audio data
-
-static const uint32_t MAX_POTENTIALLY_FAILED_COUNT = 10;
-
-AudioDecoder::AudioDecoder(size_t input_buffer_size, size_t output_buffer_size) {
-  this->input_transfer_buffer_ = AudioSourceTransferBuffer::create(input_buffer_size);
-  this->output_transfer_buffer_ = AudioSinkTransferBuffer::create(output_buffer_size);
-}
-
-AudioDecoder::~AudioDecoder() {
-#ifdef USE_AUDIO_MP3_SUPPORT
-  if (this->audio_file_type_ == AudioFileType::MP3) {
-    esp_audio_libs::helix_decoder::MP3FreeDecoder(this->mp3_decoder_);
-  }
-#endif
-}
-
-esp_err_t AudioDecoder::add_source(std::weak_ptr<RingBuffer> &input_ring_buffer) {
-  if (this->input_transfer_buffer_ != nullptr) {
-    this->input_transfer_buffer_->set_source(input_ring_buffer);
-    return ESP_OK;
-  }
-  return ESP_ERR_NO_MEM;
-}
-
-esp_err_t AudioDecoder::add_sink(std::weak_ptr<RingBuffer> &output_ring_buffer) {
-  if (this->output_transfer_buffer_ != nullptr) {
-    this->output_transfer_buffer_->set_sink(output_ring_buffer);
-    return ESP_OK;
-  }
-  return ESP_ERR_NO_MEM;
-}
-
-#ifdef USE_SPEAKER
-esp_err_t AudioDecoder::add_sink(speaker::Speaker *speaker) {
-  if (this->output_transfer_buffer_ != nullptr) {
-    this->output_transfer_buffer_->set_sink(speaker);
-    return ESP_OK;
-  }
-  return ESP_ERR_NO_MEM;
-}
-#endif
-
-esp_err_t AudioDecoder::start(AudioFileType audio_file_type) {
-  if ((this->input_transfer_buffer_ == nullptr) || (this->output_transfer_buffer_ == nullptr)) {
-    return ESP_ERR_NO_MEM;
-  }
-
-  this->audio_file_type_ = audio_file_type;
-
-  this->potentially_failed_count_ = 0;
-  this->end_of_file_ = false;
-
-  switch (this->audio_file_type_) {
-#ifdef USE_AUDIO_FLAC_SUPPORT
-    case AudioFileType::FLAC:
-      this->flac_decoder_ = make_unique<esp_audio_libs::flac::FLACDecoder>();
-      this->free_buffer_required_ =
-          this->output_transfer_buffer_->capacity();  // Adjusted and reallocated after reading the header
-      break;
-#endif
-#ifdef USE_AUDIO_MP3_SUPPORT
-    case AudioFileType::MP3:
-      this->mp3_decoder_ = esp_audio_libs::helix_decoder::MP3InitDecoder();
-
-      // MP3 always has 1152 samples per chunk
-      this->free_buffer_required_ = 1152 * sizeof(int16_t) * 2;  // samples * size per sample * channels
-
-      // Always reallocate the output transfer buffer to the smallest necessary size
-      this->output_transfer_buffer_->reallocate(this->free_buffer_required_);
-      break;
-#endif
-    case AudioFileType::WAV:
-      this->wav_decoder_ = make_unique<esp_audio_libs::wav_decoder::WAVDecoder>();
-      this->wav_decoder_->reset();
-
-      // Processing WAVs doesn't actually require a specific amount of buffer size, as it is already in PCM format.
-      // Thus, we don't reallocate to a minimum size.
-      this->free_buffer_required_ = 1024;
-      if (this->output_transfer_buffer_->capacity() < this->free_buffer_required_) {
-        this->output_transfer_buffer_->reallocate(this->free_buffer_required_);
-      }
-      break;
-    case AudioFileType::NONE:
-    default:
-      return ESP_ERR_NOT_SUPPORTED;
-      break;
-  }
-
-  return ESP_OK;
-}
-
-AudioDecoderState AudioDecoder::decode(bool stop_gracefully) {
-  if (stop_gracefully) {
-    if (this->output_transfer_buffer_->available() == 0) {
-      if (this->end_of_file_) {
-        // The file decoder indicates it reached the end of file
-        return AudioDecoderState::FINISHED;
-      }
-
-      if (!this->input_transfer_buffer_->has_buffered_data()) {
-        // If all the internal buffers are empty, the decoding is done
-        return AudioDecoderState::FINISHED;
-      }
-    }
-  }
-
-  if (this->potentially_failed_count_ > MAX_POTENTIALLY_FAILED_COUNT) {
-    if (stop_gracefully) {
-      // No more new data is going to come in, so decoding is done
-      return AudioDecoderState::FINISHED;
-    }
-    return AudioDecoderState::FAILED;
-  }
-
-  FileDecoderState state = FileDecoderState::MORE_TO_PROCESS;
-
-  uint32_t decoding_start = millis();
-
-  bool first_loop_iteration = true;
-
-  size_t bytes_processed = 0;
-  size_t bytes_available_before_processing = 0;
-
-  while (state == FileDecoderState::MORE_TO_PROCESS) {
-    // Transfer decoded out
-    if (!this->pause_output_) {
-      // Never shift the data in the output transfer buffer to avoid unnecessary, slow data moves
-      size_t bytes_written =
-          this->output_transfer_buffer_->transfer_data_to_sink(pdMS_TO_TICKS(READ_WRITE_TIMEOUT_MS), false);
-
-      if (this->audio_stream_info_.has_value()) {
-        this->accumulated_frames_written_ += this->audio_stream_info_.value().bytes_to_frames(bytes_written);
-        this->playback_ms_ +=
-            this->audio_stream_info_.value().frames_to_milliseconds_with_remainder(&this->accumulated_frames_written_);
-      }
-    } else {
-      // If paused, block to avoid wasting CPU resources
-      delay(READ_WRITE_TIMEOUT_MS);
-    }
-
-    // Verify there is enough space to store more decoded audio and that the function hasn't been running too long
-    if ((this->output_transfer_buffer_->free() < this->free_buffer_required_) ||
-        (millis() - decoding_start > DECODING_TIMEOUT_MS)) {
-      return AudioDecoderState::DECODING;
-    }
-
-    // Decode more audio
-
-    // Only shift data on the first loop iteration to avoid unnecessary, slow moves
-    size_t bytes_read = this->input_transfer_buffer_->transfer_data_from_source(pdMS_TO_TICKS(READ_WRITE_TIMEOUT_MS),
-                                                                                first_loop_iteration);
-
-    if (!first_loop_iteration && (this->input_transfer_buffer_->available() < bytes_processed)) {
-      // Less data is available than what was processed in last iteration, so don't attempt to decode.
-      // This attempts to avoid the decoder from consistently trying to decode an incomplete frame. The transfer buffer
-      // will shift the remaining data to the start and copy more from the source the next time the decode function is
-      // called
-      break;
-    }
-
-    bytes_available_before_processing = this->input_transfer_buffer_->available();
-
-    if ((this->potentially_failed_count_ > 10) && (bytes_read == 0)) {
-      // Failed to decode in last attempt and there is no new data
-
-      if ((this->input_transfer_buffer_->free() == 0) && first_loop_iteration) {
-        // The input buffer is full. Since it previously failed on the exact same data, we can never recover
-        state = FileDecoderState::FAILED;
-      } else {
-        // Attempt to get more data next time
-        state = FileDecoderState::IDLE;
-      }
-    } else if (this->input_transfer_buffer_->available() == 0) {
-      // No data to decode, attempt to get more data next time
-      state = FileDecoderState::IDLE;
-    } else {
-      switch (this->audio_file_type_) {
-#ifdef USE_AUDIO_FLAC_SUPPORT
-        case AudioFileType::FLAC:
-          state = this->decode_flac_();
-          break;
-#endif
-#ifdef USE_AUDIO_MP3_SUPPORT
-        case AudioFileType::MP3:
-          state = this->decode_mp3_();
-          break;
-#endif
-        case AudioFileType::WAV:
-          state = this->decode_wav_();
-          break;
-        case AudioFileType::NONE:
-        default:
-          state = FileDecoderState::IDLE;
-          break;
-      }
-    }
-
-    first_loop_iteration = false;
-    bytes_processed = bytes_available_before_processing - this->input_transfer_buffer_->available();
-
-    if (state == FileDecoderState::POTENTIALLY_FAILED) {
-      ++this->potentially_failed_count_;
-    } else if (state == FileDecoderState::END_OF_FILE) {
-      this->end_of_file_ = true;
-    } else if (state == FileDecoderState::FAILED) {
-      return AudioDecoderState::FAILED;
-    } else if (state == FileDecoderState::MORE_TO_PROCESS) {
-      this->potentially_failed_count_ = 0;
-    }
-  }
-  return AudioDecoderState::DECODING;
-}
-
-#ifdef USE_AUDIO_FLAC_SUPPORT
-FileDecoderState AudioDecoder::decode_flac_() {
-  if (!this->audio_stream_info_.has_value()) {
-    // Header hasn't been read
-    auto result = this->flac_decoder_->read_header(this->input_transfer_buffer_->get_buffer_start(),
-                                                   this->input_transfer_buffer_->available());
-
-    if (result == esp_audio_libs::flac::FLAC_DECODER_HEADER_OUT_OF_DATA) {
-      return FileDecoderState::POTENTIALLY_FAILED;
-    }
-
-    if (result != esp_audio_libs::flac::FLAC_DECODER_SUCCESS) {
-      // Couldn't read FLAC header
-      return FileDecoderState::FAILED;
-    }
-
-    size_t bytes_consumed = this->flac_decoder_->get_bytes_index();
-    this->input_transfer_buffer_->decrease_buffer_length(bytes_consumed);
-
-    // Reallocate the output transfer buffer to the smallest necessary size
-    this->free_buffer_required_ = flac_decoder_->get_output_buffer_size_bytes();
-    if (!this->output_transfer_buffer_->reallocate(this->free_buffer_required_)) {
-      // Couldn't reallocate output buffer
-      return FileDecoderState::FAILED;
-    }
-
-    this->audio_stream_info_ =
-        audio::AudioStreamInfo(this->flac_decoder_->get_sample_depth(), this->flac_decoder_->get_num_channels(),
-                               this->flac_decoder_->get_sample_rate());
-
-    return FileDecoderState::MORE_TO_PROCESS;
-  }
-
-  uint32_t output_samples = 0;
-  auto result = this->flac_decoder_->decode_frame(
-      this->input_transfer_buffer_->get_buffer_start(), this->input_transfer_buffer_->available(),
-      reinterpret_cast<int16_t *>(this->output_transfer_buffer_->get_buffer_end()), &output_samples);
-
-  if (result == esp_audio_libs::flac::FLAC_DECODER_ERROR_OUT_OF_DATA) {
-    // Not an issue, just needs more data that we'll get next time.
-    return FileDecoderState::POTENTIALLY_FAILED;
-  }
-
-  size_t bytes_consumed = this->flac_decoder_->get_bytes_index();
-  this->input_transfer_buffer_->decrease_buffer_length(bytes_consumed);
-
-  if (result > esp_audio_libs::flac::FLAC_DECODER_ERROR_OUT_OF_DATA) {
-    // Corrupted frame, don't retry with current buffer content, wait for new sync
-    return FileDecoderState::POTENTIALLY_FAILED;
-  }
-
-  // We have successfully decoded some input data and have new output data
-  this->output_transfer_buffer_->increase_buffer_length(
-      this->audio_stream_info_.value().samples_to_bytes(output_samples));
-
-  if (result == esp_audio_libs::flac::FLAC_DECODER_NO_MORE_FRAMES) {
-    return FileDecoderState::END_OF_FILE;
-  }
-
-  return FileDecoderState::MORE_TO_PROCESS;
-}
-#endif
-
-#ifdef USE_AUDIO_MP3_SUPPORT
-FileDecoderState AudioDecoder::decode_mp3_() {
-  // Look for the next sync word
-  int buffer_length = (int) this->input_transfer_buffer_->available();
-  int32_t offset =
-      esp_audio_libs::helix_decoder::MP3FindSyncWord(this->input_transfer_buffer_->get_buffer_start(), buffer_length);
-
-  if (offset < 0) {
-    // New data may have the sync word
-    this->input_transfer_buffer_->decrease_buffer_length(buffer_length);
-    return FileDecoderState::POTENTIALLY_FAILED;
-  }
-
-  // Advance read pointer to match the offset for the syncword
-  this->input_transfer_buffer_->decrease_buffer_length(offset);
-  uint8_t *buffer_start = this->input_transfer_buffer_->get_buffer_start();
-
-  buffer_length = (int) this->input_transfer_buffer_->available();
-  int err = esp_audio_libs::helix_decoder::MP3Decode(this->mp3_decoder_, &buffer_start, &buffer_length,
-                                                     (int16_t *) this->output_transfer_buffer_->get_buffer_end(), 0);
-
-  size_t consumed = this->input_transfer_buffer_->available() - buffer_length;
-  this->input_transfer_buffer_->decrease_buffer_length(consumed);
-
-  if (err) {
-    switch (err) {
-      case esp_audio_libs::helix_decoder::ERR_MP3_OUT_OF_MEMORY:
-        // Intentional fallthrough
-      case esp_audio_libs::helix_decoder::ERR_MP3_NULL_POINTER:
-        return FileDecoderState::FAILED;
-        break;
-      default:
-        // Most errors are recoverable by moving on to the next frame, so mark as potentailly failed
-        return FileDecoderState::POTENTIALLY_FAILED;
-        break;
-    }
-  } else {
-    esp_audio_libs::helix_decoder::MP3FrameInfo mp3_frame_info;
-    esp_audio_libs::helix_decoder::MP3GetLastFrameInfo(this->mp3_decoder_, &mp3_frame_info);
-    if (mp3_frame_info.outputSamps > 0) {
-      int bytes_per_sample = (mp3_frame_info.bitsPerSample / 8);
-      this->output_transfer_buffer_->increase_buffer_length(mp3_frame_info.outputSamps * bytes_per_sample);
-
-      if (!this->audio_stream_info_.has_value()) {
-        this->audio_stream_info_ =
-            audio::AudioStreamInfo(mp3_frame_info.bitsPerSample, mp3_frame_info.nChans, mp3_frame_info.samprate);
-      }
-    }
-  }
-
-  return FileDecoderState::MORE_TO_PROCESS;
-}
-#endif
-
-FileDecoderState AudioDecoder::decode_wav_() {
-  if (!this->audio_stream_info_.has_value()) {
-    // Header hasn't been processed
-
-    esp_audio_libs::wav_decoder::WAVDecoderResult result = this->wav_decoder_->decode_header(
-        this->input_transfer_buffer_->get_buffer_start(), this->input_transfer_buffer_->available());
-
-    if (result == esp_audio_libs::wav_decoder::WAV_DECODER_SUCCESS_IN_DATA) {
-      this->input_transfer_buffer_->decrease_buffer_length(this->wav_decoder_->bytes_processed());
-
-      this->audio_stream_info_ = audio::AudioStreamInfo(
-          this->wav_decoder_->bits_per_sample(), this->wav_decoder_->num_channels(), this->wav_decoder_->sample_rate());
-
-      this->wav_bytes_left_ = this->wav_decoder_->chunk_bytes_left();
-      this->wav_has_known_end_ = (this->wav_bytes_left_ > 0);
-      return FileDecoderState::MORE_TO_PROCESS;
-    } else if (result == esp_audio_libs::wav_decoder::WAV_DECODER_WARNING_INCOMPLETE_DATA) {
-      // Available data didn't have the full header
-      return FileDecoderState::POTENTIALLY_FAILED;
-    } else {
-      return FileDecoderState::FAILED;
-    }
-  } else {
-    if (!this->wav_has_known_end_ || (this->wav_bytes_left_ > 0)) {
-      size_t bytes_to_copy = this->input_transfer_buffer_->available();
-
-      if (this->wav_has_known_end_) {
-        bytes_to_copy = std::min(bytes_to_copy, this->wav_bytes_left_);
-      }
-
-      bytes_to_copy = std::min(bytes_to_copy, this->output_transfer_buffer_->free());
-
-      if (bytes_to_copy > 0) {
-        std::memcpy(this->output_transfer_buffer_->get_buffer_end(), this->input_transfer_buffer_->get_buffer_start(),
-                    bytes_to_copy);
-        this->input_transfer_buffer_->decrease_buffer_length(bytes_to_copy);
-        this->output_transfer_buffer_->increase_buffer_length(bytes_to_copy);
-        if (this->wav_has_known_end_) {
-          this->wav_bytes_left_ -= bytes_to_copy;
-        }
-      }
-      return FileDecoderState::IDLE;
-    }
-  }
-
-  return FileDecoderState::END_OF_FILE;
-}
-
-}  // namespace audio
-}  // namespace esphome
-
-#endif
--- a/esphome/components/audio/audio_decoder.h
+++ b/esphome/components/audio/audio_decoder.h
@@ -1,135 +0,0 @@
-#pragma once
-
-#ifdef USE_ESP32
-
-#include "audio.h"
-#include "audio_transfer_buffer.h"
-
-#include "esphome/core/defines.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/ring_buffer.h"
-
-#ifdef USE_SPEAKER
-#include "esphome/components/speaker/speaker.h"
-#endif
-
-#include "esp_err.h"
-
-// esp-audio-libs
-#ifdef USE_AUDIO_FLAC_SUPPORT
-#include <flac_decoder.h>
-#endif
-#ifdef USE_AUDIO_MP3_SUPPORT
-#include <mp3_decoder.h>
-#endif
-#include <wav_decoder.h>
-
-namespace esphome {
-namespace audio {
-
-enum class AudioDecoderState : uint8_t {
-  DECODING = 0,  // More data is available to decode
-  FINISHED,      // All file data has been decoded and transferred
-  FAILED,        // Encountered an error
-};
-
-// Only used within the AudioDecoder class; conveys the state of the particular file type decoder
-enum class FileDecoderState : uint8_t {
-  MORE_TO_PROCESS,     // Successsfully read a file chunk and more data is available to decode
-  IDLE,                // Not enough data to decode, waiting for more to be transferred
-  POTENTIALLY_FAILED,  // Decoder encountered a potentially recoverable error if more file data is available
-  FAILED,              // Decoder encoutnered an uncrecoverable error
-  END_OF_FILE,         // The specific file decoder knows its the end of the file
-};
-
-class AudioDecoder {
-  /*
-   * @brief Class that facilitates decoding an audio file.
-   * The audio file is read from a ring buffer source, decoded, and sent to an audio sink (ring buffer or speaker
-   * component).
-   * Supports wav, flac, and mp3 formats.
-   */
- public:
-  /// @brief Allocates the input and output transfer buffers
-  /// @param input_buffer_size Size of the input transfer buffer in bytes.
-  /// @param output_buffer_size Size of the output transfer buffer in bytes.
-  AudioDecoder(size_t input_buffer_size, size_t output_buffer_size);
-
-  /// @brief Deallocates the MP3 decoder (the flac and wav decoders are deallocated automatically)
-  ~AudioDecoder();
-
-  /// @brief Adds a source ring buffer for raw file data. Takes ownership of the ring buffer in a shared_ptr.
-  /// @param input_ring_buffer weak_ptr of a shared_ptr of the sink ring buffer to transfer ownership
-  /// @return ESP_OK if successsful, ESP_ERR_NO_MEM if the transfer buffer wasn't allocated
-  esp_err_t add_source(std::weak_ptr<RingBuffer> &input_ring_buffer);
-
-  /// @brief Adds a sink ring buffer for decoded audio. Takes ownership of the ring buffer in a shared_ptr.
-  /// @param output_ring_buffer weak_ptr of a shared_ptr of the sink ring buffer to transfer ownership
-  /// @return ESP_OK if successsful, ESP_ERR_NO_MEM if the transfer buffer wasn't allocated
-  esp_err_t add_sink(std::weak_ptr<RingBuffer> &output_ring_buffer);
-
-#ifdef USE_SPEAKER
-  /// @brief Adds a sink speaker for decoded audio.
-  /// @param speaker pointer to speaker component
-  /// @return ESP_OK if successsful, ESP_ERR_NO_MEM if the transfer buffer wasn't allocated
-  esp_err_t add_sink(speaker::Speaker *speaker);
-#endif
-
-  /// @brief Sets up decoding the file
-  /// @param audio_file_type AudioFileType of the file
-  /// @return ESP_OK if successful, ESP_ERR_NO_MEM if the transfer buffers fail to allocate, or ESP_ERR_NOT_SUPPORTED if
-  /// the format isn't supported.
-  esp_err_t start(AudioFileType audio_file_type);
-
-  /// @brief Decodes audio from the ring buffer source and writes to the sink.
-  /// @param stop_gracefully If true, it indicates the file source is finished. The decoder will decode all the
-  /// reamining data and then finish.
-  /// @return AudioDecoderState
-  AudioDecoderState decode(bool stop_gracefully);
-
-  /// @brief Gets the audio stream information, if it has been decoded from the files header
-  /// @return optional<AudioStreamInfo> with the audio information. If not available yet, returns no value.
-  const optional<audio::AudioStreamInfo> &get_audio_stream_info() const { return this->audio_stream_info_; }
-
-  /// @brief Returns the duration of audio (in milliseconds) decoded and sent to the sink
-  /// @return Duration of decoded audio in milliseconds
-  uint32_t get_playback_ms() const { return this->playback_ms_; }
-
-  /// @brief Pauses sending resampled audio to the sink. If paused, it will continue to process internal buffers.
-  /// @param pause_state If true, audio data is not sent to the sink.
-  void set_pause_output_state(bool pause_state) { this->pause_output_ = pause_state; }
-
- protected:
-  std::unique_ptr<esp_audio_libs::wav_decoder::WAVDecoder> wav_decoder_;
-#ifdef USE_AUDIO_FLAC_SUPPORT
-  FileDecoderState decode_flac_();
-  std::unique_ptr<esp_audio_libs::flac::FLACDecoder> flac_decoder_;
-#endif
-#ifdef USE_AUDIO_MP3_SUPPORT
-  FileDecoderState decode_mp3_();
-  esp_audio_libs::helix_decoder::HMP3Decoder mp3_decoder_;
-#endif
-  FileDecoderState decode_wav_();
-
-  std::unique_ptr<AudioSourceTransferBuffer> input_transfer_buffer_;
-  std::unique_ptr<AudioSinkTransferBuffer> output_transfer_buffer_;
-
-  AudioFileType audio_file_type_{AudioFileType::NONE};
-  optional<AudioStreamInfo> audio_stream_info_{};
-
-  size_t free_buffer_required_{0};
-  size_t wav_bytes_left_{0};
-
-  uint32_t potentially_failed_count_{0};
-  bool end_of_file_{false};
-  bool wav_has_known_end_{false};
-
-  bool pause_output_{false};
-
-  uint32_t accumulated_frames_written_{0};
-  uint32_t playback_ms_{0};
-};
-}  // namespace audio
-}  // namespace esphome
-
-#endif
--- a/esphome/components/audio/audio_reader.cpp
+++ b/esphome/components/audio/audio_reader.cpp
@@ -1,308 +0,0 @@
-#include "audio_reader.h"
-
-#ifdef USE_ESP_IDF
-
-#include "esphome/core/defines.h"
-#include "esphome/core/hal.h"
-#include "esphome/core/helpers.h"
-
-#if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
-#include "esp_crt_bundle.h"
-#endif
-
-namespace esphome {
-namespace audio {
-
-static const uint32_t READ_WRITE_TIMEOUT_MS = 20;
-
-static const uint32_t CONNECTION_TIMEOUT_MS = 5000;
-
-// The number of times the http read times out with no data before throwing an error
-static const uint32_t ERROR_COUNT_NO_DATA_READ_TIMEOUT = 100;
-
-static const size_t HTTP_STREAM_BUFFER_SIZE = 2048;
-
-static const uint8_t MAX_REDIRECTION = 5;
-
-// Some common HTTP status codes - borrowed from http_request component accessed 20241224
-enum HttpStatus {
-  HTTP_STATUS_OK = 200,
-  HTTP_STATUS_NO_CONTENT = 204,
-  HTTP_STATUS_PARTIAL_CONTENT = 206,
-
-  /* 3xx - Redirection */
-  HTTP_STATUS_MULTIPLE_CHOICES = 300,
-  HTTP_STATUS_MOVED_PERMANENTLY = 301,
-  HTTP_STATUS_FOUND = 302,
-  HTTP_STATUS_SEE_OTHER = 303,
-  HTTP_STATUS_NOT_MODIFIED = 304,
-  HTTP_STATUS_TEMPORARY_REDIRECT = 307,
-  HTTP_STATUS_PERMANENT_REDIRECT = 308,
-
-  /* 4XX - CLIENT ERROR */
-  HTTP_STATUS_BAD_REQUEST = 400,
-  HTTP_STATUS_UNAUTHORIZED = 401,
-  HTTP_STATUS_FORBIDDEN = 403,
-  HTTP_STATUS_NOT_FOUND = 404,
-  HTTP_STATUS_METHOD_NOT_ALLOWED = 405,
-  HTTP_STATUS_NOT_ACCEPTABLE = 406,
-  HTTP_STATUS_LENGTH_REQUIRED = 411,
-
-  /* 5xx - Server Error */
-  HTTP_STATUS_INTERNAL_ERROR = 500
-};
-
-AudioReader::~AudioReader() { this->cleanup_connection_(); }
-
-esp_err_t AudioReader::add_sink(const std::weak_ptr<RingBuffer> &output_ring_buffer) {
-  if (current_audio_file_ != nullptr) {
-    // A transfer buffer isn't ncessary for a local file
-    this->file_ring_buffer_ = output_ring_buffer.lock();
-    return ESP_OK;
-  }
-
-  if (this->output_transfer_buffer_ != nullptr) {
-    this->output_transfer_buffer_->set_sink(output_ring_buffer);
-    return ESP_OK;
-  }
-
-  return ESP_ERR_INVALID_STATE;
-}
-
-esp_err_t AudioReader::start(AudioFile *audio_file, AudioFileType &file_type) {
-  file_type = AudioFileType::NONE;
-
-  this->current_audio_file_ = audio_file;
-
-  this->file_current_ = audio_file->data;
-  file_type = audio_file->file_type;
-
-  return ESP_OK;
-}
-
-esp_err_t AudioReader::start(const std::string &uri, AudioFileType &file_type) {
-  file_type = AudioFileType::NONE;
-
-  this->cleanup_connection_();
-
-  if (uri.empty()) {
-    return ESP_ERR_INVALID_ARG;
-  }
-
-  esp_http_client_config_t client_config = {};
-
-  client_config.url = uri.c_str();
-  client_config.cert_pem = nullptr;
-  client_config.disable_auto_redirect = false;
-  client_config.max_redirection_count = 10;
-  client_config.event_handler = http_event_handler;
-  client_config.user_data = this;
-  client_config.buffer_size = HTTP_STREAM_BUFFER_SIZE;
-  client_config.keep_alive_enable = true;
-  client_config.timeout_ms = CONNECTION_TIMEOUT_MS;  // Shouldn't trigger watchdog resets if caller runs in a task
-
-#if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
-  if (uri.find("https:") != std::string::npos) {
-    client_config.crt_bundle_attach = esp_crt_bundle_attach;
-  }
-#endif
-
-  this->client_ = esp_http_client_init(&client_config);
-
-  if (this->client_ == nullptr) {
-    return ESP_FAIL;
-  }
-
-  esp_err_t err = esp_http_client_open(this->client_, 0);
-
-  if (err != ESP_OK) {
-    this->cleanup_connection_();
-    return err;
-  }
-
-  int64_t header_length = esp_http_client_fetch_headers(this->client_);
-  if (header_length < 0) {
-    this->cleanup_connection_();
-    return ESP_FAIL;
-  }
-
-  int status_code = esp_http_client_get_status_code(this->client_);
-
-  if ((status_code < HTTP_STATUS_OK) || (status_code > HTTP_STATUS_PERMANENT_REDIRECT)) {
-    this->cleanup_connection_();
-    return ESP_FAIL;
-  }
-
-  ssize_t redirect_count = 0;
-
-  while ((esp_http_client_set_redirection(this->client_) == ESP_OK) && (redirect_count < MAX_REDIRECTION)) {
-    err = esp_http_client_open(this->client_, 0);
-    if (err != ESP_OK) {
-      this->cleanup_connection_();
-      return ESP_FAIL;
-    }
-
-    header_length = esp_http_client_fetch_headers(this->client_);
-    if (header_length < 0) {
-      this->cleanup_connection_();
-      return ESP_FAIL;
-    }
-
-    status_code = esp_http_client_get_status_code(this->client_);
-
-    if ((status_code < HTTP_STATUS_OK) || (status_code > HTTP_STATUS_PERMANENT_REDIRECT)) {
-      this->cleanup_connection_();
-      return ESP_FAIL;
-    }
-
-    ++redirect_count;
-  }
-
-  if (this->audio_file_type_ == AudioFileType::NONE) {
-    // Failed to determine the file type from the header, fallback to using the url
-    char url[500];
-    err = esp_http_client_get_url(this->client_, url, 500);
-    if (err != ESP_OK) {
-      this->cleanup_connection_();
-      return err;
-    }
-
-    std::string url_string = str_lower_case(url);
-
-    if (str_endswith(url_string, ".wav")) {
-      file_type = AudioFileType::WAV;
-    }
-#ifdef USE_AUDIO_MP3_SUPPORT
-    else if (str_endswith(url_string, ".mp3")) {
-      file_type = AudioFileType::MP3;
-    }
-#endif
-#ifdef USE_AUDIO_FLAC_SUPPORT
-    else if (str_endswith(url_string, ".flac")) {
-      file_type = AudioFileType::FLAC;
-    }
-#endif
-    else {
-      file_type = AudioFileType::NONE;
-      this->cleanup_connection_();
-      return ESP_ERR_NOT_SUPPORTED;
-    }
-  } else {
-    file_type = this->audio_file_type_;
-  }
-
-  this->last_data_read_ms_ = millis();
-
-  this->output_transfer_buffer_ = AudioSinkTransferBuffer::create(this->buffer_size_);
-  if (this->output_transfer_buffer_ == nullptr) {
-    return ESP_ERR_NO_MEM;
-  }
-
-  return ESP_OK;
-}
-
-AudioReaderState AudioReader::read() {
-  if (this->client_ != nullptr) {
-    return this->http_read_();
-  } else if (this->current_audio_file_ != nullptr) {
-    return this->file_read_();
-  }
-
-  return AudioReaderState::FAILED;
-}
-
-AudioFileType AudioReader::get_audio_type(const char *content_type) {
-#ifdef USE_AUDIO_MP3_SUPPORT
-  if (strcasecmp(content_type, "mp3") == 0 || strcasecmp(content_type, "audio/mp3") == 0 ||
-      strcasecmp(content_type, "audio/mpeg") == 0) {
-    return AudioFileType::MP3;
-  }
-#endif
-  if (strcasecmp(content_type, "audio/wav") == 0) {
-    return AudioFileType::WAV;
-  }
-#ifdef USE_AUDIO_FLAC_SUPPORT
-  if (strcasecmp(content_type, "audio/flac") == 0 || strcasecmp(content_type, "audio/x-flac") == 0) {
-    return AudioFileType::FLAC;
-  }
-#endif
-  return AudioFileType::NONE;
-}
-
-esp_err_t AudioReader::http_event_handler(esp_http_client_event_t *evt) {
-  // Based on https://github.com/maroc81/WeatherLily/tree/main/main/net accessed 20241224
-  AudioReader *this_reader = (AudioReader *) evt->user_data;
-
-  switch (evt->event_id) {
-    case HTTP_EVENT_ON_HEADER:
-      if (strcasecmp(evt->header_key, "Content-Type") == 0) {
-        this_reader->audio_file_type_ = get_audio_type(evt->header_value);
-      }
-      break;
-    default:
-      break;
-  }
-  return ESP_OK;
-}
-
-AudioReaderState AudioReader::file_read_() {
-  size_t remaining_bytes = this->current_audio_file_->length - (this->file_current_ - this->current_audio_file_->data);
-  if (remaining_bytes > 0) {
-    size_t bytes_written = this->file_ring_buffer_->write_without_replacement(this->file_current_, remaining_bytes,
-                                                                              pdMS_TO_TICKS(READ_WRITE_TIMEOUT_MS));
-    this->file_current_ += bytes_written;
-
-    return AudioReaderState::READING;
-  }
-
-  return AudioReaderState::FINISHED;
-}
-
-AudioReaderState AudioReader::http_read_() {
-  this->output_transfer_buffer_->transfer_data_to_sink(pdMS_TO_TICKS(READ_WRITE_TIMEOUT_MS), false);
-
-  if (esp_http_client_is_complete_data_received(this->client_)) {
-    if (this->output_transfer_buffer_->available() == 0) {
-      this->cleanup_connection_();
-      return AudioReaderState::FINISHED;
-    }
-  } else if (this->output_transfer_buffer_->free() > 0) {
-    size_t bytes_to_read = this->output_transfer_buffer_->free();
-    int received_len =
-        esp_http_client_read(this->client_, (char *) this->output_transfer_buffer_->get_buffer_end(), bytes_to_read);
-
-    if (received_len > 0) {
-      this->output_transfer_buffer_->increase_buffer_length(received_len);
-      this->last_data_read_ms_ = millis();
-    } else if (received_len < 0) {
-      // HTTP read error
-      this->cleanup_connection_();
-      return AudioReaderState::FAILED;
-    } else {
-      if (bytes_to_read > 0) {
-        // Read timed out
-        if ((millis() - this->last_data_read_ms_) > CONNECTION_TIMEOUT_MS) {
-          this->cleanup_connection_();
-          return AudioReaderState::FAILED;
-        }
-
-        delay(READ_WRITE_TIMEOUT_MS);
-      }
-    }
-  }
-
-  return AudioReaderState::READING;
-}
-
-void AudioReader::cleanup_connection_() {
-  if (this->client_ != nullptr) {
-    esp_http_client_close(this->client_);
-    esp_http_client_cleanup(this->client_);
-    this->client_ = nullptr;
-  }
-}
-
-}  // namespace audio
-}  // namespace esphome
-
-#endif
--- a/esphome/components/audio/audio_reader.h
+++ b/esphome/components/audio/audio_reader.h
@@ -1,85 +0,0 @@
-#pragma once
-
-#ifdef USE_ESP_IDF
-
-#include "audio.h"
-#include "audio_transfer_buffer.h"
-
-#include "esphome/core/ring_buffer.h"
-
-#include "esp_err.h"
-
-#include <esp_http_client.h>
-
-namespace esphome {
-namespace audio {
-
-enum class AudioReaderState : uint8_t {
-  READING = 0,  // More data is available to read
-  FINISHED,     // All data has been read and transferred
-  FAILED,       // Encountered an error
-};
-
-class AudioReader {
-  /*
-   * @brief Class that facilitates reading a raw audio file.
-   * Files can be read from flash (stored in a AudioFile struct) or from an http source.
-   * The file data is sent to a ring buffer sink.
-   */
- public:
-  /// @brief Constructs an AudioReader object.
-  /// The transfer buffer isn't allocated here, but only if necessary (an http source) in the start function.
-  /// @param buffer_size Transfer buffer size in bytes.
-  AudioReader(size_t buffer_size) : buffer_size_(buffer_size) {}
-  ~AudioReader();
-
-  /// @brief Adds a sink ring buffer for audio data. Takes ownership of the ring buffer in a shared_ptr
-  /// @param output_ring_buffer weak_ptr of a shared_ptr of the sink ring buffer to transfer ownership
-  /// @return  ESP_OK if successful, ESP_ERR_INVALID_STATE otherwise
-  esp_err_t add_sink(const std::weak_ptr<RingBuffer> &output_ring_buffer);
-
-  /// @brief Starts reading an audio file from an http source. The transfer buffer is allocated here.
-  /// @param uri Web url to the http file.
-  /// @param file_type AudioFileType variable passed-by-reference indicating the type of file being read.
-  /// @return ESP_OK if successful, an ESP_ERR* code otherwise.
-  esp_err_t start(const std::string &uri, AudioFileType &file_type);
-
-  /// @brief Starts reading an audio file from flash. No transfer buffer is allocated.
-  /// @param audio_file AudioFile struct containing the file.
-  /// @param file_type AudioFileType variable passed-by-reference indicating the type of file being read.
-  /// @return ESP_OK
-  esp_err_t start(AudioFile *audio_file, AudioFileType &file_type);
-
-  /// @brief Reads new file data from the source and sends to the ring buffer sink.
-  /// @return AudioReaderState
-  AudioReaderState read();
-
- protected:
-  /// @brief Monitors the http client events to attempt determining the file type from the Content-Type header
-  static esp_err_t http_event_handler(esp_http_client_event_t *evt);
-
-  /// @brief Determines the audio file type from the http header's Content-Type key
-  /// @param content_type string with the Content-Type key
-  /// @return AudioFileType of the url, if it can be determined. If not, return AudioFileType::NONE.
-  static AudioFileType get_audio_type(const char *content_type);
-
-  AudioReaderState file_read_();
-  AudioReaderState http_read_();
-
-  std::shared_ptr<RingBuffer> file_ring_buffer_;
-  std::unique_ptr<AudioSinkTransferBuffer> output_transfer_buffer_;
-  void cleanup_connection_();
-
-  size_t buffer_size_;
-  uint32_t last_data_read_ms_;
-
-  esp_http_client_handle_t client_{nullptr};
-
-  AudioFile *current_audio_file_{nullptr};
-  AudioFileType audio_file_type_{AudioFileType::NONE};
-  const uint8_t *file_current_{nullptr};
-};
-}  // namespace audio
-}  // namespace esphome
-
-#endif
--- a/esphome/components/audio/audio_resampler.cpp
+++ b/esphome/components/audio/audio_resampler.cpp
@@ -1,161 +0,0 @@
-#include "audio_resampler.h"
-
-#ifdef USE_ESP32
-
-#include "esphome/core/hal.h"
-
-namespace esphome {
-namespace audio {
-
-static const uint32_t READ_WRITE_TIMEOUT_MS = 20;
-
-AudioResampler::AudioResampler(size_t input_buffer_size, size_t output_buffer_size)
-    : input_buffer_size_(input_buffer_size), output_buffer_size_(output_buffer_size) {
-  this->input_transfer_buffer_ = AudioSourceTransferBuffer::create(input_buffer_size);
-  this->output_transfer_buffer_ = AudioSinkTransferBuffer::create(output_buffer_size);
-}
-
-esp_err_t AudioResampler::add_source(std::weak_ptr<RingBuffer> &input_ring_buffer) {
-  if (this->input_transfer_buffer_ != nullptr) {
-    this->input_transfer_buffer_->set_source(input_ring_buffer);
-    return ESP_OK;
-  }
-  return ESP_ERR_NO_MEM;
-}
-
-esp_err_t AudioResampler::add_sink(std::weak_ptr<RingBuffer> &output_ring_buffer) {
-  if (this->output_transfer_buffer_ != nullptr) {
-    this->output_transfer_buffer_->set_sink(output_ring_buffer);
-    return ESP_OK;
-  }
-  return ESP_ERR_NO_MEM;
-}
-
-#ifdef USE_SPEAKER
-esp_err_t AudioResampler::add_sink(speaker::Speaker *speaker) {
-  if (this->output_transfer_buffer_ != nullptr) {
-    this->output_transfer_buffer_->set_sink(speaker);
-    return ESP_OK;
-  }
-  return ESP_ERR_NO_MEM;
-}
-#endif
-
-esp_err_t AudioResampler::start(AudioStreamInfo &input_stream_info, AudioStreamInfo &output_stream_info,
-                                uint16_t number_of_taps, uint16_t number_of_filters) {
-  this->input_stream_info_ = input_stream_info;
-  this->output_stream_info_ = output_stream_info;
-
-  if ((this->input_transfer_buffer_ == nullptr) || (this->output_transfer_buffer_ == nullptr)) {
-    return ESP_ERR_NO_MEM;
-  }
-
-  if ((input_stream_info.get_bits_per_sample() > 32) || (output_stream_info.get_bits_per_sample() > 32) ||
-      (input_stream_info_.get_channels() != output_stream_info.get_channels())) {
-    return ESP_ERR_NOT_SUPPORTED;
-  }
-
-  if ((input_stream_info.get_sample_rate() != output_stream_info.get_sample_rate()) ||
-      (input_stream_info.get_bits_per_sample() != output_stream_info.get_bits_per_sample())) {
-    this->resampler_ = make_unique<esp_audio_libs::resampler::Resampler>(
-        input_stream_info.bytes_to_samples(this->input_buffer_size_),
-        output_stream_info.bytes_to_samples(this->output_buffer_size_));
-
-    // Use cascaded biquad filters when downsampling to avoid aliasing
-    bool use_pre_filter = output_stream_info.get_sample_rate() < input_stream_info.get_sample_rate();
-
-    esp_audio_libs::resampler::ResamplerConfiguration resample_config = {
-        .source_sample_rate = static_cast<float>(input_stream_info.get_sample_rate()),
-        .target_sample_rate = static_cast<float>(output_stream_info.get_sample_rate()),
-        .source_bits_per_sample = input_stream_info.get_bits_per_sample(),
-        .target_bits_per_sample = output_stream_info.get_bits_per_sample(),
-        .channels = input_stream_info_.get_channels(),
-        .use_pre_or_post_filter = use_pre_filter,
-        .subsample_interpolate = false,  // Doubles the CPU load. Using more filters is a better alternative
-        .number_of_taps = number_of_taps,
-        .number_of_filters = number_of_filters,
-    };
-
-    if (!this->resampler_->initialize(resample_config)) {
-      // Failed to allocate the resampler's internal buffers
-      return ESP_ERR_NO_MEM;
-    }
-  }
-
-  return ESP_OK;
-}
-
-AudioResamplerState AudioResampler::resample(bool stop_gracefully, int32_t *ms_differential) {
-  if (stop_gracefully) {
-    if (!this->input_transfer_buffer_->has_buffered_data() && (this->output_transfer_buffer_->available() == 0)) {
-      return AudioResamplerState::FINISHED;
-    }
-  }
-
-  if (!this->pause_output_) {
-    // Move audio data to the sink without shifting the data in the output transfer buffer to avoid unnecessary, slow
-    // data moves
-    this->output_transfer_buffer_->transfer_data_to_sink(pdMS_TO_TICKS(READ_WRITE_TIMEOUT_MS), false);
-  } else {
-    // If paused, block to avoid wasting CPU resources
-    delay(READ_WRITE_TIMEOUT_MS);
-  }
-
-  this->input_transfer_buffer_->transfer_data_from_source(pdMS_TO_TICKS(READ_WRITE_TIMEOUT_MS));
-
-  if (this->input_transfer_buffer_->available() == 0) {
-    // No samples available to process
-    return AudioResamplerState::RESAMPLING;
-  }
-
-  const size_t bytes_free = this->output_transfer_buffer_->free();
-  const uint32_t frames_free = this->output_stream_info_.bytes_to_frames(bytes_free);
-
-  const size_t bytes_available = this->input_transfer_buffer_->available();
-  const uint32_t frames_available = this->input_stream_info_.bytes_to_frames(bytes_available);
-
-  if ((this->input_stream_info_.get_sample_rate() != this->output_stream_info_.get_sample_rate()) ||
-      (this->input_stream_info_.get_bits_per_sample() != this->output_stream_info_.get_bits_per_sample())) {
-    // Adjust gain by -3 dB to avoid clipping due to the resampling process
-    esp_audio_libs::resampler::ResamplerResults results =
-        this->resampler_->resample(this->input_transfer_buffer_->get_buffer_start(),
-                                   this->output_transfer_buffer_->get_buffer_end(), frames_available, frames_free, -3);
-
-    this->input_transfer_buffer_->decrease_buffer_length(this->input_stream_info_.frames_to_bytes(results.frames_used));
-    this->output_transfer_buffer_->increase_buffer_length(
-        this->output_stream_info_.frames_to_bytes(results.frames_generated));
-
-    // Resampling causes slight differences in the durations used versus generated. Computes the difference in
-    // millisconds. The callback function passing the played audio duration uses the difference to convert from output
-    // duration to input duration.
-    this->accumulated_frames_used_ += results.frames_used;
-    this->accumulated_frames_generated_ += results.frames_generated;
-
-    const int32_t used_ms =
-        this->input_stream_info_.frames_to_milliseconds_with_remainder(&this->accumulated_frames_used_);
-    const int32_t generated_ms =
-        this->output_stream_info_.frames_to_milliseconds_with_remainder(&this->accumulated_frames_generated_);
-
-    *ms_differential = used_ms - generated_ms;
-
-  } else {
-    // No resampling required, copy samples directly to the output transfer buffer
-    *ms_differential = 0;
-
-    const size_t bytes_to_transfer = std::min(this->output_stream_info_.frames_to_bytes(frames_free),
-                                              this->input_stream_info_.frames_to_bytes(frames_available));
-
-    std::memcpy((void *) this->output_transfer_buffer_->get_buffer_end(),
-                (void *) this->input_transfer_buffer_->get_buffer_start(), bytes_to_transfer);
-
-    this->input_transfer_buffer_->decrease_buffer_length(bytes_to_transfer);
-    this->output_transfer_buffer_->increase_buffer_length(bytes_to_transfer);
-  }
-
-  return AudioResamplerState::RESAMPLING;
-}
-
-}  // namespace audio
-}  // namespace esphome
-
-#endif
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jesse Hills	cdce8bb9be	Bump api minor version	2024-12-06 16:36:38 +13:00
Jesse Hills	d64cfd18ed	[project] Split Project name and manufacturer config	2024-12-06 16:32:07 +13:00