Rewrite PMSX003 to be less repetitive

2025-11-03 00:21:56 +00:00 · 2022-02-18 16:13:27 +13:00
739 changed files with 6626 additions and 35147 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -25,9 +25,10 @@ indent_size = 2
 [*.{yaml,yml}]
 indent_style = space
 indent_size = 2
-quote_type = double
+quote_type = single

 # JSON
 [*.json]
 indent_style = space
 indent_size = 2
+
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,4 +1,3 @@
---
 # These are supported funding model platforms

 custom: https://www.nabucasa.com
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,4 +1,3 @@
---
 blank_issues_enabled: false
 contact_links:
  - name: Issue Tracker
@@ -6,10 +5,8 @@ contact_links:
    about: Please create bug reports in the dedicated issue tracker.
  - name: Feature Request Tracker
    url: https://github.com/esphome/feature-requests
-    about: |
-      Please create feature requests in the dedicated feature request tracker.
+    about: Please create feature requests in the dedicated feature request tracker.
  - name: Frequently Asked Question
    url: https://esphome.io/guides/faq.html
-    about: |
-      Please view the FAQ for common questions and what
-      to include in a bug report.
+    about: Please view the FAQ for common questions and what to include in a bug report.
+    
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,4 @@
-# What does this implement/fix?
+# What does this implement/fix? 

 Quick description and explanation of changes

@@ -35,6 +35,6 @@ Quick description and explanation of changes
 ## Checklist:
  - [ ] The code change is tested and works locally.
  - [ ] Tests have been added to verify that the new code works (under `tests/` folder).
-
+  
 If user exposed functionality or configuration variables are added/changed:
  - [ ] Documentation added/updated in [esphome-docs](https://github.com/esphome/esphome-docs).
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,15 +1,9 @@
---
 version: 2
 updates:
-  - package-ecosystem: pip
+  - package-ecosystem: "pip"
    directory: "/"
    schedule:
-      interval: daily
+      interval: "daily"
    ignore:
      # Hypotehsis is only used for testing and is updated quite often
      - dependency-name: hypothesis
-  - package-ecosystem: github-actions
-    directory: "/"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 10
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -1,23 +1,21 @@
---
 name: CI for docker images

 # Only run when docker paths change
-# yamllint disable-line rule:truthy
 on:
  push:
    branches: [dev, beta, release]
    paths:
-      - "docker/**"
-      - ".github/workflows/**"
-      - "requirements*.txt"
-      - "platformio.ini"
+      - 'docker/**'
+      - '.github/workflows/**'
+      - 'requirements*.txt'
+      - 'platformio.ini'

  pull_request:
    paths:
-      - "docker/**"
-      - ".github/workflows/**"
-      - "requirements*.txt"
-      - "platformio.ini"
+      - 'docker/**'
+      - '.github/workflows/**'
+      - 'requirements*.txt'
+      - 'platformio.ini'

 permissions:
  contents: read
@@ -32,24 +30,24 @@ jobs:
        arch: [amd64, armv7, aarch64]
        build_type: ["ha-addon", "docker", "lint"]
    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.9"
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.9'
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v1

-      - name: Set TAG
-        run: |
-          echo "TAG=check" >> $GITHUB_ENV
+    - name: Set TAG
+      run: |
+        echo "TAG=check" >> $GITHUB_ENV

-      - name: Run build
-        run: |
-          docker/build.py \
-            --tag "${TAG}" \
-            --arch "${{ matrix.arch }}" \
-            --build-type "${{ matrix.build_type }}" \
-            build
+    - name: Run build
+      run: |
+        docker/build.py \
+          --tag "${TAG}" \
+          --arch "${{ matrix.arch }}" \
+          --build-type "${{ matrix.build_type }}" \
+          build
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,7 +1,5 @@
---
 name: CI

-# yamllint disable-line rule:truthy
 on:
  push:
    branches: [dev, beta, release]
@@ -12,7 +10,6 @@ permissions:
  contents: read

 concurrency:
-  # yamllint disable-line rule:line-length
  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
  cancel-in-progress: true

@@ -76,28 +73,24 @@ jobs:
            name: Run script/clang-tidy for ESP32 IDF
            options: --environment esp32-idf-tidy --grep USE_ESP_IDF
            pio_cache_key: tidyesp32-idf
-          - id: yamllint
-            name: Run yamllint

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
      - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v2
        id: python
        with:
-          python-version: "3.8"
+          python-version: '3.8'

      - name: Cache virtualenv
-        uses: actions/cache@v3
+        uses: actions/cache@v2
        with:
          path: .venv
-          # yamllint disable-line rule:line-length
          key: venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements*.txt') }}
          restore-keys: |
            venv-${{ steps.python.outputs.python-version }}-

      - name: Set up virtualenv
-        # yamllint disable rule:line-length
        run: |
          python -m venv .venv
          source .venv/bin/activate
@@ -106,14 +99,12 @@ jobs:
          pip install -e .
          echo "$GITHUB_WORKSPACE/.venv/bin" >> $GITHUB_PATH
          echo "VIRTUAL_ENV=$GITHUB_WORKSPACE/.venv" >> $GITHUB_ENV
-        # yamllint enable rule:line-length

      # Use per check platformio cache because checks use different parts
      - name: Cache platformio
-        uses: actions/cache@v3
+        uses: actions/cache@v2
        with:
          path: ~/.platformio
-          # yamllint disable-line rule:line-length
          key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}
        if: matrix.id == 'test' || matrix.id == 'clang-tidy'

@@ -140,7 +131,7 @@ jobs:
        if: matrix.id == 'ci-custom'

      - name: Lint Python
-        run: script/lint-python -a
+        run: script/lint-python
        if: matrix.id == 'lint-python'

      - run: esphome compile ${{ matrix.file }}
@@ -154,9 +145,8 @@ jobs:
          pytest -vv --tb=native tests
        if: matrix.id == 'pytest'

-      # Also run git-diff-index so that the step is marked as failed on
-      # formatting errors, since clang-format doesn't do anything but
-      # change files if -i is passed.
+      # Also run git-diff-index so that the step is marked as failed on formatting errors,
+      # since clang-format doesn't do anything but change files if -i is passed.
      - name: Run clang-format
        run: |
          script/clang-format -i
@@ -171,11 +161,6 @@ jobs:
          # Also cache libdeps, store them in a ~/.platformio subfolder
          PLATFORMIO_LIBDEPS_DIR: ~/.platformio/libdeps

-      - name: Run yamllint
-        if: matrix.id == 'yamllint'
-        uses: frenck/action-yamllint@v1.3.0
-
      - name: Suggested changes
        run: script/ci-suggest-changes
-        # yamllint disable-line rule:line-length
-        if: always() && (matrix.id == 'clang-tidy' || matrix.id == 'clang-format' || matrix.id == 'lint-python')
+        if: always() && (matrix.id == 'clang-tidy' || matrix.id == 'clang-format')
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -1,10 +1,8 @@
---
 name: Lock

-# yamllint disable-line rule:truthy
 on:
  schedule:
-    - cron: "30 0 * * *"
+    - cron: '30 0 * * *'
  workflow_dispatch:

 permissions:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,7 +1,5 @@
---
 name: Publish Release

-# yamllint disable-line rule:truthy
 on:
  workflow_dispatch:
  release:
@@ -19,10 +17,9 @@ jobs:
    outputs:
      tag: ${{ steps.tag.outputs.tag }}
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
      - name: Get tag
        id: tag
-        # yamllint disable rule:line-length
        run: |
          if [[ "$GITHUB_EVENT_NAME" = "release" ]]; then
            TAG="${GITHUB_REF#refs/tags/}"
@@ -32,18 +29,17 @@ jobs:
            TAG="${TAG}${today}"
          fi
          echo "::set-output name=tag::${TAG}"
-        # yamllint enable rule:line-length

  deploy-pypi:
    name: Build and publish to PyPi
    if: github.repository == 'esphome/esphome' && github.event_name == 'release'
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
      - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v1
        with:
-          python-version: "3.x"
+          python-version: '3.x'
      - name: Set up python environment
        run: |
          script/setup
@@ -69,37 +65,37 @@ jobs:
        arch: [amd64, armv7, aarch64]
        build_type: ["ha-addon", "docker", "lint"]
    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.9"
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.9'

-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v1

-      - name: Log in to docker hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Log in to the GitHub container registry
-        uses: docker/login-action@v2
-        with:
+    - name: Log in to docker hub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_USER }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+    - name: Log in to the GitHub container registry
+      uses: docker/login-action@v1
+      with:
          registry: ghcr.io
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}

-      - name: Build and push
-        run: |
-          docker/build.py \
-            --tag "${{ needs.init.outputs.tag }}" \
-            --arch "${{ matrix.arch }}" \
-            --build-type "${{ matrix.build_type }}" \
-            build \
-            --push
+    - name: Build and push
+      run: |
+        docker/build.py \
+          --tag "${{ needs.init.outputs.tag }}" \
+          --arch "${{ matrix.arch }}" \
+          --build-type "${{ matrix.build_type }}" \
+          build \
+          --push

  deploy-docker-manifest:
    if: github.repository == 'esphome/esphome'
@@ -112,34 +108,34 @@ jobs:
      matrix:
        build_type: ["ha-addon", "docker", "lint"]
    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.9"
-      - name: Enable experimental manifest support
-        run: |
-          mkdir -p ~/.docker
-          echo "{\"experimental\": \"enabled\"}" > ~/.docker/config.json
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.9'
+    - name: Enable experimental manifest support
+      run: |
+        mkdir -p ~/.docker
+        echo "{\"experimental\": \"enabled\"}" > ~/.docker/config.json

-      - name: Log in to docker hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Log in to the GitHub container registry
-        uses: docker/login-action@v2
-        with:
+    - name: Log in to docker hub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_USER }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+    - name: Log in to the GitHub container registry
+      uses: docker/login-action@v1
+      with:
          registry: ghcr.io
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}

-      - name: Run manifest
-        run: |
-          docker/build.py \
-            --tag "${{ needs.init.outputs.tag }}" \
-            --build-type "${{ matrix.build_type }}" \
-            manifest
+    - name: Run manifest
+      run: |
+        docker/build.py \
+          --tag "${{ needs.init.outputs.tag }}" \
+          --build-type "${{ matrix.build_type }}" \
+          manifest

  deploy-ha-addon-repo:
    if: github.repository == 'esphome/esphome' && github.event_name == 'release'
@@ -148,7 +144,6 @@ jobs:
    steps:
      - env:
          TOKEN: ${{ secrets.DEPLOY_HA_ADDON_REPO_TOKEN }}
-        # yamllint disable rule:line-length
        run: |
          TAG="${GITHUB_REF#refs/tags/}"
          curl \
@@ -157,4 +152,3 @@ jobs:
            -H "Accept: application/vnd.github.v3+json" \
            https://api.github.com/repos/esphome/home-assistant-addon/actions/workflows/bump-version.yml/dispatches \
            -d "{\"ref\":\"main\",\"inputs\":{\"version\":\"$TAG\"}}"
-        # yamllint enable rule:line-length
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,10 +1,8 @@
---
 name: Stale

-# yamllint disable-line rule:truthy
 on:
  schedule:
-    - cron: "30 0 * * *"
+    - cron: '30 0 * * *'
  workflow_dispatch:

 permissions:
@@ -18,7 +16,7 @@ jobs:
  stale:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v4
        with:
          days-before-pr-stale: 90
          days-before-pr-close: 7
@@ -33,12 +31,11 @@ jobs:
            and will be closed if no further activity occurs within 7 days.
            Thank you for your contributions.

-  # Use stale to automatically close issues with a
-  # reference to the issue tracker
+  # Use stale to automatically close issues with a reference to the issue tracker
  close-issues:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v4
        with:
          days-before-pr-stale: -1
          days-before-pr-close: -1
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,8 +1,6 @@
---
 ports:
-  - port: 6052
-    onOpen: open-preview
+- port: 6052
+  onOpen: open-preview
 tasks:
-  # yamllint disable-line rule:line-length
-  - before: pyenv local $(pyenv version | grep '^3\.' | cut -d ' ' -f 1) && script/setup
-    command: python -m esphome dashboard config
+- before: pyenv local $(pyenv version | grep '^3\.' | cut -d ' ' -f 1) && script/setup
+  command: python -m esphome dashboard config
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,15 +1,14 @@
---
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
  - repo: https://github.com/ambv/black
-    rev: 22.6.0
+    rev: 22.1.0
    hooks:
-      - id: black
-        args:
-          - --safe
-          - --quiet
-        files: ^((esphome|script|tests)/.+)?[^/]+\.py$
+    - id: black
+      args:
+        - --safe
+        - --quiet
+      files: ^((esphome|script|tests)/.+)?[^/]+\.py$
  - repo: https://gitlab.com/pycqa/flake8
    rev: 4.0.1
    hooks:
@@ -27,7 +26,7 @@ repos:
          - --branch=release
          - --branch=beta
  - repo: https://github.com/asottile/pyupgrade
-    rev: v2.37.3
+    rev: v2.31.0
    hooks:
      - id: pyupgrade
        args: [--py38-plus]
--- a/.yamllint
+++ b/.yamllint
@@ -1,3 +0,0 @@
---
-ignore: |
-  venv/
--- a/47
+++ b/47
@@ -28,16 +28,9 @@ esphome/components/atc_mithermometer/* @ahpohl
 esphome/components/b_parasite/* @rbaron
 esphome/components/ballu/* @bazuchan
 esphome/components/bang_bang/* @OttoWinter
-esphome/components/bedjet/* @jhansche
-esphome/components/bedjet/climate/* @jhansche
-esphome/components/bedjet/fan/* @jhansche
-esphome/components/bh1750/* @OttoWinter
 esphome/components/binary_sensor/* @esphome/core
-esphome/components/bl0939/* @ziceva
 esphome/components/bl0940/* @tobias-
-esphome/components/bl0942/* @dbuezas
 esphome/components/ble_client/* @buxtronix
-esphome/components/bluetooth_proxy/* @jesserockz
 esphome/components/bme680_bsec/* @trvrnrth
 esphome/components/bmp3xx/* @martgras
 esphome/components/button/* @esphome/core
@@ -50,24 +43,19 @@ esphome/components/climate/* @esphome/core
 esphome/components/climate_ir/* @glmnet
 esphome/components/color_temperature/* @jesserockz
 esphome/components/coolix/* @glmnet
-esphome/components/copy/* @OttoWinter
 esphome/components/cover/* @esphome/core
 esphome/components/cs5460a/* @balrog-kun
 esphome/components/cse7761/* @berfenger
 esphome/components/ct_clamp/* @jesserockz
 esphome/components/current_based/* @djwmarcx
-esphome/components/dac7678/* @NickB1
 esphome/components/daly_bms/* @s1lvi0
 esphome/components/dashboard_import/* @esphome/core
 esphome/components/debug/* @OttoWinter
-esphome/components/delonghi/* @grob6000
 esphome/components/dfplayer/* @glmnet
 esphome/components/dht/* @OttoWinter
-esphome/components/dps310/* @kbx81
 esphome/components/ds1307/* @badbadc0ffee
 esphome/components/dsmr/* @glmnet @zuidwijk
 esphome/components/ektf2232/* @jesserockz
-esphome/components/ens210/* @itn3rd77
 esphome/components/esp32/* @esphome/core
 esphome/components/esp32_ble/* @jesserockz
 esphome/components/esp32_ble_server/* @jesserockz
@@ -77,9 +65,7 @@ esphome/components/esp32_improv/* @jesserockz
 esphome/components/esp8266/* @esphome/core
 esphome/components/exposure_notifications/* @OttoWinter
 esphome/components/ezo/* @ssieb
-esphome/components/factory_reset/* @anatoly-savchenkov
 esphome/components/fastled_base/* @OttoWinter
-esphome/components/feedback/* @ianchi
 esphome/components/fingerprint_grow/* @OnFreund @loongyh
 esphome/components/globals/* @esphome/core
 esphome/components/gpio/* @esphome/core
@@ -92,11 +78,8 @@ esphome/components/hbridge/light/* @DotNetDann
 esphome/components/heatpumpir/* @rob-deutsch
 esphome/components/hitachi_ac424/* @sourabhjaiswal
 esphome/components/homeassistant/* @OttoWinter
-esphome/components/honeywellabp/* @RubyBailey
 esphome/components/hrxl_maxsonar_wr/* @netmikey
-esphome/components/hydreon_rgxx/* @functionpointer
 esphome/components/i2c/* @esphome/core
-esphome/components/i2s_audio/* @jesserockz
 esphome/components/improv_serial/* @esphome/core
 esphome/components/ina260/* @MrEditor97
 esphome/components/inkbird_ibsth1_mini/* @fkirill
@@ -111,8 +94,6 @@ esphome/components/lilygo_t5_47/touchscreen/* @jesserockz
 esphome/components/lock/* @esphome/core
 esphome/components/logger/* @esphome/core
 esphome/components/ltr390/* @sjtrny
-esphome/components/max31865/* @DAVe3283
-esphome/components/max44009/* @berfenger
 esphome/components/max7219digit/* @rspaargaren
 esphome/components/max9611/* @mckaymatthew
 esphome/components/mcp23008/* @jesserockz
@@ -124,13 +105,10 @@ esphome/components/mcp23x17_base/* @jesserockz
 esphome/components/mcp23xxx_base/* @jesserockz
 esphome/components/mcp2515/* @danielschramm @mvturnho
 esphome/components/mcp3204/* @rsumner
-esphome/components/mcp4728/* @berfenger
 esphome/components/mcp47a1/* @jesserockz
-esphome/components/mcp9600/* @MrEditor97
 esphome/components/mcp9808/* @k7hpn
 esphome/components/md5/* @esphome/core
 esphome/components/mdns/* @esphome/core
-esphome/components/media_player/* @jesserockz
 esphome/components/midea/* @dudanov
 esphome/components/midea_ir/* @dudanov
 esphome/components/mitsubishi/* @RubyBailey
@@ -143,10 +121,6 @@ esphome/components/modbus_controller/select/* @martgras @stegm
 esphome/components/modbus_controller/sensor/* @martgras
 esphome/components/modbus_controller/switch/* @martgras
 esphome/components/modbus_controller/text_sensor/* @martgras
-esphome/components/mopeka_ble/* @spbrogan
-esphome/components/mopeka_pro_check/* @spbrogan
-esphome/components/mpl3115a2/* @kbickar
-esphome/components/mpu6886/* @fabaff
 esphome/components/network/* @esphome/core
 esphome/components/nextion/* @senexcrenshaw
 esphome/components/nextion/binary_sensor/* @senexcrenshaw
@@ -167,9 +141,8 @@ esphome/components/pn532_spi/* @OttoWinter @jesserockz
 esphome/components/power_supply/* @esphome/core
 esphome/components/preferences/* @esphome/core
 esphome/components/psram/* @esphome/core
-esphome/components/pulse_meter/* @cstaahl @stevebaxter
+esphome/components/pulse_meter/* @stevebaxter
 esphome/components/pvvx_mithermometer/* @pasiz
-esphome/components/qmp6988/* @andrewpc
 esphome/components/qr_code/* @wjtje
 esphome/components/radon_eye_ble/* @jeffeb3
 esphome/components/radon_eye_rd200/* @jeffeb3
@@ -181,29 +154,20 @@ esphome/components/rf_bridge/* @jesserockz
 esphome/components/rgbct/* @jesserockz
 esphome/components/rtttl/* @glmnet
 esphome/components/safe_mode/* @jsuanet @paulmonigatti
-esphome/components/scd4x/* @martgras @sjtrny
+esphome/components/scd4x/* @sjtrny
 esphome/components/script/* @esphome/core
 esphome/components/sdm_meter/* @jesserockz @polyfaces
 esphome/components/sdp3x/* @Azimath
 esphome/components/selec_meter/* @sourabhjaiswal
 esphome/components/select/* @esphome/core
-esphome/components/sen5x/* @martgras
-esphome/components/sensirion_common/* @martgras
 esphome/components/sensor/* @esphome/core
 esphome/components/sgp40/* @SenexCrenshaw
-esphome/components/sgp4x/* @SenexCrenshaw @martgras
-esphome/components/shelly_dimmer/* @edge90 @rnauber
 esphome/components/sht4x/* @sjtrny
 esphome/components/shutdown/* @esphome/core @jsuanet
 esphome/components/sim800l/* @glmnet
 esphome/components/sm2135/* @BoukeHaarsma23
-esphome/components/sml/* @alengwenus
-esphome/components/smt100/* @piechade
 esphome/components/socket/* @esphome/core
-esphome/components/sonoff_d1/* @anatoly-savchenkov
 esphome/components/spi/* @esphome/core
-esphome/components/sprinkler/* @kbx81
-esphome/components/sps30/* @martgras
 esphome/components/ssd1322_base/* @kbx81
 esphome/components/ssd1322_spi/* @kbx81
 esphome/components/ssd1325_base/* @kbx81
@@ -228,9 +192,7 @@ esphome/components/teleinfo/* @0hax
 esphome/components/thermostat/* @kbx81
 esphome/components/time/* @OttoWinter
 esphome/components/tlc5947/* @rnauber
-esphome/components/tm1621/* @Philippe12
 esphome/components/tm1637/* @glmnet
-esphome/components/tm1638/* @skykingjwc
 esphome/components/tmp102/* @timsavage
 esphome/components/tmp117/* @Azimath
 esphome/components/tof10120/* @wstrzalka
@@ -240,21 +202,16 @@ esphome/components/tsl2591/* @wjcarpenter
 esphome/components/tuya/binary_sensor/* @jesserockz
 esphome/components/tuya/climate/* @jesserockz
 esphome/components/tuya/number/* @frankiboy1
-esphome/components/tuya/select/* @bearpawmaxim
 esphome/components/tuya/sensor/* @jesserockz
 esphome/components/tuya/switch/* @jesserockz
 esphome/components/tuya/text_sensor/* @dentra
 esphome/components/uart/* @esphome/core
-esphome/components/ufire_ec/* @pvizeli
-esphome/components/ufire_ise/* @pvizeli
 esphome/components/ultrasonic/* @OttoWinter
 esphome/components/version/* @esphome/core
 esphome/components/wake_on_lan/* @willwill2will54
 esphome/components/web_server_base/* @OttoWinter
 esphome/components/whirlpool/* @glmnet
-esphome/components/whynter/* @aeonsablaze
 esphome/components/xiaomi_lywsd03mmc/* @ahpohl
 esphome/components/xiaomi_mhoc303/* @drug123
 esphome/components/xiaomi_mhoc401/* @vevsvevs
-esphome/components/xiaomi_rtcgq02lm/* @jesserockz
 esphome/components/xpt2046/* @numo68
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,7 +5,7 @@ For a detailed guide, please see https://esphome.io/guides/contributing.html#con
 Things to note when contributing:

 - Please test your changes :)
- - If a new feature is added or an existing user-facing feature is changed, you should also
+ - 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
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -6,13 +6,13 @@
 ARG BASEIMGTYPE=docker

 # https://github.com/hassio-addons/addon-debian-base/releases
-FROM ghcr.io/hassio-addons/debian-base/amd64:5.3.0 AS base-hassio-amd64
-FROM ghcr.io/hassio-addons/debian-base/aarch64:5.3.0 AS base-hassio-arm64
-FROM ghcr.io/hassio-addons/debian-base/armv7:5.3.0 AS base-hassio-armv7
+FROM ghcr.io/hassio-addons/debian-base/amd64:5.2.3 AS base-hassio-amd64
+FROM ghcr.io/hassio-addons/debian-base/aarch64:5.2.3 AS base-hassio-arm64
+FROM ghcr.io/hassio-addons/debian-base/armv7:5.2.3 AS base-hassio-armv7
 # https://hub.docker.com/_/debian?tab=tags&page=1&name=bullseye
-FROM debian:bullseye-20220328-slim AS base-docker-amd64
-FROM debian:bullseye-20220328-slim AS base-docker-arm64
-FROM debian:bullseye-20220328-slim AS base-docker-armv7
+FROM debian:bullseye-20220125-slim AS base-docker-amd64
+FROM debian:bullseye-20220125-slim AS base-docker-arm64
+FROM debian:bullseye-20220125-slim AS base-docker-armv7

 # Use TARGETARCH/TARGETVARIANT defined by docker
 # https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
@@ -23,14 +23,13 @@ RUN \
    # Use pinned versions so that we get updates with build caching
    && apt-get install -y --no-install-recommends \
        python3=3.9.2-3 \
-        python3-pip=20.3.4-4+deb11u1 \
+        python3-pip=20.3.4-4 \
        python3-setuptools=52.0.0-4 \
        python3-pil=8.1.2+dfsg-0.3+deb11u1 \
        python3-cryptography=3.3.2-1 \
        iputils-ping=3:20210202-1 \
        git=1:2.30.2-1 \
        curl=7.74.0-1.3+deb11u1 \
-        openssh-client=1:8.4p1-5 \
    && rm -rf \
        /tmp/* \
        /var/{cache,log}/* \
@@ -46,10 +45,12 @@ RUN \
    # Ubuntu python3-pip is missing wheel
    pip3 install --no-cache-dir \
        wheel==0.37.1 \
-        platformio==6.0.2 \
+        platformio==5.2.5 \
    # Change some platformio settings
    && platformio settings set enable_telemetry No \
+    && platformio settings set check_libraries_interval 1000000 \
    && platformio settings set check_platformio_interval 1000000 \
+    && platformio settings set check_platforms_interval 1000000 \
    && mkdir -p /piolibs


@@ -94,7 +95,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.18.0-6.1+deb11u2 \
+        nginx-light=1.18.0-6.1 \
    && rm -rf \
        /tmp/* \
        /var/{cache,log}/* \
@@ -134,7 +135,7 @@ RUN \
        clang-tidy-11=1:11.0.1-2 \
        patch=2.7.6-7 \
        software-properties-common=0.96.20.2-2.1 \
-        nano=5.4-2+deb11u1 \
+        nano=5.4-2 \
        build-essential=12.9 \
        python3-dev=3.9.2-3 \
    && rm -rf \
--- a/docker/build.py
+++ b/docker/build.py
@@ -88,12 +88,10 @@ def main():
                sys.exit(1)

    # detect channel from tag
-    match = re.match(r"^(\d+\.\d+)(?:\.\d+)?(b\d+)?$", args.tag)
-    major_minor_version = None
+    match = re.match(r'^\d+\.\d+(?:\.\d+)?(b\d+)?$', args.tag)
    if match is None:
        channel = CHANNEL_DEV
-    elif match.group(2) is None:
-        major_minor_version = match.group(1)
+    elif match.group(1) is None:
        channel = CHANNEL_RELEASE
    else:
        channel = CHANNEL_BETA
@@ -108,11 +106,6 @@ def main():
        tags_to_push.append("beta")
        tags_to_push.append("latest")

-        # Compatibility with HA tags
-        if major_minor_version:
-            tags_to_push.append("stable")
-            tags_to_push.append(major_minor_version)
-
    if args.command == "build":
        # 1. pull cache image
        params = DockerParams.for_type_arch(args.build_type, args.arch)
--- a/docker/ha-addon-rootfs/etc/cont-init.d/10-requirements.sh
+++ b/docker/ha-addon-rootfs/etc/cont-init.d/10-requirements.sh
@@ -7,12 +7,12 @@
 # Check SSL requirements, if enabled
 if bashio::config.true 'ssl'; then
    if ! bashio::config.has_value 'certfile'; then
-        bashio::log.fatal 'SSL is enabled, but no certfile was specified.'
+        bashio::fatal 'SSL is enabled, but no certfile was specified.'
        bashio::exit.nok
    fi

    if ! bashio::config.has_value 'keyfile'; then
-        bashio::log.fatal 'SSL is enabled, but no keyfile was specified'
+        bashio::fatal 'SSL is enabled, but no keyfile was specified'
        bashio::exit.nok
    fi

--- a/esphome/main.py
+++ b/esphome/main.py
@@ -2,7 +2,6 @@ import argparse
 import functools
 import logging
 import os
-import re
 import sys
 from datetime import datetime

@@ -10,18 +9,15 @@ from esphome import const, writer, yaml_util
 import esphome.codegen as cg
 from esphome.config import iter_components, read_config, strip_default_ids
 from esphome.const import (
-    ALLOWED_NAME_CHARS,
    CONF_BAUD_RATE,
    CONF_BROKER,
    CONF_DEASSERT_RTS_DTR,
    CONF_LOGGER,
-    CONF_NAME,
    CONF_OTA,
    CONF_PASSWORD,
    CONF_PORT,
    CONF_ESPHOME,
    CONF_PLATFORMIO_OPTIONS,
-    CONF_SUBSTITUTIONS,
    SECRETS_FILES,
 )
 from esphome.core import CORE, EsphomeError, coroutine
@@ -485,98 +481,6 @@ def command_idedata(args, config):
    return 0


-def command_rename(args, config):
-    for c in args.name:
-        if c not in ALLOWED_NAME_CHARS:
-            print(
-                color(
-                    Fore.BOLD_RED,
-                    f"'{c}' is an invalid character for names. Valid characters are: "
-                    f"{ALLOWED_NAME_CHARS} (lowercase, no spaces)",
-                )
-            )
-            return 1
-    # Load existing yaml file
-    with open(CORE.config_path, mode="r+", encoding="utf-8") as raw_file:
-        raw_contents = raw_file.read()
-
-    yaml = yaml_util.load_yaml(CORE.config_path)
-    if CONF_ESPHOME not in yaml or CONF_NAME not in yaml[CONF_ESPHOME]:
-        print(
-            color(Fore.BOLD_RED, "Complex YAML files cannot be automatically renamed.")
-        )
-        return 1
-    old_name = yaml[CONF_ESPHOME][CONF_NAME]
-    match = re.match(r"^\$\{?([a-zA-Z0-9_]+)\}?$", old_name)
-    if match is None:
-        new_raw = re.sub(
-            rf"name:\s+[\"']?{old_name}[\"']?",
-            f'name: "{args.name}"',
-            raw_contents,
-        )
-    else:
-        old_name = yaml[CONF_SUBSTITUTIONS][match.group(1)]
-        if (
-            len(
-                re.findall(
-                    rf"^\s+{match.group(1)}:\s+[\"']?{old_name}[\"']?",
-                    raw_contents,
-                    flags=re.MULTILINE,
-                )
-            )
-            > 1
-        ):
-            print(color(Fore.BOLD_RED, "Too many matches in YAML to safely rename"))
-            return 1
-
-        new_raw = re.sub(
-            rf"^(\s+{match.group(1)}):\s+[\"']?{old_name}[\"']?",
-            f'\\1: "{args.name}"',
-            raw_contents,
-            flags=re.MULTILINE,
-        )
-
-    new_path = os.path.join(CORE.config_dir, args.name + ".yaml")
-    print(
-        f"Updating {color(Fore.CYAN, CORE.config_path)} to {color(Fore.CYAN, new_path)}"
-    )
-    print()
-
-    with open(new_path, mode="w", encoding="utf-8") as new_file:
-        new_file.write(new_raw)
-
-    rc = run_external_process("esphome", "config", new_path)
-    if rc != 0:
-        print(color(Fore.BOLD_RED, "Rename failed. Reverting changes."))
-        os.remove(new_path)
-        return 1
-
-    cli_args = [
-        "run",
-        new_path,
-        "--no-logs",
-        "--device",
-        CORE.address,
-    ]
-
-    if args.dashboard:
-        cli_args.insert(0, "--dashboard")
-
-    try:
-        rc = run_external_process("esphome", *cli_args)
-    except KeyboardInterrupt:
-        rc = 1
-    if rc != 0:
-        os.remove(new_path)
-        return 1
-
-    os.remove(CORE.config_path)
-
-    print(color(Fore.BOLD_GREEN, "SUCCESS"))
-    print()
-    return 0
-
-
 PRE_CONFIG_ACTIONS = {
    "wizard": command_wizard,
    "version": command_version,
@@ -595,7 +499,6 @@ POST_CONFIG_ACTIONS = {
    "mqtt-fingerprint": command_mqtt_fingerprint,
    "clean": command_clean,
    "idedata": command_idedata,
-    "rename": command_rename,
 }


@@ -778,15 +681,6 @@ def parse_args(argv):
        "configuration", help="Your YAML configuration file(s).", nargs=1
    )

-    parser_rename = subparsers.add_parser(
-        "rename",
-        help="Rename a device in YAML, compile the binary and upload it.",
-    )
-    parser_rename.add_argument(
-        "configuration", help="Your YAML configuration file.", nargs=1
-    )
-    parser_rename.add_argument("name", help="The new name for the device.", type=str)
-
    # Keep backward compatibility with the old command line format of
    # esphome <config> <command>.
    #
--- a/esphome/automation.py
+++ b/esphome/automation.py
@@ -12,7 +12,7 @@ from esphome.const import (
    CONF_TYPE_ID,
    CONF_TIME,
 )
-from esphome.schema_extractors import SCHEMA_EXTRACT, schema_extractor
+from esphome.jsonschema import jschema_extractor
 from esphome.util import Registry


@@ -23,10 +23,11 @@ def maybe_simple_id(*validators):
 def maybe_conf(conf, *validators):
    validator = cv.All(*validators)

-    @schema_extractor("maybe")
+    @jschema_extractor("maybe")
    def validate(value):
-        if value == SCHEMA_EXTRACT:
-            return (validator, conf)
+        # pylint: disable=comparison-with-callable
+        if value == jschema_extractor:
+            return validator

        if isinstance(value, dict):
            return validator(value)
@@ -110,9 +111,11 @@ def validate_automation(extra_schema=None, extra_validators=None, single=False):
        # This should only happen with invalid configs, but let's have a nice error message.
        return [schema(value)]

-    @schema_extractor("automation")
+    @jschema_extractor("automation")
    def validator(value):
-        if value == SCHEMA_EXTRACT:
+        # hack to get the schema
+        # pylint: disable=comparison-with-callable
+        if value == jschema_extractor:
            return schema

        value = validator_(value)
@@ -259,16 +262,21 @@ async def repeat_action_to_code(config, action_id, template_arg, args):
    return var


-_validate_wait_until = cv.maybe_simple_value(
-    {
-        cv.Required(CONF_CONDITION): validate_potentially_and_condition,
-        cv.Optional(CONF_TIMEOUT): cv.templatable(cv.positive_time_period_milliseconds),
-    },
-    key=CONF_CONDITION,
-)
+def validate_wait_until(value):
+    schema = cv.Schema(
+        {
+            cv.Required(CONF_CONDITION): validate_potentially_and_condition,
+            cv.Optional(CONF_TIMEOUT): cv.templatable(
+                cv.positive_time_period_milliseconds
+            ),
+        }
+    )
+    if isinstance(value, dict) and CONF_CONDITION in value:
+        return schema(value)
+    return validate_wait_until({CONF_CONDITION: value})


-@register_action("wait_until", WaitUntilAction, _validate_wait_until)
+@register_action("wait_until", WaitUntilAction, validate_wait_until)
 async def wait_until_action_to_code(config, action_id, template_arg, args):
    conditions = await build_condition(config[CONF_CONDITION], template_arg, args)
    var = cg.new_Pvariable(action_id, template_arg, conditions)
--- a/esphome/codegen.py
+++ b/esphome/codegen.py
@@ -64,7 +64,6 @@ from esphome.cpp_types import (  # noqa
    uint64,
    int32,
    int64,
-    size_t,
    const_char_ptr,
    NAN,
    esphome_ns,
--- a/esphome/components/ac_dimmer/ac_dimmer.cpp
+++ b/esphome/components/ac_dimmer/ac_dimmer.cpp
@@ -122,7 +122,6 @@ void IRAM_ATTR HOT AcDimmerDataStore::gpio_intr() {
      // also take into account min_power
      auto min_us = this->cycle_time_us * this->min_power / 1000;
      this->enable_time_us = std::max((uint32_t) 1, ((65535 - this->value) * (this->cycle_time_us - min_us)) / 65535);
-
      if (this->method == DIM_METHOD_LEADING_PULSE) {
        // Minimum pulse time should be enough for the triac to trigger when it is close to the ZC zone
        // this is for brightness near 99%
@@ -203,7 +202,6 @@ void AcDimmer::setup() {
 #endif
 }
 void AcDimmer::write_state(float state) {
-  state = std::acos(1 - (2 * state)) / 3.14159;  // RMS power compensation
  auto new_value = static_cast<uint16_t>(roundf(state * 65535));
  if (new_value != 0 && this->store_.value == 0)
    this->store_.init_cycle = this->init_with_half_cycle_;
--- a/esphome/components/adc/adc_sensor.cpp
+++ b/esphome/components/adc/adc_sensor.cpp
@@ -15,21 +15,10 @@ namespace esphome {
 namespace adc {

 static const char *const TAG = "adc";
-
-// 13bit for S2, and 12bit for all other esp32 variants
+// 13 bits for S3 / 12 bit for all other esp32 variants
+// create a const to avoid the repated cast to enum
 #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
-#if USE_ESP32_VARIANT_ESP32S2
-static const int SOC_ADC_RTC_MAX_BITWIDTH = 13;
-#else
-static const int SOC_ADC_RTC_MAX_BITWIDTH = 12;
-#endif
-#endif
-
-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() {
@@ -62,6 +51,10 @@ void ADCSensor::setup() {
    }
  }

+  // adc_gpio_init doesn't exist on ESP32-C3 or ESP32-H2
+#if !defined(USE_ESP32_VARIANT_ESP32C3) && !defined(USE_ESP32_VARIANT_ESP32H2)
+  adc_gpio_init(ADC_UNIT_1, (adc_channel_t) channel_);
+#endif
 #endif  // USE_ESP32
 }

@@ -82,16 +75,16 @@ void ADCSensor::dump_config() {
  } else {
    switch (this->attenuation_) {
      case ADC_ATTEN_DB_0:
-        ESP_LOGCONFIG(TAG, " Attenuation: 0db");
+        ESP_LOGCONFIG(TAG, " Attenuation: 0db (max 1.1V)");
        break;
      case ADC_ATTEN_DB_2_5:
-        ESP_LOGCONFIG(TAG, " Attenuation: 2.5db");
+        ESP_LOGCONFIG(TAG, " Attenuation: 2.5db (max 1.5V)");
        break;
      case ADC_ATTEN_DB_6:
-        ESP_LOGCONFIG(TAG, " Attenuation: 6db");
+        ESP_LOGCONFIG(TAG, " Attenuation: 6db (max 2.2V)");
        break;
      case ADC_ATTEN_DB_11:
-        ESP_LOGCONFIG(TAG, " Attenuation: 11db");
+        ESP_LOGCONFIG(TAG, " Attenuation: 11db (max 3.9V)");
        break;
      default:  // This is to satisfy the unused ADC_ATTEN_MAX
        break;
@@ -136,16 +129,16 @@ float ADCSensor::sample() {
    return mv / 1000.0f;
  }

-  int raw11, raw6 = ADC_MAX, raw2 = ADC_MAX, raw0 = ADC_MAX;
+  int raw11, raw6 = 4095, raw2 = 4095, raw0 = 4095;
  adc1_config_channel_atten(channel_, ADC_ATTEN_DB_11);
  raw11 = adc1_get_raw(channel_);
-  if (raw11 < ADC_MAX) {
+  if (raw11 < 4095) {
    adc1_config_channel_atten(channel_, ADC_ATTEN_DB_6);
    raw6 = adc1_get_raw(channel_);
-    if (raw6 < ADC_MAX) {
+    if (raw6 < 4095) {
      adc1_config_channel_atten(channel_, ADC_ATTEN_DB_2_5);
      raw2 = adc1_get_raw(channel_);
-      if (raw2 < ADC_MAX) {
+      if (raw2 < 4095) {
        adc1_config_channel_atten(channel_, ADC_ATTEN_DB_0);
        raw0 = adc1_get_raw(channel_);
      }
@@ -161,15 +154,15 @@ float ADCSensor::sample() {
  uint32_t mv2 = esp_adc_cal_raw_to_voltage(raw2, &cal_characteristics_[(int) ADC_ATTEN_DB_2_5]);
  uint32_t mv0 = esp_adc_cal_raw_to_voltage(raw0, &cal_characteristics_[(int) ADC_ATTEN_DB_0]);

-  // Contribution of each value, in range 0-2048 (12 bit ADC) or 0-4096 (13 bit ADC)
-  uint32_t c11 = std::min(raw11, 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
+  // Contribution of each value, in range 0-2048
+  uint32_t c11 = std::min(raw11, 2048);
+  uint32_t c6 = 2048 - std::abs(raw6 - 2048);
+  uint32_t c2 = 2048 - std::abs(raw2 - 2048);
+  uint32_t c0 = std::min(4095 - raw0, 2048);
+  // max theoretical csum value is 2048*4 = 8192
  uint32_t csum = c11 + c6 + c2 + c0;

-  // each mv is max 3900; so max value is 3900*4096*4, fits in unsigned32
+  // each mv is max 3900; so max value is 3900*2048*4, fits in unsigned
  uint32_t mv_scaled = (mv11 * c11) + (mv6 * c6) + (mv2 * c2) + (mv0 * c0);
  return mv_scaled / (float) (csum * 1000U);
 }
--- a/esphome/components/addressable_light/addressable_light_display.h
+++ b/esphome/components/addressable_light/addressable_light_display.h
@@ -40,8 +40,6 @@ class AddressableLightDisplay : public display::DisplayBuffer, public PollingCom
  void setup() override;
  void display();

-  display::DisplayType get_display_type() override { return display::DisplayType::DISPLAY_TYPE_COLOR; }
-
 protected:
  int get_width_internal() override;
  int get_height_internal() override;
--- a/esphome/components/ade7953/ade7953.h
+++ b/esphome/components/ade7953/ade7953.h
@@ -82,7 +82,7 @@ class ADE7953 : public i2c::I2CDevice, public PollingComponent {
    return i2c::ERROR_OK;
  }

-  InternalGPIOPin *irq_pin_{nullptr};
+  InternalGPIOPin *irq_pin_ = nullptr;
  bool is_setup_{false};
  sensor::Sensor *voltage_sensor_{nullptr};
  sensor::Sensor *current_a_sensor_{nullptr};
--- a/esphome/components/aht10/aht10.h
+++ b/esphome/components/aht10/aht10.h
@@ -18,8 +18,8 @@ class AHT10Component : public PollingComponent, public i2c::I2CDevice {
  void set_humidity_sensor(sensor::Sensor *humidity_sensor) { humidity_sensor_ = humidity_sensor; }

 protected:
-  sensor::Sensor *temperature_sensor_{nullptr};
-  sensor::Sensor *humidity_sensor_{nullptr};
+  sensor::Sensor *temperature_sensor_;
+  sensor::Sensor *humidity_sensor_;
 };

 }  // namespace aht10
--- a/esphome/components/am2320/am2320.cpp
+++ b/esphome/components/am2320/am2320.cpp
@@ -4,15 +4,33 @@
 //  - Arduino - AM2320: https://github.com/EngDial/AM2320/blob/master/src/AM2320.cpp

 #include "am2320.h"
-#include "esphome/core/hal.h"
-#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
+#include "esphome/core/hal.h"

 namespace esphome {
 namespace am2320 {

 static const char *const TAG = "am2320";

+// ---=== Calc CRC16 ===---
+uint16_t crc_16(uint8_t *ptr, uint8_t length) {
+  uint16_t crc = 0xFFFF;
+  uint8_t i;
+  //------------------------------
+  while (length--) {
+    crc ^= *ptr++;
+    for (i = 0; i < 8; i++) {
+      if ((crc & 0x01) != 0) {
+        crc >>= 1;
+        crc ^= 0xA001;
+      } else {
+        crc >>= 1;
+      }
+    }
+  }
+  return crc;
+}
+
 void AM2320Component::update() {
  uint8_t data[8];
  data[0] = 0;
@@ -80,7 +98,7 @@ bool AM2320Component::read_data_(uint8_t *data) {
  checksum = data[7] << 8;
  checksum += data[6];

-  if (crc16(data, 6) != checksum) {
+  if (crc_16(data, 6) != checksum) {
    ESP_LOGW(TAG, "AM2320 Checksum invalid!");
    return false;
  }
--- a/esphome/components/am2320/am2320.h
+++ b/esphome/components/am2320/am2320.h
@@ -21,8 +21,8 @@ class AM2320Component : public PollingComponent, public i2c::I2CDevice {
  bool read_data_(uint8_t *data);
  bool read_bytes_(uint8_t a_register, uint8_t *data, uint8_t len, uint32_t conversion = 0);

-  sensor::Sensor *temperature_sensor_{nullptr};
-  sensor::Sensor *humidity_sensor_{nullptr};
+  sensor::Sensor *temperature_sensor_;
+  sensor::Sensor *humidity_sensor_;
 };

 }  // namespace am2320
--- a/esphome/components/animation/init.py
+++ b/esphome/components/animation/init.py
@@ -76,8 +76,6 @@ async def to_code(config):
        pos = 0
        for frameIndex in range(frames):
            image.seek(frameIndex)
-            if CONF_RESIZE in config:
-                image.thumbnail(config[CONF_RESIZE])
            frame = image.convert("RGB")
            if CONF_RESIZE in config:
                frame = frame.resize([width, height])
@@ -94,29 +92,6 @@ async def to_code(config):
                data[pos] = pix[2]
                pos += 1

-    elif config[CONF_TYPE] == "RGB565":
-        data = [0 for _ in range(height * width * 2 * frames)]
-        pos = 0
-        for frameIndex in range(frames):
-            image.seek(frameIndex)
-            frame = image.convert("RGB")
-            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:
-                R = pix[0] >> 3
-                G = pix[1] >> 2
-                B = pix[2] >> 3
-                rgb = (R << 11) | (G << 5) | B
-                data[pos] = rgb >> 8
-                pos += 1
-                data[pos] = rgb & 255
-                pos += 1
-
    elif config[CONF_TYPE] == "BINARY":
        width8 = ((width + 7) // 8) * 8
        data = [0 for _ in range((height * width8 // 8) * frames)]
--- a/esphome/components/anova/anova.cpp
+++ b/esphome/components/anova/anova.cpp
@@ -92,7 +92,7 @@ void Anova::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_
      }
      if (this->codec_->has_unit()) {
        this->fahrenheit_ = (this->codec_->unit_ == 'f');
-        ESP_LOGD(TAG, "Anova units is %s", this->fahrenheit_ ? "fahrenheit" : "celsius");
+        ESP_LOGD(TAG, "Anova units is %s", this->fahrenheit_ ? "fahrenheit" : "celcius");
        this->current_request_++;
      }
      this->publish_state();
--- a/esphome/components/apds9960/init.py
+++ b/esphome/components/apds9960/init.py
@@ -8,27 +8,6 @@ AUTO_LOAD = ["sensor", "binary_sensor"]
 MULTI_CONF = True

 CONF_APDS9960_ID = "apds9960_id"
-CONF_LED_DRIVE = "led_drive"
-CONF_PROXIMITY_GAIN = "proximity_gain"
-CONF_AMBIENT_LIGHT_GAIN = "ambient_light_gain"
-CONF_GESTURE_LED_DRIVE = "gesture_led_drive"
-CONF_GESTURE_GAIN = "gesture_gain"
-CONF_GESTURE_WAIT_TIME = "gesture_wait_time"
-
-DRIVE_LEVELS = {"100ma": 0, "50ma": 1, "25ma": 2, "12.5ma": 3}
-PROXIMITY_LEVELS = {"1x": 0, "2x": 1, "4x": 2, "8x": 3}
-AMBIENT_LEVELS = {"1x": 0, "4x": 1, "16x": 2, "64x": 3}
-GESTURE_LEVELS = {"1x": 0, "2x": 1, "4x": 2, "8x": 3}
-GESTURE_WAIT_TIMES = {
-    "0ms": 0,
-    "2.8ms": 1,
-    "5.6ms": 2,
-    "8.4ms": 3,
-    "14ms": 4,
-    "22.4ms": 5,
-    "30.8ms": 6,
-    "39.2ms": 7,
-}

 apds9960_nds = cg.esphome_ns.namespace("apds9960")
 APDS9960 = apds9960_nds.class_("APDS9960", cg.PollingComponent, i2c.I2CDevice)
@@ -37,20 +16,6 @@ CONFIG_SCHEMA = (
    cv.Schema(
        {
            cv.GenerateID(): cv.declare_id(APDS9960),
-            cv.Optional(CONF_LED_DRIVE, "100mA"): cv.enum(DRIVE_LEVELS, lower=True),
-            cv.Optional(CONF_PROXIMITY_GAIN, "4x"): cv.enum(
-                PROXIMITY_LEVELS, lower=True
-            ),
-            cv.Optional(CONF_AMBIENT_LIGHT_GAIN, "4x"): cv.enum(
-                AMBIENT_LEVELS, lower=True
-            ),
-            cv.Optional(CONF_GESTURE_LED_DRIVE, "100mA"): cv.enum(
-                DRIVE_LEVELS, lower=True
-            ),
-            cv.Optional(CONF_GESTURE_GAIN, "4x"): cv.enum(GESTURE_LEVELS, lower=True),
-            cv.Optional(CONF_GESTURE_WAIT_TIME, "2.8ms"): cv.enum(
-                GESTURE_WAIT_TIMES, lower=True
-            ),
        }
    )
    .extend(cv.polling_component_schema("60s"))
@@ -62,9 +27,3 @@ async def to_code(config):
    var = cg.new_Pvariable(config[CONF_ID])
    await cg.register_component(var, config)
    await i2c.register_i2c_device(var, config)
-    cg.add(var.set_led_drive(config[CONF_LED_DRIVE]))
-    cg.add(var.set_proximity_gain(config[CONF_PROXIMITY_GAIN]))
-    cg.add(var.set_ambient_gain(config[CONF_AMBIENT_LIGHT_GAIN]))
-    cg.add(var.set_gesture_led_drive(config[CONF_GESTURE_LED_DRIVE]))
-    cg.add(var.set_gesture_gain(config[CONF_GESTURE_GAIN]))
-    cg.add(var.set_gesture_wait_time(config[CONF_GESTURE_WAIT_TIME]))
--- a/esphome/components/apds9960/apds9960.cpp
+++ b/esphome/components/apds9960/apds9960.cpp
@@ -46,16 +46,16 @@ void APDS9960::setup() {
  uint8_t val = 0;
  APDS9960_ERROR_CHECK(this->read_byte(0x8F, &val));
  val &= 0b00111111;
-  // led drive, 0 -> 100mA, 1 -> 50mA, 2 -> 25mA, 3 -> 12.5mA
-  val |= (this->led_drive_ & 0b11) << 6;
+  uint8_t led_drive = 0;  // led drive, 0 -> 100mA, 1 -> 50mA, 2 -> 25mA, 3 -> 12.5mA
+  val |= (led_drive & 0b11) << 6;

  val &= 0b11110011;
-  // proximity gain, 0 -> 1x, 1 -> 2X, 2 -> 4X, 3 -> 8X
-  val |= (this->proximity_gain_ & 0b11) << 2;
+  uint8_t proximity_gain = 2;  // proximity gain, 0 -> 1x, 1 -> 2X, 2 -> 4X, 4 -> 8X
+  val |= (proximity_gain & 0b11) << 2;

  val &= 0b11111100;
-  // ambient light gain, 0 -> 1x, 1 -> 4x, 2 -> 16x, 3 -> 64x
-  val |= (this->ambient_gain_ & 0b11) << 0;
+  uint8_t ambient_gain = 1;  // ambient light gain, 0 -> 1x, 1 -> 4x, 2 -> 16x, 3 -> 64x
+  val |= (ambient_gain & 0b11) << 0;
  APDS9960_WRITE_BYTE(0x8F, val);

  // Pers (0x8C) -> 0x11 (2 consecutive proximity or ALS for interrupt)
@@ -75,18 +75,19 @@ void APDS9960::setup() {
  // GConf 2 (0xA3, gesture config 2) ->
  APDS9960_ERROR_CHECK(this->read_byte(0xA3, &val));
  val &= 0b10011111;
-  // gesture gain, 0 -> 1x, 1 -> 2x, 2 -> 4x, 3 -> 8x
-  val |= (this->gesture_gain_ & 0b11) << 5;
+  uint8_t gesture_gain = 2;  // gesture gain, 0 -> 1x, 1 -> 2x, 2 -> 4x, 3 -> 8x
+  val |= (gesture_gain & 0b11) << 5;

  val &= 0b11100111;
-  // gesture led drive, 0 -> 100mA, 1 -> 50mA, 2 -> 25mA, 3 -> 12.5mA
-  val |= (this->gesture_led_drive_ & 0b11) << 3;
+  uint8_t gesture_led_drive = 0;  // gesture led drive, 0 -> 100mA, 1 -> 50mA, 2 -> 25mA, 3 -> 12.5mA
+  val |= (gesture_led_drive & 0b11) << 3;

  val &= 0b11111000;
  // gesture wait time
  // 0 -> 0ms, 1 -> 2.8ms, 2 -> 5.6ms, 3 -> 8.4ms
  // 4 -> 14.0ms, 5 -> 22.4 ms, 6 -> 30.8ms, 7 -> 39.2 ms
-  val |= (this->gesture_wait_time_ & 0b111) << 0;
+  uint8_t gesture_wait_time = 1;  // gesture wait time
+  val |= (gesture_wait_time & 0b111) << 0;
  APDS9960_WRITE_BYTE(0xA3, val);

  // GOffsetU (0xA4) -> 0x00 (no offset)
--- a/esphome/components/apds9960/apds9960.h
+++ b/esphome/components/apds9960/apds9960.h
@@ -16,13 +16,6 @@ class APDS9960 : public PollingComponent, public i2c::I2CDevice {
  void update() override;
  void loop() override;

-  void set_led_drive(uint8_t level) { this->led_drive_ = level; }
-  void set_proximity_gain(uint8_t gain) { this->proximity_gain_ = gain; }
-  void set_ambient_gain(uint8_t gain) { this->ambient_gain_ = gain; }
-  void set_gesture_led_drive(uint8_t level) { this->gesture_led_drive_ = level; }
-  void set_gesture_gain(uint8_t gain) { this->gesture_gain_ = gain; }
-  void set_gesture_wait_time(uint8_t wait_time) { this->gesture_wait_time_ = wait_time; }
-
  void set_red_channel(sensor::Sensor *red_channel) { red_channel_ = red_channel; }
  void set_green_channel(sensor::Sensor *green_channel) { green_channel_ = green_channel; }
  void set_blue_channel(sensor::Sensor *blue_channel) { blue_channel_ = blue_channel; }
@@ -43,13 +36,6 @@ class APDS9960 : public PollingComponent, public i2c::I2CDevice {
  void report_gesture_(int gesture);
  void process_dataset_(int up, int down, int left, int right);

-  uint8_t led_drive_;
-  uint8_t proximity_gain_;
-  uint8_t ambient_gain_;
-  uint8_t gesture_led_drive_;
-  uint8_t gesture_gain_;
-  uint8_t gesture_wait_time_;
-
  sensor::Sensor *red_channel_{nullptr};
  sensor::Sensor *green_channel_{nullptr};
  sensor::Sensor *blue_channel_{nullptr};
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -27,7 +27,6 @@ service APIConnection {
  rpc subscribe_logs (SubscribeLogsRequest) returns (void) {}
  rpc subscribe_homeassistant_services (SubscribeHomeassistantServicesRequest) returns (void) {}
  rpc subscribe_home_assistant_states (SubscribeHomeAssistantStatesRequest) returns (void) {}
-  rpc subscribe_bluetooth_le_advertisements (SubscribeBluetoothLEAdvertisementsRequest) returns (void) {}
  rpc get_time (GetTimeRequest) returns (GetTimeResponse) {
    option (needs_authentication) = false;
  }
@@ -43,7 +42,6 @@ service APIConnection {
  rpc select_command (SelectCommandRequest) returns (void) {}
  rpc button_command (ButtonCommandRequest) returns (void) {}
  rpc lock_command (LockCommandRequest) returns (void) {}
-  rpc media_player_command (MediaPlayerCommandRequest) returns (void) {}
 }


@@ -191,8 +189,6 @@ message DeviceInfoResponse {
  string project_version = 9;

  uint32 webserver_port = 10;
-
-  bool has_bluetooth_proxy = 11;
 }

 message ListEntitiesRequest {
@@ -476,7 +472,6 @@ enum SensorStateClass {
  STATE_CLASS_NONE = 0;
  STATE_CLASS_MEASUREMENT = 1;
  STATE_CLASS_TOTAL_INCREASING = 2;
-  STATE_CLASS_TOTAL = 3;
 }

 enum SensorLastResetType {
@@ -996,7 +991,7 @@ message ListEntitiesLockResponse {
  bool supports_open = 9;
  bool requires_code = 10;

-  // Not yet implemented:
+  # Not yet implemented:
  string code_format = 11;
 }
 message LockStateResponse {
@@ -1015,7 +1010,7 @@ message LockCommandRequest {
  fixed32 key = 1;
  LockCommand command = 2;

-  // Not yet implemented:
+  # Not yet implemented:
  bool has_code = 3;
  string code = 4;
 }
@@ -1045,85 +1040,3 @@ message ButtonCommandRequest {
  fixed32 key = 1;
 }

-// ==================== MEDIA PLAYER ====================
-enum MediaPlayerState {
-  MEDIA_PLAYER_STATE_NONE = 0;
-  MEDIA_PLAYER_STATE_IDLE = 1;
-  MEDIA_PLAYER_STATE_PLAYING = 2;
-  MEDIA_PLAYER_STATE_PAUSED = 3;
-}
-enum MediaPlayerCommand {
-  MEDIA_PLAYER_COMMAND_PLAY = 0;
-  MEDIA_PLAYER_COMMAND_PAUSE = 1;
-  MEDIA_PLAYER_COMMAND_STOP = 2;
-  MEDIA_PLAYER_COMMAND_MUTE = 3;
-  MEDIA_PLAYER_COMMAND_UNMUTE = 4;
-}
-message ListEntitiesMediaPlayerResponse {
-  option (id) = 63;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_MEDIA_PLAYER";
-
-  string object_id = 1;
-  fixed32 key = 2;
-  string name = 3;
-  string unique_id = 4;
-
-  string icon = 5;
-  bool disabled_by_default = 6;
-  EntityCategory entity_category = 7;
-
-  bool supports_pause = 8;
-}
-message MediaPlayerStateResponse {
-  option (id) = 64;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_MEDIA_PLAYER";
-  option (no_delay) = true;
-  fixed32 key = 1;
-  MediaPlayerState state = 2;
-  float volume = 3;
-  bool muted = 4;
-}
-message MediaPlayerCommandRequest {
-  option (id) = 65;
-  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_MEDIA_PLAYER";
-  option (no_delay) = true;
-
-  fixed32 key = 1;
-
-  bool has_command = 2;
-  MediaPlayerCommand command = 3;
-
-  bool has_volume = 4;
-  float volume = 5;
-
-  bool has_media_url = 6;
-  string media_url = 7;
-}
-
-// ==================== BLUETOOTH ====================
-message SubscribeBluetoothLEAdvertisementsRequest {
-  option (id) = 66;
-  option (source) = SOURCE_CLIENT;
-}
-
-message BluetoothServiceData {
-  string uuid = 1;
-  repeated uint32 data = 2 [packed=false];
-}
-message BluetoothLEAdvertisementResponse {
-  option (id) = 67;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY";
-  option (no_delay) = true;
-
-  uint64 address = 1;
-  string name = 2;
-  sint32 rssi = 3;
-
-  repeated string service_uuids = 4;
-  repeated BluetoothServiceData service_data = 5;
-  repeated BluetoothServiceData manufacturer_data = 6;
-}
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -12,6 +12,9 @@
 #ifdef USE_HOMEASSISTANT_TIME
 #include "esphome/components/homeassistant/time/homeassistant_time.h"
 #endif
+#ifdef USE_FAN
+#include "esphome/components/fan/fan_helpers.h"
+#endif

 namespace esphome {
 namespace api {
@@ -20,7 +23,7 @@ static const char *const TAG = "api.connection";
 static const int ESP32_CAMERA_STOP_STREAM = 5000;

 APIConnection::APIConnection(std::unique_ptr<socket::Socket> sock, APIServer *parent)
-    : parent_(parent), initial_state_iterator_(this), list_entities_iterator_(this) {
+    : parent_(parent), initial_state_iterator_(parent, this), list_entities_iterator_(parent, this) {
  this->proto_write_buffer_.reserve(64);

 #if defined(USE_API_PLAINTEXT)
@@ -102,7 +105,6 @@ void APIConnection::loop() {
      ESP_LOGW(TAG, "%s didn't respond to ping request in time. Disconnecting...", this->client_info_.c_str());
    }
  } else if (now - this->last_traffic_ > keepalive) {
-    ESP_LOGVV(TAG, "Sending keepalive PING...");
    this->sent_ping_ = true;
    this->send_ping_request(PingRequest());
  }
@@ -250,6 +252,9 @@ void APIConnection::cover_command(const CoverCommandRequest &msg) {
 #endif

 #ifdef USE_FAN
+// Shut-up about usage of deprecated speed_level_to_enum/speed_enum_to_level functions for a bit.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 bool APIConnection::send_fan_state(fan::Fan *fan) {
  if (!this->state_subscription_)
    return false;
@@ -262,6 +267,7 @@ bool APIConnection::send_fan_state(fan::Fan *fan) {
    resp.oscillating = fan->oscillating;
  if (traits.supports_speed()) {
    resp.speed_level = fan->speed;
+    resp.speed = static_cast<enums::FanSpeed>(fan::speed_level_to_enum(fan->speed, traits.supported_speed_count()));
  }
  if (traits.supports_direction())
    resp.direction = static_cast<enums::FanDirection>(fan->direction);
@@ -288,6 +294,8 @@ void APIConnection::fan_command(const FanCommandRequest &msg) {
  if (fan == nullptr)
    return;

+  auto traits = fan->get_traits();
+
  auto call = fan->make_call();
  if (msg.has_state)
    call.set_state(msg.state);
@@ -296,11 +304,14 @@ void APIConnection::fan_command(const FanCommandRequest &msg) {
  if (msg.has_speed_level) {
    // Prefer level
    call.set_speed(msg.speed_level);
+  } else if (msg.has_speed) {
+    call.set_speed(fan::speed_enum_to_level(static_cast<fan::FanSpeed>(msg.speed), traits.supported_speed_count()));
  }
  if (msg.has_direction)
    call.set_direction(static_cast<fan::FanDirection>(msg.direction));
  call.perform();
 }
+#pragma GCC diagnostic pop
 #endif

 #ifdef USE_LIGHT
@@ -733,52 +744,6 @@ void APIConnection::lock_command(const LockCommandRequest &msg) {
 }
 #endif

-#ifdef USE_MEDIA_PLAYER
-bool APIConnection::send_media_player_state(media_player::MediaPlayer *media_player) {
-  if (!this->state_subscription_)
-    return false;
-
-  MediaPlayerStateResponse resp{};
-  resp.key = media_player->get_object_id_hash();
-  resp.state = static_cast<enums::MediaPlayerState>(media_player->state);
-  resp.volume = media_player->volume;
-  resp.muted = media_player->is_muted();
-  return this->send_media_player_state_response(resp);
-}
-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();
-  msg.name = media_player->get_name();
-  msg.unique_id = get_default_unique_id("media_player", media_player);
-  msg.icon = media_player->get_icon();
-  msg.disabled_by_default = media_player->is_disabled_by_default();
-  msg.entity_category = static_cast<enums::EntityCategory>(media_player->get_entity_category());
-
-  auto traits = media_player->get_traits();
-  msg.supports_pause = traits.get_supports_pause();
-
-  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);
-  if (media_player == nullptr)
-    return;
-
-  auto call = media_player->make_call();
-  if (msg.has_command) {
-    call.set_command(static_cast<media_player::MediaPlayerCommand>(msg.command));
-  }
-  if (msg.has_volume) {
-    call.set_volume(msg.volume);
-  }
-  if (msg.has_media_url) {
-    call.set_media_url(msg.media_url);
-  }
-  call.perform();
-}
-#endif
-
 #ifdef USE_ESP32_CAMERA
 void APIConnection::send_camera_state(std::shared_ptr<esp32_camera::CameraImage> image) {
  if (!this->state_subscription_)
@@ -886,9 +851,6 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
 #endif
 #ifdef USE_WEBSERVER
  resp.webserver_port = USE_WEBSERVER_PORT;
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  resp.has_bluetooth_proxy = true;
 #endif
  return resp;
 }
@@ -946,7 +908,7 @@ bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint32_t message_type)
    }
    return false;
  }
-  // Do not set last_traffic_ on send
+  this->last_traffic_ = millis();
  return true;
 }
 void APIConnection::on_unauthenticated_access() {
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -7,10 +7,6 @@
 #include "api_server.h"
 #include "api_frame_helper.h"

-#ifdef USE_BLUETOOTH_PROXY
-#include "esphome/components/bluetooth_proxy/bluetooth_proxy.h"
-#endif
-
 namespace esphome {
 namespace api {

@@ -86,11 +82,6 @@ class APIConnection : public APIServerConnection {
  bool send_lock_state(lock::Lock *a_lock, lock::LockState state);
  bool send_lock_info(lock::Lock *a_lock);
  void lock_command(const LockCommandRequest &msg) override;
-#endif
-#ifdef USE_MEDIA_PLAYER
-  bool send_media_player_state(media_player::MediaPlayer *media_player);
-  bool send_media_player_info(media_player::MediaPlayer *media_player);
-  void media_player_command(const MediaPlayerCommandRequest &msg) override;
 #endif
  bool send_log_message(int level, const char *tag, const char *line);
  void send_homeassistant_service_call(const HomeassistantServiceResponse &call) {
@@ -98,13 +89,6 @@ class APIConnection : public APIServerConnection {
      return;
    this->send_homeassistant_service_response(call);
  }
-#ifdef USE_BLUETOOTH_PROXY
-  bool send_bluetooth_le_advertisement(const BluetoothLEAdvertisementResponse &call) {
-    if (!this->bluetooth_le_advertisement_subscription_)
-      return false;
-    return this->send_bluetooth_le_advertisement_response(call);
-  }
-#endif
 #ifdef USE_HOMEASSISTANT_TIME
  void send_time_request() {
    GetTimeRequest req;
@@ -145,9 +129,6 @@ class APIConnection : public APIServerConnection {
    return {};
  }
  void execute_service(const ExecuteServiceRequest &msg) override;
-  void subscribe_bluetooth_le_advertisements(const SubscribeBluetoothLEAdvertisementsRequest &msg) override {
-    this->bluetooth_le_advertisement_subscription_ = true;
-  }
  bool is_authenticated() override { return this->connection_state_ == ConnectionState::AUTHENTICATED; }
  bool is_connection_setup() override {
    return this->connection_state_ == ConnectionState ::CONNECTED || this->is_authenticated();
@@ -190,7 +171,6 @@ class APIConnection : public APIServerConnection {
  uint32_t last_traffic_;
  bool sent_ping_{false};
  bool service_call_subscription_{false};
-  bool bluetooth_le_advertisement_subscription_{true};
  bool next_close_ = false;
  APIServer *parent_;
  InitialStateIterator initial_state_iterator_;
--- a/esphome/components/api/api_frame_helper.cpp
+++ b/esphome/components/api/api_frame_helper.cpp
@@ -270,7 +270,7 @@ APIError APINoiseFrameHelper::try_read_frame_(ParsedFrame *frame) {
 *
 * If the handshake is still active when this method returns and a read/write can't take place at
 * the moment, returns WOULD_BLOCK.
- * If an error occurred, returns that error. Only returns OK if the transport is ready for data
+ * If an error occured, returns that error. Only returns OK if the transport is ready for data
 * traffic.
 */
 APIError APINoiseFrameHelper::state_action_() {
@@ -586,7 +586,7 @@ APIError APINoiseFrameHelper::write_raw_(const struct iovec *iov, int iovcnt) {
    }
    return APIError::OK;
  } else if (sent == -1) {
-    // an error occurred
+    // an error occured
    state_ = State::FAILED;
    HELPER_LOG("Socket write failed with errno %d", errno);
    return APIError::SOCKET_WRITE_FAILED;
@@ -980,7 +980,7 @@ APIError APIPlaintextFrameHelper::write_raw_(const struct iovec *iov, int iovcnt
    }
    return APIError::OK;
  } else if (sent == -1) {
-    // an error occurred
+    // an error occured
    state_ = State::FAILED;
    HELPER_LOG("Socket write failed with errno %d", errno);
    return APIError::SOCKET_WRITE_FAILED;
--- a/esphome/components/api/api_frame_helper.h
+++ b/esphome/components/api/api_frame_helper.h
@@ -116,9 +116,9 @@ class APINoiseFrameHelper : public APIFrameHelper {
  std::vector<uint8_t> prologue_;

  std::shared_ptr<APINoiseContext> ctx_;
-  NoiseHandshakeState *handshake_{nullptr};
-  NoiseCipherState *send_cipher_{nullptr};
-  NoiseCipherState *recv_cipher_{nullptr};
+  NoiseHandshakeState *handshake_ = nullptr;
+  NoiseCipherState *send_cipher_ = nullptr;
+  NoiseCipherState *recv_cipher_ = nullptr;
  NoiseProtocolId nid_;

  enum class State {
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -108,8 +108,6 @@ template<> const char *proto_enum_to_string<enums::SensorStateClass>(enums::Sens
      return "STATE_CLASS_MEASUREMENT";
    case enums::STATE_CLASS_TOTAL_INCREASING:
      return "STATE_CLASS_TOTAL_INCREASING";
-    case enums::STATE_CLASS_TOTAL:
-      return "STATE_CLASS_TOTAL";
    default:
      return "UNKNOWN";
  }
@@ -310,36 +308,6 @@ template<> const char *proto_enum_to_string<enums::LockCommand>(enums::LockComma
      return "UNKNOWN";
  }
 }
-template<> const char *proto_enum_to_string<enums::MediaPlayerState>(enums::MediaPlayerState value) {
-  switch (value) {
-    case enums::MEDIA_PLAYER_STATE_NONE:
-      return "MEDIA_PLAYER_STATE_NONE";
-    case enums::MEDIA_PLAYER_STATE_IDLE:
-      return "MEDIA_PLAYER_STATE_IDLE";
-    case enums::MEDIA_PLAYER_STATE_PLAYING:
-      return "MEDIA_PLAYER_STATE_PLAYING";
-    case enums::MEDIA_PLAYER_STATE_PAUSED:
-      return "MEDIA_PLAYER_STATE_PAUSED";
-    default:
-      return "UNKNOWN";
-  }
-}
-template<> const char *proto_enum_to_string<enums::MediaPlayerCommand>(enums::MediaPlayerCommand value) {
-  switch (value) {
-    case enums::MEDIA_PLAYER_COMMAND_PLAY:
-      return "MEDIA_PLAYER_COMMAND_PLAY";
-    case enums::MEDIA_PLAYER_COMMAND_PAUSE:
-      return "MEDIA_PLAYER_COMMAND_PAUSE";
-    case enums::MEDIA_PLAYER_COMMAND_STOP:
-      return "MEDIA_PLAYER_COMMAND_STOP";
-    case enums::MEDIA_PLAYER_COMMAND_MUTE:
-      return "MEDIA_PLAYER_COMMAND_MUTE";
-    case enums::MEDIA_PLAYER_COMMAND_UNMUTE:
-      return "MEDIA_PLAYER_COMMAND_UNMUTE";
-    default:
-      return "UNKNOWN";
-  }
-}
 bool HelloRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
  switch (field_id) {
    case 1: {
@@ -495,10 +463,6 @@ bool DeviceInfoResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
      this->webserver_port = value.as_uint32();
      return true;
    }
-    case 11: {
-      this->has_bluetooth_proxy = value.as_bool();
-      return true;
-    }
    default:
      return false;
  }
@@ -548,7 +512,6 @@ void DeviceInfoResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(8, this->project_name);
  buffer.encode_string(9, this->project_version);
  buffer.encode_uint32(10, this->webserver_port);
-  buffer.encode_bool(11, this->has_bluetooth_proxy);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void DeviceInfoResponse::dump_to(std::string &out) const {
@@ -594,10 +557,6 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
  sprintf(buffer, "%u", this->webserver_port);
  out.append(buffer);
  out.append("\n");
-
-  out.append("  has_bluetooth_proxy: ");
-  out.append(YESNO(this->has_bluetooth_proxy));
-  out.append("\n");
  out.append("}");
 }
 #endif
@@ -4615,391 +4574,6 @@ void ButtonCommandRequest::dump_to(std::string &out) const {
  out.append("}");
 }
 #endif
-bool ListEntitiesMediaPlayerResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 6: {
-      this->disabled_by_default = value.as_bool();
-      return true;
-    }
-    case 7: {
-      this->entity_category = value.as_enum<enums::EntityCategory>();
-      return true;
-    }
-    case 8: {
-      this->supports_pause = value.as_bool();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool ListEntitiesMediaPlayerResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 1: {
-      this->object_id = value.as_string();
-      return true;
-    }
-    case 3: {
-      this->name = value.as_string();
-      return true;
-    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
-    case 5: {
-      this->icon = value.as_string();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool ListEntitiesMediaPlayerResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
-  switch (field_id) {
-    case 2: {
-      this->key = value.as_fixed32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void ListEntitiesMediaPlayerResponse::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_string(1, this->object_id);
-  buffer.encode_fixed32(2, this->key);
-  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
-  buffer.encode_string(5, this->icon);
-  buffer.encode_bool(6, this->disabled_by_default);
-  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
-  buffer.encode_bool(8, this->supports_pause);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void ListEntitiesMediaPlayerResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("ListEntitiesMediaPlayerResponse {\n");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id).append("'");
-  out.append("\n");
-
-  out.append("  key: ");
-  sprintf(buffer, "%u", this->key);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  name: ");
-  out.append("'").append(this->name).append("'");
-  out.append("\n");
-
-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
-  out.append("  icon: ");
-  out.append("'").append(this->icon).append("'");
-  out.append("\n");
-
-  out.append("  disabled_by_default: ");
-  out.append(YESNO(this->disabled_by_default));
-  out.append("\n");
-
-  out.append("  entity_category: ");
-  out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
-  out.append("\n");
-
-  out.append("  supports_pause: ");
-  out.append(YESNO(this->supports_pause));
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool MediaPlayerStateResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 2: {
-      this->state = value.as_enum<enums::MediaPlayerState>();
-      return true;
-    }
-    case 4: {
-      this->muted = value.as_bool();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool MediaPlayerStateResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
-  switch (field_id) {
-    case 1: {
-      this->key = value.as_fixed32();
-      return true;
-    }
-    case 3: {
-      this->volume = value.as_float();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void MediaPlayerStateResponse::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_fixed32(1, this->key);
-  buffer.encode_enum<enums::MediaPlayerState>(2, this->state);
-  buffer.encode_float(3, this->volume);
-  buffer.encode_bool(4, this->muted);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void MediaPlayerStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("MediaPlayerStateResponse {\n");
-  out.append("  key: ");
-  sprintf(buffer, "%u", this->key);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  state: ");
-  out.append(proto_enum_to_string<enums::MediaPlayerState>(this->state));
-  out.append("\n");
-
-  out.append("  volume: ");
-  sprintf(buffer, "%g", this->volume);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  muted: ");
-  out.append(YESNO(this->muted));
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool MediaPlayerCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 2: {
-      this->has_command = value.as_bool();
-      return true;
-    }
-    case 3: {
-      this->command = value.as_enum<enums::MediaPlayerCommand>();
-      return true;
-    }
-    case 4: {
-      this->has_volume = value.as_bool();
-      return true;
-    }
-    case 6: {
-      this->has_media_url = value.as_bool();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool MediaPlayerCommandRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 7: {
-      this->media_url = value.as_string();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool MediaPlayerCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
-  switch (field_id) {
-    case 1: {
-      this->key = value.as_fixed32();
-      return true;
-    }
-    case 5: {
-      this->volume = value.as_float();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void MediaPlayerCommandRequest::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_fixed32(1, this->key);
-  buffer.encode_bool(2, this->has_command);
-  buffer.encode_enum<enums::MediaPlayerCommand>(3, this->command);
-  buffer.encode_bool(4, this->has_volume);
-  buffer.encode_float(5, this->volume);
-  buffer.encode_bool(6, this->has_media_url);
-  buffer.encode_string(7, this->media_url);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void MediaPlayerCommandRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("MediaPlayerCommandRequest {\n");
-  out.append("  key: ");
-  sprintf(buffer, "%u", this->key);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  has_command: ");
-  out.append(YESNO(this->has_command));
-  out.append("\n");
-
-  out.append("  command: ");
-  out.append(proto_enum_to_string<enums::MediaPlayerCommand>(this->command));
-  out.append("\n");
-
-  out.append("  has_volume: ");
-  out.append(YESNO(this->has_volume));
-  out.append("\n");
-
-  out.append("  volume: ");
-  sprintf(buffer, "%g", this->volume);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  has_media_url: ");
-  out.append(YESNO(this->has_media_url));
-  out.append("\n");
-
-  out.append("  media_url: ");
-  out.append("'").append(this->media_url).append("'");
-  out.append("\n");
-  out.append("}");
-}
-#endif
-void SubscribeBluetoothLEAdvertisementsRequest::encode(ProtoWriteBuffer buffer) const {}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void SubscribeBluetoothLEAdvertisementsRequest::dump_to(std::string &out) const {
-  out.append("SubscribeBluetoothLEAdvertisementsRequest {}");
-}
-#endif
-bool BluetoothServiceData::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 2: {
-      this->data.push_back(value.as_uint32());
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool BluetoothServiceData::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 1: {
-      this->uuid = value.as_string();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothServiceData::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_string(1, this->uuid);
-  for (auto &it : this->data) {
-    buffer.encode_uint32(2, it, true);
-  }
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothServiceData::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothServiceData {\n");
-  out.append("  uuid: ");
-  out.append("'").append(this->uuid).append("'");
-  out.append("\n");
-
-  for (const auto &it : this->data) {
-    out.append("  data: ");
-    sprintf(buffer, "%u", it);
-    out.append(buffer);
-    out.append("\n");
-  }
-  out.append("}");
-}
-#endif
-bool BluetoothLEAdvertisementResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->address = value.as_uint64();
-      return true;
-    }
-    case 3: {
-      this->rssi = value.as_sint32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool BluetoothLEAdvertisementResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 2: {
-      this->name = value.as_string();
-      return true;
-    }
-    case 4: {
-      this->service_uuids.push_back(value.as_string());
-      return true;
-    }
-    case 5: {
-      this->service_data.push_back(value.as_message<BluetoothServiceData>());
-      return true;
-    }
-    case 6: {
-      this->manufacturer_data.push_back(value.as_message<BluetoothServiceData>());
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothLEAdvertisementResponse::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_uint64(1, this->address);
-  buffer.encode_string(2, this->name);
-  buffer.encode_sint32(3, this->rssi);
-  for (auto &it : this->service_uuids) {
-    buffer.encode_string(4, it, true);
-  }
-  for (auto &it : this->service_data) {
-    buffer.encode_message<BluetoothServiceData>(5, it, true);
-  }
-  for (auto &it : this->manufacturer_data) {
-    buffer.encode_message<BluetoothServiceData>(6, it, true);
-  }
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothLEAdvertisementResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothLEAdvertisementResponse {\n");
-  out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  name: ");
-  out.append("'").append(this->name).append("'");
-  out.append("\n");
-
-  out.append("  rssi: ");
-  sprintf(buffer, "%d", this->rssi);
-  out.append(buffer);
-  out.append("\n");
-
-  for (const auto &it : this->service_uuids) {
-    out.append("  service_uuids: ");
-    out.append("'").append(it).append("'");
-    out.append("\n");
-  }
-
-  for (const auto &it : this->service_data) {
-    out.append("  service_data: ");
-    it.dump_to(out);
-    out.append("\n");
-  }
-
-  for (const auto &it : this->manufacturer_data) {
-    out.append("  manufacturer_data: ");
-    it.dump_to(out);
-    out.append("\n");
-  }
-  out.append("}");
-}
-#endif

 }  // namespace api
 }  // namespace esphome
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -53,7 +53,6 @@ enum SensorStateClass : uint32_t {
  STATE_CLASS_NONE = 0,
  STATE_CLASS_MEASUREMENT = 1,
  STATE_CLASS_TOTAL_INCREASING = 2,
-  STATE_CLASS_TOTAL = 3,
 };
 enum SensorLastResetType : uint32_t {
  LAST_RESET_NONE = 0,
@@ -142,19 +141,6 @@ enum LockCommand : uint32_t {
  LOCK_LOCK = 1,
  LOCK_OPEN = 2,
 };
-enum MediaPlayerState : uint32_t {
-  MEDIA_PLAYER_STATE_NONE = 0,
-  MEDIA_PLAYER_STATE_IDLE = 1,
-  MEDIA_PLAYER_STATE_PLAYING = 2,
-  MEDIA_PLAYER_STATE_PAUSED = 3,
-};
-enum MediaPlayerCommand : uint32_t {
-  MEDIA_PLAYER_COMMAND_PLAY = 0,
-  MEDIA_PLAYER_COMMAND_PAUSE = 1,
-  MEDIA_PLAYER_COMMAND_STOP = 2,
-  MEDIA_PLAYER_COMMAND_MUTE = 3,
-  MEDIA_PLAYER_COMMAND_UNMUTE = 4,
-};

 }  // namespace enums

@@ -263,7 +249,6 @@ class DeviceInfoResponse : public ProtoMessage {
  std::string project_name{};
  std::string project_version{};
  uint32_t webserver_port{0};
-  bool has_bluetooth_proxy{false};
  void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  void dump_to(std::string &out) const override;
@@ -1161,99 +1146,6 @@ class ButtonCommandRequest : public ProtoMessage {
 protected:
  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
 };
-class ListEntitiesMediaPlayerResponse : public ProtoMessage {
- public:
-  std::string object_id{};
-  uint32_t key{0};
-  std::string name{};
-  std::string unique_id{};
-  std::string icon{};
-  bool disabled_by_default{false};
-  enums::EntityCategory entity_category{};
-  bool supports_pause{false};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class MediaPlayerStateResponse : public ProtoMessage {
- public:
-  uint32_t key{0};
-  enums::MediaPlayerState state{};
-  float volume{0.0f};
-  bool muted{false};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class MediaPlayerCommandRequest : public ProtoMessage {
- public:
-  uint32_t key{0};
-  bool has_command{false};
-  enums::MediaPlayerCommand command{};
-  bool has_volume{false};
-  float volume{0.0f};
-  bool has_media_url{false};
-  std::string media_url{};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class SubscribeBluetoothLEAdvertisementsRequest : public ProtoMessage {
- public:
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-};
-class BluetoothServiceData : public ProtoMessage {
- public:
-  std::string uuid{};
-  std::vector<uint32_t> data{};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class BluetoothLEAdvertisementResponse : public ProtoMessage {
- public:
-  uint64_t address{0};
-  std::string name{};
-  int32_t rssi{0};
-  std::vector<std::string> service_uuids{};
-  std::vector<BluetoothServiceData> service_data{};
-  std::vector<BluetoothServiceData> manufacturer_data{};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};

 }  // namespace api
 }  // namespace esphome
--- a/esphome/components/api/api_pb2_service.cpp
+++ b/esphome/components/api/api_pb2_service.cpp
@@ -310,32 +310,6 @@ bool APIServerConnectionBase::send_list_entities_button_response(const ListEntit
 #endif
 #ifdef USE_BUTTON
 #endif
-#ifdef USE_MEDIA_PLAYER
-bool APIServerConnectionBase::send_list_entities_media_player_response(const ListEntitiesMediaPlayerResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_media_player_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesMediaPlayerResponse>(msg, 63);
-}
-#endif
-#ifdef USE_MEDIA_PLAYER
-bool APIServerConnectionBase::send_media_player_state_response(const MediaPlayerStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_media_player_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<MediaPlayerStateResponse>(msg, 64);
-}
-#endif
-#ifdef USE_MEDIA_PLAYER
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-bool APIServerConnectionBase::send_bluetooth_le_advertisement_response(const BluetoothLEAdvertisementResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_bluetooth_le_advertisement_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<BluetoothLEAdvertisementResponse>(msg, 67);
-}
-#endif
 bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) {
  switch (msg_type) {
    case 1: {
@@ -592,26 +566,6 @@ bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
 #endif
      break;
    }
-    case 65: {
-#ifdef USE_MEDIA_PLAYER
-      MediaPlayerCommandRequest msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_media_player_command_request: %s", msg.dump().c_str());
-#endif
-      this->on_media_player_command_request(msg);
-#endif
-      break;
-    }
-    case 66: {
-      SubscribeBluetoothLEAdvertisementsRequest msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_subscribe_bluetooth_le_advertisements_request: %s", msg.dump().c_str());
-#endif
-      this->on_subscribe_bluetooth_le_advertisements_request(msg);
-      break;
-    }
    default:
      return false;
  }
@@ -708,18 +662,6 @@ void APIServerConnection::on_subscribe_home_assistant_states_request(const Subsc
  }
  this->subscribe_home_assistant_states(msg);
 }
-void APIServerConnection::on_subscribe_bluetooth_le_advertisements_request(
-    const SubscribeBluetoothLEAdvertisementsRequest &msg) {
-  if (!this->is_connection_setup()) {
-    this->on_no_setup_connection();
-    return;
-  }
-  if (!this->is_authenticated()) {
-    this->on_unauthenticated_access();
-    return;
-  }
-  this->subscribe_bluetooth_le_advertisements(msg);
-}
 void APIServerConnection::on_get_time_request(const GetTimeRequest &msg) {
  if (!this->is_connection_setup()) {
    this->on_no_setup_connection();
@@ -871,19 +813,6 @@ void APIServerConnection::on_lock_command_request(const LockCommandRequest &msg)
  this->lock_command(msg);
 }
 #endif
-#ifdef USE_MEDIA_PLAYER
-void APIServerConnection::on_media_player_command_request(const MediaPlayerCommandRequest &msg) {
-  if (!this->is_connection_setup()) {
-    this->on_no_setup_connection();
-    return;
-  }
-  if (!this->is_authenticated()) {
-    this->on_unauthenticated_access();
-    return;
-  }
-  this->media_player_command(msg);
-}
-#endif

 }  // namespace api
 }  // namespace esphome
--- a/esphome/components/api/api_pb2_service.h
+++ b/esphome/components/api/api_pb2_service.h
@@ -144,20 +144,6 @@ class APIServerConnectionBase : public ProtoService {
 #endif
 #ifdef USE_BUTTON
  virtual void on_button_command_request(const ButtonCommandRequest &value){};
-#endif
-#ifdef USE_MEDIA_PLAYER
-  bool send_list_entities_media_player_response(const ListEntitiesMediaPlayerResponse &msg);
-#endif
-#ifdef USE_MEDIA_PLAYER
-  bool send_media_player_state_response(const MediaPlayerStateResponse &msg);
-#endif
-#ifdef USE_MEDIA_PLAYER
-  virtual void on_media_player_command_request(const MediaPlayerCommandRequest &value){};
-#endif
-  virtual void on_subscribe_bluetooth_le_advertisements_request(
-      const SubscribeBluetoothLEAdvertisementsRequest &value){};
-#ifdef USE_BLUETOOTH_PROXY
-  bool send_bluetooth_le_advertisement_response(const BluetoothLEAdvertisementResponse &msg);
 #endif
 protected:
  bool read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) override;
@@ -175,7 +161,6 @@ class APIServerConnection : public APIServerConnectionBase {
  virtual void subscribe_logs(const SubscribeLogsRequest &msg) = 0;
  virtual void subscribe_homeassistant_services(const SubscribeHomeassistantServicesRequest &msg) = 0;
  virtual void subscribe_home_assistant_states(const SubscribeHomeAssistantStatesRequest &msg) = 0;
-  virtual void subscribe_bluetooth_le_advertisements(const SubscribeBluetoothLEAdvertisementsRequest &msg) = 0;
  virtual GetTimeResponse get_time(const GetTimeRequest &msg) = 0;
  virtual void execute_service(const ExecuteServiceRequest &msg) = 0;
 #ifdef USE_COVER
@@ -207,9 +192,6 @@ class APIServerConnection : public APIServerConnectionBase {
 #endif
 #ifdef USE_LOCK
  virtual void lock_command(const LockCommandRequest &msg) = 0;
-#endif
-#ifdef USE_MEDIA_PLAYER
-  virtual void media_player_command(const MediaPlayerCommandRequest &msg) = 0;
 #endif
 protected:
  void on_hello_request(const HelloRequest &msg) override;
@@ -222,7 +204,6 @@ class APIServerConnection : public APIServerConnectionBase {
  void on_subscribe_logs_request(const SubscribeLogsRequest &msg) override;
  void on_subscribe_homeassistant_services_request(const SubscribeHomeassistantServicesRequest &msg) override;
  void on_subscribe_home_assistant_states_request(const SubscribeHomeAssistantStatesRequest &msg) override;
-  void on_subscribe_bluetooth_le_advertisements_request(const SubscribeBluetoothLEAdvertisementsRequest &msg) override;
  void on_get_time_request(const GetTimeRequest &msg) override;
  void on_execute_service_request(const ExecuteServiceRequest &msg) override;
 #ifdef USE_COVER
@@ -255,9 +236,6 @@ class APIServerConnection : public APIServerConnectionBase {
 #ifdef USE_LOCK
  void on_lock_command_request(const LockCommandRequest &msg) override;
 #endif
-#ifdef USE_MEDIA_PLAYER
-  void on_media_player_command_request(const MediaPlayerCommandRequest &msg) override;
-#endif
 };

 }  // namespace api
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -255,7 +255,7 @@ void APIServer::on_number_update(number::Number *obj, float state) {
 #endif

 #ifdef USE_SELECT
-void APIServer::on_select_update(select::Select *obj, const std::string &state, size_t index) {
+void APIServer::on_select_update(select::Select *obj, const std::string &state) {
  if (obj->is_internal())
    return;
  for (auto &c : this->clients_)
@@ -272,15 +272,6 @@ void APIServer::on_lock_update(lock::Lock *obj) {
 }
 #endif

-#ifdef USE_MEDIA_PLAYER
-void APIServer::on_media_player_update(media_player::MediaPlayer *obj) {
-  if (obj->is_internal())
-    return;
-  for (auto &c : this->clients_)
-    c->send_media_player_state(obj);
-}
-#endif
-
 float APIServer::get_setup_priority() const { return setup_priority::AFTER_WIFI; }
 void APIServer::set_port(uint16_t port) { this->port_ = port; }
 APIServer *global_api_server = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
@@ -291,13 +282,6 @@ void APIServer::send_homeassistant_service_call(const HomeassistantServiceRespon
    client->send_homeassistant_service_call(call);
  }
 }
-#ifdef USE_BLUETOOTH_PROXY
-void APIServer::send_bluetooth_le_advertisement(const BluetoothLEAdvertisementResponse &call) {
-  for (auto &client : this->clients_) {
-    client->send_bluetooth_le_advertisement(call);
-  }
-}
-#endif
 APIServer::APIServer() { global_api_server = this; }
 void APIServer::subscribe_home_assistant_state(std::string entity_id, optional<std::string> attribute,
                                               std::function<void(std::string)> f) {
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -7,6 +7,7 @@
 #include "esphome/components/socket/socket.h"
 #include "api_pb2.h"
 #include "api_pb2_service.h"
+#include "util.h"
 #include "list_entities.h"
 #include "subscribe_state.h"
 #include "user_services.h"
@@ -64,18 +65,12 @@ class APIServer : public Component, public Controller {
  void on_number_update(number::Number *obj, float state) override;
 #endif
 #ifdef USE_SELECT
-  void on_select_update(select::Select *obj, const std::string &state, size_t index) override;
+  void on_select_update(select::Select *obj, const std::string &state) override;
 #endif
 #ifdef USE_LOCK
  void on_lock_update(lock::Lock *obj) override;
-#endif
-#ifdef USE_MEDIA_PLAYER
-  void on_media_player_update(media_player::MediaPlayer *obj) override;
 #endif
  void send_homeassistant_service_call(const HomeassistantServiceResponse &call);
-#ifdef USE_BLUETOOTH_PROXY
-  void send_bluetooth_le_advertisement(const BluetoothLEAdvertisementResponse &call);
-#endif
  void register_user_service(UserServiceDescriptor *descriptor) { this->user_services_.push_back(descriptor); }
 #ifdef USE_HOMEASSISTANT_TIME
  void request_time();
--- a/esphome/components/api/list_entities.cpp
+++ b/esphome/components/api/list_entities.cpp
@@ -40,7 +40,8 @@ bool ListEntitiesIterator::on_lock(lock::Lock *a_lock) { return this->client_->s
 #endif

 bool ListEntitiesIterator::on_end() { return this->client_->send_list_info_done(); }
-ListEntitiesIterator::ListEntitiesIterator(APIConnection *client) : client_(client) {}
+ListEntitiesIterator::ListEntitiesIterator(APIServer *server, APIConnection *client)
+    : ComponentIterator(server), client_(client) {}
 bool ListEntitiesIterator::on_service(UserServiceDescriptor *service) {
  auto resp = service->encode_list_service_response();
  return this->client_->send_list_entities_services_response(resp);
@@ -64,11 +65,5 @@ bool ListEntitiesIterator::on_number(number::Number *number) { return this->clie
 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) {
-  return this->client_->send_media_player_info(media_player);
-}
-#endif
-
 }  // namespace api
 }  // namespace esphome
--- a/esphome/components/api/list_entities.h
+++ b/esphome/components/api/list_entities.h
@@ -1,8 +1,8 @@
 #pragma once

 #include "esphome/core/component.h"
-#include "esphome/core/component_iterator.h"
 #include "esphome/core/defines.h"
+#include "util.h"

 namespace esphome {
 namespace api {
@@ -11,7 +11,7 @@ class APIConnection;

 class ListEntitiesIterator : public ComponentIterator {
 public:
-  ListEntitiesIterator(APIConnection *client);
+  ListEntitiesIterator(APIServer *server, APIConnection *client);
 #ifdef USE_BINARY_SENSOR
  bool on_binary_sensor(binary_sensor::BinarySensor *binary_sensor) override;
 #endif
@@ -51,9 +51,6 @@ class ListEntitiesIterator : public ComponentIterator {
 #endif
 #ifdef USE_LOCK
  bool on_lock(lock::Lock *a_lock) override;
-#endif
-#ifdef USE_MEDIA_PLAYER
-  bool on_media_player(media_player::MediaPlayer *media_player) override;
 #endif
  bool on_end() override;

@@ -63,3 +60,5 @@ class ListEntitiesIterator : public ComponentIterator {

 }  // namespace api
 }  // namespace esphome
+
+#include "api_server.h"
--- a/esphome/components/api/proto.cpp
+++ b/esphome/components/api/proto.cpp
@@ -1,4 +1,5 @@
 #include "proto.h"
+#include "util.h"
 #include "esphome/core/log.h"

 namespace esphome {
--- a/esphome/components/api/proto.h
+++ b/esphome/components/api/proto.h
@@ -70,7 +70,7 @@ class ProtoVarInt {
    }
  }
  void encode(std::vector<uint8_t> &out) {
-    uint64_t val = this->value_;
+    uint32_t val = this->value_;
    if (val <= 0x7F) {
      out.push_back(val);
      return;
@@ -195,20 +195,6 @@ class ProtoWriteBuffer {
    this->write((value >> 16) & 0xFF);
    this->write((value >> 24) & 0xFF);
  }
-  void encode_fixed64(uint32_t field_id, uint64_t value, bool force = false) {
-    if (value == 0 && !force)
-      return;
-
-    this->encode_field_raw(field_id, 5);
-    this->write((value >> 0) & 0xFF);
-    this->write((value >> 8) & 0xFF);
-    this->write((value >> 16) & 0xFF);
-    this->write((value >> 24) & 0xFF);
-    this->write((value >> 32) & 0xFF);
-    this->write((value >> 40) & 0xFF);
-    this->write((value >> 48) & 0xFF);
-    this->write((value >> 56) & 0xFF);
-  }
  template<typename T> void encode_enum(uint32_t field_id, T value, bool force = false) {
    this->encode_uint32(field_id, static_cast<uint32_t>(value), force);
  }
@@ -243,15 +229,6 @@ class ProtoWriteBuffer {
    }
    this->encode_uint32(field_id, uvalue, force);
  }
-  void encode_sint64(uint32_t field_id, int64_t value, bool force = false) {
-    uint64_t uvalue;
-    if (value < 0) {
-      uvalue = ~(value << 1);
-    } else {
-      uvalue = value << 1;
-    }
-    this->encode_uint64(field_id, uvalue, force);
-  }
  template<class C> void encode_message(uint32_t field_id, const C &value, bool force = false) {
    this->encode_field_raw(field_id, 2);
    size_t begin = this->buffer_->size();
--- a/esphome/components/api/subscribe_state.cpp
+++ b/esphome/components/api/subscribe_state.cpp
@@ -50,12 +50,8 @@ bool InitialStateIterator::on_select(select::Select *select) {
 #ifdef USE_LOCK
 bool InitialStateIterator::on_lock(lock::Lock *a_lock) { return this->client_->send_lock_state(a_lock, a_lock->state); }
 #endif
-#ifdef USE_MEDIA_PLAYER
-bool InitialStateIterator::on_media_player(media_player::MediaPlayer *media_player) {
-  return this->client_->send_media_player_state(media_player);
-}
-#endif
-InitialStateIterator::InitialStateIterator(APIConnection *client) : client_(client) {}
+InitialStateIterator::InitialStateIterator(APIServer *server, APIConnection *client)
+    : ComponentIterator(server), client_(client) {}

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

 #include "esphome/core/component.h"
-#include "esphome/core/component_iterator.h"
 #include "esphome/core/controller.h"
 #include "esphome/core/defines.h"
+#include "util.h"

 namespace esphome {
 namespace api {
@@ -12,7 +12,7 @@ class APIConnection;

 class InitialStateIterator : public ComponentIterator {
 public:
-  InitialStateIterator(APIConnection *client);
+  InitialStateIterator(APIServer *server, APIConnection *client);
 #ifdef USE_BINARY_SENSOR
  bool on_binary_sensor(binary_sensor::BinarySensor *binary_sensor) override;
 #endif
@@ -48,9 +48,6 @@ class InitialStateIterator : public ComponentIterator {
 #endif
 #ifdef USE_LOCK
  bool on_lock(lock::Lock *a_lock) override;
-#endif
-#ifdef USE_MEDIA_PLAYER
-  bool on_media_player(media_player::MediaPlayer *media_player) override;
 #endif
 protected:
  APIConnection *client_;
@@ -58,3 +55,5 @@ class InitialStateIterator : public ComponentIterator {

 }  // namespace api
 }  // namespace esphome
+
+#include "api_server.h"
--- a/esphome/core/component_iterator.cpp
+++ b/esphome/core/component_iterator.cpp
@@ -1,18 +1,16 @@
-#include "component_iterator.h"
-
+#include "util.h"
+#include "api_server.h"
+#include "user_services.h"
+#include "esphome/core/log.h"
 #include "esphome/core/application.h"

-#ifdef USE_API
-#include "esphome/components/api/api_server.h"
-#include "esphome/components/api/user_services.h"
-#endif
-
 namespace esphome {
+namespace api {

-void ComponentIterator::begin(bool include_internal) {
+ComponentIterator::ComponentIterator(APIServer *server) : server_(server) {}
+void ComponentIterator::begin() {
  this->state_ = IteratorState::BEGIN;
  this->at_ = 0;
-  this->include_internal_ = include_internal;
 }
 void ComponentIterator::advance() {
  bool advance_platform = false;
@@ -34,7 +32,7 @@ void ComponentIterator::advance() {
        advance_platform = true;
      } else {
        auto *binary_sensor = App.get_binary_sensors()[this->at_];
-        if (binary_sensor->is_internal() && !this->include_internal_) {
+        if (binary_sensor->is_internal()) {
          success = true;
          break;
        } else {
@@ -49,7 +47,7 @@ void ComponentIterator::advance() {
        advance_platform = true;
      } else {
        auto *cover = App.get_covers()[this->at_];
-        if (cover->is_internal() && !this->include_internal_) {
+        if (cover->is_internal()) {
          success = true;
          break;
        } else {
@@ -64,7 +62,7 @@ void ComponentIterator::advance() {
        advance_platform = true;
      } else {
        auto *fan = App.get_fans()[this->at_];
-        if (fan->is_internal() && !this->include_internal_) {
+        if (fan->is_internal()) {
          success = true;
          break;
        } else {
@@ -79,7 +77,7 @@ void ComponentIterator::advance() {
        advance_platform = true;
      } else {
        auto *light = App.get_lights()[this->at_];
-        if (light->is_internal() && !this->include_internal_) {
+        if (light->is_internal()) {
          success = true;
          break;
        } else {
@@ -94,7 +92,7 @@ void ComponentIterator::advance() {
        advance_platform = true;
      } else {
        auto *sensor = App.get_sensors()[this->at_];
-        if (sensor->is_internal() && !this->include_internal_) {
+        if (sensor->is_internal()) {
          success = true;
          break;
        } else {
@@ -109,7 +107,7 @@ void ComponentIterator::advance() {
        advance_platform = true;
      } else {
        auto *a_switch = App.get_switches()[this->at_];
-        if (a_switch->is_internal() && !this->include_internal_) {
+        if (a_switch->is_internal()) {
          success = true;
          break;
        } else {
@@ -124,7 +122,7 @@ void ComponentIterator::advance() {
        advance_platform = true;
      } else {
        auto *button = App.get_buttons()[this->at_];
-        if (button->is_internal() && !this->include_internal_) {
+        if (button->is_internal()) {
          success = true;
          break;
        } else {
@@ -139,7 +137,7 @@ void ComponentIterator::advance() {
        advance_platform = true;
      } else {
        auto *text_sensor = App.get_text_sensors()[this->at_];
-        if (text_sensor->is_internal() && !this->include_internal_) {
+        if (text_sensor->is_internal()) {
          success = true;
          break;
        } else {
@@ -148,22 +146,20 @@ void ComponentIterator::advance() {
      }
      break;
 #endif
-#ifdef USE_API
    case IteratorState ::SERVICE:
-      if (this->at_ >= api::global_api_server->get_user_services().size()) {
+      if (this->at_ >= this->server_->get_user_services().size()) {
        advance_platform = true;
      } else {
-        auto *service = api::global_api_server->get_user_services()[this->at_];
+        auto *service = this->server_->get_user_services()[this->at_];
        success = this->on_service(service);
      }
      break;
-#endif
 #ifdef USE_ESP32_CAMERA
    case IteratorState::CAMERA:
      if (esp32_camera::global_esp32_camera == nullptr) {
        advance_platform = true;
      } else {
-        if (esp32_camera::global_esp32_camera->is_internal() && !this->include_internal_) {
+        if (esp32_camera::global_esp32_camera->is_internal()) {
          advance_platform = success = true;
          break;
        } else {
@@ -178,7 +174,7 @@ void ComponentIterator::advance() {
        advance_platform = true;
      } else {
        auto *climate = App.get_climates()[this->at_];
-        if (climate->is_internal() && !this->include_internal_) {
+        if (climate->is_internal()) {
          success = true;
          break;
        } else {
@@ -193,7 +189,7 @@ void ComponentIterator::advance() {
        advance_platform = true;
      } else {
        auto *number = App.get_numbers()[this->at_];
-        if (number->is_internal() && !this->include_internal_) {
+        if (number->is_internal()) {
          success = true;
          break;
        } else {
@@ -208,7 +204,7 @@ void ComponentIterator::advance() {
        advance_platform = true;
      } else {
        auto *select = App.get_selects()[this->at_];
-        if (select->is_internal() && !this->include_internal_) {
+        if (select->is_internal()) {
          success = true;
          break;
        } else {
@@ -223,7 +219,7 @@ void ComponentIterator::advance() {
        advance_platform = true;
      } else {
        auto *a_lock = App.get_locks()[this->at_];
-        if (a_lock->is_internal() && !this->include_internal_) {
+        if (a_lock->is_internal()) {
          success = true;
          break;
        } else {
@@ -231,21 +227,6 @@ void ComponentIterator::advance() {
        }
      }
      break;
-#endif
-#ifdef USE_MEDIA_PLAYER
-    case IteratorState::MEDIA_PLAYER:
-      if (this->at_ >= App.get_media_players().size()) {
-        advance_platform = true;
-      } else {
-        auto *media_player = App.get_media_players()[this->at_];
-        if (media_player->is_internal() && !this->include_internal_) {
-          success = true;
-          break;
-        } else {
-          success = this->on_media_player(media_player);
-        }
-      }
-      break;
 #endif
    case IteratorState::MAX:
      if (this->on_end()) {
@@ -263,13 +244,10 @@ void ComponentIterator::advance() {
 }
 bool ComponentIterator::on_end() { return true; }
 bool ComponentIterator::on_begin() { return true; }
-#ifdef USE_API
-bool ComponentIterator::on_service(api::UserServiceDescriptor *service) { return true; }
-#endif
+bool ComponentIterator::on_service(UserServiceDescriptor *service) { return true; }
 #ifdef USE_ESP32_CAMERA
 bool ComponentIterator::on_camera(esp32_camera::ESP32Camera *camera) { return true; }
 #endif
-#ifdef USE_MEDIA_PLAYER
-bool ComponentIterator::on_media_player(media_player::MediaPlayer *media_player) { return true; }
-#endif
+
+}  // namespace api
 }  // namespace esphome
--- a/esphome/core/component_iterator.h
+++ b/esphome/core/component_iterator.h
@@ -1,24 +1,23 @@
 #pragma once

+#include "esphome/core/helpers.h"
 #include "esphome/core/component.h"
 #include "esphome/core/controller.h"
-#include "esphome/core/helpers.h"
-
 #ifdef USE_ESP32_CAMERA
 #include "esphome/components/esp32_camera/esp32_camera.h"
 #endif

 namespace esphome {
-
-#ifdef USE_API
 namespace api {
+
+class APIServer;
 class UserServiceDescriptor;
-}  // namespace api
-#endif

 class ComponentIterator {
 public:
-  void begin(bool include_internal = false);
+  ComponentIterator(APIServer *server);
+
+  void begin();
  void advance();
  virtual bool on_begin();
 #ifdef USE_BINARY_SENSOR
@@ -45,9 +44,7 @@ class ComponentIterator {
 #ifdef USE_TEXT_SENSOR
  virtual bool on_text_sensor(text_sensor::TextSensor *text_sensor) = 0;
 #endif
-#ifdef USE_API
-  virtual bool on_service(api::UserServiceDescriptor *service);
-#endif
+  virtual bool on_service(UserServiceDescriptor *service);
 #ifdef USE_ESP32_CAMERA
  virtual bool on_camera(esp32_camera::ESP32Camera *camera);
 #endif
@@ -62,9 +59,6 @@ class ComponentIterator {
 #endif
 #ifdef USE_LOCK
  virtual bool on_lock(lock::Lock *a_lock) = 0;
-#endif
-#ifdef USE_MEDIA_PLAYER
-  virtual bool on_media_player(media_player::MediaPlayer *media_player);
 #endif
  virtual bool on_end();

@@ -96,9 +90,7 @@ class ComponentIterator {
 #ifdef USE_TEXT_SENSOR
    TEXT_SENSOR,
 #endif
-#ifdef USE_API
    SERVICE,
-#endif
 #ifdef USE_ESP32_CAMERA
    CAMERA,
 #endif
@@ -113,14 +105,13 @@ class ComponentIterator {
 #endif
 #ifdef USE_LOCK
    LOCK,
-#endif
-#ifdef USE_MEDIA_PLAYER
-    MEDIA_PLAYER,
 #endif
    MAX,
  } state_{IteratorState::NONE};
  size_t at_{0};
-  bool include_internal_{false};
+
+  APIServer *server_;
 };

+}  // namespace api
 }  // namespace esphome
--- a/esphome/components/as3935/as3935.h
+++ b/esphome/components/as3935/as3935.h
@@ -92,9 +92,9 @@ class AS3935Component : public Component {

  virtual void write_register(uint8_t reg, uint8_t mask, uint8_t bits, uint8_t start_position) = 0;

-  sensor::Sensor *distance_sensor_{nullptr};
-  sensor::Sensor *energy_sensor_{nullptr};
-  binary_sensor::BinarySensor *thunder_alert_binary_sensor_{nullptr};
+  sensor::Sensor *distance_sensor_;
+  sensor::Sensor *energy_sensor_;
+  binary_sensor::BinarySensor *thunder_alert_binary_sensor_;
  GPIOPin *irq_pin_;

  bool indoor_;
--- a/esphome/components/b_parasite/b_parasite.cpp
+++ b/esphome/components/b_parasite/b_parasite.cpp
@@ -38,7 +38,7 @@ bool BParasite::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
  const auto &data = service_data.data;

  const uint8_t protocol_version = data[0] >> 4;
-  if (protocol_version != 1 && protocol_version != 2) {
+  if (protocol_version != 1) {
    ESP_LOGE(TAG, "Unsupported protocol version: %u", protocol_version);
    return false;
  }
@@ -57,15 +57,9 @@ bool BParasite::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
  uint16_t battery_millivolt = data[2] << 8 | data[3];
  float battery_voltage = battery_millivolt / 1000.0f;

-  // Temperature in 1000 * Celsius (protocol v1) or 100 * Celsius (protocol v2).
-  float temp_celsius;
-  if (protocol_version == 1) {
-    uint16_t temp_millicelsius = data[4] << 8 | data[5];
-    temp_celsius = temp_millicelsius / 1000.0f;
-  } else {
-    int16_t temp_centicelsius = data[4] << 8 | data[5];
-    temp_celsius = temp_centicelsius / 100.0f;
-  }
+  // Temperature in 1000 * Celsius.
+  uint16_t temp_millicelcius = data[4] << 8 | data[5];
+  float temp_celcius = temp_millicelcius / 1000.0f;

  // Relative air humidity in the range [0, 2^16).
  uint16_t humidity = data[6] << 8 | data[7];
@@ -82,7 +76,7 @@ bool BParasite::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
    battery_voltage_->publish_state(battery_voltage);
  }
  if (temperature_ != nullptr) {
-    temperature_->publish_state(temp_celsius);
+    temperature_->publish_state(temp_celcius);
  }
  if (humidity_ != nullptr) {
    humidity_->publish_state(humidity_percent);
--- a/esphome/components/bedjet/init.py
+++ b/esphome/components/bedjet/init.py
@@ -1,52 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import ble_client, time
-from esphome.const import (
-    CONF_ID,
-    CONF_RECEIVE_TIMEOUT,
-    CONF_TIME_ID,
-)
-
-CODEOWNERS = ["@jhansche"]
-DEPENDENCIES = ["ble_client"]
-MULTI_CONF = True
-CONF_BEDJET_ID = "bedjet_id"
-
-bedjet_ns = cg.esphome_ns.namespace("bedjet")
-BedJetHub = bedjet_ns.class_("BedJetHub", ble_client.BLEClientNode, cg.PollingComponent)
-
-CONFIG_SCHEMA = (
-    cv.COMPONENT_SCHEMA.extend(
-        {
-            cv.GenerateID(): cv.declare_id(BedJetHub),
-            cv.Optional(CONF_TIME_ID): cv.use_id(time.RealTimeClock),
-            cv.Optional(
-                CONF_RECEIVE_TIMEOUT, default="0s"
-            ): cv.positive_time_period_milliseconds,
-        }
-    )
-    .extend(ble_client.BLE_CLIENT_SCHEMA)
-    .extend(cv.polling_component_schema("15s"))
-)
-
-BEDJET_CLIENT_SCHEMA = cv.Schema(
-    {
-        cv.Required(CONF_BEDJET_ID): cv.use_id(BedJetHub),
-    }
-)
-
-
-async def register_bedjet_child(var, config):
-    parent = await cg.get_variable(config[CONF_BEDJET_ID])
-    cg.add(parent.register_child(var))
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await ble_client.register_ble_node(var, config)
-    if CONF_TIME_ID in config:
-        time_ = await cg.get_variable(config[CONF_TIME_ID])
-        cg.add(var.set_time_id(time_))
-    if CONF_RECEIVE_TIMEOUT in config:
-        cg.add(var.set_status_timeout(config[CONF_RECEIVE_TIMEOUT]))
--- a/esphome/components/bedjet/bedjet_child.h
+++ b/esphome/components/bedjet/bedjet_child.h
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "bedjet_codec.h"
-#include "esphome/core/helpers.h"
-
-namespace esphome {
-namespace bedjet {
-
-// Forward declare BedJetHub
-class BedJetHub;
-
-class BedJetClient : public Parented<BedJetHub> {
- public:
-  virtual void on_status(const BedjetStatusPacket *data) = 0;
-  virtual void on_bedjet_state(bool is_ready) = 0;
-
- protected:
-  friend BedJetHub;
-  virtual std::string describe() = 0;
-};
-
-}  // namespace bedjet
-}  // namespace esphome
--- a/esphome/components/bedjet/bedjet_codec.cpp
+++ b/esphome/components/bedjet/bedjet_codec.cpp
@@ -1,161 +0,0 @@
-#include "bedjet_codec.h"
-#include <cstdio>
-#include <cstring>
-
-namespace esphome {
-namespace bedjet {
-
-/// Converts a BedJet temp step into degrees Fahrenheit.
-float bedjet_temp_to_f(const uint8_t temp) {
-  // BedJet temp is "C*2"; to get F, multiply by 0.9 (half 1.8) and add 32.
-  return 0.9f * temp + 32.0f;
-}
-
-/** Cleans up the packet before sending. */
-BedjetPacket *BedjetCodec::clean_packet_() {
-  // So far no commands require more than 2 bytes of data.
-  assert(this->packet_.data_length <= 2);
-  for (int i = this->packet_.data_length; i < 2; i++) {
-    this->packet_.data[i] = '\0';
-  }
-  ESP_LOGV(TAG, "Created packet: %02X, %02X %02X", this->packet_.command, this->packet_.data[0], this->packet_.data[1]);
-  return &this->packet_;
-}
-
-/** Returns a BedjetPacket that will initiate a BedjetButton press. */
-BedjetPacket *BedjetCodec::get_button_request(BedjetButton button) {
-  this->packet_.command = CMD_BUTTON;
-  this->packet_.data_length = 1;
-  this->packet_.data[0] = button;
-  return this->clean_packet_();
-}
-
-/** Returns a BedjetPacket that will set the device's target `temperature`. */
-BedjetPacket *BedjetCodec::get_set_target_temp_request(float temperature) {
-  this->packet_.command = CMD_SET_TEMP;
-  this->packet_.data_length = 1;
-  this->packet_.data[0] = temperature * 2;
-  return this->clean_packet_();
-}
-
-/** Returns a BedjetPacket that will set the device's target fan speed. */
-BedjetPacket *BedjetCodec::get_set_fan_speed_request(const uint8_t fan_step) {
-  this->packet_.command = CMD_SET_FAN;
-  this->packet_.data_length = 1;
-  this->packet_.data[0] = fan_step;
-  return this->clean_packet_();
-}
-
-/** Returns a BedjetPacket that will set the device's current time. */
-BedjetPacket *BedjetCodec::get_set_time_request(const uint8_t hour, const uint8_t minute) {
-  this->packet_.command = CMD_SET_CLOCK;
-  this->packet_.data_length = 2;
-  this->packet_.data[0] = hour;
-  this->packet_.data[1] = minute;
-  return this->clean_packet_();
-}
-
-/** Returns a BedjetPacket that will set the device's remaining runtime. */
-BedjetPacket *BedjetCodec::get_set_runtime_remaining_request(const uint8_t hour, const uint8_t minute) {
-  this->packet_.command = CMD_SET_RUNTIME;
-  this->packet_.data_length = 2;
-  this->packet_.data[0] = hour;
-  this->packet_.data[1] = minute;
-  return this->clean_packet_();
-}
-
-/** Decodes the extra bytes that were received after being notified with a partial packet. */
-void BedjetCodec::decode_extra(const uint8_t *data, uint16_t length) {
-  ESP_LOGVV(TAG, "Received extra: %d bytes: %d %d %d %d", length, data[1], data[2], data[3], data[4]);
-  uint8_t offset = this->last_buffer_size_;
-  if (offset > 0 && length + offset <= sizeof(BedjetStatusPacket)) {
-    memcpy(((uint8_t *) (&this->buf_)) + offset, data, length);
-    ESP_LOGVV(TAG,
-              "Extra bytes: skip1=0x%08x, skip2=0x%04x, skip3=0x%02x; update phase=0x%02x, "
-              "flags=BedjetFlags <conn=%c, leds=%c, units=%c, mute=%c; packed=%02x>",
-              this->buf_.unused_1, this->buf_.unused_2, this->buf_.unused_3, this->buf_.update_phase,
-              this->buf_.flags.conn_test_passed ? '1' : '0', this->buf_.flags.leds_enabled ? '1' : '0',
-              this->buf_.flags.units_setup ? '1' : '0', this->buf_.flags.beeps_muted ? '1' : '0',
-              this->buf_.flags_packed);
-  } else {
-    ESP_LOGI(TAG, "Could not determine where to append to, last offset=%d, max size=%u, new size would be %d", offset,
-             sizeof(BedjetStatusPacket), length + offset);
-  }
-}
-
-/** Decodes the incoming status packet received on the BEDJET_STATUS_UUID.
- *
- * @return `true` if the packet was decoded and represents a "partial" packet; `false` otherwise.
- */
-bool BedjetCodec::decode_notify(const uint8_t *data, uint16_t length) {
-  ESP_LOGV(TAG, "Received: %d bytes: %d %d %d %d", length, data[1], data[2], data[3], data[4]);
-
-  if (data[1] == PACKET_FORMAT_V3_HOME && data[3] == PACKET_TYPE_STATUS) {
-    // Clear old buffer
-    memset(&this->buf_, 0, sizeof(BedjetStatusPacket));
-    // Copy new data into buffer
-    memcpy(&this->buf_, data, length);
-    this->last_buffer_size_ = length;
-
-    // TODO: validate the packet checksum?
-    if (this->buf_.mode < 7 && this->buf_.target_temp_step >= 38 && this->buf_.target_temp_step <= 86 &&
-        this->buf_.actual_temp_step > 1 && this->buf_.actual_temp_step <= 100 && this->buf_.ambient_temp_step > 1 &&
-        this->buf_.ambient_temp_step <= 100) {
-      // and save it for the update() loop
-      this->status_packet_ = &this->buf_;
-      return this->buf_.is_partial;
-    } else {
-      this->status_packet_ = nullptr;
-      // TODO: log a warning if we detect that we connected to a non-V3 device.
-      ESP_LOGW(TAG, "Received potentially invalid packet (len %d):", length);
-    }
-  } else if (data[1] == PACKET_FORMAT_DEBUG || data[3] == PACKET_TYPE_DEBUG) {
-    // We don't actually know the packet format for this. Dump packets to log, in case a pattern presents itself.
-    ESP_LOGVV(TAG,
-              "received DEBUG packet: set1=%01fF, set2=%01fF, air=%01fF;  [7]=%d, [8]=%d, [9]=%d, [10]=%d, [11]=%d, "
-              "[12]=%d, [-1]=%d",
-              bedjet_temp_to_f(data[4]), bedjet_temp_to_f(data[5]), bedjet_temp_to_f(data[6]), data[7], data[8],
-              data[9], data[10], data[11], data[12], data[length - 1]);
-
-    if (this->has_status()) {
-      this->status_packet_->ambient_temp_step = data[6];
-    }
-  } else {
-    // TODO: log a warning if we detect that we connected to a non-V3 device.
-  }
-
-  return false;
-}
-
-/** @return `true` if the new packet is meaningfully different from the last seen packet. */
-bool BedjetCodec::compare(const uint8_t *data, uint16_t length) {
-  if (data == nullptr) {
-    return false;
-  }
-
-  if (length < 17) {
-    // New packet looks small, skip it.
-    return false;
-  }
-
-  if (this->buf_.packet_format != PACKET_FORMAT_V3_HOME ||
-      this->buf_.packet_type != PACKET_TYPE_STATUS) {  // No last seen packet, so take the new one.
-    return true;
-  }
-
-  if (data[1] != PACKET_FORMAT_V3_HOME || data[3] != PACKET_TYPE_STATUS) {  // New packet is not a v3 status, skip it.
-    return false;
-  }
-
-  // Now coerce it to a status packet and compare some key fields
-  const BedjetStatusPacket *test = reinterpret_cast<const BedjetStatusPacket *>(data);
-  // These are fields that will only change due to explicit action.
-  // That is why we do not check ambient or actual temp here, because those are environmental.
-  bool explicit_fields_changed = this->buf_.mode != test->mode || this->buf_.fan_step != test->fan_step ||
-                                 this->buf_.target_temp_step != test->target_temp_step;
-
-  return explicit_fields_changed;
-}
-
-}  // namespace bedjet
-}  // namespace esphome
--- a/esphome/components/bedjet/bedjet_codec.h
+++ b/esphome/components/bedjet/bedjet_codec.h
@@ -1,191 +0,0 @@
-#pragma once
-
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-#include "bedjet_const.h"
-
-namespace esphome {
-namespace bedjet {
-
-struct BedjetPacket {
-  uint8_t data_length;
-  BedjetCommand command;
-  uint8_t data[2];
-};
-
-enum BedjetPacketFormat : uint8_t {
-  PACKET_FORMAT_DEBUG = 0x05,    //  5
-  PACKET_FORMAT_V3_HOME = 0x56,  // 86
-};
-
-enum BedjetPacketType : uint8_t {
-  PACKET_TYPE_STATUS = 0x1,
-  PACKET_TYPE_DEBUG = 0x2,
-};
-
-enum BedjetNotification : uint8_t {
-  NOTIFY_NONE = 0,                    ///< No notification pending
-  NOTIFY_FILTER = 1,                  ///< Clean Filter / Please check BedJet air filter and clean if necessary.
-  NOTIFY_UPDATE = 2,                  ///< Firmware Update / A newer version of firmware is available.
-  NOTIFY_UPDATE_FAIL = 3,             ///< Firmware Update / Unable to connect to the firmware update server.
-  NOTIFY_BIO_FAIL_CLOCK_NOT_SET = 4,  ///< The specified sequence cannot be run because the clock is not set
-  NOTIFY_BIO_FAIL_TOO_LONG = 5,  ///< The specified sequence cannot be run because it contains steps that would be too
-                                 ///< long running from the current time.
-  // Note: after handling a notification, send MAGIC_NOTIFY_ACK
-};
-
-/** The format of a BedJet V3 status packet. */
-struct BedjetStatusPacket {
-  // [0]
-  bool is_partial : 8;  ///< `1` indicates that this is a partial packet, and more data can be read directly from the
-                        ///< characteristic.
-  BedjetPacketFormat packet_format : 8;  ///< BedjetPacketFormat::PACKET_FORMAT_V3_HOME for BedJet V3 status packet
-                                         ///< format. BedjetPacketFormat::PACKET_FORMAT_DEBUG for debugging packets.
-  uint8_t expecting_length : 8;      ///< The expected total length of the status packet after merging the extra packet.
-  BedjetPacketType packet_type : 8;  ///< Typically BedjetPacketType::PACKET_TYPE_STATUS for BedJet V3 status packet.
-
-  // [4]
-  uint8_t time_remaining_hrs : 8;   ///< Hours remaining in program runtime
-  uint8_t time_remaining_mins : 8;  ///< Minutes remaining in program runtime
-  uint8_t time_remaining_secs : 8;  ///< Seconds remaining in program runtime
-
-  // [7]
-  uint8_t actual_temp_step : 8;  ///< Actual temp of the air blown by the BedJet fan; value represents `2 *
-                                 ///< degrees_celsius`. See #bedjet_temp_to_c and #bedjet_temp_to_f
-  uint8_t target_temp_step : 8;  ///< Target temp that the BedJet will try to heat to. See #actual_temp_step.
-
-  // [9]
-  BedjetMode mode : 8;  ///< BedJet operating mode.
-
-  // [10]
-  uint8_t fan_step : 8;  ///< BedJet fan speed; value is in the 0-19 range, representing 5% increments (5%-100%): `5 + 5
-                         ///< * fan_step`
-  uint8_t max_hrs : 8;   ///< Max hours of mode runtime
-  uint8_t max_mins : 8;  ///< Max minutes of mode runtime
-  uint8_t min_temp_step : 8;  ///< Min temp allowed in mode. See #actual_temp_step.
-  uint8_t max_temp_step : 8;  ///< Max temp allowed in mode. See #actual_temp_step.
-
-  // [15-16]
-  uint16_t turbo_time : 16;  ///< Time remaining in BedjetMode::MODE_TURBO.
-
-  // [17]
-  uint8_t ambient_temp_step : 8;  ///< Current ambient air temp. This is the coldest air the BedJet can blow. See
-                                  ///< #actual_temp_step.
-  uint8_t shutdown_reason : 8;    ///< The reason for the last device shutdown.
-
-  // [19-25]; the initial partial packet cuts off here after [19]
-
-  uint8_t unused_1 : 8;  // Unknown [19] = 0x01
-  uint8_t unused_2 : 8;  // Unknown [20] = 0x81
-  uint8_t unused_3 : 8;  // Unknown [21] = 0x01
-
-  // [22]: 0x2=is_dual_zone, ...?
-  struct {
-    int unused_1 : 1;       // 0x80
-    int unused_2 : 1;       // 0x40
-    int unused_3 : 1;       // 0x20
-    int unused_4 : 1;       // 0x10
-    int unused_5 : 1;       // 0x8
-    int unused_6 : 1;       // 0x4
-    bool is_dual_zone : 1;  /// Is part of a Dual Zone configuration
-    int unused_7 : 1;       // 0x1
-  } dual_zone_flags;
-
-  uint8_t unused_4 : 8;  // Unknown 23-24 = 0x1310
-  uint8_t unused_5 : 8;  // Unknown 23-24 = 0x1310
-  uint8_t unused_6 : 8;  // Unknown 25 = 0x00
-
-  // [26]
-  //   0x18(24) = "Connection test has completed OK"
-  //   0x1a(26) = "Firmware update is not needed"
-  uint8_t update_phase : 8;  ///< The current status/phase of a firmware update.
-
-  // [27]
-  union {
-    uint8_t flags_packed;
-    struct {
-      /* uint8_t */
-      int unused_1 : 1;           // 0x80
-      int unused_2 : 1;           // 0x40
-      bool conn_test_passed : 1;  ///< (0x20) Bit is set `1` if the last connection test passed.
-      bool leds_enabled : 1;      ///< (0x10) Bit is set `1` if the LEDs on the device are enabled.
-      int unused_3 : 1;           // 0x08
-      bool units_setup : 1;       ///< (0x04) Bit is set `1` if the device's units have been configured.
-      int unused_4 : 1;           // 0x02
-      bool beeps_muted : 1;       ///< (0x01) Bit is set `1` if the device's sound output is muted.
-    } __attribute__((packed)) flags;
-  };
-
-  // [28] = (biorhythm?) sequence step
-  uint8_t bio_sequence_step : 8;  /// Biorhythm sequence step number
-  // [29] = notify_code:
-  BedjetNotification notify_code : 8;  /// See BedjetNotification
-
-  uint16_t unused_7 : 16;  // Unknown
-
-} __attribute__((packed));
-
-/** This class is responsible for encoding command packets and decoding status packets.
- *
- * Status Packets
- * ==============
- * The BedJet protocol depends on registering for notifications on the esphome::BedJet::BEDJET_SERVICE_UUID
- * characteristic. If the BedJet is on, it will send rapid updates as notifications. If it is off,
- * it generally will not notify of any status.
- *
- * As the BedJet V3's BedjetStatusPacket exceeds the buffer size allowed for BLE notification packets,
- * the notification packet will contain `BedjetStatusPacket::is_partial == 1`. When that happens, an additional
- * read of the esphome::BedJet::BEDJET_SERVICE_UUID characteristic will contain the second portion of the
- * full status packet.
- *
- * Command Packets
- * ===============
- * This class supports encoding a number of BedjetPacket commands:
- * - Button press
- *   This simulates a press of one of the BedjetButton values.
- *   - BedjetPacket#command = BedjetCommand::CMD_BUTTON
- *   - BedjetPacket#data [0] contains the BedjetButton value
- * - Set target temp
- *   This sets the BedJet's target temp to a concrete temperature value.
- *   - BedjetPacket#command = BedjetCommand::CMD_SET_TEMP
- *   - BedjetPacket#data [0] contains the BedJet temp value; see BedjetStatusPacket#actual_temp_step
- * - Set fan speed
- *   This sets the BedJet fan speed.
- *   - BedjetPacket#command = BedjetCommand::CMD_SET_FAN
- *   - BedjetPacket#data [0] contains the BedJet fan step in the range 0-19.
- * - Set current time
- *   The BedJet needs to have its clock set properly in order to run the biorhythm programs, which might
- *   contain time-of-day based step rules.
- *   - BedjetPacket#command = BedjetCommand::CMD_SET_CLOCK
- *   - BedjetPacket#data [0] is hours, [1] is minutes
- */
-class BedjetCodec {
- public:
-  BedjetPacket *get_button_request(BedjetButton button);
-  BedjetPacket *get_set_target_temp_request(float temperature);
-  BedjetPacket *get_set_fan_speed_request(uint8_t fan_step);
-  BedjetPacket *get_set_time_request(uint8_t hour, uint8_t minute);
-  BedjetPacket *get_set_runtime_remaining_request(uint8_t hour, uint8_t minute);
-
-  bool decode_notify(const uint8_t *data, uint16_t length);
-  void decode_extra(const uint8_t *data, uint16_t length);
-  bool compare(const uint8_t *data, uint16_t length);
-
-  inline bool has_status() { return this->status_packet_ != nullptr; }
-  const BedjetStatusPacket *get_status_packet() const { return this->status_packet_; }
-  void clear_status() { this->status_packet_ = nullptr; }
-
- protected:
-  BedjetPacket *clean_packet_();
-
-  uint8_t last_buffer_size_ = 0;
-
-  BedjetPacket packet_;
-
-  BedjetStatusPacket *status_packet_;
-  BedjetStatusPacket buf_;
-};
-
-}  // namespace bedjet
-}  // namespace esphome
--- a/esphome/components/bedjet/bedjet_const.h
+++ b/esphome/components/bedjet/bedjet_const.h
@@ -1,99 +0,0 @@
-#pragma once
-
-#include <set>
-
-namespace esphome {
-namespace bedjet {
-
-static const char *const TAG = "bedjet";
-
-/// Converts a BedJet fan step to a speed percentage, in the range of 5% to 100%.
-inline static uint8_t bedjet_fan_step_to_speed(const uint8_t fan) {
-  //  0 =  5%
-  // 19 = 100%
-  return 5 * fan + 5;
-}
-inline static uint8_t bedjet_fan_speed_to_index(const uint8_t speed) { return speed / 5 - 1; }
-
-enum BedjetMode : uint8_t {
-  /// BedJet is Off
-  MODE_STANDBY = 0,
-  /// BedJet is in Heat mode (limited to 4 hours)
-  MODE_HEAT = 1,
-  /// BedJet is in Turbo mode (high heat, limited time)
-  MODE_TURBO = 2,
-  /// BedJet is in Extended Heat mode (limited to 10 hours)
-  MODE_EXTHT = 3,
-  /// BedJet is in Cool mode (actually "Fan only" mode)
-  MODE_COOL = 4,
-  /// BedJet is in Dry mode (high speed, no heat)
-  MODE_DRY = 5,
-  /// BedJet is in "wait" mode, a step during a biorhythm program
-  MODE_WAIT = 6,
-};
-
-/** Optional heating strategies to use for climate::CLIMATE_MODE_HEAT. */
-enum BedjetHeatMode {
-  /// HVACMode.HEAT is handled using BTN_HEAT (default)
-  HEAT_MODE_HEAT,
-  /// HVACMode.HEAT is handled using BTN_EXTHT
-  HEAT_MODE_EXTENDED,
-};
-
-enum BedjetButton : uint8_t {
-  /// Turn BedJet off
-  BTN_OFF = 0x1,
-  /// Enter Cool mode (fan only)
-  BTN_COOL = 0x2,
-  /// Enter Heat mode (limited to 4 hours)
-  BTN_HEAT = 0x3,
-  /// Enter Turbo mode (high heat, limited to 10 minutes)
-  BTN_TURBO = 0x4,
-  /// Enter Dry mode (high speed, no heat)
-  BTN_DRY = 0x5,
-  /// Enter Extended Heat mode (limited to 10 hours)
-  BTN_EXTHT = 0x6,
-
-  /// Start the M1 biorhythm/preset program
-  BTN_M1 = 0x20,
-  /// Start the M2 biorhythm/preset program
-  BTN_M2 = 0x21,
-  /// Start the M3 biorhythm/preset program
-  BTN_M3 = 0x22,
-
-  /* These are "MAGIC" buttons */
-
-  /// Turn debug mode on/off
-  MAGIC_DEBUG_ON = 0x40,
-  MAGIC_DEBUG_OFF = 0x41,
-  /// Perform a connection test.
-  MAGIC_CONNTEST = 0x42,
-  /// Request a firmware update. This will also restart the Bedjet.
-  MAGIC_UPDATE = 0x43,
-  /// Acknowledge notification handled. See BedjetNotify
-  MAGIC_NOTIFY_ACK = 0x52,
-};
-
-enum BedjetCommand : uint8_t {
-  CMD_BUTTON = 0x1,
-  CMD_SET_RUNTIME = 0x2,
-  CMD_SET_TEMP = 0x3,
-  CMD_STATUS = 0x6,
-  CMD_SET_FAN = 0x7,
-  CMD_SET_CLOCK = 0x8,
-};
-
-#define BEDJET_FAN_STEP_NAMES_ \
-  { \
-    "5%", "10%", "15%", "20%", "25%", "30%", "35%", "40%", "45%", "50%", "55%", "60%", "65%", "70%", "75%", "80%", \
-        "85%", "90%", "95%", "100%" \
-  }
-
-static const uint8_t BEDJET_FAN_SPEED_COUNT = 20;
-
-static const char *const BEDJET_FAN_STEP_NAMES[BEDJET_FAN_SPEED_COUNT] = BEDJET_FAN_STEP_NAMES_;
-static const std::string BEDJET_FAN_STEP_NAME_STRINGS[BEDJET_FAN_SPEED_COUNT] = BEDJET_FAN_STEP_NAMES_;
-static const std::set<std::string> BEDJET_FAN_STEP_NAMES_SET BEDJET_FAN_STEP_NAMES_;
-
-}  // namespace bedjet
-}  // namespace esphome
--- a/esphome/components/bedjet/bedjet_hub.cpp
+++ b/esphome/components/bedjet/bedjet_hub.cpp
@@ -1,559 +0,0 @@
-#include "bedjet_hub.h"
-#include "bedjet_child.h"
-#include "bedjet_const.h"
-
-namespace esphome {
-namespace bedjet {
-
-static const LogString *bedjet_button_to_string(BedjetButton button) {
-  switch (button) {
-    case BTN_OFF:
-      return LOG_STR("OFF");
-    case BTN_COOL:
-      return LOG_STR("COOL");
-    case BTN_HEAT:
-      return LOG_STR("HEAT");
-    case BTN_EXTHT:
-      return LOG_STR("EXT HT");
-    case BTN_TURBO:
-      return LOG_STR("TURBO");
-    case BTN_DRY:
-      return LOG_STR("DRY");
-    case BTN_M1:
-      return LOG_STR("M1");
-    case BTN_M2:
-      return LOG_STR("M2");
-    case BTN_M3:
-      return LOG_STR("M3");
-    default:
-      return LOG_STR("unknown");
-  }
-}
-
-/* Public */
-
-void BedJetHub::upgrade_firmware() {
-  auto *pkt = this->codec_->get_button_request(MAGIC_UPDATE);
-  auto status = this->write_bedjet_packet_(pkt);
-
-  if (status) {
-    ESP_LOGW(TAG, "[%s] MAGIC_UPDATE button failed, status=%d", this->get_name().c_str(), status);
-  }
-}
-
-bool BedJetHub::button_heat() { return this->send_button(BTN_HEAT); }
-bool BedJetHub::button_ext_heat() { return this->send_button(BTN_EXTHT); }
-bool BedJetHub::button_turbo() { return this->send_button(BTN_TURBO); }
-bool BedJetHub::button_cool() { return this->send_button(BTN_COOL); }
-bool BedJetHub::button_dry() { return this->send_button(BTN_DRY); }
-bool BedJetHub::button_off() { return this->send_button(BTN_OFF); }
-bool BedJetHub::button_memory1() { return this->send_button(BTN_M1); }
-bool BedJetHub::button_memory2() { return this->send_button(BTN_M2); }
-bool BedJetHub::button_memory3() { return this->send_button(BTN_M3); }
-
-bool BedJetHub::set_fan_index(uint8_t fan_speed_index) {
-  if (fan_speed_index > 19) {
-    ESP_LOGW(TAG, "Invalid fan speed index %d, expecting 0-19.", fan_speed_index);
-    return false;
-  }
-
-  auto *pkt = this->codec_->get_set_fan_speed_request(fan_speed_index);
-  auto status = this->write_bedjet_packet_(pkt);
-
-  if (status) {
-    ESP_LOGW(TAG, "[%s] writing fan speed failed, status=%d", this->get_name().c_str(), status);
-  }
-  return status == 0;
-}
-
-uint8_t BedJetHub::get_fan_index() {
-  auto *status = this->codec_->get_status_packet();
-  if (status != nullptr) {
-    return status->fan_step;
-  }
-  return 0;
-}
-
-bool BedJetHub::set_target_temp(float temp_c) {
-  auto *pkt = this->codec_->get_set_target_temp_request(temp_c);
-  auto status = this->write_bedjet_packet_(pkt);
-
-  if (status) {
-    ESP_LOGW(TAG, "[%s] writing target temp failed, status=%d", this->get_name().c_str(), status);
-  }
-  return status == 0;
-}
-
-bool BedJetHub::set_time_remaining(uint8_t hours, uint8_t mins) {
-  // FIXME: this may fail depending on current mode or other restrictions enforced by the unit.
-  auto *pkt = this->codec_->get_set_runtime_remaining_request(hours, mins);
-  auto status = this->write_bedjet_packet_(pkt);
-
-  if (status) {
-    ESP_LOGW(TAG, "[%s] writing remaining runtime failed, status=%d", this->get_name().c_str(), status);
-  }
-  return status == 0;
-}
-
-bool BedJetHub::send_button(BedjetButton button) {
-  auto *pkt = this->codec_->get_button_request(button);
-  auto status = this->write_bedjet_packet_(pkt);
-
-  if (status) {
-    ESP_LOGW(TAG, "[%s] writing button %s failed, status=%d", this->get_name().c_str(),
-             LOG_STR_ARG(bedjet_button_to_string(button)), status);
-  } else {
-    ESP_LOGD(TAG, "[%s] writing button %s success", this->get_name().c_str(),
-             LOG_STR_ARG(bedjet_button_to_string(button)));
-  }
-  return status == 0;
-}
-
-uint16_t BedJetHub::get_time_remaining() {
-  auto *status = this->codec_->get_status_packet();
-  if (status != nullptr) {
-    return status->time_remaining_secs + status->time_remaining_mins * 60 + status->time_remaining_hrs * 3600;
-  }
-  return 0;
-}
-
-/* Bluetooth/GATT */
-
-uint8_t BedJetHub::write_bedjet_packet_(BedjetPacket *pkt) {
-  if (!this->is_connected()) {
-    if (!this->parent_->enabled) {
-      ESP_LOGI(TAG, "[%s] Cannot write packet: Not connected, enabled=false", this->get_name().c_str());
-    } else {
-      ESP_LOGW(TAG, "[%s] Cannot write packet: Not connected", this->get_name().c_str());
-    }
-    return -1;
-  }
-  auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_cmd_,
-                                         pkt->data_length + 1, (uint8_t *) &pkt->command, ESP_GATT_WRITE_TYPE_NO_RSP,
-                                         ESP_GATT_AUTH_REQ_NONE);
-  return status;
-}
-
-/** Configures the local ESP BLE client to register (`true`) or unregister (`false`) for status notifications. */
-uint8_t BedJetHub::set_notify_(const bool enable) {
-  uint8_t status;
-  if (enable) {
-    status = esp_ble_gattc_register_for_notify(this->parent_->gattc_if, this->parent_->remote_bda,
-                                               this->char_handle_status_);
-    if (status) {
-      ESP_LOGW(TAG, "[%s] esp_ble_gattc_register_for_notify failed, status=%d", this->get_name().c_str(), status);
-    }
-  } else {
-    status = esp_ble_gattc_unregister_for_notify(this->parent_->gattc_if, this->parent_->remote_bda,
-                                                 this->char_handle_status_);
-    if (status) {
-      ESP_LOGW(TAG, "[%s] esp_ble_gattc_unregister_for_notify failed, status=%d", this->get_name().c_str(), status);
-    }
-  }
-  ESP_LOGV(TAG, "[%s] set_notify: enable=%d; result=%d", this->get_name().c_str(), enable, status);
-  return status;
-}
-
-bool BedJetHub::discover_characteristics_() {
-  bool result = true;
-  esphome::ble_client::BLECharacteristic *chr;
-
-  if (!this->char_handle_cmd_) {
-    chr = this->parent_->get_characteristic(BEDJET_SERVICE_UUID, BEDJET_COMMAND_UUID);
-    if (chr == nullptr) {
-      ESP_LOGW(TAG, "[%s] No control service found at device, not a BedJet..?", this->get_name().c_str());
-      result = false;
-    } else {
-      this->char_handle_cmd_ = chr->handle;
-    }
-  }
-
-  if (!this->char_handle_status_) {
-    chr = this->parent_->get_characteristic(BEDJET_SERVICE_UUID, BEDJET_STATUS_UUID);
-    if (chr == nullptr) {
-      ESP_LOGW(TAG, "[%s] No status service found at device, not a BedJet..?", this->get_name().c_str());
-      result = false;
-    } else {
-      this->char_handle_status_ = chr->handle;
-    }
-  }
-
-  if (!this->config_descr_status_) {
-    // We also need to obtain the config descriptor for this handle.
-    // Otherwise once we set node_state=Established, the parent will flush all handles/descriptors, and we won't be
-    // able to look it up.
-    auto *descr = this->parent_->get_config_descriptor(this->char_handle_status_);
-    if (descr == nullptr) {
-      ESP_LOGW(TAG, "No config descriptor for status handle 0x%x. Will not be able to receive status notifications",
-               this->char_handle_status_);
-      result = false;
-    } else if (descr->uuid.get_uuid().len != ESP_UUID_LEN_16 ||
-               descr->uuid.get_uuid().uuid.uuid16 != ESP_GATT_UUID_CHAR_CLIENT_CONFIG) {
-      ESP_LOGW(TAG, "Config descriptor 0x%x (uuid %s) is not a client config char uuid", this->char_handle_status_,
-               descr->uuid.to_string().c_str());
-      result = false;
-    } else {
-      this->config_descr_status_ = descr->handle;
-    }
-  }
-
-  if (!this->char_handle_name_) {
-    chr = this->parent_->get_characteristic(BEDJET_SERVICE_UUID, BEDJET_NAME_UUID);
-    if (chr == nullptr) {
-      ESP_LOGW(TAG, "[%s] No name service found at device, not a BedJet..?", this->get_name().c_str());
-      result = false;
-    } else {
-      this->char_handle_name_ = chr->handle;
-      auto status = esp_ble_gattc_read_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_name_,
-                                            ESP_GATT_AUTH_REQ_NONE);
-      if (status) {
-        ESP_LOGI(TAG, "[%s] Unable to read name characteristic: %d", this->get_name().c_str(), status);
-      }
-    }
-  }
-
-  ESP_LOGI(TAG, "[%s] Discovered service characteristics: ", this->get_name().c_str());
-  ESP_LOGI(TAG, "     - Command char: 0x%x", this->char_handle_cmd_);
-  ESP_LOGI(TAG, "     - Status char: 0x%x", this->char_handle_status_);
-  ESP_LOGI(TAG, "       - config descriptor: 0x%x", this->config_descr_status_);
-  ESP_LOGI(TAG, "     - Name char: 0x%x", this->char_handle_name_);
-
-  return result;
-}
-
-void BedJetHub::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                                    esp_ble_gattc_cb_param_t *param) {
-  switch (event) {
-    case ESP_GATTC_DISCONNECT_EVT: {
-      ESP_LOGV(TAG, "Disconnected: reason=%d", param->disconnect.reason);
-      this->status_set_warning();
-      this->dispatch_state_(false);
-      break;
-    }
-    case ESP_GATTC_OPEN_EVT: {
-      // FIXME: bug in BLEClient
-      this->parent_->conn_id = param->open.conn_id;
-      this->open_conn_id_ = param->open.conn_id;
-      break;
-    }
-
-    case ESP_GATTC_CONNECT_EVT: {
-      if (this->parent_->conn_id != param->connect.conn_id && this->open_conn_id_ != 0xff) {
-        // FIXME: bug in BLEClient
-        ESP_LOGW(TAG, "[%s] CONNECT_EVT unexpected conn_id; open=%d, parent=%d, param=%d", this->get_name().c_str(),
-                 this->open_conn_id_, this->parent_->conn_id, param->connect.conn_id);
-        this->parent_->conn_id = this->open_conn_id_;
-      }
-      break;
-    }
-    case ESP_GATTC_SEARCH_CMPL_EVT: {
-      auto result = this->discover_characteristics_();
-
-      if (result) {
-        ESP_LOGD(TAG, "[%s] Services complete: obtained char handles.", this->get_name().c_str());
-        this->node_state = espbt::ClientState::ESTABLISHED;
-        this->set_notify_(true);
-
-#ifdef USE_TIME
-        if (this->time_id_.has_value()) {
-          this->send_local_time();
-        }
-#endif
-
-        this->dispatch_state_(true);
-      } else {
-        ESP_LOGW(TAG, "[%s] Failed discovering service characteristics.", this->get_name().c_str());
-        this->parent()->set_enabled(false);
-        this->status_set_warning();
-        this->dispatch_state_(false);
-      }
-      break;
-    }
-    case ESP_GATTC_WRITE_DESCR_EVT: {
-      if (param->write.status != ESP_GATT_OK) {
-        if (param->write.status == ESP_GATT_INVALID_ATTR_LEN) {
-          // This probably means that our hack for notify_en (8 bit vs 16 bit) didn't work right.
-          // Should we try to fall back to BLEClient's way?
-          ESP_LOGW(TAG, "[%s] Invalid attr length writing descr at handle 0x%04d, status=%d", this->get_name().c_str(),
-                   param->write.handle, param->write.status);
-        } else {
-          ESP_LOGW(TAG, "[%s] Error writing descr at handle 0x%04d, status=%d", this->get_name().c_str(),
-                   param->write.handle, param->write.status);
-        }
-        break;
-      }
-      ESP_LOGD(TAG, "[%s] Write to handle 0x%04x status=%d", this->get_name().c_str(), param->write.handle,
-               param->write.status);
-      break;
-    }
-    case ESP_GATTC_WRITE_CHAR_EVT: {
-      if (param->write.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "Error writing char at handle 0x%04d, status=%d", param->write.handle, param->write.status);
-        break;
-      }
-      if (param->write.handle == this->char_handle_cmd_) {
-        if (this->force_refresh_) {
-          // Command write was successful. Publish the pending state, hoping that notify will kick in.
-          // FIXME: better to wait until we know the status has changed
-          this->dispatch_status_();
-        }
-      }
-      break;
-    }
-    case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->parent_->conn_id)
-        break;
-      if (param->read.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "Error reading char at handle %d, status=%d", param->read.handle, param->read.status);
-        break;
-      }
-
-      if (param->read.handle == this->char_handle_status_) {
-        // This is the additional packet that doesn't fit in the notify packet.
-        this->codec_->decode_extra(param->read.value, param->read.value_len);
-        this->status_packet_ready_();
-      } else if (param->read.handle == this->char_handle_name_) {
-        // The data should represent the name.
-        if (param->read.status == ESP_GATT_OK && param->read.value_len > 0) {
-          std::string bedjet_name(reinterpret_cast<char const *>(param->read.value), param->read.value_len);
-          ESP_LOGV(TAG, "[%s] Got BedJet name: '%s'", this->get_name().c_str(), bedjet_name.c_str());
-          this->set_name_(bedjet_name);
-        }
-      }
-      break;
-    }
-    case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
-      // This event means that ESP received the request to enable notifications on the client side. But we also have to
-      // tell the server that we want it to send notifications. Normally BLEClient parent would handle this
-      // automatically, but as soon as we set our status to Established, the parent is going to purge all the
-      // service/char/descriptor handles, and then get_config_descriptor() won't work anymore. There's no way to disable
-      // the BLEClient parent behavior, so our only option is to write the handle anyway, and hope a double-write
-      // doesn't break anything.
-
-      if (param->reg_for_notify.handle != this->char_handle_status_) {
-        ESP_LOGW(TAG, "[%s] Register for notify on unexpected handle 0x%04x, expecting 0x%04x",
-                 this->get_name().c_str(), param->reg_for_notify.handle, this->char_handle_status_);
-        break;
-      }
-
-      this->write_notify_config_descriptor_(true);
-      this->last_notify_ = 0;
-      this->force_refresh_ = true;
-      break;
-    }
-    case ESP_GATTC_UNREG_FOR_NOTIFY_EVT: {
-      // This event is not handled by the parent BLEClient, so we need to do this either way.
-      if (param->unreg_for_notify.handle != this->char_handle_status_) {
-        ESP_LOGW(TAG, "[%s] Unregister for notify on unexpected handle 0x%04x, expecting 0x%04x",
-                 this->get_name().c_str(), param->unreg_for_notify.handle, this->char_handle_status_);
-        break;
-      }
-
-      this->write_notify_config_descriptor_(false);
-      this->last_notify_ = 0;
-      // Now we wait until the next update() poll to re-register notify...
-      break;
-    }
-    case ESP_GATTC_NOTIFY_EVT: {
-      if (this->processing_)
-        break;
-
-      if (param->notify.conn_id != this->parent_->conn_id) {
-        ESP_LOGW(TAG, "[%s] Received notify event for unexpected parent conn: expect %x, got %x",
-                 this->get_name().c_str(), this->parent_->conn_id, param->notify.conn_id);
-        // FIXME: bug in BLEClient holding wrong conn_id.
-      }
-
-      if (param->notify.handle != this->char_handle_status_) {
-        ESP_LOGW(TAG, "[%s] Unexpected notify handle, wanted %04X, got %04X", this->get_name().c_str(),
-                 this->char_handle_status_, param->notify.handle);
-        break;
-      }
-
-      // FIXME: notify events come in every ~200-300 ms, which is too fast to be helpful. So we
-      //  throttle the updates to once every MIN_NOTIFY_THROTTLE (5 seconds).
-      //  Another idea would be to keep notify off by default, and use update() as an opportunity to turn on
-      //  notify to get enough data to update status, then turn off notify again.
-
-      uint32_t now = millis();
-      auto delta = now - this->last_notify_;
-
-      if (!this->force_refresh_ && this->codec_->compare(param->notify.value, param->notify.value_len)) {
-        // If the packet is meaningfully different, trigger children as well
-        this->force_refresh_ = true;
-        ESP_LOGV(TAG, "[%s] Incoming packet indicates a significant change.", this->get_name().c_str());
-      }
-
-      if (this->last_notify_ == 0 || delta > MIN_NOTIFY_THROTTLE || this->force_refresh_) {
-        // Set reentrant flag to prevent processing multiple packets.
-        this->processing_ = true;
-        ESP_LOGVV(TAG, "[%s] Decoding packet: last=%d, delta=%d, force=%s", this->get_name().c_str(),
-                  this->last_notify_, delta, this->force_refresh_ ? "y" : "n");
-        bool needs_extra = this->codec_->decode_notify(param->notify.value, param->notify.value_len);
-
-        if (needs_extra) {
-          // This means the packet was partial, so read the status characteristic to get the second part.
-          // Ideally this will complete quickly. We won't process additional notification events until it does.
-          auto status = esp_ble_gattc_read_char(this->parent_->gattc_if, this->parent_->conn_id,
-                                                this->char_handle_status_, ESP_GATT_AUTH_REQ_NONE);
-          if (status) {
-            ESP_LOGI(TAG, "[%s] Unable to read extended status packet", this->get_name().c_str());
-          }
-        } else {
-          this->status_packet_ready_();
-        }
-      }
-      break;
-    }
-    default:
-      ESP_LOGVV(TAG, "[%s] gattc unhandled event: enum=%d", this->get_name().c_str(), event);
-      break;
-  }
-}
-
-inline void BedJetHub::status_packet_ready_() {
-  this->last_notify_ = millis();
-  this->processing_ = false;
-
-  if (this->force_refresh_) {
-    // If we requested an immediate update, do that now.
-    this->update();
-    this->force_refresh_ = false;
-  }
-}
-
-/** Reimplementation of BLEClient.gattc_event_handler() for ESP_GATTC_REG_FOR_NOTIFY_EVT.
- *
- * This is a copy of ble_client's automatic handling of `ESP_GATTC_REG_FOR_NOTIFY_EVT`, in order
- * to undo the same on unregister. It also allows us to maintain the config descriptor separately,
- * since the parent BLEClient is going to purge all descriptors once we set our connection status
- * to `Established`.
- */
-uint8_t BedJetHub::write_notify_config_descriptor_(bool enable) {
-  auto handle = this->config_descr_status_;
-  if (handle == 0) {
-    ESP_LOGW(TAG, "No descriptor found for notify of handle 0x%x", this->char_handle_status_);
-    return -1;
-  }
-
-  // NOTE: BLEClient uses `uint8_t*` of length 1, but BLE spec requires 16 bits.
-  uint16_t notify_en = enable ? 1 : 0;
-  auto status =
-      esp_ble_gattc_write_char_descr(this->parent_->gattc_if, this->parent_->conn_id, handle, sizeof(notify_en),
-                                     (uint8_t *) &notify_en, ESP_GATT_WRITE_TYPE_RSP, ESP_GATT_AUTH_REQ_NONE);
-  if (status) {
-    ESP_LOGW(TAG, "esp_ble_gattc_write_char_descr error, status=%d", status);
-    return status;
-  }
-  ESP_LOGD(TAG, "[%s] wrote notify=%s to status config 0x%04x, for conn %d", this->get_name().c_str(),
-           enable ? "true" : "false", handle, this->parent_->conn_id);
-  return ESP_GATT_OK;
-}
-
-/* Time Component */
-
-#ifdef USE_TIME
-void BedJetHub::send_local_time() {
-  if (this->time_id_.has_value()) {
-    auto *time_id = *this->time_id_;
-    time::ESPTime now = time_id->now();
-    if (now.is_valid()) {
-      this->set_clock(now.hour, now.minute);
-      ESP_LOGD(TAG, "Using time component to set BedJet clock: %d:%02d", now.hour, now.minute);
-    }
-  } else {
-    ESP_LOGI(TAG, "`time_id` is not configured: will not sync BedJet clock.");
-  }
-}
-
-void BedJetHub::setup_time_() {
-  if (this->time_id_.has_value()) {
-    this->send_local_time();
-    auto *time_id = *this->time_id_;
-    time_id->add_on_time_sync_callback([this] { this->send_local_time(); });
-  } else {
-    ESP_LOGI(TAG, "`time_id` is not configured: will not sync BedJet clock.");
-  }
-}
-#endif
-
-void BedJetHub::set_clock(uint8_t hour, uint8_t minute) {
-  if (!this->is_connected()) {
-    ESP_LOGV(TAG, "[%s] Not connected, cannot send time.", this->get_name().c_str());
-    return;
-  }
-
-  BedjetPacket *pkt = this->codec_->get_set_time_request(hour, minute);
-  auto status = this->write_bedjet_packet_(pkt);
-  if (status) {
-    ESP_LOGW(TAG, "Failed setting BedJet clock: %d", status);
-  } else {
-    ESP_LOGD(TAG, "[%s] BedJet clock set to: %d:%02d", this->get_name().c_str(), hour, minute);
-  }
-}
-
-/* Internal */
-
-void BedJetHub::loop() {}
-void BedJetHub::update() { this->dispatch_status_(); }
-
-void BedJetHub::dump_config() {
-  ESP_LOGCONFIG(TAG, "BedJet Hub '%s'", this->get_name().c_str());
-  ESP_LOGCONFIG(TAG, "  ble_client.app_id: %d", this->parent()->app_id);
-  ESP_LOGCONFIG(TAG, "  ble_client.conn_id: %d", this->parent()->conn_id);
-  LOG_UPDATE_INTERVAL(this)
-  ESP_LOGCONFIG(TAG, "  Child components (%d):", this->children_.size());
-  for (auto *child : this->children_) {
-    ESP_LOGCONFIG(TAG, "    - %s", child->describe().c_str());
-  }
-}
-
-void BedJetHub::dispatch_state_(bool is_ready) {
-  for (auto *child : this->children_) {
-    child->on_bedjet_state(is_ready);
-  }
-}
-
-void BedJetHub::dispatch_status_() {
-  auto *status = this->codec_->get_status_packet();
-
-  if (!this->is_connected()) {
-    ESP_LOGD(TAG, "[%s] Not connected, will not send status.", this->get_name().c_str());
-  } else if (status != nullptr) {
-    ESP_LOGD(TAG, "[%s] Notifying %d children of latest status @%p.", this->get_name().c_str(), this->children_.size(),
-             status);
-    for (auto *child : this->children_) {
-      child->on_status(status);
-    }
-  } else {
-    uint32_t now = millis();
-    uint32_t diff = now - this->last_notify_;
-
-    if (this->last_notify_ == 0) {
-      // This means we're connected and haven't received a notification, so it likely means that the BedJet is off.
-      // However, it could also mean that it's running, but failing to send notifications.
-      // We can try to unregister for notifications now, and then re-register, hoping to clear it up...
-      // But how do we know for sure which state we're in, and how do we actually clear out the buggy state?
-
-      ESP_LOGI(TAG, "[%s] Still waiting for first GATT notify event.", this->get_name().c_str());
-    } else if (diff > NOTIFY_WARN_THRESHOLD) {
-      ESP_LOGW(TAG, "[%s] Last GATT notify was %d seconds ago.", this->get_name().c_str(), diff / 1000);
-    }
-
-    if (this->timeout_ > 0 && diff > this->timeout_ && this->parent()->enabled) {
-      ESP_LOGW(TAG, "[%s] Timed out after %d sec. Retrying...", this->get_name().c_str(), this->timeout_);
-      // set_enabled(false) will only close the connection if state != IDLE.
-      this->parent()->set_state(espbt::ClientState::CONNECTING);
-      this->parent()->set_enabled(false);
-      this->parent()->set_enabled(true);
-    }
-  }
-}
-
-void BedJetHub::register_child(BedJetClient *obj) {
-  this->children_.push_back(obj);
-  obj->set_parent(this);
-}
-
-}  // namespace bedjet
-}  // namespace esphome
--- a/esphome/components/bedjet/bedjet_hub.h
+++ b/esphome/components/bedjet/bedjet_hub.h
@@ -1,178 +0,0 @@
-#pragma once
-
-#include "esphome/components/ble_client/ble_client.h"
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
-#include "esphome/core/component.h"
-#include "esphome/core/defines.h"
-#include "esphome/core/hal.h"
-#include "bedjet_child.h"
-#include "bedjet_codec.h"
-
-#ifdef USE_TIME
-#include "esphome/components/time/real_time_clock.h"
-#endif
-
-#ifdef USE_ESP32
-
-#include <esp_gattc_api.h>
-
-namespace esphome {
-namespace bedjet {
-
-namespace espbt = esphome::esp32_ble_tracker;
-
-// Forward declare BedJetClient
-class BedJetClient;
-
-static const espbt::ESPBTUUID BEDJET_SERVICE_UUID = espbt::ESPBTUUID::from_raw("00001000-bed0-0080-aa55-4265644a6574");
-static const espbt::ESPBTUUID BEDJET_STATUS_UUID = espbt::ESPBTUUID::from_raw("00002000-bed0-0080-aa55-4265644a6574");
-static const espbt::ESPBTUUID BEDJET_COMMAND_UUID = espbt::ESPBTUUID::from_raw("00002004-bed0-0080-aa55-4265644a6574");
-static const espbt::ESPBTUUID BEDJET_NAME_UUID = espbt::ESPBTUUID::from_raw("00002001-bed0-0080-aa55-4265644a6574");
-
-/**
- * Hub component connecting to the BedJet device over Bluetooth.
- */
-class BedJetHub : public esphome::ble_client::BLEClientNode, public PollingComponent {
- public:
-  /* BedJet functionality exposed to `BedJetClient` children and/or accessible from action lambdas. */
-
-  /** Attempts to check for and apply firmware updates. */
-  void upgrade_firmware();
-
-  /** Press the OFF button. */
-  bool button_off();
-  /** Press the HEAT button. */
-  bool button_heat();
-  /** Press the EXT HT button. */
-  bool button_ext_heat();
-  /** Press the TURBO button. */
-  bool button_turbo();
-  /** Press the COOL button. */
-  bool button_cool();
-  /** Press the DRY button. */
-  bool button_dry();
-  /** Press the M1 (memory recall) button. */
-  bool button_memory1();
-  /** Press the M2 (memory recall) button. */
-  bool button_memory2();
-  /** Press the M3 (memory recall) button. */
-  bool button_memory3();
-
-  /** Send the `button`. */
-  bool send_button(BedjetButton button);
-
-  /** Set the target temperature to `temp_c` in °C. */
-  bool set_target_temp(float temp_c);
-
-  /** Set the fan speed to a stepped index in the range 0-19. */
-  bool set_fan_index(uint8_t fan_speed_index);
-
-  /** Set the fan speed to a percent in the range 5% - 100%, at 5% increments. */
-  bool set_fan_speed(uint8_t fan_speed_pct) { return this->set_fan_index(bedjet_fan_speed_to_index(fan_speed_pct)); }
-
-  /** Return the fan speed index, in the range 0-19. */
-  uint8_t get_fan_index();
-
-  /** Return the fan speed as a percent in the range 5%-100%. */
-  uint8_t get_fan_speed() { return bedjet_fan_step_to_speed(this->get_fan_index()); }
-
-  /** Set the operational runtime remaining.
-   *
-   * The unit establishes and enforces runtime limits for some modes, so this call is not guaranteed to succeed.
-   */
-  bool set_time_remaining(uint8_t hours, uint8_t mins);
-
-  /** Return the remaining runtime, in seconds. */
-  uint16_t get_time_remaining();
-
-  /** @return `true` if the `BLEClient::node_state` is `ClientState::ESTABLISHED`. */
-  bool is_connected() { return this->node_state == espbt::ClientState::ESTABLISHED; }
-
-  bool has_status() { return this->codec_->has_status(); }
-  const BedjetStatusPacket *get_status_packet() const { return this->codec_->get_status_packet(); }
-
-  /** Register a `BedJetClient` child component. */
-  void register_child(BedJetClient *obj);
-
-  /** Set the status timeout.
-   *
-   * This is the max time to wait for a status update before the connection is presumed unusable.
-   */
-  void set_status_timeout(uint32_t timeout) { this->timeout_ = timeout; }
-
-#ifdef USE_TIME
-  /** Set the `time::RealTimeClock` implementation. */
-  void set_time_id(time::RealTimeClock *time_id) { this->time_id_ = time_id; }
-  /** Attempts to sync the local time (via `time_id`) to the BedJet device. */
-  void send_local_time();
-#endif
-  /** Attempt to set the BedJet device's clock to the specified time. */
-  void set_clock(uint8_t hour, uint8_t minute);
-
-  /* Component overrides */
-
-  void loop() override;
-  void update() override;
-  void dump_config() override;
-  void setup() override { this->codec_ = make_unique<BedjetCodec>(); }
-  float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
-
-  /** @return The BedJet's configured name, or the MAC address if not discovered yet. */
-  std::string get_name() {
-    if (this->name_.empty()) {
-      return this->parent_->address_str();
-    } else {
-      return this->name_;
-    }
-  }
-
-  /* BLEClient overrides */
-
-  void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                           esp_ble_gattc_cb_param_t *param) override;
-
- protected:
-  std::vector<BedJetClient *> children_;
-  void dispatch_status_();
-  void dispatch_state_(bool is_ready);
-
-#ifdef USE_TIME
-  /** Initializes time sync callbacks to support syncing current time to the BedJet. */
-  void setup_time_();
-  optional<time::RealTimeClock *> time_id_{};
-#endif
-
-  uint32_t timeout_{DEFAULT_STATUS_TIMEOUT};
-  static const uint32_t MIN_NOTIFY_THROTTLE = 15000;
-  static const uint32_t NOTIFY_WARN_THRESHOLD = 300000;
-  static const uint32_t DEFAULT_STATUS_TIMEOUT = 900000;
-
-  uint8_t set_notify_(bool enable);
-  /** Send the `BedjetPacket` to the device. */
-  uint8_t write_bedjet_packet_(BedjetPacket *pkt);
-  void set_name_(const std::string &name) { this->name_ = name; }
-
-  std::string name_;
-
-  uint32_t last_notify_ = 0;
-  inline void status_packet_ready_();
-  bool force_refresh_ = false;
-  bool processing_ = false;
-
-  std::unique_ptr<BedjetCodec> codec_;
-
-  bool discover_characteristics_();
-  uint16_t char_handle_cmd_;
-  uint16_t char_handle_name_;
-  uint16_t char_handle_status_;
-  uint16_t config_descr_status_;
-
-  uint8_t open_conn_id_ = -1;
-
-  uint8_t write_notify_config_descriptor_(bool enable);
-};
-
-}  // namespace bedjet
-}  // namespace esphome
-
-#endif
--- a/esphome/components/bedjet/climate/init.py
+++ b/esphome/components/bedjet/climate/init.py
@@ -1,65 +0,0 @@
-import logging
-
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import climate, ble_client
-from esphome.const import (
-    CONF_HEAT_MODE,
-    CONF_ID,
-    CONF_RECEIVE_TIMEOUT,
-    CONF_TIME_ID,
-)
-from .. import (
-    BEDJET_CLIENT_SCHEMA,
-    bedjet_ns,
-    register_bedjet_child,
-)
-
-_LOGGER = logging.getLogger(__name__)
-CODEOWNERS = ["@jhansche"]
-DEPENDENCIES = ["bedjet"]
-
-BedJetClimate = bedjet_ns.class_("BedJetClimate", climate.Climate, cg.PollingComponent)
-BedjetHeatMode = bedjet_ns.enum("BedjetHeatMode")
-BEDJET_HEAT_MODES = {
-    "heat": BedjetHeatMode.HEAT_MODE_HEAT,
-    "extended": BedjetHeatMode.HEAT_MODE_EXTENDED,
-}
-
-CONFIG_SCHEMA = (
-    climate.CLIMATE_SCHEMA.extend(
-        {
-            cv.GenerateID(): cv.declare_id(BedJetClimate),
-            cv.Optional(CONF_HEAT_MODE, default="heat"): cv.enum(
-                BEDJET_HEAT_MODES, lower=True
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(
-        # TODO: remove compat layer.
-        {
-            cv.Optional(ble_client.CONF_BLE_CLIENT_ID): cv.invalid(
-                "The 'ble_client_id' option has been removed. Please migrate "
-                "to the new `bedjet_id` option in the `bedjet` component.\n"
-                "See https://esphome.io/components/climate/bedjet.html"
-            ),
-            cv.Optional(CONF_TIME_ID): cv.invalid(
-                "The 'time_id' option has been moved to the `bedjet` component."
-            ),
-            cv.Optional(CONF_RECEIVE_TIMEOUT): cv.invalid(
-                "The 'receive_timeout' option has been moved to the `bedjet` component."
-            ),
-        }
-    )
-    .extend(BEDJET_CLIENT_SCHEMA)
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await climate.register_climate(var, config)
-    await register_bedjet_child(var, config)
-
-    cg.add(var.set_heating_mode(config[CONF_HEAT_MODE]))
--- a/esphome/components/bedjet/climate/bedjet_climate.cpp
+++ b/esphome/components/bedjet/climate/bedjet_climate.cpp
@@ -1,354 +0,0 @@
-#include "bedjet_climate.h"
-#include "esphome/core/log.h"
-
-#ifdef USE_ESP32
-
-namespace esphome {
-namespace bedjet {
-
-using namespace esphome::climate;
-
-/// Converts a BedJet temp step into degrees Celsius.
-float bedjet_temp_to_c(const uint8_t temp) {
-  // BedJet temp is "C*2"; to get C, divide by 2.
-  return temp / 2.0f;
-}
-
-static const std::string *bedjet_fan_step_to_fan_mode(const uint8_t fan_step) {
-  if (fan_step < BEDJET_FAN_SPEED_COUNT)
-    return &BEDJET_FAN_STEP_NAME_STRINGS[fan_step];
-  return nullptr;
-}
-
-static uint8_t bedjet_fan_speed_to_step(const std::string &fan_step_percent) {
-  for (int i = 0; i < BEDJET_FAN_SPEED_COUNT; i++) {
-    if (fan_step_percent == BEDJET_FAN_STEP_NAME_STRINGS[i]) {
-      return i;
-    }
-  }
-  return -1;
-}
-
-static inline BedjetButton heat_button(BedjetHeatMode mode) {
-  return mode == HEAT_MODE_EXTENDED ? BTN_EXTHT : BTN_HEAT;
-}
-
-std::string BedJetClimate::describe() { return "BedJet Climate"; }
-
-void BedJetClimate::dump_config() {
-  LOG_CLIMATE("", "BedJet Climate", this);
-  auto traits = this->get_traits();
-
-  ESP_LOGCONFIG(TAG, "  Supported modes:");
-  for (auto mode : traits.get_supported_modes()) {
-    ESP_LOGCONFIG(TAG, "   - %s", LOG_STR_ARG(climate_mode_to_string(mode)));
-  }
-  if (this->heating_mode_ == HEAT_MODE_EXTENDED) {
-    ESP_LOGCONFIG(TAG, "   - BedJet heating mode: EXT HT");
-  } else {
-    ESP_LOGCONFIG(TAG, "   - BedJet heating mode: HEAT");
-  }
-
-  ESP_LOGCONFIG(TAG, "  Supported fan modes:");
-  for (const auto &mode : traits.get_supported_fan_modes()) {
-    ESP_LOGCONFIG(TAG, "   - %s", LOG_STR_ARG(climate_fan_mode_to_string(mode)));
-  }
-  for (const auto &mode : traits.get_supported_custom_fan_modes()) {
-    ESP_LOGCONFIG(TAG, "   - %s (c)", mode.c_str());
-  }
-
-  ESP_LOGCONFIG(TAG, "  Supported presets:");
-  for (auto preset : traits.get_supported_presets()) {
-    ESP_LOGCONFIG(TAG, "   - %s", LOG_STR_ARG(climate_preset_to_string(preset)));
-  }
-  for (const auto &preset : traits.get_supported_custom_presets()) {
-    ESP_LOGCONFIG(TAG, "   - %s (c)", preset.c_str());
-  }
-}
-
-void BedJetClimate::setup() {
-  // restore set points
-  auto restore = this->restore_state_();
-  if (restore.has_value()) {
-    ESP_LOGI(TAG, "Restored previous saved state.");
-    restore->apply(this);
-  } else {
-    // Initial status is unknown until we connect
-    this->reset_state_();
-  }
-}
-
-/** Resets states to defaults. */
-void BedJetClimate::reset_state_() {
-  this->mode = CLIMATE_MODE_OFF;
-  this->action = CLIMATE_ACTION_IDLE;
-  this->target_temperature = NAN;
-  this->current_temperature = NAN;
-  this->preset.reset();
-  this->custom_preset.reset();
-  this->publish_state();
-}
-
-void BedJetClimate::loop() {}
-
-void BedJetClimate::control(const ClimateCall &call) {
-  ESP_LOGD(TAG, "Received BedJetClimate::control");
-  if (!this->parent_->is_connected()) {
-    ESP_LOGW(TAG, "Not connected, cannot handle control call yet.");
-    return;
-  }
-
-  if (call.get_mode().has_value()) {
-    ClimateMode mode = *call.get_mode();
-    bool button_result;
-    switch (mode) {
-      case CLIMATE_MODE_OFF:
-        button_result = this->parent_->button_off();
-        break;
-      case CLIMATE_MODE_HEAT:
-        button_result = this->parent_->send_button(heat_button(this->heating_mode_));
-        break;
-      case CLIMATE_MODE_FAN_ONLY:
-        button_result = this->parent_->button_cool();
-        break;
-      case CLIMATE_MODE_DRY:
-        button_result = this->parent_->button_dry();
-        break;
-      default:
-        ESP_LOGW(TAG, "Unsupported mode: %d", mode);
-        return;
-    }
-
-    if (button_result) {
-      this->mode = mode;
-      // We're using (custom) preset for Turbo, EXT HT, & M1-3 presets, so changing climate mode will clear those
-      this->custom_preset.reset();
-      this->preset.reset();
-    }
-  }
-
-  if (call.get_target_temperature().has_value()) {
-    auto target_temp = *call.get_target_temperature();
-    auto result = this->parent_->set_target_temp(target_temp);
-
-    if (result) {
-      this->target_temperature = target_temp;
-    }
-  }
-
-  if (call.get_preset().has_value()) {
-    ClimatePreset preset = *call.get_preset();
-    bool result;
-
-    if (preset == CLIMATE_PRESET_BOOST) {
-      // We use BOOST preset for TURBO mode, which is a short-lived/high-heat mode.
-      result = this->parent_->button_turbo();
-
-      if (result) {
-        this->mode = CLIMATE_MODE_HEAT;
-        this->preset = CLIMATE_PRESET_BOOST;
-        this->custom_preset.reset();
-      }
-    } else if (preset == CLIMATE_PRESET_NONE && this->preset.has_value()) {
-      if (this->mode == CLIMATE_MODE_HEAT && this->preset == CLIMATE_PRESET_BOOST) {
-        // We were in heat mode with Boost preset, and now preset is set to None, so revert to normal heat.
-        result = this->parent_->send_button(heat_button(this->heating_mode_));
-        if (result) {
-          this->preset.reset();
-          this->custom_preset.reset();
-        }
-      } else {
-        ESP_LOGD(TAG, "Ignoring preset '%s' call; with current mode '%s' and preset '%s'",
-                 LOG_STR_ARG(climate_preset_to_string(preset)), LOG_STR_ARG(climate_mode_to_string(this->mode)),
-                 LOG_STR_ARG(climate_preset_to_string(this->preset.value_or(CLIMATE_PRESET_NONE))));
-      }
-    } else {
-      ESP_LOGW(TAG, "Unsupported preset: %d", preset);
-      return;
-    }
-  } else if (call.get_custom_preset().has_value()) {
-    std::string preset = *call.get_custom_preset();
-    bool result;
-
-    if (preset == "M1") {
-      result = this->parent_->button_memory1();
-    } else if (preset == "M2") {
-      result = this->parent_->button_memory2();
-    } else if (preset == "M3") {
-      result = this->parent_->button_memory3();
-    } else if (preset == "LTD HT") {
-      result = this->parent_->button_heat();
-    } else if (preset == "EXT HT") {
-      result = this->parent_->button_ext_heat();
-    } else {
-      ESP_LOGW(TAG, "Unsupported preset: %s", preset.c_str());
-      return;
-    }
-
-    if (result) {
-      this->custom_preset = preset;
-      this->preset.reset();
-    }
-  }
-
-  if (call.get_fan_mode().has_value()) {
-    // Climate fan mode only supports low/med/high, but the BedJet supports 5-100% increments.
-    // We can still support a ClimateCall that requests low/med/high, and just translate it to a step increment here.
-    auto fan_mode = *call.get_fan_mode();
-    bool result;
-    if (fan_mode == CLIMATE_FAN_LOW) {
-      result = this->parent_->set_fan_speed(20);
-    } else if (fan_mode == CLIMATE_FAN_MEDIUM) {
-      result = this->parent_->set_fan_speed(50);
-    } else if (fan_mode == CLIMATE_FAN_HIGH) {
-      result = this->parent_->set_fan_speed(75);
-    } else {
-      ESP_LOGW(TAG, "[%s] Unsupported fan mode: %s", this->get_name().c_str(),
-               LOG_STR_ARG(climate_fan_mode_to_string(fan_mode)));
-      return;
-    }
-
-    if (result) {
-      this->fan_mode = fan_mode;
-      this->custom_fan_mode.reset();
-    }
-  } else if (call.get_custom_fan_mode().has_value()) {
-    auto fan_mode = *call.get_custom_fan_mode();
-    auto fan_index = bedjet_fan_speed_to_step(fan_mode);
-    if (fan_index <= 19) {
-      ESP_LOGV(TAG, "[%s] Converted fan mode %s to bedjet fan step %d", this->get_name().c_str(), fan_mode.c_str(),
-               fan_index);
-      bool result = this->parent_->set_fan_index(fan_index);
-      if (result) {
-        this->custom_fan_mode = fan_mode;
-        this->fan_mode.reset();
-      }
-    }
-  }
-}
-
-void BedJetClimate::on_bedjet_state(bool is_ready) {}
-
-void BedJetClimate::on_status(const BedjetStatusPacket *data) {
-  ESP_LOGV(TAG, "[%s] Handling on_status with data=%p", this->get_name().c_str(), (void *) data);
-
-  auto converted_temp = bedjet_temp_to_c(data->target_temp_step);
-  if (converted_temp > 0)
-    this->target_temperature = converted_temp;
-
-  converted_temp = bedjet_temp_to_c(data->ambient_temp_step);
-  if (converted_temp > 0)
-    this->current_temperature = converted_temp;
-
-  const auto *fan_mode_name = bedjet_fan_step_to_fan_mode(data->fan_step);
-  if (fan_mode_name != nullptr) {
-    this->custom_fan_mode = *fan_mode_name;
-  }
-
-  // TODO: Get biorhythm data to determine which preset (M1-3) is running, if any.
-  switch (data->mode) {
-    case MODE_WAIT:  // Biorhythm "wait" step: device is idle
-    case MODE_STANDBY:
-      this->mode = CLIMATE_MODE_OFF;
-      this->action = CLIMATE_ACTION_IDLE;
-      this->fan_mode = CLIMATE_FAN_OFF;
-      this->custom_preset.reset();
-      this->preset.reset();
-      break;
-
-    case MODE_HEAT:
-      this->mode = CLIMATE_MODE_HEAT;
-      this->action = CLIMATE_ACTION_HEATING;
-      this->preset.reset();
-      if (this->heating_mode_ == HEAT_MODE_EXTENDED) {
-        this->set_custom_preset_("LTD HT");
-      } else {
-        this->custom_preset.reset();
-      }
-      break;
-
-    case MODE_EXTHT:
-      this->mode = CLIMATE_MODE_HEAT;
-      this->action = CLIMATE_ACTION_HEATING;
-      this->preset.reset();
-      if (this->heating_mode_ == HEAT_MODE_EXTENDED) {
-        this->custom_preset.reset();
-      } else {
-        this->set_custom_preset_("EXT HT");
-      }
-      break;
-
-    case MODE_COOL:
-      this->mode = CLIMATE_MODE_FAN_ONLY;
-      this->action = CLIMATE_ACTION_COOLING;
-      this->custom_preset.reset();
-      this->preset.reset();
-      break;
-
-    case MODE_DRY:
-      this->mode = CLIMATE_MODE_DRY;
-      this->action = CLIMATE_ACTION_DRYING;
-      this->custom_preset.reset();
-      this->preset.reset();
-      break;
-
-    case MODE_TURBO:
-      this->preset = CLIMATE_PRESET_BOOST;
-      this->custom_preset.reset();
-      this->mode = CLIMATE_MODE_HEAT;
-      this->action = CLIMATE_ACTION_HEATING;
-      break;
-
-    default:
-      ESP_LOGW(TAG, "[%s] Unexpected mode: 0x%02X", this->get_name().c_str(), data->mode);
-      break;
-  }
-
-  ESP_LOGV(TAG, "[%s] After on_status, new mode=%s", this->get_name().c_str(),
-           LOG_STR_ARG(climate_mode_to_string(this->mode)));
-  // FIXME: compare new state to previous state.
-  this->publish_state();
-}
-
-/** Attempts to update the climate device from the last received BedjetStatusPacket.
- *
- * This will be called from #on_status() when the parent dispatches new status packets,
- * and from #update() when the polling interval is triggered.
- *
- * @return `true` if the status has been applied; `false` if there is nothing to apply.
- */
-bool BedJetClimate::update_status_() {
-  if (!this->parent_->is_connected())
-    return false;
-  if (!this->parent_->has_status())
-    return false;
-
-  auto *status = this->parent_->get_status_packet();
-
-  if (status == nullptr)
-    return false;
-
-  this->on_status(status);
-
-  if (this->is_valid_()) {
-    // TODO: only if state changed?
-    this->publish_state();
-    this->status_clear_warning();
-    return true;
-  }
-
-  return false;
-}
-
-void BedJetClimate::update() {
-  ESP_LOGD(TAG, "[%s] update()", this->get_name().c_str());
-  // TODO: if the hub component is already polling, do we also need to include polling?
-  //  We're already going to get on_status() at the hub's polling interval.
-  auto result = this->update_status_();
-  ESP_LOGD(TAG, "[%s] update_status result=%s", this->get_name().c_str(), result ? "true" : "false");
-}
-
-}  // namespace bedjet
-}  // namespace esphome
-
-#endif
--- a/esphome/components/bedjet/climate/bedjet_climate.h
+++ b/esphome/components/bedjet/climate/bedjet_climate.h
@@ -1,91 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/defines.h"
-#include "esphome/core/hal.h"
-#include "esphome/components/bedjet/bedjet_child.h"
-#include "esphome/components/bedjet/bedjet_codec.h"
-#include "esphome/components/bedjet/bedjet_hub.h"
-#include "esphome/components/climate/climate.h"
-
-#ifdef USE_ESP32
-
-namespace esphome {
-namespace bedjet {
-
-class BedJetClimate : public climate::Climate, public BedJetClient, public PollingComponent {
- public:
-  void setup() override;
-  void loop() override;
-  void update() override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
-
-  /* BedJetClient status update */
-  void on_status(const BedjetStatusPacket *data) override;
-  void on_bedjet_state(bool is_ready) override;
-  std::string describe() override;
-
-  /** Sets the default strategy to use for climate::CLIMATE_MODE_HEAT. */
-  void set_heating_mode(BedjetHeatMode mode) { this->heating_mode_ = mode; }
-
-  climate::ClimateTraits traits() override {
-    auto traits = climate::ClimateTraits();
-    traits.set_supports_action(true);
-    traits.set_supports_current_temperature(true);
-    traits.set_supported_modes({
-        climate::CLIMATE_MODE_OFF,
-        climate::CLIMATE_MODE_HEAT,
-        // climate::CLIMATE_MODE_TURBO // Not supported by Climate: see presets instead
-        climate::CLIMATE_MODE_FAN_ONLY,
-        climate::CLIMATE_MODE_DRY,
-    });
-
-    // It would be better if we had a slider for the fan modes.
-    traits.set_supported_custom_fan_modes(BEDJET_FAN_STEP_NAMES_SET);
-    traits.set_supported_presets({
-        // If we support NONE, then have to decide what happens if the user switches to it (turn off?)
-        // climate::CLIMATE_PRESET_NONE,
-        // Climate doesn't have a "TURBO" mode, but we can use the BOOST preset instead.
-        climate::CLIMATE_PRESET_BOOST,
-    });
-    traits.set_supported_custom_presets({
-        // We could fetch biodata from bedjet and set these names that way.
-        // But then we have to invert the lookup in order to send the right preset.
-        // For now, we can leave them as M1-3 to match the remote buttons.
-        // EXT HT added to match remote button.
-        "EXT HT",
-        "M1",
-        "M2",
-        "M3",
-    });
-    if (this->heating_mode_ == HEAT_MODE_EXTENDED) {
-      traits.add_supported_custom_preset("LTD HT");
-    } else {
-      traits.add_supported_custom_preset("EXT HT");
-    }
-    traits.set_visual_min_temperature(19.0);
-    traits.set_visual_max_temperature(43.0);
-    traits.set_visual_temperature_step(1.0);
-    return traits;
-  }
-
- protected:
-  void control(const climate::ClimateCall &call) override;
-
-  BedjetHeatMode heating_mode_ = HEAT_MODE_HEAT;
-
-  void reset_state_();
-  bool update_status_();
-
-  bool is_valid_() {
-    // FIXME: find a better way to check this?
-    return !std::isnan(this->current_temperature) && !std::isnan(this->target_temperature) &&
-           this->current_temperature > 1 && this->target_temperature > 1;
-  }
-};
-
-}  // namespace bedjet
-}  // namespace esphome
-
-#endif
--- a/esphome/components/bedjet/fan/init.py
+++ b/esphome/components/bedjet/fan/init.py
@@ -1,36 +0,0 @@
-import logging
-
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import fan
-from esphome.const import (
-    CONF_ID,
-)
-from .. import (
-    BEDJET_CLIENT_SCHEMA,
-    bedjet_ns,
-    register_bedjet_child,
-)
-
-_LOGGER = logging.getLogger(__name__)
-CODEOWNERS = ["@jhansche"]
-DEPENDENCIES = ["bedjet"]
-
-BedJetFan = bedjet_ns.class_("BedJetFan", fan.Fan, cg.PollingComponent)
-
-CONFIG_SCHEMA = (
-    fan.FAN_SCHEMA.extend(
-        {
-            cv.GenerateID(): cv.declare_id(BedJetFan),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(BEDJET_CLIENT_SCHEMA)
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await fan.register_fan(var, config)
-    await register_bedjet_child(var, config)
--- a/esphome/components/bedjet/fan/bedjet_fan.cpp
+++ b/esphome/components/bedjet/fan/bedjet_fan.cpp
@@ -1,108 +0,0 @@
-#include "bedjet_fan.h"
-#include "esphome/core/log.h"
-
-#ifdef USE_ESP32
-
-namespace esphome {
-namespace bedjet {
-
-using namespace esphome::fan;
-
-void BedJetFan::dump_config() { LOG_FAN("", "BedJet Fan", this); }
-std::string BedJetFan::describe() { return "BedJet Fan"; }
-
-void BedJetFan::control(const fan::FanCall &call) {
-  ESP_LOGD(TAG, "Received BedJetFan::control");
-  if (!this->parent_->is_connected()) {
-    ESP_LOGW(TAG, "Not connected, cannot handle control call yet.");
-    return;
-  }
-  bool did_change = false;
-
-  if (call.get_state().has_value() && this->state != *call.get_state()) {
-    // Turning off is easy:
-    if (this->state && this->parent_->button_off()) {
-      this->state = false;
-      this->publish_state();
-      return;
-    }
-
-    // Turning on, we have to choose a specific mode; for now, use "COOL" mode
-    // In the future we could configure the mode to use for fan.turn_on.
-    if (this->parent_->button_cool()) {
-      this->state = true;
-      did_change = true;
-    }
-  }
-
-  // ignore speed changes if not on or turning on
-  if (this->state && call.get_speed().has_value()) {
-    this->speed = *call.get_speed();
-    this->parent_->set_fan_index(this->speed);
-    did_change = true;
-  }
-
-  if (did_change) {
-    this->publish_state();
-  }
-}
-
-void BedJetFan::on_status(const BedjetStatusPacket *data) {
-  ESP_LOGVV(TAG, "[%s] Handling on_status with data=%p", this->get_name().c_str(), (void *) data);
-  bool did_change = false;
-  bool new_state = data->mode != MODE_STANDBY && data->mode != MODE_WAIT;
-
-  if (new_state != this->state) {
-    this->state = new_state;
-    did_change = true;
-  }
-
-  if (data->fan_step != this->speed) {
-    this->speed = data->fan_step;
-    did_change = true;
-  }
-
-  if (did_change) {
-    this->publish_state();
-  }
-}
-
-/** Attempts to update the fan device from the last received BedjetStatusPacket.
- *
- * This will be called from #on_status() when the parent dispatches new status packets,
- * and from #update() when the polling interval is triggered.
- *
- * @return `true` if the status has been applied; `false` if there is nothing to apply.
- */
-bool BedJetFan::update_status_() {
-  if (!this->parent_->is_connected())
-    return false;
-  if (!this->parent_->has_status())
-    return false;
-
-  auto *status = this->parent_->get_status_packet();
-
-  if (status == nullptr)
-    return false;
-
-  this->on_status(status);
-  return true;
-}
-
-void BedJetFan::update() {
-  ESP_LOGD(TAG, "[%s] update()", this->get_name().c_str());
-  // TODO: if the hub component is already polling, do we also need to include polling?
-  //  We're already going to get on_status() at the hub's polling interval.
-  auto result = this->update_status_();
-  ESP_LOGD(TAG, "[%s] update_status result=%s", this->get_name().c_str(), result ? "true" : "false");
-}
-
-/** Resets states to defaults. */
-void BedJetFan::reset_state_() {
-  this->state = false;
-  this->publish_state();
-}
-}  // namespace bedjet
-}  // namespace esphome
-
-#endif
--- a/esphome/components/bedjet/fan/bedjet_fan.h
+++ b/esphome/components/bedjet/fan/bedjet_fan.h
@@ -1,40 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/defines.h"
-#include "esphome/core/hal.h"
-#include "esphome/components/bedjet/bedjet_child.h"
-#include "esphome/components/bedjet/bedjet_codec.h"
-#include "esphome/components/bedjet/bedjet_hub.h"
-#include "esphome/components/fan/fan.h"
-
-#ifdef USE_ESP32
-
-namespace esphome {
-namespace bedjet {
-
-class BedJetFan : public fan::Fan, public BedJetClient, public PollingComponent {
- public:
-  void update() override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
-
-  /* BedJetClient status update */
-  void on_status(const BedjetStatusPacket *data) override;
-  void on_bedjet_state(bool is_ready) override{};
-  std::string describe() override;
-
-  fan::FanTraits get_traits() override { return fan::FanTraits(false, true, false, BEDJET_FAN_SPEED_COUNT); }
-
- protected:
-  void control(const fan::FanCall &call) override;
-
- private:
-  void reset_state_();
-  bool update_status_();
-};
-
-}  // namespace bedjet
-}  // namespace esphome
-
-#endif
--- a/esphome/components/bh1750/bh1750.cpp
+++ b/esphome/components/bh1750/bh1750.cpp
@@ -9,109 +9,18 @@ static const char *const TAG = "bh1750.sensor";
 static const uint8_t BH1750_COMMAND_POWER_ON = 0b00000001;
 static const uint8_t BH1750_COMMAND_MT_REG_HI = 0b01000000;  // last 3 bits
 static const uint8_t BH1750_COMMAND_MT_REG_LO = 0b01100000;  // last 5 bits
-static const uint8_t BH1750_COMMAND_ONE_TIME_L = 0b00100011;
-static const uint8_t BH1750_COMMAND_ONE_TIME_H = 0b00100000;
-static const uint8_t BH1750_COMMAND_ONE_TIME_H2 = 0b00100001;
-
-/*
-bh1750 properties:
-
-L-resolution mode:
- resolution 4lx (@ mtreg=69)
- measurement time: typ=16ms, max=24ms, scaled by MTreg value divided by 69
- formula: counts / 1.2 * (69 / MTreg) lx
-H-resolution mode:
- resolution 1lx (@ mtreg=69)
- measurement time: typ=120ms, max=180ms, scaled by MTreg value divided by 69
- formula: counts / 1.2 * (69 / MTreg) lx
-H-resolution mode2:
- resolution 0.5lx (@ mtreg=69)
- measurement time: typ=120ms, max=180ms, scaled by MTreg value divided by 69
- formula: counts / 1.2 * (69 / MTreg) / 2 lx
-
-MTreg:
- min=31, default=69, max=254
-
-> only reason to use l-resolution is faster, but offers no higher range
-> below ~7000lx, makes sense to use H-resolution2 @ MTreg=254
-> try to maximize MTreg to get lowest noise level
-*/

 void BH1750Sensor::setup() {
  ESP_LOGCONFIG(TAG, "Setting up BH1750 '%s'...", this->name_.c_str());
-  uint8_t turn_on = BH1750_COMMAND_POWER_ON;
-  if (this->write(&turn_on, 1) != i2c::ERROR_OK) {
+  if (!this->write_bytes(BH1750_COMMAND_POWER_ON, nullptr, 0)) {
    this->mark_failed();
    return;
  }
-}

-void BH1750Sensor::read_lx_(BH1750Mode mode, uint8_t mtreg, const std::function<void(float)> &f) {
-  // turn on (after one-shot sensor automatically powers down)
-  uint8_t turn_on = BH1750_COMMAND_POWER_ON;
-  if (this->write(&turn_on, 1) != i2c::ERROR_OK) {
-    ESP_LOGW(TAG, "Turning on BH1750 failed");
-    f(NAN);
-    return;
-  }
-
-  if (active_mtreg_ != mtreg) {
-    // set mtreg
-    uint8_t mtreg_hi = BH1750_COMMAND_MT_REG_HI | ((mtreg >> 5) & 0b111);
-    uint8_t mtreg_lo = BH1750_COMMAND_MT_REG_LO | ((mtreg >> 0) & 0b11111);
-    if (this->write(&mtreg_hi, 1) != i2c::ERROR_OK || this->write(&mtreg_lo, 1) != i2c::ERROR_OK) {
-      ESP_LOGW(TAG, "Setting measurement time for BH1750 failed");
-      active_mtreg_ = 0;
-      f(NAN);
-      return;
-    }
-    active_mtreg_ = mtreg;
-  }
-
-  uint8_t cmd;
-  uint16_t meas_time;
-  switch (mode) {
-    case BH1750_MODE_L:
-      cmd = BH1750_COMMAND_ONE_TIME_L;
-      meas_time = 24 * mtreg / 69;
-      break;
-    case BH1750_MODE_H:
-      cmd = BH1750_COMMAND_ONE_TIME_H;
-      meas_time = 180 * mtreg / 69;
-      break;
-    case BH1750_MODE_H2:
-      cmd = BH1750_COMMAND_ONE_TIME_H2;
-      meas_time = 180 * mtreg / 69;
-      break;
-    default:
-      f(NAN);
-      return;
-  }
-  if (this->write(&cmd, 1) != i2c::ERROR_OK) {
-    ESP_LOGW(TAG, "Starting measurement for BH1750 failed");
-    f(NAN);
-    return;
-  }
-
-  // probably not needed, but adjust for rounding
-  meas_time++;
-
-  this->set_timeout("read", meas_time, [this, mode, mtreg, f]() {
-    uint16_t raw_value;
-    if (this->read(reinterpret_cast<uint8_t *>(&raw_value), 2) != i2c::ERROR_OK) {
-      ESP_LOGW(TAG, "Reading BH1750 data failed");
-      f(NAN);
-      return;
-    }
-    raw_value = i2c::i2ctohs(raw_value);
-
-    float lx = float(raw_value) / 1.2f;
-    lx *= 69.0f / mtreg;
-    if (mode == BH1750_MODE_H2)
-      lx /= 2.0f;
-
-    f(lx);
-  });
+  uint8_t mtreg_hi = (this->measurement_duration_ >> 5) & 0b111;
+  uint8_t mtreg_lo = (this->measurement_duration_ >> 0) & 0b11111;
+  this->write_bytes(BH1750_COMMAND_MT_REG_HI | mtreg_hi, nullptr, 0);
+  this->write_bytes(BH1750_COMMAND_MT_REG_LO | mtreg_lo, nullptr, 0);
 }

 void BH1750Sensor::dump_config() {
@@ -121,49 +30,64 @@ void BH1750Sensor::dump_config() {
    ESP_LOGE(TAG, "Communication with BH1750 failed!");
  }

+  const char *resolution_s;
+  switch (this->resolution_) {
+    case BH1750_RESOLUTION_0P5_LX:
+      resolution_s = "0.5";
+      break;
+    case BH1750_RESOLUTION_1P0_LX:
+      resolution_s = "1";
+      break;
+    case BH1750_RESOLUTION_4P0_LX:
+      resolution_s = "4";
+      break;
+    default:
+      resolution_s = "Unknown";
+      break;
+  }
+  ESP_LOGCONFIG(TAG, "  Resolution: %s", resolution_s);
  LOG_UPDATE_INTERVAL(this);
 }

 void BH1750Sensor::update() {
-  // first do a quick measurement in L-mode with full range
-  // to find right range
-  this->read_lx_(BH1750_MODE_L, 31, [this](float val) {
-    if (std::isnan(val)) {
-      this->status_set_warning();
-      this->publish_state(NAN);
-      return;
-    }
+  if (!this->write_bytes(this->resolution_, nullptr, 0))
+    return;

-    BH1750Mode use_mode;
-    uint8_t use_mtreg;
-    if (val <= 7000) {
-      use_mode = BH1750_MODE_H2;
-      use_mtreg = 254;
-    } else {
-      use_mode = BH1750_MODE_H;
-      // lx = counts / 1.2 * (69 / mtreg)
-      // -> mtreg = counts / 1.2 * (69 / lx)
-      // calculate for counts=50000 (allow some range to not saturate, but maximize mtreg)
-      // -> mtreg = 50000*(10/12)*(69/lx)
-      int ideal_mtreg = 50000 * 10 * 69 / (12 * (int) val);
-      use_mtreg = std::min(254, std::max(31, ideal_mtreg));
-    }
-    ESP_LOGV(TAG, "L result: %f -> Calculated mode=%d, mtreg=%d", val, (int) use_mode, use_mtreg);
+  uint32_t wait = 0;
+  // use max conversion times
+  switch (this->resolution_) {
+    case BH1750_RESOLUTION_0P5_LX:
+    case BH1750_RESOLUTION_1P0_LX:
+      wait = 180;
+      break;
+    case BH1750_RESOLUTION_4P0_LX:
+      wait = 24;
+      break;
+  }

-    this->read_lx_(use_mode, use_mtreg, [this](float val) {
-      if (std::isnan(val)) {
-        this->status_set_warning();
-        this->publish_state(NAN);
-        return;
-      }
-      ESP_LOGD(TAG, "'%s': Got illuminance=%.1flx", this->get_name().c_str(), val);
-      this->status_clear_warning();
-      this->publish_state(val);
-    });
-  });
+  this->set_timeout("illuminance", wait, [this]() { this->read_data_(); });
 }

 float BH1750Sensor::get_setup_priority() const { return setup_priority::DATA; }
+void BH1750Sensor::read_data_() {
+  uint16_t raw_value;
+  if (this->read(reinterpret_cast<uint8_t *>(&raw_value), 2) != i2c::ERROR_OK) {
+    this->status_set_warning();
+    return;
+  }
+  raw_value = i2c::i2ctohs(raw_value);
+
+  float lx = float(raw_value) / 1.2f;
+  lx *= 69.0f / this->measurement_duration_;
+  if (this->resolution_ == BH1750_RESOLUTION_0P5_LX) {
+    lx /= 2.0f;
+  }
+  ESP_LOGD(TAG, "'%s': Got illuminance=%.1flx", this->get_name().c_str(), lx);
+  this->publish_state(lx);
+  this->status_clear_warning();
+}
+
+void BH1750Sensor::set_resolution(BH1750Resolution resolution) { this->resolution_ = resolution; }

 }  // namespace bh1750
 }  // namespace esphome
--- a/esphome/components/bh1750/bh1750.h
+++ b/esphome/components/bh1750/bh1750.h
@@ -7,15 +7,29 @@
 namespace esphome {
 namespace bh1750 {

-enum BH1750Mode {
-  BH1750_MODE_L,
-  BH1750_MODE_H,
-  BH1750_MODE_H2,
+/// Enum listing all resolutions that can be used with the BH1750
+enum BH1750Resolution {
+  BH1750_RESOLUTION_4P0_LX = 0b00100011,  // one-time low resolution mode
+  BH1750_RESOLUTION_1P0_LX = 0b00100000,  // one-time high resolution mode 1
+  BH1750_RESOLUTION_0P5_LX = 0b00100001,  // one-time high resolution mode 2
 };

 /// This class implements support for the i2c-based BH1750 ambient light sensor.
 class BH1750Sensor : public sensor::Sensor, public PollingComponent, public i2c::I2CDevice {
 public:
+  /** Set the resolution of this sensor.
+   *
+   * Possible values are:
+   *
+   *  - `BH1750_RESOLUTION_4P0_LX`
+   *  - `BH1750_RESOLUTION_1P0_LX`
+   *  - `BH1750_RESOLUTION_0P5_LX` (default)
+   *
+   * @param resolution The new resolution of the sensor.
+   */
+  void set_resolution(BH1750Resolution resolution);
+  void set_measurement_duration(uint8_t measurement_duration) { measurement_duration_ = measurement_duration; }
+
  // ========== INTERNAL METHODS ==========
  // (In most use cases you won't need these)
  void setup() override;
@@ -24,9 +38,10 @@ class BH1750Sensor : public sensor::Sensor, public PollingComponent, public i2c:
  float get_setup_priority() const override;

 protected:
-  void read_lx_(BH1750Mode mode, uint8_t mtreg, const std::function<void(float)> &f);
+  void read_data_();

-  uint8_t active_mtreg_{0};
+  BH1750Resolution resolution_{BH1750_RESOLUTION_0P5_LX};
+  uint8_t measurement_duration_;
 };

 }  // namespace bh1750
--- a/esphome/components/bh1750/sensor.py
+++ b/esphome/components/bh1750/sensor.py
@@ -2,20 +2,28 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import i2c, sensor
 from esphome.const import (
+    CONF_RESOLUTION,
    DEVICE_CLASS_ILLUMINANCE,
    STATE_CLASS_MEASUREMENT,
    UNIT_LUX,
+    CONF_MEASUREMENT_DURATION,
 )

 DEPENDENCIES = ["i2c"]
-CODEOWNERS = ["@OttoWinter"]

 bh1750_ns = cg.esphome_ns.namespace("bh1750")
+BH1750Resolution = bh1750_ns.enum("BH1750Resolution")
+BH1750_RESOLUTIONS = {
+    4.0: BH1750Resolution.BH1750_RESOLUTION_4P0_LX,
+    1.0: BH1750Resolution.BH1750_RESOLUTION_1P0_LX,
+    0.5: BH1750Resolution.BH1750_RESOLUTION_0P5_LX,
+}

 BH1750Sensor = bh1750_ns.class_(
    "BH1750Sensor", sensor.Sensor, cg.PollingComponent, i2c.I2CDevice
 )

+CONF_MEASUREMENT_TIME = "measurement_time"
 CONFIG_SCHEMA = (
    sensor.sensor_schema(
        BH1750Sensor,
@@ -26,11 +34,14 @@ CONFIG_SCHEMA = (
    )
    .extend(
        {
-            cv.Optional("resolution"): cv.invalid(
-                "The 'resolution' option has been removed. The optimal value is now dynamically calculated."
+            cv.Optional(CONF_RESOLUTION, default=0.5): cv.enum(
+                BH1750_RESOLUTIONS, float=True
            ),
-            cv.Optional("measurement_duration"): cv.invalid(
-                "The 'measurement_duration' option has been removed. The optimal value is now dynamically calculated."
+            cv.Optional(CONF_MEASUREMENT_DURATION, default=69): cv.int_range(
+                min=31, max=254
+            ),
+            cv.Optional(CONF_MEASUREMENT_TIME): cv.invalid(
+                "The 'measurement_time' option has been replaced with 'measurement_duration' in 1.18.0"
            ),
        }
    )
@@ -43,3 +54,6 @@ async def to_code(config):
    var = await sensor.new_sensor(config)
    await cg.register_component(var, config)
    await i2c.register_i2c_device(var, config)
+
+    cg.add(var.set_resolution(config[CONF_RESOLUTION]))
+    cg.add(var.set_measurement_duration(config[CONF_MEASUREMENT_DURATION]))
--- a/esphome/components/binary_sensor/init.py
+++ b/esphome/components/binary_sensor/init.py
@@ -22,7 +22,6 @@ from esphome.const import (
    CONF_ON_PRESS,
    CONF_ON_RELEASE,
    CONF_ON_STATE,
-    CONF_PUBLISH_INITIAL_STATE,
    CONF_STATE,
    CONF_TIMING,
    CONF_TRIGGER_ID,
@@ -30,7 +29,6 @@ from esphome.const import (
    DEVICE_CLASS_EMPTY,
    DEVICE_CLASS_BATTERY,
    DEVICE_CLASS_BATTERY_CHARGING,
-    DEVICE_CLASS_CARBON_MONOXIDE,
    DEVICE_CLASS_COLD,
    DEVICE_CLASS_CONNECTIVITY,
    DEVICE_CLASS_DOOR,
@@ -65,7 +63,6 @@ DEVICE_CLASSES = [
    DEVICE_CLASS_EMPTY,
    DEVICE_CLASS_BATTERY,
    DEVICE_CLASS_BATTERY_CHARGING,
-    DEVICE_CLASS_CARBON_MONOXIDE,
    DEVICE_CLASS_COLD,
    DEVICE_CLASS_CONNECTIVITY,
    DEVICE_CLASS_DOOR,
@@ -329,7 +326,6 @@ BINARY_SENSOR_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMPONENT_SCHEMA).ex
        cv.OnlyWith(CONF_MQTT_ID, "mqtt"): cv.declare_id(
            mqtt.MQTTBinarySensorComponent
        ),
-        cv.Optional(CONF_PUBLISH_INITIAL_STATE): cv.boolean,
        cv.Optional(CONF_DEVICE_CLASS): validate_device_class,
        cv.Optional(CONF_FILTERS): validate_filters,
        cv.Optional(CONF_ON_PRESS): automation.validate_automation(
@@ -422,8 +418,6 @@ async def setup_binary_sensor_core_(var, config):

    if CONF_DEVICE_CLASS in config:
        cg.add(var.set_device_class(config[CONF_DEVICE_CLASS]))
-    if CONF_PUBLISH_INITIAL_STATE in config:
-        cg.add(var.set_publish_initial_state(config[CONF_PUBLISH_INITIAL_STATE]))
    if CONF_INVERTED in config:
        cg.add(var.set_inverted(config[CONF_INVERTED]))
    if CONF_FILTERS in config:
@@ -483,8 +477,8 @@ async def register_binary_sensor(var, config):
    await setup_binary_sensor_core_(var, config)


-async def new_binary_sensor(config, *args):
-    var = cg.new_Pvariable(config[CONF_ID], *args)
+async def new_binary_sensor(config):
+    var = cg.new_Pvariable(config[CONF_ID])
    await register_binary_sensor(var, config)
    return var

--- a/esphome/components/binary_sensor/binary_sensor.cpp
+++ b/esphome/components/binary_sensor/binary_sensor.cpp
@@ -37,7 +37,7 @@ void BinarySensor::send_state_internal(bool state, bool is_initial) {
  }
  this->has_state_ = true;
  this->state = state;
-  if (!is_initial || this->publish_initial_state_) {
+  if (!is_initial) {
    this->state_callback_.call(state);
  }
 }
@@ -69,6 +69,7 @@ void BinarySensor::add_filters(const std::vector<Filter *> &filters) {
  }
 }
 bool BinarySensor::has_state() const { return this->has_state_; }
+uint32_t BinarySensor::hash_base() { return 1210250844UL; }
 bool BinarySensor::is_status_binary_sensor() const { return false; }

 }  // namespace binary_sensor
--- a/esphome/components/binary_sensor/binary_sensor.h
+++ b/esphome/components/binary_sensor/binary_sensor.h
@@ -58,8 +58,6 @@ class BinarySensor : public EntityBase {
  void add_filter(Filter *filter);
  void add_filters(const std::vector<Filter *> &filters);

-  void set_publish_initial_state(bool publish_initial_state) { this->publish_initial_state_ = publish_initial_state; }
-
  // ========== INTERNAL METHODS ==========
  // (In most use cases you won't need these)
  void send_state_internal(bool state, bool is_initial);
@@ -78,11 +76,12 @@ class BinarySensor : public EntityBase {
  virtual std::string device_class();

 protected:
+  uint32_t hash_base() override;
+
  CallbackManager<void(bool)> state_callback_{};
  optional<std::string> device_class_{};  ///< Stores the override of the device class
  Filter *filter_list_{nullptr};
  bool has_state_{false};
-  bool publish_initial_state_{false};
  Deduplicator<bool> publish_dedup_;
 };

--- a/esphome/components/binary_sensor_map/binary_sensor_map.cpp
+++ b/esphome/components/binary_sensor_map/binary_sensor_map.cpp
@@ -13,9 +13,6 @@ void BinarySensorMap::loop() {
    case BINARY_SENSOR_MAP_TYPE_GROUP:
      this->process_group_();
      break;
-    case BINARY_SENSOR_MAP_TYPE_SUM:
-      this->process_sum_();
-      break;
  }
 }

@@ -49,34 +46,6 @@ void BinarySensorMap::process_group_() {
  this->last_mask_ = mask;
 }

-void BinarySensorMap::process_sum_() {
-  float total_current_value = 0.0;
-  uint64_t mask = 0x00;
-  // check all binary_sensors for its state. when active add its value to total_current_value.
-  // create a bitmask for the binary_sensor status on all channels
-  for (size_t i = 0; i < this->channels_.size(); i++) {
-    auto bs = this->channels_[i];
-    if (bs.binary_sensor->state) {
-      total_current_value += bs.sensor_value;
-      mask |= 1 << i;
-    }
-  }
-  // check if the sensor map was touched
-  if (mask != 0ULL) {
-    // did the bit_mask change or is it a new sensor touch
-    if (this->last_mask_ != mask) {
-      float publish_value = total_current_value;
-      ESP_LOGD(TAG, "'%s' - Publishing %.2f", this->name_.c_str(), publish_value);
-      this->publish_state(publish_value);
-    }
-  } else if (this->last_mask_ != 0ULL) {
-    // is this a new sensor release
-    ESP_LOGD(TAG, "'%s' - No binary sensor active, publishing 0", this->name_.c_str());
-    this->publish_state(0.0);
-  }
-  this->last_mask_ = mask;
-}
-
 void BinarySensorMap::add_channel(binary_sensor::BinarySensor *sensor, float value) {
  BinarySensorMapChannel sensor_channel{
      .binary_sensor = sensor,
--- a/esphome/components/binary_sensor_map/binary_sensor_map.h
+++ b/esphome/components/binary_sensor_map/binary_sensor_map.h
@@ -9,7 +9,6 @@ namespace binary_sensor_map {

 enum BinarySensorMapType {
  BINARY_SENSOR_MAP_TYPE_GROUP,
-  BINARY_SENSOR_MAP_TYPE_SUM,
 };

 struct BinarySensorMapChannel {
@@ -51,10 +50,8 @@ class BinarySensorMap : public sensor::Sensor, public Component {
  /**
   * methods to process the types of binary_sensor_maps
   * GROUP: process_group_() just map to a value
-   * ADD: process_add_() adds all the values
   * */
  void process_group_();
-  void process_sum_();
 };

 }  // namespace binary_sensor_map
--- a/esphome/components/binary_sensor_map/sensor.py
+++ b/esphome/components/binary_sensor_map/sensor.py
@@ -9,7 +9,6 @@ from esphome.const import (
    ICON_CHECK_CIRCLE_OUTLINE,
    CONF_BINARY_SENSOR,
    CONF_GROUP,
-    CONF_SUM,
 )

 DEPENDENCIES = ["binary_sensor"]
@@ -22,7 +21,6 @@ SensorMapType = binary_sensor_map_ns.enum("SensorMapType")

 SENSOR_MAP_TYPES = {
    CONF_GROUP: SensorMapType.BINARY_SENSOR_MAP_TYPE_GROUP,
-    CONF_SUM: SensorMapType.BINARY_SENSOR_MAP_TYPE_SUM,
 }

 entry = {
@@ -43,17 +41,6 @@ CONFIG_SCHEMA = cv.typed_schema(
                ),
            }
        ),
-        CONF_SUM: sensor.sensor_schema(
-            BinarySensorMap,
-            icon=ICON_CHECK_CIRCLE_OUTLINE,
-            accuracy_decimals=0,
-        ).extend(
-            {
-                cv.Required(CONF_CHANNELS): cv.All(
-                    cv.ensure_list(entry), cv.Length(min=1)
-                ),
-            }
-        ),
    },
    lower=True,
 )
--- a/esphome/components/bl0939/init.py
+++ b/esphome/components/bl0939/init.py
@@ -1 +0,0 @@
-CODEOWNERS = ["@ziceva"]
--- a/esphome/components/bl0939/bl0939.cpp
+++ b/esphome/components/bl0939/bl0939.cpp
@@ -1,144 +0,0 @@
-#include "bl0939.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace bl0939 {
-
-static const char *const TAG = "bl0939";
-
-// https://www.belling.com.cn/media/file_object/bel_product/BL0939/datasheet/BL0939_V1.2_cn.pdf
-// (unfortunately chinese, but the protocol can be understood with some translation tool)
-static const uint8_t BL0939_READ_COMMAND = 0x55;  // 0x5{A4,A3,A2,A1}
-static const uint8_t BL0939_FULL_PACKET = 0xAA;
-static const uint8_t BL0939_PACKET_HEADER = 0x55;
-
-static const uint8_t BL0939_WRITE_COMMAND = 0xA5;  // 0xA{A4,A3,A2,A1}
-static const uint8_t BL0939_REG_IA_FAST_RMS_CTRL = 0x10;
-static const uint8_t BL0939_REG_IB_FAST_RMS_CTRL = 0x1E;
-static const uint8_t BL0939_REG_MODE = 0x18;
-static const uint8_t BL0939_REG_SOFT_RESET = 0x19;
-static const uint8_t BL0939_REG_USR_WRPROT = 0x1A;
-static const uint8_t BL0939_REG_TPS_CTRL = 0x1B;
-
-const uint8_t BL0939_INIT[6][6] = {
-    // Reset to default
-    {BL0939_WRITE_COMMAND, BL0939_REG_SOFT_RESET, 0x5A, 0x5A, 0x5A, 0x33},
-    // Enable User Operation Write
-    {BL0939_WRITE_COMMAND, BL0939_REG_USR_WRPROT, 0x55, 0x00, 0x00, 0xEB},
-    // 0x0100 = CF_UNABLE energy pulse, AC_FREQ_SEL 50Hz, RMS_UPDATE_SEL 800mS
-    {BL0939_WRITE_COMMAND, BL0939_REG_MODE, 0x00, 0x10, 0x00, 0x32},
-    // 0x47FF = Over-current and leakage alarm on, Automatic temperature measurement, Interval 100mS
-    {BL0939_WRITE_COMMAND, BL0939_REG_TPS_CTRL, 0xFF, 0x47, 0x00, 0xF9},
-    // 0x181C = Half cycle, Fast RMS threshold 6172
-    {BL0939_WRITE_COMMAND, BL0939_REG_IA_FAST_RMS_CTRL, 0x1C, 0x18, 0x00, 0x16},
-    // 0x181C = Half cycle, Fast RMS threshold 6172
-    {BL0939_WRITE_COMMAND, BL0939_REG_IB_FAST_RMS_CTRL, 0x1C, 0x18, 0x00, 0x08}};
-
-void BL0939::loop() {
-  DataPacket buffer;
-  if (!this->available()) {
-    return;
-  }
-  if (read_array((uint8_t *) &buffer, sizeof(buffer))) {
-    if (validate_checksum(&buffer)) {
-      received_package_(&buffer);
-    }
-  } else {
-    ESP_LOGW(TAG, "Junk on wire. Throwing away partial message");
-    while (read() >= 0)
-      ;
-  }
-}
-
-bool BL0939::validate_checksum(const DataPacket *data) {
-  uint8_t checksum = BL0939_READ_COMMAND;
-  // Whole package but checksum
-  for (uint32_t i = 0; i < sizeof(data->raw) - 1; i++) {
-    checksum += data->raw[i];
-  }
-  checksum ^= 0xFF;
-  if (checksum != data->checksum) {
-    ESP_LOGW(TAG, "BL0939 invalid checksum! 0x%02X != 0x%02X", checksum, data->checksum);
-  }
-  return checksum == data->checksum;
-}
-
-void BL0939::update() {
-  this->flush();
-  this->write_byte(BL0939_READ_COMMAND);
-  this->write_byte(BL0939_FULL_PACKET);
-}
-
-void BL0939::setup() {
-  for (auto *i : BL0939_INIT) {
-    this->write_array(i, 6);
-    delay(1);
-  }
-  this->flush();
-}
-
-void BL0939::received_package_(const DataPacket *data) const {
-  // Bad header
-  if (data->frame_header != BL0939_PACKET_HEADER) {
-    ESP_LOGI("bl0939", "Invalid data. Header mismatch: %d", data->frame_header);
-    return;
-  }
-
-  float v_rms = (float) to_uint32_t(data->v_rms) / voltage_reference_;
-  float ia_rms = (float) to_uint32_t(data->ia_rms) / current_reference_;
-  float ib_rms = (float) to_uint32_t(data->ib_rms) / current_reference_;
-  float a_watt = (float) to_int32_t(data->a_watt) / power_reference_;
-  float b_watt = (float) to_int32_t(data->b_watt) / power_reference_;
-  int32_t cfa_cnt = to_int32_t(data->cfa_cnt);
-  int32_t cfb_cnt = to_int32_t(data->cfb_cnt);
-  float a_energy_consumption = (float) cfa_cnt / energy_reference_;
-  float b_energy_consumption = (float) cfb_cnt / energy_reference_;
-  float total_energy_consumption = a_energy_consumption + b_energy_consumption;
-
-  if (voltage_sensor_ != nullptr) {
-    voltage_sensor_->publish_state(v_rms);
-  }
-  if (current_sensor_1_ != nullptr) {
-    current_sensor_1_->publish_state(ia_rms);
-  }
-  if (current_sensor_2_ != nullptr) {
-    current_sensor_2_->publish_state(ib_rms);
-  }
-  if (power_sensor_1_ != nullptr) {
-    power_sensor_1_->publish_state(a_watt);
-  }
-  if (power_sensor_2_ != nullptr) {
-    power_sensor_2_->publish_state(b_watt);
-  }
-  if (energy_sensor_1_ != nullptr) {
-    energy_sensor_1_->publish_state(a_energy_consumption);
-  }
-  if (energy_sensor_2_ != nullptr) {
-    energy_sensor_2_->publish_state(b_energy_consumption);
-  }
-  if (energy_sensor_sum_ != nullptr) {
-    energy_sensor_sum_->publish_state(total_energy_consumption);
-  }
-
-  ESP_LOGV("bl0939", "BL0939: U %fV, I1 %fA, I2 %fA, P1 %fW, P2 %fW, CntA %d, CntB %d, ∫P1 %fkWh, ∫P2 %fkWh", v_rms,
-           ia_rms, ib_rms, a_watt, b_watt, cfa_cnt, cfb_cnt, a_energy_consumption, b_energy_consumption);
-}
-
-void BL0939::dump_config() {  // NOLINT(readability-function-cognitive-complexity)
-  ESP_LOGCONFIG(TAG, "BL0939:");
-  LOG_SENSOR("", "Voltage", this->voltage_sensor_);
-  LOG_SENSOR("", "Current 1", this->current_sensor_1_);
-  LOG_SENSOR("", "Current 2", this->current_sensor_2_);
-  LOG_SENSOR("", "Power 1", this->power_sensor_1_);
-  LOG_SENSOR("", "Power 2", this->power_sensor_2_);
-  LOG_SENSOR("", "Energy 1", this->energy_sensor_1_);
-  LOG_SENSOR("", "Energy 2", this->energy_sensor_2_);
-  LOG_SENSOR("", "Energy sum", this->energy_sensor_sum_);
-}
-
-uint32_t BL0939::to_uint32_t(ube24_t input) { return input.h << 16 | input.m << 8 | input.l; }
-
-int32_t BL0939::to_int32_t(sbe24_t input) { return input.h << 16 | input.m << 8 | input.l; }
-
-}  // namespace bl0939
-}  // namespace esphome
--- a/esphome/components/bl0939/bl0939.h
+++ b/esphome/components/bl0939/bl0939.h
@@ -1,107 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/uart/uart.h"
-#include "esphome/components/sensor/sensor.h"
-
-namespace esphome {
-namespace bl0939 {
-
-// https://datasheet.lcsc.com/lcsc/2108071830_BL-Shanghai-Belling-BL0939_C2841044.pdf
-// (unfortunately chinese, but the formulas can be easily understood)
-// Sonoff Dual R3 V2 has the exact same resistor values for the current shunts (RL=1miliOhm)
-// and for the voltage divider (R1=0.51kOhm, R2=5*390kOhm)
-// as in the manufacturer's reference circuit, so the same formulas were used here (Vref=1.218V)
-static const float BL0939_IREF = 324004 * 1 / 1.218;
-static const float BL0939_UREF = 79931 * 0.51 * 1000 / (1.218 * (5 * 390 + 0.51));
-static const float BL0939_PREF = 4046 * 1 * 0.51 * 1000 / (1.218 * 1.218 * (5 * 390 + 0.51));
-static const float BL0939_EREF = 3.6e6 * 4046 * 1 * 0.51 * 1000 / (1638.4 * 256 * 1.218 * 1.218 * (5 * 390 + 0.51));
-
-struct ube24_t {  // NOLINT(readability-identifier-naming,altera-struct-pack-align)
-  uint8_t l;
-  uint8_t m;
-  uint8_t h;
-} __attribute__((packed));
-
-struct ube16_t {  // NOLINT(readability-identifier-naming,altera-struct-pack-align)
-  uint8_t l;
-  uint8_t h;
-} __attribute__((packed));
-
-struct sbe24_t {  // NOLINT(readability-identifier-naming,altera-struct-pack-align)
-  uint8_t l;
-  uint8_t m;
-  int8_t h;
-} __attribute__((packed));
-
-// Caveat: All these values are big endian (low - middle - high)
-
-union DataPacket {  // NOLINT(altera-struct-pack-align)
-  uint8_t raw[35];
-  struct {
-    uint8_t frame_header;  // 0x55 according to docs
-    ube24_t ia_fast_rms;
-    ube24_t ia_rms;
-    ube24_t ib_rms;
-    ube24_t v_rms;
-    ube24_t ib_fast_rms;
-    sbe24_t a_watt;
-    sbe24_t b_watt;
-    sbe24_t cfa_cnt;
-    sbe24_t cfb_cnt;
-    ube16_t tps1;
-    uint8_t RESERVED1;  // value of 0x00
-    ube16_t tps2;
-    uint8_t RESERVED2;  // value of 0x00
-    uint8_t checksum;   // checksum
-  };
-} __attribute__((packed));
-
-class BL0939 : public PollingComponent, public uart::UARTDevice {
- public:
-  void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
-  void set_current_sensor_1(sensor::Sensor *current_sensor_1) { current_sensor_1_ = current_sensor_1; }
-  void set_current_sensor_2(sensor::Sensor *current_sensor_2) { current_sensor_2_ = current_sensor_2; }
-  void set_power_sensor_1(sensor::Sensor *power_sensor_1) { power_sensor_1_ = power_sensor_1; }
-  void set_power_sensor_2(sensor::Sensor *power_sensor_2) { power_sensor_2_ = power_sensor_2; }
-  void set_energy_sensor_1(sensor::Sensor *energy_sensor_1) { energy_sensor_1_ = energy_sensor_1; }
-  void set_energy_sensor_2(sensor::Sensor *energy_sensor_2) { energy_sensor_2_ = energy_sensor_2; }
-  void set_energy_sensor_sum(sensor::Sensor *energy_sensor_sum) { energy_sensor_sum_ = energy_sensor_sum; }
-
-  void loop() override;
-
-  void update() override;
-  void setup() override;
-  void dump_config() override;
-
- protected:
-  sensor::Sensor *voltage_sensor_{nullptr};
-  sensor::Sensor *current_sensor_1_{nullptr};
-  sensor::Sensor *current_sensor_2_{nullptr};
-  // NB This may be negative as the circuits is seemingly able to measure
-  // power in both directions
-  sensor::Sensor *power_sensor_1_{nullptr};
-  sensor::Sensor *power_sensor_2_{nullptr};
-  sensor::Sensor *energy_sensor_1_{nullptr};
-  sensor::Sensor *energy_sensor_2_{nullptr};
-  sensor::Sensor *energy_sensor_sum_{nullptr};
-
-  // Divide by this to turn into Watt
-  float power_reference_ = BL0939_PREF;
-  // Divide by this to turn into Volt
-  float voltage_reference_ = BL0939_UREF;
-  // Divide by this to turn into Ampere
-  float current_reference_ = BL0939_IREF;
-  // Divide by this to turn into kWh
-  float energy_reference_ = BL0939_EREF;
-
-  static uint32_t to_uint32_t(ube24_t input);
-
-  static int32_t to_int32_t(sbe24_t input);
-
-  static bool validate_checksum(const DataPacket *data);
-
-  void received_package_(const DataPacket *data) const;
-};
-}  // namespace bl0939
-}  // namespace esphome
--- a/esphome/components/bl0939/sensor.py
+++ b/esphome/components/bl0939/sensor.py
@@ -1,123 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor, uart
-from esphome.const import (
-    CONF_ID,
-    CONF_VOLTAGE,
-    DEVICE_CLASS_CURRENT,
-    DEVICE_CLASS_ENERGY,
-    DEVICE_CLASS_POWER,
-    DEVICE_CLASS_VOLTAGE,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_AMPERE,
-    UNIT_KILOWATT_HOURS,
-    UNIT_VOLT,
-    UNIT_WATT,
-)
-
-DEPENDENCIES = ["uart"]
-
-CONF_CURRENT_1 = "current_1"
-CONF_CURRENT_2 = "current_2"
-CONF_ACTIVE_POWER_1 = "active_power_1"
-CONF_ACTIVE_POWER_2 = "active_power_2"
-CONF_ENERGY_1 = "energy_1"
-CONF_ENERGY_2 = "energy_2"
-CONF_ENERGY_TOTAL = "energy_total"
-
-bl0939_ns = cg.esphome_ns.namespace("bl0939")
-BL0939 = bl0939_ns.class_("BL0939", cg.PollingComponent, uart.UARTDevice)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(BL0939),
-            cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_VOLT,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_VOLTAGE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_CURRENT_1): sensor.sensor_schema(
-                unit_of_measurement=UNIT_AMPERE,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_CURRENT,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_CURRENT_2): sensor.sensor_schema(
-                unit_of_measurement=UNIT_AMPERE,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_CURRENT,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_ACTIVE_POWER_1): sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_POWER,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_ACTIVE_POWER_2): sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_POWER,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_ENERGY_1): sensor.sensor_schema(
-                unit_of_measurement=UNIT_KILOWATT_HOURS,
-                accuracy_decimals=3,
-                device_class=DEVICE_CLASS_ENERGY,
-            ),
-            cv.Optional(CONF_ENERGY_2): sensor.sensor_schema(
-                unit_of_measurement=UNIT_KILOWATT_HOURS,
-                accuracy_decimals=3,
-                device_class=DEVICE_CLASS_ENERGY,
-            ),
-            cv.Optional(CONF_ENERGY_TOTAL): sensor.sensor_schema(
-                unit_of_measurement=UNIT_KILOWATT_HOURS,
-                accuracy_decimals=3,
-                device_class=DEVICE_CLASS_ENERGY,
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(uart.UART_DEVICE_SCHEMA)
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await uart.register_uart_device(var, config)
-
-    if CONF_VOLTAGE in config:
-        conf = config[CONF_VOLTAGE]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_voltage_sensor(sens))
-    if CONF_CURRENT_1 in config:
-        conf = config[CONF_CURRENT_1]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_current_sensor_1(sens))
-    if CONF_CURRENT_2 in config:
-        conf = config[CONF_CURRENT_2]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_current_sensor_2(sens))
-    if CONF_ACTIVE_POWER_1 in config:
-        conf = config[CONF_ACTIVE_POWER_1]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_power_sensor_1(sens))
-    if CONF_ACTIVE_POWER_2 in config:
-        conf = config[CONF_ACTIVE_POWER_2]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_power_sensor_2(sens))
-    if CONF_ENERGY_1 in config:
-        conf = config[CONF_ENERGY_1]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_energy_sensor_1(sens))
-    if CONF_ENERGY_2 in config:
-        conf = config[CONF_ENERGY_2]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_energy_sensor_2(sens))
-    if CONF_ENERGY_TOTAL in config:
-        conf = config[CONF_ENERGY_TOTAL]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_energy_sensor_sum(sens))
--- a/esphome/components/bl0940/bl0940.h
+++ b/esphome/components/bl0940/bl0940.h
@@ -75,14 +75,14 @@ class BL0940 : public PollingComponent, public uart::UARTDevice {
  void dump_config() override;

 protected:
-  sensor::Sensor *voltage_sensor_{nullptr};
-  sensor::Sensor *current_sensor_{nullptr};
+  sensor::Sensor *voltage_sensor_;
+  sensor::Sensor *current_sensor_;
  // NB This may be negative as the circuits is seemingly able to measure
  // power in both directions
-  sensor::Sensor *power_sensor_{nullptr};
-  sensor::Sensor *energy_sensor_{nullptr};
-  sensor::Sensor *internal_temperature_sensor_{nullptr};
-  sensor::Sensor *external_temperature_sensor_{nullptr};
+  sensor::Sensor *power_sensor_;
+  sensor::Sensor *energy_sensor_;
+  sensor::Sensor *internal_temperature_sensor_;
+  sensor::Sensor *external_temperature_sensor_;

  // Max difference between two measurements of the temperature. Used to avoid noise.
  float max_temperature_diff_{0};
--- a/esphome/components/bl0942/init.py
+++ b/esphome/components/bl0942/init.py
@@ -1 +0,0 @@
-CODEOWNERS = ["@dbuezas"]
--- a/esphome/components/bl0942/bl0942.cpp
+++ b/esphome/components/bl0942/bl0942.cpp
@@ -1,121 +0,0 @@
-#include "bl0942.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace bl0942 {
-
-static const char *const TAG = "bl0942";
-
-static const uint8_t BL0942_READ_COMMAND = 0x58;
-static const uint8_t BL0942_FULL_PACKET = 0xAA;
-static const uint8_t BL0942_PACKET_HEADER = 0x55;
-
-static const uint8_t BL0942_WRITE_COMMAND = 0xA8;
-static const uint8_t BL0942_REG_I_FAST_RMS_CTRL = 0x10;
-static const uint8_t BL0942_REG_MODE = 0x18;
-static const uint8_t BL0942_REG_SOFT_RESET = 0x19;
-static const uint8_t BL0942_REG_USR_WRPROT = 0x1A;
-static const uint8_t BL0942_REG_TPS_CTRL = 0x1B;
-
-// TODO: Confirm insialisation works as intended
-const uint8_t BL0942_INIT[5][6] = {
-    // Reset to default
-    {BL0942_WRITE_COMMAND, BL0942_REG_SOFT_RESET, 0x5A, 0x5A, 0x5A, 0x38},
-    // Enable User Operation Write
-    {BL0942_WRITE_COMMAND, BL0942_REG_USR_WRPROT, 0x55, 0x00, 0x00, 0xF0},
-    // 0x0100 = CF_UNABLE energy pulse, AC_FREQ_SEL 50Hz, RMS_UPDATE_SEL 800mS
-    {BL0942_WRITE_COMMAND, BL0942_REG_MODE, 0x00, 0x10, 0x00, 0x37},
-    // 0x47FF = Over-current and leakage alarm on, Automatic temperature measurement, Interval 100mS
-    {BL0942_WRITE_COMMAND, BL0942_REG_TPS_CTRL, 0xFF, 0x47, 0x00, 0xFE},
-    // 0x181C = Half cycle, Fast RMS threshold 6172
-    {BL0942_WRITE_COMMAND, BL0942_REG_I_FAST_RMS_CTRL, 0x1C, 0x18, 0x00, 0x1B}};
-
-void BL0942::loop() {
-  DataPacket buffer;
-  if (!this->available()) {
-    return;
-  }
-  if (read_array((uint8_t *) &buffer, sizeof(buffer))) {
-    if (validate_checksum(&buffer)) {
-      received_package_(&buffer);
-    }
-  } else {
-    ESP_LOGW(TAG, "Junk on wire. Throwing away partial message");
-    while (read() >= 0)
-      ;
-  }
-}
-
-bool BL0942::validate_checksum(DataPacket *data) {
-  uint8_t checksum = BL0942_READ_COMMAND;
-  // Whole package but checksum
-  uint8_t *raw = (uint8_t *) data;
-  for (uint32_t i = 0; i < sizeof(*data) - 1; i++) {
-    checksum += raw[i];
-  }
-  checksum ^= 0xFF;
-  if (checksum != data->checksum) {
-    ESP_LOGW(TAG, "BL0942 invalid checksum! 0x%02X != 0x%02X", checksum, data->checksum);
-  }
-  return checksum == data->checksum;
-}
-
-void BL0942::update() {
-  this->flush();
-  this->write_byte(BL0942_READ_COMMAND);
-  this->write_byte(BL0942_FULL_PACKET);
-}
-
-void BL0942::setup() {
-  for (auto *i : BL0942_INIT) {
-    this->write_array(i, 6);
-    delay(1);
-  }
-  this->flush();
-}
-
-void BL0942::received_package_(DataPacket *data) {
-  // Bad header
-  if (data->frame_header != BL0942_PACKET_HEADER) {
-    ESP_LOGI(TAG, "Invalid data. Header mismatch: %d", data->frame_header);
-    return;
-  }
-
-  float v_rms = (uint24_t) data->v_rms / voltage_reference_;
-  float i_rms = (uint24_t) data->i_rms / current_reference_;
-  float watt = (int24_t) data->watt / power_reference_;
-  uint32_t cf_cnt = (uint24_t) data->cf_cnt;
-  float total_energy_consumption = cf_cnt / energy_reference_;
-  float frequency = 1000000.0f / data->frequency;
-
-  if (voltage_sensor_ != nullptr) {
-    voltage_sensor_->publish_state(v_rms);
-  }
-  if (current_sensor_ != nullptr) {
-    current_sensor_->publish_state(i_rms);
-  }
-  if (power_sensor_ != nullptr) {
-    power_sensor_->publish_state(watt);
-  }
-  if (energy_sensor_ != nullptr) {
-    energy_sensor_->publish_state(total_energy_consumption);
-  }
-  if (frequency_sensor_ != nullptr) {
-    frequency_sensor_->publish_state(frequency);
-  }
-
-  ESP_LOGV(TAG, "BL0942: U %fV, I %fA, P %fW, Cnt %d, ∫P %fkWh, frequency %f°Hz, status 0x%08X", v_rms, i_rms, watt,
-           cf_cnt, total_energy_consumption, frequency, data->status);
-}
-
-void BL0942::dump_config() {  // NOLINT(readability-function-cognitive-complexity)
-  ESP_LOGCONFIG(TAG, "BL0942:");
-  LOG_SENSOR("", "Voltage", this->voltage_sensor_);
-  LOG_SENSOR("", "Current", this->current_sensor_);
-  LOG_SENSOR("", "Power", this->power_sensor_);
-  LOG_SENSOR("", "Energy", this->energy_sensor_);
-  LOG_SENSOR("", "frequency", this->frequency_sensor_);
-}
-
-}  // namespace bl0942
-}  // namespace esphome
--- a/esphome/components/bl0942/bl0942.h
+++ b/esphome/components/bl0942/bl0942.h
@@ -1,68 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/datatypes.h"
-#include "esphome/components/uart/uart.h"
-#include "esphome/components/sensor/sensor.h"
-
-namespace esphome {
-namespace bl0942 {
-
-static const float BL0942_PREF = 596;              // taken from tasmota
-static const float BL0942_UREF = 15873.35944299;   // should be 73989/1.218
-static const float BL0942_IREF = 251213.46469622;  // 305978/1.218
-static const float BL0942_EREF = 3304.61127328;    // Measured
-
-struct DataPacket {
-  uint8_t frame_header;
-  uint24_le_t i_rms;
-  uint24_le_t v_rms;
-  uint24_le_t i_fast_rms;
-  int24_le_t watt;
-  uint24_le_t cf_cnt;
-  uint16_le_t frequency;
-  uint8_t reserved1;
-  uint8_t status;
-  uint8_t reserved2;
-  uint8_t reserved3;
-  uint8_t checksum;
-} __attribute__((packed));
-
-class BL0942 : public PollingComponent, public uart::UARTDevice {
- public:
-  void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
-  void set_current_sensor(sensor::Sensor *current_sensor) { current_sensor_ = current_sensor; }
-  void set_power_sensor(sensor::Sensor *power_sensor) { power_sensor_ = power_sensor; }
-  void set_energy_sensor(sensor::Sensor *energy_sensor) { energy_sensor_ = energy_sensor; }
-  void set_frequency_sensor(sensor::Sensor *frequency_sensor) { frequency_sensor_ = frequency_sensor; }
-
-  void loop() override;
-
-  void update() override;
-  void setup() override;
-  void dump_config() override;
-
- protected:
-  sensor::Sensor *voltage_sensor_{nullptr};
-  sensor::Sensor *current_sensor_{nullptr};
-  // NB This may be negative as the circuits is seemingly able to measure
-  // power in both directions
-  sensor::Sensor *power_sensor_{nullptr};
-  sensor::Sensor *energy_sensor_{nullptr};
-  sensor::Sensor *frequency_sensor_{nullptr};
-
-  // Divide by this to turn into Watt
-  float power_reference_ = BL0942_PREF;
-  // Divide by this to turn into Volt
-  float voltage_reference_ = BL0942_UREF;
-  // Divide by this to turn into Ampere
-  float current_reference_ = BL0942_IREF;
-  // Divide by this to turn into kWh
-  float energy_reference_ = BL0942_EREF;
-
-  static bool validate_checksum(DataPacket *data);
-
-  void received_package_(DataPacket *data);
-};
-}  // namespace bl0942
-}  // namespace esphome
--- a/esphome/components/bl0942/sensor.py
+++ b/esphome/components/bl0942/sensor.py
@@ -1,93 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor, uart
-from esphome.const import (
-    CONF_CURRENT,
-    CONF_ENERGY,
-    CONF_ID,
-    CONF_POWER,
-    CONF_VOLTAGE,
-    CONF_FREQUENCY,
-    DEVICE_CLASS_CURRENT,
-    DEVICE_CLASS_ENERGY,
-    DEVICE_CLASS_POWER,
-    DEVICE_CLASS_VOLTAGE,
-    DEVICE_CLASS_FREQUENCY,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_AMPERE,
-    UNIT_KILOWATT_HOURS,
-    UNIT_VOLT,
-    UNIT_WATT,
-    UNIT_HERTZ,
-)
-
-DEPENDENCIES = ["uart"]
-
-bl0942_ns = cg.esphome_ns.namespace("bl0942")
-BL0942 = bl0942_ns.class_("BL0942", cg.PollingComponent, uart.UARTDevice)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(BL0942),
-            cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_VOLT,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_VOLTAGE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_CURRENT): sensor.sensor_schema(
-                unit_of_measurement=UNIT_AMPERE,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_CURRENT,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_POWER): sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_POWER,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_ENERGY): sensor.sensor_schema(
-                unit_of_measurement=UNIT_KILOWATT_HOURS,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_ENERGY,
-            ),
-            cv.Optional(CONF_FREQUENCY): sensor.sensor_schema(
-                unit_of_measurement=UNIT_HERTZ,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_FREQUENCY,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(uart.UART_DEVICE_SCHEMA)
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await uart.register_uart_device(var, config)
-
-    if CONF_VOLTAGE in config:
-        conf = config[CONF_VOLTAGE]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_voltage_sensor(sens))
-    if CONF_CURRENT in config:
-        conf = config[CONF_CURRENT]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_current_sensor(sens))
-    if CONF_POWER in config:
-        conf = config[CONF_POWER]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_power_sensor(sens))
-    if CONF_ENERGY in config:
-        conf = config[CONF_ENERGY]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_energy_sensor(sens))
-    if CONF_FREQUENCY in config:
-        conf = config[CONF_FREQUENCY]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_frequency_sensor(sens))
--- a/esphome/components/ble_client/init.py
+++ b/esphome/components/ble_client/init.py
@@ -2,15 +2,12 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import esp32_ble_tracker
 from esphome.const import (
-    CONF_CHARACTERISTIC_UUID,
    CONF_ID,
    CONF_MAC_ADDRESS,
    CONF_NAME,
    CONF_ON_CONNECT,
    CONF_ON_DISCONNECT,
-    CONF_SERVICE_UUID,
    CONF_TRIGGER_ID,
-    CONF_VALUE,
 )
 from esphome import automation

@@ -30,8 +27,6 @@ BLEClientConnectTrigger = ble_client_ns.class_(
 BLEClientDisconnectTrigger = ble_client_ns.class_(
    "BLEClientDisconnectTrigger", automation.Trigger.template(BLEClientNodeConstRef)
 )
-# Actions
-BLEWriteAction = ble_client_ns.class_("BLEClientWriteAction", automation.Action)

 # Espressif platformio framework is built with MAX_BLE_CONN to 3, so
 # enforce this in yaml checks.
@@ -77,39 +72,6 @@ async def register_ble_node(var, config):
    cg.add(parent.register_ble_node(var))


-BLE_WRITE_ACTION_SCHEMA = cv.Schema(
-    {
-        cv.Required(CONF_ID): cv.use_id(BLEClient),
-        cv.Required(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
-        cv.Required(CONF_CHARACTERISTIC_UUID): esp32_ble_tracker.bt_uuid,
-        cv.Required(CONF_VALUE): cv.templatable(cv.ensure_list(cv.hex_uint8_t)),
-    }
-)
-
-
-@automation.register_action(
-    "ble_client.ble_write", BLEWriteAction, BLE_WRITE_ACTION_SCHEMA
-)
-async def ble_write_to_code(config, action_id, template_arg, args):
-    paren = await cg.get_variable(config[CONF_ID])
-    var = cg.new_Pvariable(action_id, template_arg, paren)
-
-    value = config[CONF_VALUE]
-    if cg.is_template(value):
-        templ = await cg.templatable(value, args, cg.std_vector.template(cg.uint8))
-        cg.add(var.set_value_template(templ))
-    else:
-        cg.add(var.set_value_simple(value))
-
-    serv_uuid128 = esp32_ble_tracker.as_reversed_hex_array(config[CONF_SERVICE_UUID])
-    cg.add(var.set_service_uuid128(serv_uuid128))
-    char_uuid128 = esp32_ble_tracker.as_reversed_hex_array(
-        config[CONF_CHARACTERISTIC_UUID]
-    )
-    cg.add(var.set_char_uuid128(char_uuid128))
-    return var
-
-
 async def to_code(config):
    var = cg.new_Pvariable(config[CONF_ID])
    await cg.register_component(var, config)
--- a/esphome/components/ble_client/automation.cpp
+++ b/esphome/components/ble_client/automation.cpp
@@ -1,75 +0,0 @@
-#include "automation.h"
-
-#include <esp_gap_ble_api.h>
-#include <esp_gattc_api.h>
-#include <esp_bt_defs.h>
-
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace ble_client {
-static const char *const TAG = "ble_client.automation";
-
-void BLEWriterClientNode::write(const std::vector<uint8_t> &value) {
-  if (this->node_state != espbt::ClientState::ESTABLISHED) {
-    ESP_LOGW(TAG, "Cannot write to BLE characteristic - not connected");
-    return;
-  } else if (this->ble_char_handle_ == 0) {
-    ESP_LOGW(TAG, "Cannot write to BLE characteristic - characteristic not found");
-    return;
-  }
-  esp_gatt_write_type_t write_type;
-  if (this->char_props_ & ESP_GATT_CHAR_PROP_BIT_WRITE) {
-    write_type = ESP_GATT_WRITE_TYPE_RSP;
-    ESP_LOGD(TAG, "Write type: ESP_GATT_WRITE_TYPE_RSP");
-  } else if (this->char_props_ & ESP_GATT_CHAR_PROP_BIT_WRITE_NR) {
-    write_type = ESP_GATT_WRITE_TYPE_NO_RSP;
-    ESP_LOGD(TAG, "Write type: ESP_GATT_WRITE_TYPE_NO_RSP");
-  } else {
-    ESP_LOGE(TAG, "Characteristic %s does not allow writing", this->char_uuid_.to_string().c_str());
-    return;
-  }
-  ESP_LOGVV(TAG, "Will write %d bytes: %s", value.size(), format_hex_pretty(value).c_str());
-  esp_err_t err =
-      esp_ble_gattc_write_char(this->parent()->gattc_if, this->parent()->conn_id, this->ble_char_handle_, value.size(),
-                               const_cast<uint8_t *>(value.data()), write_type, ESP_GATT_AUTH_REQ_NONE);
-  if (err != ESP_OK) {
-    ESP_LOGE(TAG, "Error writing to characteristic: %s!", esp_err_to_name(err));
-  }
-}
-
-void BLEWriterClientNode::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                                              esp_ble_gattc_cb_param_t *param) {
-  switch (event) {
-    case ESP_GATTC_REG_EVT:
-      break;
-    case ESP_GATTC_OPEN_EVT:
-      this->node_state = espbt::ClientState::ESTABLISHED;
-      ESP_LOGD(TAG, "Connection established with %s", ble_client_->address_str().c_str());
-      break;
-    case ESP_GATTC_SEARCH_CMPL_EVT: {
-      auto *chr = this->parent()->get_characteristic(this->service_uuid_, this->char_uuid_);
-      if (chr == nullptr) {
-        ESP_LOGW("ble_write_action", "Characteristic %s was not found in service %s",
-                 this->char_uuid_.to_string().c_str(), this->service_uuid_.to_string().c_str());
-        break;
-      }
-      this->ble_char_handle_ = chr->handle;
-      this->char_props_ = chr->properties;
-      this->node_state = espbt::ClientState::ESTABLISHED;
-      ESP_LOGD(TAG, "Found characteristic %s on device %s", this->char_uuid_.to_string().c_str(),
-               ble_client_->address_str().c_str());
-      break;
-    }
-    case ESP_GATTC_DISCONNECT_EVT:
-      this->node_state = espbt::ClientState::IDLE;
-      this->ble_char_handle_ = 0;
-      ESP_LOGD(TAG, "Disconnected from %s", ble_client_->address_str().c_str());
-      break;
-    default:
-      break;
-  }
-}
-
-}  // namespace ble_client
-}  // namespace esphome
--- a/esphome/components/ble_client/automation.h
+++ b/esphome/components/ble_client/automation.h
@@ -1,7 +1,5 @@
 #pragma once

-#include <utility>
-
 #include "esphome/core/automation.h"
 #include "esphome/components/ble_client/ble_client.h"

@@ -15,10 +13,10 @@ class BLEClientConnectTrigger : public Trigger<>, public BLEClientNode {
  void loop() override {}
  void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                           esp_ble_gattc_cb_param_t *param) override {
-    if (event == ESP_GATTC_SEARCH_CMPL_EVT) {
-      this->node_state = espbt::ClientState::ESTABLISHED;
+    if (event == ESP_GATTC_OPEN_EVT && param->open.status == ESP_GATT_OK)
      this->trigger();
-    }
+    if (event == ESP_GATTC_SEARCH_CMPL_EVT)
+      this->node_state = espbt::ClientState::ESTABLISHED;
  }
 };

@@ -35,59 +33,6 @@ class BLEClientDisconnectTrigger : public Trigger<>, public BLEClientNode {
  }
 };

-class BLEWriterClientNode : public BLEClientNode {
- public:
-  BLEWriterClientNode(BLEClient *ble_client) {
-    ble_client->register_ble_node(this);
-    ble_client_ = ble_client;
-  }
-
-  // Attempts to write the contents of value to char_uuid_.
-  void write(const std::vector<uint8_t> &value);
-
-  void set_char_uuid128(uint8_t *uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }
-
-  void set_service_uuid128(uint8_t *uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }
-
-  void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                           esp_ble_gattc_cb_param_t *param) override;
-
- private:
-  BLEClient *ble_client_;
-  int ble_char_handle_ = 0;
-  esp_gatt_char_prop_t char_props_;
-  espbt::ESPBTUUID service_uuid_;
-  espbt::ESPBTUUID char_uuid_;
-};
-
-template<typename... Ts> class BLEClientWriteAction : public Action<Ts...>, public BLEWriterClientNode {
- public:
-  BLEClientWriteAction(BLEClient *ble_client) : BLEWriterClientNode(ble_client) {}
-
-  void play(Ts... x) override {
-    if (has_simple_value_) {
-      return write(this->value_simple_);
-    } else {
-      return write(this->value_template_(x...));
-    }
-  }
-
-  void set_value_template(std::function<std::vector<uint8_t>(Ts...)> func) {
-    this->value_template_ = std::move(func);
-    has_simple_value_ = false;
-  }
-
-  void set_value_simple(const std::vector<uint8_t> &value) {
-    this->value_simple_ = value;
-    has_simple_value_ = true;
-  }
-
- private:
-  bool has_simple_value_ = true;
-  std::vector<uint8_t> value_simple_;
-  std::function<std::vector<uint8_t>(Ts...)> value_template_{};
-};
-
 }  // namespace ble_client
 }  // namespace esphome

--- a/esphome/components/ble_client/ble_client.cpp
+++ b/esphome/components/ble_client/ble_client.cpp
@@ -54,7 +54,6 @@ bool BLEClient::parse_device(const espbt::ESPBTDevice &device) {
  this->remote_bda[3] = (addr >> 16) & 0xFF;
  this->remote_bda[4] = (addr >> 8) & 0xFF;
  this->remote_bda[5] = (addr >> 0) & 0xFF;
-  this->remote_addr_type = device.get_address_type();
  return true;
 }

@@ -84,7 +83,7 @@ void BLEClient::set_enabled(bool enabled) {

 void BLEClient::connect() {
  ESP_LOGI(TAG, "Attempting BLE connection to %s", this->address_str().c_str());
-  auto ret = esp_ble_gattc_open(this->gattc_if, this->remote_bda, this->remote_addr_type, true);
+  auto ret = esp_ble_gattc_open(this->gattc_if, this->remote_bda, BLE_ADDR_TYPE_PUBLIC, true);
  if (ret) {
    ESP_LOGW(TAG, "esp_ble_gattc_open error, address=%s status=%d", this->address_str().c_str(), ret);
    this->set_states_(espbt::ClientState::IDLE);
@@ -114,30 +113,21 @@ void BLEClient::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t es
    }
    case ESP_GATTC_OPEN_EVT: {
      ESP_LOGV(TAG, "[%s] ESP_GATTC_OPEN_EVT", this->address_str().c_str());
-      this->conn_id = param->open.conn_id;
      if (param->open.status != ESP_GATT_OK) {
        ESP_LOGW(TAG, "connect to %s failed, status=%d", this->address_str().c_str(), param->open.status);
        this->set_states_(espbt::ClientState::IDLE);
        break;
      }
-      break;
-    }
-    case ESP_GATTC_CONNECT_EVT: {
-      ESP_LOGV(TAG, "[%s] ESP_GATTC_CONNECT_EVT", this->address_str().c_str());
-      if (this->conn_id != param->connect.conn_id) {
-        ESP_LOGD(TAG, "[%s] Unexpected conn_id in CONNECT_EVT: param conn=%d, open conn=%d",
-                 this->address_str().c_str(), param->connect.conn_id, this->conn_id);
-      }
-      auto ret = esp_ble_gattc_send_mtu_req(this->gattc_if, param->connect.conn_id);
+      this->conn_id = param->open.conn_id;
+      auto ret = esp_ble_gattc_send_mtu_req(this->gattc_if, param->open.conn_id);
      if (ret) {
-        ESP_LOGW(TAG, "esp_ble_gattc_send_mtu_req failed, status=%x", ret);
+        ESP_LOGW(TAG, "esp_ble_gattc_send_mtu_req failed, status=%d", ret);
      }
      break;
    }
    case ESP_GATTC_CFG_MTU_EVT: {
      if (param->cfg_mtu.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "cfg_mtu to %s failed, mtu %d, status %d", this->address_str().c_str(), param->cfg_mtu.mtu,
-                 param->cfg_mtu.status);
+        ESP_LOGW(TAG, "cfg_mtu to %s failed, status %d", this->address_str().c_str(), param->cfg_mtu.status);
        this->set_states_(espbt::ClientState::IDLE);
        break;
      }
@@ -149,7 +139,7 @@ void BLEClient::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t es
      if (memcmp(param->disconnect.remote_bda, this->remote_bda, 6) != 0) {
        return;
      }
-      ESP_LOGV(TAG, "[%s] ESP_GATTC_DISCONNECT_EVT, reason %d", this->address_str().c_str(), param->disconnect.reason);
+      ESP_LOGV(TAG, "[%s] ESP_GATTC_DISCONNECT_EVT", this->address_str().c_str());
      for (auto &svc : this->services_)
        delete svc;  // NOLINT(cppcoreguidelines-owning-memory)
      this->services_.clear();
@@ -188,10 +178,9 @@ void BLEClient::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t es
                 descr->uuid.to_string().c_str());
        break;
      }
-      uint16_t notify_en = 1;
-      auto status =
-          esp_ble_gattc_write_char_descr(this->gattc_if, this->conn_id, descr->handle, sizeof(notify_en),
-                                         (uint8_t *) &notify_en, ESP_GATT_WRITE_TYPE_RSP, ESP_GATT_AUTH_REQ_NONE);
+      uint8_t notify_en = 1;
+      auto status = esp_ble_gattc_write_char_descr(this->gattc_if, this->conn_id, descr->handle, sizeof(notify_en),
+                                                   &notify_en, ESP_GATT_WRITE_TYPE_RSP, ESP_GATT_AUTH_REQ_NONE);
      if (status) {
        ESP_LOGW(TAG, "esp_ble_gattc_write_char_descr error, status=%d", status);
      }
@@ -212,32 +201,6 @@ void BLEClient::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t es
  }
 }

-void BLEClient::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
-  switch (event) {
-    // This event is sent by the server when it requests security
-    case ESP_GAP_BLE_SEC_REQ_EVT:
-      ESP_LOGV(TAG, "ESP_GAP_BLE_SEC_REQ_EVT %x", event);
-      esp_ble_gap_security_rsp(param->ble_security.ble_req.bd_addr, true);
-      break;
-    // This event is sent once authentication has completed
-    case ESP_GAP_BLE_AUTH_CMPL_EVT:
-      esp_bd_addr_t bd_addr;
-      memcpy(bd_addr, param->ble_security.auth_cmpl.bd_addr, sizeof(esp_bd_addr_t));
-      ESP_LOGI(TAG, "auth complete. remote BD_ADDR: %s", format_hex(bd_addr, 6).c_str());
-      if (!param->ble_security.auth_cmpl.success) {
-        ESP_LOGE(TAG, "auth fail reason = 0x%x", param->ble_security.auth_cmpl.fail_reason);
-      } else {
-        ESP_LOGV(TAG, "auth success. address type = %d auth mode = %d", param->ble_security.auth_cmpl.addr_type,
-                 param->ble_security.auth_cmpl.auth_mode);
-      }
-      break;
-    // There are other events we'll want to implement at some point to support things like pass key
-    // https://github.com/espressif/esp-idf/blob/cba69dd088344ed9d26739f04736ae7a37541b3a/examples/bluetooth/bluedroid/ble/gatt_security_client/tutorial/Gatt_Security_Client_Example_Walkthrough.md
-    default:
-      break;
-  }
-}
-
 // Parse GATT values into a float for a sensor.
 // Ref: https://www.bluetooth.com/specifications/assigned-numbers/format-types/
 float BLEClient::parse_char_value(uint8_t *value, uint16_t length) {
--- a/esphome/components/ble_client/ble_client.h
+++ b/esphome/components/ble_client/ble_client.h
@@ -11,7 +11,6 @@
 #include <esp_gap_ble_api.h>
 #include <esp_gattc_api.h>
 #include <esp_bt_defs.h>
-#include <esp_gatt_common_api.h>

 namespace esphome {
 namespace ble_client {
@@ -87,7 +86,6 @@ class BLEClient : public espbt::ESPBTClient, public Component {

  void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                           esp_ble_gattc_cb_param_t *param) override;
-  void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) override;
  bool parse_device(const espbt::ESPBTDevice &device) override;
  void on_scan_end() override {}
  void connect() override;
@@ -115,7 +113,6 @@ class BLEClient : public espbt::ESPBTClient, public Component {

  int gattc_if;
  esp_bd_addr_t remote_bda;
-  esp_ble_addr_type_t remote_addr_type;
  uint16_t conn_id;
  uint64_t address;
  bool enabled;
--- a/esphome/components/ble_client/output/init.py
+++ b/esphome/components/ble_client/output/init.py
@@ -1,12 +1,13 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import ble_client, esp32_ble_tracker, output
-from esphome.const import CONF_CHARACTERISTIC_UUID, CONF_ID, CONF_SERVICE_UUID
+from esphome.const import CONF_ID, CONF_SERVICE_UUID

 from .. import ble_client_ns

 DEPENDENCIES = ["ble_client"]

+CONF_CHARACTERISTIC_UUID = "characteristic_uuid"
 CONF_REQUIRE_RESPONSE = "require_response"

 BLEBinaryOutput = ble_client_ns.class_(
--- a/esphome/components/ble_client/sensor/init.py
+++ b/esphome/components/ble_client/sensor/init.py
@@ -2,7 +2,6 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import sensor, ble_client, esp32_ble_tracker
 from esphome.const import (
-    CONF_CHARACTERISTIC_UUID,
    CONF_LAMBDA,
    CONF_TRIGGER_ID,
    CONF_SERVICE_UUID,
@@ -12,6 +11,7 @@ from .. import ble_client_ns

 DEPENDENCIES = ["ble_client"]

+CONF_CHARACTERISTIC_UUID = "characteristic_uuid"
 CONF_DESCRIPTOR_UUID = "descriptor_uuid"

 CONF_NOTIFY = "notify"
--- a/esphome/components/ble_client/sensor/ble_sensor.cpp
+++ b/esphome/components/ble_client/sensor/ble_sensor.cpp
@@ -11,6 +11,8 @@ namespace ble_client {

 static const char *const TAG = "ble_sensor";

+uint32_t BLESensor::hash_base() { return 343459825UL; }
+
 void BLESensor::loop() {}

 void BLESensor::dump_config() {
--- a/esphome/components/ble_client/sensor/ble_sensor.h
+++ b/esphome/components/ble_client/sensor/ble_sensor.h
@@ -37,6 +37,7 @@ class BLESensor : public sensor::Sensor, public PollingComponent, public BLEClie
  uint16_t handle;

 protected:
+  uint32_t hash_base() override;
  float parse_data_(uint8_t *value, uint16_t value_len);
  optional<data_to_value_t> data_to_value_func_{};
  bool notify_;
--- a/esphome/components/ble_client/switch/init.py
+++ b/esphome/components/ble_client/switch/init.py
@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import switch, ble_client
-from esphome.const import ICON_BLUETOOTH
+from esphome.const import CONF_ICON, CONF_ID, CONF_INVERTED, ICON_BLUETOOTH
 from .. import ble_client_ns

 BLEClientSwitch = ble_client_ns.class_(
@@ -9,13 +9,22 @@ BLEClientSwitch = ble_client_ns.class_(
 )

 CONFIG_SCHEMA = (
-    switch.switch_schema(BLEClientSwitch, icon=ICON_BLUETOOTH, block_inverted=True)
+    switch.SWITCH_SCHEMA.extend(
+        {
+            cv.GenerateID(): cv.declare_id(BLEClientSwitch),
+            cv.Optional(CONF_INVERTED): cv.invalid(
+                "BLE client switches do not support inverted mode!"
+            ),
+            cv.Optional(CONF_ICON, default=ICON_BLUETOOTH): switch.icon,
+        }
+    )
    .extend(ble_client.BLE_CLIENT_SCHEMA)
    .extend(cv.COMPONENT_SCHEMA)
 )


 async def to_code(config):
-    var = await switch.new_switch(config)
+    var = cg.new_Pvariable(config[CONF_ID])
    await cg.register_component(var, config)
+    await switch.register_switch(var, config)
    await ble_client.register_ble_node(var, config)
--- a/esphome/components/ble_client/text_sensor/init.py
+++ b/esphome/components/ble_client/text_sensor/init.py
@@ -1,121 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import text_sensor, ble_client, esp32_ble_tracker
-from esphome.const import (
-    CONF_CHARACTERISTIC_UUID,
-    CONF_ID,
-    CONF_TRIGGER_ID,
-    CONF_SERVICE_UUID,
-)
-from esphome import automation
-from .. import ble_client_ns
-
-DEPENDENCIES = ["ble_client"]
-
-CONF_DESCRIPTOR_UUID = "descriptor_uuid"
-
-CONF_NOTIFY = "notify"
-CONF_ON_NOTIFY = "on_notify"
-
-adv_data_t = cg.std_vector.template(cg.uint8)
-adv_data_t_const_ref = adv_data_t.operator("ref").operator("const")
-
-BLETextSensor = ble_client_ns.class_(
-    "BLETextSensor",
-    text_sensor.TextSensor,
-    cg.PollingComponent,
-    ble_client.BLEClientNode,
-)
-BLETextSensorNotifyTrigger = ble_client_ns.class_(
-    "BLETextSensorNotifyTrigger", automation.Trigger.template(cg.std_string)
-)
-
-CONFIG_SCHEMA = cv.All(
-    text_sensor.TEXT_SENSOR_SCHEMA.extend(
-        {
-            cv.GenerateID(): cv.declare_id(BLETextSensor),
-            cv.Required(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
-            cv.Required(CONF_CHARACTERISTIC_UUID): esp32_ble_tracker.bt_uuid,
-            cv.Optional(CONF_DESCRIPTOR_UUID): esp32_ble_tracker.bt_uuid,
-            cv.Optional(CONF_NOTIFY, default=False): cv.boolean,
-            cv.Optional(CONF_ON_NOTIFY): automation.validate_automation(
-                {
-                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
-                        BLETextSensorNotifyTrigger
-                    ),
-                }
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(ble_client.BLE_CLIENT_SCHEMA)
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    if len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid16_format):
-        cg.add(
-            var.set_service_uuid16(esp32_ble_tracker.as_hex(config[CONF_SERVICE_UUID]))
-        )
-    elif len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid32_format):
-        cg.add(
-            var.set_service_uuid32(esp32_ble_tracker.as_hex(config[CONF_SERVICE_UUID]))
-        )
-    elif len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid128_format):
-        uuid128 = esp32_ble_tracker.as_reversed_hex_array(config[CONF_SERVICE_UUID])
-        cg.add(var.set_service_uuid128(uuid128))
-
-    if len(config[CONF_CHARACTERISTIC_UUID]) == len(esp32_ble_tracker.bt_uuid16_format):
-        cg.add(
-            var.set_char_uuid16(
-                esp32_ble_tracker.as_hex(config[CONF_CHARACTERISTIC_UUID])
-            )
-        )
-    elif len(config[CONF_CHARACTERISTIC_UUID]) == len(
-        esp32_ble_tracker.bt_uuid32_format
-    ):
-        cg.add(
-            var.set_char_uuid32(
-                esp32_ble_tracker.as_hex(config[CONF_CHARACTERISTIC_UUID])
-            )
-        )
-    elif len(config[CONF_CHARACTERISTIC_UUID]) == len(
-        esp32_ble_tracker.bt_uuid128_format
-    ):
-        uuid128 = esp32_ble_tracker.as_reversed_hex_array(
-            config[CONF_CHARACTERISTIC_UUID]
-        )
-        cg.add(var.set_char_uuid128(uuid128))
-
-    if CONF_DESCRIPTOR_UUID in config:
-        if len(config[CONF_DESCRIPTOR_UUID]) == len(esp32_ble_tracker.bt_uuid16_format):
-            cg.add(
-                var.set_descr_uuid16(
-                    esp32_ble_tracker.as_hex(config[CONF_DESCRIPTOR_UUID])
-                )
-            )
-        elif len(config[CONF_DESCRIPTOR_UUID]) == len(
-            esp32_ble_tracker.bt_uuid32_format
-        ):
-            cg.add(
-                var.set_descr_uuid32(
-                    esp32_ble_tracker.as_hex(config[CONF_DESCRIPTOR_UUID])
-                )
-            )
-        elif len(config[CONF_DESCRIPTOR_UUID]) == len(
-            esp32_ble_tracker.bt_uuid128_format
-        ):
-            uuid128 = esp32_ble_tracker.as_reversed_hex_array(
-                config[CONF_DESCRIPTOR_UUID]
-            )
-            cg.add(var.set_descr_uuid128(uuid128))
-
-    await cg.register_component(var, config)
-    await ble_client.register_ble_node(var, config)
-    cg.add(var.set_enable_notify(config[CONF_NOTIFY]))
-    await text_sensor.register_text_sensor(var, config)
-    for conf in config.get(CONF_ON_NOTIFY, []):
-        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-        await ble_client.register_ble_node(trigger, config)
-        await automation.build_automation(trigger, [(cg.std_string, "x")], conf)
--- a/esphome/components/ble_client/text_sensor/automation.h
+++ b/esphome/components/ble_client/text_sensor/automation.h
@@ -1,38 +0,0 @@
-#pragma once
-
-#include "esphome/core/automation.h"
-#include "esphome/components/ble_client/text_sensor/ble_text_sensor.h"
-
-#ifdef USE_ESP32
-
-namespace esphome {
-namespace ble_client {
-
-class BLETextSensorNotifyTrigger : public Trigger<std::string>, public BLETextSensor {
- public:
-  explicit BLETextSensorNotifyTrigger(BLETextSensor *sensor) { sensor_ = sensor; }
-  void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                           esp_ble_gattc_cb_param_t *param) override {
-    switch (event) {
-      case ESP_GATTC_SEARCH_CMPL_EVT: {
-        this->sensor_->node_state = espbt::ClientState::ESTABLISHED;
-        break;
-      }
-      case ESP_GATTC_NOTIFY_EVT: {
-        if (param->notify.conn_id != this->sensor_->parent()->conn_id || param->notify.handle != this->sensor_->handle)
-          break;
-        this->trigger(this->sensor_->parse_data(param->notify.value, param->notify.value_len));
-      }
-      default:
-        break;
-    }
-  }
-
- protected:
-  BLETextSensor *sensor_;
-};
-
-}  // namespace ble_client
-}  // namespace esphome
-
-#endif
--- a/esphome/components/ble_client/text_sensor/ble_text_sensor.cpp
+++ b/esphome/components/ble_client/text_sensor/ble_text_sensor.cpp
@@ -1,135 +0,0 @@
-#include "ble_text_sensor.h"
-
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
-#include "esphome/core/application.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-#ifdef USE_ESP32
-
-namespace esphome {
-namespace ble_client {
-
-static const char *const TAG = "ble_text_sensor";
-
-static const std::string EMPTY = "";
-
-void BLETextSensor::loop() {}
-
-void BLETextSensor::dump_config() {
-  LOG_TEXT_SENSOR("", "BLE Text Sensor", this);
-  ESP_LOGCONFIG(TAG, "  MAC address        : %s", this->parent()->address_str().c_str());
-  ESP_LOGCONFIG(TAG, "  Service UUID       : %s", this->service_uuid_.to_string().c_str());
-  ESP_LOGCONFIG(TAG, "  Characteristic UUID: %s", this->char_uuid_.to_string().c_str());
-  ESP_LOGCONFIG(TAG, "  Descriptor UUID    : %s", this->descr_uuid_.to_string().c_str());
-  ESP_LOGCONFIG(TAG, "  Notifications      : %s", YESNO(this->notify_));
-  LOG_UPDATE_INTERVAL(this);
-}
-
-void BLETextSensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                                        esp_ble_gattc_cb_param_t *param) {
-  switch (event) {
-    case ESP_GATTC_OPEN_EVT: {
-      if (param->open.status == ESP_GATT_OK) {
-        ESP_LOGI(TAG, "[%s] Connected successfully!", this->get_name().c_str());
-        break;
-      }
-      break;
-    }
-    case ESP_GATTC_DISCONNECT_EVT: {
-      ESP_LOGW(TAG, "[%s] Disconnected!", this->get_name().c_str());
-      this->status_set_warning();
-      this->publish_state(EMPTY);
-      break;
-    }
-    case ESP_GATTC_SEARCH_CMPL_EVT: {
-      this->handle = 0;
-      auto *chr = this->parent()->get_characteristic(this->service_uuid_, this->char_uuid_);
-      if (chr == nullptr) {
-        this->status_set_warning();
-        this->publish_state(EMPTY);
-        ESP_LOGW(TAG, "No sensor characteristic found at service %s char %s", this->service_uuid_.to_string().c_str(),
-                 this->char_uuid_.to_string().c_str());
-        break;
-      }
-      this->handle = chr->handle;
-      if (this->descr_uuid_.get_uuid().len > 0) {
-        auto *descr = chr->get_descriptor(this->descr_uuid_);
-        if (descr == nullptr) {
-          this->status_set_warning();
-          this->publish_state(EMPTY);
-          ESP_LOGW(TAG, "No sensor descriptor found at service %s char %s descr %s",
-                   this->service_uuid_.to_string().c_str(), this->char_uuid_.to_string().c_str(),
-                   this->descr_uuid_.to_string().c_str());
-          break;
-        }
-        this->handle = descr->handle;
-      }
-      if (this->notify_) {
-        auto status =
-            esp_ble_gattc_register_for_notify(this->parent()->gattc_if, this->parent()->remote_bda, chr->handle);
-        if (status) {
-          ESP_LOGW(TAG, "esp_ble_gattc_register_for_notify failed, status=%d", status);
-        }
-      } else {
-        this->node_state = espbt::ClientState::ESTABLISHED;
-      }
-      break;
-    }
-    case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->parent()->conn_id)
-        break;
-      if (param->read.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "Error reading char at handle %d, status=%d", param->read.handle, param->read.status);
-        break;
-      }
-      if (param->read.handle == this->handle) {
-        this->status_clear_warning();
-        this->publish_state(this->parse_data(param->read.value, param->read.value_len));
-      }
-      break;
-    }
-    case ESP_GATTC_NOTIFY_EVT: {
-      if (param->notify.conn_id != this->parent()->conn_id || param->notify.handle != this->handle)
-        break;
-      ESP_LOGV(TAG, "[%s] ESP_GATTC_NOTIFY_EVT: handle=0x%x, value=0x%x", this->get_name().c_str(),
-               param->notify.handle, param->notify.value[0]);
-      this->publish_state(this->parse_data(param->notify.value, param->notify.value_len));
-      break;
-    }
-    case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
-      this->node_state = espbt::ClientState::ESTABLISHED;
-      break;
-    }
-    default:
-      break;
-  }
-}
-
-std::string BLETextSensor::parse_data(uint8_t *value, uint16_t value_len) {
-  std::string text(value, value + value_len);
-  return text;
-}
-
-void BLETextSensor::update() {
-  if (this->node_state != espbt::ClientState::ESTABLISHED) {
-    ESP_LOGW(TAG, "[%s] Cannot poll, not connected", this->get_name().c_str());
-    return;
-  }
-  if (this->handle == 0) {
-    ESP_LOGW(TAG, "[%s] Cannot poll, no service or characteristic found", this->get_name().c_str());
-    return;
-  }
-
-  auto status =
-      esp_ble_gattc_read_char(this->parent()->gattc_if, this->parent()->conn_id, this->handle, ESP_GATT_AUTH_REQ_NONE);
-  if (status) {
-    this->status_set_warning();
-    this->publish_state(EMPTY);
-    ESP_LOGW(TAG, "[%s] Error sending read request for sensor, status=%d", this->get_name().c_str(), status);
-  }
-}
-
-}  // namespace ble_client
-}  // namespace esphome
-#endif
--- a/esphome/components/ble_client/text_sensor/ble_text_sensor.h
+++ b/esphome/components/ble_client/text_sensor/ble_text_sensor.h
@@ -1,46 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/ble_client/ble_client.h"
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
-#include "esphome/components/text_sensor/text_sensor.h"
-
-#ifdef USE_ESP32
-#include <esp_gattc_api.h>
-
-namespace esphome {
-namespace ble_client {
-
-namespace espbt = esphome::esp32_ble_tracker;
-
-class BLETextSensor : public text_sensor::TextSensor, public PollingComponent, public BLEClientNode {
- public:
-  void loop() override;
-  void update() override;
-  void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                           esp_ble_gattc_cb_param_t *param) override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::DATA; }
-  void set_service_uuid16(uint16_t uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_uint16(uuid); }
-  void set_service_uuid32(uint32_t uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_uint32(uuid); }
-  void set_service_uuid128(uint8_t *uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }
-  void set_char_uuid16(uint16_t uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_uint16(uuid); }
-  void set_char_uuid32(uint32_t uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_uint32(uuid); }
-  void set_char_uuid128(uint8_t *uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }
-  void set_descr_uuid16(uint16_t uuid) { this->descr_uuid_ = espbt::ESPBTUUID::from_uint16(uuid); }
-  void set_descr_uuid32(uint32_t uuid) { this->descr_uuid_ = espbt::ESPBTUUID::from_uint32(uuid); }
-  void set_descr_uuid128(uint8_t *uuid) { this->descr_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }
-  void set_enable_notify(bool notify) { this->notify_ = notify; }
-  std::string parse_data(uint8_t *value, uint16_t value_len);
-  uint16_t handle;
-
- protected:
-  bool notify_;
-  espbt::ESPBTUUID service_uuid_;
-  espbt::ESPBTUUID char_uuid_;
-  espbt::ESPBTUUID descr_uuid_;
-};
-
-}  // namespace ble_client
-}  // namespace esphome
-#endif
--- a/esphome/components/ble_rssi/ble_rssi_sensor.h
+++ b/esphome/components/ble_rssi/ble_rssi_sensor.h
@@ -12,78 +12,41 @@ namespace ble_rssi {
 class BLERSSISensor : public sensor::Sensor, public esp32_ble_tracker::ESPBTDeviceListener, public Component {
 public:
  void set_address(uint64_t address) {
-    this->match_by_ = MATCH_BY_MAC_ADDRESS;
+    this->by_address_ = true;
    this->address_ = address;
  }
  void set_service_uuid16(uint16_t uuid) {
-    this->match_by_ = MATCH_BY_SERVICE_UUID;
+    this->by_address_ = false;
    this->uuid_ = esp32_ble_tracker::ESPBTUUID::from_uint16(uuid);
  }
  void set_service_uuid32(uint32_t uuid) {
-    this->match_by_ = MATCH_BY_SERVICE_UUID;
+    this->by_address_ = false;
    this->uuid_ = esp32_ble_tracker::ESPBTUUID::from_uint32(uuid);
  }
  void set_service_uuid128(uint8_t *uuid) {
-    this->match_by_ = MATCH_BY_SERVICE_UUID;
+    this->by_address_ = false;
    this->uuid_ = esp32_ble_tracker::ESPBTUUID::from_raw(uuid);
  }
-  void set_ibeacon_uuid(uint8_t *uuid) {
-    this->match_by_ = MATCH_BY_IBEACON_UUID;
-    this->ibeacon_uuid_ = esp32_ble_tracker::ESPBTUUID::from_raw(uuid);
-  }
-  void set_ibeacon_major(uint16_t major) {
-    this->check_ibeacon_major_ = true;
-    this->ibeacon_major_ = major;
-  }
-  void set_ibeacon_minor(uint16_t minor) {
-    this->check_ibeacon_minor_ = true;
-    this->ibeacon_minor_ = minor;
-  }
  void on_scan_end() override {
    if (!this->found_)
      this->publish_state(NAN);
    this->found_ = false;
  }
  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override {
-    switch (this->match_by_) {
-      case MATCH_BY_MAC_ADDRESS:
-        if (device.address_uint64() == this->address_) {
+    if (this->by_address_) {
+      if (device.address_uint64() == this->address_) {
+        this->publish_state(device.get_rssi());
+        this->found_ = true;
+        return true;
+      }
+    } else {
+      for (auto uuid : device.get_service_uuids()) {
+        if (this->uuid_ == uuid) {
          this->publish_state(device.get_rssi());
          this->found_ = true;
          return true;
        }
-        break;
-      case MATCH_BY_SERVICE_UUID:
-        for (auto uuid : device.get_service_uuids()) {
-          if (this->uuid_ == uuid) {
-            this->publish_state(device.get_rssi());
-            this->found_ = true;
-            return true;
-          }
-        }
-        break;
-      case MATCH_BY_IBEACON_UUID:
-        if (!device.get_ibeacon().has_value()) {
-          return false;
-        }
-
-        auto ibeacon = device.get_ibeacon().value();
-
-        if (this->ibeacon_uuid_ != ibeacon.get_uuid()) {
-          return false;
-        }
-
-        if (this->check_ibeacon_major_ && this->ibeacon_major_ != ibeacon.get_major()) {
-          return false;
-        }
-
-        if (this->check_ibeacon_minor_ && this->ibeacon_minor_ != ibeacon.get_minor()) {
-          return false;
-        }
-
-        this->publish_state(device.get_rssi());
-        this->found_ = true;
-        return true;
+      }
    }
    return false;
  }
@@ -91,20 +54,10 @@ class BLERSSISensor : public sensor::Sensor, public esp32_ble_tracker::ESPBTDevi
  float get_setup_priority() const override { return setup_priority::DATA; }

 protected:
-  enum MatchType { MATCH_BY_MAC_ADDRESS, MATCH_BY_SERVICE_UUID, MATCH_BY_IBEACON_UUID };
-  MatchType match_by_;
-
  bool found_{false};
-
+  bool by_address_{false};
  uint64_t address_;
-
  esp32_ble_tracker::ESPBTUUID uuid_;
-
-  esp32_ble_tracker::ESPBTUUID ibeacon_uuid_;
-  uint16_t ibeacon_major_;
-  bool check_ibeacon_major_;
-  uint16_t ibeacon_minor_;
-  bool check_ibeacon_minor_;
 };

 }  // namespace ble_rssi
--- a/Show More
+++ b/Show More