gitpod changes

Try run inside esphome container image
2025-11-03 16:41:50 +00:00 · 2022-10-19 20:34:23 +00:00 · 2022-10-19 20:15:12 +00:00
563 changed files with 3818 additions and 17915 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
  "name": "ESPHome Dev",
-  "image": "ghcr.io/esphome/esphome-lint:dev",
+  "image": "esphome/esphome-lint:dev",
  "postCreateCommand": [
    "script/devcontainer-post-create"
  ],
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
 # What does this implement/fix?

-<!-- Quick description and explanation of changes -->
+Quick description and explanation of changes

 ## Types of changes

@@ -18,7 +18,6 @@
 - [ ] ESP32
 - [ ] ESP32 IDF
 - [ ] ESP8266
- [ ] RP2040

 ## Example entry for `config.yaml`:
 <!--
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,14 +48,6 @@ jobs:
            file: tests/test5.yaml
            name: Test tests/test5.yaml
            pio_cache_key: test5
-          - id: test
-            file: tests/test6.yaml
-            name: Test tests/test6.yaml
-            pio_cache_key: test6
-          - id: test
-            file: tests/test7.yaml
-            name: Test tests/test7.yaml
-            pio_cache_key: test7
          - id: pytest
            name: Run pytest
          - id: clang-format
@@ -181,7 +173,7 @@ jobs:

      - name: Run yamllint
        if: matrix.id == 'yamllint'
-        uses: frenck/action-yamllint@v1.3.1
+        uses: frenck/action-yamllint@v1.3.0

      - name: Suggested changes
        run: script/ci-suggest-changes
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -18,7 +18,7 @@ jobs:
  lock:
    runs-on: ubuntu-latest
    steps:
-      - uses: dessant/lock-threads@v4
+      - uses: dessant/lock-threads@v3
        with:
          pr-inactive-days: "1"
          pr-lock-reason: ""
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,12 +30,8 @@ jobs:
            TAG=$(cat esphome/const.py | sed -n -E "s/^__version__\s+=\s+\"(.+)\"$/\1/p")
            today="$(date --utc '+%Y%m%d')"
            TAG="${TAG}${today}"
-            BRANCH=${GITHUB_REF#refs/heads/}
-            if [[ "$BRANCH" != "dev" ]]; then
-              TAG="${TAG}-${BRANCH}"
-            fi
          fi
-          echo "tag=${TAG}" >> $GITHUB_OUTPUT
+          echo "::set-output name=tag::${TAG}"
        # yamllint enable rule:line-length

  deploy-pypi:
@@ -61,30 +57,17 @@ jobs:
        run: twine upload dist/*

  deploy-docker:
-    name: Build and publish ESPHome ${{ matrix.image.title}}
+    name: Build and publish docker containers
    if: github.repository == 'esphome/esphome'
    permissions:
      contents: read
      packages: write
    runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.image.title == 'lint' }}
    needs: [init]
    strategy:
-      fail-fast: false
      matrix:
-        image:
-          - title: "ha-addon"
-            suffix: "hassio"
-            target: "hassio"
-            baseimg: "hassio"
-          - title: "docker"
-            suffix: ""
-            target: "docker"
-            baseimg: "docker"
-          - title: "lint"
-            suffix: "lint"
-            target: "lint"
-            baseimg: "docker"
+        arch: [amd64, armv7, aarch64]
+        build_type: ["ha-addon", "docker", "lint"]
    steps:
      - uses: actions/checkout@v3
      - name: Set up Python
@@ -109,47 +92,69 @@ jobs:
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}

-      - name: Generate short tags
-        id: tags
-        run: |
-          docker/generate_tags.py \
-            --tag "${{ needs.init.outputs.tag }}" \
-            --suffix "${{ matrix.image.suffix }}"
-
      - name: Build and push
-        uses: docker/build-push-action@v3
+        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'
+    permissions:
+      contents: read
+      packages: write
+    runs-on: ubuntu-latest
+    needs: [init, deploy-docker]
+    strategy:
+      matrix:
+        build_type: ["ha-addon", "docker", "lint"]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
        with:
-          context: .
-          file: ./docker/Dockerfile
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
-          target: ${{ matrix.image.target }}
-          push: true
-          # yamllint disable rule:line-length
-          cache-from: type=registry,ref=ghcr.io/${{ steps.tags.outputs.image }}:cache-${{ steps.tags.outputs.channel }}
-          cache-to: type=registry,ref=ghcr.io/${{ steps.tags.outputs.image }}:cache-${{ steps.tags.outputs.channel }},mode=max
-          # yamllint enable rule:line-length
-          tags: ${{ steps.tags.outputs.tags }}
-          build-args: |
-            BASEIMGTYPE=${{ matrix.image.baseimg }}
-            BUILD_VERSION=${{ needs.init.outputs.tag }}
+          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:
+          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

  deploy-ha-addon-repo:
    if: github.repository == 'esphome/esphome' && github.event_name == 'release'
    runs-on: ubuntu-latest
    needs: [deploy-docker]
    steps:
-      - name: Trigger Workflow
-        uses: actions/github-script@v6
-        with:
-          github-token: ${{ secrets.DEPLOY_HA_ADDON_REPO_TOKEN }}
-          script: |
-            github.rest.actions.createWorkflowDispatch({
-              owner: "esphome",
-              repo: "home-assistant-addon",
-              workflow_id: "bump-version.yml",
-              ref: "main",
-              inputs: {
-                version: "${{ github.event.release.tag_name }}",
-                content: "${{ toJSON(github.event.release.body) }}"
-              }
-            })
+      - env:
+          TOKEN: ${{ secrets.DEPLOY_HA_ADDON_REPO_TOKEN }}
+        # yamllint disable rule:line-length
+        run: |
+          TAG="${GITHUB_REF#refs/tags/}"
+          curl \
+            -u ":$TOKEN" \
+            -X POST \
+            -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
@@ -18,7 +18,7 @@ jobs:
  stale:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/stale@v7
+      - uses: actions/stale@v5
        with:
          days-before-pr-stale: 90
          days-before-pr-close: 7
@@ -38,7 +38,7 @@ jobs:
  close-issues:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/stale@v7
+      - uses: actions/stale@v5
        with:
          days-before-pr-stale: -1
          days-before-pr-close: -1
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -0,0 +1,9 @@
+---
+image: ghcr.io/esphome/esphome-lint:dev
+ports:
+  - port: 6052
+    onOpen: open-browser
+tasks:
+  # yamllint disable-line rule:line-length
+  - before: script/devcontainer-post-create
+    command: python3 -m esphome dashboard config
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,15 +3,15 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
  - repo: https://github.com/ambv/black
-    rev: 22.12.0
+    rev: 22.6.0
    hooks:
      - id: black
        args:
          - --safe
          - --quiet
        files: ^((esphome|script|tests)/.+)?[^/]+\.py$
-  - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 4.0.1
    hooks:
      - id: flake8
        additional_dependencies:
@@ -27,7 +27,7 @@ repos:
          - --branch=release
          - --branch=beta
  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.0
+    rev: v3.0.0
    hooks:
      - id: pyupgrade
        args: [--py39-plus]
--- a/25
+++ b/25
@@ -41,8 +41,6 @@ esphome/components/ble_client/* @buxtronix
 esphome/components/bluetooth_proxy/* @jesserockz
 esphome/components/bme680_bsec/* @trvrnrth
 esphome/components/bmp3xx/* @martgras
-esphome/components/bp1658cj/* @Cossid
-esphome/components/bp5758d/* @Cossid
 esphome/components/button/* @esphome/core
 esphome/components/canbus/* @danielschramm @mvturnho
 esphome/components/cap1188/* @MrEditor97
@@ -67,11 +65,9 @@ esphome/components/debug/* @OttoWinter
 esphome/components/delonghi/* @grob6000
 esphome/components/dfplayer/* @glmnet
 esphome/components/dht/* @OttoWinter
-esphome/components/display_menu_base/* @numo68
 esphome/components/dps310/* @kbx81
 esphome/components/ds1307/* @badbadc0ffee
 esphome/components/dsmr/* @glmnet @zuidwijk
-esphome/components/ee895/* @Stock-M
 esphome/components/ektf2232/* @jesserockz
 esphome/components/ens210/* @itn3rd77
 esphome/components/esp32/* @esphome/core
@@ -103,11 +99,9 @@ esphome/components/hitachi_ac424/* @sourabhjaiswal
 esphome/components/homeassistant/* @OttoWinter
 esphome/components/honeywellabp/* @RubyBailey
 esphome/components/hrxl_maxsonar_wr/* @netmikey
-esphome/components/hte501/* @Stock-M
 esphome/components/hydreon_rgxx/* @functionpointer
 esphome/components/i2c/* @esphome/core
 esphome/components/i2s_audio/* @jesserockz
-esphome/components/improv_base/* @esphome/core
 esphome/components/improv_serial/* @esphome/core
 esphome/components/ina260/* @MrEditor97
 esphome/components/inkbird_ibsth1_mini/* @fkirill
@@ -116,17 +110,12 @@ esphome/components/integration/* @OttoWinter
 esphome/components/interval/* @esphome/core
 esphome/components/json/* @OttoWinter
 esphome/components/kalman_combinator/* @Cat-Ion
-esphome/components/key_collector/* @ssieb
-esphome/components/key_provider/* @ssieb
-esphome/components/lcd_menu/* @numo68
-esphome/components/ld2410/* @sebcaps
 esphome/components/ledc/* @OttoWinter
 esphome/components/light/* @esphome/core
 esphome/components/lilygo_t5_47/touchscreen/* @jesserockz
 esphome/components/lock/* @esphome/core
 esphome/components/logger/* @esphome/core
 esphome/components/ltr390/* @sjtrny
-esphome/components/matrix_keypad/* @ssieb
 esphome/components/max31865/* @DAVe3283
 esphome/components/max44009/* @berfenger
 esphome/components/max7219digit/* @rspaargaren
@@ -147,7 +136,6 @@ esphome/components/mcp9808/* @k7hpn
 esphome/components/md5/* @esphome/core
 esphome/components/mdns/* @esphome/core
 esphome/components/media_player/* @jesserockz
-esphome/components/mics_4514/* @jesserockz
 esphome/components/midea/* @dudanov
 esphome/components/midea_ir/* @dudanov
 esphome/components/mitsubishi/* @RubyBailey
@@ -174,8 +162,6 @@ esphome/components/nfc/* @jesserockz
 esphome/components/number/* @esphome/core
 esphome/components/ota/* @esphome/core
 esphome/components/output/* @esphome/core
-esphome/components/pca9554/* @hwstar
-esphome/components/pcf85063/* @brogon
 esphome/components/pid/* @OttoWinter
 esphome/components/pipsolar/* @andreashergert1984
 esphome/components/pm1006/* @habbie
@@ -198,8 +184,6 @@ esphome/components/rc522_spi/* @glmnet
 esphome/components/restart/* @esphome/core
 esphome/components/rf_bridge/* @jesserockz
 esphome/components/rgbct/* @jesserockz
-esphome/components/rp2040/* @jesserockz
-esphome/components/rp2040_pwm/* @jesserockz
 esphome/components/rtttl/* @glmnet
 esphome/components/safe_mode/* @jsuanet @paulmonigatti
 esphome/components/scd4x/* @martgras @sjtrny
@@ -216,15 +200,10 @@ esphome/components/sgp4x/* @SenexCrenshaw @martgras
 esphome/components/shelly_dimmer/* @edge90 @rnauber
 esphome/components/sht4x/* @sjtrny
 esphome/components/shutdown/* @esphome/core @jsuanet
-esphome/components/sigma_delta_output/* @Cat-Ion
 esphome/components/sim800l/* @glmnet
-esphome/components/sm10bit_base/* @Cossid
 esphome/components/sm2135/* @BoukeHaarsma23
-esphome/components/sm2235/* @Cossid
-esphome/components/sm2335/* @Cossid
 esphome/components/sml/* @alengwenus
 esphome/components/smt100/* @piechade
-esphome/components/sn74hc165/* @jesserockz
 esphome/components/socket/* @esphome/core
 esphome/components/sonoff_d1/* @anatoly-savchenkov
 esphome/components/spi/* @esphome/core
@@ -250,7 +229,6 @@ esphome/components/switch/* @esphome/core
 esphome/components/t6615/* @tylermenezes
 esphome/components/tca9548a/* @andreashergert1984
 esphome/components/tcl112/* @glmnet
-esphome/components/tee501/* @Stock-M
 esphome/components/teleinfo/* @0hax
 esphome/components/thermostat/* @kbx81
 esphome/components/time/* @OttoWinter
@@ -275,15 +253,12 @@ esphome/components/uart/* @esphome/core
 esphome/components/ufire_ec/* @pvizeli
 esphome/components/ufire_ise/* @pvizeli
 esphome/components/ultrasonic/* @OttoWinter
-esphome/components/vbus/* @ssieb
 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/wiegand/* @ssieb
 esphome/components/wl_134/* @hobbypunk90
-esphome/components/x9c/* @EtienneMD
 esphome/components/xiaomi_lywsd03mmc/* @ahpohl
 esphome/components/xiaomi_mhoc303/* @drug123
 esphome/components/xiaomi_mhoc401/* @vevsvevs
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -6,14 +6,17 @@
 ARG BASEIMGTYPE=docker

 # https://github.com/hassio-addons/addon-debian-base/releases
-FROM ghcr.io/hassio-addons/debian-base:6.2.0 AS base-hassio
+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
 # https://hub.docker.com/_/debian?tab=tags&page=1&name=bullseye
-FROM debian:bullseye-20221024-slim AS base-docker
+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 base-${BASEIMGTYPE} AS base
-
-ARG TARGETARCH
-ARG TARGETVARIANT
+# Use TARGETARCH/TARGETVARIANT defined by docker
+# https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
+FROM base-${BASEIMGTYPE}-${TARGETARCH}${TARGETVARIANT} AS base

 RUN \
    apt-get update \
@@ -26,8 +29,8 @@ RUN \
        python3-cryptography=3.3.2-1 \
        iputils-ping=3:20210202-1 \
        git=1:2.30.2-1 \
-        curl=7.74.0-1.3+deb11u3 \
-        openssh-client=1:8.4p1-5+deb11u1 \
+        curl=7.74.0-1.3+deb11u1 \
+        openssh-client=1:8.4p1-5 \
    && rm -rf \
        /tmp/* \
        /var/{cache,log}/* \
@@ -39,19 +42,11 @@ ENV \
  # Store globally installed pio libs in /piolibs
  PLATFORMIO_GLOBALLIB_DIR=/piolibs

-# Support legacy binaries on Debian multiarch system. There is no "correct" way
-# to do this, other than using properly built toolchains...
-# See: https://unix.stackexchange.com/questions/553743/correct-way-to-add-lib-ld-linux-so-3-in-debian
-RUN \
-    if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
-        ln -s /lib/arm-linux-gnueabihf/ld-linux.so.3 /lib/ld-linux.so.3; \
-    fi
-
 RUN \
    # Ubuntu python3-pip is missing wheel
    pip3 install --no-cache-dir \
        wheel==0.37.1 \
-        platformio==6.1.5 \
+        platformio==6.0.2 \
    # Change some platformio settings
    && platformio settings set enable_telemetry No \
    && platformio settings set check_platformio_interval 1000000 \
@@ -99,7 +94,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+deb11u3 \
+        nginx-light=1.18.0-6.1+deb11u2 \
    && rm -rf \
        /tmp/* \
        /var/{cache,log}/* \
@@ -139,7 +134,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+deb11u2 \
+        nano=5.4-2+deb11u1 \
        build-essential=12.9 \
        python3-dev=3.9.2-3 \
    && rm -rf \
--- a/docker/build.py
+++ b/docker/build.py
@@ -8,49 +8,32 @@ import re
 import sys


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

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

-TYPE_DOCKER = "docker"
-TYPE_HA_ADDON = "ha-addon"
-TYPE_LINT = "lint"
+TYPE_DOCKER = 'docker'
+TYPE_HA_ADDON = 'ha-addon'
+TYPE_LINT = 'lint'
 TYPES = [TYPE_DOCKER, TYPE_HA_ADDON, TYPE_LINT]


 parser = argparse.ArgumentParser()
-parser.add_argument(
-    "--tag",
-    type=str,
-    required=True,
-    help="The main docker tag to push to. If a version number also adds latest and/or beta tag",
-)
-parser.add_argument(
-    "--arch", choices=ARCHS, required=False, help="The architecture to build for"
-)
-parser.add_argument(
-    "--build-type", choices=TYPES, required=True, help="The type of build to run"
-)
-parser.add_argument(
-    "--dry-run", action="store_true", help="Don't run any commands, just print them"
-)
-subparsers = parser.add_subparsers(
-    help="Action to perform", dest="command", required=True
-)
+parser.add_argument("--tag", type=str, required=True, help="The main docker tag to push to. If a version number also adds latest and/or beta tag")
+parser.add_argument("--arch", choices=ARCHS, required=False, help="The architecture to build for")
+parser.add_argument("--build-type", choices=TYPES, required=True, help="The type of build to run")
+parser.add_argument("--dry-run", action="store_true", help="Don't run any commands, just print them")
+subparsers = parser.add_subparsers(help="Action to perform", dest="command", required=True)
 build_parser = subparsers.add_parser("build", help="Build the image")
 build_parser.add_argument("--push", help="Also push the images", action="store_true")
-build_parser.add_argument(
-    "--load", help="Load the docker image locally", action="store_true"
-)
-manifest_parser = subparsers.add_parser(
-    "manifest", help="Create a manifest from already pushed images"
-)
+build_parser.add_argument("--load", help="Load the docker image locally", action="store_true")
+manifest_parser = subparsers.add_parser("manifest", help="Create a manifest from already pushed images")


@dataclass(frozen=True)
@@ -66,7 +49,7 @@ class DockerParams:
        prefix = {
            TYPE_DOCKER: "esphome/esphome",
            TYPE_HA_ADDON: "esphome/esphome-hassio",
-            TYPE_LINT: "esphome/esphome-lint",
+            TYPE_LINT: "esphome/esphome-lint"
        }[build_type]
        build_to = f"{prefix}-{arch}"
        baseimgtype = {
@@ -145,21 +128,13 @@ def main():

        # 3. build
        cmd = [
-            "docker",
-            "buildx",
-            "build",
-            "--build-arg",
-            f"BASEIMGTYPE={params.baseimgtype}",
-            "--build-arg",
-            f"BUILD_VERSION={args.tag}",
-            "--cache-from",
-            f"type=registry,ref={cache_img}",
-            "--file",
-            "docker/Dockerfile",
-            "--platform",
-            params.platform,
-            "--target",
-            params.target,
+            "docker", "buildx", "build",
+            "--build-arg", f"BASEIMGTYPE={params.baseimgtype}",
+            "--build-arg", f"BUILD_VERSION={args.tag}",
+            "--cache-from", f"type=registry,ref={cache_img}",
+            "--file", "docker/Dockerfile",
+            "--platform", params.platform,
+            "--target", params.target,
        ]
        for img in imgs:
            cmd += ["--tag", img]
@@ -185,7 +160,9 @@ def main():
            run_command(*cmd)
        # 2. Push manifests
        for target in targets:
-            run_command("docker", "manifest", "push", target)
+            run_command(
+                "docker", "manifest", "push", target
+            )


 if __name__ == "__main__":
--- a/docker/generate_tags.py
+++ b/docker/generate_tags.py
@@ -1,68 +0,0 @@
-#!/usr/bin/env python3
-import re
-import os
-import argparse
-import json
-
-CHANNEL_DEV = "dev"
-CHANNEL_BETA = "beta"
-CHANNEL_RELEASE = "release"
-
-parser = argparse.ArgumentParser()
-parser.add_argument(
-    "--tag",
-    type=str,
-    required=True,
-    help="The main docker tag to push to. If a version number also adds latest and/or beta tag",
-)
-parser.add_argument(
-    "--suffix",
-    type=str,
-    required=True,
-    help="The suffix of the tag.",
-)
-
-
-def main():
-    args = parser.parse_args()
-
-    # detect channel from tag
-    match = re.match(r"^(\d+\.\d+)(?:\.\d+)?(b\d+)?$", args.tag)
-    major_minor_version = None
-    if match is None:
-        channel = CHANNEL_DEV
-    elif match.group(2) is None:
-        major_minor_version = match.group(1)
-        channel = CHANNEL_RELEASE
-    else:
-        channel = CHANNEL_BETA
-
-    tags_to_push = [args.tag]
-    if channel == CHANNEL_DEV:
-        tags_to_push.append("dev")
-    elif channel == CHANNEL_BETA:
-        tags_to_push.append("beta")
-    elif channel == CHANNEL_RELEASE:
-        # Additionally push to beta
-        tags_to_push.append("beta")
-        tags_to_push.append("latest")
-
-        if major_minor_version:
-            tags_to_push.append("stable")
-            tags_to_push.append(major_minor_version)
-
-    suffix = f"-{args.suffix}" if args.suffix else ""
-
-    with open(os.environ["GITHUB_OUTPUT"], "w") as f:
-        print(f"channel={channel}", file=f)
-        print(f"image=esphome/esphome{suffix}", file=f)
-        full_tags = []
-
-        for tag in tags_to_push:
-            full_tags += [f"ghcr.io/esphome/esphome{suffix}:{tag}"]
-            full_tags += [f"esphome/esphome{suffix}:{tag}"]
-        print(f"tags={','.join(full_tags)}", file=f)
-
-
-if __name__ == "__main__":
-    main()
--- a/docker/ha-addon-rootfs/etc/cont-init.d/10-requirements.sh
+++ b/docker/ha-addon-rootfs/etc/cont-init.d/10-requirements.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# Community Hass.io Add-ons: ESPHome
+# This files check if all user configuration requirements are met
+# ==============================================================================
+
+# 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::exit.nok
+    fi
+
+    if ! bashio::config.has_value 'keyfile'; then
+        bashio::log.fatal 'SSL is enabled, but no keyfile was specified'
+        bashio::exit.nok
+    fi
+
+
+    certfile="/ssl/$(bashio::config 'certfile')"
+    keyfile="/ssl/$(bashio::config 'keyfile')"
+
+    if ! bashio::fs.file_exists "${certfile}"; then
+        if ! bashio::fs.file_exists "${keyfile}"; then
+            # Both files are missing, let's print a friendlier error message
+            bashio::log.fatal 'You enabled encrypted connections using the "ssl": true option.'
+            bashio::log.fatal "However, the SSL files '${certfile}' and '${keyfile}'"
+            bashio::log.fatal "were not found. If you're using Hass.io on your local network and don't want"
+            bashio::log.fatal 'to encrypt connections to the ESPHome dashboard, you can manually disable'
+            bashio::log.fatal 'SSL by setting "ssl" to false."'
+            bashio::exit.nok
+        fi
+        bashio::log.fatal "The configured certfile '${certfile}' was not found."
+        bashio::exit.nok
+    fi
+
+    if ! bashio::fs.file_exists "/ssl/$(bashio::config 'keyfile')"; then
+        bashio::log.fatal "The configured keyfile '${keyfile}' was not found."
+        bashio::exit.nok
+    fi
+fi
--- a/docker/ha-addon-rootfs/etc/cont-init.d/20-nginx.sh
+++ b/docker/ha-addon-rootfs/etc/cont-init.d/20-nginx.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# Community Hass.io Add-ons: ESPHome
+# Configures NGINX for use with ESPHome
+# ==============================================================================
+
+declare certfile
+declare keyfile
+declare direct_port
+declare ingress_interface
+declare ingress_port
+
+mkdir -p /var/log/nginx
+
+direct_port=$(bashio::addon.port 6052)
+if bashio::var.has_value "${direct_port}"; then
+    if bashio::config.true 'ssl'; then
+        certfile=$(bashio::config 'certfile')
+        keyfile=$(bashio::config 'keyfile')
+
+        mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf
+        sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/servers/direct.conf
+        sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/servers/direct.conf
+    else
+        mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf
+    fi
+
+    sed -i "s/%%port%%/${direct_port}/g" /etc/nginx/servers/direct.conf
+fi
+
+ingress_port=$(bashio::addon.ingress_port)
+ingress_interface=$(bashio::addon.ip_address)
+sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf
+sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf
--- a/docker/ha-addon-rootfs/etc/cont-init.d/30-dirs.sh
+++ b/docker/ha-addon-rootfs/etc/cont-init.d/30-dirs.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# Community Hass.io Add-ons: ESPHome
+# This files creates all directories used by esphome
+# ==============================================================================
+
+pio_cache_base=/data/cache/platformio
+
+mkdir -p "${pio_cache_base}"
--- a/docker/ha-addon-rootfs/etc/nginx/includes/proxy_params.conf
+++ b/docker/ha-addon-rootfs/etc/nginx/includes/proxy_params.conf
@@ -1,9 +1,9 @@
-proxy_http_version          1.1;
-proxy_ignore_client_abort   off;
-proxy_read_timeout          86400s;
-proxy_redirect              off;
-proxy_send_timeout          86400s;
-proxy_max_temp_file_size    0;
+proxy_http_version 1.1;
+proxy_ignore_client_abort off;
+proxy_read_timeout 86400s;
+proxy_redirect off;
+proxy_send_timeout 86400s;
+proxy_max_temp_file_size 0;

 proxy_set_header Accept-Encoding "";
 proxy_set_header Connection $connection_upgrade;
--- a/docker/ha-addon-rootfs/etc/nginx/includes/server_params.conf
+++ b/docker/ha-addon-rootfs/etc/nginx/includes/server_params.conf
@@ -1,7 +1,5 @@
-root            /dev/null;
-server_name     $hostname;
-
-client_max_body_size 512m;
+root /dev/null;
+server_name $hostname;

 add_header X-Content-Type-Options nosniff;
 add_header X-XSS-Protection "1; mode=block";
--- a/docker/ha-addon-rootfs/etc/nginx/includes/ssl_params.conf
+++ b/docker/ha-addon-rootfs/etc/nginx/includes/ssl_params.conf
@@ -1,6 +1,7 @@
-ssl_protocols TLSv1.2 TLSv1.3;
-ssl_prefer_server_ciphers off;
-ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
+ssl_protocols TLSv1.2;
+ssl_prefer_server_ciphers on;
+ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA;
+ssl_ecdh_curve secp384r1;
 ssl_session_timeout  10m;
 ssl_session_cache shared:SSL:10m;
 ssl_session_tickets off;
--- a/docker/ha-addon-rootfs/etc/nginx/includes/upstream.conf
+++ b/docker/ha-addon-rootfs/etc/nginx/includes/upstream.conf
@@ -1,3 +0,0 @@
-upstream esphome {
-    server unix:/var/run/esphome.sock;
-}
--- a/docker/ha-addon-rootfs/etc/nginx/nginx.conf
+++ b/docker/ha-addon-rootfs/etc/nginx/nginx.conf
@@ -2,6 +2,7 @@ daemon off;
 user root;
 pid /var/run/nginx.pid;
 worker_processes 1;
+# Hass.io addon log
 error_log /proc/1/fd/1 error;
 events {
    worker_connections 1024;
@@ -9,22 +10,24 @@ events {

 http {
    include /etc/nginx/includes/mime.types;
-
-    access_log              off;
-    default_type            application/octet-stream;
-    gzip                    on;
-    keepalive_timeout       65;
-    sendfile                on;
-    server_tokens           off;
-
-    tcp_nodelay             on;
-    tcp_nopush              on;
+    access_log stdout;
+    default_type application/octet-stream;
+    gzip on;
+    keepalive_timeout 65;
+    sendfile on;
+    server_tokens off;

    map $http_upgrade $connection_upgrade {
        default upgrade;
        ''      close;
    }

-    include /etc/nginx/includes/upstream.conf;
+    # Use Hass.io supervisor as resolver
+    resolver 172.30.32.2;
+
+    upstream esphome {
+        server unix:/var/run/esphome.sock;
+    }
+
    include /etc/nginx/servers/*.conf;
 }
--- a/docker/ha-addon-rootfs/etc/nginx/servers/.gitkeep
+++ b/docker/ha-addon-rootfs/etc/nginx/servers/.gitkeep
@@ -1 +0,0 @@
-Without requirements or design, programming is the art of adding bugs to an empty text file. (Louis Srygley)
--- a/docker/ha-addon-rootfs/etc/nginx/servers/direct-ssl.disabled
+++ b/docker/ha-addon-rootfs/etc/nginx/servers/direct-ssl.disabled
@@ -1,26 +1,20 @@
 server {
-    {{ if not .ssl }}
-    listen 6052 default_server;
-    {{ else }}
-    listen 6052 default_server ssl http2;
-    {{ end }}
+    listen %%port%% default_server ssl http2;

    include /etc/nginx/includes/server_params.conf;
    include /etc/nginx/includes/proxy_params.conf;
-
-    {{ if .ssl }}
    include /etc/nginx/includes/ssl_params.conf;

-    ssl_certificate /ssl/{{ .certfile }};
-    ssl_certificate_key /ssl/{{ .keyfile }};
+    ssl on;
+    ssl_certificate /ssl/%%certfile%%;
+    ssl_certificate_key /ssl/%%keyfile%%;
+
+    # Clear Hass.io Ingress header
+    proxy_set_header X-HA-Ingress "";

    # Redirect http requests to https on the same port.
    # https://rageagainstshell.com/2016/11/redirect-http-to-https-on-the-same-port-in-nginx/
    error_page 497 https://$http_host$request_uri;
-    {{ end }}
-
-    # Clear Home Assistant Ingress header
-    proxy_set_header X-HA-Ingress "";

    location / {
        proxy_pass http://esphome;
--- a/docker/ha-addon-rootfs/etc/nginx/servers/direct.disabled
+++ b/docker/ha-addon-rootfs/etc/nginx/servers/direct.disabled
@@ -0,0 +1,12 @@
+server {
+    listen %%port%% default_server;
+
+    include /etc/nginx/includes/server_params.conf;
+    include /etc/nginx/includes/proxy_params.conf;
+    # Clear Hass.io Ingress header
+    proxy_set_header X-HA-Ingress "";
+
+    location / {
+        proxy_pass http://esphome;
+    }
+}
--- a/docker/ha-addon-rootfs/etc/nginx/templates/ingress.gtpl
+++ b/docker/ha-addon-rootfs/etc/nginx/templates/ingress.gtpl
@@ -1,16 +1,14 @@
 server {
-    listen 127.0.0.1:{{ .port }} default_server;
-    listen {{ .interface }}:{{ .port }} default_server;
+    listen %%interface%%:%%port%% default_server;

    include /etc/nginx/includes/server_params.conf;
    include /etc/nginx/includes/proxy_params.conf;
-
    # Set Home Assistant Ingress header
    proxy_set_header X-HA-Ingress "YES";

    location / {
+        # Only allow from Hass.io supervisor
        allow   172.30.32.2;
-        allow   127.0.0.1;
        deny    all;

        proxy_pass http://esphome;
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/dependencies.d/esphome
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/dependencies.d/esphome
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/dependencies.d/nginx
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/dependencies.d/nginx
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/run
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/run
@@ -1,32 +0,0 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
-# ==============================================================================
-# Home Assistant Add-on: ESPHome
-# Sends discovery information to Home Assistant.
-# ==============================================================================
-declare config
-declare port
-
-# We only disable it when disabled explicitly
-if bashio::config.false 'home_assistant_dashboard_integration';
-then
-    bashio::log.info "Home Assistant discovery is disabled for this add-on."
-    bashio::exit.ok
-fi
-
-port=$(bashio::addon.ingress_port)
-
-# Wait for NGINX to become available
-bashio::net.wait_for "${port}" "127.0.0.1" 300
-
-config=$(\
-    bashio::var.json \
-        host "127.0.0.1" \
-        port "^${port}" \
-)
-
-if bashio::discovery "esphome" "${config}" > /dev/null; then
-    bashio::log.info "Successfully send discovery information to Home Assistant."
-else
-    bashio::log.error "Discovery message to Home Assistant failed!"
-fi
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/type
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/type
@@ -1 +0,0 @@
-oneshot
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/up
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/up
@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/discovery/run
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/dependencies.d/base
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/dependencies.d/base
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/finish
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/finish
@@ -1,26 +0,0 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
-# ==============================================================================
-# Home Assistant Community Add-on: ESPHome
-# Take down the S6 supervision tree when ESPHome dashboard fails
-# ==============================================================================
-declare exit_code
-readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
-readonly exit_code_service="${1}"
-readonly exit_code_signal="${2}"
-
-bashio::log.info \
-  "Service ESPHome dashboard exited with code ${exit_code_service}" \
-  "(by signal ${exit_code_signal})"
-
-if [[ "${exit_code_service}" -eq 256 ]]; then
-  if [[ "${exit_code_container}" -eq 0 ]]; then
-    echo $((128 + $exit_code_signal)) > /run/s6-linux-init-container-results/exitcode
-  fi
-  [[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt
-elif [[ "${exit_code_service}" -ne 0 ]]; then
-  if [[ "${exit_code_container}" -eq 0 ]]; then
-    echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode
-  fi
-  exec /run/s6/basedir/bin/halt
-fi
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/type
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/type
@@ -1 +0,0 @@
-longrun
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/dependencies.d/base
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/dependencies.d/base
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run
@@ -1,27 +0,0 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# Configures NGINX for use with ESPHome
-# ==============================================================================
-mkdir -p /var/log/nginx
-
-# Generate Ingress configuration
-bashio::var.json \
-    interface "$(bashio::addon.ip_address)" \
-    port "^$(bashio::addon.ingress_port)" \
-    | tempio \
-        -template /etc/nginx/templates/ingress.gtpl \
-        -out /etc/nginx/servers/ingress.conf
-
-# Generate direct access configuration, if enabled.
-if bashio::var.has_value "$(bashio::addon.port 6052)"; then
-    bashio::config.require.ssl
-    bashio::var.json \
-        certfile "$(bashio::config 'certfile')" \
-        keyfile "$(bashio::config 'keyfile')" \
-        ssl "^$(bashio::config 'ssl')" \
-        | tempio \
-            -template /etc/nginx/templates/direct.gtpl \
-            -out /etc/nginx/servers/direct.conf
-fi
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type
@@ -1 +0,0 @@
-oneshot
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up
@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-nginx/run
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/esphome
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/esphome
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/init-nginx
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/init-nginx
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/finish
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/finish
@@ -1,25 +0,0 @@
-#!/command/with-contenv bashio
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# Take down the S6 supervision tree when NGINX fails
-# ==============================================================================
-declare exit_code
-readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
-readonly exit_code_service="${1}"
-readonly exit_code_signal="${2}"
-
-bashio::log.info \
-  "Service NGINX exited with code ${exit_code_service}" \
-  "(by signal ${exit_code_signal})"
-
-if [[ "${exit_code_service}" -eq 256 ]]; then
-  if [[ "${exit_code_container}" -eq 0 ]]; then
-    echo $((128 + $exit_code_signal)) > /run/s6-linux-init-container-results/exitcode
-  fi
-  [[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt
-elif [[ "${exit_code_service}" -ne 0 ]]; then
-  if [[ "${exit_code_container}" -eq 0 ]]; then
-    echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode
-  fi
-  exec /run/s6/basedir/bin/halt
-fi
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/type
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/type
@@ -1 +0,0 @@
-longrun
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/discovery
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/discovery
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/esphome
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/esphome
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-nginx
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-nginx
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/nginx
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/nginx
--- a/docker/ha-addon-rootfs/etc/services.d/esphome/finish
+++ b/docker/ha-addon-rootfs/etc/services.d/esphome/finish
@@ -0,0 +1,9 @@
+#!/usr/bin/execlineb -S0
+# ==============================================================================
+# Community Hass.io Add-ons: ESPHome
+# Take down the S6 supervision tree when ESPHome fails
+# ==============================================================================
+if -n { s6-test $# -ne 0 }
+if -n { s6-test ${1} -eq 256 }
+
+s6-svscanctl -t /var/run/s6/services
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/run
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/run
@@ -1,19 +1,10 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
+#!/usr/bin/with-contenv bashio
 # ==============================================================================
 # Community Hass.io Add-ons: ESPHome
 # Runs the ESPHome dashboard
 # ==============================================================================
-readonly pio_cache_base=/data/cache/platformio

 export ESPHOME_IS_HA_ADDON=true
-export PLATFORMIO_GLOBALLIB_DIR=/piolibs
-
-# we can't set core_dir, because the settings file is stored in `core_dir/appstate.json`
-# setting `core_dir` would therefore prevent pio from accessing
-export PLATFORMIO_PLATFORMS_DIR="${pio_cache_base}/platforms"
-export PLATFORMIO_PACKAGES_DIR="${pio_cache_base}/packages"
-export PLATFORMIO_CACHE_DIR="${pio_cache_base}/cache"

 if bashio::config.true 'leave_front_door_open'; then
    export DISABLE_HA_AUTHENTICATION=true
@@ -31,15 +22,14 @@ if bashio::config.has_value 'relative_url'; then
    export ESPHOME_DASHBOARD_RELATIVE_URL=$(bashio::config 'relative_url')
 fi

-if bashio::config.has_value 'default_compile_process_limit'; then
-    export ESPHOME_DEFAULT_COMPILE_PROCESS_LIMIT=$(bashio::config 'default_compile_process_limit')
-else
-    if grep -q 'Raspberry Pi 3' /proc/cpuinfo; then
-        export ESPHOME_DEFAULT_COMPILE_PROCESS_LIMIT=1;
-    fi
-fi
+pio_cache_base=/data/cache/platformio
+# we can't set core_dir, because the settings file is stored in `core_dir/appstate.json`
+# setting `core_dir` would therefore prevent pio from accessing
+export PLATFORMIO_PLATFORMS_DIR="${pio_cache_base}/platforms"
+export PLATFORMIO_PACKAGES_DIR="${pio_cache_base}/packages"
+export PLATFORMIO_CACHE_DIR="${pio_cache_base}/cache"

-mkdir -p "${pio_cache_base}"
+export PLATFORMIO_GLOBALLIB_DIR=/piolibs

 bashio::log.info "Starting ESPHome dashboard..."
 exec esphome dashboard /config/esphome --socket /var/run/esphome.sock --ha-addon
--- a/docker/ha-addon-rootfs/etc/services.d/nginx/finish
+++ b/docker/ha-addon-rootfs/etc/services.d/nginx/finish
@@ -0,0 +1,9 @@
+#!/usr/bin/execlineb -S0
+# ==============================================================================
+# Community Hass.io Add-ons: ESPHome
+# Take down the S6 supervision tree when NGINX fails
+# ==============================================================================
+if -n { s6-test $# -ne 0 }
+if -n { s6-test ${1} -eq 256 }
+
+s6-svscanctl -t /var/run/s6/services
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/run
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/run
@@ -1,11 +1,10 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
+#!/usr/bin/with-contenv bashio
 # ==============================================================================
 # Community Hass.io Add-ons: ESPHome
 # Runs the NGINX proxy
 # ==============================================================================

-bashio::log.info "Waiting for ESPHome dashboard to come up..."
+bashio::log.info "Waiting for dashboard to come up..."

 while [[ ! -S /var/run/esphome.sock ]]; do
  sleep 0.5
--- a/esphome/main.py
+++ b/esphome/main.py
@@ -4,7 +4,6 @@ import logging
 import os
 import re
 import sys
-import time
 from datetime import datetime

 from esphome import const, writer, yaml_util
@@ -23,9 +22,6 @@ from esphome.const import (
    CONF_ESPHOME,
    CONF_PLATFORMIO_OPTIONS,
    CONF_SUBSTITUTIONS,
-    PLATFORM_ESP32,
-    PLATFORM_ESP8266,
-    PLATFORM_RP2040,
    SECRETS_FILES,
 )
 from esphome.core import CORE, EsphomeError, coroutine
@@ -105,11 +101,11 @@ def run_miniterm(config, port):

    if CONF_LOGGER not in config:
        _LOGGER.info("Logger is not enabled. Not starting UART logs.")
-        return 1
+        return
    baud_rate = config["logger"][CONF_BAUD_RATE]
    if baud_rate == 0:
        _LOGGER.info("UART logging is disabled (baud_rate=0). Not starting UART logs.")
-        return 1
+        return
    _LOGGER.info("Starting log output from %s with baud rate %s", port, baud_rate)

    backtrace_state = False
@@ -123,34 +119,25 @@ def run_miniterm(config, port):
        ser.dtr = False
        ser.rts = False

-    tries = 0
-    while tries < 5:
-        try:
-            with ser:
-                while True:
-                    try:
-                        raw = ser.readline()
-                    except serial.SerialException:
-                        _LOGGER.error("Serial port closed!")
-                        return 0
-                    line = (
-                        raw.replace(b"\r", b"")
-                        .replace(b"\n", b"")
-                        .decode("utf8", "backslashreplace")
-                    )
-                    time_str = datetime.now().time().strftime("[%H:%M:%S]")
-                    message = time_str + line
-                    safe_print(message)
+    with ser:
+        while True:
+            try:
+                raw = ser.readline()
+            except serial.SerialException:
+                _LOGGER.error("Serial port closed!")
+                return
+            line = (
+                raw.replace(b"\r", b"")
+                .replace(b"\n", b"")
+                .decode("utf8", "backslashreplace")
+            )
+            time = datetime.now().time().strftime("[%H:%M:%S]")
+            message = time + line
+            safe_print(message)

-                    backtrace_state = platformio_api.process_stacktrace(
-                        config, line, backtrace_state=backtrace_state
-                    )
-        except serial.SerialException:
-            tries += 1
-            time.sleep(1)
-    if tries >= 5:
-        _LOGGER.error("Could not connect to serial port %s", port)
-        return 1
+            backtrace_state = platformio_api.process_stacktrace(
+                config, line, backtrace_state=backtrace_state
+            )


 def wrap_to_code(name, comp):
@@ -254,7 +241,8 @@ def upload_using_esptool(config, port):
        if os.environ.get("ESPHOME_USE_SUBPROCESS") is None:
            import esptool

-            return run_external_command(esptool.main, *cmd)  # pylint: disable=no-member
+            # pylint: disable=protected-access
+            return run_external_command(esptool._main, *cmd)

        return run_external_process(*cmd)

@@ -270,21 +258,9 @@ def upload_using_esptool(config, port):


 def upload_program(config, args, host):
+    # if upload is to a serial port use platformio, otherwise assume ota
    if get_port_type(host) == "SERIAL":
-        if CORE.target_platform in (PLATFORM_ESP32, PLATFORM_ESP8266):
-            return upload_using_esptool(config, host)
-
-        if CORE.target_platform in (PLATFORM_RP2040):
-            from esphome import platformio_api
-
-            upload_args = ["-t", "upload"]
-            if args.device is not None:
-                upload_args += ["--upload-port", args.device]
-            return platformio_api.run_platformio_cli_run(
-                config, CORE.verbose, *upload_args
-            )
-
-        return 1  # Unknown target platform
+        return upload_using_esptool(config, host)

    from esphome import espota2

@@ -297,8 +273,6 @@ def upload_program(config, args, host):
    ota_conf = config[CONF_OTA]
    remote_port = ota_conf[CONF_PORT]
    password = ota_conf.get(CONF_PASSWORD, "")
-    if getattr(args, "file", None) is not None:
-        return espota2.run_ota(host, remote_port, password, args.file)
    return espota2.run_ota(host, remote_port, password, CORE.firmware_bin)


@@ -306,7 +280,8 @@ def show_logs(config, args, port):
    if "logger" not in config:
        raise EsphomeError("Logger is not configured!")
    if get_port_type(port) == "SERIAL":
-        return run_miniterm(config, port)
+        run_miniterm(config, port)
+        return 0
    if get_port_type(port) == "NETWORK" and "api" in config:
        from esphome.components.api.client import run_logs

@@ -339,7 +314,7 @@ def command_config(args, config):
    _LOGGER.info("Configuration is valid!")
    if not CORE.verbose:
        config = strip_default_ids(config)
-    safe_print(yaml_util.dump(config, args.show_secrets))
+    safe_print(yaml_util.dump(config))
    return 0


@@ -665,9 +640,6 @@ def parse_args(argv):
    parser_config.add_argument(
        "configuration", help="Your YAML configuration file(s).", nargs="+"
    )
-    parser_config.add_argument(
-        "--show-secrets", help="Show secrets in output.", action="store_true"
-    )

    parser_compile = subparsers.add_parser(
        "compile", help="Read the configuration and compile a program."
@@ -691,10 +663,6 @@ def parse_args(argv):
        "--device",
        help="Manually specify the serial port/address to use, for example /dev/ttyUSB0.",
    )
-    parser_upload.add_argument(
-        "--file",
-        help="Manually specify the binary file to upload.",
-    )

    parser_logs = subparsers.add_parser(
        "logs",
--- a/esphome/components/a4988/a4988.cpp
+++ b/esphome/components/a4988/a4988.cpp
@@ -46,7 +46,6 @@ void A4988::loop() {
    return;

  this->dir_pin_->digital_write(dir == 1);
-  delayMicroseconds(50);
  this->step_pin_->digital_write(true);
  delayMicroseconds(5);
  this->step_pin_->digital_write(false);
--- a/esphome/components/adc/adc_sensor.cpp
+++ b/esphome/components/adc/adc_sensor.cpp
@@ -11,10 +11,6 @@ ADC_MODE(ADC_VCC)
 #endif
 #endif

-#ifdef USE_RP2040
-#include <hardware/adc.h>
-#endif
-
 namespace esphome {
 namespace adc {

@@ -36,13 +32,9 @@ static const int ADC_MAX = (1 << SOC_ADC_RTC_MAX_BITWIDTH) - 1;    // 4095 (12 b
 static const int ADC_HALF = (1 << SOC_ADC_RTC_MAX_BITWIDTH) >> 1;  // 2048 (12 bit) or 4096 (13 bit)
 #endif

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

@@ -71,16 +63,6 @@ extern "C"
  }

 #endif  // USE_ESP32
-
-#ifdef USE_RP2040
-  static bool initialized = false;
-  if (!initialized) {
-    adc_init();
-    initialized = true;
-  }
-#endif
-
-  ESP_LOGCONFIG(TAG, "ADC '%s' setup finished!", this->get_name().c_str());
 }

 void ADCSensor::dump_config() {
@@ -116,13 +98,6 @@ void ADCSensor::dump_config() {
    }
  }
 #endif  // USE_ESP32
-#ifdef USE_RP2040
-  if (this->is_temperature_) {
-    ESP_LOGCONFIG(TAG, "  Pin: Temperature");
-  } else {
-    LOG_PIN("  Pin: ", pin_);
-  }
-#endif
  LOG_UPDATE_INTERVAL(this);
 }

@@ -200,29 +175,6 @@ float ADCSensor::sample() {
 }
 #endif  // USE_ESP32

-#ifdef USE_RP2040
-float ADCSensor::sample() {
-  if (this->is_temperature_) {
-    adc_set_temp_sensor_enabled(true);
-    delay(1);
-    adc_select_input(4);
-  } else {
-    uint8_t pin = this->pin_->get_pin();
-    adc_gpio_init(pin);
-    adc_select_input(pin - 26);
-  }
-
-  int raw = adc_read();
-  if (this->is_temperature_) {
-    adc_set_temp_sensor_enabled(false);
-  }
-  if (output_raw_) {
-    return raw;
-  }
-  return raw * 3.3f / 4096.0f;
-}
-#endif
-
 #ifdef USE_ESP8266
 std::string ADCSensor::unique_id() { return get_mac_address() + "-adc"; }
 #endif
--- a/esphome/components/adc/adc_sensor.h
+++ b/esphome/components/adc/adc_sensor.h
@@ -38,18 +38,10 @@ class ADCSensor : public sensor::Sensor, public PollingComponent, public voltage
  std::string unique_id() override;
 #endif

-#ifdef USE_RP2040
-  void set_is_temperature() { is_temperature_ = true; }
-#endif
-
 protected:
  InternalGPIOPin *pin_;
  bool output_raw_{false};

-#ifdef USE_RP2040
-  bool is_temperature_{false};
-#endif
-
 #ifdef USE_ESP32
  adc_atten_t attenuation_{ADC_ATTEN_DB_0};
  adc1_channel_t channel_{};
--- a/esphome/components/adc/sensor.py
+++ b/esphome/components/adc/sensor.py
@@ -94,9 +94,6 @@ def validate_adc_pin(value):
    if str(value).upper() == "VCC":
        return cv.only_on_esp8266("VCC")

-    if str(value).upper() == "TEMPERATURE":
-        return cv.only_on_rp2040("TEMPERATURE")
-
    if CORE.is_esp32:
        value = pins.internal_gpio_input_pin_number(value)
        variant = get_esp32_variant()
@@ -120,12 +117,6 @@ def validate_adc_pin(value):
            {CONF_ANALOG: True, CONF_INPUT: True}, internal=True
        )(value)

-    if CORE.is_rp2040:
-        value = pins.internal_gpio_input_pin_number(value)
-        if value not in (26, 27, 28, 29):
-            raise cv.Invalid("RP2040: Only pins 26, 27, 28 and 29 support ADC.")
-        return pins.internal_gpio_input_pin_schema(value)
-
    raise NotImplementedError


@@ -169,8 +160,6 @@ async def to_code(config):

    if config[CONF_PIN] == "VCC":
        cg.add_define("USE_ADC_SENSOR_VCC")
-    elif config[CONF_PIN] == "TEMPERATURE":
-        cg.add(var.set_is_temperature())
    else:
        pin = await cg.gpio_pin_expression(config[CONF_PIN])
        cg.add(var.set_pin(pin))
--- a/esphome/components/addressable_light/addressable_light_display.h
+++ b/esphome/components/addressable_light/addressable_light_display.h
@@ -5,8 +5,6 @@
 #include "esphome/components/display/display_buffer.h"
 #include "esphome/components/light/addressable_light.h"

-#include <vector>
-
 namespace esphome {
 namespace addressable_light {

--- a/esphome/components/ade7953/ade7953.h
+++ b/esphome/components/ade7953/ade7953.h
@@ -5,8 +5,6 @@
 #include "esphome/components/i2c/i2c.h"
 #include "esphome/components/sensor/sensor.h"

-#include <vector>
-
 namespace esphome {
 namespace ade7953 {

--- a/esphome/components/ads1115/ads1115.cpp
+++ b/esphome/components/ads1115/ads1115.cpp
@@ -9,7 +9,7 @@ static const char *const TAG = "ads1115";
 static const uint8_t ADS1115_REGISTER_CONVERSION = 0x00;
 static const uint8_t ADS1115_REGISTER_CONFIG = 0x01;

-static const uint8_t ADS1115_DATA_RATE_860_SPS = 0b111;  // 3300_SPS for ADS1015
+static const uint8_t ADS1115_DATA_RATE_860_SPS = 0b111;

 void ADS1115Component::setup() {
  ESP_LOGCONFIG(TAG, "Setting up ADS1115...");
@@ -18,9 +18,6 @@ void ADS1115Component::setup() {
    this->mark_failed();
    return;
  }
-
-  ESP_LOGCONFIG(TAG, "Configuring ADS1115...");
-
  uint16_t config = 0;
  // Clear single-shot bit
  //        0b0xxxxxxxxxxxxxxx
@@ -80,7 +77,6 @@ void ADS1115Component::dump_config() {
    LOG_SENSOR("  ", "Sensor", sensor);
    ESP_LOGCONFIG(TAG, "    Multiplexer: %u", sensor->get_multiplexer());
    ESP_LOGCONFIG(TAG, "    Gain: %u", sensor->get_gain());
-    ESP_LOGCONFIG(TAG, "    Resolution: %u", sensor->get_resolution());
  }
 }
 float ADS1115Component::request_measurement(ADS1115Sensor *sensor) {
@@ -131,45 +127,27 @@ float ADS1115Component::request_measurement(ADS1115Sensor *sensor) {
    this->status_set_warning();
    return NAN;
  }
-
-  if (sensor->get_resolution() == ADS1015_12_BITS) {
-    bool negative = (raw_conversion >> 15) == 1;
-
-    // shift raw_conversion as it's only 12-bits, left justified
-    raw_conversion = raw_conversion >> (16 - ADS1015_12_BITS);
-
-    // check if number was negative in order to keep the sign
-    if (negative) {
-      // the number was negative
-      // 1) set the negative bit back
-      raw_conversion |= 0x8000;
-      // 2) reset the former (shifted) negative bit
-      raw_conversion &= 0xF7FF;
-    }
-  }
-
  auto signed_conversion = static_cast<int16_t>(raw_conversion);

  float millivolts;
-  float divider = (sensor->get_resolution() == ADS1115_16_BITS) ? 32768.0f : 2048.0f;
  switch (sensor->get_gain()) {
    case ADS1115_GAIN_6P144:
-      millivolts = (signed_conversion * 6144) / divider;
+      millivolts = signed_conversion * 0.187500f;
      break;
    case ADS1115_GAIN_4P096:
-      millivolts = (signed_conversion * 4096) / divider;
+      millivolts = signed_conversion * 0.125000f;
      break;
    case ADS1115_GAIN_2P048:
-      millivolts = (signed_conversion * 2048) / divider;
+      millivolts = signed_conversion * 0.062500f;
      break;
    case ADS1115_GAIN_1P024:
-      millivolts = (signed_conversion * 1024) / divider;
+      millivolts = signed_conversion * 0.031250f;
      break;
    case ADS1115_GAIN_0P512:
-      millivolts = (signed_conversion * 512) / divider;
+      millivolts = signed_conversion * 0.015625f;
      break;
    case ADS1115_GAIN_0P256:
-      millivolts = (signed_conversion * 256) / divider;
+      millivolts = signed_conversion * 0.007813f;
      break;
    default:
      millivolts = NAN;
--- a/esphome/components/ads1115/ads1115.h
+++ b/esphome/components/ads1115/ads1115.h
@@ -5,8 +5,6 @@
 #include "esphome/components/i2c/i2c.h"
 #include "esphome/components/voltage_sampler/voltage_sampler.h"

-#include <vector>
-
 namespace esphome {
 namespace ads1115 {

@@ -30,11 +28,6 @@ enum ADS1115Gain {
  ADS1115_GAIN_0P256 = 0b101,
 };

-enum ADS1115Resolution {
-  ADS1115_16_BITS = 16,
-  ADS1015_12_BITS = 12,
-};
-
 class ADS1115Sensor;

 class ADS1115Component : public Component, public i2c::I2CDevice {
@@ -63,17 +56,15 @@ class ADS1115Sensor : public sensor::Sensor, public PollingComponent, public vol
  void update() override;
  void set_multiplexer(ADS1115Multiplexer multiplexer) { multiplexer_ = multiplexer; }
  void set_gain(ADS1115Gain gain) { gain_ = gain; }
-  void set_resolution(ADS1115Resolution resolution) { resolution_ = resolution; }
+
  float sample() override;
  uint8_t get_multiplexer() const { return multiplexer_; }
  uint8_t get_gain() const { return gain_; }
-  uint8_t get_resolution() const { return resolution_; }

 protected:
  ADS1115Component *parent_;
  ADS1115Multiplexer multiplexer_;
  ADS1115Gain gain_;
-  ADS1115Resolution resolution_;
 };

 }  // namespace ads1115
--- a/esphome/components/ads1115/sensor.py
+++ b/esphome/components/ads1115/sensor.py
@@ -4,7 +4,6 @@ from esphome.components import sensor, voltage_sampler
 from esphome.const import (
    CONF_GAIN,
    CONF_MULTIPLEXER,
-    CONF_RESOLUTION,
    DEVICE_CLASS_VOLTAGE,
    STATE_CLASS_MEASUREMENT,
    UNIT_VOLT,
@@ -36,12 +35,6 @@ GAIN = {
    "0.256": ADS1115Gain.ADS1115_GAIN_0P256,
 }

-ADS1115Resolution = ads1115_ns.enum("ADS1115Resolution")
-RESOLUTION = {
-    "16_BITS": ADS1115Resolution.ADS1115_16_BITS,
-    "12_BITS": ADS1115Resolution.ADS1015_12_BITS,
-}
-

 def validate_gain(value):
    if isinstance(value, float):
@@ -70,9 +63,6 @@ CONFIG_SCHEMA = (
            cv.GenerateID(CONF_ADS1115_ID): cv.use_id(ADS1115Component),
            cv.Required(CONF_MULTIPLEXER): cv.enum(MUX, upper=True, space="_"),
            cv.Required(CONF_GAIN): validate_gain,
-            cv.Optional(CONF_RESOLUTION, default="16_BITS"): cv.enum(
-                RESOLUTION, upper=True, space="_"
-            ),
        }
    )
    .extend(cv.polling_component_schema("60s"))
@@ -87,6 +77,5 @@ async def to_code(config):

    cg.add(var.set_multiplexer(config[CONF_MULTIPLEXER]))
    cg.add(var.set_gain(config[CONF_GAIN]))
-    cg.add(var.set_resolution(config[CONF_RESOLUTION]))

    cg.add(paren.register_sensor(var))
--- a/esphome/components/aht10/aht10.cpp
+++ b/esphome/components/aht10/aht10.cpp
@@ -122,9 +122,8 @@ void AHT10Component::update() {
    this->temperature_sensor_->publish_state(temperature);
  }
  if (this->humidity_sensor_ != nullptr) {
-    if (std::isnan(humidity)) {
+    if (std::isnan(humidity))
      ESP_LOGW(TAG, "Invalid humidity! Sensor reported 0%% Hum");
-    }
    this->humidity_sensor_->publish_state(humidity);
  }
  this->status_clear_warning();
--- a/esphome/components/am43/am43.cpp
+++ b/esphome/components/am43/am43.cpp
@@ -104,9 +104,8 @@ void Am43::update() {
      auto status =
          esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
                                   packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
-      if (status) {
+      if (status)
        ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(), status);
-      }
    }
    this->current_sensor_++;
  }
--- a/esphome/components/am43/cover/am43_cover.cpp
+++ b/esphome/components/am43/cover/am43_cover.cpp
@@ -56,9 +56,8 @@ void Am43Component::control(const CoverCall &call) {
    auto status =
        esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
                                 packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
-    if (status) {
+    if (status)
      ESP_LOGW(TAG, "[%s] Error writing stop command to device, error = %d", this->get_name().c_str(), status);
-    }
  }
  if (call.get_position().has_value()) {
    auto pos = *call.get_position();
@@ -69,9 +68,8 @@ void Am43Component::control(const CoverCall &call) {
    auto status =
        esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
                                 packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
-    if (status) {
+    if (status)
      ESP_LOGW(TAG, "[%s] Error writing set_position command to device, error = %d", this->get_name().c_str(), status);
-    }
  }
 }

@@ -128,21 +126,18 @@ void Am43Component::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
          auto status = esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(),
                                                 this->char_handle_, packet->length, packet->data,
                                                 ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
-          if (status) {
+          if (status)
            ESP_LOGW(TAG, "[%s] Error writing set_position to device, error = %d", this->get_name().c_str(), status);
-          }
        } else {
          ESP_LOGW(TAG, "[%s] AM43 pin rejected!", this->get_name().c_str());
        }
      }

-      if (this->decoder_->has_set_position_response() && !this->decoder_->set_position_ok_) {
+      if (this->decoder_->has_set_position_response() && !this->decoder_->set_position_ok_)
        ESP_LOGW(TAG, "[%s] Got nack after sending set_position. Bad pin?", this->get_name().c_str());
-      }

-      if (this->decoder_->has_set_state_response() && !this->decoder_->set_state_ok_) {
+      if (this->decoder_->has_set_state_response() && !this->decoder_->set_state_ok_)
        ESP_LOGW(TAG, "[%s] Got nack after sending set_state. Bad pin?", this->get_name().c_str());
-      }
      break;
    }
    default:
--- a/esphome/components/animation/init.py
+++ b/esphome/components/animation/init.py
@@ -117,7 +117,7 @@ async def to_code(config):
                data[pos] = rgb & 255
                pos += 1

-    elif config[CONF_TYPE] in ["BINARY", "TRANSPARENT_BINARY"]:
+    elif config[CONF_TYPE] == "BINARY":
        width8 = ((width + 7) // 8) * 8
        data = [0 for _ in range((height * width8 // 8) * frames)]
        for frameIndex in range(frames):
--- a/esphome/components/anova/anova.cpp
+++ b/esphome/components/anova/anova.cpp
@@ -37,18 +37,16 @@ void Anova::control(const ClimateCall &call) {
    auto status =
        esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
                                 pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
-    if (status) {
+    if (status)
      ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(), status);
-    }
  }
  if (call.get_target_temperature().has_value()) {
    auto *pkt = this->codec_->get_set_target_temp_request(*call.get_target_temperature());
    auto status =
        esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
                                 pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
-    if (status) {
+    if (status)
      ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(), status);
-    }
  }
 }

@@ -145,9 +143,8 @@ void Anova::update() {
    auto status =
        esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
                                 pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
-    if (status) {
+    if (status)
      ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(), status);
-    }
    this->current_request_++;
  }
 }
--- a/esphome/components/apds9960/apds9960.cpp
+++ b/esphome/components/apds9960/apds9960.cpp
@@ -23,7 +23,7 @@ void APDS9960::setup() {
    return;
  }

-  if (id != 0xAB && id != 0x9C && id != 0xA8) {  // APDS9960 all should have one of these IDs
+  if (id != 0xAB && id != 0x9C) {  // APDS9960 all should have one of these IDs
    this->error_code_ = WRONG_ID;
    this->mark_failed();
    return;
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -204,10 +204,6 @@ message DeviceInfoResponse {
  uint32 webserver_port = 10;

  uint32 bluetooth_proxy_version = 11;
-
-  string manufacturer = 12;
-
-  string friendly_name = 13;
 }

 message ListEntitiesRequest {
@@ -787,7 +783,6 @@ enum ClimateFanMode {
  CLIMATE_FAN_MIDDLE = 6;
  CLIMATE_FAN_FOCUS = 7;
  CLIMATE_FAN_DIFFUSE = 8;
-  CLIMATE_FAN_QUIET = 9;
 }
 enum ClimateSwingMode {
  CLIMATE_SWING_OFF = 0;
@@ -918,7 +913,6 @@ message ListEntitiesNumberResponse {
  EntityCategory entity_category = 10;
  string unit_of_measurement = 11;
  NumberMode mode = 12;
-  string device_class = 13;
 }
 message NumberStateResponse {
  option (id) = 50;
@@ -1144,8 +1138,6 @@ message BluetoothLEAdvertisementResponse {
  repeated string service_uuids = 4;
  repeated BluetoothServiceData service_data = 5;
  repeated BluetoothServiceData manufacturer_data = 6;
-
-  uint32 address_type = 7;
 }

 enum BluetoothDeviceRequestType {
@@ -1153,8 +1145,6 @@ enum BluetoothDeviceRequestType {
  BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT = 1;
  BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR = 2;
  BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR = 3;
-  BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITH_CACHE = 4;
-  BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE = 5;
 }

 message BluetoothDeviceRequest {
@@ -1164,8 +1154,6 @@ message BluetoothDeviceRequest {

  uint64 address = 1;
  BluetoothDeviceRequestType request_type = 2;
-  bool has_address_type = 3;
-  uint32 address_type = 4;
 }

 message BluetoothDeviceConnectionResponse {
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -616,7 +616,6 @@ bool APIConnection::send_number_info(number::Number *number) {
  msg.entity_category = static_cast<enums::EntityCategory>(number->get_entity_category());
  msg.unit_of_measurement = number->traits.get_unit_of_measurement();
  msg.mode = static_cast<enums::NumberMode>(number->traits.get_mode());
-  msg.device_class = number->traits.get_device_class();

  msg.min_value = number->traits.get_min_value();
  msg.max_value = number->traits.get_max_value();
@@ -930,15 +929,9 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
  DeviceInfoResponse resp{};
  resp.uses_password = this->parent_->uses_password();
  resp.name = App.get_name();
-  resp.friendly_name = App.get_friendly_name();
  resp.mac_address = get_mac_address_pretty();
  resp.esphome_version = ESPHOME_VERSION;
  resp.compilation_time = App.get_compilation_time();
-#if defined(USE_ESP8266) || defined(USE_ESP32)
-  resp.manufacturer = "Espressif";
-#elif defined(USE_RP2040)
-  resp.manufacturer = "Raspberry Pi";
-#endif
  resp.model = ESPHOME_BOARD;
 #ifdef USE_DEEP_SLEEP
  resp.has_deep_sleep = deep_sleep::global_has_deep_sleep;
@@ -951,7 +944,7 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
  resp.webserver_port = USE_WEBSERVER_PORT;
 #endif
 #ifdef USE_BLUETOOTH_PROXY
-  resp.bluetooth_proxy_version = bluetooth_proxy::global_bluetooth_proxy->has_active() ? 3 : 1;
+  resp.bluetooth_proxy_version = bluetooth_proxy::global_bluetooth_proxy->has_active() ? 2 : 1;
 #endif
  return resp;
 }
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -7,8 +7,6 @@
 #include "esphome/core/application.h"
 #include "esphome/core/component.h"

-#include <vector>
-
 namespace esphome {
 namespace api {

--- a/esphome/components/api/api_frame_helper.cpp
+++ b/esphome/components/api/api_frame_helper.cpp
@@ -616,9 +616,6 @@ APIError APINoiseFrameHelper::write_frame_(const uint8_t *data, size_t len) {
  struct iovec iov[2];
  iov[0].iov_base = header;
  iov[0].iov_len = 3;
-  if (len == 0) {
-    return write_raw_(iov, 1);
-  }
  iov[1].iov_base = const_cast<uint8_t *>(data);
  iov[1].iov_len = len;

@@ -916,9 +913,6 @@ APIError APIPlaintextFrameHelper::write_packet(uint16_t type, const uint8_t *pay
  struct iovec iov[2];
  iov[0].iov_base = &header[0];
  iov[0].iov_len = header.size();
-  if (payload_len == 0) {
-    return write_raw_(iov, 1);
-  }
  iov[1].iov_base = const_cast<uint8_t *>(payload);
  iov[1].iov_len = payload_len;

--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -6,7 +6,6 @@
 namespace esphome {
 namespace api {

-#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::EntityCategory>(enums::EntityCategory value) {
  switch (value) {
    case enums::ENTITY_CATEGORY_NONE:
@@ -19,8 +18,6 @@ template<> const char *proto_enum_to_string<enums::EntityCategory>(enums::Entity
      return "UNKNOWN";
  }
 }
-#endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::LegacyCoverState>(enums::LegacyCoverState value) {
  switch (value) {
    case enums::LEGACY_COVER_STATE_OPEN:
@@ -31,8 +28,6 @@ template<> const char *proto_enum_to_string<enums::LegacyCoverState>(enums::Lega
      return "UNKNOWN";
  }
 }
-#endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::CoverOperation>(enums::CoverOperation value) {
  switch (value) {
    case enums::COVER_OPERATION_IDLE:
@@ -45,8 +40,6 @@ template<> const char *proto_enum_to_string<enums::CoverOperation>(enums::CoverO
      return "UNKNOWN";
  }
 }
-#endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::LegacyCoverCommand>(enums::LegacyCoverCommand value) {
  switch (value) {
    case enums::LEGACY_COVER_COMMAND_OPEN:
@@ -59,8 +52,6 @@ template<> const char *proto_enum_to_string<enums::LegacyCoverCommand>(enums::Le
      return "UNKNOWN";
  }
 }
-#endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::FanSpeed>(enums::FanSpeed value) {
  switch (value) {
    case enums::FAN_SPEED_LOW:
@@ -73,8 +64,6 @@ template<> const char *proto_enum_to_string<enums::FanSpeed>(enums::FanSpeed val
      return "UNKNOWN";
  }
 }
-#endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::FanDirection>(enums::FanDirection value) {
  switch (value) {
    case enums::FAN_DIRECTION_FORWARD:
@@ -85,8 +74,6 @@ template<> const char *proto_enum_to_string<enums::FanDirection>(enums::FanDirec
      return "UNKNOWN";
  }
 }
-#endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::ColorMode>(enums::ColorMode value) {
  switch (value) {
    case enums::COLOR_MODE_UNKNOWN:
@@ -113,8 +100,6 @@ template<> const char *proto_enum_to_string<enums::ColorMode>(enums::ColorMode v
      return "UNKNOWN";
  }
 }
-#endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::SensorStateClass>(enums::SensorStateClass value) {
  switch (value) {
    case enums::STATE_CLASS_NONE:
@@ -129,8 +114,6 @@ template<> const char *proto_enum_to_string<enums::SensorStateClass>(enums::Sens
      return "UNKNOWN";
  }
 }
-#endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::SensorLastResetType>(enums::SensorLastResetType value) {
  switch (value) {
    case enums::LAST_RESET_NONE:
@@ -143,8 +126,6 @@ template<> const char *proto_enum_to_string<enums::SensorLastResetType>(enums::S
      return "UNKNOWN";
  }
 }
-#endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::LogLevel>(enums::LogLevel value) {
  switch (value) {
    case enums::LOG_LEVEL_NONE:
@@ -167,8 +148,6 @@ template<> const char *proto_enum_to_string<enums::LogLevel>(enums::LogLevel val
      return "UNKNOWN";
  }
 }
-#endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::ServiceArgType>(enums::ServiceArgType value) {
  switch (value) {
    case enums::SERVICE_ARG_TYPE_BOOL:
@@ -191,8 +170,6 @@ template<> const char *proto_enum_to_string<enums::ServiceArgType>(enums::Servic
      return "UNKNOWN";
  }
 }
-#endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::ClimateMode>(enums::ClimateMode value) {
  switch (value) {
    case enums::CLIMATE_MODE_OFF:
@@ -213,8 +190,6 @@ template<> const char *proto_enum_to_string<enums::ClimateMode>(enums::ClimateMo
      return "UNKNOWN";
  }
 }
-#endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::ClimateFanMode>(enums::ClimateFanMode value) {
  switch (value) {
    case enums::CLIMATE_FAN_ON:
@@ -235,14 +210,10 @@ template<> const char *proto_enum_to_string<enums::ClimateFanMode>(enums::Climat
      return "CLIMATE_FAN_FOCUS";
    case enums::CLIMATE_FAN_DIFFUSE:
      return "CLIMATE_FAN_DIFFUSE";
-    case enums::CLIMATE_FAN_QUIET:
-      return "CLIMATE_FAN_QUIET";
    default:
      return "UNKNOWN";
  }
 }
-#endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::ClimateSwingMode>(enums::ClimateSwingMode value) {
  switch (value) {
    case enums::CLIMATE_SWING_OFF:
@@ -257,8 +228,6 @@ template<> const char *proto_enum_to_string<enums::ClimateSwingMode>(enums::Clim
      return "UNKNOWN";
  }
 }
-#endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::ClimateAction>(enums::ClimateAction value) {
  switch (value) {
    case enums::CLIMATE_ACTION_OFF:
@@ -277,8 +246,6 @@ template<> const char *proto_enum_to_string<enums::ClimateAction>(enums::Climate
      return "UNKNOWN";
  }
 }
-#endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::ClimatePreset>(enums::ClimatePreset value) {
  switch (value) {
    case enums::CLIMATE_PRESET_NONE:
@@ -301,8 +268,6 @@ template<> const char *proto_enum_to_string<enums::ClimatePreset>(enums::Climate
      return "UNKNOWN";
  }
 }
-#endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::NumberMode>(enums::NumberMode value) {
  switch (value) {
    case enums::NUMBER_MODE_AUTO:
@@ -315,8 +280,6 @@ template<> const char *proto_enum_to_string<enums::NumberMode>(enums::NumberMode
      return "UNKNOWN";
  }
 }
-#endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::LockState>(enums::LockState value) {
  switch (value) {
    case enums::LOCK_STATE_NONE:
@@ -335,8 +298,6 @@ template<> const char *proto_enum_to_string<enums::LockState>(enums::LockState v
      return "UNKNOWN";
  }
 }
-#endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::LockCommand>(enums::LockCommand value) {
  switch (value) {
    case enums::LOCK_UNLOCK:
@@ -349,8 +310,6 @@ template<> const char *proto_enum_to_string<enums::LockCommand>(enums::LockComma
      return "UNKNOWN";
  }
 }
-#endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::MediaPlayerState>(enums::MediaPlayerState value) {
  switch (value) {
    case enums::MEDIA_PLAYER_STATE_NONE:
@@ -365,8 +324,6 @@ template<> const char *proto_enum_to_string<enums::MediaPlayerState>(enums::Medi
      return "UNKNOWN";
  }
 }
-#endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::MediaPlayerCommand>(enums::MediaPlayerCommand value) {
  switch (value) {
    case enums::MEDIA_PLAYER_COMMAND_PLAY:
@@ -383,8 +340,6 @@ template<> const char *proto_enum_to_string<enums::MediaPlayerCommand>(enums::Me
      return "UNKNOWN";
  }
 }
-#endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
 template<>
 const char *proto_enum_to_string<enums::BluetoothDeviceRequestType>(enums::BluetoothDeviceRequestType value) {
  switch (value) {
@@ -396,15 +351,10 @@ const char *proto_enum_to_string<enums::BluetoothDeviceRequestType>(enums::Bluet
      return "BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR";
    case enums::BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR:
      return "BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR";
-    case enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITH_CACHE:
-      return "BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITH_CACHE";
-    case enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE:
-      return "BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE";
    default:
      return "UNKNOWN";
  }
 }
-#endif
 bool HelloRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
  switch (field_id) {
    case 2: {
@@ -626,14 +576,6 @@ bool DeviceInfoResponse::decode_length(uint32_t field_id, ProtoLengthDelimited v
      this->project_version = value.as_string();
      return true;
    }
-    case 12: {
-      this->manufacturer = value.as_string();
-      return true;
-    }
-    case 13: {
-      this->friendly_name = value.as_string();
-      return true;
-    }
    default:
      return false;
  }
@@ -650,8 +592,6 @@ void DeviceInfoResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(9, this->project_version);
  buffer.encode_uint32(10, this->webserver_port);
  buffer.encode_uint32(11, this->bluetooth_proxy_version);
-  buffer.encode_string(12, this->manufacturer);
-  buffer.encode_string(13, this->friendly_name);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void DeviceInfoResponse::dump_to(std::string &out) const {
@@ -702,14 +642,6 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
  sprintf(buffer, "%u", this->bluetooth_proxy_version);
  out.append(buffer);
  out.append("\n");
-
-  out.append("  manufacturer: ");
-  out.append("'").append(this->manufacturer).append("'");
-  out.append("\n");
-
-  out.append("  friendly_name: ");
-  out.append("'").append(this->friendly_name).append("'");
-  out.append("\n");
  out.append("}");
 }
 #endif
@@ -4001,10 +3933,6 @@ bool ListEntitiesNumberResponse::decode_length(uint32_t field_id, ProtoLengthDel
      this->unit_of_measurement = value.as_string();
      return true;
    }
-    case 13: {
-      this->device_class = value.as_string();
-      return true;
-    }
    default:
      return false;
  }
@@ -4044,7 +3972,6 @@ void ListEntitiesNumberResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_enum<enums::EntityCategory>(10, this->entity_category);
  buffer.encode_string(11, this->unit_of_measurement);
  buffer.encode_enum<enums::NumberMode>(12, this->mode);
-  buffer.encode_string(13, this->device_class);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesNumberResponse::dump_to(std::string &out) const {
@@ -4101,10 +4028,6 @@ void ListEntitiesNumberResponse::dump_to(std::string &out) const {
  out.append("  mode: ");
  out.append(proto_enum_to_string<enums::NumberMode>(this->mode));
  out.append("\n");
-
-  out.append("  device_class: ");
-  out.append("'").append(this->device_class).append("'");
-  out.append("\n");
  out.append("}");
 }
 #endif
@@ -5052,10 +4975,6 @@ bool BluetoothLEAdvertisementResponse::decode_varint(uint32_t field_id, ProtoVar
      this->rssi = value.as_sint32();
      return true;
    }
-    case 7: {
-      this->address_type = value.as_uint32();
-      return true;
-    }
    default:
      return false;
  }
@@ -5095,7 +5014,6 @@ void BluetoothLEAdvertisementResponse::encode(ProtoWriteBuffer buffer) const {
  for (auto &it : this->manufacturer_data) {
    buffer.encode_message<BluetoothServiceData>(6, it, true);
  }
-  buffer.encode_uint32(7, this->address_type);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BluetoothLEAdvertisementResponse::dump_to(std::string &out) const {
@@ -5132,11 +5050,6 @@ void BluetoothLEAdvertisementResponse::dump_to(std::string &out) const {
    it.dump_to(out);
    out.append("\n");
  }
-
-  out.append("  address_type: ");
-  sprintf(buffer, "%u", this->address_type);
-  out.append(buffer);
-  out.append("\n");
  out.append("}");
 }
 #endif
@@ -5150,14 +5063,6 @@ bool BluetoothDeviceRequest::decode_varint(uint32_t field_id, ProtoVarInt value)
      this->request_type = value.as_enum<enums::BluetoothDeviceRequestType>();
      return true;
    }
-    case 3: {
-      this->has_address_type = value.as_bool();
-      return true;
-    }
-    case 4: {
-      this->address_type = value.as_uint32();
-      return true;
-    }
    default:
      return false;
  }
@@ -5165,8 +5070,6 @@ bool BluetoothDeviceRequest::decode_varint(uint32_t field_id, ProtoVarInt value)
 void BluetoothDeviceRequest::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_uint64(1, this->address);
  buffer.encode_enum<enums::BluetoothDeviceRequestType>(2, this->request_type);
-  buffer.encode_bool(3, this->has_address_type);
-  buffer.encode_uint32(4, this->address_type);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BluetoothDeviceRequest::dump_to(std::string &out) const {
@@ -5180,15 +5083,6 @@ void BluetoothDeviceRequest::dump_to(std::string &out) const {
  out.append("  request_type: ");
  out.append(proto_enum_to_string<enums::BluetoothDeviceRequestType>(this->request_type));
  out.append("\n");
-
-  out.append("  has_address_type: ");
-  out.append(YESNO(this->has_address_type));
-  out.append("\n");
-
-  out.append("  address_type: ");
-  sprintf(buffer, "%u", this->address_type);
-  out.append(buffer);
-  out.append("\n");
  out.append("}");
 }
 #endif
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -99,7 +99,6 @@ enum ClimateFanMode : uint32_t {
  CLIMATE_FAN_MIDDLE = 6,
  CLIMATE_FAN_FOCUS = 7,
  CLIMATE_FAN_DIFFUSE = 8,
-  CLIMATE_FAN_QUIET = 9,
 };
 enum ClimateSwingMode : uint32_t {
  CLIMATE_SWING_OFF = 0,
@@ -161,8 +160,6 @@ enum BluetoothDeviceRequestType : uint32_t {
  BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT = 1,
  BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR = 2,
  BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR = 3,
-  BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITH_CACHE = 4,
-  BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE = 5,
 };

 }  // namespace enums
@@ -276,8 +273,6 @@ class DeviceInfoResponse : public ProtoMessage {
  std::string project_version{};
  uint32_t webserver_port{0};
  uint32_t bluetooth_proxy_version{0};
-  std::string manufacturer{};
-  std::string friendly_name{};
  void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  void dump_to(std::string &out) const override;
@@ -1008,7 +1003,6 @@ class ListEntitiesNumberResponse : public ProtoMessage {
  enums::EntityCategory entity_category{};
  std::string unit_of_measurement{};
  enums::NumberMode mode{};
-  std::string device_class{};
  void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  void dump_to(std::string &out) const override;
@@ -1261,7 +1255,6 @@ class BluetoothLEAdvertisementResponse : public ProtoMessage {
  std::vector<std::string> service_uuids{};
  std::vector<BluetoothServiceData> service_data{};
  std::vector<BluetoothServiceData> manufacturer_data{};
-  uint32_t address_type{0};
  void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  void dump_to(std::string &out) const override;
@@ -1275,8 +1268,6 @@ class BluetoothDeviceRequest : public ProtoMessage {
 public:
  uint64_t address{0};
  enums::BluetoothDeviceRequestType request_type{};
-  bool has_address_type{false};
-  uint32_t address_type{0};
  void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  void dump_to(std::string &out) const override;
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -12,8 +12,6 @@
 #include "user_services.h"
 #include "api_noise_context.h"

-#include <vector>
-
 namespace esphome {
 namespace api {

@@ -77,7 +75,7 @@ class APIServer : public Component, public Controller {
  void send_homeassistant_service_call(const HomeassistantServiceResponse &call);
 #ifdef USE_BLUETOOTH_PROXY
  void send_bluetooth_le_advertisement(const BluetoothLEAdvertisementResponse &call);
-  void send_bluetooth_device_connection(uint64_t address, bool connected, uint16_t mtu = 0, esp_err_t error = ESP_OK);
+  void send_bluetooth_device_connection(uint64_t address, bool connected, uint16_t mtu, esp_err_t error = ESP_OK);
  void send_bluetooth_connections_free(uint8_t free, uint8_t limit);
  void send_bluetooth_gatt_read_response(const BluetoothGATTReadResponse &call);
  void send_bluetooth_gatt_write_response(const BluetoothGATTWriteResponse &call);
--- a/esphome/components/api/homeassistant_service.h
+++ b/esphome/components/api/homeassistant_service.h
@@ -5,8 +5,6 @@
 #include "api_pb2.h"
 #include "api_server.h"

-#include <vector>
-
 namespace esphome {
 namespace api {

--- a/esphome/components/api/proto.h
+++ b/esphome/components/api/proto.h
@@ -4,8 +4,6 @@
 #include "esphome/core/log.h"
 #include "esphome/core/helpers.h"

-#include <vector>
-
 #ifdef ESPHOME_LOG_HAS_VERY_VERBOSE
 #define HAS_PROTO_MESSAGE_DUMP
 #endif
--- a/esphome/components/api/user_services.h
+++ b/esphome/components/api/user_services.h
@@ -1,7 +1,6 @@
 #pragma once

 #include <utility>
-#include <vector>

 #include "esphome/core/component.h"
 #include "esphome/core/automation.h"
--- a/esphome/components/async_tcp/init.py
+++ b/esphome/components/async_tcp/init.py
@@ -8,7 +8,6 @@ CODEOWNERS = ["@OttoWinter"]
 CONFIG_SCHEMA = cv.All(
    cv.Schema({}),
    cv.only_with_arduino,
-    cv.only_on(["esp32", "esp8266"]),
 )


--- a/esphome/components/atc_mithermometer/atc_mithermometer.h
+++ b/esphome/components/atc_mithermometer/atc_mithermometer.h
@@ -4,8 +4,6 @@
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"

-#include <vector>
-
 #ifdef USE_ESP32

 namespace esphome {
--- a/esphome/components/bedjet/bedjet_hub.h
+++ b/esphome/components/bedjet/bedjet_hub.h
@@ -8,8 +8,6 @@
 #include "bedjet_child.h"
 #include "bedjet_codec.h"

-#include <vector>
-
 #ifdef USE_TIME
 #include "esphome/components/time/real_time_clock.h"
 #endif
--- a/esphome/components/bedjet/fan/bedjet_fan.cpp
+++ b/esphome/components/bedjet/fan/bedjet_fan.cpp
@@ -37,13 +37,9 @@ void BedJetFan::control(const fan::FanCall &call) {

  // ignore speed changes if not on or turning on
  if (this->state && call.get_speed().has_value()) {
-    auto speed = *call.get_speed();
-    if (speed >= 1) {
-      this->speed = speed;
-      // Fan.speed is 1-20, but Bedjet expects 0-19, so subtract 1
-      this->parent_->set_fan_index(this->speed - 1);
-      did_change = true;
-    }
+    this->speed = *call.get_speed();
+    this->parent_->set_fan_index(this->speed);
+    did_change = true;
  }

  if (did_change) {
@@ -61,9 +57,8 @@ void BedJetFan::on_status(const BedjetStatusPacket *data) {
    did_change = true;
  }

-  // BedjetStatusPacket.fan_step is in range 0-19, but Fan.speed wants 1-20.
-  if (data->fan_step + 1 != this->speed) {
-    this->speed = data->fan_step + 1;
+  if (data->fan_step != this->speed) {
+    this->speed = data->fan_step;
    did_change = true;
  }

--- a/esphome/components/binary_sensor/automation.h
+++ b/esphome/components/binary_sensor/automation.h
@@ -1,7 +1,6 @@
 #pragma once

 #include <utility>
-#include <vector>

 #include "esphome/core/component.h"
 #include "esphome/core/automation.h"
--- a/esphome/components/binary_sensor/binary_sensor.h
+++ b/esphome/components/binary_sensor/binary_sensor.h
@@ -5,8 +5,6 @@
 #include "esphome/core/helpers.h"
 #include "esphome/components/binary_sensor/filter.h"

-#include <vector>
-
 namespace esphome {

 namespace binary_sensor {
--- a/esphome/components/binary_sensor/filter.h
+++ b/esphome/components/binary_sensor/filter.h
@@ -3,8 +3,6 @@
 #include "esphome/core/component.h"
 #include "esphome/core/helpers.h"

-#include <vector>
-
 namespace esphome {

 namespace binary_sensor {
--- a/esphome/components/binary_sensor_map/binary_sensor_map.h
+++ b/esphome/components/binary_sensor_map/binary_sensor_map.h
@@ -4,8 +4,6 @@
 #include "esphome/components/binary_sensor/binary_sensor.h"
 #include "esphome/components/sensor/sensor.h"

-#include <vector>
-
 namespace esphome {
 namespace binary_sensor_map {

--- a/esphome/components/ble_client/init.py
+++ b/esphome/components/ble_client/init.py
@@ -66,7 +66,7 @@ CONF_BLE_CLIENT_ID = "ble_client_id"

 BLE_CLIENT_SCHEMA = cv.Schema(
    {
-        cv.GenerateID(CONF_BLE_CLIENT_ID): cv.use_id(BLEClient),
+        cv.Required(CONF_BLE_CLIENT_ID): cv.use_id(BLEClient),
    }
 )

@@ -78,7 +78,7 @@ async def register_ble_node(var, config):

 BLE_WRITE_ACTION_SCHEMA = cv.Schema(
    {
-        cv.GenerateID(CONF_ID): cv.use_id(BLEClient),
+        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)),
--- a/esphome/components/ble_client/automation.h
+++ b/esphome/components/ble_client/automation.h
@@ -1,7 +1,6 @@
 #pragma once

 #include <utility>
-#include <vector>

 #include "esphome/core/automation.h"
 #include "esphome/components/ble_client/ble_client.h"
--- a/esphome/components/ble_client/ble_client.cpp
+++ b/esphome/components/ble_client/ble_client.cpp
@@ -47,12 +47,11 @@ void BLEClient::set_enabled(bool enabled) {
  this->enabled = enabled;
 }

-bool BLEClient::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t esp_gattc_if,
+void BLEClient::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t esp_gattc_if,
                                    esp_ble_gattc_cb_param_t *param) {
  bool all_established = this->all_nodes_established_();

-  if (!BLEClientBase::gattc_event_handler(event, esp_gattc_if, param))
-    return false;
+  BLEClientBase::gattc_event_handler(event, esp_gattc_if, param);

  for (auto *node : this->nodes_)
    node->gattc_event_handler(event, esp_gattc_if, param);
@@ -63,7 +62,6 @@ bool BLEClient::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t es
      delete svc;  // NOLINT(cppcoreguidelines-owning-memory)
    this->services_.clear();
  }
-  return true;
 }

 void BLEClient::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
--- a/esphome/components/ble_client/ble_client.h
+++ b/esphome/components/ble_client/ble_client.h
@@ -7,13 +7,12 @@

 #ifdef USE_ESP32

-#include <esp_bt_defs.h>
-#include <esp_gap_ble_api.h>
-#include <esp_gatt_common_api.h>
-#include <esp_gattc_api.h>
-#include <array>
 #include <string>
-#include <vector>
+#include <array>
+#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 {
@@ -51,7 +50,7 @@ class BLEClient : public BLEClientBase {
  void dump_config() override;
  void loop() override;

-  bool gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
+  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;
--- a/esphome/components/ble_client/sensor/ble_sensor.h
+++ b/esphome/components/ble_client/sensor/ble_sensor.h
@@ -5,8 +5,6 @@
 #include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
 #include "esphome/components/sensor/sensor.h"

-#include <vector>
-
 #ifdef USE_ESP32
 #include <esp_gattc_api.h>

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

 AUTO_LOAD = ["esp32_ble_client", "esp32_ble_tracker"]
 DEPENDENCIES = ["api", "esp32"]
 CODEOWNERS = ["@jesserockz"]

-CONF_CACHE_SERVICES = "cache_services"
-CONF_CONNECTIONS = "connections"
-MAX_CONNECTIONS = 3

 bluetooth_proxy_ns = cg.esphome_ns.namespace("bluetooth_proxy")

 BluetoothProxy = bluetooth_proxy_ns.class_(
-    "BluetoothProxy", esp32_ble_tracker.ESPBTDeviceListener, cg.Component
-)
-BluetoothConnection = bluetooth_proxy_ns.class_(
-    "BluetoothConnection", esp32_ble_client.BLEClientBase
+    "BluetoothProxy", esp32_ble_client.BLEClientBase
 )

-CONNECTION_SCHEMA = esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA.extend(
+CONFIG_SCHEMA = cv.Schema(
    {
-        cv.GenerateID(): cv.declare_id(BluetoothConnection),
+        cv.GenerateID(): cv.declare_id(BluetoothProxy),
+        cv.Optional(CONF_ACTIVE, default=False): cv.boolean,
    }
-).extend(cv.COMPONENT_SCHEMA)
-
-
-def validate_connections(config):
-    if CONF_CONNECTIONS in config:
-        if not config[CONF_ACTIVE]:
-            raise cv.Invalid(
-                "Connections can only be used if the proxy is set to active"
-            )
-    else:
-        if config[CONF_ACTIVE]:
-            conf = config.copy()
-            conf[CONF_CONNECTIONS] = [
-                CONNECTION_SCHEMA({}) for _ in range(MAX_CONNECTIONS)
-            ]
-            return conf
-    return config
-
-
-CONFIG_SCHEMA = cv.All(
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(BluetoothProxy),
-            cv.Optional(CONF_ACTIVE, default=False): cv.boolean,
-            cv.SplitDefault(CONF_CACHE_SERVICES, esp32_idf=True): cv.All(
-                cv.only_with_esp_idf, cv.boolean
-            ),
-            cv.Optional(CONF_CONNECTIONS): cv.All(
-                cv.ensure_list(CONNECTION_SCHEMA),
-                cv.Length(min=1, max=MAX_CONNECTIONS),
-            ),
-        }
-    )
-    .extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
-    .extend(cv.COMPONENT_SCHEMA),
-    validate_connections,
-)
+).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)


 async def to_code(config):
@@ -69,15 +27,7 @@ async def to_code(config):
    await cg.register_component(var, config)

    cg.add(var.set_active(config[CONF_ACTIVE]))
-    await esp32_ble_tracker.register_ble_device(var, config)

-    for connection_conf in config.get(CONF_CONNECTIONS, []):
-        connection_var = cg.new_Pvariable(connection_conf[CONF_ID])
-        await cg.register_component(connection_var, connection_conf)
-        cg.add(var.register_connection(connection_var))
-        await esp32_ble_tracker.register_client(connection_var, connection_conf)
-
-    if config.get(CONF_CACHE_SERVICES):
-        add_idf_sdkconfig_option("CONFIG_BT_GATTC_CACHE_NVS_FLASH", True)
+    await esp32_ble_tracker.register_client(var, config)

    cg.add_define("USE_BLUETOOTH_PROXY")
--- a/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
@@ -1,270 +0,0 @@
-#include "bluetooth_connection.h"
-
-#include "esphome/components/api/api_server.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-#ifdef USE_ESP32
-
-#include "bluetooth_proxy.h"
-
-namespace esphome {
-namespace bluetooth_proxy {
-
-static const char *const TAG = "bluetooth_proxy.connection";
-
-bool BluetoothConnection::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                                              esp_ble_gattc_cb_param_t *param) {
-  if (!BLEClientBase::gattc_event_handler(event, gattc_if, param))
-    return false;
-
-  switch (event) {
-    case ESP_GATTC_DISCONNECT_EVT: {
-      api::global_api_server->send_bluetooth_device_connection(this->address_, false, 0, param->disconnect.reason);
-      this->set_address(0);
-      api::global_api_server->send_bluetooth_connections_free(this->proxy_->get_bluetooth_connections_free(),
-                                                              this->proxy_->get_bluetooth_connections_limit());
-      break;
-    }
-    case ESP_GATTC_OPEN_EVT: {
-      if (param->open.conn_id != this->conn_id_)
-        break;
-      if (param->open.status != ESP_GATT_OK && param->open.status != ESP_GATT_ALREADY_OPEN) {
-        api::global_api_server->send_bluetooth_device_connection(this->address_, false, 0, param->open.status);
-        this->set_address(0);
-        api::global_api_server->send_bluetooth_connections_free(this->proxy_->get_bluetooth_connections_free(),
-                                                                this->proxy_->get_bluetooth_connections_limit());
-      } else if (this->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE) {
-        api::global_api_server->send_bluetooth_device_connection(this->address_, true, this->mtu_);
-        api::global_api_server->send_bluetooth_connections_free(this->proxy_->get_bluetooth_connections_free(),
-                                                                this->proxy_->get_bluetooth_connections_limit());
-      }
-      this->seen_mtu_or_services_ = false;
-      break;
-    }
-    case ESP_GATTC_CFG_MTU_EVT: {
-      if (param->cfg_mtu.conn_id != this->conn_id_)
-        break;
-      if (!this->seen_mtu_or_services_) {
-        // We don't know if we will get the MTU or the services first, so
-        // only send the device connection true if we have already received
-        // the services.
-        this->seen_mtu_or_services_ = true;
-        break;
-      }
-      api::global_api_server->send_bluetooth_device_connection(this->address_, true, this->mtu_);
-      api::global_api_server->send_bluetooth_connections_free(this->proxy_->get_bluetooth_connections_free(),
-                                                              this->proxy_->get_bluetooth_connections_limit());
-      break;
-    }
-    case ESP_GATTC_SEARCH_CMPL_EVT: {
-      if (param->search_cmpl.conn_id != this->conn_id_)
-        break;
-      if (!this->seen_mtu_or_services_) {
-        // We don't know if we will get the MTU or the services first, so
-        // only send the device connection true if we have already received
-        // the mtu.
-        this->seen_mtu_or_services_ = true;
-        break;
-      }
-      api::global_api_server->send_bluetooth_device_connection(this->address_, true, this->mtu_);
-      api::global_api_server->send_bluetooth_connections_free(this->proxy_->get_bluetooth_connections_free(),
-                                                              this->proxy_->get_bluetooth_connections_limit());
-      break;
-    }
-    case ESP_GATTC_READ_DESCR_EVT:
-    case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->conn_id_)
-        break;
-      if (param->read.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "[%d] [%s] Error reading char/descriptor at handle 0x%2X, status=%d", this->connection_index_,
-                 this->address_str_.c_str(), param->read.handle, param->read.status);
-        api::global_api_server->send_bluetooth_gatt_error(this->address_, param->read.handle, param->read.status);
-        break;
-      }
-      api::BluetoothGATTReadResponse resp;
-      resp.address = this->address_;
-      resp.handle = param->read.handle;
-      resp.data.reserve(param->read.value_len);
-      for (uint16_t i = 0; i < param->read.value_len; i++) {
-        resp.data.push_back(param->read.value[i]);
-      }
-      api::global_api_server->send_bluetooth_gatt_read_response(resp);
-      break;
-    }
-    case ESP_GATTC_WRITE_CHAR_EVT:
-    case ESP_GATTC_WRITE_DESCR_EVT: {
-      if (param->write.conn_id != this->conn_id_)
-        break;
-      if (param->write.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "[%d] [%s] Error writing char/descriptor at handle 0x%2X, status=%d", this->connection_index_,
-                 this->address_str_.c_str(), param->write.handle, param->write.status);
-        api::global_api_server->send_bluetooth_gatt_error(this->address_, param->write.handle, param->write.status);
-        break;
-      }
-      api::BluetoothGATTWriteResponse resp;
-      resp.address = this->address_;
-      resp.handle = param->write.handle;
-      api::global_api_server->send_bluetooth_gatt_write_response(resp);
-      break;
-    }
-    case ESP_GATTC_UNREG_FOR_NOTIFY_EVT: {
-      if (param->unreg_for_notify.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "[%d] [%s] Error unregistering notifications for handle 0x%2X, status=%d",
-                 this->connection_index_, this->address_str_.c_str(), param->unreg_for_notify.handle,
-                 param->unreg_for_notify.status);
-        api::global_api_server->send_bluetooth_gatt_error(this->address_, param->unreg_for_notify.handle,
-                                                          param->unreg_for_notify.status);
-        break;
-      }
-      api::BluetoothGATTNotifyResponse resp;
-      resp.address = this->address_;
-      resp.handle = param->unreg_for_notify.handle;
-      api::global_api_server->send_bluetooth_gatt_notify_response(resp);
-      break;
-    }
-    case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
-      if (param->reg_for_notify.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "[%d] [%s] Error registering notifications for handle 0x%2X, status=%d", this->connection_index_,
-                 this->address_str_.c_str(), param->reg_for_notify.handle, param->reg_for_notify.status);
-        api::global_api_server->send_bluetooth_gatt_error(this->address_, param->reg_for_notify.handle,
-                                                          param->reg_for_notify.status);
-        break;
-      }
-      api::BluetoothGATTNotifyResponse resp;
-      resp.address = this->address_;
-      resp.handle = param->reg_for_notify.handle;
-      api::global_api_server->send_bluetooth_gatt_notify_response(resp);
-      break;
-    }
-    case ESP_GATTC_NOTIFY_EVT: {
-      if (param->notify.conn_id != this->conn_id_)
-        break;
-      ESP_LOGV(TAG, "[%d] [%s] ESP_GATTC_NOTIFY_EVT: handle=0x%2X", this->connection_index_, this->address_str_.c_str(),
-               param->notify.handle);
-      api::BluetoothGATTNotifyDataResponse resp;
-      resp.address = this->address_;
-      resp.handle = param->notify.handle;
-      resp.data.reserve(param->notify.value_len);
-      for (uint16_t i = 0; i < param->notify.value_len; i++) {
-        resp.data.push_back(param->notify.value[i]);
-      }
-      api::global_api_server->send_bluetooth_gatt_notify_data_response(resp);
-      break;
-    }
-    default:
-      break;
-  }
-  return true;
-}
-
-esp_err_t BluetoothConnection::read_characteristic(uint16_t handle) {
-  if (!this->connected()) {
-    ESP_LOGW(TAG, "[%d] [%s] Cannot read GATT characteristic, not connected.", this->connection_index_,
-             this->address_str_.c_str());
-    return ESP_GATT_NOT_CONNECTED;
-  }
-
-  ESP_LOGV(TAG, "[%d] [%s] Reading GATT characteristic handle %d", this->connection_index_, this->address_str_.c_str(),
-           handle);
-
-  esp_err_t err = esp_ble_gattc_read_char(this->gattc_if_, this->conn_id_, handle, ESP_GATT_AUTH_REQ_NONE);
-  if (err != ERR_OK) {
-    ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_read_char error, err=%d", this->connection_index_,
-             this->address_str_.c_str(), err);
-    return err;
-  }
-  return ESP_OK;
-}
-
-esp_err_t BluetoothConnection::write_characteristic(uint16_t handle, const std::string &data, bool response) {
-  if (!this->connected()) {
-    ESP_LOGW(TAG, "[%d] [%s] Cannot write GATT characteristic, not connected.", this->connection_index_,
-             this->address_str_.c_str());
-    return ESP_GATT_NOT_CONNECTED;
-  }
-  ESP_LOGV(TAG, "[%d] [%s] Writing GATT characteristic handle %d", this->connection_index_, this->address_str_.c_str(),
-           handle);
-
-  esp_err_t err =
-      esp_ble_gattc_write_char(this->gattc_if_, this->conn_id_, handle, data.size(), (uint8_t *) data.data(),
-                               response ? ESP_GATT_WRITE_TYPE_RSP : ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
-  if (err != ERR_OK) {
-    ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_write_char error, err=%d", this->connection_index_,
-             this->address_str_.c_str(), err);
-    return err;
-  }
-  return ESP_OK;
-}
-
-esp_err_t BluetoothConnection::read_descriptor(uint16_t handle) {
-  if (!this->connected()) {
-    ESP_LOGW(TAG, "[%d] [%s] Cannot read GATT descriptor, not connected.", this->connection_index_,
-             this->address_str_.c_str());
-    return ESP_GATT_NOT_CONNECTED;
-  }
-  ESP_LOGV(TAG, "[%d] [%s] Reading GATT descriptor handle %d", this->connection_index_, this->address_str_.c_str(),
-           handle);
-
-  esp_err_t err = esp_ble_gattc_read_char_descr(this->gattc_if_, this->conn_id_, handle, ESP_GATT_AUTH_REQ_NONE);
-  if (err != ERR_OK) {
-    ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_read_char_descr error, err=%d", this->connection_index_,
-             this->address_str_.c_str(), err);
-    return err;
-  }
-  return ESP_OK;
-}
-
-esp_err_t BluetoothConnection::write_descriptor(uint16_t handle, const std::string &data, bool response) {
-  if (!this->connected()) {
-    ESP_LOGW(TAG, "[%d] [%s] Cannot write GATT descriptor, not connected.", this->connection_index_,
-             this->address_str_.c_str());
-    return ESP_GATT_NOT_CONNECTED;
-  }
-  ESP_LOGV(TAG, "[%d] [%s] Writing GATT descriptor handle %d", this->connection_index_, this->address_str_.c_str(),
-           handle);
-
-  esp_err_t err = esp_ble_gattc_write_char_descr(
-      this->gattc_if_, this->conn_id_, handle, data.size(), (uint8_t *) data.data(),
-      response ? ESP_GATT_WRITE_TYPE_RSP : ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
-  if (err != ERR_OK) {
-    ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_write_char_descr error, err=%d", this->connection_index_,
-             this->address_str_.c_str(), err);
-    return err;
-  }
-  return ESP_OK;
-}
-
-esp_err_t BluetoothConnection::notify_characteristic(uint16_t handle, bool enable) {
-  if (!this->connected()) {
-    ESP_LOGW(TAG, "[%d] [%s] Cannot notify GATT characteristic, not connected.", this->connection_index_,
-             this->address_str_.c_str());
-    return ESP_GATT_NOT_CONNECTED;
-  }
-
-  if (enable) {
-    ESP_LOGV(TAG, "[%d] [%s] Registering for GATT characteristic notifications handle %d", this->connection_index_,
-             this->address_str_.c_str(), handle);
-    esp_err_t err = esp_ble_gattc_register_for_notify(this->gattc_if_, this->remote_bda_, handle);
-    if (err != ESP_OK) {
-      ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_register_for_notify failed, err=%d", this->connection_index_,
-               this->address_str_.c_str(), err);
-      return err;
-    }
-  } else {
-    ESP_LOGV(TAG, "[%d] [%s] Unregistering for GATT characteristic notifications handle %d", this->connection_index_,
-             this->address_str_.c_str(), handle);
-    esp_err_t err = esp_ble_gattc_unregister_for_notify(this->gattc_if_, this->remote_bda_, handle);
-    if (err != ESP_OK) {
-      ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_unregister_for_notify failed, err=%d", this->connection_index_,
-               this->address_str_.c_str(), err);
-      return err;
-    }
-  }
-  return ESP_OK;
-}
-
-}  // namespace bluetooth_proxy
-}  // namespace esphome
-
-#endif  // USE_ESP32
--- a/esphome/components/bluetooth_proxy/bluetooth_connection.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_connection.h
@@ -1,35 +0,0 @@
-#pragma once
-
-#ifdef USE_ESP32
-
-#include "esphome/components/esp32_ble_client/ble_client_base.h"
-
-namespace esphome {
-namespace bluetooth_proxy {
-
-class BluetoothProxy;
-
-class BluetoothConnection : public esp32_ble_client::BLEClientBase {
- public:
-  bool gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                           esp_ble_gattc_cb_param_t *param) override;
-
-  esp_err_t read_characteristic(uint16_t handle);
-  esp_err_t write_characteristic(uint16_t handle, const std::string &data, bool response);
-  esp_err_t read_descriptor(uint16_t handle);
-  esp_err_t write_descriptor(uint16_t handle, const std::string &data, bool response);
-
-  esp_err_t notify_characteristic(uint16_t handle, bool enable);
-
- protected:
-  friend class BluetoothProxy;
-  bool seen_mtu_or_services_{false};
-
-  int16_t send_service_{-2};
-  BluetoothProxy *proxy_;
-};
-
-}  // namespace bluetooth_proxy
-}  // namespace esphome
-
-#endif  // USE_ESP32
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -10,22 +10,15 @@ namespace esphome {
 namespace bluetooth_proxy {

 static const char *const TAG = "bluetooth_proxy";
-static const int DONE_SENDING_SERVICES = -2;

-std::vector<uint64_t> get_128bit_uuid_vec(esp_bt_uuid_t uuid_source) {
-  esp_bt_uuid_t uuid = espbt::ESPBTUUID::from_uuid(uuid_source).as_128bit().get_uuid();
-  return std::vector<uint64_t>{((uint64_t) uuid.uuid.uuid128[15] << 56) | ((uint64_t) uuid.uuid.uuid128[14] << 48) |
-                                   ((uint64_t) uuid.uuid.uuid128[13] << 40) | ((uint64_t) uuid.uuid.uuid128[12] << 32) |
-                                   ((uint64_t) uuid.uuid.uuid128[11] << 24) | ((uint64_t) uuid.uuid.uuid128[10] << 16) |
-                                   ((uint64_t) uuid.uuid.uuid128[9] << 8) | ((uint64_t) uuid.uuid.uuid128[8]),
-                               ((uint64_t) uuid.uuid.uuid128[7] << 56) | ((uint64_t) uuid.uuid.uuid128[6] << 48) |
-                                   ((uint64_t) uuid.uuid.uuid128[5] << 40) | ((uint64_t) uuid.uuid.uuid128[4] << 32) |
-                                   ((uint64_t) uuid.uuid.uuid128[3] << 24) | ((uint64_t) uuid.uuid.uuid128[2] << 16) |
-                                   ((uint64_t) uuid.uuid.uuid128[1] << 8) | ((uint64_t) uuid.uuid.uuid128[0])};
+static const esp_err_t ESP_GATT_NOT_CONNECTED = -1;
+static const esp_err_t ESP_GATT_WRONG_ADDRESS = -2;
+
+BluetoothProxy::BluetoothProxy() {
+  global_bluetooth_proxy = this;
+  this->address_ = 0;
 }

-BluetoothProxy::BluetoothProxy() { global_bluetooth_proxy = this; }
-
 bool BluetoothProxy::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
  if (!api::global_api_server->is_connected())
    return false;
@@ -33,13 +26,16 @@ bool BluetoothProxy::parse_device(const esp32_ble_tracker::ESPBTDevice &device)
           device.get_rssi());
  this->send_api_packet_(device);

+  if (this->address_ == 0)
+    return true;
+
+  BLEClientBase::parse_device(device);
  return true;
 }

 void BluetoothProxy::send_api_packet_(const esp32_ble_tracker::ESPBTDevice &device) {
  api::BluetoothLEAdvertisementResponse resp;
  resp.address = device.address_uint64();
-  resp.address_type = device.get_address_type();
  if (!device.get_name().empty())
    resp.name = device.get_name();
  resp.rssi = device.get_rssi();
@@ -61,232 +57,167 @@ void BluetoothProxy::send_api_packet_(const esp32_ble_tracker::ESPBTDevice &devi
  api::global_api_server->send_bluetooth_le_advertisement(resp);
 }

-void BluetoothProxy::dump_config() {
-  ESP_LOGCONFIG(TAG, "Bluetooth Proxy:");
-  ESP_LOGCONFIG(TAG, "  Active: %s", YESNO(this->active_));
-}
-
-int BluetoothProxy::get_bluetooth_connections_free() {
-  int free = 0;
-  for (auto *connection : this->connections_) {
-    if (connection->address_ == 0) {
-      free++;
-      ESP_LOGV(TAG, "[%d] Free connection", connection->get_connection_index());
-    } else {
-      ESP_LOGV(TAG, "[%d] Used connection by [%s]", connection->get_connection_index(),
-               connection->address_str().c_str());
+void BluetoothProxy::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
+                                         esp_ble_gattc_cb_param_t *param) {
+  BLEClientBase::gattc_event_handler(event, gattc_if, param);
+  switch (event) {
+    case ESP_GATTC_DISCONNECT_EVT: {
+      api::global_api_server->send_bluetooth_device_connection(this->address_, false, this->mtu_,
+                                                               param->disconnect.reason);
+      api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
+                                                              this->get_bluetooth_connections_limit());
+      this->address_ = 0;
    }
-  }
-  return free;
-}
-
-void BluetoothProxy::loop() {
-  if (!api::global_api_server->is_connected()) {
-    for (auto *connection : this->connections_) {
-      if (connection->get_address() != 0) {
-        connection->disconnect();
+    case ESP_GATTC_OPEN_EVT: {
+      if (param->open.status != ESP_GATT_OK && param->open.status != ESP_GATT_ALREADY_OPEN) {
+        api::global_api_server->send_bluetooth_device_connection(this->address_, false, this->mtu_, param->open.status);
+        break;
      }
+      break;
    }
-    return;
-  }
-  for (auto *connection : this->connections_) {
-    if (connection->send_service_ == connection->service_count_) {
-      connection->send_service_ = DONE_SENDING_SERVICES;
-      api::global_api_server->send_bluetooth_gatt_services_done(connection->get_address());
-      if (connection->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE ||
-          connection->connection_type_ == espbt::ConnectionType::V3_WITHOUT_CACHE) {
-        connection->release_services();
-      }
-    } else if (connection->send_service_ >= 0) {
-      esp_gattc_service_elem_t service_result;
-      uint16_t service_count = 1;
-      esp_gatt_status_t service_status =
-          esp_ble_gattc_get_service(connection->get_gattc_if(), connection->get_conn_id(), nullptr, &service_result,
-                                    &service_count, connection->send_service_);
-      connection->send_service_++;
-      if (service_status != ESP_GATT_OK) {
-        ESP_LOGE(TAG, "[%d] [%s] esp_ble_gattc_get_service error at offset=%d, status=%d",
-                 connection->get_connection_index(), connection->address_str().c_str(), connection->send_service_ - 1,
-                 service_status);
-        continue;
-      }
-      if (service_count == 0) {
-        ESP_LOGE(TAG, "[%d] [%s] esp_ble_gattc_get_service missing, service_count=%d",
-                 connection->get_connection_index(), connection->address_str().c_str(), service_count);
-        continue;
-      }
-      api::BluetoothGATTGetServicesResponse resp;
-      resp.address = connection->get_address();
-      api::BluetoothGATTService service_resp;
-      service_resp.uuid = get_128bit_uuid_vec(service_result.uuid);
-      service_resp.handle = service_result.start_handle;
-      uint16_t char_offset = 0;
-      esp_gattc_char_elem_t char_result;
-      while (true) {  // characteristics
-        uint16_t char_count = 1;
-        esp_gatt_status_t char_status = esp_ble_gattc_get_all_char(
-            connection->get_gattc_if(), connection->get_conn_id(), service_result.start_handle,
-            service_result.end_handle, &char_result, &char_count, char_offset);
-        if (char_status == ESP_GATT_INVALID_OFFSET || char_status == ESP_GATT_NOT_FOUND) {
-          break;
-        }
-        if (char_status != ESP_GATT_OK) {
-          ESP_LOGE(TAG, "[%d] [%s] esp_ble_gattc_get_all_char error, status=%d", connection->get_connection_index(),
-                   connection->address_str().c_str(), char_status);
-          break;
-        }
-        if (char_count == 0) {
-          break;
-        }
-        api::BluetoothGATTCharacteristic characteristic_resp;
-        characteristic_resp.uuid = get_128bit_uuid_vec(char_result.uuid);
-        characteristic_resp.handle = char_result.char_handle;
-        characteristic_resp.properties = char_result.properties;
-        char_offset++;
-        uint16_t desc_offset = 0;
-        esp_gattc_descr_elem_t desc_result;
-        while (true) {  // descriptors
-          uint16_t desc_count = 1;
-          esp_gatt_status_t desc_status =
-              esp_ble_gattc_get_all_descr(connection->get_gattc_if(), connection->get_conn_id(),
-                                          char_result.char_handle, &desc_result, &desc_count, desc_offset);
-          if (desc_status == ESP_GATT_INVALID_OFFSET || desc_status == ESP_GATT_NOT_FOUND) {
-            break;
-          }
-          if (desc_status != ESP_GATT_OK) {
-            ESP_LOGE(TAG, "[%d] [%s] esp_ble_gattc_get_all_descr error, status=%d", connection->get_connection_index(),
-                     connection->address_str().c_str(), desc_status);
-            break;
-          }
-          if (desc_count == 0) {
-            break;
-          }
-          api::BluetoothGATTDescriptor descriptor_resp;
-          descriptor_resp.uuid = get_128bit_uuid_vec(desc_result.uuid);
-          descriptor_resp.handle = desc_result.handle;
-          characteristic_resp.descriptors.push_back(std::move(descriptor_resp));
-          desc_offset++;
-        }
-        service_resp.characteristics.push_back(std::move(characteristic_resp));
-      }
-      resp.services.push_back(std::move(service_resp));
-      api::global_api_server->send_bluetooth_gatt_services(resp);
-    }
-  }
-}
-
-BluetoothConnection *BluetoothProxy::get_connection_(uint64_t address, bool reserve) {
-  for (auto *connection : this->connections_) {
-    if (connection->get_address() == address)
-      return connection;
-  }
-
-  if (!reserve)
-    return nullptr;
-
-  for (auto *connection : this->connections_) {
-    if (connection->get_address() == 0) {
-      connection->send_service_ = DONE_SENDING_SERVICES;
-      connection->set_address(address);
-      // All connections must start at INIT
-      // We only set the state if we allocate the connection
-      // to avoid a race where multiple connection attempts
-      // are made.
-      connection->set_state(espbt::ClientState::INIT);
-      return connection;
-    }
-  }
-
-  return nullptr;
-}
-
-void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest &msg) {
-  switch (msg.request_type) {
-    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITH_CACHE:
-    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE:
-    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT: {
-      auto *connection = this->get_connection_(msg.address, true);
-      if (connection == nullptr) {
-        ESP_LOGW(TAG, "No free connections available");
-        api::global_api_server->send_bluetooth_device_connection(msg.address, false);
-        return;
-      }
-      if (connection->state() == espbt::ClientState::CONNECTED ||
-          connection->state() == espbt::ClientState::ESTABLISHED) {
-        ESP_LOGW(TAG, "[%d] [%s] Connection already established", connection->get_connection_index(),
-                 connection->address_str().c_str());
-        api::global_api_server->send_bluetooth_device_connection(msg.address, true);
-        api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
-                                                                this->get_bluetooth_connections_limit());
-        return;
-      } else if (connection->state() == espbt::ClientState::SEARCHING) {
-        ESP_LOGW(TAG, "[%d] [%s] Connection request ignored, already searching for device",
-                 connection->get_connection_index(), connection->address_str().c_str());
-        return;
-      } else if (connection->state() == espbt::ClientState::DISCOVERED) {
-        ESP_LOGW(TAG, "[%d] [%s] Connection request ignored, device already discovered",
-                 connection->get_connection_index(), connection->address_str().c_str());
-        return;
-      } else if (connection->state() == espbt::ClientState::READY_TO_CONNECT) {
-        ESP_LOGW(TAG, "[%d] [%s] Connection request ignored, waiting in line to connect",
-                 connection->get_connection_index(), connection->address_str().c_str());
-        return;
-      } else if (connection->state() == espbt::ClientState::CONNECTING) {
-        ESP_LOGW(TAG, "[%d] [%s] Connection request ignored, already connecting", connection->get_connection_index(),
-                 connection->address_str().c_str());
-        return;
-      } else if (connection->state() == espbt::ClientState::DISCONNECTING) {
-        ESP_LOGW(TAG, "[%d] [%s] Connection request ignored, device is disconnecting",
-                 connection->get_connection_index(), connection->address_str().c_str());
-        return;
-      } else if (connection->state() != espbt::ClientState::INIT) {
-        ESP_LOGW(TAG, "[%d] [%s] Connection already in progress", connection->get_connection_index(),
-                 connection->address_str().c_str());
-        return;
-      }
-      if (msg.request_type == api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITH_CACHE) {
-        connection->set_connection_type(espbt::ConnectionType::V3_WITH_CACHE);
-        ESP_LOGI(TAG, "[%d] [%s] Connecting v3 with cache", connection->get_connection_index(),
-                 connection->address_str().c_str());
-      } else if (msg.request_type == api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE) {
-        connection->set_connection_type(espbt::ConnectionType::V3_WITHOUT_CACHE);
-        ESP_LOGI(TAG, "[%d] [%s] Connecting v3 without cache", connection->get_connection_index(),
-                 connection->address_str().c_str());
-      } else {
-        connection->set_connection_type(espbt::ConnectionType::V1);
-        ESP_LOGI(TAG, "[%d] [%s] Connecting v1", connection->get_connection_index(), connection->address_str().c_str());
-      }
-      if (msg.has_address_type) {
-        connection->remote_bda_[0] = (msg.address >> 40) & 0xFF;
-        connection->remote_bda_[1] = (msg.address >> 32) & 0xFF;
-        connection->remote_bda_[2] = (msg.address >> 24) & 0xFF;
-        connection->remote_bda_[3] = (msg.address >> 16) & 0xFF;
-        connection->remote_bda_[4] = (msg.address >> 8) & 0xFF;
-        connection->remote_bda_[5] = (msg.address >> 0) & 0xFF;
-        connection->set_remote_addr_type(static_cast<esp_ble_addr_type_t>(msg.address_type));
-        connection->set_state(espbt::ClientState::DISCOVERED);
-      } else {
-        connection->set_state(espbt::ClientState::SEARCHING);
-      }
+    case ESP_GATTC_SEARCH_CMPL_EVT: {
+      api::global_api_server->send_bluetooth_device_connection(this->address_, true, this->mtu_);
      api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
                                                              this->get_bluetooth_connections_limit());
      break;
    }
-    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT: {
-      auto *connection = this->get_connection_(msg.address, false);
-      if (connection == nullptr) {
-        api::global_api_server->send_bluetooth_device_connection(msg.address, false);
-        api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
-                                                                this->get_bluetooth_connections_limit());
-        return;
+    case ESP_GATTC_READ_DESCR_EVT:
+    case ESP_GATTC_READ_CHAR_EVT: {
+      if (param->read.conn_id != this->conn_id_)
+        break;
+      if (param->read.status != ESP_GATT_OK) {
+        ESP_LOGW(TAG, "Error reading char/descriptor at handle 0x%2X, status=%d", param->read.handle,
+                 param->read.status);
+        api::global_api_server->send_bluetooth_gatt_error(this->address_, param->read.handle, param->read.status);
+        break;
      }
-      if (connection->state() != espbt::ClientState::IDLE) {
-        connection->disconnect();
-      } else {
-        connection->set_address(0);
-        api::global_api_server->send_bluetooth_device_connection(msg.address, false);
-        api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
-                                                                this->get_bluetooth_connections_limit());
+      api::BluetoothGATTReadResponse resp;
+      resp.address = this->address_;
+      resp.handle = param->read.handle;
+      resp.data.reserve(param->read.value_len);
+      for (uint16_t i = 0; i < param->read.value_len; i++) {
+        resp.data.push_back(param->read.value[i]);
+      }
+      api::global_api_server->send_bluetooth_gatt_read_response(resp);
+      break;
+    }
+    case ESP_GATTC_WRITE_CHAR_EVT:
+    case ESP_GATTC_WRITE_DESCR_EVT: {
+      if (param->write.conn_id != this->conn_id_)
+        break;
+      if (param->write.status != ESP_GATT_OK) {
+        ESP_LOGW(TAG, "Error writing char/descriptor at handle 0x%2X, status=%d", param->write.handle,
+                 param->write.status);
+        api::global_api_server->send_bluetooth_gatt_error(this->address_, param->write.handle, param->write.status);
+        break;
+      }
+      api::BluetoothGATTWriteResponse resp;
+      resp.address = this->address_;
+      resp.handle = param->write.handle;
+      api::global_api_server->send_bluetooth_gatt_write_response(resp);
+      break;
+    }
+    case ESP_GATTC_UNREG_FOR_NOTIFY_EVT: {
+      if (param->unreg_for_notify.status != ESP_GATT_OK) {
+        ESP_LOGW(TAG, "Error unregistering notifications for handle 0x%2X, status=%d", param->unreg_for_notify.handle,
+                 param->unreg_for_notify.status);
+        api::global_api_server->send_bluetooth_gatt_error(this->address_, param->unreg_for_notify.handle,
+                                                          param->unreg_for_notify.status);
+        break;
+      }
+      api::BluetoothGATTNotifyResponse resp;
+      resp.address = this->address_;
+      resp.handle = param->unreg_for_notify.handle;
+      api::global_api_server->send_bluetooth_gatt_notify_response(resp);
+      break;
+    }
+    case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
+      if (param->reg_for_notify.status != ESP_GATT_OK) {
+        ESP_LOGW(TAG, "Error registering notifications for handle 0x%2X, status=%d", param->reg_for_notify.handle,
+                 param->reg_for_notify.status);
+        api::global_api_server->send_bluetooth_gatt_error(this->address_, param->reg_for_notify.handle,
+                                                          param->reg_for_notify.status);
+        break;
+      }
+      api::BluetoothGATTNotifyResponse resp;
+      resp.address = this->address_;
+      resp.handle = param->reg_for_notify.handle;
+      api::global_api_server->send_bluetooth_gatt_notify_response(resp);
+      break;
+    }
+    case ESP_GATTC_NOTIFY_EVT: {
+      if (param->notify.conn_id != this->conn_id_)
+        break;
+      ESP_LOGV(TAG, "ESP_GATTC_NOTIFY_EVT: handle=0x%2X", param->notify.handle);
+      api::BluetoothGATTNotifyDataResponse resp;
+      resp.address = this->address_;
+      resp.handle = param->notify.handle;
+      resp.data.reserve(param->notify.value_len);
+      for (uint16_t i = 0; i < param->notify.value_len; i++) {
+        resp.data.push_back(param->notify.value[i]);
+      }
+      api::global_api_server->send_bluetooth_gatt_notify_data_response(resp);
+      break;
+    }
+    default:
+      break;
+  }
+}
+
+void BluetoothProxy::dump_config() { ESP_LOGCONFIG(TAG, "Bluetooth Proxy:"); }
+
+void BluetoothProxy::loop() {
+  BLEClientBase::loop();
+  if (this->state_ != espbt::ClientState::IDLE && !api::global_api_server->is_connected()) {
+    ESP_LOGI(TAG, "[%s] Disconnecting.", this->address_str().c_str());
+    auto err = esp_ble_gattc_close(this->gattc_if_, this->conn_id_);
+    if (err != ERR_OK) {
+      ESP_LOGW(TAG, "esp_ble_gattc_close error, address=%s err=%d", this->address_str().c_str(), err);
+    }
+  }
+
+  if (this->send_service_ == this->services_.size()) {
+    this->send_service_ = -1;
+    api::global_api_server->send_bluetooth_gatt_services_done(this->address_);
+  } else if (this->send_service_ >= 0) {
+    auto &service = this->services_[this->send_service_];
+    api::BluetoothGATTGetServicesResponse resp;
+    resp.address = this->address_;
+    api::BluetoothGATTService service_resp;
+    service_resp.uuid = {service->uuid.get_128bit_high(), service->uuid.get_128bit_low()};
+    service_resp.handle = service->start_handle;
+    for (auto &characteristic : service->characteristics) {
+      api::BluetoothGATTCharacteristic characteristic_resp;
+      characteristic_resp.uuid = {characteristic->uuid.get_128bit_high(), characteristic->uuid.get_128bit_low()};
+      characteristic_resp.handle = characteristic->handle;
+      characteristic_resp.properties = characteristic->properties;
+      for (auto &descriptor : characteristic->descriptors) {
+        api::BluetoothGATTDescriptor descriptor_resp;
+        descriptor_resp.uuid = {descriptor->uuid.get_128bit_high(), descriptor->uuid.get_128bit_low()};
+        descriptor_resp.handle = descriptor->handle;
+        characteristic_resp.descriptors.push_back(std::move(descriptor_resp));
+      }
+      service_resp.characteristics.push_back(std::move(characteristic_resp));
+    }
+    resp.services.push_back(std::move(service_resp));
+    api::global_api_server->send_bluetooth_gatt_services(resp);
+    this->send_service_++;
+  }
+}
+
+void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest &msg) {
+  switch (msg.request_type) {
+    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT: {
+      this->address_ = msg.address;
+      break;
+    }
+    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT: {
+      if (this->state() != espbt::ClientState::IDLE) {
+        ESP_LOGI(TAG, "[%s] Disconnecting.", this->address_str().c_str());
+        auto err = esp_ble_gattc_close(this->gattc_if_, this->conn_id_);
+        if (err != ERR_OK) {
+          ESP_LOGW(TAG, "esp_ble_gattc_close error, address=%s err=%d", this->address_str().c_str(), err);
+        }
      }
      break;
    }
@@ -297,89 +228,170 @@ void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest
 }

 void BluetoothProxy::bluetooth_gatt_read(const api::BluetoothGATTReadRequest &msg) {
-  auto *connection = this->get_connection_(msg.address, false);
-  if (connection == nullptr) {
-    ESP_LOGW(TAG, "Cannot read GATT characteristic, not connected");
+  if (this->state_ != espbt::ClientState::ESTABLISHED) {
+    ESP_LOGW(TAG, "Cannot read GATT characteristic, not connected.");
    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
    return;
  }
+  if (this->address_ != msg.address) {
+    ESP_LOGW(TAG, "Address mismatch for read GATT characteristic request");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_WRONG_ADDRESS);
+    return;
+  }

-  auto err = connection->read_characteristic(msg.handle);
-  if (err != ESP_OK) {
+  auto *characteristic = this->get_characteristic(msg.handle);
+  if (characteristic == nullptr) {
+    ESP_LOGW(TAG, "Cannot read GATT characteristic, not found.");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_INVALID_HANDLE);
+    return;
+  }
+
+  ESP_LOGV(TAG, "Reading GATT characteristic %s", characteristic->uuid.to_string().c_str());
+
+  esp_err_t err =
+      esp_ble_gattc_read_char(this->gattc_if_, this->conn_id_, characteristic->handle, ESP_GATT_AUTH_REQ_NONE);
+  if (err != ERR_OK) {
+    ESP_LOGW(TAG, "esp_ble_gattc_read_char error, err=%d", err);
    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, err);
  }
 }

 void BluetoothProxy::bluetooth_gatt_write(const api::BluetoothGATTWriteRequest &msg) {
-  auto *connection = this->get_connection_(msg.address, false);
-  if (connection == nullptr) {
-    ESP_LOGW(TAG, "Cannot write GATT characteristic, not connected");
+  if (this->state_ != espbt::ClientState::ESTABLISHED) {
+    ESP_LOGW(TAG, "Cannot write GATT characteristic, not connected.");
    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
    return;
  }
+  if (this->address_ != msg.address) {
+    ESP_LOGW(TAG, "Address mismatch for write GATT characteristic request");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_WRONG_ADDRESS);
+    return;
+  }

-  auto err = connection->write_characteristic(msg.handle, msg.data, msg.response);
-  if (err != ESP_OK) {
+  auto *characteristic = this->get_characteristic(msg.handle);
+  if (characteristic == nullptr) {
+    ESP_LOGW(TAG, "Cannot write GATT characteristic, not found.");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_INVALID_HANDLE);
+    return;
+  }
+
+  ESP_LOGV(TAG, "Writing GATT characteristic %s", characteristic->uuid.to_string().c_str());
+  auto err = characteristic->write_value((uint8_t *) msg.data.data(), msg.data.size(),
+                                         msg.response ? ESP_GATT_WRITE_TYPE_RSP : ESP_GATT_WRITE_TYPE_NO_RSP);
+  if (err != ERR_OK) {
    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, err);
  }
 }

 void BluetoothProxy::bluetooth_gatt_read_descriptor(const api::BluetoothGATTReadDescriptorRequest &msg) {
-  auto *connection = this->get_connection_(msg.address, false);
-  if (connection == nullptr) {
-    ESP_LOGW(TAG, "Cannot read GATT descriptor, not connected");
+  if (this->state_ != espbt::ClientState::ESTABLISHED) {
+    ESP_LOGW(TAG, "Cannot read GATT characteristic descriptor, not connected.");
    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
    return;
  }
+  if (this->address_ != msg.address) {
+    ESP_LOGW(TAG, "Address mismatch for read GATT characteristic descriptor request");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_WRONG_ADDRESS);
+    return;
+  }

-  auto err = connection->read_descriptor(msg.handle);
-  if (err != ESP_OK) {
+  auto *descriptor = this->get_descriptor(msg.handle);
+  if (descriptor == nullptr) {
+    ESP_LOGW(TAG, "Cannot read GATT characteristic descriptor, not found.");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_INVALID_HANDLE);
+    return;
+  }
+
+  ESP_LOGV(TAG, "Reading GATT characteristic descriptor %s -> %s", descriptor->characteristic->uuid.to_string().c_str(),
+           descriptor->uuid.to_string().c_str());
+
+  esp_err_t err =
+      esp_ble_gattc_read_char_descr(this->gattc_if_, this->conn_id_, descriptor->handle, ESP_GATT_AUTH_REQ_NONE);
+  if (err != ERR_OK) {
+    ESP_LOGW(TAG, "esp_ble_gattc_read_char error, err=%d", err);
    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, err);
  }
 }

 void BluetoothProxy::bluetooth_gatt_write_descriptor(const api::BluetoothGATTWriteDescriptorRequest &msg) {
-  auto *connection = this->get_connection_(msg.address, false);
-  if (connection == nullptr) {
-    ESP_LOGW(TAG, "Cannot write GATT descriptor, not connected");
+  if (this->state_ != espbt::ClientState::ESTABLISHED) {
+    ESP_LOGW(TAG, "Cannot write GATT characteristic descriptor, not connected.");
    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
    return;
  }
+  if (this->address_ != msg.address) {
+    ESP_LOGW(TAG, "Address mismatch for write GATT characteristic descriptor request");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_WRONG_ADDRESS);
+    return;
+  }

-  auto err = connection->write_descriptor(msg.handle, msg.data, true);
-  if (err != ESP_OK) {
+  auto *descriptor = this->get_descriptor(msg.handle);
+  if (descriptor == nullptr) {
+    ESP_LOGW(TAG, "Cannot write GATT characteristic descriptor, not found.");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_INVALID_HANDLE);
+    return;
+  }
+
+  ESP_LOGV(TAG, "Writing GATT characteristic descriptor %s -> %s", descriptor->characteristic->uuid.to_string().c_str(),
+           descriptor->uuid.to_string().c_str());
+
+  esp_err_t err =
+      esp_ble_gattc_write_char_descr(this->gattc_if_, this->conn_id_, descriptor->handle, msg.data.size(),
+                                     (uint8_t *) msg.data.data(), ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+  if (err != ERR_OK) {
+    ESP_LOGW(TAG, "esp_ble_gattc_write_char_descr error, err=%d", err);
    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, err);
  }
 }

 void BluetoothProxy::bluetooth_gatt_send_services(const api::BluetoothGATTGetServicesRequest &msg) {
-  auto *connection = this->get_connection_(msg.address, false);
-  if (connection == nullptr || !connection->connected()) {
-    ESP_LOGW(TAG, "Cannot get GATT services, not connected");
+  if (this->state_ != espbt::ClientState::ESTABLISHED) {
+    ESP_LOGW(TAG, "Cannot get GATT services, not connected.");
    api::global_api_server->send_bluetooth_gatt_error(msg.address, 0, ESP_GATT_NOT_CONNECTED);
    return;
  }
-  if (!connection->service_count_) {
-    ESP_LOGW(TAG, "[%d] [%s] No GATT services found", connection->connection_index_, connection->address_str().c_str());
-    api::global_api_server->send_bluetooth_gatt_services_done(msg.address);
+  if (this->address_ != msg.address) {
+    ESP_LOGW(TAG, "Address mismatch for service list request");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, 0, ESP_GATT_WRONG_ADDRESS);
    return;
  }
-  if (connection->send_service_ ==
-      DONE_SENDING_SERVICES)  // Only start sending services if we're not already sending them
-    connection->send_service_ = 0;
+  this->send_service_ = 0;
 }

 void BluetoothProxy::bluetooth_gatt_notify(const api::BluetoothGATTNotifyRequest &msg) {
-  auto *connection = this->get_connection_(msg.address, false);
-  if (connection == nullptr) {
-    ESP_LOGW(TAG, "Cannot notify GATT characteristic, not connected");
+  if (this->state_ != espbt::ClientState::ESTABLISHED) {
+    ESP_LOGW(TAG, "Cannot configure notify, not connected.");
    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
    return;
  }

-  auto err = connection->notify_characteristic(msg.handle, msg.enable);
-  if (err != ESP_OK) {
-    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, err);
+  if (this->address_ != msg.address) {
+    ESP_LOGW(TAG, "Address mismatch for notify");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_WRONG_ADDRESS);
+    return;
+  }
+
+  auto *characteristic = this->get_characteristic(msg.handle);
+
+  if (characteristic == nullptr) {
+    ESP_LOGW(TAG, "Cannot notify GATT characteristic, not found.");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_INVALID_HANDLE);
+    return;
+  }
+
+  esp_err_t err;
+  if (msg.enable) {
+    err = esp_ble_gattc_register_for_notify(this->gattc_if_, this->remote_bda_, characteristic->handle);
+    if (err != ESP_OK) {
+      ESP_LOGW(TAG, "esp_ble_gattc_register_for_notify failed, err=%d", err);
+      api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, err);
+    }
+  } else {
+    err = esp_ble_gattc_unregister_for_notify(this->gattc_if_, this->remote_bda_, characteristic->handle);
+    if (err != ESP_OK) {
+      ESP_LOGW(TAG, "esp_ble_gattc_unregister_for_notify failed, err=%d", err);
+      api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, err);
+    }
  }
 }

--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
@@ -3,7 +3,6 @@
 #ifdef USE_ESP32

 #include <map>
-#include <vector>

 #include "esphome/components/api/api_pb2.h"
 #include "esphome/components/esp32_ble_client/ble_client_base.h"
@@ -12,26 +11,22 @@
 #include "esphome/core/component.h"
 #include "esphome/core/defines.h"

-#include "bluetooth_connection.h"
+#include <map>

 namespace esphome {
 namespace bluetooth_proxy {

-static const esp_err_t ESP_GATT_NOT_CONNECTED = -1;
-
 using namespace esp32_ble_client;

-class BluetoothProxy : public esp32_ble_tracker::ESPBTDeviceListener, public Component {
+class BluetoothProxy : public BLEClientBase {
 public:
  BluetoothProxy();
  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
  void dump_config() override;
  void loop() override;

-  void register_connection(BluetoothConnection *connection) {
-    this->connections_.push_back(connection);
-    connection->proxy_ = this;
-  }
+  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 bluetooth_device_request(const api::BluetoothDeviceRequest &msg);
  void bluetooth_gatt_read(const api::BluetoothGATTReadRequest &msg);
@@ -41,8 +36,8 @@ class BluetoothProxy : public esp32_ble_tracker::ESPBTDeviceListener, public Com
  void bluetooth_gatt_send_services(const api::BluetoothGATTGetServicesRequest &msg);
  void bluetooth_gatt_notify(const api::BluetoothGATTNotifyRequest &msg);

-  int get_bluetooth_connections_free();
-  int get_bluetooth_connections_limit() { return this->connections_.size(); }
+  int get_bluetooth_connections_free() { return this->state_ == espbt::ClientState::IDLE ? 1 : 0; }
+  int get_bluetooth_connections_limit() { return 1; }

  void set_active(bool active) { this->active_ = active; }
  bool has_active() { return this->active_; }
@@ -50,11 +45,8 @@ class BluetoothProxy : public esp32_ble_tracker::ESPBTDeviceListener, public Com
 protected:
  void send_api_packet_(const esp32_ble_tracker::ESPBTDevice &device);

-  BluetoothConnection *get_connection_(uint64_t address, bool reserve);
-
+  int16_t send_service_{-1};
  bool active_;
-
-  std::vector<BluetoothConnection *> connections_{};
 };

 extern BluetoothProxy *global_bluetooth_proxy;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
--- a/esphome/components/bme280/bme280.cpp
+++ b/esphome/components/bme280/bme280.cpp
@@ -88,10 +88,7 @@ void BME280Component::setup() {

  // Mark as not failed before initializing. Some devices will turn off sensors to save on batteries
  // and when they come back on, the COMPONENT_STATE_FAILED bit must be unset on the component.
-  if ((this->component_state_ & COMPONENT_STATE_MASK) == COMPONENT_STATE_FAILED) {
-    this->component_state_ &= ~COMPONENT_STATE_MASK;
-    this->component_state_ |= COMPONENT_STATE_CONSTRUCTION;
-  }
+  this->component_state_ &= ~COMPONENT_STATE_FAILED;

  if (!this->read_byte(BME280_REGISTER_CHIPID, &chip_id)) {
    this->error_code_ = COMMUNICATION_FAILED;
--- a/esphome/components/bmp280/bmp280.cpp
+++ b/esphome/components/bmp280/bmp280.cpp
@@ -1,5 +1,4 @@
 #include "bmp280.h"
-#include "esphome/core/hal.h"
 #include "esphome/core/log.h"

 namespace esphome {
@@ -12,11 +11,8 @@ static const uint8_t BMP280_REGISTER_CONTROL = 0xF4;
 static const uint8_t BMP280_REGISTER_CONFIG = 0xF5;
 static const uint8_t BMP280_REGISTER_PRESSUREDATA = 0xF7;
 static const uint8_t BMP280_REGISTER_TEMPDATA = 0xFA;
-static const uint8_t BMP280_REGISTER_RESET = 0xE0;

 static const uint8_t BMP280_MODE_FORCED = 0b01;
-static const uint8_t BMP280_SOFT_RESET = 0xB6;
-static const uint8_t BMP280_STATUS_IM_UPDATE = 0b01;

 inline uint16_t combine_bytes(uint8_t msb, uint8_t lsb) { return ((msb & 0xFF) << 8) | (lsb & 0xFF); }

@@ -70,28 +66,6 @@ void BMP280Component::setup() {
    return;
  }

-  // Send a soft reset.
-  if (!this->write_byte(BMP280_REGISTER_RESET, BMP280_SOFT_RESET)) {
-    this->mark_failed();
-    return;
-  }
-  // Wait until the NVM data has finished loading.
-  uint8_t status;
-  uint8_t retry = 5;
-  do {
-    delay(2);
-    if (!this->read_byte(BMP280_REGISTER_STATUS, &status)) {
-      ESP_LOGW(TAG, "Error reading status register.");
-      this->mark_failed();
-      return;
-    }
-  } while ((status & BMP280_STATUS_IM_UPDATE) && (--retry));
-  if (status & BMP280_STATUS_IM_UPDATE) {
-    ESP_LOGW(TAG, "Timeout loading NVM.");
-    this->mark_failed();
-    return;
-  }
-
  // Read calibration
  this->calibration_.t1 = this->read_u16_le_(0x88);
  this->calibration_.t2 = this->read_s16_le_(0x8A);
--- a/esphome/components/bp1658cj/init.py
+++ b/esphome/components/bp1658cj/init.py
@@ -1,44 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome import pins
-from esphome.const import (
-    CONF_CLOCK_PIN,
-    CONF_DATA_PIN,
-    CONF_ID,
-)
-
-CODEOWNERS = ["@Cossid"]
-MULTI_CONF = True
-
-CONF_MAX_POWER_COLOR_CHANNELS = "max_power_color_channels"
-CONF_MAX_POWER_WHITE_CHANNELS = "max_power_white_channels"
-
-AUTO_LOAD = ["output"]
-bp1658cj_ns = cg.esphome_ns.namespace("bp1658cj")
-BP1658CJ = bp1658cj_ns.class_("BP1658CJ", cg.Component)
-
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(BP1658CJ),
-        cv.Required(CONF_DATA_PIN): pins.gpio_output_pin_schema,
-        cv.Required(CONF_CLOCK_PIN): pins.gpio_output_pin_schema,
-        cv.Optional(CONF_MAX_POWER_COLOR_CHANNELS, default=2): cv.int_range(
-            min=0, max=15
-        ),
-        cv.Optional(CONF_MAX_POWER_WHITE_CHANNELS, default=4): cv.int_range(
-            min=0, max=15
-        ),
-    }
-).extend(cv.COMPONENT_SCHEMA)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-
-    data = await cg.gpio_pin_expression(config[CONF_DATA_PIN])
-    cg.add(var.set_data_pin(data))
-    clock = await cg.gpio_pin_expression(config[CONF_CLOCK_PIN])
-    cg.add(var.set_clock_pin(clock))
-    cg.add(var.set_max_power_color_channels(config[CONF_MAX_POWER_COLOR_CHANNELS]))
-    cg.add(var.set_max_power_white_channels(config[CONF_MAX_POWER_WHITE_CHANNELS]))
--- a/esphome/components/bp1658cj/bp1658cj.cpp
+++ b/esphome/components/bp1658cj/bp1658cj.cpp
@@ -1,110 +0,0 @@
-#include "bp1658cj.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace bp1658cj {
-
-static const char *const TAG = "bp1658cj";
-
-static const uint8_t BP1658CJ_MODEL_ID = 0x80;
-static const uint8_t BP1658CJ_ADDR_STANDBY = 0x0;
-static const uint8_t BP1658CJ_ADDR_START_3CH = 0x10;
-static const uint8_t BP1658CJ_ADDR_START_2CH = 0x20;
-static const uint8_t BP1658CJ_ADDR_START_5CH = 0x30;
-
-void BP1658CJ::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up BP1658CJ Output Component...");
-  this->data_pin_->setup();
-  this->data_pin_->digital_write(false);
-  this->clock_pin_->setup();
-  this->clock_pin_->digital_write(false);
-  this->pwm_amounts_.resize(5, 0);
-}
-void BP1658CJ::dump_config() {
-  ESP_LOGCONFIG(TAG, "BP1658CJ:");
-  LOG_PIN("  Data Pin: ", this->data_pin_);
-  LOG_PIN("  Clock Pin: ", this->clock_pin_);
-  ESP_LOGCONFIG(TAG, "  Color Channels Max Power: %u", this->max_power_color_channels_);
-  ESP_LOGCONFIG(TAG, "  White Channels Max Power: %u", this->max_power_white_channels_);
-}
-
-void BP1658CJ::loop() {
-  if (!this->update_)
-    return;
-
-  uint8_t data[12];
-  if (this->pwm_amounts_[0] == 0 && this->pwm_amounts_[1] == 0 && this->pwm_amounts_[2] == 0 &&
-      this->pwm_amounts_[3] == 0 && this->pwm_amounts_[4] == 0) {
-    // Off / Sleep
-    data[0] = BP1658CJ_MODEL_ID + BP1658CJ_ADDR_STANDBY;
-    for (int i = 1; i < 12; i++)
-      data[i] = 0;
-    this->write_buffer_(data, 12);
-  } else if (this->pwm_amounts_[0] == 0 && this->pwm_amounts_[1] == 0 && this->pwm_amounts_[2] == 0 &&
-             (this->pwm_amounts_[3] > 0 || this->pwm_amounts_[4] > 0)) {
-    // Only data on white channels
-    data[0] = BP1658CJ_MODEL_ID + BP1658CJ_ADDR_START_2CH;
-    data[1] = 0 << 4 | this->max_power_white_channels_;
-    for (int i = 2, j = 0; i < 12; i += 2, j++) {
-      data[i] = this->pwm_amounts_[j] & 0x1F;
-      data[i + 1] = (this->pwm_amounts_[j] >> 5) & 0x1F;
-    }
-    this->write_buffer_(data, 12);
-  } else if ((this->pwm_amounts_[0] > 0 || this->pwm_amounts_[1] > 0 || this->pwm_amounts_[2] > 0) &&
-             this->pwm_amounts_[3] == 0 && this->pwm_amounts_[4] == 0) {
-    // Only data on RGB channels
-    data[0] = BP1658CJ_MODEL_ID + BP1658CJ_ADDR_START_3CH;
-    data[1] = this->max_power_color_channels_ << 4 | 0;
-    for (int i = 2, j = 0; i < 12; i += 2, j++) {
-      data[i] = this->pwm_amounts_[j] & 0x1F;
-      data[i + 1] = (this->pwm_amounts_[j] >> 5) & 0x1F;
-    }
-    this->write_buffer_(data, 12);
-  } else {
-    // All channels
-    data[0] = BP1658CJ_MODEL_ID + BP1658CJ_ADDR_START_5CH;
-    data[1] = this->max_power_color_channels_ << 4 | this->max_power_white_channels_;
-    for (int i = 2, j = 0; i < 12; i += 2, j++) {
-      data[i] = this->pwm_amounts_[j] & 0x1F;
-      data[i + 1] = (this->pwm_amounts_[j] >> 5) & 0x1F;
-    }
-    this->write_buffer_(data, 12);
-  }
-
-  this->update_ = false;
-}
-
-void BP1658CJ::set_channel_value_(uint8_t channel, uint16_t value) {
-  if (this->pwm_amounts_[channel] != value) {
-    this->update_ = true;
-    this->update_channel_ = channel;
-  }
-  this->pwm_amounts_[channel] = value;
-}
-void BP1658CJ::write_bit_(bool value) {
-  this->clock_pin_->digital_write(false);
-  this->data_pin_->digital_write(value);
-  this->clock_pin_->digital_write(true);
-}
-
-void BP1658CJ::write_byte_(uint8_t data) {
-  for (uint8_t mask = 0x80; mask; mask >>= 1) {
-    this->write_bit_(data & mask);
-  }
-  this->clock_pin_->digital_write(false);
-  this->data_pin_->digital_write(true);
-  this->clock_pin_->digital_write(true);
-}
-
-void BP1658CJ::write_buffer_(uint8_t *buffer, uint8_t size) {
-  this->data_pin_->digital_write(false);
-  for (uint32_t i = 0; i < size; i++) {
-    this->write_byte_(buffer[i]);
-  }
-  this->clock_pin_->digital_write(false);
-  this->clock_pin_->digital_write(true);
-  this->data_pin_->digital_write(true);
-}
-
-}  // namespace bp1658cj
-}  // namespace esphome
--- a/esphome/components/bp1658cj/bp1658cj.h
+++ b/esphome/components/bp1658cj/bp1658cj.h
@@ -1,64 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/hal.h"
-#include "esphome/components/output/float_output.h"
-#include <vector>
-
-namespace esphome {
-namespace bp1658cj {
-
-class BP1658CJ : public Component {
- public:
-  class Channel;
-
-  void set_data_pin(GPIOPin *data_pin) { data_pin_ = data_pin; }
-  void set_clock_pin(GPIOPin *clock_pin) { clock_pin_ = clock_pin; }
-  void set_max_power_color_channels(uint8_t max_power_color_channels) {
-    max_power_color_channels_ = max_power_color_channels;
-  }
-  void set_max_power_white_channels(uint8_t max_power_white_channels) {
-    max_power_white_channels_ = max_power_white_channels;
-  }
-
-  void setup() override;
-
-  void dump_config() override;
-
-  float get_setup_priority() const override { return setup_priority::HARDWARE; }
-
-  /// Send new values if they were updated.
-  void loop() override;
-
-  class Channel : public output::FloatOutput {
-   public:
-    void set_parent(BP1658CJ *parent) { parent_ = parent; }
-    void set_channel(uint8_t channel) { channel_ = channel; }
-
-   protected:
-    void write_state(float state) override {
-      auto amount = static_cast<uint16_t>(state * 0x3FF);
-      this->parent_->set_channel_value_(this->channel_, amount);
-    }
-
-    BP1658CJ *parent_;
-    uint8_t channel_;
-  };
-
- protected:
-  void set_channel_value_(uint8_t channel, uint16_t value);
-  void write_bit_(bool value);
-  void write_byte_(uint8_t data);
-  void write_buffer_(uint8_t *buffer, uint8_t size);
-
-  GPIOPin *data_pin_;
-  GPIOPin *clock_pin_;
-  uint8_t max_power_color_channels_{4};
-  uint8_t max_power_white_channels_{6};
-  uint8_t update_channel_;
-  std::vector<uint16_t> pwm_amounts_;
-  bool update_{true};
-};
-
-}  // namespace bp1658cj
-}  // namespace esphome
--- a/esphome/components/bp1658cj/output.py
+++ b/esphome/components/bp1658cj/output.py
@@ -1,27 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import output
-from esphome.const import CONF_CHANNEL, CONF_ID
-from . import BP1658CJ
-
-DEPENDENCIES = ["bp1658cj"]
-
-Channel = BP1658CJ.class_("Channel", output.FloatOutput)
-
-CONF_BP1658CJ_ID = "bp1658cj_id"
-CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
-    {
-        cv.GenerateID(CONF_BP1658CJ_ID): cv.use_id(BP1658CJ),
-        cv.Required(CONF_ID): cv.declare_id(Channel),
-        cv.Required(CONF_CHANNEL): cv.int_range(min=0, max=65535),
-    }
-).extend(cv.COMPONENT_SCHEMA)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await output.register_output(var, config)
-
-    parent = await cg.get_variable(config[CONF_BP1658CJ_ID])
-    cg.add(var.set_parent(parent))
-    cg.add(var.set_channel(config[CONF_CHANNEL]))
--- a/esphome/components/bp5758d/init.py
+++ b/esphome/components/bp5758d/init.py
@@ -1,33 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome import pins
-from esphome.const import (
-    CONF_CLOCK_PIN,
-    CONF_DATA_PIN,
-    CONF_ID,
-)
-
-CODEOWNERS = ["@Cossid"]
-MULTI_CONF = True
-
-AUTO_LOAD = ["output"]
-bp5758d_ns = cg.esphome_ns.namespace("bp5758d")
-BP5758D = bp5758d_ns.class_("BP5758D", cg.Component)
-
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(BP5758D),
-        cv.Required(CONF_DATA_PIN): pins.gpio_output_pin_schema,
-        cv.Required(CONF_CLOCK_PIN): pins.gpio_output_pin_schema,
-    }
-).extend(cv.COMPONENT_SCHEMA)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-
-    data = await cg.gpio_pin_expression(config[CONF_DATA_PIN])
-    cg.add(var.set_data_pin(data))
-    clock = await cg.gpio_pin_expression(config[CONF_CLOCK_PIN])
-    cg.add(var.set_clock_pin(clock))
--- a/esphome/components/bp5758d/bp5758d.cpp
+++ b/esphome/components/bp5758d/bp5758d.cpp
@@ -1,147 +0,0 @@
-#include "bp5758d.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace bp5758d {
-
-static const char *const TAG = "bp5758d";
-
-static const uint8_t BP5758D_MODEL_ID = 0b10000000;
-static const uint8_t BP5758D_ADDR_STANDBY = 0b00000000;
-// Note, channel start address seems ambiguous and mis-translated.
-// Documentation states all are "invalid sleep"
-// All 3 values appear to activate all 5 channels.  Using the mapping
-// from BP1658CJ ordering since it won't break anything.
-static const uint8_t BP5758D_ADDR_START_3CH = 0b00010000;
-static const uint8_t BP5758D_ADDR_START_2CH = 0b00100000;
-static const uint8_t BP5758D_ADDR_START_5CH = 0b00110000;
-static const uint8_t BP5758D_ALL_DATA_CHANNEL_ENABLEMENT = 0b00011111;
-
-void BP5758D::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up BP5758D Output Component...");
-  this->data_pin_->setup();
-  this->data_pin_->digital_write(false);
-  this->clock_pin_->setup();
-  this->clock_pin_->digital_write(false);
-  this->channel_current_.resize(5, 0);
-  this->pwm_amounts_.resize(5, 0);
-}
-void BP5758D::dump_config() {
-  ESP_LOGCONFIG(TAG, "BP5758D:");
-  LOG_PIN("  Data Pin: ", this->data_pin_);
-  LOG_PIN("  Clock Pin: ", this->clock_pin_);
-}
-
-void BP5758D::loop() {
-  if (!this->update_)
-    return;
-
-  uint8_t data[17];
-  if (this->pwm_amounts_[0] == 0 && this->pwm_amounts_[1] == 0 && this->pwm_amounts_[2] == 0 &&
-      this->pwm_amounts_[3] == 0 && this->pwm_amounts_[4] == 0) {
-    // Off / Sleep
-    data[0] = BP5758D_MODEL_ID + BP5758D_ADDR_STANDBY;
-    for (int i = 1; i < 16; i++)
-      data[i] = 0;
-    this->write_buffer_(data, 17);
-  } else if (this->pwm_amounts_[0] == 0 && this->pwm_amounts_[1] == 0 && this->pwm_amounts_[2] == 0 &&
-             (this->pwm_amounts_[3] > 0 || this->pwm_amounts_[4] > 0)) {
-    // Only data on white channels
-    data[0] = BP5758D_MODEL_ID + BP5758D_ADDR_START_2CH;
-    data[1] = BP5758D_ALL_DATA_CHANNEL_ENABLEMENT;
-    data[2] = 0;
-    data[3] = 0;
-    data[4] = 0;
-    data[5] = this->pwm_amounts_[3] > 0 ? correct_current_level_bits_(this->channel_current_[3]) : 0;
-    data[6] = this->pwm_amounts_[4] > 0 ? correct_current_level_bits_(this->channel_current_[4]) : 0;
-    for (int i = 7, j = 0; i <= 15; i += 2, j++) {
-      data[i] = this->pwm_amounts_[j] & 0x1F;
-      data[i + 1] = (this->pwm_amounts_[j] >> 5) & 0x1F;
-    }
-    this->write_buffer_(data, 17);
-  } else if ((this->pwm_amounts_[0] > 0 || this->pwm_amounts_[1] > 0 || this->pwm_amounts_[2] > 0) &&
-             this->pwm_amounts_[3] == 0 && this->pwm_amounts_[4] == 0) {
-    // Only data on RGB channels
-    data[0] = BP5758D_MODEL_ID + BP5758D_ADDR_START_3CH;
-    data[1] = BP5758D_ALL_DATA_CHANNEL_ENABLEMENT;
-    data[2] = this->pwm_amounts_[0] > 0 ? correct_current_level_bits_(this->channel_current_[0]) : 0;
-    data[3] = this->pwm_amounts_[1] > 0 ? correct_current_level_bits_(this->channel_current_[1]) : 0;
-    data[4] = this->pwm_amounts_[2] > 0 ? correct_current_level_bits_(this->channel_current_[2]) : 0;
-    data[5] = 0;
-    data[6] = 0;
-    for (int i = 7, j = 0; i <= 15; i += 2, j++) {
-      data[i] = this->pwm_amounts_[j] & 0x1F;
-      data[i + 1] = (this->pwm_amounts_[j] >> 5) & 0x1F;
-    }
-    this->write_buffer_(data, 17);
-  } else {
-    // All channels
-    data[0] = BP5758D_MODEL_ID + BP5758D_ADDR_START_5CH;
-    data[1] = BP5758D_ALL_DATA_CHANNEL_ENABLEMENT;
-    data[2] = this->pwm_amounts_[0] > 0 ? correct_current_level_bits_(this->channel_current_[0]) : 0;
-    data[3] = this->pwm_amounts_[1] > 0 ? correct_current_level_bits_(this->channel_current_[1]) : 0;
-    data[4] = this->pwm_amounts_[2] > 0 ? correct_current_level_bits_(this->channel_current_[2]) : 0;
-    data[5] = this->pwm_amounts_[3] > 0 ? correct_current_level_bits_(this->channel_current_[3]) : 0;
-    data[6] = this->pwm_amounts_[4] > 0 ? correct_current_level_bits_(this->channel_current_[4]) : 0;
-    for (int i = 7, j = 0; i <= 15; i += 2, j++) {
-      data[i] = this->pwm_amounts_[j] & 0x1F;
-      data[i + 1] = (this->pwm_amounts_[j] >> 5) & 0x1F;
-    }
-    this->write_buffer_(data, 17);
-  }
-
-  this->update_ = false;
-}
-
-uint8_t BP5758D::correct_current_level_bits_(uint8_t current) {
-  // Anything below 64 uses normal bitmapping.
-  if (current < 64) {
-    return current;
-  }
-
-  // Anything above 63 needs to be offset by +34 because the driver remaps bit 7 (normally 64) to 30.
-  // (no idea why(!) but it is documented)
-  // Example:
-  // integer 64 would normally put out 0b01000000 but here 0b01000000 = 30 whereas everything lower
-  // is normal, so we add 34 to the integer where
-  // integer 98 = 0b01100010 which is 30 (7th bit adjusted) + 34 (1st-6th bits).
-  return current + 34;
-}
-
-void BP5758D::set_channel_value_(uint8_t channel, uint16_t value) {
-  if (this->pwm_amounts_[channel] != value) {
-    this->update_ = true;
-    this->update_channel_ = channel;
-  }
-  this->pwm_amounts_[channel] = value;
-}
-
-void BP5758D::set_channel_current_(uint8_t channel, uint8_t current) { this->channel_current_[channel] = current; }
-
-void BP5758D::write_bit_(bool value) {
-  this->clock_pin_->digital_write(false);
-  this->data_pin_->digital_write(value);
-  this->clock_pin_->digital_write(true);
-}
-
-void BP5758D::write_byte_(uint8_t data) {
-  for (uint8_t mask = 0x80; mask; mask >>= 1) {
-    this->write_bit_(data & mask);
-  }
-  this->clock_pin_->digital_write(false);
-  this->data_pin_->digital_write(true);
-  this->clock_pin_->digital_write(true);
-}
-
-void BP5758D::write_buffer_(uint8_t *buffer, uint8_t size) {
-  this->data_pin_->digital_write(false);
-  for (uint32_t i = 0; i < size; i++) {
-    this->write_byte_(buffer[i]);
-  }
-  this->clock_pin_->digital_write(false);
-  this->clock_pin_->digital_write(true);
-  this->data_pin_->digital_write(true);
-}
-
-}  // namespace bp5758d
-}  // namespace esphome
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jesse Hills	d407c6fe69	gitpod changes	2022-10-19 20:34:23 +00:00
Jesse Hills	4deef55257	Try run inside esphome container image	2022-10-19 20:15:12 +00:00
				`@@ -1 +0,0 @@`
				`Without requirements or design, programming is the art of adding bugs to an empty text file. (Louis Srygley)`