Add gai_strerror

.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"
   ],

.editorconfig

@@ -25,9 +25,10 @@ indent_size = 2
 [*.{yaml,yml}]
 indent_style = space
 indent_size = 2
-quote_type = double
+quote_type = single
 
 # JSON
 [*.json]
 indent_style = space
 indent_size = 2
+

.github/FUNDING.yml

@@ -1,4 +1,3 @@
----
 # These are supported funding model platforms
 
 custom: https://www.nabucasa.com

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,3 @@
----
 blank_issues_enabled: false
 contact_links:
   - name: Issue Tracker
@@ -6,10 +5,8 @@ contact_links:
     about: Please create bug reports in the dedicated issue tracker.
   - name: Feature Request Tracker
     url: https://github.com/esphome/feature-requests
-    about: |
-      Please create feature requests in the dedicated feature request tracker.
+    about: Please create feature requests in the dedicated feature request tracker.
   - name: Frequently Asked Question
     url: https://esphome.io/guides/faq.html
-    about: |
-      Please view the FAQ for common questions and what
-      to include in a bug report.
+    about: Please view the FAQ for common questions and what to include in a bug report.
+    

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
-# What does this implement/fix?
+# 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`:
 <!--
@@ -36,6 +35,6 @@
 ## Checklist:
   - [ ] The code change is tested and works locally.
   - [ ] Tests have been added to verify that the new code works (under `tests/` folder).
-
+  
 If user exposed functionality or configuration variables are added/changed:
   - [ ] Documentation added/updated in [esphome-docs](https://github.com/esphome/esphome-docs).

.github/dependabot.yml

@@ -1,15 +1,9 @@
----
 version: 2
 updates:
-  - package-ecosystem: pip
+  - package-ecosystem: "pip"
     directory: "/"
     schedule:
-      interval: daily
+      interval: "daily"
     ignore:
       # Hypotehsis is only used for testing and is updated quite often
       - dependency-name: hypothesis
-  - package-ecosystem: github-actions
-    directory: "/"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 10

.github/workflows/ci-docker.yml

@@ -1,23 +1,21 @@
----
 name: CI for docker images
 
 # Only run when docker paths change
-# yamllint disable-line rule:truthy
 on:
   push:
     branches: [dev, beta, release]
     paths:
-      - "docker/**"
-      - ".github/workflows/**"
-      - "requirements*.txt"
-      - "platformio.ini"
+      - 'docker/**'
+      - '.github/workflows/**'
+      - 'requirements*.txt'
+      - 'platformio.ini'
 
   pull_request:
     paths:
-      - "docker/**"
-      - ".github/workflows/**"
-      - "requirements*.txt"
-      - "platformio.ini"
+      - 'docker/**'
+      - '.github/workflows/**'
+      - 'requirements*.txt'
+      - 'platformio.ini'
 
 permissions:
   contents: read
@@ -28,29 +26,28 @@ jobs:
     name: Build docker containers
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: false
       matrix:
         arch: [amd64, armv7, aarch64]
         build_type: ["ha-addon", "docker", "lint"]
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.9"
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.9'
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v1
 
-      - name: Set TAG
-        run: |
-          echo "TAG=check" >> $GITHUB_ENV
+    - name: Set TAG
+      run: |
+        echo "TAG=check" >> $GITHUB_ENV
 
-      - name: Run build
-        run: |
-          docker/build.py \
-            --tag "${TAG}" \
-            --arch "${{ matrix.arch }}" \
-            --build-type "${{ matrix.build_type }}" \
-            build
+    - name: Run build
+      run: |
+        docker/build.py \
+          --tag "${TAG}" \
+          --arch "${{ matrix.arch }}" \
+          --build-type "${{ matrix.build_type }}" \
+          build

.github/workflows/ci.yml

@@ -1,7 +1,5 @@
----
 name: CI
 
-# yamllint disable-line rule:truthy
 on:
   push:
     branches: [dev, beta, release]
@@ -12,7 +10,6 @@ permissions:
   contents: read
 
 concurrency:
-  # yamllint disable-line rule:line-length
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
@@ -48,10 +45,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: pytest
             name: Run pytest
           - id: clang-format
@@ -80,28 +73,24 @@ jobs:
             name: Run script/clang-tidy for ESP32 IDF
             options: --environment esp32-idf-tidy --grep USE_ESP_IDF
             pio_cache_key: tidyesp32-idf
-          - id: yamllint
-            name: Run yamllint
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v2
         id: python
         with:
-          python-version: "3.9"
+          python-version: '3.7'
 
       - name: Cache virtualenv
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: .venv
-          # yamllint disable-line rule:line-length
           key: venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements*.txt') }}
           restore-keys: |
             venv-${{ steps.python.outputs.python-version }}-
 
       - name: Set up virtualenv
-        # yamllint disable rule:line-length
         run: |
           python -m venv .venv
           source .venv/bin/activate
@@ -110,14 +99,12 @@ jobs:
           pip install -e .
           echo "$GITHUB_WORKSPACE/.venv/bin" >> $GITHUB_PATH
           echo "VIRTUAL_ENV=$GITHUB_WORKSPACE/.venv" >> $GITHUB_ENV
-        # yamllint enable rule:line-length
 
       # Use per check platformio cache because checks use different parts
       - name: Cache platformio
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: ~/.platformio
-          # yamllint disable-line rule:line-length
           key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}
         if: matrix.id == 'test' || matrix.id == 'clang-tidy'
 
@@ -144,7 +131,7 @@ jobs:
         if: matrix.id == 'ci-custom'
 
       - name: Lint Python
-        run: script/lint-python -a
+        run: script/lint-python
         if: matrix.id == 'lint-python'
 
       - run: esphome compile ${{ matrix.file }}
@@ -158,9 +145,8 @@ jobs:
           pytest -vv --tb=native tests
         if: matrix.id == 'pytest'
 
-      # Also run git-diff-index so that the step is marked as failed on
-      # formatting errors, since clang-format doesn't do anything but
-      # change files if -i is passed.
+      # Also run git-diff-index so that the step is marked as failed on formatting errors,
+      # since clang-format doesn't do anything but change files if -i is passed.
       - name: Run clang-format
         run: |
           script/clang-format -i
@@ -175,11 +161,6 @@ jobs:
           # Also cache libdeps, store them in a ~/.platformio subfolder
           PLATFORMIO_LIBDEPS_DIR: ~/.platformio/libdeps
 
-      - name: Run yamllint
-        if: matrix.id == 'yamllint'
-        uses: frenck/action-yamllint@v1.3.1
-
       - name: Suggested changes
         run: script/ci-suggest-changes
-        # yamllint disable-line rule:line-length
-        if: always() && (matrix.id == 'clang-tidy' || matrix.id == 'clang-format' || matrix.id == 'lint-python')
+        if: always() && (matrix.id == 'clang-tidy' || matrix.id == 'clang-format')

.github/workflows/lock.yml

@@ -1,10 +1,8 @@
----
 name: Lock
 
-# yamllint disable-line rule:truthy
 on:
   schedule:
-    - cron: "30 0 * * *"
+    - cron: '30 0 * * *'
   workflow_dispatch:
 
 permissions:
@@ -18,7 +16,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: ""

.github/workflows/release.yml

@@ -1,7 +1,5 @@
----
 name: Publish Release
 
-# yamllint disable-line rule:truthy
 on:
   workflow_dispatch:
   release:
@@ -19,10 +17,9 @@ jobs:
     outputs:
       tag: ${{ steps.tag.outputs.tag }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - name: Get tag
         id: tag
-        # yamllint disable rule:line-length
         run: |
           if [[ "$GITHUB_EVENT_NAME" = "release" ]]; then
             TAG="${GITHUB_REF#refs/tags/}"
@@ -31,19 +28,18 @@ jobs:
             today="$(date --utc '+%Y%m%d')"
             TAG="${TAG}${today}"
           fi
-          echo "tag=${TAG}" >> $GITHUB_OUTPUT
-        # yamllint enable rule:line-length
+          echo "::set-output name=tag::${TAG}"
 
   deploy-pypi:
     name: Build and publish to PyPi
     if: github.repository == 'esphome/esphome' && github.event_name == 'release'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v1
         with:
-          python-version: "3.x"
+          python-version: '3.x'
       - name: Set up python environment
         run: |
           script/setup
@@ -69,37 +65,37 @@ jobs:
         arch: [amd64, armv7, aarch64]
         build_type: ["ha-addon", "docker", "lint"]
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.9"
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.9'
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v1
 
-      - name: Log in to docker hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Log in to the GitHub container registry
-        uses: docker/login-action@v2
-        with:
+    - name: Log in to docker hub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_USER }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+    - name: Log in to the GitHub container registry
+      uses: docker/login-action@v1
+      with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and push
-        run: |
-          docker/build.py \
-            --tag "${{ needs.init.outputs.tag }}" \
-            --arch "${{ matrix.arch }}" \
-            --build-type "${{ matrix.build_type }}" \
-            build \
-            --push
+    - name: Build and push
+      run: |
+        docker/build.py \
+          --tag "${{ needs.init.outputs.tag }}" \
+          --arch "${{ matrix.arch }}" \
+          --build-type "${{ matrix.build_type }}" \
+          build \
+          --push
 
   deploy-docker-manifest:
     if: github.repository == 'esphome/esphome'
@@ -112,49 +108,47 @@ jobs:
       matrix:
         build_type: ["ha-addon", "docker", "lint"]
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.9"
-      - name: Enable experimental manifest support
-        run: |
-          mkdir -p ~/.docker
-          echo "{\"experimental\": \"enabled\"}" > ~/.docker/config.json
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.9'
+    - name: Enable experimental manifest support
+      run: |
+        mkdir -p ~/.docker
+        echo "{\"experimental\": \"enabled\"}" > ~/.docker/config.json
 
-      - name: Log in to docker hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Log in to the GitHub container registry
-        uses: docker/login-action@v2
-        with:
+    - name: Log in to docker hub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_USER }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+    - name: Log in to the GitHub container registry
+      uses: docker/login-action@v1
+      with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Run manifest
-        run: |
-          docker/build.py \
-            --tag "${{ needs.init.outputs.tag }}" \
-            --build-type "${{ matrix.build_type }}" \
-            manifest
+    - name: Run manifest
+      run: |
+        docker/build.py \
+          --tag "${{ needs.init.outputs.tag }}" \
+          --build-type "${{ matrix.build_type }}" \
+          manifest
 
-  deploy-ha-addon-repo:
+  deploy-hassio-repo:
     if: github.repository == 'esphome/esphome' && github.event_name == 'release'
     runs-on: ubuntu-latest
     needs: [deploy-docker]
     steps:
       - env:
-          TOKEN: ${{ secrets.DEPLOY_HA_ADDON_REPO_TOKEN }}
-        # yamllint disable rule:line-length
+          TOKEN: ${{ secrets.DEPLOY_HASSIO_TOKEN }}
         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 \
+            https://api.github.com/repos/esphome/hassio/actions/workflows/bump-version.yml/dispatches \
             -d "{\"ref\":\"main\",\"inputs\":{\"version\":\"$TAG\"}}"
-        # yamllint enable rule:line-length

.github/workflows/stale.yml

@@ -1,10 +1,8 @@
----
 name: Stale
 
-# yamllint disable-line rule:truthy
 on:
   schedule:
-    - cron: "30 0 * * *"
+    - cron: '30 0 * * *'
   workflow_dispatch:
 
 permissions:
@@ -18,7 +16,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v4
         with:
           days-before-pr-stale: 90
           days-before-pr-close: 7
@@ -33,12 +31,11 @@ jobs:
             and will be closed if no further activity occurs within 7 days.
             Thank you for your contributions.
 
-  # Use stale to automatically close issues with a
-  # reference to the issue tracker
+  # Use stale to automatically close issues with a reference to the issue tracker
   close-issues:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v4
         with:
           days-before-pr-stale: -1
           days-before-pr-close: -1

.gitignore

@@ -77,7 +77,6 @@ venv/
 ENV/
 env.bak/
 venv.bak/
-venv-*/
 
 # mypy
 .mypy_cache/

.gitpod.yml

@@ -0,0 +1,6 @@
+ports:
+- port: 6052
+  onOpen: open-preview
+tasks:
+- before: pyenv local $(pyenv version | grep '^3\.' | cut -d ' ' -f 1) && script/setup
+  command: python -m esphome dashboard config

.pre-commit-config.yaml

@@ -1,17 +1,16 @@
----
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/ambv/black
-    rev: 22.10.0
+    rev: 22.1.0
     hooks:
-      - id: black
-        args:
-          - --safe
-          - --quiet
-        files: ^((esphome|script|tests)/.+)?[^/]+\.py$
-  - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+    - id: black
+      args:
+        - --safe
+        - --quiet
+      files: ^((esphome|script|tests)/.+)?[^/]+\.py$
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 4.0.1
     hooks:
       - id: flake8
         additional_dependencies:
@@ -26,8 +25,3 @@ repos:
           - --branch=dev
           - --branch=release
           - --branch=beta
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.0
-    hooks:
-      - id: pyupgrade
-        args: [--py39-plus]

.yamllint

@@ -1,3 +0,0 @@
----
-ignore: |
-  venv/

CODEOWNERS

@@ -13,14 +13,12 @@ esphome/core/* @esphome/core
 # Integrations
 esphome/components/ac_dimmer/* @glmnet
 esphome/components/adc/* @esphome/core
-esphome/components/adc128s102/* @DeerMaximum
 esphome/components/addressable_light/* @justfalter
 esphome/components/airthings_ble/* @jeromelaban
 esphome/components/airthings_wave_mini/* @ncareau
 esphome/components/airthings_wave_plus/* @jeromelaban
 esphome/components/am43/* @buxtronix
 esphome/components/am43/cover/* @buxtronix
-esphome/components/analog_threshold/* @ianchi
 esphome/components/animation/* @syndlex
 esphome/components/anova/* @buxtronix
 esphome/components/api/* @OttoWinter
@@ -29,16 +27,9 @@ esphome/components/atc_mithermometer/* @ahpohl
 esphome/components/b_parasite/* @rbaron
 esphome/components/ballu/* @bazuchan
 esphome/components/bang_bang/* @OttoWinter
-esphome/components/bedjet/* @jhansche
-esphome/components/bedjet/climate/* @jhansche
-esphome/components/bedjet/fan/* @jhansche
-esphome/components/bh1750/* @OttoWinter
 esphome/components/binary_sensor/* @esphome/core
-esphome/components/bl0939/* @ziceva
 esphome/components/bl0940/* @tobias-
-esphome/components/bl0942/* @dbuezas
 esphome/components/ble_client/* @buxtronix
-esphome/components/bluetooth_proxy/* @jesserockz
 esphome/components/bme680_bsec/* @trvrnrth
 esphome/components/bmp3xx/* @martgras
 esphome/components/button/* @esphome/core
@@ -51,41 +42,29 @@ esphome/components/climate/* @esphome/core
 esphome/components/climate_ir/* @glmnet
 esphome/components/color_temperature/* @jesserockz
 esphome/components/coolix/* @glmnet
-esphome/components/copy/* @OttoWinter
 esphome/components/cover/* @esphome/core
 esphome/components/cs5460a/* @balrog-kun
 esphome/components/cse7761/* @berfenger
 esphome/components/ct_clamp/* @jesserockz
 esphome/components/current_based/* @djwmarcx
-esphome/components/dac7678/* @NickB1
-esphome/components/daikin_brc/* @hagak
 esphome/components/daly_bms/* @s1lvi0
 esphome/components/dashboard_import/* @esphome/core
 esphome/components/debug/* @OttoWinter
-esphome/components/delonghi/* @grob6000
 esphome/components/dfplayer/* @glmnet
 esphome/components/dht/* @OttoWinter
-esphome/components/display_menu_base/* @numo68
-esphome/components/dps310/* @kbx81
 esphome/components/ds1307/* @badbadc0ffee
 esphome/components/dsmr/* @glmnet @zuidwijk
 esphome/components/ektf2232/* @jesserockz
-esphome/components/ens210/* @itn3rd77
 esphome/components/esp32/* @esphome/core
 esphome/components/esp32_ble/* @jesserockz
-esphome/components/esp32_ble_client/* @jesserockz
 esphome/components/esp32_ble_server/* @jesserockz
 esphome/components/esp32_camera_web_server/* @ayufan
 esphome/components/esp32_can/* @Sympatron
 esphome/components/esp32_improv/* @jesserockz
 esphome/components/esp8266/* @esphome/core
-esphome/components/ethernet_info/* @gtjadsonsantos
 esphome/components/exposure_notifications/* @OttoWinter
 esphome/components/ezo/* @ssieb
-esphome/components/ezo_pmp/* @carlos-sarmiento
-esphome/components/factory_reset/* @anatoly-savchenkov
 esphome/components/fastled_base/* @OttoWinter
-esphome/components/feedback/* @ianchi
 esphome/components/fingerprint_grow/* @OnFreund @loongyh
 esphome/components/globals/* @esphome/core
 esphome/components/gpio/* @esphome/core
@@ -98,11 +77,8 @@ esphome/components/hbridge/light/* @DotNetDann
 esphome/components/heatpumpir/* @rob-deutsch
 esphome/components/hitachi_ac424/* @sourabhjaiswal
 esphome/components/homeassistant/* @OttoWinter
-esphome/components/honeywellabp/* @RubyBailey
 esphome/components/hrxl_maxsonar_wr/* @netmikey
-esphome/components/hydreon_rgxx/* @functionpointer
 esphome/components/i2c/* @esphome/core
-esphome/components/i2s_audio/* @jesserockz
 esphome/components/improv_serial/* @esphome/core
 esphome/components/ina260/* @MrEditor97
 esphome/components/inkbird_ibsth1_mini/* @fkirill
@@ -111,18 +87,11 @@ esphome/components/integration/* @OttoWinter
 esphome/components/interval/* @esphome/core
 esphome/components/json/* @OttoWinter
 esphome/components/kalman_combinator/* @Cat-Ion
-esphome/components/kamstrup_mc40x/* @cfeenstra1024
-esphome/components/lcd_menu/* @numo68
 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/max31865/* @DAVe3283
-esphome/components/max44009/* @berfenger
 esphome/components/max7219digit/* @rspaargaren
-esphome/components/max9611/* @mckaymatthew
 esphome/components/mcp23008/* @jesserockz
 esphome/components/mcp23017/* @jesserockz
 esphome/components/mcp23s08/* @SenexCrenshaw @jesserockz
@@ -132,29 +101,20 @@ esphome/components/mcp23x17_base/* @jesserockz
 esphome/components/mcp23xxx_base/* @jesserockz
 esphome/components/mcp2515/* @danielschramm @mvturnho
 esphome/components/mcp3204/* @rsumner
-esphome/components/mcp4728/* @berfenger
 esphome/components/mcp47a1/* @jesserockz
-esphome/components/mcp9600/* @MrEditor97
 esphome/components/mcp9808/* @k7hpn
 esphome/components/md5/* @esphome/core
 esphome/components/mdns/* @esphome/core
-esphome/components/media_player/* @jesserockz
 esphome/components/midea/* @dudanov
 esphome/components/midea_ir/* @dudanov
 esphome/components/mitsubishi/* @RubyBailey
-esphome/components/mlx90393/* @functionpointer
 esphome/components/modbus_controller/* @martgras
 esphome/components/modbus_controller/binary_sensor/* @martgras
 esphome/components/modbus_controller/number/* @martgras
 esphome/components/modbus_controller/output/* @martgras
-esphome/components/modbus_controller/select/* @martgras @stegm
 esphome/components/modbus_controller/sensor/* @martgras
 esphome/components/modbus_controller/switch/* @martgras
 esphome/components/modbus_controller/text_sensor/* @martgras
-esphome/components/mopeka_ble/* @spbrogan
-esphome/components/mopeka_pro_check/* @spbrogan
-esphome/components/mpl3115a2/* @kbickar
-esphome/components/mpu6886/* @fabaff
 esphome/components/network/* @esphome/core
 esphome/components/nextion/* @senexcrenshaw
 esphome/components/nextion/binary_sensor/* @senexcrenshaw
@@ -175,46 +135,31 @@ esphome/components/pn532_spi/* @OttoWinter @jesserockz
 esphome/components/power_supply/* @esphome/core
 esphome/components/preferences/* @esphome/core
 esphome/components/psram/* @esphome/core
-esphome/components/pulse_meter/* @cstaahl @stevebaxter
+esphome/components/pulse_meter/* @stevebaxter
 esphome/components/pvvx_mithermometer/* @pasiz
-esphome/components/qmp6988/* @andrewpc
 esphome/components/qr_code/* @wjtje
-esphome/components/radon_eye_ble/* @jeffeb3
-esphome/components/radon_eye_rd200/* @jeffeb3
 esphome/components/rc522/* @glmnet
 esphome/components/rc522_i2c/* @glmnet
 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
+esphome/components/scd4x/* @sjtrny
 esphome/components/script/* @esphome/core
 esphome/components/sdm_meter/* @jesserockz @polyfaces
 esphome/components/sdp3x/* @Azimath
 esphome/components/selec_meter/* @sourabhjaiswal
 esphome/components/select/* @esphome/core
-esphome/components/sen5x/* @martgras
-esphome/components/sensirion_common/* @martgras
 esphome/components/sensor/* @esphome/core
 esphome/components/sgp40/* @SenexCrenshaw
-esphome/components/sgp4x/* @SenexCrenshaw @martgras
-esphome/components/shelly_dimmer/* @edge90 @rnauber
 esphome/components/sht4x/* @sjtrny
 esphome/components/shutdown/* @esphome/core @jsuanet
 esphome/components/sim800l/* @glmnet
 esphome/components/sm2135/* @BoukeHaarsma23
-esphome/components/sml/* @alengwenus
-esphome/components/smt100/* @piechade
-esphome/components/sn74hc165/* @jesserockz
 esphome/components/socket/* @esphome/core
-esphome/components/sonoff_d1/* @anatoly-savchenkov
 esphome/components/spi/* @esphome/core
-esphome/components/sprinkler/* @kbx81
-esphome/components/sps30/* @martgras
 esphome/components/ssd1322_base/* @kbx81
 esphome/components/ssd1322_spi/* @kbx81
 esphome/components/ssd1325_base/* @kbx81
@@ -239,9 +184,7 @@ esphome/components/teleinfo/* @0hax
 esphome/components/thermostat/* @kbx81
 esphome/components/time/* @OttoWinter
 esphome/components/tlc5947/* @rnauber
-esphome/components/tm1621/* @Philippe12
 esphome/components/tm1637/* @glmnet
-esphome/components/tm1638/* @skykingjwc
 esphome/components/tmp102/* @timsavage
 esphome/components/tmp117/* @Azimath
 esphome/components/tof10120/* @wstrzalka
@@ -251,22 +194,16 @@ esphome/components/tsl2591/* @wjcarpenter
 esphome/components/tuya/binary_sensor/* @jesserockz
 esphome/components/tuya/climate/* @jesserockz
 esphome/components/tuya/number/* @frankiboy1
-esphome/components/tuya/select/* @bearpawmaxim
 esphome/components/tuya/sensor/* @jesserockz
 esphome/components/tuya/switch/* @jesserockz
 esphome/components/tuya/text_sensor/* @dentra
 esphome/components/uart/* @esphome/core
-esphome/components/ufire_ec/* @pvizeli
-esphome/components/ufire_ise/* @pvizeli
 esphome/components/ultrasonic/* @OttoWinter
 esphome/components/version/* @esphome/core
 esphome/components/wake_on_lan/* @willwill2will54
 esphome/components/web_server_base/* @OttoWinter
 esphome/components/whirlpool/* @glmnet
-esphome/components/whynter/* @aeonsablaze
-esphome/components/wl_134/* @hobbypunk90
 esphome/components/xiaomi_lywsd03mmc/* @ahpohl
 esphome/components/xiaomi_mhoc303/* @drug123
 esphome/components/xiaomi_mhoc401/* @vevsvevs
-esphome/components/xiaomi_rtcgq02lm/* @jesserockz
-esphome/components/xpt2046/* @nielsnl68 @numo68
+esphome/components/xpt2046/* @numo68

CONTRIBUTING.md

@@ -5,7 +5,7 @@ For a detailed guide, please see https://esphome.io/guides/contributing.html#con
 Things to note when contributing:
 
  - Please test your changes :)
- - If a new feature is added or an existing user-facing feature is changed, you should also
+ - If a new feature is added or an existing user-facing feature is changed, you should also 
    update the [docs](https://github.com/esphome/esphome-docs). See [contributing to esphome-docs](https://esphome.io/guides/contributing.html#contributing-to-esphomedocs)
    for more information.
  - Please also update the tests in the `tests/` folder. You can do so by just adding a line in one of the YAML files

README.md

@@ -1,43 +1,3 @@
-# TEMPORARY BRANCH KAMSTRUP MC40X
-This branch is the same as [kamstrup_mc40x](https://github.com/cfeenstra1024/esphome/tree/kamstrup_mc40x) but has no changes in shared files. This allows you to use the Kamstrup MultiCal component as an external component.
-
-Some time after the above mentioned component has been merged into the ESPHome project, this branch will be removed.
-
-To use this component, add the below yaml to your config file.
-Full [documentation](https://deploy-preview-2551--esphome.netlify.app/components/sensor/kamstrup_mc40x.html) is available.
-
-``` yaml
-external_components:
-  - source:
-      type: git
-      url: https://github.com/cfeenstra1024/esphome
-      ref: kamstrup_mc40x_temp
-    components: [ kamstrup_mc40x ]
-    
-uart:
-  baud_rate: 1200
-  stop_bits: 2
-  tx_pin: GPIO15
-  rx_pin: GPIO13
-
-sensor:
-  - platform: kamstrup_mc40x
-    heat_energy:
-      name: 'Heat Energy'
-    power:
-      name: 'Heat Power'
-    temp_diff:
-      name: 'Heat Temperature Difference'
-    flow:
-      name: 'Heat Flow'
-    update_interval: 60s    
-```
-
-
-
-
-
-
 # ESPHome [![Discord Chat](https://img.shields.io/discord/429907082951524364.svg)](https://discord.gg/KhAMKrd) [![GitHub release](https://img.shields.io/github/release/esphome/esphome.svg)](https://GitHub.com/esphome/esphome/releases/)
 
 [![ESPHome Logo](https://esphome.io/_images/logo-text.png)](https://esphome.io/)

docker/Dockerfile

@@ -5,26 +5,29 @@
 # One of "docker", "hassio"
 ARG BASEIMGTYPE=docker
 
-# https://github.com/hassio-addons/addon-debian-base/releases
-FROM ghcr.io/hassio-addons/debian-base:6.1.3 AS base-hassio
-# https://hub.docker.com/_/debian?tab=tags&page=1&name=bullseye
-FROM debian:bullseye-20221024-slim AS base-docker
+FROM ghcr.io/hassio-addons/debian-base/amd64:5.2.3 AS base-hassio-amd64
+FROM ghcr.io/hassio-addons/debian-base/aarch64:5.2.3 AS base-hassio-arm64
+FROM ghcr.io/hassio-addons/debian-base/armv7:5.2.3 AS base-hassio-armv7
+FROM debian:bullseye-20220125-slim AS base-docker-amd64
+FROM debian:bullseye-20220125-slim AS base-docker-arm64
+FROM debian:bullseye-20220125-slim AS base-docker-armv7
 
-FROM base-${BASEIMGTYPE} AS base
+# 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 \
     # Use pinned versions so that we get updates with build caching
     && apt-get install -y --no-install-recommends \
         python3=3.9.2-3 \
-        python3-pip=20.3.4-4+deb11u1 \
+        python3-pip=20.3.4-4 \
         python3-setuptools=52.0.0-4 \
         python3-pil=8.1.2+dfsg-0.3+deb11u1 \
         python3-cryptography=3.3.2-1 \
         iputils-ping=3:20210202-1 \
         git=1:2.30.2-1 \
-        curl=7.74.0-1.3+deb11u3 \
-        openssh-client=1:8.4p1-5+deb11u1 \
+        curl=7.74.0-1.3+deb11u1 \
     && rm -rf \
         /tmp/* \
         /var/{cache,log}/* \
@@ -40,23 +43,25 @@ RUN \
     # Ubuntu python3-pip is missing wheel
     pip3 install --no-cache-dir \
         wheel==0.37.1 \
-        platformio==6.1.5 \
+        platformio==5.2.4 \
     # Change some platformio settings
     && platformio settings set enable_telemetry No \
+    && platformio settings set check_libraries_interval 1000000 \
     && platformio settings set check_platformio_interval 1000000 \
+    && platformio settings set check_platforms_interval 1000000 \
     && mkdir -p /piolibs
 
 
+
+# ======================= docker-type image =======================
+FROM base AS docker
+
 # First install requirements to leverage caching when requirements don't change
 COPY requirements.txt requirements_optional.txt docker/platformio_install_deps.py platformio.ini /
 RUN \
     pip3 install --no-cache-dir -r /requirements.txt -r /requirements_optional.txt \
     && /platformio_install_deps.py /platformio.ini
 
-
-# ======================= docker-type image =======================
-FROM base AS docker
-
 # Copy esphome and install
 COPY . /esphome
 RUN pip3 install --no-cache-dir --no-use-pep517 -e /esphome
@@ -88,7 +93,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=1.18.0-6.1 \
     && rm -rf \
         /tmp/* \
         /var/{cache,log}/* \
@@ -97,7 +102,13 @@ RUN \
 ARG BUILD_VERSION=dev
 
 # Copy root filesystem
-COPY docker/ha-addon-rootfs/ /
+COPY docker/hassio-rootfs/ /
+
+# First install requirements to leverage caching when requirements don't change
+COPY requirements.txt requirements_optional.txt docker/platformio_install_deps.py platformio.ini /
+RUN \
+    pip3 install --no-cache-dir -r /requirements.txt -r /requirements_optional.txt \
+    && /platformio_install_deps.py /platformio.ini
 
 # Copy esphome and install
 COPY . /esphome
@@ -128,7 +139,7 @@ RUN \
         clang-tidy-11=1:11.0.1-2 \
         patch=2.7.6-7 \
         software-properties-common=0.96.20.2-2.1 \
-        nano=5.4-2+deb11u1 \
+        nano=5.4-2 \
         build-essential=12.9 \
         python3-dev=3.9.2-3 \
     && rm -rf \
@@ -136,8 +147,10 @@ RUN \
         /var/{cache,log}/* \
         /var/lib/apt/lists/*
 
-COPY requirements_test.txt /
-RUN pip3 install --no-cache-dir -r /requirements_test.txt
+COPY requirements.txt requirements_optional.txt requirements_test.txt docker/platformio_install_deps.py platformio.ini /
+RUN \
+    pip3 install --no-cache-dir -r /requirements.txt -r /requirements_optional.txt -r /requirements_test.txt \
+    && /platformio_install_deps.py /platformio.ini
 
 VOLUME ["/esphome"]
 WORKDIR /esphome

docker/build.py

@@ -88,12 +88,10 @@ def main():
                 sys.exit(1)
 
     # detect channel from tag
-    match = re.match(r"^(\d+\.\d+)(?:\.\d+)?(b\d+)?$", args.tag)
-    major_minor_version = None
+    match = re.match(r'^\d+\.\d+(?:\.\d+)?(b\d+)?$', args.tag)
     if match is None:
         channel = CHANNEL_DEV
-    elif match.group(2) is None:
-        major_minor_version = match.group(1)
+    elif match.group(1) is None:
         channel = CHANNEL_RELEASE
     else:
         channel = CHANNEL_BETA
@@ -108,11 +106,6 @@ def main():
         tags_to_push.append("beta")
         tags_to_push.append("latest")
 
-        # Compatibility with HA tags
-        if major_minor_version:
-            tags_to_push.append("stable")
-            tags_to_push.append(major_minor_version)
-
     if args.command == "build":
         # 1. pull cache image
         params = DockerParams.for_type_arch(args.build_type, args.arch)

docker/ha-addon-rootfs/etc/services.d/esphome/finish

@@ -1,15 +0,0 @@
-#!/usr/bin/execlineb -S0
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# Take down the S6 supervision tree when ESPHome fails
-# ==============================================================================
-
-declare APP_EXIT_CODE=${1}
-
-if [[ "${APP_EXIT_CODE}" -ne 0 ]] && [[ "${APP_EXIT_CODE}" -ne 256 ]]; then
-  bashio::log.warning "Halt add-on with exit code ${APP_EXIT_CODE}"
-  echo "${APP_EXIT_CODE}" > /run/s6-linux-init-container-results/exitcode
-  exec /run/s6/basedir/bin/halt
-fi
-
-bashio::log.info "Service restart after closing"

docker/ha-addon-rootfs/etc/services.d/nginx/finish

@@ -1,15 +0,0 @@
-#!/usr/bin/execlineb -S0
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# Take down the S6 supervision tree when NGINX fails
-# ==============================================================================
-
-declare APP_EXIT_CODE=${1}
-
-if [[ "${APP_EXIT_CODE}" -ne 0 ]] && [[ "${APP_EXIT_CODE}" -ne 256 ]]; then
-  bashio::log.warning "Halt add-on with exit code ${APP_EXIT_CODE}"
-  echo "${APP_EXIT_CODE}" > /run/s6-linux-init-container-results/exitcode
-  exec /run/s6/basedir/bin/halt
-fi
-
-bashio::log.info "Service restart after closing"

docker/hassio-rootfs/etc/cont-init.d/10-requirements.sh

@@ -7,12 +7,12 @@
 # Check SSL requirements, if enabled
 if bashio::config.true 'ssl'; then
     if ! bashio::config.has_value 'certfile'; then
-        bashio::log.fatal 'SSL is enabled, but no certfile was specified.'
+        bashio::fatal 'SSL is enabled, but no certfile was specified.'
         bashio::exit.nok
     fi
 
     if ! bashio::config.has_value 'keyfile'; then
-        bashio::log.fatal 'SSL is enabled, but no keyfile was specified'
+        bashio::fatal 'SSL is enabled, but no keyfile was specified'
         bashio::exit.nok
     fi
 

docker/hassio-rootfs/etc/nginx/servers/direct-ssl.disabled

@@ -10,7 +10,7 @@ server {
     ssl_certificate_key /ssl/%%keyfile%%;
 
     # Clear Hass.io Ingress header
-    proxy_set_header X-HA-Ingress "";
+    proxy_set_header X-Hassio-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/

docker/hassio-rootfs/etc/nginx/servers/direct.disabled

@@ -4,7 +4,7 @@ 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 "";
+    proxy_set_header X-Hassio-Ingress "";
 
     location / {
         proxy_pass http://esphome;

docker/hassio-rootfs/etc/nginx/servers/ingress.conf

@@ -3,8 +3,8 @@ 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";
+    # Set Hass.io Ingress header
+    proxy_set_header X-Hassio-Ingress "YES";
 
     location / {
         # Only allow from Hass.io supervisor

docker/hassio-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

docker/hassio-rootfs/etc/services.d/esphome/run

@@ -4,7 +4,7 @@
 # Runs the ESPHome dashboard
 # ==============================================================================
 
-export ESPHOME_IS_HA_ADDON=true
+export ESPHOME_IS_HASSIO=true
 
 if bashio::config.true 'leave_front_door_open'; then
     export DISABLE_HA_AUTHENTICATION=true
@@ -22,14 +22,6 @@ 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
@@ -40,4 +32,4 @@ export PLATFORMIO_CACHE_DIR="${pio_cache_base}/cache"
 export PLATFORMIO_GLOBALLIB_DIR=/piolibs
 
 bashio::log.info "Starting ESPHome dashboard..."
-exec esphome dashboard /config/esphome --socket /var/run/esphome.sock --ha-addon
+exec esphome dashboard /config/esphome --socket /var/run/esphome.sock --hassio

docker/hassio-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

esphome/__main__.py

@@ -2,30 +2,22 @@ import argparse
 import functools
 import logging
 import os
-import re
 import sys
-import time
 from datetime import datetime
 
 from esphome import const, writer, yaml_util
 import esphome.codegen as cg
 from esphome.config import iter_components, read_config, strip_default_ids
 from esphome.const import (
-    ALLOWED_NAME_CHARS,
     CONF_BAUD_RATE,
     CONF_BROKER,
     CONF_DEASSERT_RTS_DTR,
     CONF_LOGGER,
-    CONF_NAME,
     CONF_OTA,
     CONF_PASSWORD,
     CONF_PORT,
     CONF_ESPHOME,
     CONF_PLATFORMIO_OPTIONS,
-    CONF_SUBSTITUTIONS,
-    PLATFORM_ESP32,
-    PLATFORM_ESP8266,
-    PLATFORM_RP2040,
     SECRETS_FILES,
 )
 from esphome.core import CORE, EsphomeError, coroutine
@@ -105,11 +97,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 +115,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 +237,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 +254,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 +269,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 +276,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
 
@@ -510,98 +481,6 @@ def command_idedata(args, config):
     return 0
 
 
-def command_rename(args, config):
-    for c in args.name:
-        if c not in ALLOWED_NAME_CHARS:
-            print(
-                color(
-                    Fore.BOLD_RED,
-                    f"'{c}' is an invalid character for names. Valid characters are: "
-                    f"{ALLOWED_NAME_CHARS} (lowercase, no spaces)",
-                )
-            )
-            return 1
-    # Load existing yaml file
-    with open(CORE.config_path, mode="r+", encoding="utf-8") as raw_file:
-        raw_contents = raw_file.read()
-
-    yaml = yaml_util.load_yaml(CORE.config_path)
-    if CONF_ESPHOME not in yaml or CONF_NAME not in yaml[CONF_ESPHOME]:
-        print(
-            color(Fore.BOLD_RED, "Complex YAML files cannot be automatically renamed.")
-        )
-        return 1
-    old_name = yaml[CONF_ESPHOME][CONF_NAME]
-    match = re.match(r"^\$\{?([a-zA-Z0-9_]+)\}?$", old_name)
-    if match is None:
-        new_raw = re.sub(
-            rf"name:\s+[\"']?{old_name}[\"']?",
-            f'name: "{args.name}"',
-            raw_contents,
-        )
-    else:
-        old_name = yaml[CONF_SUBSTITUTIONS][match.group(1)]
-        if (
-            len(
-                re.findall(
-                    rf"^\s+{match.group(1)}:\s+[\"']?{old_name}[\"']?",
-                    raw_contents,
-                    flags=re.MULTILINE,
-                )
-            )
-            > 1
-        ):
-            print(color(Fore.BOLD_RED, "Too many matches in YAML to safely rename"))
-            return 1
-
-        new_raw = re.sub(
-            rf"^(\s+{match.group(1)}):\s+[\"']?{old_name}[\"']?",
-            f'\\1: "{args.name}"',
-            raw_contents,
-            flags=re.MULTILINE,
-        )
-
-    new_path = os.path.join(CORE.config_dir, args.name + ".yaml")
-    print(
-        f"Updating {color(Fore.CYAN, CORE.config_path)} to {color(Fore.CYAN, new_path)}"
-    )
-    print()
-
-    with open(new_path, mode="w", encoding="utf-8") as new_file:
-        new_file.write(new_raw)
-
-    rc = run_external_process("esphome", "config", new_path)
-    if rc != 0:
-        print(color(Fore.BOLD_RED, "Rename failed. Reverting changes."))
-        os.remove(new_path)
-        return 1
-
-    cli_args = [
-        "run",
-        new_path,
-        "--no-logs",
-        "--device",
-        CORE.address,
-    ]
-
-    if args.dashboard:
-        cli_args.insert(0, "--dashboard")
-
-    try:
-        rc = run_external_process("esphome", *cli_args)
-    except KeyboardInterrupt:
-        rc = 1
-    if rc != 0:
-        os.remove(new_path)
-        return 1
-
-    os.remove(CORE.config_path)
-
-    print(color(Fore.BOLD_GREEN, "SUCCESS"))
-    print()
-    return 0
-
-
 PRE_CONFIG_ACTIONS = {
     "wizard": command_wizard,
     "version": command_version,
@@ -620,7 +499,6 @@ POST_CONFIG_ACTIONS = {
     "mqtt-fingerprint": command_mqtt_fingerprint,
     "clean": command_clean,
     "idedata": command_idedata,
-    "rename": command_rename,
 }
 
 
@@ -688,10 +566,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",
@@ -787,7 +661,7 @@ def parse_args(argv):
         "--open-ui", help="Open the dashboard UI in a browser.", action="store_true"
     )
     parser_dashboard.add_argument(
-        "--ha-addon", help=argparse.SUPPRESS, action="store_true"
+        "--hassio", help=argparse.SUPPRESS, action="store_true"
     )
     parser_dashboard.add_argument(
         "--socket", help="Make the dashboard serve under a unix socket", type=str
@@ -807,15 +681,6 @@ def parse_args(argv):
         "configuration", help="Your YAML configuration file(s).", nargs=1
     )
 
-    parser_rename = subparsers.add_parser(
-        "rename",
-        help="Rename a device in YAML, compile the binary and upload it.",
-    )
-    parser_rename.add_argument(
-        "configuration", help="Your YAML configuration file.", nargs=1
-    )
-    parser_rename.add_argument("name", help="The new name for the device.", type=str)
-
     # Keep backward compatibility with the old command line format of
     # esphome <config> <command>.
     #
@@ -913,10 +778,10 @@ def run_esphome(argv):
         _LOGGER.warning("Please instead use:")
         _LOGGER.warning("   esphome %s", " ".join(args.deprecated_argv_suggestion))
 
-    if sys.version_info < (3, 8, 0):
+    if sys.version_info < (3, 7, 0):
         _LOGGER.error(
-            "You're running ESPHome with Python <3.8. ESPHome is no longer compatible "
-            "with this Python version. Please reinstall ESPHome with Python 3.8+"
+            "You're running ESPHome with Python <3.7. ESPHome is no longer compatible "
+            "with this Python version. Please reinstall ESPHome with Python 3.7+"
         )
         return 1
 

esphome/automation.py

@@ -12,7 +12,7 @@ from esphome.const import (
     CONF_TYPE_ID,
     CONF_TIME,
 )
-from esphome.schema_extractors import SCHEMA_EXTRACT, schema_extractor
+from esphome.jsonschema import jschema_extractor
 from esphome.util import Registry
 
 
@@ -23,10 +23,11 @@ def maybe_simple_id(*validators):
 def maybe_conf(conf, *validators):
     validator = cv.All(*validators)
 
-    @schema_extractor("maybe")
+    @jschema_extractor("maybe")
     def validate(value):
-        if value == SCHEMA_EXTRACT:
-            return (validator, conf)
+        # pylint: disable=comparison-with-callable
+        if value == jschema_extractor:
+            return validator
 
         if isinstance(value, dict):
             return validator(value)
@@ -110,9 +111,11 @@ def validate_automation(extra_schema=None, extra_validators=None, single=False):
         # This should only happen with invalid configs, but let's have a nice error message.
         return [schema(value)]
 
-    @schema_extractor("automation")
+    @jschema_extractor("automation")
     def validator(value):
-        if value == SCHEMA_EXTRACT:
+        # hack to get the schema
+        # pylint: disable=comparison-with-callable
+        if value == jschema_extractor:
             return schema
 
         value = validator_(value)
@@ -259,16 +262,21 @@ async def repeat_action_to_code(config, action_id, template_arg, args):
     return var
 
 
-_validate_wait_until = cv.maybe_simple_value(
-    {
-        cv.Required(CONF_CONDITION): validate_potentially_and_condition,
-        cv.Optional(CONF_TIMEOUT): cv.templatable(cv.positive_time_period_milliseconds),
-    },
-    key=CONF_CONDITION,
-)
+def validate_wait_until(value):
+    schema = cv.Schema(
+        {
+            cv.Required(CONF_CONDITION): validate_potentially_and_condition,
+            cv.Optional(CONF_TIMEOUT): cv.templatable(
+                cv.positive_time_period_milliseconds
+            ),
+        }
+    )
+    if isinstance(value, dict) and CONF_CONDITION in value:
+        return schema(value)
+    return validate_wait_until({CONF_CONDITION: value})
 
 
-@register_action("wait_until", WaitUntilAction, _validate_wait_until)
+@register_action("wait_until", WaitUntilAction, validate_wait_until)
 async def wait_until_action_to_code(config, action_id, template_arg, args):
     conditions = await build_condition(config[CONF_CONDITION], template_arg, args)
     var = cg.new_Pvariable(action_id, template_arg, conditions)

esphome/codegen.py

@@ -22,7 +22,6 @@ from esphome.cpp_generator import (  # noqa
     static_const_array,
     statement,
     variable,
-    with_local_variable,
     new_variable,
     Pvariable,
     new_Pvariable,
@@ -64,8 +63,6 @@ from esphome.cpp_types import (  # noqa
     uint32,
     uint64,
     int32,
-    int64,
-    size_t,
     const_char_ptr,
     NAN,
     esphome_ns,
@@ -84,5 +81,4 @@ from esphome.cpp_types import (  # noqa
     InternalGPIOPin,
     gpio_Flags,
     EntityCategory,
-    Parented,
 )

esphome/components/ac_dimmer/ac_dimmer.cpp

@@ -122,7 +122,6 @@ void IRAM_ATTR HOT AcDimmerDataStore::gpio_intr() {
       // also take into account min_power
       auto min_us = this->cycle_time_us * this->min_power / 1000;
       this->enable_time_us = std::max((uint32_t) 1, ((65535 - this->value) * (this->cycle_time_us - min_us)) / 65535);
-
       if (this->method == DIM_METHOD_LEADING_PULSE) {
         // Minimum pulse time should be enough for the triac to trigger when it is close to the ZC zone
         // this is for brightness near 99%
@@ -203,7 +202,6 @@ void AcDimmer::setup() {
 #endif
 }
 void AcDimmer::write_state(float state) {
-  state = std::acos(1 - (2 * state)) / 3.14159;  // RMS power compensation
   auto new_value = static_cast<uint16_t>(roundf(state * 65535));
   if (new_value != 0 && this->store_.value == 0)
     this->store_.init_cycle = this->init_with_half_cycle_;

esphome/components/adc/adc_sensor.cpp

@@ -11,38 +11,19 @@ ADC_MODE(ADC_VCC)
 #endif
 #endif
 
-#ifdef USE_RP2040
-#include <hardware/adc.h>
-#endif
-
 namespace esphome {
 namespace adc {
 
 static const char *const TAG = "adc";
-
-// 13bit for S2, and 12bit for all other esp32 variants
+// 13 bits for S3 / 12 bit for all other esp32 variants
+// create a const to avoid the repated cast to enum
 #ifdef USE_ESP32
 static const adc_bits_width_t ADC_WIDTH_MAX_SOC_BITS = static_cast<adc_bits_width_t>(ADC_WIDTH_MAX - 1);
-
-#ifndef SOC_ADC_RTC_MAX_BITWIDTH
-#if USE_ESP32_VARIANT_ESP32S2
-static const int SOC_ADC_RTC_MAX_BITWIDTH = 13;
-#else
-static const int SOC_ADC_RTC_MAX_BITWIDTH = 12;
-#endif
 #endif
 
-static const int ADC_MAX = (1 << SOC_ADC_RTC_MAX_BITWIDTH) - 1;    // 4095 (12 bit) or 8191 (13 bit)
-static const int ADC_HALF = (1 << SOC_ADC_RTC_MAX_BITWIDTH) >> 1;  // 2048 (12 bit) or 4096 (13 bit)
-#endif
-
-#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
 
@@ -70,17 +51,11 @@ extern "C"
     }
   }
 
-#endif  // USE_ESP32
-
-#ifdef USE_RP2040
-  static bool initialized = false;
-  if (!initialized) {
-    adc_init();
-    initialized = true;
-  }
+  // adc_gpio_init doesn't exist on ESP32-C3 or ESP32-H2
+#if !defined(USE_ESP32_VARIANT_ESP32C3) && !defined(USE_ESP32_VARIANT_ESP32H2)
+  adc_gpio_init(ADC_UNIT_1, (adc_channel_t) channel_);
 #endif
-
-  ESP_LOGCONFIG(TAG, "ADC '%s' setup finished!", this->get_name().c_str());
+#endif  // USE_ESP32
 }
 
 void ADCSensor::dump_config() {
@@ -100,29 +75,22 @@ void ADCSensor::dump_config() {
   } else {
     switch (this->attenuation_) {
       case ADC_ATTEN_DB_0:
-        ESP_LOGCONFIG(TAG, " Attenuation: 0db");
+        ESP_LOGCONFIG(TAG, " Attenuation: 0db (max 1.1V)");
         break;
       case ADC_ATTEN_DB_2_5:
-        ESP_LOGCONFIG(TAG, " Attenuation: 2.5db");
+        ESP_LOGCONFIG(TAG, " Attenuation: 2.5db (max 1.5V)");
         break;
       case ADC_ATTEN_DB_6:
-        ESP_LOGCONFIG(TAG, " Attenuation: 6db");
+        ESP_LOGCONFIG(TAG, " Attenuation: 6db (max 2.2V)");
         break;
       case ADC_ATTEN_DB_11:
-        ESP_LOGCONFIG(TAG, " Attenuation: 11db");
+        ESP_LOGCONFIG(TAG, " Attenuation: 11db (max 3.9V)");
         break;
       default:  // This is to satisfy the unused ADC_ATTEN_MAX
         break;
     }
   }
 #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);
 }
 
@@ -161,16 +129,16 @@ float ADCSensor::sample() {
     return mv / 1000.0f;
   }
 
-  int raw11, raw6 = ADC_MAX, raw2 = ADC_MAX, raw0 = ADC_MAX;
+  int raw11, raw6 = 4095, raw2 = 4095, raw0 = 4095;
   adc1_config_channel_atten(channel_, ADC_ATTEN_DB_11);
   raw11 = adc1_get_raw(channel_);
-  if (raw11 < ADC_MAX) {
+  if (raw11 < 4095) {
     adc1_config_channel_atten(channel_, ADC_ATTEN_DB_6);
     raw6 = adc1_get_raw(channel_);
-    if (raw6 < ADC_MAX) {
+    if (raw6 < 4095) {
       adc1_config_channel_atten(channel_, ADC_ATTEN_DB_2_5);
       raw2 = adc1_get_raw(channel_);
-      if (raw2 < ADC_MAX) {
+      if (raw2 < 4095) {
         adc1_config_channel_atten(channel_, ADC_ATTEN_DB_0);
         raw0 = adc1_get_raw(channel_);
       }
@@ -186,43 +154,20 @@ float ADCSensor::sample() {
   uint32_t mv2 = esp_adc_cal_raw_to_voltage(raw2, &cal_characteristics_[(int) ADC_ATTEN_DB_2_5]);
   uint32_t mv0 = esp_adc_cal_raw_to_voltage(raw0, &cal_characteristics_[(int) ADC_ATTEN_DB_0]);
 
-  // Contribution of each value, in range 0-2048 (12 bit ADC) or 0-4096 (13 bit ADC)
-  uint32_t c11 = std::min(raw11, ADC_HALF);
-  uint32_t c6 = ADC_HALF - std::abs(raw6 - ADC_HALF);
-  uint32_t c2 = ADC_HALF - std::abs(raw2 - ADC_HALF);
-  uint32_t c0 = std::min(ADC_MAX - raw0, ADC_HALF);
-  // max theoretical csum value is 4096*4 = 16384
+  // Contribution of each value, in range 0-2048
+  uint32_t c11 = std::min(raw11, 2048);
+  uint32_t c6 = 2048 - std::abs(raw6 - 2048);
+  uint32_t c2 = 2048 - std::abs(raw2 - 2048);
+  uint32_t c0 = std::min(4095 - raw0, 2048);
+  // max theoretical csum value is 2048*4 = 8192
   uint32_t csum = c11 + c6 + c2 + c0;
 
-  // each mv is max 3900; so max value is 3900*4096*4, fits in unsigned32
+  // each mv is max 3900; so max value is 3900*2048*4, fits in unsigned
   uint32_t mv_scaled = (mv11 * c11) + (mv6 * c6) + (mv2 * c2) + (mv0 * c0);
   return mv_scaled / (float) (csum * 1000U);
 }
 #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

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_{};

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
 
 
@@ -142,7 +133,6 @@ ADCSensor = adc_ns.class_(
 
 CONFIG_SCHEMA = cv.All(
     sensor.sensor_schema(
-        ADCSensor,
         unit_of_measurement=UNIT_VOLT,
         accuracy_decimals=2,
         device_class=DEVICE_CLASS_VOLTAGE,
@@ -150,6 +140,7 @@ CONFIG_SCHEMA = cv.All(
     )
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(ADCSensor),
             cv.Required(CONF_PIN): validate_adc_pin,
             cv.Optional(CONF_RAW, default=False): cv.boolean,
             cv.SplitDefault(CONF_ATTENUATION, esp32="0db"): cv.All(
@@ -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))

esphome/components/adc128s102/__init__.py

@@ -1,23 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import spi
-from esphome.const import CONF_ID
-
-DEPENDENCIES = ["spi"]
-MULTI_CONF = True
-CODEOWNERS = ["@DeerMaximum"]
-
-adc128s102_ns = cg.esphome_ns.namespace("adc128s102")
-ADC128S102 = adc128s102_ns.class_("ADC128S102", cg.Component, spi.SPIDevice)
-
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(ADC128S102),
-    }
-).extend(spi.spi_device_schema(cs_pin_required=True))
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await spi.register_spi_device(var, config)

esphome/components/adc128s102/adc128s102.cpp

@@ -1,35 +0,0 @@
-#include "adc128s102.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace adc128s102 {
-
-static const char *const TAG = "adc128s102";
-
-float ADC128S102::get_setup_priority() const { return setup_priority::HARDWARE; }
-
-void ADC128S102::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up adc128s102");
-  this->spi_setup();
-}
-
-void ADC128S102::dump_config() {
-  ESP_LOGCONFIG(TAG, "ADC128S102:");
-  LOG_PIN("  CS Pin:", this->cs_);
-}
-
-uint16_t ADC128S102::read_data(uint8_t channel) {
-  uint8_t control = channel << 3;
-
-  this->enable();
-  uint8_t adc_primary_byte = this->transfer_byte(control);
-  uint8_t adc_secondary_byte = this->transfer_byte(0x00);
-  this->disable();
-
-  uint16_t digital_value = adc_primary_byte << 8 | adc_secondary_byte;
-
-  return digital_value;
-}
-
-}  // namespace adc128s102
-}  // namespace esphome

esphome/components/adc128s102/adc128s102.h

@@ -1,23 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/hal.h"
-#include "esphome/components/spi/spi.h"
-
-namespace esphome {
-namespace adc128s102 {
-
-class ADC128S102 : public Component,
-                   public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW, spi::CLOCK_PHASE_LEADING,
-                                         spi::DATA_RATE_10MHZ> {
- public:
-  ADC128S102() = default;
-
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override;
-  uint16_t read_data(uint8_t channel);
-};
-
-}  // namespace adc128s102
-}  // namespace esphome

esphome/components/adc128s102/sensor/__init__.py

@@ -1,35 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor, voltage_sampler
-from esphome.const import CONF_ID, CONF_CHANNEL
-
-from .. import adc128s102_ns, ADC128S102
-
-AUTO_LOAD = ["voltage_sampler"]
-DEPENDENCIES = ["adc128s102"]
-
-ADC128S102Sensor = adc128s102_ns.class_(
-    "ADC128S102Sensor",
-    sensor.Sensor,
-    cg.PollingComponent,
-    voltage_sampler.VoltageSampler,
-)
-CONF_ADC128S102_ID = "adc128s102_id"
-
-CONFIG_SCHEMA = sensor.SENSOR_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(ADC128S102Sensor),
-        cv.GenerateID(CONF_ADC128S102_ID): cv.use_id(ADC128S102),
-        cv.Required(CONF_CHANNEL): cv.int_range(min=0, max=7),
-    }
-).extend(cv.polling_component_schema("60s"))
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(
-        config[CONF_ID],
-        config[CONF_CHANNEL],
-    )
-    await cg.register_parented(var, config[CONF_ADC128S102_ID])
-    await cg.register_component(var, config)
-    await sensor.register_sensor(var, config)

esphome/components/adc128s102/sensor/adc128s102_sensor.cpp

@@ -1,24 +0,0 @@
-#include "adc128s102_sensor.h"
-
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace adc128s102 {
-
-static const char *const TAG = "adc128s102.sensor";
-
-ADC128S102Sensor::ADC128S102Sensor(uint8_t channel) : channel_(channel) {}
-
-float ADC128S102Sensor::get_setup_priority() const { return setup_priority::DATA; }
-
-void ADC128S102Sensor::dump_config() {
-  LOG_SENSOR("", "ADC128S102 Sensor", this);
-  ESP_LOGCONFIG(TAG, "  Pin: %u", this->channel_);
-  LOG_UPDATE_INTERVAL(this);
-}
-
-float ADC128S102Sensor::sample() { return this->parent_->read_data(this->channel_); }
-void ADC128S102Sensor::update() { this->publish_state(this->sample()); }
-
-}  // namespace adc128s102
-}  // namespace esphome

esphome/components/adc128s102/sensor/adc128s102_sensor.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/voltage_sampler/voltage_sampler.h"
-#include "esphome/core/component.h"
-#include "esphome/core/hal.h"
-
-#include "../adc128s102.h"
-
-namespace esphome {
-namespace adc128s102 {
-
-class ADC128S102Sensor : public PollingComponent,
-                         public Parented<ADC128S102>,
-                         public sensor::Sensor,
-                         public voltage_sampler::VoltageSampler {
- public:
-  ADC128S102Sensor(uint8_t channel);
-
-  void update() override;
-  void dump_config() override;
-  float get_setup_priority() const override;
-  float sample() override;
-
- protected:
-  uint8_t channel_;
-};
-}  // namespace adc128s102
-}  // namespace esphome

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 {
 
@@ -42,8 +40,6 @@ class AddressableLightDisplay : public display::DisplayBuffer, public PollingCom
   void setup() override;
   void display();
 
-  display::DisplayType get_display_type() override { return display::DisplayType::DISPLAY_TYPE_COLOR; }
-
  protected:
   int get_width_internal() override;
   int get_height_internal() override;

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 {
 
@@ -84,7 +82,7 @@ class ADE7953 : public i2c::I2CDevice, public PollingComponent {
     return i2c::ERROR_OK;
   }
 
-  InternalGPIOPin *irq_pin_{nullptr};
+  InternalGPIOPin *irq_pin_ = nullptr;
   bool is_setup_{false};
   sensor::Sensor *voltage_sensor_{nullptr};
   sensor::Sensor *current_a_sensor_{nullptr};

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 {
 

esphome/components/ads1115/sensor.py

@@ -52,7 +52,6 @@ ADS1115Sensor = ads1115_ns.class_(
 CONF_ADS1115_ID = "ads1115_id"
 CONFIG_SCHEMA = (
     sensor.sensor_schema(
-        ADS1115Sensor,
         unit_of_measurement=UNIT_VOLT,
         accuracy_decimals=3,
         device_class=DEVICE_CLASS_VOLTAGE,
@@ -60,6 +59,7 @@ CONFIG_SCHEMA = (
     )
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(ADS1115Sensor),
             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,

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();

esphome/components/aht10/aht10.h

@@ -18,8 +18,8 @@ class AHT10Component : public PollingComponent, public i2c::I2CDevice {
   void set_humidity_sensor(sensor::Sensor *humidity_sensor) { humidity_sensor_ = humidity_sensor; }
 
  protected:
-  sensor::Sensor *temperature_sensor_{nullptr};
-  sensor::Sensor *humidity_sensor_{nullptr};
+  sensor::Sensor *temperature_sensor_;
+  sensor::Sensor *humidity_sensor_;
 };
 
 }  // namespace aht10

esphome/components/airthings_wave_mini/airthings_wave_mini.cpp

@@ -38,7 +38,7 @@ void AirthingsWaveMini::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt
     }
 
     case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->parent()->get_conn_id())
+      if (param->read.conn_id != this->parent()->conn_id)
         break;
       if (param->read.status != ESP_GATT_OK) {
         ESP_LOGW(TAG, "Error reading char at handle %d, status=%d", param->read.handle, param->read.status);
@@ -88,8 +88,8 @@ void AirthingsWaveMini::update() {
 }
 
 void AirthingsWaveMini::request_read_values_() {
-  auto status = esp_ble_gattc_read_char(this->parent()->get_gattc_if(), this->parent()->get_conn_id(), this->handle_,
-                                        ESP_GATT_AUTH_REQ_NONE);
+  auto status =
+      esp_ble_gattc_read_char(this->parent()->gattc_if, this->parent()->conn_id, this->handle_, ESP_GATT_AUTH_REQ_NONE);
   if (status) {
     ESP_LOGW(TAG, "Error sending read request for sensor, status=%d", status);
   }

esphome/components/airthings_wave_plus/airthings_wave_plus.cpp

@@ -38,7 +38,7 @@ void AirthingsWavePlus::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt
     }
 
     case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->parent()->get_conn_id())
+      if (param->read.conn_id != this->parent()->conn_id)
         break;
       if (param->read.status != ESP_GATT_OK) {
         ESP_LOGW(TAG, "Error reading char at handle %d, status=%d", param->read.handle, param->read.status);
@@ -109,8 +109,8 @@ void AirthingsWavePlus::update() {
 }
 
 void AirthingsWavePlus::request_read_values_() {
-  auto status = esp_ble_gattc_read_char(this->parent()->get_gattc_if(), this->parent()->get_conn_id(), this->handle_,
-                                        ESP_GATT_AUTH_REQ_NONE);
+  auto status =
+      esp_ble_gattc_read_char(this->parent()->gattc_if, this->parent()->conn_id, this->handle_, ESP_GATT_AUTH_REQ_NONE);
   if (status) {
     ESP_LOGW(TAG, "Error sending read request for sensor, status=%d", status);
   }

esphome/components/am2320/am2320.cpp

@@ -4,15 +4,33 @@
 //  - Arduino - AM2320: https://github.com/EngDial/AM2320/blob/master/src/AM2320.cpp
 
 #include "am2320.h"
-#include "esphome/core/hal.h"
-#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
+#include "esphome/core/hal.h"
 
 namespace esphome {
 namespace am2320 {
 
 static const char *const TAG = "am2320";
 
+// ---=== Calc CRC16 ===---
+uint16_t crc_16(uint8_t *ptr, uint8_t length) {
+  uint16_t crc = 0xFFFF;
+  uint8_t i;
+  //------------------------------
+  while (length--) {
+    crc ^= *ptr++;
+    for (i = 0; i < 8; i++) {
+      if ((crc & 0x01) != 0) {
+        crc >>= 1;
+        crc ^= 0xA001;
+      } else {
+        crc >>= 1;
+      }
+    }
+  }
+  return crc;
+}
+
 void AM2320Component::update() {
   uint8_t data[8];
   data[0] = 0;
@@ -80,7 +98,7 @@ bool AM2320Component::read_data_(uint8_t *data) {
   checksum = data[7] << 8;
   checksum += data[6];
 
-  if (crc16(data, 6) != checksum) {
+  if (crc_16(data, 6) != checksum) {
     ESP_LOGW(TAG, "AM2320 Checksum invalid!");
     return false;
   }

esphome/components/am2320/am2320.h

@@ -21,8 +21,8 @@ class AM2320Component : public PollingComponent, public i2c::I2CDevice {
   bool read_data_(uint8_t *data);
   bool read_bytes_(uint8_t a_register, uint8_t *data, uint8_t len, uint32_t conversion = 0);
 
-  sensor::Sensor *temperature_sensor_{nullptr};
-  sensor::Sensor *humidity_sensor_{nullptr};
+  sensor::Sensor *temperature_sensor_;
+  sensor::Sensor *humidity_sensor_;
 };
 
 }  // namespace am2320

esphome/components/am43/am43.cpp

@@ -76,9 +76,9 @@ void Am43::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_i
       if (this->current_sensor_ > 0) {
         if (this->illuminance_ != nullptr) {
           auto *packet = this->encoder_->get_light_level_request();
-          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);
+          auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_,
+                                                 packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP,
+                                                 ESP_GATT_AUTH_REQ_NONE);
           if (status) {
             ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(),
                      status);
@@ -102,11 +102,10 @@ void Am43::update() {
     if (this->battery_ != nullptr) {
       auto *packet = this->encoder_->get_battery_level_request();
       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) {
+          esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_, packet->length,
+                                   packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+      if (status)
         ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(), status);
-      }
     }
     this->current_sensor_++;
   }

esphome/components/am43/cover/am43_cover.cpp

@@ -27,8 +27,8 @@ void Am43Component::loop() {
   if (this->node_state == espbt::ClientState::ESTABLISHED && !this->logged_in_) {
     auto *packet = this->encoder_->get_send_pin_request(this->pin_);
     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);
+        esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_, packet->length,
+                                 packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
     ESP_LOGI(TAG, "[%s] Logging into AM43", this->get_name().c_str());
     if (status) {
       ESP_LOGW(TAG, "[%s] Error writing set_pin to device, error = %d", this->get_name().c_str(), status);
@@ -54,11 +54,10 @@ void Am43Component::control(const CoverCall &call) {
   if (call.get_stop()) {
     auto *packet = this->encoder_->get_stop_request();
     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) {
+        esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_, packet->length,
+                                 packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+    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();
@@ -67,11 +66,10 @@ void Am43Component::control(const CoverCall &call) {
       pos = 1 - pos;
     auto *packet = this->encoder_->get_set_position_request(100 - (uint8_t)(pos * 100));
     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) {
+        esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_, packet->length,
+                                 packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+    if (status)
       ESP_LOGW(TAG, "[%s] Error writing set_position command to device, error = %d", this->get_name().c_str(), status);
-    }
   }
 }
 
@@ -94,8 +92,7 @@ void Am43Component::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
       }
       this->char_handle_ = chr->handle;
 
-      auto status = esp_ble_gattc_register_for_notify(this->parent_->get_gattc_if(), this->parent_->get_remote_bda(),
-                                                      chr->handle);
+      auto status = esp_ble_gattc_register_for_notify(this->parent_->gattc_if, this->parent_->remote_bda, chr->handle);
       if (status) {
         ESP_LOGW(TAG, "[%s] esp_ble_gattc_register_for_notify failed, status=%d", this->get_name().c_str(), status);
       }
@@ -125,24 +122,21 @@ void Am43Component::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
         if (this->decoder_->pin_ok_) {
           ESP_LOGI(TAG, "[%s] AM43 pin accepted.", this->get_name().c_str());
           auto *packet = this->encoder_->get_position_request();
-          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) {
+          auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_,
+                                                 packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP,
+                                                 ESP_GATT_AUTH_REQ_NONE);
+          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:

esphome/components/analog_threshold/__init__.py

@@ -1 +0,0 @@
-CODEOWNERS = ["@ianchi"]

esphome/components/analog_threshold/analog_threshold_binary_sensor.cpp

@@ -1,40 +0,0 @@
-#include "analog_threshold_binary_sensor.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace analog_threshold {
-
-static const char *const TAG = "analog_threshold.binary_sensor";
-
-void AnalogThresholdBinarySensor::setup() {
-  float sensor_value = this->sensor_->get_state();
-
-  // TRUE state is defined to be when sensor is >= threshold
-  // so when undefined sensor value initialize to FALSE
-  if (std::isnan(sensor_value)) {
-    this->publish_initial_state(false);
-  } else {
-    this->publish_initial_state(sensor_value >= (this->lower_threshold_ + this->upper_threshold_) / 2.0f);
-  }
-}
-
-void AnalogThresholdBinarySensor::set_sensor(sensor::Sensor *analog_sensor) {
-  this->sensor_ = analog_sensor;
-
-  this->sensor_->add_on_state_callback([this](float sensor_value) {
-    // if there is an invalid sensor reading, ignore the change and keep the current state
-    if (!std::isnan(sensor_value)) {
-      this->publish_state(sensor_value >= (this->state ? this->lower_threshold_ : this->upper_threshold_));
-    }
-  });
-}
-
-void AnalogThresholdBinarySensor::dump_config() {
-  LOG_BINARY_SENSOR("", "Analog Threshold Binary Sensor", this);
-  LOG_SENSOR("  ", "Sensor", this->sensor_);
-  ESP_LOGCONFIG(TAG, "  Upper threshold: %.11f", this->upper_threshold_);
-  ESP_LOGCONFIG(TAG, "  Lower threshold: %.11f", this->lower_threshold_);
-}
-
-}  // namespace analog_threshold
-}  // namespace esphome

esphome/components/analog_threshold/analog_threshold_binary_sensor.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/binary_sensor/binary_sensor.h"
-#include "esphome/components/sensor/sensor.h"
-
-namespace esphome {
-namespace analog_threshold {
-
-class AnalogThresholdBinarySensor : public Component, public binary_sensor::BinarySensor {
- public:
-  void dump_config() override;
-  void setup() override;
-
-  float get_setup_priority() const override { return setup_priority::DATA; }
-
-  void set_sensor(sensor::Sensor *analog_sensor);
-  void set_upper_threshold(float threshold) { this->upper_threshold_ = threshold; }
-  void set_lower_threshold(float threshold) { this->lower_threshold_ = threshold; }
-
- protected:
-  sensor::Sensor *sensor_{nullptr};
-
-  float upper_threshold_;
-  float lower_threshold_;
-};
-
-}  // namespace analog_threshold
-}  // namespace esphome

esphome/components/analog_threshold/binary_sensor.py

@@ -1,44 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import binary_sensor, sensor
-from esphome.const import (
-    CONF_SENSOR_ID,
-    CONF_THRESHOLD,
-)
-
-analog_threshold_ns = cg.esphome_ns.namespace("analog_threshold")
-
-AnalogThresholdBinarySensor = analog_threshold_ns.class_(
-    "AnalogThresholdBinarySensor", binary_sensor.BinarySensor, cg.Component
-)
-
-CONF_UPPER = "upper"
-CONF_LOWER = "lower"
-
-CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(AnalogThresholdBinarySensor),
-        cv.Required(CONF_SENSOR_ID): cv.use_id(sensor.Sensor),
-        cv.Required(CONF_THRESHOLD): cv.Any(
-            cv.float_,
-            cv.Schema(
-                {cv.Required(CONF_UPPER): cv.float_, cv.Required(CONF_LOWER): cv.float_}
-            ),
-        ),
-    }
-).extend(cv.COMPONENT_SCHEMA)
-
-
-async def to_code(config):
-    var = await binary_sensor.new_binary_sensor(config)
-    await cg.register_component(var, config)
-
-    sens = await cg.get_variable(config[CONF_SENSOR_ID])
-    cg.add(var.set_sensor(sens))
-
-    if isinstance(config[CONF_THRESHOLD], float):
-        cg.add(var.set_upper_threshold(config[CONF_THRESHOLD]))
-        cg.add(var.set_lower_threshold(config[CONF_THRESHOLD]))
-    else:
-        cg.add(var.set_upper_threshold(config[CONF_THRESHOLD][CONF_UPPER]))
-        cg.add(var.set_lower_threshold(config[CONF_THRESHOLD][CONF_LOWER]))

esphome/components/animation/__init__.py

@@ -13,7 +13,7 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ["display"]
 MULTI_CONF = True
 
-Animation_ = display.display_ns.class_("Animation", espImage.Image_)
+Animation_ = display.display_ns.class_("Animation")
 
 ANIMATION_SCHEMA = cv.Schema(
     {
@@ -76,8 +76,6 @@ async def to_code(config):
         pos = 0
         for frameIndex in range(frames):
             image.seek(frameIndex)
-            if CONF_RESIZE in config:
-                image.thumbnail(config[CONF_RESIZE])
             frame = image.convert("RGB")
             if CONF_RESIZE in config:
                 frame = frame.resize([width, height])
@@ -94,29 +92,6 @@ async def to_code(config):
                 data[pos] = pix[2]
                 pos += 1
 
-    elif config[CONF_TYPE] == "RGB565":
-        data = [0 for _ in range(height * width * 2 * frames)]
-        pos = 0
-        for frameIndex in range(frames):
-            image.seek(frameIndex)
-            frame = image.convert("RGB")
-            if CONF_RESIZE in config:
-                frame = frame.resize([width, height])
-            pixels = list(frame.getdata())
-            if len(pixels) != height * width:
-                raise core.EsphomeError(
-                    f"Unexpected number of pixels in {path} frame {frameIndex}: ({len(pixels)} != {height*width})"
-                )
-            for pix in pixels:
-                R = pix[0] >> 3
-                G = pix[1] >> 2
-                B = pix[2] >> 3
-                rgb = (R << 11) | (G << 5) | B
-                data[pos] = rgb >> 8
-                pos += 1
-                data[pos] = rgb & 255
-                pos += 1
-
     elif config[CONF_TYPE] == "BINARY":
         width8 = ((width + 7) // 8) * 8
         data = [0 for _ in range((height * width8 // 8) * frames)]

esphome/components/anova/anova.cpp

@@ -34,21 +34,17 @@ void Anova::control(const ClimateCall &call) {
         ESP_LOGW(TAG, "Unsupported mode: %d", mode);
         return;
     }
-    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) {
+    auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_,
+                                           pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+    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) {
+    auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_,
+                                           pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+    if (status)
       ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(), status);
-    }
   }
 }
 
@@ -69,8 +65,7 @@ void Anova::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_
       }
       this->char_handle_ = chr->handle;
 
-      auto status = esp_ble_gattc_register_for_notify(this->parent_->get_gattc_if(), this->parent_->get_remote_bda(),
-                                                      chr->handle);
+      auto status = esp_ble_gattc_register_for_notify(this->parent_->gattc_if, this->parent_->remote_bda, chr->handle);
       if (status) {
         ESP_LOGW(TAG, "[%s] esp_ble_gattc_register_for_notify failed, status=%d", this->get_name().c_str(), status);
       }
@@ -97,7 +92,7 @@ void Anova::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_
       }
       if (this->codec_->has_unit()) {
         this->fahrenheit_ = (this->codec_->unit_ == 'f');
-        ESP_LOGD(TAG, "Anova units is %s", this->fahrenheit_ ? "fahrenheit" : "celsius");
+        ESP_LOGD(TAG, "Anova units is %s", this->fahrenheit_ ? "fahrenheit" : "celcius");
         this->current_request_++;
       }
       this->publish_state();
@@ -117,8 +112,8 @@ void Anova::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_
         }
         if (pkt != nullptr) {
           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);
+              esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_, pkt->length,
+                                       pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
           if (status) {
             ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(),
                      status);
@@ -142,12 +137,10 @@ void Anova::update() {
     auto *pkt = this->codec_->get_read_device_status_request();
     if (this->current_request_ == 0)
       this->codec_->get_set_unit_request(this->fahrenheit_ ? 'f' : 'c');
-    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) {
+    auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_,
+                                           pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+    if (status)
       ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(), status);
-    }
     this->current_request_++;
   }
 }

esphome/components/apds9960/__init__.py

@@ -8,27 +8,6 @@ AUTO_LOAD = ["sensor", "binary_sensor"]
 MULTI_CONF = True
 
 CONF_APDS9960_ID = "apds9960_id"
-CONF_LED_DRIVE = "led_drive"
-CONF_PROXIMITY_GAIN = "proximity_gain"
-CONF_AMBIENT_LIGHT_GAIN = "ambient_light_gain"
-CONF_GESTURE_LED_DRIVE = "gesture_led_drive"
-CONF_GESTURE_GAIN = "gesture_gain"
-CONF_GESTURE_WAIT_TIME = "gesture_wait_time"
-
-DRIVE_LEVELS = {"100ma": 0, "50ma": 1, "25ma": 2, "12.5ma": 3}
-PROXIMITY_LEVELS = {"1x": 0, "2x": 1, "4x": 2, "8x": 3}
-AMBIENT_LEVELS = {"1x": 0, "4x": 1, "16x": 2, "64x": 3}
-GESTURE_LEVELS = {"1x": 0, "2x": 1, "4x": 2, "8x": 3}
-GESTURE_WAIT_TIMES = {
-    "0ms": 0,
-    "2.8ms": 1,
-    "5.6ms": 2,
-    "8.4ms": 3,
-    "14ms": 4,
-    "22.4ms": 5,
-    "30.8ms": 6,
-    "39.2ms": 7,
-}
 
 apds9960_nds = cg.esphome_ns.namespace("apds9960")
 APDS9960 = apds9960_nds.class_("APDS9960", cg.PollingComponent, i2c.I2CDevice)
@@ -37,20 +16,6 @@ CONFIG_SCHEMA = (
     cv.Schema(
         {
             cv.GenerateID(): cv.declare_id(APDS9960),
-            cv.Optional(CONF_LED_DRIVE, "100mA"): cv.enum(DRIVE_LEVELS, lower=True),
-            cv.Optional(CONF_PROXIMITY_GAIN, "4x"): cv.enum(
-                PROXIMITY_LEVELS, lower=True
-            ),
-            cv.Optional(CONF_AMBIENT_LIGHT_GAIN, "4x"): cv.enum(
-                AMBIENT_LEVELS, lower=True
-            ),
-            cv.Optional(CONF_GESTURE_LED_DRIVE, "100mA"): cv.enum(
-                DRIVE_LEVELS, lower=True
-            ),
-            cv.Optional(CONF_GESTURE_GAIN, "4x"): cv.enum(GESTURE_LEVELS, lower=True),
-            cv.Optional(CONF_GESTURE_WAIT_TIME, "2.8ms"): cv.enum(
-                GESTURE_WAIT_TIMES, lower=True
-            ),
         }
     )
     .extend(cv.polling_component_schema("60s"))
@@ -62,9 +27,3 @@ async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
-    cg.add(var.set_led_drive(config[CONF_LED_DRIVE]))
-    cg.add(var.set_proximity_gain(config[CONF_PROXIMITY_GAIN]))
-    cg.add(var.set_ambient_gain(config[CONF_AMBIENT_LIGHT_GAIN]))
-    cg.add(var.set_gesture_led_drive(config[CONF_GESTURE_LED_DRIVE]))
-    cg.add(var.set_gesture_gain(config[CONF_GESTURE_GAIN]))
-    cg.add(var.set_gesture_wait_time(config[CONF_GESTURE_WAIT_TIME]))

esphome/components/apds9960/apds9960.cpp

@@ -46,16 +46,16 @@ void APDS9960::setup() {
   uint8_t val = 0;
   APDS9960_ERROR_CHECK(this->read_byte(0x8F, &val));
   val &= 0b00111111;
-  // led drive, 0 -> 100mA, 1 -> 50mA, 2 -> 25mA, 3 -> 12.5mA
-  val |= (this->led_drive_ & 0b11) << 6;
+  uint8_t led_drive = 0;  // led drive, 0 -> 100mA, 1 -> 50mA, 2 -> 25mA, 3 -> 12.5mA
+  val |= (led_drive & 0b11) << 6;
 
   val &= 0b11110011;
-  // proximity gain, 0 -> 1x, 1 -> 2X, 2 -> 4X, 3 -> 8X
-  val |= (this->proximity_gain_ & 0b11) << 2;
+  uint8_t proximity_gain = 2;  // proximity gain, 0 -> 1x, 1 -> 2X, 2 -> 4X, 4 -> 8X
+  val |= (proximity_gain & 0b11) << 2;
 
   val &= 0b11111100;
-  // ambient light gain, 0 -> 1x, 1 -> 4x, 2 -> 16x, 3 -> 64x
-  val |= (this->ambient_gain_ & 0b11) << 0;
+  uint8_t ambient_gain = 1;  // ambient light gain, 0 -> 1x, 1 -> 4x, 2 -> 16x, 3 -> 64x
+  val |= (ambient_gain & 0b11) << 0;
   APDS9960_WRITE_BYTE(0x8F, val);
 
   // Pers (0x8C) -> 0x11 (2 consecutive proximity or ALS for interrupt)
@@ -75,18 +75,19 @@ void APDS9960::setup() {
   // GConf 2 (0xA3, gesture config 2) ->
   APDS9960_ERROR_CHECK(this->read_byte(0xA3, &val));
   val &= 0b10011111;
-  // gesture gain, 0 -> 1x, 1 -> 2x, 2 -> 4x, 3 -> 8x
-  val |= (this->gesture_gain_ & 0b11) << 5;
+  uint8_t gesture_gain = 2;  // gesture gain, 0 -> 1x, 1 -> 2x, 2 -> 4x, 3 -> 8x
+  val |= (gesture_gain & 0b11) << 5;
 
   val &= 0b11100111;
-  // gesture led drive, 0 -> 100mA, 1 -> 50mA, 2 -> 25mA, 3 -> 12.5mA
-  val |= (this->gesture_led_drive_ & 0b11) << 3;
+  uint8_t gesture_led_drive = 0;  // gesture led drive, 0 -> 100mA, 1 -> 50mA, 2 -> 25mA, 3 -> 12.5mA
+  val |= (gesture_led_drive & 0b11) << 3;
 
   val &= 0b11111000;
   // gesture wait time
   // 0 -> 0ms, 1 -> 2.8ms, 2 -> 5.6ms, 3 -> 8.4ms
   // 4 -> 14.0ms, 5 -> 22.4 ms, 6 -> 30.8ms, 7 -> 39.2 ms
-  val |= (this->gesture_wait_time_ & 0b111) << 0;
+  uint8_t gesture_wait_time = 1;  // gesture wait time
+  val |= (gesture_wait_time & 0b111) << 0;
   APDS9960_WRITE_BYTE(0xA3, val);
 
   // GOffsetU (0xA4) -> 0x00 (no offset)

esphome/components/apds9960/apds9960.h

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

esphome/components/apds9960/binary_sensor.py

@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import binary_sensor
-from esphome.const import CONF_DIRECTION, DEVICE_CLASS_MOVING
+from esphome.const import CONF_DIRECTION, CONF_DEVICE_CLASS, DEVICE_CLASS_MOVING
 from . import APDS9960, CONF_APDS9960_ID
 
 DEPENDENCIES = ["apds9960"]
@@ -13,12 +13,13 @@ DIRECTIONS = {
     "RIGHT": "set_right_direction",
 }
 
-CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(
-    device_class=DEVICE_CLASS_MOVING
-).extend(
+CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
     {
-        cv.GenerateID(CONF_APDS9960_ID): cv.use_id(APDS9960),
         cv.Required(CONF_DIRECTION): cv.one_of(*DIRECTIONS, upper=True),
+        cv.GenerateID(CONF_APDS9960_ID): cv.use_id(APDS9960),
+        cv.Optional(
+            CONF_DEVICE_CLASS, default=DEVICE_CLASS_MOVING
+        ): binary_sensor.device_class,
     }
 )
 

esphome/components/api/api.proto

@@ -41,18 +41,6 @@ service APIConnection {
   rpc number_command (NumberCommandRequest) returns (void) {}
   rpc select_command (SelectCommandRequest) returns (void) {}
   rpc button_command (ButtonCommandRequest) returns (void) {}
-  rpc lock_command (LockCommandRequest) returns (void) {}
-  rpc media_player_command (MediaPlayerCommandRequest) returns (void) {}
-
-  rpc subscribe_bluetooth_le_advertisements(SubscribeBluetoothLEAdvertisementsRequest) returns (void) {}
-  rpc bluetooth_device_request(BluetoothDeviceRequest) returns (void) {}
-  rpc bluetooth_gatt_get_services(BluetoothGATTGetServicesRequest) returns (void) {}
-  rpc bluetooth_gatt_read(BluetoothGATTReadRequest) returns (void) {}
-  rpc bluetooth_gatt_write(BluetoothGATTWriteRequest) returns (void) {}
-  rpc bluetooth_gatt_read_descriptor(BluetoothGATTReadDescriptorRequest) returns (void) {}
-  rpc bluetooth_gatt_write_descriptor(BluetoothGATTWriteDescriptorRequest) returns (void) {}
-  rpc bluetooth_gatt_notify(BluetoothGATTNotifyRequest) returns (void) {}
-  rpc subscribe_bluetooth_connections_free(SubscribeBluetoothConnectionsFreeRequest) returns (BluetoothConnectionsFreeResponse) {}
 }
 
 
@@ -87,8 +75,6 @@ message HelloRequest {
   // Not strictly necessary to send but nice for debugging
   // purposes.
   string client_info = 1;
-  uint32 api_version_major = 2;
-  uint32 api_version_minor = 3;
 }
 
 // Confirmation of successful connection request.
@@ -202,10 +188,6 @@ message DeviceInfoResponse {
   string project_version = 9;
 
   uint32 webserver_port = 10;
-
-  uint32 bluetooth_proxy_version = 11;
-
-  string manufacturer = 12;
 }
 
 message ListEntitiesRequest {
@@ -489,7 +471,6 @@ enum SensorStateClass {
   STATE_CLASS_NONE = 0;
   STATE_CLASS_MEASUREMENT = 1;
   STATE_CLASS_TOTAL_INCREASING = 2;
-  STATE_CLASS_TOTAL = 3;
 }
 
 enum SensorLastResetType {
@@ -547,7 +528,6 @@ message ListEntitiesSwitchResponse {
   bool assumed_state = 6;
   bool disabled_by_default = 7;
   EntityCategory entity_category = 8;
-  string device_class = 9;
 }
 message SwitchStateResponse {
   option (id) = 26;
@@ -915,7 +895,6 @@ message ListEntitiesNumberResponse {
   EntityCategory entity_category = 10;
   string unit_of_measurement = 11;
   NumberMode mode = 12;
-  string device_class = 13;
 }
 message NumberStateResponse {
   option (id) = 50;
@@ -977,63 +956,6 @@ message SelectCommandRequest {
   string state = 2;
 }
 
-
-// ==================== LOCK ====================
-enum LockState {
-  LOCK_STATE_NONE = 0;
-  LOCK_STATE_LOCKED = 1;
-  LOCK_STATE_UNLOCKED = 2;
-  LOCK_STATE_JAMMED = 3;
-  LOCK_STATE_LOCKING = 4;
-  LOCK_STATE_UNLOCKING = 5;
-}
-enum LockCommand  {
-  LOCK_UNLOCK = 0;
-  LOCK_LOCK = 1;
-  LOCK_OPEN = 2;
-}
-message ListEntitiesLockResponse {
-  option (id) = 58;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_LOCK";
-
-  string object_id = 1;
-  fixed32 key = 2;
-  string name = 3;
-  string unique_id = 4;
-
-  string icon = 5;
-  bool disabled_by_default = 6;
-  EntityCategory entity_category = 7;
-  bool assumed_state = 8;
-
-  bool supports_open = 9;
-  bool requires_code = 10;
-
-  // Not yet implemented:
-  string code_format = 11;
-}
-message LockStateResponse {
-  option (id) = 59;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_LOCK";
-  option (no_delay) = true;
-  fixed32 key = 1;
-  LockState state = 2;
-}
-message LockCommandRequest {
-  option (id) = 60;
-  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_LOCK";
-  option (no_delay) = true;
-  fixed32 key = 1;
-  LockCommand command = 2;
-
-  // Not yet implemented:
-  bool has_code = 3;
-  string code = 4;
-}
-
 // ==================== BUTTON ====================
 message ListEntitiesButtonResponse {
   option (id) = 61;
@@ -1058,280 +980,3 @@ message ButtonCommandRequest {
 
   fixed32 key = 1;
 }
-
-// ==================== MEDIA PLAYER ====================
-enum MediaPlayerState {
-  MEDIA_PLAYER_STATE_NONE = 0;
-  MEDIA_PLAYER_STATE_IDLE = 1;
-  MEDIA_PLAYER_STATE_PLAYING = 2;
-  MEDIA_PLAYER_STATE_PAUSED = 3;
-}
-enum MediaPlayerCommand {
-  MEDIA_PLAYER_COMMAND_PLAY = 0;
-  MEDIA_PLAYER_COMMAND_PAUSE = 1;
-  MEDIA_PLAYER_COMMAND_STOP = 2;
-  MEDIA_PLAYER_COMMAND_MUTE = 3;
-  MEDIA_PLAYER_COMMAND_UNMUTE = 4;
-}
-message ListEntitiesMediaPlayerResponse {
-  option (id) = 63;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_MEDIA_PLAYER";
-
-  string object_id = 1;
-  fixed32 key = 2;
-  string name = 3;
-  string unique_id = 4;
-
-  string icon = 5;
-  bool disabled_by_default = 6;
-  EntityCategory entity_category = 7;
-
-  bool supports_pause = 8;
-}
-message MediaPlayerStateResponse {
-  option (id) = 64;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_MEDIA_PLAYER";
-  option (no_delay) = true;
-  fixed32 key = 1;
-  MediaPlayerState state = 2;
-  float volume = 3;
-  bool muted = 4;
-}
-message MediaPlayerCommandRequest {
-  option (id) = 65;
-  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_MEDIA_PLAYER";
-  option (no_delay) = true;
-
-  fixed32 key = 1;
-
-  bool has_command = 2;
-  MediaPlayerCommand command = 3;
-
-  bool has_volume = 4;
-  float volume = 5;
-
-  bool has_media_url = 6;
-  string media_url = 7;
-}
-
-// ==================== BLUETOOTH ====================
-message SubscribeBluetoothLEAdvertisementsRequest {
-  option (id) = 66;
-  option (source) = SOURCE_CLIENT;
-}
-
-message BluetoothServiceData {
-  string uuid = 1;
-  repeated uint32 legacy_data = 2 [deprecated = true];
-  bytes data = 3; // Changed in proto version 1.7
-}
-message BluetoothLEAdvertisementResponse {
-  option (id) = 67;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY";
-  option (no_delay) = true;
-
-  uint64 address = 1;
-  string name = 2;
-  sint32 rssi = 3;
-
-  repeated string service_uuids = 4;
-  repeated BluetoothServiceData service_data = 5;
-  repeated BluetoothServiceData manufacturer_data = 6;
-
-  uint32 address_type = 7;
-}
-
-enum BluetoothDeviceRequestType {
-  BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT = 0;
-  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 {
-  option (id) = 68;
-  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_BLUETOOTH_PROXY";
-
-  uint64 address = 1;
-  BluetoothDeviceRequestType request_type = 2;
-  bool has_address_type = 3;
-  uint32 address_type = 4;
-}
-
-message BluetoothDeviceConnectionResponse {
-  option (id) = 69;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY";
-
-  uint64 address = 1;
-  bool connected = 2;
-  uint32 mtu = 3;
-  int32 error = 4;
-}
-
-message BluetoothGATTGetServicesRequest {
-  option (id) = 70;
-  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_BLUETOOTH_PROXY";
-
-  uint64 address = 1;
-}
-
-message BluetoothGATTDescriptor {
-  repeated uint64 uuid = 1;
-  uint32 handle = 2;
-}
-
-message BluetoothGATTCharacteristic {
-  repeated uint64 uuid = 1;
-  uint32 handle = 2;
-  uint32 properties = 3;
-  repeated BluetoothGATTDescriptor descriptors = 4;
-}
-
-message BluetoothGATTService {
-  repeated uint64 uuid = 1;
-  uint32 handle = 2;
-  repeated BluetoothGATTCharacteristic characteristics = 3;
-}
-
-message BluetoothGATTGetServicesResponse {
-  option (id) = 71;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY";
-
-  uint64 address = 1;
-  repeated BluetoothGATTService services = 2;
-}
-
-message BluetoothGATTGetServicesDoneResponse {
-  option (id) = 72;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY";
-
-  uint64 address = 1;
-}
-
-message BluetoothGATTReadRequest {
-  option (id) = 73;
-  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_BLUETOOTH_PROXY";
-
-  uint64 address = 1;
-  uint32 handle = 2;
-}
-
-message BluetoothGATTReadResponse {
-  option (id) = 74;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY";
-
-  uint64 address = 1;
-  uint32 handle = 2;
-
-  bytes data = 3;
-
-}
-
-message BluetoothGATTWriteRequest {
-  option (id) = 75;
-  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_BLUETOOTH_PROXY";
-
-  uint64 address = 1;
-  uint32 handle = 2;
-  bool response = 3;
-
-  bytes data = 4;
-}
-
-message BluetoothGATTReadDescriptorRequest {
-  option (id) = 76;
-  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_BLUETOOTH_PROXY";
-
-  uint64 address = 1;
-  uint32 handle = 2;
-}
-
-message BluetoothGATTWriteDescriptorRequest {
-  option (id) = 77;
-  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_BLUETOOTH_PROXY";
-
-  uint64 address = 1;
-  uint32 handle = 2;
-
-  bytes data = 3;
-}
-
-message BluetoothGATTNotifyRequest {
-  option (id) = 78;
-  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_BLUETOOTH_PROXY";
-
-  uint64 address = 1;
-  uint32 handle = 2;
-  bool enable = 3;
-}
-
-message BluetoothGATTNotifyDataResponse {
-  option (id) = 79;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY";
-
-  uint64 address = 1;
-  uint32 handle = 2;
-
-  bytes data = 3;
-}
-
-message SubscribeBluetoothConnectionsFreeRequest {
-  option (id) = 80;
-  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_BLUETOOTH_PROXY";
-}
-
-message BluetoothConnectionsFreeResponse {
-  option (id) = 81;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY";
-
-  uint32 free = 1;
-  uint32 limit = 2;
-}
-
-message BluetoothGATTErrorResponse {
-  option (id) = 82;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY";
-
-  uint64 address = 1;
-  uint32 handle = 2;
-  int32 error = 3;
-}
-
-message BluetoothGATTWriteResponse {
-  option (id) = 83;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY";
-
-  uint64 address = 1;
-  uint32 handle = 2;
-}
-
-message BluetoothGATTNotifyResponse {
-  option (id) = 84;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY";
-
-  uint64 address = 1;
-  uint32 handle = 2;
-}

esphome/components/api/api_connection.cpp

@@ -1,10 +1,10 @@
 #include "api_connection.h"
-#include <cerrno>
-#include "esphome/components/network/util.h"
 #include "esphome/core/entity_base.h"
-#include "esphome/core/hal.h"
 #include "esphome/core/log.h"
+#include "esphome/components/network/util.h"
 #include "esphome/core/version.h"
+#include "esphome/core/hal.h"
+#include <cerrno>
 
 #ifdef USE_DEEP_SLEEP
 #include "esphome/components/deep_sleep/deep_sleep_component.h"
@@ -12,8 +12,8 @@
 #ifdef USE_HOMEASSISTANT_TIME
 #include "esphome/components/homeassistant/time/homeassistant_time.h"
 #endif
-#ifdef USE_BLUETOOTH_PROXY
-#include "esphome/components/bluetooth_proxy/bluetooth_proxy.h"
+#ifdef USE_FAN
+#include "esphome/components/fan/fan_helpers.h"
 #endif
 
 namespace esphome {
@@ -23,7 +23,7 @@ static const char *const TAG = "api.connection";
 static const int ESP32_CAMERA_STOP_STREAM = 5000;
 
 APIConnection::APIConnection(std::unique_ptr<socket::Socket> sock, APIServer *parent)
-    : parent_(parent), initial_state_iterator_(this), list_entities_iterator_(this) {
+    : parent_(parent), initial_state_iterator_(parent, this), list_entities_iterator_(parent, this) {
   this->proto_write_buffer_.reserve(64);
 
 #if defined(USE_API_PLAINTEXT)
@@ -105,7 +105,6 @@ void APIConnection::loop() {
       ESP_LOGW(TAG, "%s didn't respond to ping request in time. Disconnecting...", this->client_info_.c_str());
     }
   } else if (now - this->last_traffic_ > keepalive) {
-    ESP_LOGVV(TAG, "Sending keepalive PING...");
     this->sent_ping_ = true;
     this->send_ping_request(PingRequest());
   }
@@ -253,6 +252,9 @@ void APIConnection::cover_command(const CoverCommandRequest &msg) {
 #endif
 
 #ifdef USE_FAN
+// Shut-up about usage of deprecated speed_level_to_enum/speed_enum_to_level functions for a bit.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 bool APIConnection::send_fan_state(fan::Fan *fan) {
   if (!this->state_subscription_)
     return false;
@@ -265,6 +267,7 @@ bool APIConnection::send_fan_state(fan::Fan *fan) {
     resp.oscillating = fan->oscillating;
   if (traits.supports_speed()) {
     resp.speed_level = fan->speed;
+    resp.speed = static_cast<enums::FanSpeed>(fan::speed_level_to_enum(fan->speed, traits.supported_speed_count()));
   }
   if (traits.supports_direction())
     resp.direction = static_cast<enums::FanDirection>(fan->direction);
@@ -291,6 +294,8 @@ void APIConnection::fan_command(const FanCommandRequest &msg) {
   if (fan == nullptr)
     return;
 
+  auto traits = fan->get_traits();
+
   auto call = fan->make_call();
   if (msg.has_state)
     call.set_state(msg.state);
@@ -299,11 +304,14 @@ void APIConnection::fan_command(const FanCommandRequest &msg) {
   if (msg.has_speed_level) {
     // Prefer level
     call.set_speed(msg.speed_level);
+  } else if (msg.has_speed) {
+    call.set_speed(fan::speed_enum_to_level(static_cast<fan::FanSpeed>(msg.speed), traits.supported_speed_count()));
   }
   if (msg.has_direction)
     call.set_direction(static_cast<fan::FanDirection>(msg.direction));
   call.perform();
 }
+#pragma GCC diagnostic pop
 #endif
 
 #ifdef USE_LIGHT
@@ -454,7 +462,6 @@ bool APIConnection::send_switch_info(switch_::Switch *a_switch) {
   msg.assumed_state = a_switch->assumed_state();
   msg.disabled_by_default = a_switch->is_disabled_by_default();
   msg.entity_category = static_cast<enums::EntityCategory>(a_switch->get_entity_category());
-  msg.device_class = a_switch->get_device_class();
   return this->send_list_entities_switch_response(msg);
 }
 void APIConnection::switch_command(const SwitchCommandRequest &msg) {
@@ -616,7 +623,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();
@@ -694,95 +700,6 @@ void APIConnection::button_command(const ButtonCommandRequest &msg) {
 }
 #endif
 
-#ifdef USE_LOCK
-bool APIConnection::send_lock_state(lock::Lock *a_lock, lock::LockState state) {
-  if (!this->state_subscription_)
-    return false;
-
-  LockStateResponse resp{};
-  resp.key = a_lock->get_object_id_hash();
-  resp.state = static_cast<enums::LockState>(state);
-  return this->send_lock_state_response(resp);
-}
-bool APIConnection::send_lock_info(lock::Lock *a_lock) {
-  ListEntitiesLockResponse msg;
-  msg.key = a_lock->get_object_id_hash();
-  msg.object_id = a_lock->get_object_id();
-  msg.name = a_lock->get_name();
-  msg.unique_id = get_default_unique_id("lock", a_lock);
-  msg.icon = a_lock->get_icon();
-  msg.assumed_state = a_lock->traits.get_assumed_state();
-  msg.disabled_by_default = a_lock->is_disabled_by_default();
-  msg.entity_category = static_cast<enums::EntityCategory>(a_lock->get_entity_category());
-  msg.supports_open = a_lock->traits.get_supports_open();
-  msg.requires_code = a_lock->traits.get_requires_code();
-  return this->send_list_entities_lock_response(msg);
-}
-void APIConnection::lock_command(const LockCommandRequest &msg) {
-  lock::Lock *a_lock = App.get_lock_by_key(msg.key);
-  if (a_lock == nullptr)
-    return;
-
-  switch (msg.command) {
-    case enums::LOCK_UNLOCK:
-      a_lock->unlock();
-      break;
-    case enums::LOCK_LOCK:
-      a_lock->lock();
-      break;
-    case enums::LOCK_OPEN:
-      a_lock->open();
-      break;
-  }
-}
-#endif
-
-#ifdef USE_MEDIA_PLAYER
-bool APIConnection::send_media_player_state(media_player::MediaPlayer *media_player) {
-  if (!this->state_subscription_)
-    return false;
-
-  MediaPlayerStateResponse resp{};
-  resp.key = media_player->get_object_id_hash();
-  resp.state = static_cast<enums::MediaPlayerState>(media_player->state);
-  resp.volume = media_player->volume;
-  resp.muted = media_player->is_muted();
-  return this->send_media_player_state_response(resp);
-}
-bool APIConnection::send_media_player_info(media_player::MediaPlayer *media_player) {
-  ListEntitiesMediaPlayerResponse msg;
-  msg.key = media_player->get_object_id_hash();
-  msg.object_id = media_player->get_object_id();
-  msg.name = media_player->get_name();
-  msg.unique_id = get_default_unique_id("media_player", media_player);
-  msg.icon = media_player->get_icon();
-  msg.disabled_by_default = media_player->is_disabled_by_default();
-  msg.entity_category = static_cast<enums::EntityCategory>(media_player->get_entity_category());
-
-  auto traits = media_player->get_traits();
-  msg.supports_pause = traits.get_supports_pause();
-
-  return this->send_list_entities_media_player_response(msg);
-}
-void APIConnection::media_player_command(const MediaPlayerCommandRequest &msg) {
-  media_player::MediaPlayer *media_player = App.get_media_player_by_key(msg.key);
-  if (media_player == nullptr)
-    return;
-
-  auto call = media_player->make_call();
-  if (msg.has_command) {
-    call.set_command(static_cast<media_player::MediaPlayerCommand>(msg.command));
-  }
-  if (msg.has_volume) {
-    call.set_volume(msg.volume);
-  }
-  if (msg.has_media_url) {
-    call.set_media_url(msg.media_url);
-  }
-  call.perform();
-}
-#endif
-
 #ifdef USE_ESP32_CAMERA
 void APIConnection::send_camera_state(std::shared_ptr<esp32_camera::CameraImage> image) {
   if (!this->state_subscription_)
@@ -827,56 +744,6 @@ void APIConnection::on_get_time_response(const GetTimeResponse &value) {
 }
 #endif
 
-#ifdef USE_BLUETOOTH_PROXY
-bool APIConnection::send_bluetooth_le_advertisement(const BluetoothLEAdvertisementResponse &msg) {
-  if (!this->bluetooth_le_advertisement_subscription_)
-    return false;
-  if (this->client_api_version_major_ < 1 || this->client_api_version_minor_ < 7) {
-    BluetoothLEAdvertisementResponse resp = msg;
-    for (auto &service : resp.service_data) {
-      service.legacy_data.assign(service.data.begin(), service.data.end());
-      service.data.clear();
-    }
-    for (auto &manufacturer_data : resp.manufacturer_data) {
-      manufacturer_data.legacy_data.assign(manufacturer_data.data.begin(), manufacturer_data.data.end());
-      manufacturer_data.data.clear();
-    }
-    return this->send_bluetooth_le_advertisement_response(resp);
-  }
-  return this->send_bluetooth_le_advertisement_response(msg);
-}
-void APIConnection::bluetooth_device_request(const BluetoothDeviceRequest &msg) {
-  bluetooth_proxy::global_bluetooth_proxy->bluetooth_device_request(msg);
-}
-void APIConnection::bluetooth_gatt_read(const BluetoothGATTReadRequest &msg) {
-  bluetooth_proxy::global_bluetooth_proxy->bluetooth_gatt_read(msg);
-}
-void APIConnection::bluetooth_gatt_write(const BluetoothGATTWriteRequest &msg) {
-  bluetooth_proxy::global_bluetooth_proxy->bluetooth_gatt_write(msg);
-}
-void APIConnection::bluetooth_gatt_read_descriptor(const BluetoothGATTReadDescriptorRequest &msg) {
-  bluetooth_proxy::global_bluetooth_proxy->bluetooth_gatt_read_descriptor(msg);
-}
-void APIConnection::bluetooth_gatt_write_descriptor(const BluetoothGATTWriteDescriptorRequest &msg) {
-  bluetooth_proxy::global_bluetooth_proxy->bluetooth_gatt_write_descriptor(msg);
-}
-void APIConnection::bluetooth_gatt_get_services(const BluetoothGATTGetServicesRequest &msg) {
-  bluetooth_proxy::global_bluetooth_proxy->bluetooth_gatt_send_services(msg);
-}
-
-void APIConnection::bluetooth_gatt_notify(const BluetoothGATTNotifyRequest &msg) {
-  bluetooth_proxy::global_bluetooth_proxy->bluetooth_gatt_notify(msg);
-}
-
-BluetoothConnectionsFreeResponse APIConnection::subscribe_bluetooth_connections_free(
-    const SubscribeBluetoothConnectionsFreeRequest &msg) {
-  BluetoothConnectionsFreeResponse resp;
-  resp.free = bluetooth_proxy::global_bluetooth_proxy->get_bluetooth_connections_free();
-  resp.limit = bluetooth_proxy::global_bluetooth_proxy->get_bluetooth_connections_limit();
-  return resp;
-}
-#endif
-
 bool APIConnection::send_log_message(int level, const char *tag, const char *line) {
   if (this->log_subscription_ < level)
     return false;
@@ -894,14 +761,11 @@ bool APIConnection::send_log_message(int level, const char *tag, const char *lin
 HelloResponse APIConnection::hello(const HelloRequest &msg) {
   this->client_info_ = msg.client_info + " (" + this->helper_->getpeername() + ")";
   this->helper_->set_log_info(client_info_);
-  this->client_api_version_major_ = msg.api_version_major;
-  this->client_api_version_minor_ = msg.api_version_minor;
-  ESP_LOGV(TAG, "Hello from client: '%s' | API Version %d.%d", this->client_info_.c_str(),
-           this->client_api_version_major_, this->client_api_version_minor_);
+  ESP_LOGV(TAG, "Hello from client: '%s'", this->client_info_.c_str());
 
   HelloResponse resp;
   resp.api_version_major = 1;
-  resp.api_version_minor = 7;
+  resp.api_version_minor = 6;
   resp.server_info = App.get_name() + " (esphome v" ESPHOME_VERSION ")";
   resp.name = App.get_name();
 
@@ -933,11 +797,6 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
   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;
@@ -948,9 +807,6 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
 #endif
 #ifdef USE_WEBSERVER
   resp.webserver_port = USE_WEBSERVER_PORT;
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  resp.bluetooth_proxy_version = bluetooth_proxy::global_bluetooth_proxy->has_active() ? 3 : 1;
 #endif
   return resp;
 }
@@ -1008,7 +864,7 @@ bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint32_t message_type)
     }
     return false;
   }
-  // Do not set last_traffic_ on send
+  this->last_traffic_ = millis();
   return true;
 }
 void APIConnection::on_unauthenticated_access() {

esphome/components/api/api_connection.h

@@ -1,13 +1,11 @@
 #pragma once
 
-#include "api_frame_helper.h"
+#include "esphome/core/component.h"
+#include "esphome/core/application.h"
 #include "api_pb2.h"
 #include "api_pb2_service.h"
 #include "api_server.h"
-#include "esphome/core/application.h"
-#include "esphome/core/component.h"
-
-#include <vector>
+#include "api_frame_helper.h"
 
 namespace esphome {
 namespace api {
@@ -79,16 +77,6 @@ class APIConnection : public APIServerConnection {
 #ifdef USE_BUTTON
   bool send_button_info(button::Button *button);
   void button_command(const ButtonCommandRequest &msg) override;
-#endif
-#ifdef USE_LOCK
-  bool send_lock_state(lock::Lock *a_lock, lock::LockState state);
-  bool send_lock_info(lock::Lock *a_lock);
-  void lock_command(const LockCommandRequest &msg) override;
-#endif
-#ifdef USE_MEDIA_PLAYER
-  bool send_media_player_state(media_player::MediaPlayer *media_player);
-  bool send_media_player_info(media_player::MediaPlayer *media_player);
-  void media_player_command(const MediaPlayerCommandRequest &msg) override;
 #endif
   bool send_log_message(int level, const char *tag, const char *line);
   void send_homeassistant_service_call(const HomeassistantServiceResponse &call) {
@@ -96,20 +84,6 @@ class APIConnection : public APIServerConnection {
       return;
     this->send_homeassistant_service_response(call);
   }
-#ifdef USE_BLUETOOTH_PROXY
-  bool send_bluetooth_le_advertisement(const BluetoothLEAdvertisementResponse &msg);
-
-  void bluetooth_device_request(const BluetoothDeviceRequest &msg) override;
-  void bluetooth_gatt_read(const BluetoothGATTReadRequest &msg) override;
-  void bluetooth_gatt_write(const BluetoothGATTWriteRequest &msg) override;
-  void bluetooth_gatt_read_descriptor(const BluetoothGATTReadDescriptorRequest &msg) override;
-  void bluetooth_gatt_write_descriptor(const BluetoothGATTWriteDescriptorRequest &msg) override;
-  void bluetooth_gatt_get_services(const BluetoothGATTGetServicesRequest &msg) override;
-  void bluetooth_gatt_notify(const BluetoothGATTNotifyRequest &msg) override;
-  BluetoothConnectionsFreeResponse subscribe_bluetooth_connections_free(
-      const SubscribeBluetoothConnectionsFreeRequest &msg) override;
-
-#endif
 #ifdef USE_HOMEASSISTANT_TIME
   void send_time_request() {
     GetTimeRequest req;
@@ -150,9 +124,6 @@ class APIConnection : public APIServerConnection {
     return {};
   }
   void execute_service(const ExecuteServiceRequest &msg) override;
-  void subscribe_bluetooth_le_advertisements(const SubscribeBluetoothLEAdvertisementsRequest &msg) override {
-    this->bluetooth_le_advertisement_subscription_ = true;
-  }
   bool is_authenticated() override { return this->connection_state_ == ConnectionState::AUTHENTICATED; }
   bool is_connection_setup() override {
     return this->connection_state_ == ConnectionState ::CONNECTED || this->is_authenticated();
@@ -186,8 +157,6 @@ class APIConnection : public APIServerConnection {
   std::unique_ptr<APIFrameHelper> helper_;
 
   std::string client_info_;
-  uint32_t client_api_version_major_{0};
-  uint32_t client_api_version_minor_{0};
 #ifdef USE_ESP32_CAMERA
   esp32_camera::CameraImageReader image_reader_;
 #endif
@@ -197,7 +166,6 @@ class APIConnection : public APIServerConnection {
   uint32_t last_traffic_;
   bool sent_ping_{false};
   bool service_call_subscription_{false};
-  bool bluetooth_le_advertisement_subscription_{false};
   bool next_close_ = false;
   APIServer *parent_;
   InitialStateIterator initial_state_iterator_;

esphome/components/api/api_frame_helper.cpp

@@ -270,7 +270,7 @@ APIError APINoiseFrameHelper::try_read_frame_(ParsedFrame *frame) {
  *
  * If the handshake is still active when this method returns and a read/write can't take place at
  * the moment, returns WOULD_BLOCK.
- * If an error occurred, returns that error. Only returns OK if the transport is ready for data
+ * If an error occured, returns that error. Only returns OK if the transport is ready for data
  * traffic.
  */
 APIError APINoiseFrameHelper::state_action_() {
@@ -586,7 +586,7 @@ APIError APINoiseFrameHelper::write_raw_(const struct iovec *iov, int iovcnt) {
     }
     return APIError::OK;
   } else if (sent == -1) {
-    // an error occurred
+    // an error occured
     state_ = State::FAILED;
     HELPER_LOG("Socket write failed with errno %d", errno);
     return APIError::SOCKET_WRITE_FAILED;
@@ -980,7 +980,7 @@ APIError APIPlaintextFrameHelper::write_raw_(const struct iovec *iov, int iovcnt
     }
     return APIError::OK;
   } else if (sent == -1) {
-    // an error occurred
+    // an error occured
     state_ = State::FAILED;
     HELPER_LOG("Socket write failed with errno %d", errno);
     return APIError::SOCKET_WRITE_FAILED;

esphome/components/api/api_frame_helper.h

@@ -116,9 +116,9 @@ class APINoiseFrameHelper : public APIFrameHelper {
   std::vector<uint8_t> prologue_;
 
   std::shared_ptr<APINoiseContext> ctx_;
-  NoiseHandshakeState *handshake_{nullptr};
-  NoiseCipherState *send_cipher_{nullptr};
-  NoiseCipherState *recv_cipher_{nullptr};
+  NoiseHandshakeState *handshake_ = nullptr;
+  NoiseCipherState *send_cipher_ = nullptr;
+  NoiseCipherState *recv_cipher_ = nullptr;
   NoiseProtocolId nid_;
 
   enum class State {

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:
@@ -123,14 +108,10 @@ template<> const char *proto_enum_to_string<enums::SensorStateClass>(enums::Sens
       return "STATE_CLASS_MEASUREMENT";
     case enums::STATE_CLASS_TOTAL_INCREASING:
       return "STATE_CLASS_TOTAL_INCREASING";
-    case enums::STATE_CLASS_TOTAL:
-      return "STATE_CLASS_TOTAL";
     default:
       return "UNKNOWN";
   }
 }
-#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 +124,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 +146,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 +168,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 +188,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:
@@ -239,8 +212,6 @@ template<> const char *proto_enum_to_string<enums::ClimateFanMode>(enums::Climat
       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:
@@ -255,8 +226,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:
@@ -275,8 +244,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:
@@ -299,8 +266,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:
@@ -313,110 +278,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:
-      return "LOCK_STATE_NONE";
-    case enums::LOCK_STATE_LOCKED:
-      return "LOCK_STATE_LOCKED";
-    case enums::LOCK_STATE_UNLOCKED:
-      return "LOCK_STATE_UNLOCKED";
-    case enums::LOCK_STATE_JAMMED:
-      return "LOCK_STATE_JAMMED";
-    case enums::LOCK_STATE_LOCKING:
-      return "LOCK_STATE_LOCKING";
-    case enums::LOCK_STATE_UNLOCKING:
-      return "LOCK_STATE_UNLOCKING";
-    default:
-      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:
-      return "LOCK_UNLOCK";
-    case enums::LOCK_LOCK:
-      return "LOCK_LOCK";
-    case enums::LOCK_OPEN:
-      return "LOCK_OPEN";
-    default:
-      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:
-      return "MEDIA_PLAYER_STATE_NONE";
-    case enums::MEDIA_PLAYER_STATE_IDLE:
-      return "MEDIA_PLAYER_STATE_IDLE";
-    case enums::MEDIA_PLAYER_STATE_PLAYING:
-      return "MEDIA_PLAYER_STATE_PLAYING";
-    case enums::MEDIA_PLAYER_STATE_PAUSED:
-      return "MEDIA_PLAYER_STATE_PAUSED";
-    default:
-      return "UNKNOWN";
-  }
-}
-#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:
-      return "MEDIA_PLAYER_COMMAND_PLAY";
-    case enums::MEDIA_PLAYER_COMMAND_PAUSE:
-      return "MEDIA_PLAYER_COMMAND_PAUSE";
-    case enums::MEDIA_PLAYER_COMMAND_STOP:
-      return "MEDIA_PLAYER_COMMAND_STOP";
-    case enums::MEDIA_PLAYER_COMMAND_MUTE:
-      return "MEDIA_PLAYER_COMMAND_MUTE";
-    case enums::MEDIA_PLAYER_COMMAND_UNMUTE:
-      return "MEDIA_PLAYER_COMMAND_UNMUTE";
-    default:
-      return "UNKNOWN";
-  }
-}
-#endif
-#ifdef HAS_PROTO_MESSAGE_DUMP
-template<>
-const char *proto_enum_to_string<enums::BluetoothDeviceRequestType>(enums::BluetoothDeviceRequestType value) {
-  switch (value) {
-    case enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT:
-      return "BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT";
-    case enums::BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT:
-      return "BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT";
-    case enums::BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR:
-      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: {
-      this->api_version_major = value.as_uint32();
-      return true;
-    }
-    case 3: {
-      this->api_version_minor = value.as_uint32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
 bool HelloRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
     case 1: {
@@ -427,11 +288,7 @@ bool HelloRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value)
       return false;
   }
 }
-void HelloRequest::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_string(1, this->client_info);
-  buffer.encode_uint32(2, this->api_version_major);
-  buffer.encode_uint32(3, this->api_version_minor);
-}
+void HelloRequest::encode(ProtoWriteBuffer buffer) const { buffer.encode_string(1, this->client_info); }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void HelloRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
@@ -439,16 +296,6 @@ void HelloRequest::dump_to(std::string &out) const {
   out.append("  client_info: ");
   out.append("'").append(this->client_info).append("'");
   out.append("\n");
-
-  out.append("  api_version_major: ");
-  sprintf(buffer, "%u", this->api_version_major);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  api_version_minor: ");
-  sprintf(buffer, "%u", this->api_version_minor);
-  out.append(buffer);
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -586,10 +433,6 @@ bool DeviceInfoResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
       this->webserver_port = value.as_uint32();
       return true;
     }
-    case 11: {
-      this->bluetooth_proxy_version = value.as_uint32();
-      return true;
-    }
     default:
       return false;
   }
@@ -624,10 +467,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;
-    }
     default:
       return false;
   }
@@ -643,8 +482,6 @@ void DeviceInfoResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(8, this->project_name);
   buffer.encode_string(9, this->project_version);
   buffer.encode_uint32(10, this->webserver_port);
-  buffer.encode_uint32(11, this->bluetooth_proxy_version);
-  buffer.encode_string(12, this->manufacturer);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void DeviceInfoResponse::dump_to(std::string &out) const {
@@ -690,15 +527,6 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
   sprintf(buffer, "%u", this->webserver_port);
   out.append(buffer);
   out.append("\n");
-
-  out.append("  bluetooth_proxy_version: ");
-  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("}");
 }
 #endif
@@ -2319,10 +2147,6 @@ bool ListEntitiesSwitchResponse::decode_length(uint32_t field_id, ProtoLengthDel
       this->icon = value.as_string();
       return true;
     }
-    case 9: {
-      this->device_class = value.as_string();
-      return true;
-    }
     default:
       return false;
   }
@@ -2346,7 +2170,6 @@ void ListEntitiesSwitchResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(6, this->assumed_state);
   buffer.encode_bool(7, this->disabled_by_default);
   buffer.encode_enum<enums::EntityCategory>(8, this->entity_category);
-  buffer.encode_string(9, this->device_class);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesSwitchResponse::dump_to(std::string &out) const {
@@ -2384,10 +2207,6 @@ void ListEntitiesSwitchResponse::dump_to(std::string &out) const {
   out.append("  entity_category: ");
   out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
   out.append("\n");
-
-  out.append("  device_class: ");
-  out.append("'").append(this->device_class).append("'");
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -3990,10 +3809,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;
   }
@@ -4033,7 +3848,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 {
@@ -4090,10 +3904,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
@@ -4376,234 +4186,6 @@ void SelectCommandRequest::dump_to(std::string &out) const {
   out.append("}");
 }
 #endif
-bool ListEntitiesLockResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 6: {
-      this->disabled_by_default = value.as_bool();
-      return true;
-    }
-    case 7: {
-      this->entity_category = value.as_enum<enums::EntityCategory>();
-      return true;
-    }
-    case 8: {
-      this->assumed_state = value.as_bool();
-      return true;
-    }
-    case 9: {
-      this->supports_open = value.as_bool();
-      return true;
-    }
-    case 10: {
-      this->requires_code = value.as_bool();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool ListEntitiesLockResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 1: {
-      this->object_id = value.as_string();
-      return true;
-    }
-    case 3: {
-      this->name = value.as_string();
-      return true;
-    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
-    case 5: {
-      this->icon = value.as_string();
-      return true;
-    }
-    case 11: {
-      this->code_format = value.as_string();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool ListEntitiesLockResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
-  switch (field_id) {
-    case 2: {
-      this->key = value.as_fixed32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void ListEntitiesLockResponse::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_string(1, this->object_id);
-  buffer.encode_fixed32(2, this->key);
-  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
-  buffer.encode_string(5, this->icon);
-  buffer.encode_bool(6, this->disabled_by_default);
-  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
-  buffer.encode_bool(8, this->assumed_state);
-  buffer.encode_bool(9, this->supports_open);
-  buffer.encode_bool(10, this->requires_code);
-  buffer.encode_string(11, this->code_format);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void ListEntitiesLockResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("ListEntitiesLockResponse {\n");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id).append("'");
-  out.append("\n");
-
-  out.append("  key: ");
-  sprintf(buffer, "%u", this->key);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  name: ");
-  out.append("'").append(this->name).append("'");
-  out.append("\n");
-
-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
-  out.append("  icon: ");
-  out.append("'").append(this->icon).append("'");
-  out.append("\n");
-
-  out.append("  disabled_by_default: ");
-  out.append(YESNO(this->disabled_by_default));
-  out.append("\n");
-
-  out.append("  entity_category: ");
-  out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
-  out.append("\n");
-
-  out.append("  assumed_state: ");
-  out.append(YESNO(this->assumed_state));
-  out.append("\n");
-
-  out.append("  supports_open: ");
-  out.append(YESNO(this->supports_open));
-  out.append("\n");
-
-  out.append("  requires_code: ");
-  out.append(YESNO(this->requires_code));
-  out.append("\n");
-
-  out.append("  code_format: ");
-  out.append("'").append(this->code_format).append("'");
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool LockStateResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 2: {
-      this->state = value.as_enum<enums::LockState>();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool LockStateResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
-  switch (field_id) {
-    case 1: {
-      this->key = value.as_fixed32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void LockStateResponse::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_fixed32(1, this->key);
-  buffer.encode_enum<enums::LockState>(2, this->state);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void LockStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("LockStateResponse {\n");
-  out.append("  key: ");
-  sprintf(buffer, "%u", this->key);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  state: ");
-  out.append(proto_enum_to_string<enums::LockState>(this->state));
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool LockCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 2: {
-      this->command = value.as_enum<enums::LockCommand>();
-      return true;
-    }
-    case 3: {
-      this->has_code = value.as_bool();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool LockCommandRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 4: {
-      this->code = value.as_string();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool LockCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
-  switch (field_id) {
-    case 1: {
-      this->key = value.as_fixed32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void LockCommandRequest::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_fixed32(1, this->key);
-  buffer.encode_enum<enums::LockCommand>(2, this->command);
-  buffer.encode_bool(3, this->has_code);
-  buffer.encode_string(4, this->code);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void LockCommandRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("LockCommandRequest {\n");
-  out.append("  key: ");
-  sprintf(buffer, "%u", this->key);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  command: ");
-  out.append(proto_enum_to_string<enums::LockCommand>(this->command));
-  out.append("\n");
-
-  out.append("  has_code: ");
-  out.append(YESNO(this->has_code));
-  out.append("\n");
-
-  out.append("  code: ");
-  out.append("'").append(this->code).append("'");
-  out.append("\n");
-  out.append("}");
-}
-#endif
 bool ListEntitiesButtonResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
     case 6: {
@@ -4666,7 +4248,7 @@ void ListEntitiesButtonResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesButtonResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesButtonResponse {\n");
   out.append("  object_id: ");
   out.append("'").append(this->object_id).append("'");
@@ -4716,7 +4298,7 @@ bool ButtonCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
 void ButtonCommandRequest::encode(ProtoWriteBuffer buffer) const { buffer.encode_fixed32(1, this->key); }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ButtonCommandRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ButtonCommandRequest {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -4725,1234 +4307,6 @@ void ButtonCommandRequest::dump_to(std::string &out) const {
   out.append("}");
 }
 #endif
-bool ListEntitiesMediaPlayerResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 6: {
-      this->disabled_by_default = value.as_bool();
-      return true;
-    }
-    case 7: {
-      this->entity_category = value.as_enum<enums::EntityCategory>();
-      return true;
-    }
-    case 8: {
-      this->supports_pause = value.as_bool();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool ListEntitiesMediaPlayerResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 1: {
-      this->object_id = value.as_string();
-      return true;
-    }
-    case 3: {
-      this->name = value.as_string();
-      return true;
-    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
-    case 5: {
-      this->icon = value.as_string();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool ListEntitiesMediaPlayerResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
-  switch (field_id) {
-    case 2: {
-      this->key = value.as_fixed32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void ListEntitiesMediaPlayerResponse::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_string(1, this->object_id);
-  buffer.encode_fixed32(2, this->key);
-  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
-  buffer.encode_string(5, this->icon);
-  buffer.encode_bool(6, this->disabled_by_default);
-  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
-  buffer.encode_bool(8, this->supports_pause);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void ListEntitiesMediaPlayerResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("ListEntitiesMediaPlayerResponse {\n");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id).append("'");
-  out.append("\n");
-
-  out.append("  key: ");
-  sprintf(buffer, "%u", this->key);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  name: ");
-  out.append("'").append(this->name).append("'");
-  out.append("\n");
-
-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
-  out.append("  icon: ");
-  out.append("'").append(this->icon).append("'");
-  out.append("\n");
-
-  out.append("  disabled_by_default: ");
-  out.append(YESNO(this->disabled_by_default));
-  out.append("\n");
-
-  out.append("  entity_category: ");
-  out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
-  out.append("\n");
-
-  out.append("  supports_pause: ");
-  out.append(YESNO(this->supports_pause));
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool MediaPlayerStateResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 2: {
-      this->state = value.as_enum<enums::MediaPlayerState>();
-      return true;
-    }
-    case 4: {
-      this->muted = value.as_bool();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool MediaPlayerStateResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
-  switch (field_id) {
-    case 1: {
-      this->key = value.as_fixed32();
-      return true;
-    }
-    case 3: {
-      this->volume = value.as_float();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void MediaPlayerStateResponse::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_fixed32(1, this->key);
-  buffer.encode_enum<enums::MediaPlayerState>(2, this->state);
-  buffer.encode_float(3, this->volume);
-  buffer.encode_bool(4, this->muted);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void MediaPlayerStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("MediaPlayerStateResponse {\n");
-  out.append("  key: ");
-  sprintf(buffer, "%u", this->key);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  state: ");
-  out.append(proto_enum_to_string<enums::MediaPlayerState>(this->state));
-  out.append("\n");
-
-  out.append("  volume: ");
-  sprintf(buffer, "%g", this->volume);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  muted: ");
-  out.append(YESNO(this->muted));
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool MediaPlayerCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 2: {
-      this->has_command = value.as_bool();
-      return true;
-    }
-    case 3: {
-      this->command = value.as_enum<enums::MediaPlayerCommand>();
-      return true;
-    }
-    case 4: {
-      this->has_volume = value.as_bool();
-      return true;
-    }
-    case 6: {
-      this->has_media_url = value.as_bool();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool MediaPlayerCommandRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 7: {
-      this->media_url = value.as_string();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool MediaPlayerCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
-  switch (field_id) {
-    case 1: {
-      this->key = value.as_fixed32();
-      return true;
-    }
-    case 5: {
-      this->volume = value.as_float();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void MediaPlayerCommandRequest::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_fixed32(1, this->key);
-  buffer.encode_bool(2, this->has_command);
-  buffer.encode_enum<enums::MediaPlayerCommand>(3, this->command);
-  buffer.encode_bool(4, this->has_volume);
-  buffer.encode_float(5, this->volume);
-  buffer.encode_bool(6, this->has_media_url);
-  buffer.encode_string(7, this->media_url);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void MediaPlayerCommandRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("MediaPlayerCommandRequest {\n");
-  out.append("  key: ");
-  sprintf(buffer, "%u", this->key);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  has_command: ");
-  out.append(YESNO(this->has_command));
-  out.append("\n");
-
-  out.append("  command: ");
-  out.append(proto_enum_to_string<enums::MediaPlayerCommand>(this->command));
-  out.append("\n");
-
-  out.append("  has_volume: ");
-  out.append(YESNO(this->has_volume));
-  out.append("\n");
-
-  out.append("  volume: ");
-  sprintf(buffer, "%g", this->volume);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  has_media_url: ");
-  out.append(YESNO(this->has_media_url));
-  out.append("\n");
-
-  out.append("  media_url: ");
-  out.append("'").append(this->media_url).append("'");
-  out.append("\n");
-  out.append("}");
-}
-#endif
-void SubscribeBluetoothLEAdvertisementsRequest::encode(ProtoWriteBuffer buffer) const {}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void SubscribeBluetoothLEAdvertisementsRequest::dump_to(std::string &out) const {
-  out.append("SubscribeBluetoothLEAdvertisementsRequest {}");
-}
-#endif
-bool BluetoothServiceData::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 2: {
-      this->legacy_data.push_back(value.as_uint32());
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool BluetoothServiceData::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 1: {
-      this->uuid = value.as_string();
-      return true;
-    }
-    case 3: {
-      this->data = value.as_string();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothServiceData::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_string(1, this->uuid);
-  for (auto &it : this->legacy_data) {
-    buffer.encode_uint32(2, it, true);
-  }
-  buffer.encode_string(3, this->data);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothServiceData::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothServiceData {\n");
-  out.append("  uuid: ");
-  out.append("'").append(this->uuid).append("'");
-  out.append("\n");
-
-  for (const auto &it : this->legacy_data) {
-    out.append("  legacy_data: ");
-    sprintf(buffer, "%u", it);
-    out.append(buffer);
-    out.append("\n");
-  }
-
-  out.append("  data: ");
-  out.append("'").append(this->data).append("'");
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool BluetoothLEAdvertisementResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->address = value.as_uint64();
-      return true;
-    }
-    case 3: {
-      this->rssi = value.as_sint32();
-      return true;
-    }
-    case 7: {
-      this->address_type = value.as_uint32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool BluetoothLEAdvertisementResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 2: {
-      this->name = value.as_string();
-      return true;
-    }
-    case 4: {
-      this->service_uuids.push_back(value.as_string());
-      return true;
-    }
-    case 5: {
-      this->service_data.push_back(value.as_message<BluetoothServiceData>());
-      return true;
-    }
-    case 6: {
-      this->manufacturer_data.push_back(value.as_message<BluetoothServiceData>());
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothLEAdvertisementResponse::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_uint64(1, this->address);
-  buffer.encode_string(2, this->name);
-  buffer.encode_sint32(3, this->rssi);
-  for (auto &it : this->service_uuids) {
-    buffer.encode_string(4, it, true);
-  }
-  for (auto &it : this->service_data) {
-    buffer.encode_message<BluetoothServiceData>(5, it, true);
-  }
-  for (auto &it : this->manufacturer_data) {
-    buffer.encode_message<BluetoothServiceData>(6, it, true);
-  }
-  buffer.encode_uint32(7, this->address_type);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothLEAdvertisementResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothLEAdvertisementResponse {\n");
-  out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  name: ");
-  out.append("'").append(this->name).append("'");
-  out.append("\n");
-
-  out.append("  rssi: ");
-  sprintf(buffer, "%d", this->rssi);
-  out.append(buffer);
-  out.append("\n");
-
-  for (const auto &it : this->service_uuids) {
-    out.append("  service_uuids: ");
-    out.append("'").append(it).append("'");
-    out.append("\n");
-  }
-
-  for (const auto &it : this->service_data) {
-    out.append("  service_data: ");
-    it.dump_to(out);
-    out.append("\n");
-  }
-
-  for (const auto &it : this->manufacturer_data) {
-    out.append("  manufacturer_data: ");
-    it.dump_to(out);
-    out.append("\n");
-  }
-
-  out.append("  address_type: ");
-  sprintf(buffer, "%u", this->address_type);
-  out.append(buffer);
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool BluetoothDeviceRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->address = value.as_uint64();
-      return true;
-    }
-    case 2: {
-      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;
-  }
-}
-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 {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothDeviceRequest {\n");
-  out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
-  out.append(buffer);
-  out.append("\n");
-
-  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
-bool BluetoothDeviceConnectionResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->address = value.as_uint64();
-      return true;
-    }
-    case 2: {
-      this->connected = value.as_bool();
-      return true;
-    }
-    case 3: {
-      this->mtu = value.as_uint32();
-      return true;
-    }
-    case 4: {
-      this->error = value.as_int32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothDeviceConnectionResponse::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_uint64(1, this->address);
-  buffer.encode_bool(2, this->connected);
-  buffer.encode_uint32(3, this->mtu);
-  buffer.encode_int32(4, this->error);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothDeviceConnectionResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothDeviceConnectionResponse {\n");
-  out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  connected: ");
-  out.append(YESNO(this->connected));
-  out.append("\n");
-
-  out.append("  mtu: ");
-  sprintf(buffer, "%u", this->mtu);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  error: ");
-  sprintf(buffer, "%d", this->error);
-  out.append(buffer);
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool BluetoothGATTGetServicesRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->address = value.as_uint64();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothGATTGetServicesRequest::encode(ProtoWriteBuffer buffer) const { buffer.encode_uint64(1, this->address); }
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothGATTGetServicesRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothGATTGetServicesRequest {\n");
-  out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
-  out.append(buffer);
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool BluetoothGATTDescriptor::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->uuid.push_back(value.as_uint64());
-      return true;
-    }
-    case 2: {
-      this->handle = value.as_uint32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothGATTDescriptor::encode(ProtoWriteBuffer buffer) const {
-  for (auto &it : this->uuid) {
-    buffer.encode_uint64(1, it, true);
-  }
-  buffer.encode_uint32(2, this->handle);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothGATTDescriptor::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothGATTDescriptor {\n");
-  for (const auto &it : this->uuid) {
-    out.append("  uuid: ");
-    sprintf(buffer, "%llu", it);
-    out.append(buffer);
-    out.append("\n");
-  }
-
-  out.append("  handle: ");
-  sprintf(buffer, "%u", this->handle);
-  out.append(buffer);
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool BluetoothGATTCharacteristic::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->uuid.push_back(value.as_uint64());
-      return true;
-    }
-    case 2: {
-      this->handle = value.as_uint32();
-      return true;
-    }
-    case 3: {
-      this->properties = value.as_uint32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool BluetoothGATTCharacteristic::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 4: {
-      this->descriptors.push_back(value.as_message<BluetoothGATTDescriptor>());
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothGATTCharacteristic::encode(ProtoWriteBuffer buffer) const {
-  for (auto &it : this->uuid) {
-    buffer.encode_uint64(1, it, true);
-  }
-  buffer.encode_uint32(2, this->handle);
-  buffer.encode_uint32(3, this->properties);
-  for (auto &it : this->descriptors) {
-    buffer.encode_message<BluetoothGATTDescriptor>(4, it, true);
-  }
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothGATTCharacteristic::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothGATTCharacteristic {\n");
-  for (const auto &it : this->uuid) {
-    out.append("  uuid: ");
-    sprintf(buffer, "%llu", it);
-    out.append(buffer);
-    out.append("\n");
-  }
-
-  out.append("  handle: ");
-  sprintf(buffer, "%u", this->handle);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  properties: ");
-  sprintf(buffer, "%u", this->properties);
-  out.append(buffer);
-  out.append("\n");
-
-  for (const auto &it : this->descriptors) {
-    out.append("  descriptors: ");
-    it.dump_to(out);
-    out.append("\n");
-  }
-  out.append("}");
-}
-#endif
-bool BluetoothGATTService::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->uuid.push_back(value.as_uint64());
-      return true;
-    }
-    case 2: {
-      this->handle = value.as_uint32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool BluetoothGATTService::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 3: {
-      this->characteristics.push_back(value.as_message<BluetoothGATTCharacteristic>());
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothGATTService::encode(ProtoWriteBuffer buffer) const {
-  for (auto &it : this->uuid) {
-    buffer.encode_uint64(1, it, true);
-  }
-  buffer.encode_uint32(2, this->handle);
-  for (auto &it : this->characteristics) {
-    buffer.encode_message<BluetoothGATTCharacteristic>(3, it, true);
-  }
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothGATTService::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothGATTService {\n");
-  for (const auto &it : this->uuid) {
-    out.append("  uuid: ");
-    sprintf(buffer, "%llu", it);
-    out.append(buffer);
-    out.append("\n");
-  }
-
-  out.append("  handle: ");
-  sprintf(buffer, "%u", this->handle);
-  out.append(buffer);
-  out.append("\n");
-
-  for (const auto &it : this->characteristics) {
-    out.append("  characteristics: ");
-    it.dump_to(out);
-    out.append("\n");
-  }
-  out.append("}");
-}
-#endif
-bool BluetoothGATTGetServicesResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->address = value.as_uint64();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool BluetoothGATTGetServicesResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 2: {
-      this->services.push_back(value.as_message<BluetoothGATTService>());
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothGATTGetServicesResponse::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_uint64(1, this->address);
-  for (auto &it : this->services) {
-    buffer.encode_message<BluetoothGATTService>(2, it, true);
-  }
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothGATTGetServicesResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothGATTGetServicesResponse {\n");
-  out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
-  out.append(buffer);
-  out.append("\n");
-
-  for (const auto &it : this->services) {
-    out.append("  services: ");
-    it.dump_to(out);
-    out.append("\n");
-  }
-  out.append("}");
-}
-#endif
-bool BluetoothGATTGetServicesDoneResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->address = value.as_uint64();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothGATTGetServicesDoneResponse::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_uint64(1, this->address);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothGATTGetServicesDoneResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothGATTGetServicesDoneResponse {\n");
-  out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
-  out.append(buffer);
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool BluetoothGATTReadRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->address = value.as_uint64();
-      return true;
-    }
-    case 2: {
-      this->handle = value.as_uint32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothGATTReadRequest::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_uint64(1, this->address);
-  buffer.encode_uint32(2, this->handle);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothGATTReadRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothGATTReadRequest {\n");
-  out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  handle: ");
-  sprintf(buffer, "%u", this->handle);
-  out.append(buffer);
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool BluetoothGATTReadResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->address = value.as_uint64();
-      return true;
-    }
-    case 2: {
-      this->handle = value.as_uint32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool BluetoothGATTReadResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 3: {
-      this->data = value.as_string();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothGATTReadResponse::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_uint64(1, this->address);
-  buffer.encode_uint32(2, this->handle);
-  buffer.encode_string(3, this->data);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothGATTReadResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothGATTReadResponse {\n");
-  out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  handle: ");
-  sprintf(buffer, "%u", this->handle);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  data: ");
-  out.append("'").append(this->data).append("'");
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool BluetoothGATTWriteRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->address = value.as_uint64();
-      return true;
-    }
-    case 2: {
-      this->handle = value.as_uint32();
-      return true;
-    }
-    case 3: {
-      this->response = value.as_bool();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool BluetoothGATTWriteRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 4: {
-      this->data = value.as_string();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothGATTWriteRequest::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_uint64(1, this->address);
-  buffer.encode_uint32(2, this->handle);
-  buffer.encode_bool(3, this->response);
-  buffer.encode_string(4, this->data);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothGATTWriteRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothGATTWriteRequest {\n");
-  out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  handle: ");
-  sprintf(buffer, "%u", this->handle);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  response: ");
-  out.append(YESNO(this->response));
-  out.append("\n");
-
-  out.append("  data: ");
-  out.append("'").append(this->data).append("'");
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool BluetoothGATTReadDescriptorRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->address = value.as_uint64();
-      return true;
-    }
-    case 2: {
-      this->handle = value.as_uint32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothGATTReadDescriptorRequest::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_uint64(1, this->address);
-  buffer.encode_uint32(2, this->handle);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothGATTReadDescriptorRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothGATTReadDescriptorRequest {\n");
-  out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  handle: ");
-  sprintf(buffer, "%u", this->handle);
-  out.append(buffer);
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool BluetoothGATTWriteDescriptorRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->address = value.as_uint64();
-      return true;
-    }
-    case 2: {
-      this->handle = value.as_uint32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool BluetoothGATTWriteDescriptorRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 3: {
-      this->data = value.as_string();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothGATTWriteDescriptorRequest::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_uint64(1, this->address);
-  buffer.encode_uint32(2, this->handle);
-  buffer.encode_string(3, this->data);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothGATTWriteDescriptorRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothGATTWriteDescriptorRequest {\n");
-  out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  handle: ");
-  sprintf(buffer, "%u", this->handle);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  data: ");
-  out.append("'").append(this->data).append("'");
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool BluetoothGATTNotifyRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->address = value.as_uint64();
-      return true;
-    }
-    case 2: {
-      this->handle = value.as_uint32();
-      return true;
-    }
-    case 3: {
-      this->enable = value.as_bool();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothGATTNotifyRequest::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_uint64(1, this->address);
-  buffer.encode_uint32(2, this->handle);
-  buffer.encode_bool(3, this->enable);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothGATTNotifyRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothGATTNotifyRequest {\n");
-  out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  handle: ");
-  sprintf(buffer, "%u", this->handle);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  enable: ");
-  out.append(YESNO(this->enable));
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool BluetoothGATTNotifyDataResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->address = value.as_uint64();
-      return true;
-    }
-    case 2: {
-      this->handle = value.as_uint32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool BluetoothGATTNotifyDataResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 3: {
-      this->data = value.as_string();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothGATTNotifyDataResponse::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_uint64(1, this->address);
-  buffer.encode_uint32(2, this->handle);
-  buffer.encode_string(3, this->data);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothGATTNotifyDataResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothGATTNotifyDataResponse {\n");
-  out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  handle: ");
-  sprintf(buffer, "%u", this->handle);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  data: ");
-  out.append("'").append(this->data).append("'");
-  out.append("\n");
-  out.append("}");
-}
-#endif
-void SubscribeBluetoothConnectionsFreeRequest::encode(ProtoWriteBuffer buffer) const {}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void SubscribeBluetoothConnectionsFreeRequest::dump_to(std::string &out) const {
-  out.append("SubscribeBluetoothConnectionsFreeRequest {}");
-}
-#endif
-bool BluetoothConnectionsFreeResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->free = value.as_uint32();
-      return true;
-    }
-    case 2: {
-      this->limit = value.as_uint32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothConnectionsFreeResponse::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_uint32(1, this->free);
-  buffer.encode_uint32(2, this->limit);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothConnectionsFreeResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothConnectionsFreeResponse {\n");
-  out.append("  free: ");
-  sprintf(buffer, "%u", this->free);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  limit: ");
-  sprintf(buffer, "%u", this->limit);
-  out.append(buffer);
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool BluetoothGATTErrorResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->address = value.as_uint64();
-      return true;
-    }
-    case 2: {
-      this->handle = value.as_uint32();
-      return true;
-    }
-    case 3: {
-      this->error = value.as_int32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothGATTErrorResponse::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_uint64(1, this->address);
-  buffer.encode_uint32(2, this->handle);
-  buffer.encode_int32(3, this->error);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothGATTErrorResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothGATTErrorResponse {\n");
-  out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  handle: ");
-  sprintf(buffer, "%u", this->handle);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  error: ");
-  sprintf(buffer, "%d", this->error);
-  out.append(buffer);
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool BluetoothGATTWriteResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->address = value.as_uint64();
-      return true;
-    }
-    case 2: {
-      this->handle = value.as_uint32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothGATTWriteResponse::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_uint64(1, this->address);
-  buffer.encode_uint32(2, this->handle);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothGATTWriteResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothGATTWriteResponse {\n");
-  out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  handle: ");
-  sprintf(buffer, "%u", this->handle);
-  out.append(buffer);
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool BluetoothGATTNotifyResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->address = value.as_uint64();
-      return true;
-    }
-    case 2: {
-      this->handle = value.as_uint32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothGATTNotifyResponse::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_uint64(1, this->address);
-  buffer.encode_uint32(2, this->handle);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothGATTNotifyResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothGATTNotifyResponse {\n");
-  out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  handle: ");
-  sprintf(buffer, "%u", this->handle);
-  out.append(buffer);
-  out.append("\n");
-  out.append("}");
-}
-#endif
 
 }  // namespace api
 }  // namespace esphome

esphome/components/api/api_pb2.h

@@ -53,7 +53,6 @@ enum SensorStateClass : uint32_t {
   STATE_CLASS_NONE = 0,
   STATE_CLASS_MEASUREMENT = 1,
   STATE_CLASS_TOTAL_INCREASING = 2,
-  STATE_CLASS_TOTAL = 3,
 };
 enum SensorLastResetType : uint32_t {
   LAST_RESET_NONE = 0,
@@ -129,48 +128,12 @@ enum NumberMode : uint32_t {
   NUMBER_MODE_BOX = 1,
   NUMBER_MODE_SLIDER = 2,
 };
-enum LockState : uint32_t {
-  LOCK_STATE_NONE = 0,
-  LOCK_STATE_LOCKED = 1,
-  LOCK_STATE_UNLOCKED = 2,
-  LOCK_STATE_JAMMED = 3,
-  LOCK_STATE_LOCKING = 4,
-  LOCK_STATE_UNLOCKING = 5,
-};
-enum LockCommand : uint32_t {
-  LOCK_UNLOCK = 0,
-  LOCK_LOCK = 1,
-  LOCK_OPEN = 2,
-};
-enum MediaPlayerState : uint32_t {
-  MEDIA_PLAYER_STATE_NONE = 0,
-  MEDIA_PLAYER_STATE_IDLE = 1,
-  MEDIA_PLAYER_STATE_PLAYING = 2,
-  MEDIA_PLAYER_STATE_PAUSED = 3,
-};
-enum MediaPlayerCommand : uint32_t {
-  MEDIA_PLAYER_COMMAND_PLAY = 0,
-  MEDIA_PLAYER_COMMAND_PAUSE = 1,
-  MEDIA_PLAYER_COMMAND_STOP = 2,
-  MEDIA_PLAYER_COMMAND_MUTE = 3,
-  MEDIA_PLAYER_COMMAND_UNMUTE = 4,
-};
-enum BluetoothDeviceRequestType : uint32_t {
-  BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT = 0,
-  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
 
 class HelloRequest : public ProtoMessage {
  public:
   std::string client_info{};
-  uint32_t api_version_major{0};
-  uint32_t api_version_minor{0};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -178,7 +141,6 @@ class HelloRequest : public ProtoMessage {
 
  protected:
   bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
 class HelloResponse : public ProtoMessage {
  public:
@@ -274,8 +236,6 @@ class DeviceInfoResponse : public ProtoMessage {
   std::string project_name{};
   std::string project_version{};
   uint32_t webserver_port{0};
-  uint32_t bluetooth_proxy_version{0};
-  std::string manufacturer{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -607,7 +567,6 @@ class ListEntitiesSwitchResponse : public ProtoMessage {
   bool assumed_state{false};
   bool disabled_by_default{false};
   enums::EntityCategory entity_category{};
-  std::string device_class{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -1006,7 +965,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;
@@ -1091,58 +1049,6 @@ class SelectCommandRequest : public ProtoMessage {
   bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
   bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
 };
-class ListEntitiesLockResponse : public ProtoMessage {
- public:
-  std::string object_id{};
-  uint32_t key{0};
-  std::string name{};
-  std::string unique_id{};
-  std::string icon{};
-  bool disabled_by_default{false};
-  enums::EntityCategory entity_category{};
-  bool assumed_state{false};
-  bool supports_open{false};
-  bool requires_code{false};
-  std::string code_format{};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class LockStateResponse : public ProtoMessage {
- public:
-  uint32_t key{0};
-  enums::LockState state{};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class LockCommandRequest : public ProtoMessage {
- public:
-  uint32_t key{0};
-  enums::LockCommand command{};
-  bool has_code{false};
-  std::string code{};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
 class ListEntitiesButtonResponse : public ProtoMessage {
  public:
   std::string object_id{};
@@ -1174,357 +1080,6 @@ class ButtonCommandRequest : public ProtoMessage {
  protected:
   bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
 };
-class ListEntitiesMediaPlayerResponse : public ProtoMessage {
- public:
-  std::string object_id{};
-  uint32_t key{0};
-  std::string name{};
-  std::string unique_id{};
-  std::string icon{};
-  bool disabled_by_default{false};
-  enums::EntityCategory entity_category{};
-  bool supports_pause{false};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class MediaPlayerStateResponse : public ProtoMessage {
- public:
-  uint32_t key{0};
-  enums::MediaPlayerState state{};
-  float volume{0.0f};
-  bool muted{false};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class MediaPlayerCommandRequest : public ProtoMessage {
- public:
-  uint32_t key{0};
-  bool has_command{false};
-  enums::MediaPlayerCommand command{};
-  bool has_volume{false};
-  float volume{0.0f};
-  bool has_media_url{false};
-  std::string media_url{};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class SubscribeBluetoothLEAdvertisementsRequest : public ProtoMessage {
- public:
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-};
-class BluetoothServiceData : public ProtoMessage {
- public:
-  std::string uuid{};
-  std::vector<uint32_t> legacy_data{};
-  std::string data{};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class BluetoothLEAdvertisementResponse : public ProtoMessage {
- public:
-  uint64_t address{0};
-  std::string name{};
-  int32_t rssi{0};
-  std::vector<std::string> service_uuids{};
-  std::vector<BluetoothServiceData> service_data{};
-  std::vector<BluetoothServiceData> manufacturer_data{};
-  uint32_t address_type{0};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class 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;
-#endif
-
- protected:
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class BluetoothDeviceConnectionResponse : public ProtoMessage {
- public:
-  uint64_t address{0};
-  bool connected{false};
-  uint32_t mtu{0};
-  int32_t error{0};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class BluetoothGATTGetServicesRequest : public ProtoMessage {
- public:
-  uint64_t address{0};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class BluetoothGATTDescriptor : public ProtoMessage {
- public:
-  std::vector<uint64_t> uuid{};
-  uint32_t handle{0};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class BluetoothGATTCharacteristic : public ProtoMessage {
- public:
-  std::vector<uint64_t> uuid{};
-  uint32_t handle{0};
-  uint32_t properties{0};
-  std::vector<BluetoothGATTDescriptor> descriptors{};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class BluetoothGATTService : public ProtoMessage {
- public:
-  std::vector<uint64_t> uuid{};
-  uint32_t handle{0};
-  std::vector<BluetoothGATTCharacteristic> characteristics{};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class BluetoothGATTGetServicesResponse : public ProtoMessage {
- public:
-  uint64_t address{0};
-  std::vector<BluetoothGATTService> services{};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class BluetoothGATTGetServicesDoneResponse : public ProtoMessage {
- public:
-  uint64_t address{0};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class BluetoothGATTReadRequest : public ProtoMessage {
- public:
-  uint64_t address{0};
-  uint32_t handle{0};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class BluetoothGATTReadResponse : public ProtoMessage {
- public:
-  uint64_t address{0};
-  uint32_t handle{0};
-  std::string data{};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class BluetoothGATTWriteRequest : public ProtoMessage {
- public:
-  uint64_t address{0};
-  uint32_t handle{0};
-  bool response{false};
-  std::string data{};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class BluetoothGATTReadDescriptorRequest : public ProtoMessage {
- public:
-  uint64_t address{0};
-  uint32_t handle{0};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class BluetoothGATTWriteDescriptorRequest : public ProtoMessage {
- public:
-  uint64_t address{0};
-  uint32_t handle{0};
-  std::string data{};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class BluetoothGATTNotifyRequest : public ProtoMessage {
- public:
-  uint64_t address{0};
-  uint32_t handle{0};
-  bool enable{false};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class BluetoothGATTNotifyDataResponse : public ProtoMessage {
- public:
-  uint64_t address{0};
-  uint32_t handle{0};
-  std::string data{};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class SubscribeBluetoothConnectionsFreeRequest : public ProtoMessage {
- public:
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-};
-class BluetoothConnectionsFreeResponse : public ProtoMessage {
- public:
-  uint32_t free{0};
-  uint32_t limit{0};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class BluetoothGATTErrorResponse : public ProtoMessage {
- public:
-  uint64_t address{0};
-  uint32_t handle{0};
-  int32_t error{0};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class BluetoothGATTWriteResponse : public ProtoMessage {
- public:
-  uint64_t address{0};
-  uint32_t handle{0};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class BluetoothGATTNotifyResponse : public ProtoMessage {
- public:
-  uint64_t address{0};
-  uint32_t handle{0};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
 
 }  // namespace api
 }  // namespace esphome

esphome/components/api/api_pb2_service.cpp

@@ -282,24 +282,6 @@ bool APIServerConnectionBase::send_select_state_response(const SelectStateRespon
 #endif
 #ifdef USE_SELECT
 #endif
-#ifdef USE_LOCK
-bool APIServerConnectionBase::send_list_entities_lock_response(const ListEntitiesLockResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_lock_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesLockResponse>(msg, 58);
-}
-#endif
-#ifdef USE_LOCK
-bool APIServerConnectionBase::send_lock_state_response(const LockStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_lock_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<LockStateResponse>(msg, 59);
-}
-#endif
-#ifdef USE_LOCK
-#endif
 #ifdef USE_BUTTON
 bool APIServerConnectionBase::send_list_entities_button_response(const ListEntitiesButtonResponse &msg) {
 #ifdef HAS_PROTO_MESSAGE_DUMP
@@ -310,121 +292,6 @@ bool APIServerConnectionBase::send_list_entities_button_response(const ListEntit
 #endif
 #ifdef USE_BUTTON
 #endif
-#ifdef USE_MEDIA_PLAYER
-bool APIServerConnectionBase::send_list_entities_media_player_response(const ListEntitiesMediaPlayerResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_media_player_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesMediaPlayerResponse>(msg, 63);
-}
-#endif
-#ifdef USE_MEDIA_PLAYER
-bool APIServerConnectionBase::send_media_player_state_response(const MediaPlayerStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_media_player_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<MediaPlayerStateResponse>(msg, 64);
-}
-#endif
-#ifdef USE_MEDIA_PLAYER
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-bool APIServerConnectionBase::send_bluetooth_le_advertisement_response(const BluetoothLEAdvertisementResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_bluetooth_le_advertisement_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<BluetoothLEAdvertisementResponse>(msg, 67);
-}
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-bool APIServerConnectionBase::send_bluetooth_device_connection_response(const BluetoothDeviceConnectionResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_bluetooth_device_connection_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<BluetoothDeviceConnectionResponse>(msg, 69);
-}
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-bool APIServerConnectionBase::send_bluetooth_gatt_get_services_response(const BluetoothGATTGetServicesResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_bluetooth_gatt_get_services_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<BluetoothGATTGetServicesResponse>(msg, 71);
-}
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-bool APIServerConnectionBase::send_bluetooth_gatt_get_services_done_response(
-    const BluetoothGATTGetServicesDoneResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_bluetooth_gatt_get_services_done_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<BluetoothGATTGetServicesDoneResponse>(msg, 72);
-}
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-bool APIServerConnectionBase::send_bluetooth_gatt_read_response(const BluetoothGATTReadResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_bluetooth_gatt_read_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<BluetoothGATTReadResponse>(msg, 74);
-}
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-bool APIServerConnectionBase::send_bluetooth_gatt_notify_data_response(const BluetoothGATTNotifyDataResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_bluetooth_gatt_notify_data_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<BluetoothGATTNotifyDataResponse>(msg, 79);
-}
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-bool APIServerConnectionBase::send_bluetooth_connections_free_response(const BluetoothConnectionsFreeResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_bluetooth_connections_free_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<BluetoothConnectionsFreeResponse>(msg, 81);
-}
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-bool APIServerConnectionBase::send_bluetooth_gatt_error_response(const BluetoothGATTErrorResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_bluetooth_gatt_error_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<BluetoothGATTErrorResponse>(msg, 82);
-}
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-bool APIServerConnectionBase::send_bluetooth_gatt_write_response(const BluetoothGATTWriteResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_bluetooth_gatt_write_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<BluetoothGATTWriteResponse>(msg, 83);
-}
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-bool APIServerConnectionBase::send_bluetooth_gatt_notify_response(const BluetoothGATTNotifyResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_bluetooth_gatt_notify_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<BluetoothGATTNotifyResponse>(msg, 84);
-}
-#endif
 bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) {
   switch (msg_type) {
     case 1: {
@@ -656,17 +523,6 @@ bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
       ESP_LOGVV(TAG, "on_select_command_request: %s", msg.dump().c_str());
 #endif
       this->on_select_command_request(msg);
-#endif
-      break;
-    }
-    case 60: {
-#ifdef USE_LOCK
-      LockCommandRequest msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_lock_command_request: %s", msg.dump().c_str());
-#endif
-      this->on_lock_command_request(msg);
 #endif
       break;
     }
@@ -678,114 +534,6 @@ bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
       ESP_LOGVV(TAG, "on_button_command_request: %s", msg.dump().c_str());
 #endif
       this->on_button_command_request(msg);
-#endif
-      break;
-    }
-    case 65: {
-#ifdef USE_MEDIA_PLAYER
-      MediaPlayerCommandRequest msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_media_player_command_request: %s", msg.dump().c_str());
-#endif
-      this->on_media_player_command_request(msg);
-#endif
-      break;
-    }
-    case 66: {
-      SubscribeBluetoothLEAdvertisementsRequest msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_subscribe_bluetooth_le_advertisements_request: %s", msg.dump().c_str());
-#endif
-      this->on_subscribe_bluetooth_le_advertisements_request(msg);
-      break;
-    }
-    case 68: {
-#ifdef USE_BLUETOOTH_PROXY
-      BluetoothDeviceRequest msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_bluetooth_device_request: %s", msg.dump().c_str());
-#endif
-      this->on_bluetooth_device_request(msg);
-#endif
-      break;
-    }
-    case 70: {
-#ifdef USE_BLUETOOTH_PROXY
-      BluetoothGATTGetServicesRequest msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_bluetooth_gatt_get_services_request: %s", msg.dump().c_str());
-#endif
-      this->on_bluetooth_gatt_get_services_request(msg);
-#endif
-      break;
-    }
-    case 73: {
-#ifdef USE_BLUETOOTH_PROXY
-      BluetoothGATTReadRequest msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_bluetooth_gatt_read_request: %s", msg.dump().c_str());
-#endif
-      this->on_bluetooth_gatt_read_request(msg);
-#endif
-      break;
-    }
-    case 75: {
-#ifdef USE_BLUETOOTH_PROXY
-      BluetoothGATTWriteRequest msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_bluetooth_gatt_write_request: %s", msg.dump().c_str());
-#endif
-      this->on_bluetooth_gatt_write_request(msg);
-#endif
-      break;
-    }
-    case 76: {
-#ifdef USE_BLUETOOTH_PROXY
-      BluetoothGATTReadDescriptorRequest msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_bluetooth_gatt_read_descriptor_request: %s", msg.dump().c_str());
-#endif
-      this->on_bluetooth_gatt_read_descriptor_request(msg);
-#endif
-      break;
-    }
-    case 77: {
-#ifdef USE_BLUETOOTH_PROXY
-      BluetoothGATTWriteDescriptorRequest msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_bluetooth_gatt_write_descriptor_request: %s", msg.dump().c_str());
-#endif
-      this->on_bluetooth_gatt_write_descriptor_request(msg);
-#endif
-      break;
-    }
-    case 78: {
-#ifdef USE_BLUETOOTH_PROXY
-      BluetoothGATTNotifyRequest msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_bluetooth_gatt_notify_request: %s", msg.dump().c_str());
-#endif
-      this->on_bluetooth_gatt_notify_request(msg);
-#endif
-      break;
-    }
-    case 80: {
-#ifdef USE_BLUETOOTH_PROXY
-      SubscribeBluetoothConnectionsFreeRequest msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_subscribe_bluetooth_connections_free_request: %s", msg.dump().c_str());
-#endif
-      this->on_subscribe_bluetooth_connections_free_request(msg);
 #endif
       break;
     }
@@ -1023,152 +771,6 @@ void APIServerConnection::on_button_command_request(const ButtonCommandRequest &
   this->button_command(msg);
 }
 #endif
-#ifdef USE_LOCK
-void APIServerConnection::on_lock_command_request(const LockCommandRequest &msg) {
-  if (!this->is_connection_setup()) {
-    this->on_no_setup_connection();
-    return;
-  }
-  if (!this->is_authenticated()) {
-    this->on_unauthenticated_access();
-    return;
-  }
-  this->lock_command(msg);
-}
-#endif
-#ifdef USE_MEDIA_PLAYER
-void APIServerConnection::on_media_player_command_request(const MediaPlayerCommandRequest &msg) {
-  if (!this->is_connection_setup()) {
-    this->on_no_setup_connection();
-    return;
-  }
-  if (!this->is_authenticated()) {
-    this->on_unauthenticated_access();
-    return;
-  }
-  this->media_player_command(msg);
-}
-#endif
-void APIServerConnection::on_subscribe_bluetooth_le_advertisements_request(
-    const SubscribeBluetoothLEAdvertisementsRequest &msg) {
-  if (!this->is_connection_setup()) {
-    this->on_no_setup_connection();
-    return;
-  }
-  if (!this->is_authenticated()) {
-    this->on_unauthenticated_access();
-    return;
-  }
-  this->subscribe_bluetooth_le_advertisements(msg);
-}
-#ifdef USE_BLUETOOTH_PROXY
-void APIServerConnection::on_bluetooth_device_request(const BluetoothDeviceRequest &msg) {
-  if (!this->is_connection_setup()) {
-    this->on_no_setup_connection();
-    return;
-  }
-  if (!this->is_authenticated()) {
-    this->on_unauthenticated_access();
-    return;
-  }
-  this->bluetooth_device_request(msg);
-}
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-void APIServerConnection::on_bluetooth_gatt_get_services_request(const BluetoothGATTGetServicesRequest &msg) {
-  if (!this->is_connection_setup()) {
-    this->on_no_setup_connection();
-    return;
-  }
-  if (!this->is_authenticated()) {
-    this->on_unauthenticated_access();
-    return;
-  }
-  this->bluetooth_gatt_get_services(msg);
-}
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-void APIServerConnection::on_bluetooth_gatt_read_request(const BluetoothGATTReadRequest &msg) {
-  if (!this->is_connection_setup()) {
-    this->on_no_setup_connection();
-    return;
-  }
-  if (!this->is_authenticated()) {
-    this->on_unauthenticated_access();
-    return;
-  }
-  this->bluetooth_gatt_read(msg);
-}
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-void APIServerConnection::on_bluetooth_gatt_write_request(const BluetoothGATTWriteRequest &msg) {
-  if (!this->is_connection_setup()) {
-    this->on_no_setup_connection();
-    return;
-  }
-  if (!this->is_authenticated()) {
-    this->on_unauthenticated_access();
-    return;
-  }
-  this->bluetooth_gatt_write(msg);
-}
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-void APIServerConnection::on_bluetooth_gatt_read_descriptor_request(const BluetoothGATTReadDescriptorRequest &msg) {
-  if (!this->is_connection_setup()) {
-    this->on_no_setup_connection();
-    return;
-  }
-  if (!this->is_authenticated()) {
-    this->on_unauthenticated_access();
-    return;
-  }
-  this->bluetooth_gatt_read_descriptor(msg);
-}
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-void APIServerConnection::on_bluetooth_gatt_write_descriptor_request(const BluetoothGATTWriteDescriptorRequest &msg) {
-  if (!this->is_connection_setup()) {
-    this->on_no_setup_connection();
-    return;
-  }
-  if (!this->is_authenticated()) {
-    this->on_unauthenticated_access();
-    return;
-  }
-  this->bluetooth_gatt_write_descriptor(msg);
-}
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-void APIServerConnection::on_bluetooth_gatt_notify_request(const BluetoothGATTNotifyRequest &msg) {
-  if (!this->is_connection_setup()) {
-    this->on_no_setup_connection();
-    return;
-  }
-  if (!this->is_authenticated()) {
-    this->on_unauthenticated_access();
-    return;
-  }
-  this->bluetooth_gatt_notify(msg);
-}
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-void APIServerConnection::on_subscribe_bluetooth_connections_free_request(
-    const SubscribeBluetoothConnectionsFreeRequest &msg) {
-  if (!this->is_connection_setup()) {
-    this->on_no_setup_connection();
-    return;
-  }
-  if (!this->is_authenticated()) {
-    this->on_unauthenticated_access();
-    return;
-  }
-  BluetoothConnectionsFreeResponse ret = this->subscribe_bluetooth_connections_free(msg);
-  if (!this->send_bluetooth_connections_free_response(ret)) {
-    this->on_fatal_error();
-  }
-}
-#endif
 
 }  // namespace api
 }  // namespace esphome

esphome/components/api/api_pb2_service.h

@@ -130,85 +130,11 @@ class APIServerConnectionBase : public ProtoService {
 #ifdef USE_SELECT
   virtual void on_select_command_request(const SelectCommandRequest &value){};
 #endif
-#ifdef USE_LOCK
-  bool send_list_entities_lock_response(const ListEntitiesLockResponse &msg);
-#endif
-#ifdef USE_LOCK
-  bool send_lock_state_response(const LockStateResponse &msg);
-#endif
-#ifdef USE_LOCK
-  virtual void on_lock_command_request(const LockCommandRequest &value){};
-#endif
 #ifdef USE_BUTTON
   bool send_list_entities_button_response(const ListEntitiesButtonResponse &msg);
 #endif
 #ifdef USE_BUTTON
   virtual void on_button_command_request(const ButtonCommandRequest &value){};
-#endif
-#ifdef USE_MEDIA_PLAYER
-  bool send_list_entities_media_player_response(const ListEntitiesMediaPlayerResponse &msg);
-#endif
-#ifdef USE_MEDIA_PLAYER
-  bool send_media_player_state_response(const MediaPlayerStateResponse &msg);
-#endif
-#ifdef USE_MEDIA_PLAYER
-  virtual void on_media_player_command_request(const MediaPlayerCommandRequest &value){};
-#endif
-  virtual void on_subscribe_bluetooth_le_advertisements_request(
-      const SubscribeBluetoothLEAdvertisementsRequest &value){};
-#ifdef USE_BLUETOOTH_PROXY
-  bool send_bluetooth_le_advertisement_response(const BluetoothLEAdvertisementResponse &msg);
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  virtual void on_bluetooth_device_request(const BluetoothDeviceRequest &value){};
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  bool send_bluetooth_device_connection_response(const BluetoothDeviceConnectionResponse &msg);
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  virtual void on_bluetooth_gatt_get_services_request(const BluetoothGATTGetServicesRequest &value){};
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  bool send_bluetooth_gatt_get_services_response(const BluetoothGATTGetServicesResponse &msg);
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  bool send_bluetooth_gatt_get_services_done_response(const BluetoothGATTGetServicesDoneResponse &msg);
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  virtual void on_bluetooth_gatt_read_request(const BluetoothGATTReadRequest &value){};
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  bool send_bluetooth_gatt_read_response(const BluetoothGATTReadResponse &msg);
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  virtual void on_bluetooth_gatt_write_request(const BluetoothGATTWriteRequest &value){};
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  virtual void on_bluetooth_gatt_read_descriptor_request(const BluetoothGATTReadDescriptorRequest &value){};
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  virtual void on_bluetooth_gatt_write_descriptor_request(const BluetoothGATTWriteDescriptorRequest &value){};
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  virtual void on_bluetooth_gatt_notify_request(const BluetoothGATTNotifyRequest &value){};
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  bool send_bluetooth_gatt_notify_data_response(const BluetoothGATTNotifyDataResponse &msg);
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  virtual void on_subscribe_bluetooth_connections_free_request(const SubscribeBluetoothConnectionsFreeRequest &value){};
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  bool send_bluetooth_connections_free_response(const BluetoothConnectionsFreeResponse &msg);
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  bool send_bluetooth_gatt_error_response(const BluetoothGATTErrorResponse &msg);
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  bool send_bluetooth_gatt_write_response(const BluetoothGATTWriteResponse &msg);
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  bool send_bluetooth_gatt_notify_response(const BluetoothGATTNotifyResponse &msg);
 #endif
  protected:
   bool read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) override;
@@ -254,38 +180,6 @@ class APIServerConnection : public APIServerConnectionBase {
 #endif
 #ifdef USE_BUTTON
   virtual void button_command(const ButtonCommandRequest &msg) = 0;
-#endif
-#ifdef USE_LOCK
-  virtual void lock_command(const LockCommandRequest &msg) = 0;
-#endif
-#ifdef USE_MEDIA_PLAYER
-  virtual void media_player_command(const MediaPlayerCommandRequest &msg) = 0;
-#endif
-  virtual void subscribe_bluetooth_le_advertisements(const SubscribeBluetoothLEAdvertisementsRequest &msg) = 0;
-#ifdef USE_BLUETOOTH_PROXY
-  virtual void bluetooth_device_request(const BluetoothDeviceRequest &msg) = 0;
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  virtual void bluetooth_gatt_get_services(const BluetoothGATTGetServicesRequest &msg) = 0;
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  virtual void bluetooth_gatt_read(const BluetoothGATTReadRequest &msg) = 0;
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  virtual void bluetooth_gatt_write(const BluetoothGATTWriteRequest &msg) = 0;
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  virtual void bluetooth_gatt_read_descriptor(const BluetoothGATTReadDescriptorRequest &msg) = 0;
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  virtual void bluetooth_gatt_write_descriptor(const BluetoothGATTWriteDescriptorRequest &msg) = 0;
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  virtual void bluetooth_gatt_notify(const BluetoothGATTNotifyRequest &msg) = 0;
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  virtual BluetoothConnectionsFreeResponse subscribe_bluetooth_connections_free(
-      const SubscribeBluetoothConnectionsFreeRequest &msg) = 0;
 #endif
  protected:
   void on_hello_request(const HelloRequest &msg) override;
@@ -327,37 +221,6 @@ class APIServerConnection : public APIServerConnectionBase {
 #ifdef USE_BUTTON
   void on_button_command_request(const ButtonCommandRequest &msg) override;
 #endif
-#ifdef USE_LOCK
-  void on_lock_command_request(const LockCommandRequest &msg) override;
-#endif
-#ifdef USE_MEDIA_PLAYER
-  void on_media_player_command_request(const MediaPlayerCommandRequest &msg) override;
-#endif
-  void on_subscribe_bluetooth_le_advertisements_request(const SubscribeBluetoothLEAdvertisementsRequest &msg) override;
-#ifdef USE_BLUETOOTH_PROXY
-  void on_bluetooth_device_request(const BluetoothDeviceRequest &msg) override;
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  void on_bluetooth_gatt_get_services_request(const BluetoothGATTGetServicesRequest &msg) override;
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  void on_bluetooth_gatt_read_request(const BluetoothGATTReadRequest &msg) override;
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  void on_bluetooth_gatt_write_request(const BluetoothGATTWriteRequest &msg) override;
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  void on_bluetooth_gatt_read_descriptor_request(const BluetoothGATTReadDescriptorRequest &msg) override;
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  void on_bluetooth_gatt_write_descriptor_request(const BluetoothGATTWriteDescriptorRequest &msg) override;
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  void on_bluetooth_gatt_notify_request(const BluetoothGATTNotifyRequest &msg) override;
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  void on_subscribe_bluetooth_connections_free_request(const SubscribeBluetoothConnectionsFreeRequest &msg) override;
-#endif
 };
 
 }  // namespace api

esphome/components/api/api_server.cpp

@@ -255,7 +255,7 @@ void APIServer::on_number_update(number::Number *obj, float state) {
 #endif
 
 #ifdef USE_SELECT
-void APIServer::on_select_update(select::Select *obj, const std::string &state, size_t index) {
+void APIServer::on_select_update(select::Select *obj, const std::string &state) {
   if (obj->is_internal())
     return;
   for (auto &c : this->clients_)
@@ -263,24 +263,6 @@ void APIServer::on_select_update(select::Select *obj, const std::string &state,
 }
 #endif
 
-#ifdef USE_LOCK
-void APIServer::on_lock_update(lock::Lock *obj) {
-  if (obj->is_internal())
-    return;
-  for (auto &c : this->clients_)
-    c->send_lock_state(obj, obj->state);
-}
-#endif
-
-#ifdef USE_MEDIA_PLAYER
-void APIServer::on_media_player_update(media_player::MediaPlayer *obj) {
-  if (obj->is_internal())
-    return;
-  for (auto &c : this->clients_)
-    c->send_media_player_state(obj);
-}
-#endif
-
 float APIServer::get_setup_priority() const { return setup_priority::AFTER_WIFI; }
 void APIServer::set_port(uint16_t port) { this->port_ = port; }
 APIServer *global_api_server = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
@@ -291,79 +273,6 @@ void APIServer::send_homeassistant_service_call(const HomeassistantServiceRespon
     client->send_homeassistant_service_call(call);
   }
 }
-#ifdef USE_BLUETOOTH_PROXY
-void APIServer::send_bluetooth_le_advertisement(const BluetoothLEAdvertisementResponse &call) {
-  for (auto &client : this->clients_) {
-    client->send_bluetooth_le_advertisement(call);
-  }
-}
-void APIServer::send_bluetooth_device_connection(uint64_t address, bool connected, uint16_t mtu, esp_err_t error) {
-  BluetoothDeviceConnectionResponse call;
-  call.address = address;
-  call.connected = connected;
-  call.mtu = mtu;
-  call.error = error;
-
-  for (auto &client : this->clients_) {
-    client->send_bluetooth_device_connection_response(call);
-  }
-}
-
-void APIServer::send_bluetooth_connections_free(uint8_t free, uint8_t limit) {
-  BluetoothConnectionsFreeResponse call;
-  call.free = free;
-  call.limit = limit;
-
-  for (auto &client : this->clients_) {
-    client->send_bluetooth_connections_free_response(call);
-  }
-}
-
-void APIServer::send_bluetooth_gatt_read_response(const BluetoothGATTReadResponse &call) {
-  for (auto &client : this->clients_) {
-    client->send_bluetooth_gatt_read_response(call);
-  }
-}
-void APIServer::send_bluetooth_gatt_write_response(const BluetoothGATTWriteResponse &call) {
-  for (auto &client : this->clients_) {
-    client->send_bluetooth_gatt_write_response(call);
-  }
-}
-void APIServer::send_bluetooth_gatt_notify_data_response(const BluetoothGATTNotifyDataResponse &call) {
-  for (auto &client : this->clients_) {
-    client->send_bluetooth_gatt_notify_data_response(call);
-  }
-}
-void APIServer::send_bluetooth_gatt_notify_response(const BluetoothGATTNotifyResponse &call) {
-  for (auto &client : this->clients_) {
-    client->send_bluetooth_gatt_notify_response(call);
-  }
-}
-void APIServer::send_bluetooth_gatt_services(const BluetoothGATTGetServicesResponse &call) {
-  for (auto &client : this->clients_) {
-    client->send_bluetooth_gatt_get_services_response(call);
-  }
-}
-void APIServer::send_bluetooth_gatt_services_done(uint64_t address) {
-  BluetoothGATTGetServicesDoneResponse call;
-  call.address = address;
-
-  for (auto &client : this->clients_) {
-    client->send_bluetooth_gatt_get_services_done_response(call);
-  }
-}
-void APIServer::send_bluetooth_gatt_error(uint64_t address, uint16_t handle, esp_err_t error) {
-  BluetoothGATTErrorResponse call;
-  call.address = address;
-  call.handle = handle;
-  call.error = error;
-
-  for (auto &client : this->clients_) {
-    client->send_bluetooth_gatt_error_response(call);
-  }
-}
-
-#endif
 APIServer::APIServer() { global_api_server = this; }
 void APIServer::subscribe_home_assistant_state(std::string entity_id, optional<std::string> attribute,
                                                std::function<void(std::string)> f) {

esphome/components/api/api_server.h

@@ -7,13 +7,12 @@
 #include "esphome/components/socket/socket.h"
 #include "api_pb2.h"
 #include "api_pb2_service.h"
+#include "util.h"
 #include "list_entities.h"
 #include "subscribe_state.h"
 #include "user_services.h"
 #include "api_noise_context.h"
 
-#include <vector>
-
 namespace esphome {
 namespace api {
 
@@ -66,27 +65,9 @@ class APIServer : public Component, public Controller {
   void on_number_update(number::Number *obj, float state) override;
 #endif
 #ifdef USE_SELECT
-  void on_select_update(select::Select *obj, const std::string &state, size_t index) override;
-#endif
-#ifdef USE_LOCK
-  void on_lock_update(lock::Lock *obj) override;
-#endif
-#ifdef USE_MEDIA_PLAYER
-  void on_media_player_update(media_player::MediaPlayer *obj) override;
+  void on_select_update(select::Select *obj, const std::string &state) override;
 #endif
   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_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);
-  void send_bluetooth_gatt_notify_data_response(const BluetoothGATTNotifyDataResponse &call);
-  void send_bluetooth_gatt_notify_response(const BluetoothGATTNotifyResponse &call);
-  void send_bluetooth_gatt_services(const BluetoothGATTGetServicesResponse &call);
-  void send_bluetooth_gatt_services_done(uint64_t address);
-  void send_bluetooth_gatt_error(uint64_t address, uint16_t handle, esp_err_t error);
-#endif
   void register_user_service(UserServiceDescriptor *descriptor) { this->user_services_.push_back(descriptor); }
 #ifdef USE_HOMEASSISTANT_TIME
   void request_time();

esphome/components/api/client.py

@@ -21,6 +21,7 @@ async def async_run_logs(config, address):
     if CONF_ENCRYPTION in conf:
         noise_psk = conf[CONF_ENCRYPTION][CONF_KEY]
     _LOGGER.info("Starting log output from %s using esphome API", address)
+    zc = zeroconf.Zeroconf()
     cli = APIClient(
         address,
         port,

esphome/components/api/homeassistant_service.h

@@ -5,8 +5,6 @@
 #include "api_pb2.h"
 #include "api_server.h"
 
-#include <vector>
-
 namespace esphome {
 namespace api {
 

esphome/components/api/list_entities.cpp

@@ -35,12 +35,10 @@ bool ListEntitiesIterator::on_text_sensor(text_sensor::TextSensor *text_sensor)
   return this->client_->send_text_sensor_info(text_sensor);
 }
 #endif
-#ifdef USE_LOCK
-bool ListEntitiesIterator::on_lock(lock::Lock *a_lock) { return this->client_->send_lock_info(a_lock); }
-#endif
 
 bool ListEntitiesIterator::on_end() { return this->client_->send_list_info_done(); }
-ListEntitiesIterator::ListEntitiesIterator(APIConnection *client) : client_(client) {}
+ListEntitiesIterator::ListEntitiesIterator(APIServer *server, APIConnection *client)
+    : ComponentIterator(server), client_(client) {}
 bool ListEntitiesIterator::on_service(UserServiceDescriptor *service) {
   auto resp = service->encode_list_service_response();
   return this->client_->send_list_entities_services_response(resp);
@@ -64,11 +62,5 @@ bool ListEntitiesIterator::on_number(number::Number *number) { return this->clie
 bool ListEntitiesIterator::on_select(select::Select *select) { return this->client_->send_select_info(select); }
 #endif
 
-#ifdef USE_MEDIA_PLAYER
-bool ListEntitiesIterator::on_media_player(media_player::MediaPlayer *media_player) {
-  return this->client_->send_media_player_info(media_player);
-}
-#endif
-
 }  // namespace api
 }  // namespace esphome

esphome/components/api/list_entities.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "esphome/core/component.h"
-#include "esphome/core/component_iterator.h"
 #include "esphome/core/defines.h"
+#include "util.h"
 
 namespace esphome {
 namespace api {
@@ -11,7 +11,7 @@ class APIConnection;
 
 class ListEntitiesIterator : public ComponentIterator {
  public:
-  ListEntitiesIterator(APIConnection *client);
+  ListEntitiesIterator(APIServer *server, APIConnection *client);
 #ifdef USE_BINARY_SENSOR
   bool on_binary_sensor(binary_sensor::BinarySensor *binary_sensor) override;
 #endif
@@ -48,12 +48,6 @@ class ListEntitiesIterator : public ComponentIterator {
 #endif
 #ifdef USE_SELECT
   bool on_select(select::Select *select) override;
-#endif
-#ifdef USE_LOCK
-  bool on_lock(lock::Lock *a_lock) override;
-#endif
-#ifdef USE_MEDIA_PLAYER
-  bool on_media_player(media_player::MediaPlayer *media_player) override;
 #endif
   bool on_end() override;
 
@@ -63,3 +57,5 @@ class ListEntitiesIterator : public ComponentIterator {
 
 }  // namespace api
 }  // namespace esphome
+
+#include "api_server.h"

esphome/components/api/proto.cpp

@@ -1,4 +1,5 @@
 #include "proto.h"
+#include "util.h"
 #include "esphome/core/log.h"
 
 namespace esphome {

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
@@ -72,7 +70,7 @@ class ProtoVarInt {
     }
   }
   void encode(std::vector<uint8_t> &out) {
-    uint64_t val = this->value_;
+    uint32_t val = this->value_;
     if (val <= 0x7F) {
       out.push_back(val);
       return;
@@ -197,20 +195,6 @@ class ProtoWriteBuffer {
     this->write((value >> 16) & 0xFF);
     this->write((value >> 24) & 0xFF);
   }
-  void encode_fixed64(uint32_t field_id, uint64_t value, bool force = false) {
-    if (value == 0 && !force)
-      return;
-
-    this->encode_field_raw(field_id, 5);
-    this->write((value >> 0) & 0xFF);
-    this->write((value >> 8) & 0xFF);
-    this->write((value >> 16) & 0xFF);
-    this->write((value >> 24) & 0xFF);
-    this->write((value >> 32) & 0xFF);
-    this->write((value >> 40) & 0xFF);
-    this->write((value >> 48) & 0xFF);
-    this->write((value >> 56) & 0xFF);
-  }
   template<typename T> void encode_enum(uint32_t field_id, T value, bool force = false) {
     this->encode_uint32(field_id, static_cast<uint32_t>(value), force);
   }
@@ -245,15 +229,6 @@ class ProtoWriteBuffer {
     }
     this->encode_uint32(field_id, uvalue, force);
   }
-  void encode_sint64(uint32_t field_id, int64_t value, bool force = false) {
-    uint64_t uvalue;
-    if (value < 0) {
-      uvalue = ~(value << 1);
-    } else {
-      uvalue = value << 1;
-    }
-    this->encode_uint64(field_id, uvalue, force);
-  }
   template<class C> void encode_message(uint32_t field_id, const C &value, bool force = false) {
     this->encode_field_raw(field_id, 2);
     size_t begin = this->buffer_->size();

esphome/components/api/subscribe_state.cpp

@@ -47,15 +47,8 @@ bool InitialStateIterator::on_select(select::Select *select) {
   return this->client_->send_select_state(select, select->state);
 }
 #endif
-#ifdef USE_LOCK
-bool InitialStateIterator::on_lock(lock::Lock *a_lock) { return this->client_->send_lock_state(a_lock, a_lock->state); }
-#endif
-#ifdef USE_MEDIA_PLAYER
-bool InitialStateIterator::on_media_player(media_player::MediaPlayer *media_player) {
-  return this->client_->send_media_player_state(media_player);
-}
-#endif
-InitialStateIterator::InitialStateIterator(APIConnection *client) : client_(client) {}
+InitialStateIterator::InitialStateIterator(APIServer *server, APIConnection *client)
+    : ComponentIterator(server), client_(client) {}
 
 }  // namespace api
 }  // namespace esphome

esphome/components/api/subscribe_state.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #include "esphome/core/component.h"
-#include "esphome/core/component_iterator.h"
 #include "esphome/core/controller.h"
 #include "esphome/core/defines.h"
+#include "util.h"
 
 namespace esphome {
 namespace api {
@@ -12,7 +12,7 @@ class APIConnection;
 
 class InitialStateIterator : public ComponentIterator {
  public:
-  InitialStateIterator(APIConnection *client);
+  InitialStateIterator(APIServer *server, APIConnection *client);
 #ifdef USE_BINARY_SENSOR
   bool on_binary_sensor(binary_sensor::BinarySensor *binary_sensor) override;
 #endif
@@ -45,12 +45,6 @@ class InitialStateIterator : public ComponentIterator {
 #endif
 #ifdef USE_SELECT
   bool on_select(select::Select *select) override;
-#endif
-#ifdef USE_LOCK
-  bool on_lock(lock::Lock *a_lock) override;
-#endif
-#ifdef USE_MEDIA_PLAYER
-  bool on_media_player(media_player::MediaPlayer *media_player) override;
 #endif
  protected:
   APIConnection *client_;
@@ -58,3 +52,5 @@ class InitialStateIterator : public ComponentIterator {
 
 }  // namespace api
 }  // namespace esphome
+
+#include "api_server.h"

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"

esphome/components/api/util.cpp

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

esphome/components/api/util.h

@@ -1,24 +1,23 @@
 #pragma once
 
+#include "esphome/core/helpers.h"
 #include "esphome/core/component.h"
 #include "esphome/core/controller.h"
-#include "esphome/core/helpers.h"
-
 #ifdef USE_ESP32_CAMERA
 #include "esphome/components/esp32_camera/esp32_camera.h"
 #endif
 
 namespace esphome {
-
-#ifdef USE_API
 namespace api {
+
+class APIServer;
 class UserServiceDescriptor;
-}  // namespace api
-#endif
 
 class ComponentIterator {
  public:
-  void begin(bool include_internal = false);
+  ComponentIterator(APIServer *server);
+
+  void begin();
   void advance();
   virtual bool on_begin();
 #ifdef USE_BINARY_SENSOR
@@ -45,9 +44,7 @@ class ComponentIterator {
 #ifdef USE_TEXT_SENSOR
   virtual bool on_text_sensor(text_sensor::TextSensor *text_sensor) = 0;
 #endif
-#ifdef USE_API
-  virtual bool on_service(api::UserServiceDescriptor *service);
-#endif
+  virtual bool on_service(UserServiceDescriptor *service);
 #ifdef USE_ESP32_CAMERA
   virtual bool on_camera(esp32_camera::ESP32Camera *camera);
 #endif
@@ -59,12 +56,6 @@ class ComponentIterator {
 #endif
 #ifdef USE_SELECT
   virtual bool on_select(select::Select *select) = 0;
-#endif
-#ifdef USE_LOCK
-  virtual bool on_lock(lock::Lock *a_lock) = 0;
-#endif
-#ifdef USE_MEDIA_PLAYER
-  virtual bool on_media_player(media_player::MediaPlayer *media_player);
 #endif
   virtual bool on_end();
 
@@ -96,9 +87,7 @@ class ComponentIterator {
 #ifdef USE_TEXT_SENSOR
     TEXT_SENSOR,
 #endif
-#ifdef USE_API
     SERVICE,
-#endif
 #ifdef USE_ESP32_CAMERA
     CAMERA,
 #endif
@@ -110,17 +99,13 @@ class ComponentIterator {
 #endif
 #ifdef USE_SELECT
     SELECT,
-#endif
-#ifdef USE_LOCK
-    LOCK,
-#endif
-#ifdef USE_MEDIA_PLAYER
-    MEDIA_PLAYER,
 #endif
     MAX,
   } state_{IteratorState::NONE};
   size_t at_{0};
-  bool include_internal_{false};
+
+  APIServer *server_;
 };
 
+}  // namespace api
 }  // namespace esphome

esphome/components/as3935/as3935.h

@@ -92,9 +92,9 @@ class AS3935Component : public Component {
 
   virtual void write_register(uint8_t reg, uint8_t mask, uint8_t bits, uint8_t start_position) = 0;
 
-  sensor::Sensor *distance_sensor_{nullptr};
-  sensor::Sensor *energy_sensor_{nullptr};
-  binary_sensor::BinarySensor *thunder_alert_binary_sensor_{nullptr};
+  sensor::Sensor *distance_sensor_;
+  sensor::Sensor *energy_sensor_;
+  binary_sensor::BinarySensor *thunder_alert_binary_sensor_;
   GPIOPin *irq_pin_;
 
   bool indoor_;

esphome/components/as3935/binary_sensor.py

@@ -5,7 +5,7 @@ from . import AS3935, CONF_AS3935_ID
 
 DEPENDENCIES = ["as3935"]
 
-CONFIG_SCHEMA = binary_sensor.binary_sensor_schema().extend(
+CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
     {
         cv.GenerateID(CONF_AS3935_ID): cv.use_id(AS3935),
     }

esphome/components/as3935/sensor.py

@@ -4,6 +4,7 @@ from esphome.components import sensor
 from esphome.const import (
     CONF_DISTANCE,
     CONF_LIGHTNING_ENERGY,
+    STATE_CLASS_NONE,
     UNIT_KILOMETER,
     ICON_SIGNAL_DISTANCE_VARIANT,
     ICON_FLASH,
@@ -19,10 +20,12 @@ CONFIG_SCHEMA = cv.Schema(
             unit_of_measurement=UNIT_KILOMETER,
             icon=ICON_SIGNAL_DISTANCE_VARIANT,
             accuracy_decimals=1,
+            state_class=STATE_CLASS_NONE,
         ),
         cv.Optional(CONF_LIGHTNING_ENERGY): sensor.sensor_schema(
             icon=ICON_FLASH,
             accuracy_decimals=1,
+            state_class=STATE_CLASS_NONE,
         ),
     }
 ).extend(cv.COMPONENT_SCHEMA)

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"]),
 )
 
 

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 {

esphome/components/b_parasite/b_parasite.cpp

@@ -38,7 +38,7 @@ bool BParasite::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
   const auto &data = service_data.data;
 
   const uint8_t protocol_version = data[0] >> 4;
-  if (protocol_version != 1 && protocol_version != 2) {
+  if (protocol_version != 1) {
     ESP_LOGE(TAG, "Unsupported protocol version: %u", protocol_version);
     return false;
   }
@@ -57,15 +57,9 @@ bool BParasite::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
   uint16_t battery_millivolt = data[2] << 8 | data[3];
   float battery_voltage = battery_millivolt / 1000.0f;
 
-  // Temperature in 1000 * Celsius (protocol v1) or 100 * Celsius (protocol v2).
-  float temp_celsius;
-  if (protocol_version == 1) {
-    uint16_t temp_millicelsius = data[4] << 8 | data[5];
-    temp_celsius = temp_millicelsius / 1000.0f;
-  } else {
-    int16_t temp_centicelsius = data[4] << 8 | data[5];
-    temp_celsius = temp_centicelsius / 100.0f;
-  }
+  // Temperature in 1000 * Celsius.
+  uint16_t temp_millicelcius = data[4] << 8 | data[5];
+  float temp_celcius = temp_millicelcius / 1000.0f;
 
   // Relative air humidity in the range [0, 2^16).
   uint16_t humidity = data[6] << 8 | data[7];
@@ -82,7 +76,7 @@ bool BParasite::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
     battery_voltage_->publish_state(battery_voltage);
   }
   if (temperature_ != nullptr) {
-    temperature_->publish_state(temp_celsius);
+    temperature_->publish_state(temp_celcius);
   }
   if (humidity_ != nullptr) {
     humidity_->publish_state(humidity_percent);

esphome/components/bedjet/__init__.py

@@ -1,52 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import ble_client, time
-from esphome.const import (
-    CONF_ID,
-    CONF_RECEIVE_TIMEOUT,
-    CONF_TIME_ID,
-)
-
-CODEOWNERS = ["@jhansche"]
-DEPENDENCIES = ["ble_client"]
-MULTI_CONF = True
-CONF_BEDJET_ID = "bedjet_id"
-
-bedjet_ns = cg.esphome_ns.namespace("bedjet")
-BedJetHub = bedjet_ns.class_("BedJetHub", ble_client.BLEClientNode, cg.PollingComponent)
-
-CONFIG_SCHEMA = (
-    cv.COMPONENT_SCHEMA.extend(
-        {
-            cv.GenerateID(): cv.declare_id(BedJetHub),
-            cv.Optional(CONF_TIME_ID): cv.use_id(time.RealTimeClock),
-            cv.Optional(
-                CONF_RECEIVE_TIMEOUT, default="0s"
-            ): cv.positive_time_period_milliseconds,
-        }
-    )
-    .extend(ble_client.BLE_CLIENT_SCHEMA)
-    .extend(cv.polling_component_schema("15s"))
-)
-
-BEDJET_CLIENT_SCHEMA = cv.Schema(
-    {
-        cv.Required(CONF_BEDJET_ID): cv.use_id(BedJetHub),
-    }
-)
-
-
-async def register_bedjet_child(var, config):
-    parent = await cg.get_variable(config[CONF_BEDJET_ID])
-    cg.add(parent.register_child(var))
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await ble_client.register_ble_node(var, config)
-    if CONF_TIME_ID in config:
-        time_ = await cg.get_variable(config[CONF_TIME_ID])
-        cg.add(var.set_time_id(time_))
-    if CONF_RECEIVE_TIMEOUT in config:
-        cg.add(var.set_status_timeout(config[CONF_RECEIVE_TIMEOUT]))

esphome/components/bedjet/bedjet_child.h

@@ -1,23 +0,0 @@
-#pragma once
-
-#include "bedjet_codec.h"
-#include "esphome/core/helpers.h"
-
-namespace esphome {
-namespace bedjet {
-
-// Forward declare BedJetHub
-class BedJetHub;
-
-class BedJetClient : public Parented<BedJetHub> {
- public:
-  virtual void on_status(const BedjetStatusPacket *data) = 0;
-  virtual void on_bedjet_state(bool is_ready) = 0;
-
- protected:
-  friend BedJetHub;
-  virtual std::string describe() = 0;
-};
-
-}  // namespace bedjet
-}  // namespace esphome

esphome/components/bedjet/bedjet_codec.cpp

@@ -1,161 +0,0 @@
-#include "bedjet_codec.h"
-#include <cstdio>
-#include <cstring>
-
-namespace esphome {
-namespace bedjet {
-
-/// Converts a BedJet temp step into degrees Fahrenheit.
-float bedjet_temp_to_f(const uint8_t temp) {
-  // BedJet temp is "C*2"; to get F, multiply by 0.9 (half 1.8) and add 32.
-  return 0.9f * temp + 32.0f;
-}
-
-/** Cleans up the packet before sending. */
-BedjetPacket *BedjetCodec::clean_packet_() {
-  // So far no commands require more than 2 bytes of data.
-  assert(this->packet_.data_length <= 2);
-  for (int i = this->packet_.data_length; i < 2; i++) {
-    this->packet_.data[i] = '\0';
-  }
-  ESP_LOGV(TAG, "Created packet: %02X, %02X %02X", this->packet_.command, this->packet_.data[0], this->packet_.data[1]);
-  return &this->packet_;
-}
-
-/** Returns a BedjetPacket that will initiate a BedjetButton press. */
-BedjetPacket *BedjetCodec::get_button_request(BedjetButton button) {
-  this->packet_.command = CMD_BUTTON;
-  this->packet_.data_length = 1;
-  this->packet_.data[0] = button;
-  return this->clean_packet_();
-}
-
-/** Returns a BedjetPacket that will set the device's target `temperature`. */
-BedjetPacket *BedjetCodec::get_set_target_temp_request(float temperature) {
-  this->packet_.command = CMD_SET_TEMP;
-  this->packet_.data_length = 1;
-  this->packet_.data[0] = temperature * 2;
-  return this->clean_packet_();
-}
-
-/** Returns a BedjetPacket that will set the device's target fan speed. */
-BedjetPacket *BedjetCodec::get_set_fan_speed_request(const uint8_t fan_step) {
-  this->packet_.command = CMD_SET_FAN;
-  this->packet_.data_length = 1;
-  this->packet_.data[0] = fan_step;
-  return this->clean_packet_();
-}
-
-/** Returns a BedjetPacket that will set the device's current time. */
-BedjetPacket *BedjetCodec::get_set_time_request(const uint8_t hour, const uint8_t minute) {
-  this->packet_.command = CMD_SET_CLOCK;
-  this->packet_.data_length = 2;
-  this->packet_.data[0] = hour;
-  this->packet_.data[1] = minute;
-  return this->clean_packet_();
-}
-
-/** Returns a BedjetPacket that will set the device's remaining runtime. */
-BedjetPacket *BedjetCodec::get_set_runtime_remaining_request(const uint8_t hour, const uint8_t minute) {
-  this->packet_.command = CMD_SET_RUNTIME;
-  this->packet_.data_length = 2;
-  this->packet_.data[0] = hour;
-  this->packet_.data[1] = minute;
-  return this->clean_packet_();
-}
-
-/** Decodes the extra bytes that were received after being notified with a partial packet. */
-void BedjetCodec::decode_extra(const uint8_t *data, uint16_t length) {
-  ESP_LOGVV(TAG, "Received extra: %d bytes: %d %d %d %d", length, data[1], data[2], data[3], data[4]);
-  uint8_t offset = this->last_buffer_size_;
-  if (offset > 0 && length + offset <= sizeof(BedjetStatusPacket)) {
-    memcpy(((uint8_t *) (&this->buf_)) + offset, data, length);
-    ESP_LOGVV(TAG,
-              "Extra bytes: skip1=0x%08x, skip2=0x%04x, skip3=0x%02x; update phase=0x%02x, "
-              "flags=BedjetFlags <conn=%c, leds=%c, units=%c, mute=%c; packed=%02x>",
-              this->buf_.unused_1, this->buf_.unused_2, this->buf_.unused_3, this->buf_.update_phase,
-              this->buf_.flags.conn_test_passed ? '1' : '0', this->buf_.flags.leds_enabled ? '1' : '0',
-              this->buf_.flags.units_setup ? '1' : '0', this->buf_.flags.beeps_muted ? '1' : '0',
-              this->buf_.flags_packed);
-  } else {
-    ESP_LOGI(TAG, "Could not determine where to append to, last offset=%d, max size=%u, new size would be %d", offset,
-             sizeof(BedjetStatusPacket), length + offset);
-  }
-}
-
-/** Decodes the incoming status packet received on the BEDJET_STATUS_UUID.
- *
- * @return `true` if the packet was decoded and represents a "partial" packet; `false` otherwise.
- */
-bool BedjetCodec::decode_notify(const uint8_t *data, uint16_t length) {
-  ESP_LOGV(TAG, "Received: %d bytes: %d %d %d %d", length, data[1], data[2], data[3], data[4]);
-
-  if (data[1] == PACKET_FORMAT_V3_HOME && data[3] == PACKET_TYPE_STATUS) {
-    // Clear old buffer
-    memset(&this->buf_, 0, sizeof(BedjetStatusPacket));
-    // Copy new data into buffer
-    memcpy(&this->buf_, data, length);
-    this->last_buffer_size_ = length;
-
-    // TODO: validate the packet checksum?
-    if (this->buf_.mode < 7 && this->buf_.target_temp_step >= 38 && this->buf_.target_temp_step <= 86 &&
-        this->buf_.actual_temp_step > 1 && this->buf_.actual_temp_step <= 100 && this->buf_.ambient_temp_step > 1 &&
-        this->buf_.ambient_temp_step <= 100) {
-      // and save it for the update() loop
-      this->status_packet_ = &this->buf_;
-      return this->buf_.is_partial;
-    } else {
-      this->status_packet_ = nullptr;
-      // TODO: log a warning if we detect that we connected to a non-V3 device.
-      ESP_LOGW(TAG, "Received potentially invalid packet (len %d):", length);
-    }
-  } else if (data[1] == PACKET_FORMAT_DEBUG || data[3] == PACKET_TYPE_DEBUG) {
-    // We don't actually know the packet format for this. Dump packets to log, in case a pattern presents itself.
-    ESP_LOGVV(TAG,
-              "received DEBUG packet: set1=%01fF, set2=%01fF, air=%01fF;  [7]=%d, [8]=%d, [9]=%d, [10]=%d, [11]=%d, "
-              "[12]=%d, [-1]=%d",
-              bedjet_temp_to_f(data[4]), bedjet_temp_to_f(data[5]), bedjet_temp_to_f(data[6]), data[7], data[8],
-              data[9], data[10], data[11], data[12], data[length - 1]);
-
-    if (this->has_status()) {
-      this->status_packet_->ambient_temp_step = data[6];
-    }
-  } else {
-    // TODO: log a warning if we detect that we connected to a non-V3 device.
-  }
-
-  return false;
-}
-
-/** @return `true` if the new packet is meaningfully different from the last seen packet. */
-bool BedjetCodec::compare(const uint8_t *data, uint16_t length) {
-  if (data == nullptr) {
-    return false;
-  }
-
-  if (length < 17) {
-    // New packet looks small, skip it.
-    return false;
-  }
-
-  if (this->buf_.packet_format != PACKET_FORMAT_V3_HOME ||
-      this->buf_.packet_type != PACKET_TYPE_STATUS) {  // No last seen packet, so take the new one.
-    return true;
-  }
-
-  if (data[1] != PACKET_FORMAT_V3_HOME || data[3] != PACKET_TYPE_STATUS) {  // New packet is not a v3 status, skip it.
-    return false;
-  }
-
-  // Now coerce it to a status packet and compare some key fields
-  const BedjetStatusPacket *test = reinterpret_cast<const BedjetStatusPacket *>(data);
-  // These are fields that will only change due to explicit action.
-  // That is why we do not check ambient or actual temp here, because those are environmental.
-  bool explicit_fields_changed = this->buf_.mode != test->mode || this->buf_.fan_step != test->fan_step ||
-                                 this->buf_.target_temp_step != test->target_temp_step;
-
-  return explicit_fields_changed;
-}
-
-}  // namespace bedjet
-}  // namespace esphome

esphome/components/bedjet/bedjet_codec.h

@@ -1,191 +0,0 @@
-#pragma once
-
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-#include "bedjet_const.h"
-
-namespace esphome {
-namespace bedjet {
-
-struct BedjetPacket {
-  uint8_t data_length;
-  BedjetCommand command;
-  uint8_t data[2];
-};
-
-enum BedjetPacketFormat : uint8_t {
-  PACKET_FORMAT_DEBUG = 0x05,    //  5
-  PACKET_FORMAT_V3_HOME = 0x56,  // 86
-};
-
-enum BedjetPacketType : uint8_t {
-  PACKET_TYPE_STATUS = 0x1,
-  PACKET_TYPE_DEBUG = 0x2,
-};
-
-enum BedjetNotification : uint8_t {
-  NOTIFY_NONE = 0,                    ///< No notification pending
-  NOTIFY_FILTER = 1,                  ///< Clean Filter / Please check BedJet air filter and clean if necessary.
-  NOTIFY_UPDATE = 2,                  ///< Firmware Update / A newer version of firmware is available.
-  NOTIFY_UPDATE_FAIL = 3,             ///< Firmware Update / Unable to connect to the firmware update server.
-  NOTIFY_BIO_FAIL_CLOCK_NOT_SET = 4,  ///< The specified sequence cannot be run because the clock is not set
-  NOTIFY_BIO_FAIL_TOO_LONG = 5,  ///< The specified sequence cannot be run because it contains steps that would be too
-                                 ///< long running from the current time.
-  // Note: after handling a notification, send MAGIC_NOTIFY_ACK
-};
-
-/** The format of a BedJet V3 status packet. */
-struct BedjetStatusPacket {
-  // [0]
-  bool is_partial : 8;  ///< `1` indicates that this is a partial packet, and more data can be read directly from the
-                        ///< characteristic.
-  BedjetPacketFormat packet_format : 8;  ///< BedjetPacketFormat::PACKET_FORMAT_V3_HOME for BedJet V3 status packet
-                                         ///< format. BedjetPacketFormat::PACKET_FORMAT_DEBUG for debugging packets.
-  uint8_t expecting_length : 8;      ///< The expected total length of the status packet after merging the extra packet.
-  BedjetPacketType packet_type : 8;  ///< Typically BedjetPacketType::PACKET_TYPE_STATUS for BedJet V3 status packet.
-
-  // [4]
-  uint8_t time_remaining_hrs : 8;   ///< Hours remaining in program runtime
-  uint8_t time_remaining_mins : 8;  ///< Minutes remaining in program runtime
-  uint8_t time_remaining_secs : 8;  ///< Seconds remaining in program runtime
-
-  // [7]
-  uint8_t actual_temp_step : 8;  ///< Actual temp of the air blown by the BedJet fan; value represents `2 *
-                                 ///< degrees_celsius`. See #bedjet_temp_to_c and #bedjet_temp_to_f
-  uint8_t target_temp_step : 8;  ///< Target temp that the BedJet will try to heat to. See #actual_temp_step.
-
-  // [9]
-  BedjetMode mode : 8;  ///< BedJet operating mode.
-
-  // [10]
-  uint8_t fan_step : 8;  ///< BedJet fan speed; value is in the 0-19 range, representing 5% increments (5%-100%): `5 + 5
-                         ///< * fan_step`
-  uint8_t max_hrs : 8;   ///< Max hours of mode runtime
-  uint8_t max_mins : 8;  ///< Max minutes of mode runtime
-  uint8_t min_temp_step : 8;  ///< Min temp allowed in mode. See #actual_temp_step.
-  uint8_t max_temp_step : 8;  ///< Max temp allowed in mode. See #actual_temp_step.
-
-  // [15-16]
-  uint16_t turbo_time : 16;  ///< Time remaining in BedjetMode::MODE_TURBO.
-
-  // [17]
-  uint8_t ambient_temp_step : 8;  ///< Current ambient air temp. This is the coldest air the BedJet can blow. See
-                                  ///< #actual_temp_step.
-  uint8_t shutdown_reason : 8;    ///< The reason for the last device shutdown.
-
-  // [19-25]; the initial partial packet cuts off here after [19]
-
-  uint8_t unused_1 : 8;  // Unknown [19] = 0x01
-  uint8_t unused_2 : 8;  // Unknown [20] = 0x81
-  uint8_t unused_3 : 8;  // Unknown [21] = 0x01
-
-  // [22]: 0x2=is_dual_zone, ...?
-  struct {
-    int unused_1 : 1;       // 0x80
-    int unused_2 : 1;       // 0x40
-    int unused_3 : 1;       // 0x20
-    int unused_4 : 1;       // 0x10
-    int unused_5 : 1;       // 0x8
-    int unused_6 : 1;       // 0x4
-    bool is_dual_zone : 1;  /// Is part of a Dual Zone configuration
-    int unused_7 : 1;       // 0x1
-  } dual_zone_flags;
-
-  uint8_t unused_4 : 8;  // Unknown 23-24 = 0x1310
-  uint8_t unused_5 : 8;  // Unknown 23-24 = 0x1310
-  uint8_t unused_6 : 8;  // Unknown 25 = 0x00
-
-  // [26]
-  //   0x18(24) = "Connection test has completed OK"
-  //   0x1a(26) = "Firmware update is not needed"
-  uint8_t update_phase : 8;  ///< The current status/phase of a firmware update.
-
-  // [27]
-  union {
-    uint8_t flags_packed;
-    struct {
-      /* uint8_t */
-      int unused_1 : 1;           // 0x80
-      int unused_2 : 1;           // 0x40
-      bool conn_test_passed : 1;  ///< (0x20) Bit is set `1` if the last connection test passed.
-      bool leds_enabled : 1;      ///< (0x10) Bit is set `1` if the LEDs on the device are enabled.
-      int unused_3 : 1;           // 0x08
-      bool units_setup : 1;       ///< (0x04) Bit is set `1` if the device's units have been configured.
-      int unused_4 : 1;           // 0x02
-      bool beeps_muted : 1;       ///< (0x01) Bit is set `1` if the device's sound output is muted.
-    } __attribute__((packed)) flags;
-  };
-
-  // [28] = (biorhythm?) sequence step
-  uint8_t bio_sequence_step : 8;  /// Biorhythm sequence step number
-  // [29] = notify_code:
-  BedjetNotification notify_code : 8;  /// See BedjetNotification
-
-  uint16_t unused_7 : 16;  // Unknown
-
-} __attribute__((packed));
-
-/** This class is responsible for encoding command packets and decoding status packets.
- *
- * Status Packets
- * ==============
- * The BedJet protocol depends on registering for notifications on the esphome::BedJet::BEDJET_SERVICE_UUID
- * characteristic. If the BedJet is on, it will send rapid updates as notifications. If it is off,
- * it generally will not notify of any status.
- *
- * As the BedJet V3's BedjetStatusPacket exceeds the buffer size allowed for BLE notification packets,
- * the notification packet will contain `BedjetStatusPacket::is_partial == 1`. When that happens, an additional
- * read of the esphome::BedJet::BEDJET_SERVICE_UUID characteristic will contain the second portion of the
- * full status packet.
- *
- * Command Packets
- * ===============
- * This class supports encoding a number of BedjetPacket commands:
- * - Button press
- *   This simulates a press of one of the BedjetButton values.
- *   - BedjetPacket#command = BedjetCommand::CMD_BUTTON
- *   - BedjetPacket#data [0] contains the BedjetButton value
- * - Set target temp
- *   This sets the BedJet's target temp to a concrete temperature value.
- *   - BedjetPacket#command = BedjetCommand::CMD_SET_TEMP
- *   - BedjetPacket#data [0] contains the BedJet temp value; see BedjetStatusPacket#actual_temp_step
- * - Set fan speed
- *   This sets the BedJet fan speed.
- *   - BedjetPacket#command = BedjetCommand::CMD_SET_FAN
- *   - BedjetPacket#data [0] contains the BedJet fan step in the range 0-19.
- * - Set current time
- *   The BedJet needs to have its clock set properly in order to run the biorhythm programs, which might
- *   contain time-of-day based step rules.
- *   - BedjetPacket#command = BedjetCommand::CMD_SET_CLOCK
- *   - BedjetPacket#data [0] is hours, [1] is minutes
- */
-class BedjetCodec {
- public:
-  BedjetPacket *get_button_request(BedjetButton button);
-  BedjetPacket *get_set_target_temp_request(float temperature);
-  BedjetPacket *get_set_fan_speed_request(uint8_t fan_step);
-  BedjetPacket *get_set_time_request(uint8_t hour, uint8_t minute);
-  BedjetPacket *get_set_runtime_remaining_request(uint8_t hour, uint8_t minute);
-
-  bool decode_notify(const uint8_t *data, uint16_t length);
-  void decode_extra(const uint8_t *data, uint16_t length);
-  bool compare(const uint8_t *data, uint16_t length);
-
-  inline bool has_status() { return this->status_packet_ != nullptr; }
-  const BedjetStatusPacket *get_status_packet() const { return this->status_packet_; }
-  void clear_status() { this->status_packet_ = nullptr; }
-
- protected:
-  BedjetPacket *clean_packet_();
-
-  uint8_t last_buffer_size_ = 0;
-
-  BedjetPacket packet_;
-
-  BedjetStatusPacket *status_packet_;
-  BedjetStatusPacket buf_;
-};
-
-}  // namespace bedjet
-}  // namespace esphome

esphome/components/bedjet/bedjet_const.h

@@ -1,99 +0,0 @@
-#pragma once
-
-#include <set>
-
-namespace esphome {
-namespace bedjet {
-
-static const char *const TAG = "bedjet";
-
-/// Converts a BedJet fan step to a speed percentage, in the range of 5% to 100%.
-inline static uint8_t bedjet_fan_step_to_speed(const uint8_t fan) {
-  //  0 =  5%
-  // 19 = 100%
-  return 5 * fan + 5;
-}
-inline static uint8_t bedjet_fan_speed_to_index(const uint8_t speed) { return speed / 5 - 1; }
-
-enum BedjetMode : uint8_t {
-  /// BedJet is Off
-  MODE_STANDBY = 0,
-  /// BedJet is in Heat mode (limited to 4 hours)
-  MODE_HEAT = 1,
-  /// BedJet is in Turbo mode (high heat, limited time)
-  MODE_TURBO = 2,
-  /// BedJet is in Extended Heat mode (limited to 10 hours)
-  MODE_EXTHT = 3,
-  /// BedJet is in Cool mode (actually "Fan only" mode)
-  MODE_COOL = 4,
-  /// BedJet is in Dry mode (high speed, no heat)
-  MODE_DRY = 5,
-  /// BedJet is in "wait" mode, a step during a biorhythm program
-  MODE_WAIT = 6,
-};
-
-/** Optional heating strategies to use for climate::CLIMATE_MODE_HEAT. */
-enum BedjetHeatMode {
-  /// HVACMode.HEAT is handled using BTN_HEAT (default)
-  HEAT_MODE_HEAT,
-  /// HVACMode.HEAT is handled using BTN_EXTHT
-  HEAT_MODE_EXTENDED,
-};
-
-enum BedjetButton : uint8_t {
-  /// Turn BedJet off
-  BTN_OFF = 0x1,
-  /// Enter Cool mode (fan only)
-  BTN_COOL = 0x2,
-  /// Enter Heat mode (limited to 4 hours)
-  BTN_HEAT = 0x3,
-  /// Enter Turbo mode (high heat, limited to 10 minutes)
-  BTN_TURBO = 0x4,
-  /// Enter Dry mode (high speed, no heat)
-  BTN_DRY = 0x5,
-  /// Enter Extended Heat mode (limited to 10 hours)
-  BTN_EXTHT = 0x6,
-
-  /// Start the M1 biorhythm/preset program
-  BTN_M1 = 0x20,
-  /// Start the M2 biorhythm/preset program
-  BTN_M2 = 0x21,
-  /// Start the M3 biorhythm/preset program
-  BTN_M3 = 0x22,
-
-  /* These are "MAGIC" buttons */
-
-  /// Turn debug mode on/off
-  MAGIC_DEBUG_ON = 0x40,
-  MAGIC_DEBUG_OFF = 0x41,
-  /// Perform a connection test.
-  MAGIC_CONNTEST = 0x42,
-  /// Request a firmware update. This will also restart the Bedjet.
-  MAGIC_UPDATE = 0x43,
-  /// Acknowledge notification handled. See BedjetNotify
-  MAGIC_NOTIFY_ACK = 0x52,
-};
-
-enum BedjetCommand : uint8_t {
-  CMD_BUTTON = 0x1,
-  CMD_SET_RUNTIME = 0x2,
-  CMD_SET_TEMP = 0x3,
-  CMD_STATUS = 0x6,
-  CMD_SET_FAN = 0x7,
-  CMD_SET_CLOCK = 0x8,
-};
-
-#define BEDJET_FAN_STEP_NAMES_ \
-  { \
-    "5%", "10%", "15%", "20%", "25%", "30%", "35%", "40%", "45%", "50%", "55%", "60%", "65%", "70%", "75%", "80%", \
-        "85%", "90%", "95%", "100%" \
-  }
-
-static const uint8_t BEDJET_FAN_SPEED_COUNT = 20;
-
-static const char *const BEDJET_FAN_STEP_NAMES[BEDJET_FAN_SPEED_COUNT] = BEDJET_FAN_STEP_NAMES_;
-static const std::string BEDJET_FAN_STEP_NAME_STRINGS[BEDJET_FAN_SPEED_COUNT] = BEDJET_FAN_STEP_NAMES_;
-static const std::set<std::string> BEDJET_FAN_STEP_NAMES_SET BEDJET_FAN_STEP_NAMES_;
-
-}  // namespace bedjet
-}  // namespace esphome

esphome/components/bedjet/bedjet_hub.cpp

@@ -1,543 +0,0 @@
-#include "bedjet_hub.h"
-#include "bedjet_child.h"
-#include "bedjet_const.h"
-
-namespace esphome {
-namespace bedjet {
-
-static const LogString *bedjet_button_to_string(BedjetButton button) {
-  switch (button) {
-    case BTN_OFF:
-      return LOG_STR("OFF");
-    case BTN_COOL:
-      return LOG_STR("COOL");
-    case BTN_HEAT:
-      return LOG_STR("HEAT");
-    case BTN_EXTHT:
-      return LOG_STR("EXT HT");
-    case BTN_TURBO:
-      return LOG_STR("TURBO");
-    case BTN_DRY:
-      return LOG_STR("DRY");
-    case BTN_M1:
-      return LOG_STR("M1");
-    case BTN_M2:
-      return LOG_STR("M2");
-    case BTN_M3:
-      return LOG_STR("M3");
-    default:
-      return LOG_STR("unknown");
-  }
-}
-
-/* Public */
-
-void BedJetHub::upgrade_firmware() {
-  auto *pkt = this->codec_->get_button_request(MAGIC_UPDATE);
-  auto status = this->write_bedjet_packet_(pkt);
-
-  if (status) {
-    ESP_LOGW(TAG, "[%s] MAGIC_UPDATE button failed, status=%d", this->get_name().c_str(), status);
-  }
-}
-
-bool BedJetHub::button_heat() { return this->send_button(BTN_HEAT); }
-bool BedJetHub::button_ext_heat() { return this->send_button(BTN_EXTHT); }
-bool BedJetHub::button_turbo() { return this->send_button(BTN_TURBO); }
-bool BedJetHub::button_cool() { return this->send_button(BTN_COOL); }
-bool BedJetHub::button_dry() { return this->send_button(BTN_DRY); }
-bool BedJetHub::button_off() { return this->send_button(BTN_OFF); }
-bool BedJetHub::button_memory1() { return this->send_button(BTN_M1); }
-bool BedJetHub::button_memory2() { return this->send_button(BTN_M2); }
-bool BedJetHub::button_memory3() { return this->send_button(BTN_M3); }
-
-bool BedJetHub::set_fan_index(uint8_t fan_speed_index) {
-  if (fan_speed_index > 19) {
-    ESP_LOGW(TAG, "Invalid fan speed index %d, expecting 0-19.", fan_speed_index);
-    return false;
-  }
-
-  auto *pkt = this->codec_->get_set_fan_speed_request(fan_speed_index);
-  auto status = this->write_bedjet_packet_(pkt);
-
-  if (status) {
-    ESP_LOGW(TAG, "[%s] writing fan speed failed, status=%d", this->get_name().c_str(), status);
-  }
-  return status == 0;
-}
-
-uint8_t BedJetHub::get_fan_index() {
-  auto *status = this->codec_->get_status_packet();
-  if (status != nullptr) {
-    return status->fan_step;
-  }
-  return 0;
-}
-
-bool BedJetHub::set_target_temp(float temp_c) {
-  auto *pkt = this->codec_->get_set_target_temp_request(temp_c);
-  auto status = this->write_bedjet_packet_(pkt);
-
-  if (status) {
-    ESP_LOGW(TAG, "[%s] writing target temp failed, status=%d", this->get_name().c_str(), status);
-  }
-  return status == 0;
-}
-
-bool BedJetHub::set_time_remaining(uint8_t hours, uint8_t mins) {
-  // FIXME: this may fail depending on current mode or other restrictions enforced by the unit.
-  auto *pkt = this->codec_->get_set_runtime_remaining_request(hours, mins);
-  auto status = this->write_bedjet_packet_(pkt);
-
-  if (status) {
-    ESP_LOGW(TAG, "[%s] writing remaining runtime failed, status=%d", this->get_name().c_str(), status);
-  }
-  return status == 0;
-}
-
-bool BedJetHub::send_button(BedjetButton button) {
-  auto *pkt = this->codec_->get_button_request(button);
-  auto status = this->write_bedjet_packet_(pkt);
-
-  if (status) {
-    ESP_LOGW(TAG, "[%s] writing button %s failed, status=%d", this->get_name().c_str(),
-             LOG_STR_ARG(bedjet_button_to_string(button)), status);
-  } else {
-    ESP_LOGD(TAG, "[%s] writing button %s success", this->get_name().c_str(),
-             LOG_STR_ARG(bedjet_button_to_string(button)));
-  }
-  return status == 0;
-}
-
-uint16_t BedJetHub::get_time_remaining() {
-  auto *status = this->codec_->get_status_packet();
-  if (status != nullptr) {
-    return status->time_remaining_secs + status->time_remaining_mins * 60 + status->time_remaining_hrs * 3600;
-  }
-  return 0;
-}
-
-/* Bluetooth/GATT */
-
-uint8_t BedJetHub::write_bedjet_packet_(BedjetPacket *pkt) {
-  if (!this->is_connected()) {
-    if (!this->parent_->enabled) {
-      ESP_LOGI(TAG, "[%s] Cannot write packet: Not connected, enabled=false", this->get_name().c_str());
-    } else {
-      ESP_LOGW(TAG, "[%s] Cannot write packet: Not connected", this->get_name().c_str());
-    }
-    return -1;
-  }
-  auto status = esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(),
-                                         this->char_handle_cmd_, pkt->data_length + 1, (uint8_t *) &pkt->command,
-                                         ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
-  return status;
-}
-
-/** Configures the local ESP BLE client to register (`true`) or unregister (`false`) for status notifications. */
-uint8_t BedJetHub::set_notify_(const bool enable) {
-  uint8_t status;
-  if (enable) {
-    status = esp_ble_gattc_register_for_notify(this->parent_->get_gattc_if(), this->parent_->get_remote_bda(),
-                                               this->char_handle_status_);
-    if (status) {
-      ESP_LOGW(TAG, "[%s] esp_ble_gattc_register_for_notify failed, status=%d", this->get_name().c_str(), status);
-    }
-  } else {
-    status = esp_ble_gattc_unregister_for_notify(this->parent_->get_gattc_if(), this->parent_->get_remote_bda(),
-                                                 this->char_handle_status_);
-    if (status) {
-      ESP_LOGW(TAG, "[%s] esp_ble_gattc_unregister_for_notify failed, status=%d", this->get_name().c_str(), status);
-    }
-  }
-  ESP_LOGV(TAG, "[%s] set_notify: enable=%d; result=%d", this->get_name().c_str(), enable, status);
-  return status;
-}
-
-bool BedJetHub::discover_characteristics_() {
-  bool result = true;
-  esphome::ble_client::BLECharacteristic *chr;
-
-  if (!this->char_handle_cmd_) {
-    chr = this->parent_->get_characteristic(BEDJET_SERVICE_UUID, BEDJET_COMMAND_UUID);
-    if (chr == nullptr) {
-      ESP_LOGW(TAG, "[%s] No control service found at device, not a BedJet..?", this->get_name().c_str());
-      result = false;
-    } else {
-      this->char_handle_cmd_ = chr->handle;
-    }
-  }
-
-  if (!this->char_handle_status_) {
-    chr = this->parent_->get_characteristic(BEDJET_SERVICE_UUID, BEDJET_STATUS_UUID);
-    if (chr == nullptr) {
-      ESP_LOGW(TAG, "[%s] No status service found at device, not a BedJet..?", this->get_name().c_str());
-      result = false;
-    } else {
-      this->char_handle_status_ = chr->handle;
-    }
-  }
-
-  if (!this->config_descr_status_) {
-    // We also need to obtain the config descriptor for this handle.
-    // Otherwise once we set node_state=Established, the parent will flush all handles/descriptors, and we won't be
-    // able to look it up.
-    auto *descr = this->parent_->get_config_descriptor(this->char_handle_status_);
-    if (descr == nullptr) {
-      ESP_LOGW(TAG, "No config descriptor for status handle 0x%x. Will not be able to receive status notifications",
-               this->char_handle_status_);
-      result = false;
-    } else if (descr->uuid.get_uuid().len != ESP_UUID_LEN_16 ||
-               descr->uuid.get_uuid().uuid.uuid16 != ESP_GATT_UUID_CHAR_CLIENT_CONFIG) {
-      ESP_LOGW(TAG, "Config descriptor 0x%x (uuid %s) is not a client config char uuid", this->char_handle_status_,
-               descr->uuid.to_string().c_str());
-      result = false;
-    } else {
-      this->config_descr_status_ = descr->handle;
-    }
-  }
-
-  if (!this->char_handle_name_) {
-    chr = this->parent_->get_characteristic(BEDJET_SERVICE_UUID, BEDJET_NAME_UUID);
-    if (chr == nullptr) {
-      ESP_LOGW(TAG, "[%s] No name service found at device, not a BedJet..?", this->get_name().c_str());
-      result = false;
-    } else {
-      this->char_handle_name_ = chr->handle;
-      auto status = esp_ble_gattc_read_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(),
-                                            this->char_handle_name_, ESP_GATT_AUTH_REQ_NONE);
-      if (status) {
-        ESP_LOGI(TAG, "[%s] Unable to read name characteristic: %d", this->get_name().c_str(), status);
-      }
-    }
-  }
-
-  ESP_LOGI(TAG, "[%s] Discovered service characteristics: ", this->get_name().c_str());
-  ESP_LOGI(TAG, "     - Command char: 0x%x", this->char_handle_cmd_);
-  ESP_LOGI(TAG, "     - Status char: 0x%x", this->char_handle_status_);
-  ESP_LOGI(TAG, "       - config descriptor: 0x%x", this->config_descr_status_);
-  ESP_LOGI(TAG, "     - Name char: 0x%x", this->char_handle_name_);
-
-  return result;
-}
-
-void BedJetHub::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                                    esp_ble_gattc_cb_param_t *param) {
-  switch (event) {
-    case ESP_GATTC_DISCONNECT_EVT: {
-      ESP_LOGV(TAG, "Disconnected: reason=%d", param->disconnect.reason);
-      this->status_set_warning();
-      this->dispatch_state_(false);
-      break;
-    }
-    case ESP_GATTC_SEARCH_CMPL_EVT: {
-      auto result = this->discover_characteristics_();
-
-      if (result) {
-        ESP_LOGD(TAG, "[%s] Services complete: obtained char handles.", this->get_name().c_str());
-        this->node_state = espbt::ClientState::ESTABLISHED;
-        this->set_notify_(true);
-
-#ifdef USE_TIME
-        if (this->time_id_.has_value()) {
-          this->send_local_time();
-        }
-#endif
-
-        this->dispatch_state_(true);
-      } else {
-        ESP_LOGW(TAG, "[%s] Failed discovering service characteristics.", this->get_name().c_str());
-        this->parent()->set_enabled(false);
-        this->status_set_warning();
-        this->dispatch_state_(false);
-      }
-      break;
-    }
-    case ESP_GATTC_WRITE_DESCR_EVT: {
-      if (param->write.status != ESP_GATT_OK) {
-        if (param->write.status == ESP_GATT_INVALID_ATTR_LEN) {
-          // This probably means that our hack for notify_en (8 bit vs 16 bit) didn't work right.
-          // Should we try to fall back to BLEClient's way?
-          ESP_LOGW(TAG, "[%s] Invalid attr length writing descr at handle 0x%04d, status=%d", this->get_name().c_str(),
-                   param->write.handle, param->write.status);
-        } else {
-          ESP_LOGW(TAG, "[%s] Error writing descr at handle 0x%04d, status=%d", this->get_name().c_str(),
-                   param->write.handle, param->write.status);
-        }
-        break;
-      }
-      ESP_LOGD(TAG, "[%s] Write to handle 0x%04x status=%d", this->get_name().c_str(), param->write.handle,
-               param->write.status);
-      break;
-    }
-    case ESP_GATTC_WRITE_CHAR_EVT: {
-      if (param->write.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "Error writing char at handle 0x%04d, status=%d", param->write.handle, param->write.status);
-        break;
-      }
-      if (param->write.handle == this->char_handle_cmd_) {
-        if (this->force_refresh_) {
-          // Command write was successful. Publish the pending state, hoping that notify will kick in.
-          // FIXME: better to wait until we know the status has changed
-          this->dispatch_status_();
-        }
-      }
-      break;
-    }
-    case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->parent_->get_conn_id())
-        break;
-      if (param->read.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "Error reading char at handle %d, status=%d", param->read.handle, param->read.status);
-        break;
-      }
-
-      if (param->read.handle == this->char_handle_status_) {
-        // This is the additional packet that doesn't fit in the notify packet.
-        this->codec_->decode_extra(param->read.value, param->read.value_len);
-        this->status_packet_ready_();
-      } else if (param->read.handle == this->char_handle_name_) {
-        // The data should represent the name.
-        if (param->read.status == ESP_GATT_OK && param->read.value_len > 0) {
-          std::string bedjet_name(reinterpret_cast<char const *>(param->read.value), param->read.value_len);
-          ESP_LOGV(TAG, "[%s] Got BedJet name: '%s'", this->get_name().c_str(), bedjet_name.c_str());
-          this->set_name_(bedjet_name);
-        }
-      }
-      break;
-    }
-    case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
-      // This event means that ESP received the request to enable notifications on the client side. But we also have to
-      // tell the server that we want it to send notifications. Normally BLEClient parent would handle this
-      // automatically, but as soon as we set our status to Established, the parent is going to purge all the
-      // service/char/descriptor handles, and then get_config_descriptor() won't work anymore. There's no way to disable
-      // the BLEClient parent behavior, so our only option is to write the handle anyway, and hope a double-write
-      // doesn't break anything.
-
-      if (param->reg_for_notify.handle != this->char_handle_status_) {
-        ESP_LOGW(TAG, "[%s] Register for notify on unexpected handle 0x%04x, expecting 0x%04x",
-                 this->get_name().c_str(), param->reg_for_notify.handle, this->char_handle_status_);
-        break;
-      }
-
-      this->write_notify_config_descriptor_(true);
-      this->last_notify_ = 0;
-      this->force_refresh_ = true;
-      break;
-    }
-    case ESP_GATTC_UNREG_FOR_NOTIFY_EVT: {
-      // This event is not handled by the parent BLEClient, so we need to do this either way.
-      if (param->unreg_for_notify.handle != this->char_handle_status_) {
-        ESP_LOGW(TAG, "[%s] Unregister for notify on unexpected handle 0x%04x, expecting 0x%04x",
-                 this->get_name().c_str(), param->unreg_for_notify.handle, this->char_handle_status_);
-        break;
-      }
-
-      this->write_notify_config_descriptor_(false);
-      this->last_notify_ = 0;
-      // Now we wait until the next update() poll to re-register notify...
-      break;
-    }
-    case ESP_GATTC_NOTIFY_EVT: {
-      if (this->processing_)
-        break;
-
-      if (param->notify.conn_id != this->parent_->get_conn_id()) {
-        ESP_LOGW(TAG, "[%s] Received notify event for unexpected parent conn: expect %x, got %x",
-                 this->get_name().c_str(), this->parent_->get_conn_id(), param->notify.conn_id);
-        // FIXME: bug in BLEClient holding wrong conn_id.
-      }
-
-      if (param->notify.handle != this->char_handle_status_) {
-        ESP_LOGW(TAG, "[%s] Unexpected notify handle, wanted %04X, got %04X", this->get_name().c_str(),
-                 this->char_handle_status_, param->notify.handle);
-        break;
-      }
-
-      // FIXME: notify events come in every ~200-300 ms, which is too fast to be helpful. So we
-      //  throttle the updates to once every MIN_NOTIFY_THROTTLE (5 seconds).
-      //  Another idea would be to keep notify off by default, and use update() as an opportunity to turn on
-      //  notify to get enough data to update status, then turn off notify again.
-
-      uint32_t now = millis();
-      auto delta = now - this->last_notify_;
-
-      if (!this->force_refresh_ && this->codec_->compare(param->notify.value, param->notify.value_len)) {
-        // If the packet is meaningfully different, trigger children as well
-        this->force_refresh_ = true;
-        ESP_LOGV(TAG, "[%s] Incoming packet indicates a significant change.", this->get_name().c_str());
-      }
-
-      if (this->last_notify_ == 0 || delta > MIN_NOTIFY_THROTTLE || this->force_refresh_) {
-        // Set reentrant flag to prevent processing multiple packets.
-        this->processing_ = true;
-        ESP_LOGVV(TAG, "[%s] Decoding packet: last=%d, delta=%d, force=%s", this->get_name().c_str(),
-                  this->last_notify_, delta, this->force_refresh_ ? "y" : "n");
-        bool needs_extra = this->codec_->decode_notify(param->notify.value, param->notify.value_len);
-
-        if (needs_extra) {
-          // This means the packet was partial, so read the status characteristic to get the second part.
-          // Ideally this will complete quickly. We won't process additional notification events until it does.
-          auto status = esp_ble_gattc_read_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(),
-                                                this->char_handle_status_, ESP_GATT_AUTH_REQ_NONE);
-          if (status) {
-            ESP_LOGI(TAG, "[%s] Unable to read extended status packet", this->get_name().c_str());
-          }
-        } else {
-          this->status_packet_ready_();
-        }
-      }
-      break;
-    }
-    default:
-      ESP_LOGVV(TAG, "[%s] gattc unhandled event: enum=%d", this->get_name().c_str(), event);
-      break;
-  }
-}
-
-inline void BedJetHub::status_packet_ready_() {
-  this->last_notify_ = millis();
-  this->processing_ = false;
-
-  if (this->force_refresh_) {
-    // If we requested an immediate update, do that now.
-    this->update();
-    this->force_refresh_ = false;
-  }
-}
-
-/** Reimplementation of BLEClient.gattc_event_handler() for ESP_GATTC_REG_FOR_NOTIFY_EVT.
- *
- * This is a copy of ble_client's automatic handling of `ESP_GATTC_REG_FOR_NOTIFY_EVT`, in order
- * to undo the same on unregister. It also allows us to maintain the config descriptor separately,
- * since the parent BLEClient is going to purge all descriptors once we set our connection status
- * to `Established`.
- */
-uint8_t BedJetHub::write_notify_config_descriptor_(bool enable) {
-  auto handle = this->config_descr_status_;
-  if (handle == 0) {
-    ESP_LOGW(TAG, "No descriptor found for notify of handle 0x%x", this->char_handle_status_);
-    return -1;
-  }
-
-  // NOTE: BLEClient uses `uint8_t*` of length 1, but BLE spec requires 16 bits.
-  uint16_t notify_en = enable ? 1 : 0;
-  auto status = esp_ble_gattc_write_char_descr(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), handle,
-                                               sizeof(notify_en), (uint8_t *) &notify_en, ESP_GATT_WRITE_TYPE_RSP,
-                                               ESP_GATT_AUTH_REQ_NONE);
-  if (status) {
-    ESP_LOGW(TAG, "esp_ble_gattc_write_char_descr error, status=%d", status);
-    return status;
-  }
-  ESP_LOGD(TAG, "[%s] wrote notify=%s to status config 0x%04x, for conn %d", this->get_name().c_str(),
-           enable ? "true" : "false", handle, this->parent_->get_conn_id());
-  return ESP_GATT_OK;
-}
-
-/* Time Component */
-
-#ifdef USE_TIME
-void BedJetHub::send_local_time() {
-  if (this->time_id_.has_value()) {
-    auto *time_id = *this->time_id_;
-    time::ESPTime now = time_id->now();
-    if (now.is_valid()) {
-      this->set_clock(now.hour, now.minute);
-      ESP_LOGD(TAG, "Using time component to set BedJet clock: %d:%02d", now.hour, now.minute);
-    }
-  } else {
-    ESP_LOGI(TAG, "`time_id` is not configured: will not sync BedJet clock.");
-  }
-}
-
-void BedJetHub::setup_time_() {
-  if (this->time_id_.has_value()) {
-    this->send_local_time();
-    auto *time_id = *this->time_id_;
-    time_id->add_on_time_sync_callback([this] { this->send_local_time(); });
-  } else {
-    ESP_LOGI(TAG, "`time_id` is not configured: will not sync BedJet clock.");
-  }
-}
-#endif
-
-void BedJetHub::set_clock(uint8_t hour, uint8_t minute) {
-  if (!this->is_connected()) {
-    ESP_LOGV(TAG, "[%s] Not connected, cannot send time.", this->get_name().c_str());
-    return;
-  }
-
-  BedjetPacket *pkt = this->codec_->get_set_time_request(hour, minute);
-  auto status = this->write_bedjet_packet_(pkt);
-  if (status) {
-    ESP_LOGW(TAG, "Failed setting BedJet clock: %d", status);
-  } else {
-    ESP_LOGD(TAG, "[%s] BedJet clock set to: %d:%02d", this->get_name().c_str(), hour, minute);
-  }
-}
-
-/* Internal */
-
-void BedJetHub::loop() {}
-void BedJetHub::update() { this->dispatch_status_(); }
-
-void BedJetHub::dump_config() {
-  ESP_LOGCONFIG(TAG, "BedJet Hub '%s'", this->get_name().c_str());
-  ESP_LOGCONFIG(TAG, "  ble_client.app_id: %d", this->parent()->app_id);
-  ESP_LOGCONFIG(TAG, "  ble_client.conn_id: %d", this->parent()->get_conn_id());
-  LOG_UPDATE_INTERVAL(this)
-  ESP_LOGCONFIG(TAG, "  Child components (%d):", this->children_.size());
-  for (auto *child : this->children_) {
-    ESP_LOGCONFIG(TAG, "    - %s", child->describe().c_str());
-  }
-}
-
-void BedJetHub::dispatch_state_(bool is_ready) {
-  for (auto *child : this->children_) {
-    child->on_bedjet_state(is_ready);
-  }
-}
-
-void BedJetHub::dispatch_status_() {
-  auto *status = this->codec_->get_status_packet();
-
-  if (!this->is_connected()) {
-    ESP_LOGD(TAG, "[%s] Not connected, will not send status.", this->get_name().c_str());
-  } else if (status != nullptr) {
-    ESP_LOGD(TAG, "[%s] Notifying %d children of latest status @%p.", this->get_name().c_str(), this->children_.size(),
-             status);
-    for (auto *child : this->children_) {
-      child->on_status(status);
-    }
-  } else {
-    uint32_t now = millis();
-    uint32_t diff = now - this->last_notify_;
-
-    if (this->last_notify_ == 0) {
-      // This means we're connected and haven't received a notification, so it likely means that the BedJet is off.
-      // However, it could also mean that it's running, but failing to send notifications.
-      // We can try to unregister for notifications now, and then re-register, hoping to clear it up...
-      // But how do we know for sure which state we're in, and how do we actually clear out the buggy state?
-
-      ESP_LOGI(TAG, "[%s] Still waiting for first GATT notify event.", this->get_name().c_str());
-    } else if (diff > NOTIFY_WARN_THRESHOLD) {
-      ESP_LOGW(TAG, "[%s] Last GATT notify was %d seconds ago.", this->get_name().c_str(), diff / 1000);
-    }
-
-    if (this->timeout_ > 0 && diff > this->timeout_ && this->parent()->enabled) {
-      ESP_LOGW(TAG, "[%s] Timed out after %d sec. Retrying...", this->get_name().c_str(), this->timeout_);
-      // set_enabled(false) will only close the connection if state != IDLE.
-      this->parent()->set_state(espbt::ClientState::CONNECTING);
-      this->parent()->set_enabled(false);
-      this->parent()->set_enabled(true);
-    }
-  }
-}
-
-void BedJetHub::register_child(BedJetClient *obj) {
-  this->children_.push_back(obj);
-  obj->set_parent(this);
-}
-
-}  // namespace bedjet
-}  // namespace esphome

esphome/components/bedjet/bedjet_hub.h

@@ -1,178 +0,0 @@
-#pragma once
-
-#include "esphome/components/ble_client/ble_client.h"
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
-#include "esphome/core/component.h"
-#include "esphome/core/defines.h"
-#include "esphome/core/hal.h"
-#include "bedjet_child.h"
-#include "bedjet_codec.h"
-
-#include <vector>
-
-#ifdef USE_TIME
-#include "esphome/components/time/real_time_clock.h"
-#endif
-
-#ifdef USE_ESP32
-
-#include <esp_gattc_api.h>
-
-namespace esphome {
-namespace bedjet {
-
-namespace espbt = esphome::esp32_ble_tracker;
-
-// Forward declare BedJetClient
-class BedJetClient;
-
-static const espbt::ESPBTUUID BEDJET_SERVICE_UUID = espbt::ESPBTUUID::from_raw("00001000-bed0-0080-aa55-4265644a6574");
-static const espbt::ESPBTUUID BEDJET_STATUS_UUID = espbt::ESPBTUUID::from_raw("00002000-bed0-0080-aa55-4265644a6574");
-static const espbt::ESPBTUUID BEDJET_COMMAND_UUID = espbt::ESPBTUUID::from_raw("00002004-bed0-0080-aa55-4265644a6574");
-static const espbt::ESPBTUUID BEDJET_NAME_UUID = espbt::ESPBTUUID::from_raw("00002001-bed0-0080-aa55-4265644a6574");
-
-/**
- * Hub component connecting to the BedJet device over Bluetooth.
- */
-class BedJetHub : public esphome::ble_client::BLEClientNode, public PollingComponent {
- public:
-  /* BedJet functionality exposed to `BedJetClient` children and/or accessible from action lambdas. */
-
-  /** Attempts to check for and apply firmware updates. */
-  void upgrade_firmware();
-
-  /** Press the OFF button. */
-  bool button_off();
-  /** Press the HEAT button. */
-  bool button_heat();
-  /** Press the EXT HT button. */
-  bool button_ext_heat();
-  /** Press the TURBO button. */
-  bool button_turbo();
-  /** Press the COOL button. */
-  bool button_cool();
-  /** Press the DRY button. */
-  bool button_dry();
-  /** Press the M1 (memory recall) button. */
-  bool button_memory1();
-  /** Press the M2 (memory recall) button. */
-  bool button_memory2();
-  /** Press the M3 (memory recall) button. */
-  bool button_memory3();
-
-  /** Send the `button`. */
-  bool send_button(BedjetButton button);
-
-  /** Set the target temperature to `temp_c` in °C. */
-  bool set_target_temp(float temp_c);
-
-  /** Set the fan speed to a stepped index in the range 0-19. */
-  bool set_fan_index(uint8_t fan_speed_index);
-
-  /** Set the fan speed to a percent in the range 5% - 100%, at 5% increments. */
-  bool set_fan_speed(uint8_t fan_speed_pct) { return this->set_fan_index(bedjet_fan_speed_to_index(fan_speed_pct)); }
-
-  /** Return the fan speed index, in the range 0-19. */
-  uint8_t get_fan_index();
-
-  /** Return the fan speed as a percent in the range 5%-100%. */
-  uint8_t get_fan_speed() { return bedjet_fan_step_to_speed(this->get_fan_index()); }
-
-  /** Set the operational runtime remaining.
-   *
-   * The unit establishes and enforces runtime limits for some modes, so this call is not guaranteed to succeed.
-   */
-  bool set_time_remaining(uint8_t hours, uint8_t mins);
-
-  /** Return the remaining runtime, in seconds. */
-  uint16_t get_time_remaining();
-
-  /** @return `true` if the `BLEClient::node_state` is `ClientState::ESTABLISHED`. */
-  bool is_connected() { return this->node_state == espbt::ClientState::ESTABLISHED; }
-
-  bool has_status() { return this->codec_->has_status(); }
-  const BedjetStatusPacket *get_status_packet() const { return this->codec_->get_status_packet(); }
-
-  /** Register a `BedJetClient` child component. */
-  void register_child(BedJetClient *obj);
-
-  /** Set the status timeout.
-   *
-   * This is the max time to wait for a status update before the connection is presumed unusable.
-   */
-  void set_status_timeout(uint32_t timeout) { this->timeout_ = timeout; }
-
-#ifdef USE_TIME
-  /** Set the `time::RealTimeClock` implementation. */
-  void set_time_id(time::RealTimeClock *time_id) { this->time_id_ = time_id; }
-  /** Attempts to sync the local time (via `time_id`) to the BedJet device. */
-  void send_local_time();
-#endif
-  /** Attempt to set the BedJet device's clock to the specified time. */
-  void set_clock(uint8_t hour, uint8_t minute);
-
-  /* Component overrides */
-
-  void loop() override;
-  void update() override;
-  void dump_config() override;
-  void setup() override { this->codec_ = make_unique<BedjetCodec>(); }
-  float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
-
-  /** @return The BedJet's configured name, or the MAC address if not discovered yet. */
-  std::string get_name() {
-    if (this->name_.empty()) {
-      return this->parent_->address_str();
-    } else {
-      return this->name_;
-    }
-  }
-
-  /* BLEClient overrides */
-
-  void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                           esp_ble_gattc_cb_param_t *param) override;
-
- protected:
-  std::vector<BedJetClient *> children_;
-  void dispatch_status_();
-  void dispatch_state_(bool is_ready);
-
-#ifdef USE_TIME
-  /** Initializes time sync callbacks to support syncing current time to the BedJet. */
-  void setup_time_();
-  optional<time::RealTimeClock *> time_id_{};
-#endif
-
-  uint32_t timeout_{DEFAULT_STATUS_TIMEOUT};
-  static const uint32_t MIN_NOTIFY_THROTTLE = 15000;
-  static const uint32_t NOTIFY_WARN_THRESHOLD = 300000;
-  static const uint32_t DEFAULT_STATUS_TIMEOUT = 900000;
-
-  uint8_t set_notify_(bool enable);
-  /** Send the `BedjetPacket` to the device. */
-  uint8_t write_bedjet_packet_(BedjetPacket *pkt);
-  void set_name_(const std::string &name) { this->name_ = name; }
-
-  std::string name_;
-
-  uint32_t last_notify_ = 0;
-  inline void status_packet_ready_();
-  bool force_refresh_ = false;
-  bool processing_ = false;
-
-  std::unique_ptr<BedjetCodec> codec_;
-
-  bool discover_characteristics_();
-  uint16_t char_handle_cmd_;
-  uint16_t char_handle_name_;
-  uint16_t char_handle_status_;
-  uint16_t config_descr_status_;
-
-  uint8_t write_notify_config_descriptor_(bool enable);
-};
-
-}  // namespace bedjet
-}  // namespace esphome
-
-#endif

esphome/components/bedjet/climate/__init__.py

@@ -1,65 +0,0 @@
-import logging
-
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import climate, ble_client
-from esphome.const import (
-    CONF_HEAT_MODE,
-    CONF_ID,
-    CONF_RECEIVE_TIMEOUT,
-    CONF_TIME_ID,
-)
-from .. import (
-    BEDJET_CLIENT_SCHEMA,
-    bedjet_ns,
-    register_bedjet_child,
-)
-
-_LOGGER = logging.getLogger(__name__)
-CODEOWNERS = ["@jhansche"]
-DEPENDENCIES = ["bedjet"]
-
-BedJetClimate = bedjet_ns.class_("BedJetClimate", climate.Climate, cg.PollingComponent)
-BedjetHeatMode = bedjet_ns.enum("BedjetHeatMode")
-BEDJET_HEAT_MODES = {
-    "heat": BedjetHeatMode.HEAT_MODE_HEAT,
-    "extended": BedjetHeatMode.HEAT_MODE_EXTENDED,
-}
-
-CONFIG_SCHEMA = (
-    climate.CLIMATE_SCHEMA.extend(
-        {
-            cv.GenerateID(): cv.declare_id(BedJetClimate),
-            cv.Optional(CONF_HEAT_MODE, default="heat"): cv.enum(
-                BEDJET_HEAT_MODES, lower=True
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(
-        # TODO: remove compat layer.
-        {
-            cv.Optional(ble_client.CONF_BLE_CLIENT_ID): cv.invalid(
-                "The 'ble_client_id' option has been removed. Please migrate "
-                "to the new `bedjet_id` option in the `bedjet` component.\n"
-                "See https://esphome.io/components/climate/bedjet.html"
-            ),
-            cv.Optional(CONF_TIME_ID): cv.invalid(
-                "The 'time_id' option has been moved to the `bedjet` component."
-            ),
-            cv.Optional(CONF_RECEIVE_TIMEOUT): cv.invalid(
-                "The 'receive_timeout' option has been moved to the `bedjet` component."
-            ),
-        }
-    )
-    .extend(BEDJET_CLIENT_SCHEMA)
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await climate.register_climate(var, config)
-    await register_bedjet_child(var, config)
-
-    cg.add(var.set_heating_mode(config[CONF_HEAT_MODE]))

esphome/components/bedjet/climate/bedjet_climate.cpp

@@ -1,354 +0,0 @@
-#include "bedjet_climate.h"
-#include "esphome/core/log.h"
-
-#ifdef USE_ESP32
-
-namespace esphome {
-namespace bedjet {
-
-using namespace esphome::climate;
-
-/// Converts a BedJet temp step into degrees Celsius.
-float bedjet_temp_to_c(const uint8_t temp) {
-  // BedJet temp is "C*2"; to get C, divide by 2.
-  return temp / 2.0f;
-}
-
-static const std::string *bedjet_fan_step_to_fan_mode(const uint8_t fan_step) {
-  if (fan_step < BEDJET_FAN_SPEED_COUNT)
-    return &BEDJET_FAN_STEP_NAME_STRINGS[fan_step];
-  return nullptr;
-}
-
-static uint8_t bedjet_fan_speed_to_step(const std::string &fan_step_percent) {
-  for (int i = 0; i < BEDJET_FAN_SPEED_COUNT; i++) {
-    if (fan_step_percent == BEDJET_FAN_STEP_NAME_STRINGS[i]) {
-      return i;
-    }
-  }
-  return -1;
-}
-
-static inline BedjetButton heat_button(BedjetHeatMode mode) {
-  return mode == HEAT_MODE_EXTENDED ? BTN_EXTHT : BTN_HEAT;
-}
-
-std::string BedJetClimate::describe() { return "BedJet Climate"; }
-
-void BedJetClimate::dump_config() {
-  LOG_CLIMATE("", "BedJet Climate", this);
-  auto traits = this->get_traits();
-
-  ESP_LOGCONFIG(TAG, "  Supported modes:");
-  for (auto mode : traits.get_supported_modes()) {
-    ESP_LOGCONFIG(TAG, "   - %s", LOG_STR_ARG(climate_mode_to_string(mode)));
-  }
-  if (this->heating_mode_ == HEAT_MODE_EXTENDED) {
-    ESP_LOGCONFIG(TAG, "   - BedJet heating mode: EXT HT");
-  } else {
-    ESP_LOGCONFIG(TAG, "   - BedJet heating mode: HEAT");
-  }
-
-  ESP_LOGCONFIG(TAG, "  Supported fan modes:");
-  for (const auto &mode : traits.get_supported_fan_modes()) {
-    ESP_LOGCONFIG(TAG, "   - %s", LOG_STR_ARG(climate_fan_mode_to_string(mode)));
-  }
-  for (const auto &mode : traits.get_supported_custom_fan_modes()) {
-    ESP_LOGCONFIG(TAG, "   - %s (c)", mode.c_str());
-  }
-
-  ESP_LOGCONFIG(TAG, "  Supported presets:");
-  for (auto preset : traits.get_supported_presets()) {
-    ESP_LOGCONFIG(TAG, "   - %s", LOG_STR_ARG(climate_preset_to_string(preset)));
-  }
-  for (const auto &preset : traits.get_supported_custom_presets()) {
-    ESP_LOGCONFIG(TAG, "   - %s (c)", preset.c_str());
-  }
-}
-
-void BedJetClimate::setup() {
-  // restore set points
-  auto restore = this->restore_state_();
-  if (restore.has_value()) {
-    ESP_LOGI(TAG, "Restored previous saved state.");
-    restore->apply(this);
-  } else {
-    // Initial status is unknown until we connect
-    this->reset_state_();
-  }
-}
-
-/** Resets states to defaults. */
-void BedJetClimate::reset_state_() {
-  this->mode = CLIMATE_MODE_OFF;
-  this->action = CLIMATE_ACTION_IDLE;
-  this->target_temperature = NAN;
-  this->current_temperature = NAN;
-  this->preset.reset();
-  this->custom_preset.reset();
-  this->publish_state();
-}
-
-void BedJetClimate::loop() {}
-
-void BedJetClimate::control(const ClimateCall &call) {
-  ESP_LOGD(TAG, "Received BedJetClimate::control");
-  if (!this->parent_->is_connected()) {
-    ESP_LOGW(TAG, "Not connected, cannot handle control call yet.");
-    return;
-  }
-
-  if (call.get_mode().has_value()) {
-    ClimateMode mode = *call.get_mode();
-    bool button_result;
-    switch (mode) {
-      case CLIMATE_MODE_OFF:
-        button_result = this->parent_->button_off();
-        break;
-      case CLIMATE_MODE_HEAT:
-        button_result = this->parent_->send_button(heat_button(this->heating_mode_));
-        break;
-      case CLIMATE_MODE_FAN_ONLY:
-        button_result = this->parent_->button_cool();
-        break;
-      case CLIMATE_MODE_DRY:
-        button_result = this->parent_->button_dry();
-        break;
-      default:
-        ESP_LOGW(TAG, "Unsupported mode: %d", mode);
-        return;
-    }
-
-    if (button_result) {
-      this->mode = mode;
-      // We're using (custom) preset for Turbo, EXT HT, & M1-3 presets, so changing climate mode will clear those
-      this->custom_preset.reset();
-      this->preset.reset();
-    }
-  }
-
-  if (call.get_target_temperature().has_value()) {
-    auto target_temp = *call.get_target_temperature();
-    auto result = this->parent_->set_target_temp(target_temp);
-
-    if (result) {
-      this->target_temperature = target_temp;
-    }
-  }
-
-  if (call.get_preset().has_value()) {
-    ClimatePreset preset = *call.get_preset();
-    bool result;
-
-    if (preset == CLIMATE_PRESET_BOOST) {
-      // We use BOOST preset for TURBO mode, which is a short-lived/high-heat mode.
-      result = this->parent_->button_turbo();
-
-      if (result) {
-        this->mode = CLIMATE_MODE_HEAT;
-        this->preset = CLIMATE_PRESET_BOOST;
-        this->custom_preset.reset();
-      }
-    } else if (preset == CLIMATE_PRESET_NONE && this->preset.has_value()) {
-      if (this->mode == CLIMATE_MODE_HEAT && this->preset == CLIMATE_PRESET_BOOST) {
-        // We were in heat mode with Boost preset, and now preset is set to None, so revert to normal heat.
-        result = this->parent_->send_button(heat_button(this->heating_mode_));
-        if (result) {
-          this->preset.reset();
-          this->custom_preset.reset();
-        }
-      } else {
-        ESP_LOGD(TAG, "Ignoring preset '%s' call; with current mode '%s' and preset '%s'",
-                 LOG_STR_ARG(climate_preset_to_string(preset)), LOG_STR_ARG(climate_mode_to_string(this->mode)),
-                 LOG_STR_ARG(climate_preset_to_string(this->preset.value_or(CLIMATE_PRESET_NONE))));
-      }
-    } else {
-      ESP_LOGW(TAG, "Unsupported preset: %d", preset);
-      return;
-    }
-  } else if (call.get_custom_preset().has_value()) {
-    std::string preset = *call.get_custom_preset();
-    bool result;
-
-    if (preset == "M1") {
-      result = this->parent_->button_memory1();
-    } else if (preset == "M2") {
-      result = this->parent_->button_memory2();
-    } else if (preset == "M3") {
-      result = this->parent_->button_memory3();
-    } else if (preset == "LTD HT") {
-      result = this->parent_->button_heat();
-    } else if (preset == "EXT HT") {
-      result = this->parent_->button_ext_heat();
-    } else {
-      ESP_LOGW(TAG, "Unsupported preset: %s", preset.c_str());
-      return;
-    }
-
-    if (result) {
-      this->custom_preset = preset;
-      this->preset.reset();
-    }
-  }
-
-  if (call.get_fan_mode().has_value()) {
-    // Climate fan mode only supports low/med/high, but the BedJet supports 5-100% increments.
-    // We can still support a ClimateCall that requests low/med/high, and just translate it to a step increment here.
-    auto fan_mode = *call.get_fan_mode();
-    bool result;
-    if (fan_mode == CLIMATE_FAN_LOW) {
-      result = this->parent_->set_fan_speed(20);
-    } else if (fan_mode == CLIMATE_FAN_MEDIUM) {
-      result = this->parent_->set_fan_speed(50);
-    } else if (fan_mode == CLIMATE_FAN_HIGH) {
-      result = this->parent_->set_fan_speed(75);
-    } else {
-      ESP_LOGW(TAG, "[%s] Unsupported fan mode: %s", this->get_name().c_str(),
-               LOG_STR_ARG(climate_fan_mode_to_string(fan_mode)));
-      return;
-    }
-
-    if (result) {
-      this->fan_mode = fan_mode;
-      this->custom_fan_mode.reset();
-    }
-  } else if (call.get_custom_fan_mode().has_value()) {
-    auto fan_mode = *call.get_custom_fan_mode();
-    auto fan_index = bedjet_fan_speed_to_step(fan_mode);
-    if (fan_index <= 19) {
-      ESP_LOGV(TAG, "[%s] Converted fan mode %s to bedjet fan step %d", this->get_name().c_str(), fan_mode.c_str(),
-               fan_index);
-      bool result = this->parent_->set_fan_index(fan_index);
-      if (result) {
-        this->custom_fan_mode = fan_mode;
-        this->fan_mode.reset();
-      }
-    }
-  }
-}
-
-void BedJetClimate::on_bedjet_state(bool is_ready) {}
-
-void BedJetClimate::on_status(const BedjetStatusPacket *data) {
-  ESP_LOGV(TAG, "[%s] Handling on_status with data=%p", this->get_name().c_str(), (void *) data);
-
-  auto converted_temp = bedjet_temp_to_c(data->target_temp_step);
-  if (converted_temp > 0)
-    this->target_temperature = converted_temp;
-
-  converted_temp = bedjet_temp_to_c(data->ambient_temp_step);
-  if (converted_temp > 0)
-    this->current_temperature = converted_temp;
-
-  const auto *fan_mode_name = bedjet_fan_step_to_fan_mode(data->fan_step);
-  if (fan_mode_name != nullptr) {
-    this->custom_fan_mode = *fan_mode_name;
-  }
-
-  // TODO: Get biorhythm data to determine which preset (M1-3) is running, if any.
-  switch (data->mode) {
-    case MODE_WAIT:  // Biorhythm "wait" step: device is idle
-    case MODE_STANDBY:
-      this->mode = CLIMATE_MODE_OFF;
-      this->action = CLIMATE_ACTION_IDLE;
-      this->fan_mode = CLIMATE_FAN_OFF;
-      this->custom_preset.reset();
-      this->preset.reset();
-      break;
-
-    case MODE_HEAT:
-      this->mode = CLIMATE_MODE_HEAT;
-      this->action = CLIMATE_ACTION_HEATING;
-      this->preset.reset();
-      if (this->heating_mode_ == HEAT_MODE_EXTENDED) {
-        this->set_custom_preset_("LTD HT");
-      } else {
-        this->custom_preset.reset();
-      }
-      break;
-
-    case MODE_EXTHT:
-      this->mode = CLIMATE_MODE_HEAT;
-      this->action = CLIMATE_ACTION_HEATING;
-      this->preset.reset();
-      if (this->heating_mode_ == HEAT_MODE_EXTENDED) {
-        this->custom_preset.reset();
-      } else {
-        this->set_custom_preset_("EXT HT");
-      }
-      break;
-
-    case MODE_COOL:
-      this->mode = CLIMATE_MODE_FAN_ONLY;
-      this->action = CLIMATE_ACTION_COOLING;
-      this->custom_preset.reset();
-      this->preset.reset();
-      break;
-
-    case MODE_DRY:
-      this->mode = CLIMATE_MODE_DRY;
-      this->action = CLIMATE_ACTION_DRYING;
-      this->custom_preset.reset();
-      this->preset.reset();
-      break;
-
-    case MODE_TURBO:
-      this->preset = CLIMATE_PRESET_BOOST;
-      this->custom_preset.reset();
-      this->mode = CLIMATE_MODE_HEAT;
-      this->action = CLIMATE_ACTION_HEATING;
-      break;
-
-    default:
-      ESP_LOGW(TAG, "[%s] Unexpected mode: 0x%02X", this->get_name().c_str(), data->mode);
-      break;
-  }
-
-  ESP_LOGV(TAG, "[%s] After on_status, new mode=%s", this->get_name().c_str(),
-           LOG_STR_ARG(climate_mode_to_string(this->mode)));
-  // FIXME: compare new state to previous state.
-  this->publish_state();
-}
-
-/** Attempts to update the climate device from the last received BedjetStatusPacket.
- *
- * This will be called from #on_status() when the parent dispatches new status packets,
- * and from #update() when the polling interval is triggered.
- *
- * @return `true` if the status has been applied; `false` if there is nothing to apply.
- */
-bool BedJetClimate::update_status_() {
-  if (!this->parent_->is_connected())
-    return false;
-  if (!this->parent_->has_status())
-    return false;
-
-  auto *status = this->parent_->get_status_packet();
-
-  if (status == nullptr)
-    return false;
-
-  this->on_status(status);
-
-  if (this->is_valid_()) {
-    // TODO: only if state changed?
-    this->publish_state();
-    this->status_clear_warning();
-    return true;
-  }
-
-  return false;
-}
-
-void BedJetClimate::update() {
-  ESP_LOGD(TAG, "[%s] update()", this->get_name().c_str());
-  // TODO: if the hub component is already polling, do we also need to include polling?
-  //  We're already going to get on_status() at the hub's polling interval.
-  auto result = this->update_status_();
-  ESP_LOGD(TAG, "[%s] update_status result=%s", this->get_name().c_str(), result ? "true" : "false");
-}
-
-}  // namespace bedjet
-}  // namespace esphome
-
-#endif

esphome/components/bedjet/climate/bedjet_climate.h

@@ -1,91 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/defines.h"
-#include "esphome/core/hal.h"
-#include "esphome/components/bedjet/bedjet_child.h"
-#include "esphome/components/bedjet/bedjet_codec.h"
-#include "esphome/components/bedjet/bedjet_hub.h"
-#include "esphome/components/climate/climate.h"
-
-#ifdef USE_ESP32
-
-namespace esphome {
-namespace bedjet {
-
-class BedJetClimate : public climate::Climate, public BedJetClient, public PollingComponent {
- public:
-  void setup() override;
-  void loop() override;
-  void update() override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
-
-  /* BedJetClient status update */
-  void on_status(const BedjetStatusPacket *data) override;
-  void on_bedjet_state(bool is_ready) override;
-  std::string describe() override;
-
-  /** Sets the default strategy to use for climate::CLIMATE_MODE_HEAT. */
-  void set_heating_mode(BedjetHeatMode mode) { this->heating_mode_ = mode; }
-
-  climate::ClimateTraits traits() override {
-    auto traits = climate::ClimateTraits();
-    traits.set_supports_action(true);
-    traits.set_supports_current_temperature(true);
-    traits.set_supported_modes({
-        climate::CLIMATE_MODE_OFF,
-        climate::CLIMATE_MODE_HEAT,
-        // climate::CLIMATE_MODE_TURBO // Not supported by Climate: see presets instead
-        climate::CLIMATE_MODE_FAN_ONLY,
-        climate::CLIMATE_MODE_DRY,
-    });
-
-    // It would be better if we had a slider for the fan modes.
-    traits.set_supported_custom_fan_modes(BEDJET_FAN_STEP_NAMES_SET);
-    traits.set_supported_presets({
-        // If we support NONE, then have to decide what happens if the user switches to it (turn off?)
-        // climate::CLIMATE_PRESET_NONE,
-        // Climate doesn't have a "TURBO" mode, but we can use the BOOST preset instead.
-        climate::CLIMATE_PRESET_BOOST,
-    });
-    traits.set_supported_custom_presets({
-        // We could fetch biodata from bedjet and set these names that way.
-        // But then we have to invert the lookup in order to send the right preset.
-        // For now, we can leave them as M1-3 to match the remote buttons.
-        // EXT HT added to match remote button.
-        "EXT HT",
-        "M1",
-        "M2",
-        "M3",
-    });
-    if (this->heating_mode_ == HEAT_MODE_EXTENDED) {
-      traits.add_supported_custom_preset("LTD HT");
-    } else {
-      traits.add_supported_custom_preset("EXT HT");
-    }
-    traits.set_visual_min_temperature(19.0);
-    traits.set_visual_max_temperature(43.0);
-    traits.set_visual_temperature_step(1.0);
-    return traits;
-  }
-
- protected:
-  void control(const climate::ClimateCall &call) override;
-
-  BedjetHeatMode heating_mode_ = HEAT_MODE_HEAT;
-
-  void reset_state_();
-  bool update_status_();
-
-  bool is_valid_() {
-    // FIXME: find a better way to check this?
-    return !std::isnan(this->current_temperature) && !std::isnan(this->target_temperature) &&
-           this->current_temperature > 1 && this->target_temperature > 1;
-  }
-};
-
-}  // namespace bedjet
-}  // namespace esphome
-
-#endif

esphome/components/bedjet/fan/__init__.py

@@ -1,36 +0,0 @@
-import logging
-
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import fan
-from esphome.const import (
-    CONF_ID,
-)
-from .. import (
-    BEDJET_CLIENT_SCHEMA,
-    bedjet_ns,
-    register_bedjet_child,
-)
-
-_LOGGER = logging.getLogger(__name__)
-CODEOWNERS = ["@jhansche"]
-DEPENDENCIES = ["bedjet"]
-
-BedJetFan = bedjet_ns.class_("BedJetFan", fan.Fan, cg.PollingComponent)
-
-CONFIG_SCHEMA = (
-    fan.FAN_SCHEMA.extend(
-        {
-            cv.GenerateID(): cv.declare_id(BedJetFan),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(BEDJET_CLIENT_SCHEMA)
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await fan.register_fan(var, config)
-    await register_bedjet_child(var, config)

esphome/components/bedjet/fan/bedjet_fan.cpp

@@ -1,108 +0,0 @@
-#include "bedjet_fan.h"
-#include "esphome/core/log.h"
-
-#ifdef USE_ESP32
-
-namespace esphome {
-namespace bedjet {
-
-using namespace esphome::fan;
-
-void BedJetFan::dump_config() { LOG_FAN("", "BedJet Fan", this); }
-std::string BedJetFan::describe() { return "BedJet Fan"; }
-
-void BedJetFan::control(const fan::FanCall &call) {
-  ESP_LOGD(TAG, "Received BedJetFan::control");
-  if (!this->parent_->is_connected()) {
-    ESP_LOGW(TAG, "Not connected, cannot handle control call yet.");
-    return;
-  }
-  bool did_change = false;
-
-  if (call.get_state().has_value() && this->state != *call.get_state()) {
-    // Turning off is easy:
-    if (this->state && this->parent_->button_off()) {
-      this->state = false;
-      this->publish_state();
-      return;
-    }
-
-    // Turning on, we have to choose a specific mode; for now, use "COOL" mode
-    // In the future we could configure the mode to use for fan.turn_on.
-    if (this->parent_->button_cool()) {
-      this->state = true;
-      did_change = true;
-    }
-  }
-
-  // ignore speed changes if not on or turning on
-  if (this->state && call.get_speed().has_value()) {
-    this->speed = *call.get_speed();
-    this->parent_->set_fan_index(this->speed);
-    did_change = true;
-  }
-
-  if (did_change) {
-    this->publish_state();
-  }
-}
-
-void BedJetFan::on_status(const BedjetStatusPacket *data) {
-  ESP_LOGVV(TAG, "[%s] Handling on_status with data=%p", this->get_name().c_str(), (void *) data);
-  bool did_change = false;
-  bool new_state = data->mode != MODE_STANDBY && data->mode != MODE_WAIT;
-
-  if (new_state != this->state) {
-    this->state = new_state;
-    did_change = true;
-  }
-
-  if (data->fan_step != this->speed) {
-    this->speed = data->fan_step;
-    did_change = true;
-  }
-
-  if (did_change) {
-    this->publish_state();
-  }
-}
-
-/** Attempts to update the fan device from the last received BedjetStatusPacket.
- *
- * This will be called from #on_status() when the parent dispatches new status packets,
- * and from #update() when the polling interval is triggered.
- *
- * @return `true` if the status has been applied; `false` if there is nothing to apply.
- */
-bool BedJetFan::update_status_() {
-  if (!this->parent_->is_connected())
-    return false;
-  if (!this->parent_->has_status())
-    return false;
-
-  auto *status = this->parent_->get_status_packet();
-
-  if (status == nullptr)
-    return false;
-
-  this->on_status(status);
-  return true;
-}
-
-void BedJetFan::update() {
-  ESP_LOGD(TAG, "[%s] update()", this->get_name().c_str());
-  // TODO: if the hub component is already polling, do we also need to include polling?
-  //  We're already going to get on_status() at the hub's polling interval.
-  auto result = this->update_status_();
-  ESP_LOGD(TAG, "[%s] update_status result=%s", this->get_name().c_str(), result ? "true" : "false");
-}
-
-/** Resets states to defaults. */
-void BedJetFan::reset_state_() {
-  this->state = false;
-  this->publish_state();
-}
-}  // namespace bedjet
-}  // namespace esphome
-
-#endif

esphome/components/bedjet/fan/bedjet_fan.h

@@ -1,40 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/defines.h"
-#include "esphome/core/hal.h"
-#include "esphome/components/bedjet/bedjet_child.h"
-#include "esphome/components/bedjet/bedjet_codec.h"
-#include "esphome/components/bedjet/bedjet_hub.h"
-#include "esphome/components/fan/fan.h"
-
-#ifdef USE_ESP32
-
-namespace esphome {
-namespace bedjet {
-
-class BedJetFan : public fan::Fan, public BedJetClient, public PollingComponent {
- public:
-  void update() override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
-
-  /* BedJetClient status update */
-  void on_status(const BedjetStatusPacket *data) override;
-  void on_bedjet_state(bool is_ready) override{};
-  std::string describe() override;
-
-  fan::FanTraits get_traits() override { return fan::FanTraits(false, true, false, BEDJET_FAN_SPEED_COUNT); }
-
- protected:
-  void control(const fan::FanCall &call) override;
-
- private:
-  void reset_state_();
-  bool update_status_();
-};
-
-}  // namespace bedjet
-}  // namespace esphome
-
-#endif

esphome/components/bh1750/bh1750.cpp

@@ -9,109 +9,18 @@ static const char *const TAG = "bh1750.sensor";
 static const uint8_t BH1750_COMMAND_POWER_ON = 0b00000001;
 static const uint8_t BH1750_COMMAND_MT_REG_HI = 0b01000000;  // last 3 bits
 static const uint8_t BH1750_COMMAND_MT_REG_LO = 0b01100000;  // last 5 bits
-static const uint8_t BH1750_COMMAND_ONE_TIME_L = 0b00100011;
-static const uint8_t BH1750_COMMAND_ONE_TIME_H = 0b00100000;
-static const uint8_t BH1750_COMMAND_ONE_TIME_H2 = 0b00100001;
-
-/*
-bh1750 properties:
-
-L-resolution mode:
-- resolution 4lx (@ mtreg=69)
-- measurement time: typ=16ms, max=24ms, scaled by MTreg value divided by 69
-- formula: counts / 1.2 * (69 / MTreg) lx
-H-resolution mode:
-- resolution 1lx (@ mtreg=69)
-- measurement time: typ=120ms, max=180ms, scaled by MTreg value divided by 69
-- formula: counts / 1.2 * (69 / MTreg) lx
-H-resolution mode2:
-- resolution 0.5lx (@ mtreg=69)
-- measurement time: typ=120ms, max=180ms, scaled by MTreg value divided by 69
-- formula: counts / 1.2 * (69 / MTreg) / 2 lx
-
-MTreg:
-- min=31, default=69, max=254
-
--> only reason to use l-resolution is faster, but offers no higher range
--> below ~7000lx, makes sense to use H-resolution2 @ MTreg=254
--> try to maximize MTreg to get lowest noise level
-*/
 
 void BH1750Sensor::setup() {
   ESP_LOGCONFIG(TAG, "Setting up BH1750 '%s'...", this->name_.c_str());
-  uint8_t turn_on = BH1750_COMMAND_POWER_ON;
-  if (this->write(&turn_on, 1) != i2c::ERROR_OK) {
+  if (!this->write_bytes(BH1750_COMMAND_POWER_ON, nullptr, 0)) {
     this->mark_failed();
     return;
   }
-}
 
-void BH1750Sensor::read_lx_(BH1750Mode mode, uint8_t mtreg, const std::function<void(float)> &f) {
-  // turn on (after one-shot sensor automatically powers down)
-  uint8_t turn_on = BH1750_COMMAND_POWER_ON;
-  if (this->write(&turn_on, 1) != i2c::ERROR_OK) {
-    ESP_LOGW(TAG, "Turning on BH1750 failed");
-    f(NAN);
-    return;
-  }
-
-  if (active_mtreg_ != mtreg) {
-    // set mtreg
-    uint8_t mtreg_hi = BH1750_COMMAND_MT_REG_HI | ((mtreg >> 5) & 0b111);
-    uint8_t mtreg_lo = BH1750_COMMAND_MT_REG_LO | ((mtreg >> 0) & 0b11111);
-    if (this->write(&mtreg_hi, 1) != i2c::ERROR_OK || this->write(&mtreg_lo, 1) != i2c::ERROR_OK) {
-      ESP_LOGW(TAG, "Setting measurement time for BH1750 failed");
-      active_mtreg_ = 0;
-      f(NAN);
-      return;
-    }
-    active_mtreg_ = mtreg;
-  }
-
-  uint8_t cmd;
-  uint16_t meas_time;
-  switch (mode) {
-    case BH1750_MODE_L:
-      cmd = BH1750_COMMAND_ONE_TIME_L;
-      meas_time = 24 * mtreg / 69;
-      break;
-    case BH1750_MODE_H:
-      cmd = BH1750_COMMAND_ONE_TIME_H;
-      meas_time = 180 * mtreg / 69;
-      break;
-    case BH1750_MODE_H2:
-      cmd = BH1750_COMMAND_ONE_TIME_H2;
-      meas_time = 180 * mtreg / 69;
-      break;
-    default:
-      f(NAN);
-      return;
-  }
-  if (this->write(&cmd, 1) != i2c::ERROR_OK) {
-    ESP_LOGW(TAG, "Starting measurement for BH1750 failed");
-    f(NAN);
-    return;
-  }
-
-  // probably not needed, but adjust for rounding
-  meas_time++;
-
-  this->set_timeout("read", meas_time, [this, mode, mtreg, f]() {
-    uint16_t raw_value;
-    if (this->read(reinterpret_cast<uint8_t *>(&raw_value), 2) != i2c::ERROR_OK) {
-      ESP_LOGW(TAG, "Reading BH1750 data failed");
-      f(NAN);
-      return;
-    }
-    raw_value = i2c::i2ctohs(raw_value);
-
-    float lx = float(raw_value) / 1.2f;
-    lx *= 69.0f / mtreg;
-    if (mode == BH1750_MODE_H2)
-      lx /= 2.0f;
-
-    f(lx);
-  });
+  uint8_t mtreg_hi = (this->measurement_duration_ >> 5) & 0b111;
+  uint8_t mtreg_lo = (this->measurement_duration_ >> 0) & 0b11111;
+  this->write_bytes(BH1750_COMMAND_MT_REG_HI | mtreg_hi, nullptr, 0);
+  this->write_bytes(BH1750_COMMAND_MT_REG_LO | mtreg_lo, nullptr, 0);
 }
 
 void BH1750Sensor::dump_config() {
@@ -121,49 +30,64 @@ void BH1750Sensor::dump_config() {
     ESP_LOGE(TAG, "Communication with BH1750 failed!");
   }
 
+  const char *resolution_s;
+  switch (this->resolution_) {
+    case BH1750_RESOLUTION_0P5_LX:
+      resolution_s = "0.5";
+      break;
+    case BH1750_RESOLUTION_1P0_LX:
+      resolution_s = "1";
+      break;
+    case BH1750_RESOLUTION_4P0_LX:
+      resolution_s = "4";
+      break;
+    default:
+      resolution_s = "Unknown";
+      break;
+  }
+  ESP_LOGCONFIG(TAG, "  Resolution: %s", resolution_s);
   LOG_UPDATE_INTERVAL(this);
 }
 
 void BH1750Sensor::update() {
-  // first do a quick measurement in L-mode with full range
-  // to find right range
-  this->read_lx_(BH1750_MODE_L, 31, [this](float val) {
-    if (std::isnan(val)) {
-      this->status_set_warning();
-      this->publish_state(NAN);
-      return;
-    }
+  if (!this->write_bytes(this->resolution_, nullptr, 0))
+    return;
 
-    BH1750Mode use_mode;
-    uint8_t use_mtreg;
-    if (val <= 7000) {
-      use_mode = BH1750_MODE_H2;
-      use_mtreg = 254;
-    } else {
-      use_mode = BH1750_MODE_H;
-      // lx = counts / 1.2 * (69 / mtreg)
-      // -> mtreg = counts / 1.2 * (69 / lx)
-      // calculate for counts=50000 (allow some range to not saturate, but maximize mtreg)
-      // -> mtreg = 50000*(10/12)*(69/lx)
-      int ideal_mtreg = 50000 * 10 * 69 / (12 * (int) val);
-      use_mtreg = std::min(254, std::max(31, ideal_mtreg));
-    }
-    ESP_LOGV(TAG, "L result: %f -> Calculated mode=%d, mtreg=%d", val, (int) use_mode, use_mtreg);
+  uint32_t wait = 0;
+  // use max conversion times
+  switch (this->resolution_) {
+    case BH1750_RESOLUTION_0P5_LX:
+    case BH1750_RESOLUTION_1P0_LX:
+      wait = 180;
+      break;
+    case BH1750_RESOLUTION_4P0_LX:
+      wait = 24;
+      break;
+  }
 
-    this->read_lx_(use_mode, use_mtreg, [this](float val) {
-      if (std::isnan(val)) {
-        this->status_set_warning();
-        this->publish_state(NAN);
-        return;
-      }
-      ESP_LOGD(TAG, "'%s': Got illuminance=%.1flx", this->get_name().c_str(), val);
-      this->status_clear_warning();
-      this->publish_state(val);
-    });
-  });
+  this->set_timeout("illuminance", wait, [this]() { this->read_data_(); });
 }
 
 float BH1750Sensor::get_setup_priority() const { return setup_priority::DATA; }
+void BH1750Sensor::read_data_() {
+  uint16_t raw_value;
+  if (this->read(reinterpret_cast<uint8_t *>(&raw_value), 2) != i2c::ERROR_OK) {
+    this->status_set_warning();
+    return;
+  }
+  raw_value = i2c::i2ctohs(raw_value);
+
+  float lx = float(raw_value) / 1.2f;
+  lx *= 69.0f / this->measurement_duration_;
+  if (this->resolution_ == BH1750_RESOLUTION_0P5_LX) {
+    lx /= 2.0f;
+  }
+  ESP_LOGD(TAG, "'%s': Got illuminance=%.1flx", this->get_name().c_str(), lx);
+  this->publish_state(lx);
+  this->status_clear_warning();
+}
+
+void BH1750Sensor::set_resolution(BH1750Resolution resolution) { this->resolution_ = resolution; }
 
 }  // namespace bh1750
 }  // namespace esphome

esphome/components/bh1750/bh1750.h

@@ -7,15 +7,29 @@
 namespace esphome {
 namespace bh1750 {
 
-enum BH1750Mode {
-  BH1750_MODE_L,
-  BH1750_MODE_H,
-  BH1750_MODE_H2,
+/// Enum listing all resolutions that can be used with the BH1750
+enum BH1750Resolution {
+  BH1750_RESOLUTION_4P0_LX = 0b00100011,  // one-time low resolution mode
+  BH1750_RESOLUTION_1P0_LX = 0b00100000,  // one-time high resolution mode 1
+  BH1750_RESOLUTION_0P5_LX = 0b00100001,  // one-time high resolution mode 2
 };
 
 /// This class implements support for the i2c-based BH1750 ambient light sensor.
 class BH1750Sensor : public sensor::Sensor, public PollingComponent, public i2c::I2CDevice {
  public:
+  /** Set the resolution of this sensor.
+   *
+   * Possible values are:
+   *
+   *  - `BH1750_RESOLUTION_4P0_LX`
+   *  - `BH1750_RESOLUTION_1P0_LX`
+   *  - `BH1750_RESOLUTION_0P5_LX` (default)
+   *
+   * @param resolution The new resolution of the sensor.
+   */
+  void set_resolution(BH1750Resolution resolution);
+  void set_measurement_duration(uint8_t measurement_duration) { measurement_duration_ = measurement_duration; }
+
   // ========== INTERNAL METHODS ==========
   // (In most use cases you won't need these)
   void setup() override;
@@ -24,9 +38,10 @@ class BH1750Sensor : public sensor::Sensor, public PollingComponent, public i2c:
   float get_setup_priority() const override;
 
  protected:
-  void read_lx_(BH1750Mode mode, uint8_t mtreg, const std::function<void(float)> &f);
+  void read_data_();
 
-  uint8_t active_mtreg_{0};
+  BH1750Resolution resolution_{BH1750_RESOLUTION_0P5_LX};
+  uint8_t measurement_duration_;
 };
 
 }  // namespace bh1750

esphome/components/bh1750/sensor.py

@@ -2,23 +2,31 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import i2c, sensor
 from esphome.const import (
+    CONF_ID,
+    CONF_RESOLUTION,
     DEVICE_CLASS_ILLUMINANCE,
     STATE_CLASS_MEASUREMENT,
     UNIT_LUX,
+    CONF_MEASUREMENT_DURATION,
 )
 
 DEPENDENCIES = ["i2c"]
-CODEOWNERS = ["@OttoWinter"]
 
 bh1750_ns = cg.esphome_ns.namespace("bh1750")
+BH1750Resolution = bh1750_ns.enum("BH1750Resolution")
+BH1750_RESOLUTIONS = {
+    4.0: BH1750Resolution.BH1750_RESOLUTION_4P0_LX,
+    1.0: BH1750Resolution.BH1750_RESOLUTION_1P0_LX,
+    0.5: BH1750Resolution.BH1750_RESOLUTION_0P5_LX,
+}
 
 BH1750Sensor = bh1750_ns.class_(
     "BH1750Sensor", sensor.Sensor, cg.PollingComponent, i2c.I2CDevice
 )
 
+CONF_MEASUREMENT_TIME = "measurement_time"
 CONFIG_SCHEMA = (
     sensor.sensor_schema(
-        BH1750Sensor,
         unit_of_measurement=UNIT_LUX,
         accuracy_decimals=1,
         device_class=DEVICE_CLASS_ILLUMINANCE,
@@ -26,11 +34,15 @@ CONFIG_SCHEMA = (
     )
     .extend(
         {
-            cv.Optional("resolution"): cv.invalid(
-                "The 'resolution' option has been removed. The optimal value is now dynamically calculated."
+            cv.GenerateID(): cv.declare_id(BH1750Sensor),
+            cv.Optional(CONF_RESOLUTION, default=0.5): cv.enum(
+                BH1750_RESOLUTIONS, float=True
             ),
-            cv.Optional("measurement_duration"): cv.invalid(
-                "The 'measurement_duration' option has been removed. The optimal value is now dynamically calculated."
+            cv.Optional(CONF_MEASUREMENT_DURATION, default=69): cv.int_range(
+                min=31, max=254
+            ),
+            cv.Optional(CONF_MEASUREMENT_TIME): cv.invalid(
+                "The 'measurement_time' option has been replaced with 'measurement_duration' in 1.18.0"
             ),
         }
     )
@@ -40,6 +52,10 @@ CONFIG_SCHEMA = (
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
+    await sensor.register_sensor(var, config)
     await i2c.register_i2c_device(var, config)
+
+    cg.add(var.set_resolution(config[CONF_RESOLUTION]))
+    cg.add(var.set_measurement_duration(config[CONF_MEASUREMENT_DURATION]))

esphome/components/binary_sensor/__init__.py

@@ -1,6 +1,5 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome.cpp_generator import MockObjClass
 from esphome.cpp_helpers import setup_entity
 from esphome import automation, core
 from esphome.automation import Condition, maybe_simple_id
@@ -8,9 +7,7 @@ from esphome.components import mqtt
 from esphome.const import (
     CONF_DELAY,
     CONF_DEVICE_CLASS,
-    CONF_ENTITY_CATEGORY,
     CONF_FILTERS,
-    CONF_ICON,
     CONF_ID,
     CONF_INVALID_COOLDOWN,
     CONF_INVERTED,
@@ -22,15 +19,14 @@ from esphome.const import (
     CONF_ON_PRESS,
     CONF_ON_RELEASE,
     CONF_ON_STATE,
-    CONF_PUBLISH_INITIAL_STATE,
     CONF_STATE,
     CONF_TIMING,
     CONF_TRIGGER_ID,
+    CONF_NAME,
     CONF_MQTT_ID,
     DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_BATTERY,
     DEVICE_CLASS_BATTERY_CHARGING,
-    DEVICE_CLASS_CARBON_MONOXIDE,
     DEVICE_CLASS_COLD,
     DEVICE_CLASS_CONNECTIVITY,
     DEVICE_CLASS_DOOR,
@@ -65,7 +61,6 @@ DEVICE_CLASSES = [
     DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_BATTERY,
     DEVICE_CLASS_BATTERY_CHARGING,
-    DEVICE_CLASS_CARBON_MONOXIDE,
     DEVICE_CLASS_COLD,
     DEVICE_CLASS_CONNECTIVITY,
     DEVICE_CLASS_DOOR,
@@ -320,7 +315,7 @@ def validate_multi_click_timing(value):
     return timings
 
 
-validate_device_class = cv.one_of(*DEVICE_CLASSES, lower=True, space="_")
+device_class = cv.one_of(*DEVICE_CLASSES, lower=True, space="_")
 
 
 BINARY_SENSOR_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMPONENT_SCHEMA).extend(
@@ -329,8 +324,7 @@ BINARY_SENSOR_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMPONENT_SCHEMA).ex
         cv.OnlyWith(CONF_MQTT_ID, "mqtt"): cv.declare_id(
             mqtt.MQTTBinarySensorComponent
         ),
-        cv.Optional(CONF_PUBLISH_INITIAL_STATE): cv.boolean,
-        cv.Optional(CONF_DEVICE_CLASS): validate_device_class,
+        cv.Optional(CONF_DEVICE_CLASS): device_class,
         cv.Optional(CONF_FILTERS): validate_filters,
         cv.Optional(CONF_ON_PRESS): automation.validate_automation(
             {
@@ -383,47 +377,12 @@ BINARY_SENSOR_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMPONENT_SCHEMA).ex
     }
 )
 
-_UNDEF = object()
-
-
-def binary_sensor_schema(
-    class_: MockObjClass = _UNDEF,
-    *,
-    icon: str = _UNDEF,
-    entity_category: str = _UNDEF,
-    device_class: str = _UNDEF,
-) -> cv.Schema:
-    schema = BINARY_SENSOR_SCHEMA
-    if class_ is not _UNDEF:
-        schema = schema.extend({cv.GenerateID(): cv.declare_id(class_)})
-    if icon is not _UNDEF:
-        schema = schema.extend({cv.Optional(CONF_ICON, default=icon): cv.icon})
-    if entity_category is not _UNDEF:
-        schema = schema.extend(
-            {
-                cv.Optional(
-                    CONF_ENTITY_CATEGORY, default=entity_category
-                ): cv.entity_category
-            }
-        )
-    if device_class is not _UNDEF:
-        schema = schema.extend(
-            {
-                cv.Optional(
-                    CONF_DEVICE_CLASS, default=device_class
-                ): validate_device_class
-            }
-        )
-    return schema
-
 
 async def setup_binary_sensor_core_(var, config):
     await setup_entity(var, config)
 
     if CONF_DEVICE_CLASS in config:
         cg.add(var.set_device_class(config[CONF_DEVICE_CLASS]))
-    if CONF_PUBLISH_INITIAL_STATE in config:
-        cg.add(var.set_publish_initial_state(config[CONF_PUBLISH_INITIAL_STATE]))
     if CONF_INVERTED in config:
         cg.add(var.set_inverted(config[CONF_INVERTED]))
     if CONF_FILTERS in config:
@@ -483,8 +442,8 @@ async def register_binary_sensor(var, config):
     await setup_binary_sensor_core_(var, config)
 
 
-async def new_binary_sensor(config, *args):
-    var = cg.new_Pvariable(config[CONF_ID], *args)
+async def new_binary_sensor(config):
+    var = cg.new_Pvariable(config[CONF_ID], config[CONF_NAME])
     await register_binary_sensor(var, config)
     return var
 

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"

esphome/components/binary_sensor/binary_sensor.cpp

@@ -37,12 +37,13 @@ void BinarySensor::send_state_internal(bool state, bool is_initial) {
   }
   this->has_state_ = true;
   this->state = state;
-  if (!is_initial || this->publish_initial_state_) {
+  if (!is_initial) {
     this->state_callback_.call(state);
   }
 }
 std::string BinarySensor::device_class() { return ""; }
-BinarySensor::BinarySensor() : state(false) {}
+BinarySensor::BinarySensor(const std::string &name) : EntityBase(name), state(false) {}
+BinarySensor::BinarySensor() : BinarySensor("") {}
 void BinarySensor::set_device_class(const std::string &device_class) { this->device_class_ = device_class; }
 std::string BinarySensor::get_device_class() {
   if (this->device_class_.has_value())
@@ -69,6 +70,7 @@ void BinarySensor::add_filters(const std::vector<Filter *> &filters) {
   }
 }
 bool BinarySensor::has_state() const { return this->has_state_; }
+uint32_t BinarySensor::hash_base() { return 1210250844UL; }
 bool BinarySensor::is_status_binary_sensor() const { return false; }
 
 }  // namespace binary_sensor

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 {
@@ -28,6 +26,11 @@ namespace binary_sensor {
 class BinarySensor : public EntityBase {
  public:
   explicit BinarySensor();
+  /** Construct a binary sensor with the specified name
+   *
+   * @param name Name of this binary sensor.
+   */
+  explicit BinarySensor(const std::string &name);
 
   /** Add a callback to be notified of state changes.
    *
@@ -60,8 +63,6 @@ class BinarySensor : public EntityBase {
   void add_filter(Filter *filter);
   void add_filters(const std::vector<Filter *> &filters);
 
-  void set_publish_initial_state(bool publish_initial_state) { this->publish_initial_state_ = publish_initial_state; }
-
   // ========== INTERNAL METHODS ==========
   // (In most use cases you won't need these)
   void send_state_internal(bool state, bool is_initial);
@@ -80,11 +81,12 @@ class BinarySensor : public EntityBase {
   virtual std::string device_class();
 
  protected:
+  uint32_t hash_base() override;
+
   CallbackManager<void(bool)> state_callback_{};
   optional<std::string> device_class_{};  ///< Stores the override of the device class
   Filter *filter_list_{nullptr};
   bool has_state_{false};
-  bool publish_initial_state_{false};
   Deduplicator<bool> publish_dedup_;
 };
 

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 {

esphome/components/binary_sensor_map/binary_sensor_map.cpp

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

esphome/components/binary_sensor_map/binary_sensor_map.h

@@ -4,14 +4,11 @@
 #include "esphome/components/binary_sensor/binary_sensor.h"
 #include "esphome/components/sensor/sensor.h"
 
-#include <vector>
-
 namespace esphome {
 namespace binary_sensor_map {
 
 enum BinarySensorMapType {
   BINARY_SENSOR_MAP_TYPE_GROUP,
-  BINARY_SENSOR_MAP_TYPE_SUM,
 };
 
 struct BinarySensorMapChannel {
@@ -53,10 +50,8 @@ class BinarySensorMap : public sensor::Sensor, public Component {
   /**
    * methods to process the types of binary_sensor_maps
    * GROUP: process_group_() just map to a value
-   * ADD: process_add_() adds all the values
    * */
   void process_group_();
-  void process_sum_();
 };
 
 }  // namespace binary_sensor_map

esphome/components/binary_sensor_map/sensor.py

@@ -3,13 +3,14 @@ import esphome.config_validation as cv
 
 from esphome.components import sensor, binary_sensor
 from esphome.const import (
+    CONF_ID,
     CONF_CHANNELS,
     CONF_VALUE,
     CONF_TYPE,
     ICON_CHECK_CIRCLE_OUTLINE,
     CONF_BINARY_SENSOR,
     CONF_GROUP,
-    CONF_SUM,
+    STATE_CLASS_NONE,
 )
 
 DEPENDENCIES = ["binary_sensor"]
@@ -22,7 +23,6 @@ SensorMapType = binary_sensor_map_ns.enum("SensorMapType")
 
 SENSOR_MAP_TYPES = {
     CONF_GROUP: SensorMapType.BINARY_SENSOR_MAP_TYPE_GROUP,
-    CONF_SUM: SensorMapType.BINARY_SENSOR_MAP_TYPE_SUM,
 }
 
 entry = {
@@ -33,22 +33,12 @@ entry = {
 CONFIG_SCHEMA = cv.typed_schema(
     {
         CONF_GROUP: sensor.sensor_schema(
-            BinarySensorMap,
-            icon=ICON_CHECK_CIRCLE_OUTLINE,
-            accuracy_decimals=0,
-        ).extend(
-            {
-                cv.Required(CONF_CHANNELS): cv.All(
-                    cv.ensure_list(entry), cv.Length(min=1)
-                ),
-            }
-        ),
-        CONF_SUM: sensor.sensor_schema(
-            BinarySensorMap,
             icon=ICON_CHECK_CIRCLE_OUTLINE,
             accuracy_decimals=0,
+            state_class=STATE_CLASS_NONE,
         ).extend(
             {
+                cv.GenerateID(): cv.declare_id(BinarySensorMap),
                 cv.Required(CONF_CHANNELS): cv.All(
                     cv.ensure_list(entry), cv.Length(min=1)
                 ),
@@ -60,8 +50,9 @@ CONFIG_SCHEMA = cv.typed_schema(
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
+    await sensor.register_sensor(var, config)
 
     constant = SENSOR_MAP_TYPES[config[CONF_TYPE]]
     cg.add(var.set_sensor_type(constant))

esphome/components/bl0939/__init__.py

@@ -1 +0,0 @@
-CODEOWNERS = ["@ziceva"]

esphome/components/bl0939/bl0939.cpp

@@ -1,144 +0,0 @@
-#include "bl0939.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace bl0939 {
-
-static const char *const TAG = "bl0939";
-
-// https://www.belling.com.cn/media/file_object/bel_product/BL0939/datasheet/BL0939_V1.2_cn.pdf
-// (unfortunately chinese, but the protocol can be understood with some translation tool)
-static const uint8_t BL0939_READ_COMMAND = 0x55;  // 0x5{A4,A3,A2,A1}
-static const uint8_t BL0939_FULL_PACKET = 0xAA;
-static const uint8_t BL0939_PACKET_HEADER = 0x55;
-
-static const uint8_t BL0939_WRITE_COMMAND = 0xA5;  // 0xA{A4,A3,A2,A1}
-static const uint8_t BL0939_REG_IA_FAST_RMS_CTRL = 0x10;
-static const uint8_t BL0939_REG_IB_FAST_RMS_CTRL = 0x1E;
-static const uint8_t BL0939_REG_MODE = 0x18;
-static const uint8_t BL0939_REG_SOFT_RESET = 0x19;
-static const uint8_t BL0939_REG_USR_WRPROT = 0x1A;
-static const uint8_t BL0939_REG_TPS_CTRL = 0x1B;
-
-const uint8_t BL0939_INIT[6][6] = {
-    // Reset to default
-    {BL0939_WRITE_COMMAND, BL0939_REG_SOFT_RESET, 0x5A, 0x5A, 0x5A, 0x33},
-    // Enable User Operation Write
-    {BL0939_WRITE_COMMAND, BL0939_REG_USR_WRPROT, 0x55, 0x00, 0x00, 0xEB},
-    // 0x0100 = CF_UNABLE energy pulse, AC_FREQ_SEL 50Hz, RMS_UPDATE_SEL 800mS
-    {BL0939_WRITE_COMMAND, BL0939_REG_MODE, 0x00, 0x10, 0x00, 0x32},
-    // 0x47FF = Over-current and leakage alarm on, Automatic temperature measurement, Interval 100mS
-    {BL0939_WRITE_COMMAND, BL0939_REG_TPS_CTRL, 0xFF, 0x47, 0x00, 0xF9},
-    // 0x181C = Half cycle, Fast RMS threshold 6172
-    {BL0939_WRITE_COMMAND, BL0939_REG_IA_FAST_RMS_CTRL, 0x1C, 0x18, 0x00, 0x16},
-    // 0x181C = Half cycle, Fast RMS threshold 6172
-    {BL0939_WRITE_COMMAND, BL0939_REG_IB_FAST_RMS_CTRL, 0x1C, 0x18, 0x00, 0x08}};
-
-void BL0939::loop() {
-  DataPacket buffer;
-  if (!this->available()) {
-    return;
-  }
-  if (read_array((uint8_t *) &buffer, sizeof(buffer))) {
-    if (validate_checksum(&buffer)) {
-      received_package_(&buffer);
-    }
-  } else {
-    ESP_LOGW(TAG, "Junk on wire. Throwing away partial message");
-    while (read() >= 0)
-      ;
-  }
-}
-
-bool BL0939::validate_checksum(const DataPacket *data) {
-  uint8_t checksum = BL0939_READ_COMMAND;
-  // Whole package but checksum
-  for (uint32_t i = 0; i < sizeof(data->raw) - 1; i++) {
-    checksum += data->raw[i];
-  }
-  checksum ^= 0xFF;
-  if (checksum != data->checksum) {
-    ESP_LOGW(TAG, "BL0939 invalid checksum! 0x%02X != 0x%02X", checksum, data->checksum);
-  }
-  return checksum == data->checksum;
-}
-
-void BL0939::update() {
-  this->flush();
-  this->write_byte(BL0939_READ_COMMAND);
-  this->write_byte(BL0939_FULL_PACKET);
-}
-
-void BL0939::setup() {
-  for (auto *i : BL0939_INIT) {
-    this->write_array(i, 6);
-    delay(1);
-  }
-  this->flush();
-}
-
-void BL0939::received_package_(const DataPacket *data) const {
-  // Bad header
-  if (data->frame_header != BL0939_PACKET_HEADER) {
-    ESP_LOGI("bl0939", "Invalid data. Header mismatch: %d", data->frame_header);
-    return;
-  }
-
-  float v_rms = (float) to_uint32_t(data->v_rms) / voltage_reference_;
-  float ia_rms = (float) to_uint32_t(data->ia_rms) / current_reference_;
-  float ib_rms = (float) to_uint32_t(data->ib_rms) / current_reference_;
-  float a_watt = (float) to_int32_t(data->a_watt) / power_reference_;
-  float b_watt = (float) to_int32_t(data->b_watt) / power_reference_;
-  int32_t cfa_cnt = to_int32_t(data->cfa_cnt);
-  int32_t cfb_cnt = to_int32_t(data->cfb_cnt);
-  float a_energy_consumption = (float) cfa_cnt / energy_reference_;
-  float b_energy_consumption = (float) cfb_cnt / energy_reference_;
-  float total_energy_consumption = a_energy_consumption + b_energy_consumption;
-
-  if (voltage_sensor_ != nullptr) {
-    voltage_sensor_->publish_state(v_rms);
-  }
-  if (current_sensor_1_ != nullptr) {
-    current_sensor_1_->publish_state(ia_rms);
-  }
-  if (current_sensor_2_ != nullptr) {
-    current_sensor_2_->publish_state(ib_rms);
-  }
-  if (power_sensor_1_ != nullptr) {
-    power_sensor_1_->publish_state(a_watt);
-  }
-  if (power_sensor_2_ != nullptr) {
-    power_sensor_2_->publish_state(b_watt);
-  }
-  if (energy_sensor_1_ != nullptr) {
-    energy_sensor_1_->publish_state(a_energy_consumption);
-  }
-  if (energy_sensor_2_ != nullptr) {
-    energy_sensor_2_->publish_state(b_energy_consumption);
-  }
-  if (energy_sensor_sum_ != nullptr) {
-    energy_sensor_sum_->publish_state(total_energy_consumption);
-  }
-
-  ESP_LOGV("bl0939", "BL0939: U %fV, I1 %fA, I2 %fA, P1 %fW, P2 %fW, CntA %d, CntB %d, ∫P1 %fkWh, ∫P2 %fkWh", v_rms,
-           ia_rms, ib_rms, a_watt, b_watt, cfa_cnt, cfb_cnt, a_energy_consumption, b_energy_consumption);
-}
-
-void BL0939::dump_config() {  // NOLINT(readability-function-cognitive-complexity)
-  ESP_LOGCONFIG(TAG, "BL0939:");
-  LOG_SENSOR("", "Voltage", this->voltage_sensor_);
-  LOG_SENSOR("", "Current 1", this->current_sensor_1_);
-  LOG_SENSOR("", "Current 2", this->current_sensor_2_);
-  LOG_SENSOR("", "Power 1", this->power_sensor_1_);
-  LOG_SENSOR("", "Power 2", this->power_sensor_2_);
-  LOG_SENSOR("", "Energy 1", this->energy_sensor_1_);
-  LOG_SENSOR("", "Energy 2", this->energy_sensor_2_);
-  LOG_SENSOR("", "Energy sum", this->energy_sensor_sum_);
-}
-
-uint32_t BL0939::to_uint32_t(ube24_t input) { return input.h << 16 | input.m << 8 | input.l; }
-
-int32_t BL0939::to_int32_t(sbe24_t input) { return input.h << 16 | input.m << 8 | input.l; }
-
-}  // namespace bl0939
-}  // namespace esphome

esphome/components/bl0939/bl0939.h

@@ -1,107 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/uart/uart.h"
-#include "esphome/components/sensor/sensor.h"
-
-namespace esphome {
-namespace bl0939 {
-
-// https://datasheet.lcsc.com/lcsc/2108071830_BL-Shanghai-Belling-BL0939_C2841044.pdf
-// (unfortunately chinese, but the formulas can be easily understood)
-// Sonoff Dual R3 V2 has the exact same resistor values for the current shunts (RL=1miliOhm)
-// and for the voltage divider (R1=0.51kOhm, R2=5*390kOhm)
-// as in the manufacturer's reference circuit, so the same formulas were used here (Vref=1.218V)
-static const float BL0939_IREF = 324004 * 1 / 1.218;
-static const float BL0939_UREF = 79931 * 0.51 * 1000 / (1.218 * (5 * 390 + 0.51));
-static const float BL0939_PREF = 4046 * 1 * 0.51 * 1000 / (1.218 * 1.218 * (5 * 390 + 0.51));
-static const float BL0939_EREF = 3.6e6 * 4046 * 1 * 0.51 * 1000 / (1638.4 * 256 * 1.218 * 1.218 * (5 * 390 + 0.51));
-
-struct ube24_t {  // NOLINT(readability-identifier-naming,altera-struct-pack-align)
-  uint8_t l;
-  uint8_t m;
-  uint8_t h;
-} __attribute__((packed));
-
-struct ube16_t {  // NOLINT(readability-identifier-naming,altera-struct-pack-align)
-  uint8_t l;
-  uint8_t h;
-} __attribute__((packed));
-
-struct sbe24_t {  // NOLINT(readability-identifier-naming,altera-struct-pack-align)
-  uint8_t l;
-  uint8_t m;
-  int8_t h;
-} __attribute__((packed));
-
-// Caveat: All these values are big endian (low - middle - high)
-
-union DataPacket {  // NOLINT(altera-struct-pack-align)
-  uint8_t raw[35];
-  struct {
-    uint8_t frame_header;  // 0x55 according to docs
-    ube24_t ia_fast_rms;
-    ube24_t ia_rms;
-    ube24_t ib_rms;
-    ube24_t v_rms;
-    ube24_t ib_fast_rms;
-    sbe24_t a_watt;
-    sbe24_t b_watt;
-    sbe24_t cfa_cnt;
-    sbe24_t cfb_cnt;
-    ube16_t tps1;
-    uint8_t RESERVED1;  // value of 0x00
-    ube16_t tps2;
-    uint8_t RESERVED2;  // value of 0x00
-    uint8_t checksum;   // checksum
-  };
-} __attribute__((packed));
-
-class BL0939 : public PollingComponent, public uart::UARTDevice {
- public:
-  void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
-  void set_current_sensor_1(sensor::Sensor *current_sensor_1) { current_sensor_1_ = current_sensor_1; }
-  void set_current_sensor_2(sensor::Sensor *current_sensor_2) { current_sensor_2_ = current_sensor_2; }
-  void set_power_sensor_1(sensor::Sensor *power_sensor_1) { power_sensor_1_ = power_sensor_1; }
-  void set_power_sensor_2(sensor::Sensor *power_sensor_2) { power_sensor_2_ = power_sensor_2; }
-  void set_energy_sensor_1(sensor::Sensor *energy_sensor_1) { energy_sensor_1_ = energy_sensor_1; }
-  void set_energy_sensor_2(sensor::Sensor *energy_sensor_2) { energy_sensor_2_ = energy_sensor_2; }
-  void set_energy_sensor_sum(sensor::Sensor *energy_sensor_sum) { energy_sensor_sum_ = energy_sensor_sum; }
-
-  void loop() override;
-
-  void update() override;
-  void setup() override;
-  void dump_config() override;
-
- protected:
-  sensor::Sensor *voltage_sensor_{nullptr};
-  sensor::Sensor *current_sensor_1_{nullptr};
-  sensor::Sensor *current_sensor_2_{nullptr};
-  // NB This may be negative as the circuits is seemingly able to measure
-  // power in both directions
-  sensor::Sensor *power_sensor_1_{nullptr};
-  sensor::Sensor *power_sensor_2_{nullptr};
-  sensor::Sensor *energy_sensor_1_{nullptr};
-  sensor::Sensor *energy_sensor_2_{nullptr};
-  sensor::Sensor *energy_sensor_sum_{nullptr};
-
-  // Divide by this to turn into Watt
-  float power_reference_ = BL0939_PREF;
-  // Divide by this to turn into Volt
-  float voltage_reference_ = BL0939_UREF;
-  // Divide by this to turn into Ampere
-  float current_reference_ = BL0939_IREF;
-  // Divide by this to turn into kWh
-  float energy_reference_ = BL0939_EREF;
-
-  static uint32_t to_uint32_t(ube24_t input);
-
-  static int32_t to_int32_t(sbe24_t input);
-
-  static bool validate_checksum(const DataPacket *data);
-
-  void received_package_(const DataPacket *data) const;
-};
-}  // namespace bl0939
-}  // namespace esphome

esphome/components/bl0939/sensor.py

@@ -1,123 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor, uart
-from esphome.const import (
-    CONF_ID,
-    CONF_VOLTAGE,
-    DEVICE_CLASS_CURRENT,
-    DEVICE_CLASS_ENERGY,
-    DEVICE_CLASS_POWER,
-    DEVICE_CLASS_VOLTAGE,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_AMPERE,
-    UNIT_KILOWATT_HOURS,
-    UNIT_VOLT,
-    UNIT_WATT,
-)
-
-DEPENDENCIES = ["uart"]
-
-CONF_CURRENT_1 = "current_1"
-CONF_CURRENT_2 = "current_2"
-CONF_ACTIVE_POWER_1 = "active_power_1"
-CONF_ACTIVE_POWER_2 = "active_power_2"
-CONF_ENERGY_1 = "energy_1"
-CONF_ENERGY_2 = "energy_2"
-CONF_ENERGY_TOTAL = "energy_total"
-
-bl0939_ns = cg.esphome_ns.namespace("bl0939")
-BL0939 = bl0939_ns.class_("BL0939", cg.PollingComponent, uart.UARTDevice)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(BL0939),
-            cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_VOLT,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_VOLTAGE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_CURRENT_1): sensor.sensor_schema(
-                unit_of_measurement=UNIT_AMPERE,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_CURRENT,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_CURRENT_2): sensor.sensor_schema(
-                unit_of_measurement=UNIT_AMPERE,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_CURRENT,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_ACTIVE_POWER_1): sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_POWER,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_ACTIVE_POWER_2): sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_POWER,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_ENERGY_1): sensor.sensor_schema(
-                unit_of_measurement=UNIT_KILOWATT_HOURS,
-                accuracy_decimals=3,
-                device_class=DEVICE_CLASS_ENERGY,
-            ),
-            cv.Optional(CONF_ENERGY_2): sensor.sensor_schema(
-                unit_of_measurement=UNIT_KILOWATT_HOURS,
-                accuracy_decimals=3,
-                device_class=DEVICE_CLASS_ENERGY,
-            ),
-            cv.Optional(CONF_ENERGY_TOTAL): sensor.sensor_schema(
-                unit_of_measurement=UNIT_KILOWATT_HOURS,
-                accuracy_decimals=3,
-                device_class=DEVICE_CLASS_ENERGY,
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(uart.UART_DEVICE_SCHEMA)
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await uart.register_uart_device(var, config)
-
-    if CONF_VOLTAGE in config:
-        conf = config[CONF_VOLTAGE]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_voltage_sensor(sens))
-    if CONF_CURRENT_1 in config:
-        conf = config[CONF_CURRENT_1]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_current_sensor_1(sens))
-    if CONF_CURRENT_2 in config:
-        conf = config[CONF_CURRENT_2]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_current_sensor_2(sens))
-    if CONF_ACTIVE_POWER_1 in config:
-        conf = config[CONF_ACTIVE_POWER_1]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_power_sensor_1(sens))
-    if CONF_ACTIVE_POWER_2 in config:
-        conf = config[CONF_ACTIVE_POWER_2]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_power_sensor_2(sens))
-    if CONF_ENERGY_1 in config:
-        conf = config[CONF_ENERGY_1]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_energy_sensor_1(sens))
-    if CONF_ENERGY_2 in config:
-        conf = config[CONF_ENERGY_2]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_energy_sensor_2(sens))
-    if CONF_ENERGY_TOTAL in config:
-        conf = config[CONF_ENERGY_TOTAL]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_energy_sensor_sum(sens))

esphome/components/bl0940/bl0940.h

@@ -75,14 +75,14 @@ class BL0940 : public PollingComponent, public uart::UARTDevice {
   void dump_config() override;
 
  protected:
-  sensor::Sensor *voltage_sensor_{nullptr};
-  sensor::Sensor *current_sensor_{nullptr};
+  sensor::Sensor *voltage_sensor_;
+  sensor::Sensor *current_sensor_;
   // NB This may be negative as the circuits is seemingly able to measure
   // power in both directions
-  sensor::Sensor *power_sensor_{nullptr};
-  sensor::Sensor *energy_sensor_{nullptr};
-  sensor::Sensor *internal_temperature_sensor_{nullptr};
-  sensor::Sensor *external_temperature_sensor_{nullptr};
+  sensor::Sensor *power_sensor_;
+  sensor::Sensor *energy_sensor_;
+  sensor::Sensor *internal_temperature_sensor_;
+  sensor::Sensor *external_temperature_sensor_;
 
   // Max difference between two measurements of the temperature. Used to avoid noise.
   float max_temperature_diff_{0};

esphome/components/bl0940/sensor.py

@@ -12,7 +12,9 @@ from esphome.const import (
     DEVICE_CLASS_POWER,
     DEVICE_CLASS_VOLTAGE,
     DEVICE_CLASS_TEMPERATURE,
+    ICON_EMPTY,
     STATE_CLASS_MEASUREMENT,
+    STATE_CLASS_NONE,
     UNIT_AMPERE,
     UNIT_CELSIUS,
     UNIT_KILOWATT_HOURS,
@@ -33,39 +35,38 @@ CONFIG_SCHEMA = (
         {
             cv.GenerateID(): cv.declare_id(BL0940),
             cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_VOLT,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_VOLTAGE,
-                state_class=STATE_CLASS_MEASUREMENT,
+                UNIT_VOLT, ICON_EMPTY, 1, DEVICE_CLASS_VOLTAGE, STATE_CLASS_MEASUREMENT
             ),
             cv.Optional(CONF_CURRENT): sensor.sensor_schema(
-                unit_of_measurement=UNIT_AMPERE,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_CURRENT,
-                state_class=STATE_CLASS_MEASUREMENT,
+                UNIT_AMPERE,
+                ICON_EMPTY,
+                2,
+                DEVICE_CLASS_CURRENT,
+                STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_POWER): sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_POWER,
-                state_class=STATE_CLASS_MEASUREMENT,
+                UNIT_WATT, ICON_EMPTY, 0, DEVICE_CLASS_POWER, STATE_CLASS_MEASUREMENT
             ),
             cv.Optional(CONF_ENERGY): sensor.sensor_schema(
-                unit_of_measurement=UNIT_KILOWATT_HOURS,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_ENERGY,
+                UNIT_KILOWATT_HOURS,
+                ICON_EMPTY,
+                0,
+                DEVICE_CLASS_ENERGY,
+                STATE_CLASS_NONE,
             ),
             cv.Optional(CONF_INTERNAL_TEMPERATURE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_CELSIUS,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_TEMPERATURE,
-                state_class=STATE_CLASS_MEASUREMENT,
+                UNIT_CELSIUS,
+                ICON_EMPTY,
+                0,
+                DEVICE_CLASS_TEMPERATURE,
+                STATE_CLASS_NONE,
             ),
             cv.Optional(CONF_EXTERNAL_TEMPERATURE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_CELSIUS,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_TEMPERATURE,
-                state_class=STATE_CLASS_MEASUREMENT,
+                UNIT_CELSIUS,
+                ICON_EMPTY,
+                0,
+                DEVICE_CLASS_TEMPERATURE,
+                STATE_CLASS_NONE,
             ),
         }
     )

esphome/components/bl0942/__init__.py

@@ -1 +0,0 @@
-CODEOWNERS = ["@dbuezas"]

esphome/components/bl0942/bl0942.cpp

@@ -1,121 +0,0 @@
-#include "bl0942.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace bl0942 {
-
-static const char *const TAG = "bl0942";
-
-static const uint8_t BL0942_READ_COMMAND = 0x58;
-static const uint8_t BL0942_FULL_PACKET = 0xAA;
-static const uint8_t BL0942_PACKET_HEADER = 0x55;
-
-static const uint8_t BL0942_WRITE_COMMAND = 0xA8;
-static const uint8_t BL0942_REG_I_FAST_RMS_CTRL = 0x10;
-static const uint8_t BL0942_REG_MODE = 0x18;
-static const uint8_t BL0942_REG_SOFT_RESET = 0x19;
-static const uint8_t BL0942_REG_USR_WRPROT = 0x1A;
-static const uint8_t BL0942_REG_TPS_CTRL = 0x1B;
-
-// TODO: Confirm insialisation works as intended
-const uint8_t BL0942_INIT[5][6] = {
-    // Reset to default
-    {BL0942_WRITE_COMMAND, BL0942_REG_SOFT_RESET, 0x5A, 0x5A, 0x5A, 0x38},
-    // Enable User Operation Write
-    {BL0942_WRITE_COMMAND, BL0942_REG_USR_WRPROT, 0x55, 0x00, 0x00, 0xF0},
-    // 0x0100 = CF_UNABLE energy pulse, AC_FREQ_SEL 50Hz, RMS_UPDATE_SEL 800mS
-    {BL0942_WRITE_COMMAND, BL0942_REG_MODE, 0x00, 0x10, 0x00, 0x37},
-    // 0x47FF = Over-current and leakage alarm on, Automatic temperature measurement, Interval 100mS
-    {BL0942_WRITE_COMMAND, BL0942_REG_TPS_CTRL, 0xFF, 0x47, 0x00, 0xFE},
-    // 0x181C = Half cycle, Fast RMS threshold 6172
-    {BL0942_WRITE_COMMAND, BL0942_REG_I_FAST_RMS_CTRL, 0x1C, 0x18, 0x00, 0x1B}};
-
-void BL0942::loop() {
-  DataPacket buffer;
-  if (!this->available()) {
-    return;
-  }
-  if (read_array((uint8_t *) &buffer, sizeof(buffer))) {
-    if (validate_checksum(&buffer)) {
-      received_package_(&buffer);
-    }
-  } else {
-    ESP_LOGW(TAG, "Junk on wire. Throwing away partial message");
-    while (read() >= 0)
-      ;
-  }
-}
-
-bool BL0942::validate_checksum(DataPacket *data) {
-  uint8_t checksum = BL0942_READ_COMMAND;
-  // Whole package but checksum
-  uint8_t *raw = (uint8_t *) data;
-  for (uint32_t i = 0; i < sizeof(*data) - 1; i++) {
-    checksum += raw[i];
-  }
-  checksum ^= 0xFF;
-  if (checksum != data->checksum) {
-    ESP_LOGW(TAG, "BL0942 invalid checksum! 0x%02X != 0x%02X", checksum, data->checksum);
-  }
-  return checksum == data->checksum;
-}
-
-void BL0942::update() {
-  this->flush();
-  this->write_byte(BL0942_READ_COMMAND);
-  this->write_byte(BL0942_FULL_PACKET);
-}
-
-void BL0942::setup() {
-  for (auto *i : BL0942_INIT) {
-    this->write_array(i, 6);
-    delay(1);
-  }
-  this->flush();
-}
-
-void BL0942::received_package_(DataPacket *data) {
-  // Bad header
-  if (data->frame_header != BL0942_PACKET_HEADER) {
-    ESP_LOGI(TAG, "Invalid data. Header mismatch: %d", data->frame_header);
-    return;
-  }
-
-  float v_rms = (uint24_t) data->v_rms / voltage_reference_;
-  float i_rms = (uint24_t) data->i_rms / current_reference_;
-  float watt = (int24_t) data->watt / power_reference_;
-  uint32_t cf_cnt = (uint24_t) data->cf_cnt;
-  float total_energy_consumption = cf_cnt / energy_reference_;
-  float frequency = 1000000.0f / data->frequency;
-
-  if (voltage_sensor_ != nullptr) {
-    voltage_sensor_->publish_state(v_rms);
-  }
-  if (current_sensor_ != nullptr) {
-    current_sensor_->publish_state(i_rms);
-  }
-  if (power_sensor_ != nullptr) {
-    power_sensor_->publish_state(watt);
-  }
-  if (energy_sensor_ != nullptr) {
-    energy_sensor_->publish_state(total_energy_consumption);
-  }
-  if (frequency_sensor_ != nullptr) {
-    frequency_sensor_->publish_state(frequency);
-  }
-
-  ESP_LOGV(TAG, "BL0942: U %fV, I %fA, P %fW, Cnt %d, ∫P %fkWh, frequency %f°Hz, status 0x%08X", v_rms, i_rms, watt,
-           cf_cnt, total_energy_consumption, frequency, data->status);
-}
-
-void BL0942::dump_config() {  // NOLINT(readability-function-cognitive-complexity)
-  ESP_LOGCONFIG(TAG, "BL0942:");
-  LOG_SENSOR("", "Voltage", this->voltage_sensor_);
-  LOG_SENSOR("", "Current", this->current_sensor_);
-  LOG_SENSOR("", "Power", this->power_sensor_);
-  LOG_SENSOR("", "Energy", this->energy_sensor_);
-  LOG_SENSOR("", "frequency", this->frequency_sensor_);
-}
-
-}  // namespace bl0942
-}  // namespace esphome

esphome/components/bl0942/bl0942.h

@@ -1,68 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/datatypes.h"
-#include "esphome/components/uart/uart.h"
-#include "esphome/components/sensor/sensor.h"
-
-namespace esphome {
-namespace bl0942 {
-
-static const float BL0942_PREF = 596;              // taken from tasmota
-static const float BL0942_UREF = 15873.35944299;   // should be 73989/1.218
-static const float BL0942_IREF = 251213.46469622;  // 305978/1.218
-static const float BL0942_EREF = 3304.61127328;    // Measured
-
-struct DataPacket {
-  uint8_t frame_header;
-  uint24_le_t i_rms;
-  uint24_le_t v_rms;
-  uint24_le_t i_fast_rms;
-  int24_le_t watt;
-  uint24_le_t cf_cnt;
-  uint16_le_t frequency;
-  uint8_t reserved1;
-  uint8_t status;
-  uint8_t reserved2;
-  uint8_t reserved3;
-  uint8_t checksum;
-} __attribute__((packed));
-
-class BL0942 : public PollingComponent, public uart::UARTDevice {
- public:
-  void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
-  void set_current_sensor(sensor::Sensor *current_sensor) { current_sensor_ = current_sensor; }
-  void set_power_sensor(sensor::Sensor *power_sensor) { power_sensor_ = power_sensor; }
-  void set_energy_sensor(sensor::Sensor *energy_sensor) { energy_sensor_ = energy_sensor; }
-  void set_frequency_sensor(sensor::Sensor *frequency_sensor) { frequency_sensor_ = frequency_sensor; }
-
-  void loop() override;
-
-  void update() override;
-  void setup() override;
-  void dump_config() override;
-
- protected:
-  sensor::Sensor *voltage_sensor_{nullptr};
-  sensor::Sensor *current_sensor_{nullptr};
-  // NB This may be negative as the circuits is seemingly able to measure
-  // power in both directions
-  sensor::Sensor *power_sensor_{nullptr};
-  sensor::Sensor *energy_sensor_{nullptr};
-  sensor::Sensor *frequency_sensor_{nullptr};
-
-  // Divide by this to turn into Watt
-  float power_reference_ = BL0942_PREF;
-  // Divide by this to turn into Volt
-  float voltage_reference_ = BL0942_UREF;
-  // Divide by this to turn into Ampere
-  float current_reference_ = BL0942_IREF;
-  // Divide by this to turn into kWh
-  float energy_reference_ = BL0942_EREF;
-
-  static bool validate_checksum(DataPacket *data);
-
-  void received_package_(DataPacket *data);
-};
-}  // namespace bl0942
-}  // namespace esphome

esphome/components/bl0942/sensor.py

@@ -1,93 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor, uart
-from esphome.const import (
-    CONF_CURRENT,
-    CONF_ENERGY,
-    CONF_ID,
-    CONF_POWER,
-    CONF_VOLTAGE,
-    CONF_FREQUENCY,
-    DEVICE_CLASS_CURRENT,
-    DEVICE_CLASS_ENERGY,
-    DEVICE_CLASS_POWER,
-    DEVICE_CLASS_VOLTAGE,
-    DEVICE_CLASS_FREQUENCY,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_AMPERE,
-    UNIT_KILOWATT_HOURS,
-    UNIT_VOLT,
-    UNIT_WATT,
-    UNIT_HERTZ,
-)
-
-DEPENDENCIES = ["uart"]
-
-bl0942_ns = cg.esphome_ns.namespace("bl0942")
-BL0942 = bl0942_ns.class_("BL0942", cg.PollingComponent, uart.UARTDevice)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(BL0942),
-            cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_VOLT,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_VOLTAGE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_CURRENT): sensor.sensor_schema(
-                unit_of_measurement=UNIT_AMPERE,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_CURRENT,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_POWER): sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_POWER,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_ENERGY): sensor.sensor_schema(
-                unit_of_measurement=UNIT_KILOWATT_HOURS,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_ENERGY,
-            ),
-            cv.Optional(CONF_FREQUENCY): sensor.sensor_schema(
-                unit_of_measurement=UNIT_HERTZ,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_FREQUENCY,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(uart.UART_DEVICE_SCHEMA)
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await uart.register_uart_device(var, config)
-
-    if CONF_VOLTAGE in config:
-        conf = config[CONF_VOLTAGE]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_voltage_sensor(sens))
-    if CONF_CURRENT in config:
-        conf = config[CONF_CURRENT]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_current_sensor(sens))
-    if CONF_POWER in config:
-        conf = config[CONF_POWER]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_power_sensor(sens))
-    if CONF_ENERGY in config:
-        conf = config[CONF_ENERGY]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_energy_sensor(sens))
-    if CONF_FREQUENCY in config:
-        conf = config[CONF_FREQUENCY]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_frequency_sensor(sens))

esphome/components/ble_client/__init__.py

@@ -1,25 +1,23 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome.components import esp32_ble_tracker, esp32_ble_client
+from esphome.components import esp32_ble_tracker
 from esphome.const import (
-    CONF_CHARACTERISTIC_UUID,
     CONF_ID,
     CONF_MAC_ADDRESS,
     CONF_NAME,
     CONF_ON_CONNECT,
     CONF_ON_DISCONNECT,
-    CONF_SERVICE_UUID,
     CONF_TRIGGER_ID,
-    CONF_VALUE,
 )
 from esphome import automation
 
-AUTO_LOAD = ["esp32_ble_client"]
 CODEOWNERS = ["@buxtronix"]
 DEPENDENCIES = ["esp32_ble_tracker"]
 
 ble_client_ns = cg.esphome_ns.namespace("ble_client")
-BLEClient = ble_client_ns.class_("BLEClient", esp32_ble_client.BLEClientBase)
+BLEClient = ble_client_ns.class_(
+    "BLEClient", cg.Component, esp32_ble_tracker.ESPBTClient
+)
 BLEClientNode = ble_client_ns.class_("BLEClientNode")
 BLEClientNodeConstRef = BLEClientNode.operator("ref").operator("const")
 # Triggers
@@ -29,8 +27,6 @@ BLEClientConnectTrigger = ble_client_ns.class_(
 BLEClientDisconnectTrigger = ble_client_ns.class_(
     "BLEClientDisconnectTrigger", automation.Trigger.template(BLEClientNodeConstRef)
 )
-# Actions
-BLEWriteAction = ble_client_ns.class_("BLEClientWriteAction", automation.Action)
 
 # Espressif platformio framework is built with MAX_BLE_CONN to 3, so
 # enforce this in yaml checks.
@@ -66,7 +62,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),
     }
 )
 
@@ -76,67 +72,6 @@ async def register_ble_node(var, config):
     cg.add(parent.register_ble_node(var))
 
 
-BLE_WRITE_ACTION_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(CONF_ID): cv.use_id(BLEClient),
-        cv.Required(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
-        cv.Required(CONF_CHARACTERISTIC_UUID): esp32_ble_tracker.bt_uuid,
-        cv.Required(CONF_VALUE): cv.templatable(cv.ensure_list(cv.hex_uint8_t)),
-    }
-)
-
-
-@automation.register_action(
-    "ble_client.ble_write", BLEWriteAction, BLE_WRITE_ACTION_SCHEMA
-)
-async def ble_write_to_code(config, action_id, template_arg, args):
-    paren = await cg.get_variable(config[CONF_ID])
-    var = cg.new_Pvariable(action_id, template_arg, paren)
-
-    value = config[CONF_VALUE]
-    if cg.is_template(value):
-        templ = await cg.templatable(value, args, cg.std_vector.template(cg.uint8))
-        cg.add(var.set_value_template(templ))
-    else:
-        cg.add(var.set_value_simple(value))
-
-    if len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid16_format):
-        cg.add(
-            var.set_service_uuid16(esp32_ble_tracker.as_hex(config[CONF_SERVICE_UUID]))
-        )
-    elif len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid32_format):
-        cg.add(
-            var.set_service_uuid32(esp32_ble_tracker.as_hex(config[CONF_SERVICE_UUID]))
-        )
-    elif len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid128_format):
-        uuid128 = esp32_ble_tracker.as_reversed_hex_array(config[CONF_SERVICE_UUID])
-        cg.add(var.set_service_uuid128(uuid128))
-
-    if len(config[CONF_CHARACTERISTIC_UUID]) == len(esp32_ble_tracker.bt_uuid16_format):
-        cg.add(
-            var.set_char_uuid16(
-                esp32_ble_tracker.as_hex(config[CONF_CHARACTERISTIC_UUID])
-            )
-        )
-    elif len(config[CONF_CHARACTERISTIC_UUID]) == len(
-        esp32_ble_tracker.bt_uuid32_format
-    ):
-        cg.add(
-            var.set_char_uuid32(
-                esp32_ble_tracker.as_hex(config[CONF_CHARACTERISTIC_UUID])
-            )
-        )
-    elif len(config[CONF_CHARACTERISTIC_UUID]) == len(
-        esp32_ble_tracker.bt_uuid128_format
-    ):
-        uuid128 = esp32_ble_tracker.as_reversed_hex_array(
-            config[CONF_CHARACTERISTIC_UUID]
-        )
-        cg.add(var.set_char_uuid128(uuid128))
-
-    return var
-
-
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)

esphome/components/ble_client/automation.cpp

@@ -1,75 +0,0 @@
-#include "automation.h"
-
-#include <esp_bt_defs.h>
-#include <esp_gap_ble_api.h>
-#include <esp_gattc_api.h>
-
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace ble_client {
-static const char *const TAG = "ble_client.automation";
-
-void BLEWriterClientNode::write(const std::vector<uint8_t> &value) {
-  if (this->node_state != espbt::ClientState::ESTABLISHED) {
-    ESP_LOGW(TAG, "Cannot write to BLE characteristic - not connected");
-    return;
-  } else if (this->ble_char_handle_ == 0) {
-    ESP_LOGW(TAG, "Cannot write to BLE characteristic - characteristic not found");
-    return;
-  }
-  esp_gatt_write_type_t write_type;
-  if (this->char_props_ & ESP_GATT_CHAR_PROP_BIT_WRITE) {
-    write_type = ESP_GATT_WRITE_TYPE_RSP;
-    ESP_LOGD(TAG, "Write type: ESP_GATT_WRITE_TYPE_RSP");
-  } else if (this->char_props_ & ESP_GATT_CHAR_PROP_BIT_WRITE_NR) {
-    write_type = ESP_GATT_WRITE_TYPE_NO_RSP;
-    ESP_LOGD(TAG, "Write type: ESP_GATT_WRITE_TYPE_NO_RSP");
-  } else {
-    ESP_LOGE(TAG, "Characteristic %s does not allow writing", this->char_uuid_.to_string().c_str());
-    return;
-  }
-  ESP_LOGVV(TAG, "Will write %d bytes: %s", value.size(), format_hex_pretty(value).c_str());
-  esp_err_t err =
-      esp_ble_gattc_write_char(this->parent()->get_gattc_if(), this->parent()->get_conn_id(), this->ble_char_handle_,
-                               value.size(), const_cast<uint8_t *>(value.data()), write_type, ESP_GATT_AUTH_REQ_NONE);
-  if (err != ESP_OK) {
-    ESP_LOGE(TAG, "Error writing to characteristic: %s!", esp_err_to_name(err));
-  }
-}
-
-void BLEWriterClientNode::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                                              esp_ble_gattc_cb_param_t *param) {
-  switch (event) {
-    case ESP_GATTC_REG_EVT:
-      break;
-    case ESP_GATTC_OPEN_EVT:
-      this->node_state = espbt::ClientState::ESTABLISHED;
-      ESP_LOGD(TAG, "Connection established with %s", ble_client_->address_str().c_str());
-      break;
-    case ESP_GATTC_SEARCH_CMPL_EVT: {
-      auto *chr = this->parent()->get_characteristic(this->service_uuid_, this->char_uuid_);
-      if (chr == nullptr) {
-        ESP_LOGW("ble_write_action", "Characteristic %s was not found in service %s",
-                 this->char_uuid_.to_string().c_str(), this->service_uuid_.to_string().c_str());
-        break;
-      }
-      this->ble_char_handle_ = chr->handle;
-      this->char_props_ = chr->properties;
-      this->node_state = espbt::ClientState::ESTABLISHED;
-      ESP_LOGD(TAG, "Found characteristic %s on device %s", this->char_uuid_.to_string().c_str(),
-               ble_client_->address_str().c_str());
-      break;
-    }
-    case ESP_GATTC_DISCONNECT_EVT:
-      this->node_state = espbt::ClientState::IDLE;
-      this->ble_char_handle_ = 0;
-      ESP_LOGD(TAG, "Disconnected from %s", ble_client_->address_str().c_str());
-      break;
-    default:
-      break;
-  }
-}
-
-}  // namespace ble_client
-}  // namespace esphome

esphome/components/ble_client/automation.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#include <utility>
-#include <vector>
-
 #include "esphome/core/automation.h"
 #include "esphome/components/ble_client/ble_client.h"
 
@@ -16,10 +13,10 @@ class BLEClientConnectTrigger : public Trigger<>, public BLEClientNode {
   void loop() override {}
   void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                            esp_ble_gattc_cb_param_t *param) override {
-    if (event == ESP_GATTC_SEARCH_CMPL_EVT) {
-      this->node_state = espbt::ClientState::ESTABLISHED;
+    if (event == ESP_GATTC_OPEN_EVT && param->open.status == ESP_GATT_OK)
       this->trigger();
-    }
+    if (event == ESP_GATTC_SEARCH_CMPL_EVT)
+      this->node_state = espbt::ClientState::ESTABLISHED;
   }
 };
 
@@ -29,71 +26,13 @@ class BLEClientDisconnectTrigger : public Trigger<>, public BLEClientNode {
   void loop() override {}
   void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                            esp_ble_gattc_cb_param_t *param) override {
-    if (event == ESP_GATTC_DISCONNECT_EVT &&
-        memcmp(param->disconnect.remote_bda, this->parent_->get_remote_bda(), 6) == 0)
+    if (event == ESP_GATTC_DISCONNECT_EVT && memcmp(param->disconnect.remote_bda, this->parent_->remote_bda, 6) == 0)
       this->trigger();
     if (event == ESP_GATTC_SEARCH_CMPL_EVT)
       this->node_state = espbt::ClientState::ESTABLISHED;
   }
 };
 
-class BLEWriterClientNode : public BLEClientNode {
- public:
-  BLEWriterClientNode(BLEClient *ble_client) {
-    ble_client->register_ble_node(this);
-    ble_client_ = ble_client;
-  }
-
-  // Attempts to write the contents of value to char_uuid_.
-  void write(const std::vector<uint8_t> &value);
-
-  void set_service_uuid16(uint16_t uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_uint16(uuid); }
-  void set_service_uuid32(uint32_t uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_uint32(uuid); }
-  void set_service_uuid128(uint8_t *uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }
-
-  void set_char_uuid16(uint16_t uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_uint16(uuid); }
-  void set_char_uuid32(uint32_t uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_uint32(uuid); }
-  void set_char_uuid128(uint8_t *uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }
-
-  void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                           esp_ble_gattc_cb_param_t *param) override;
-
- private:
-  BLEClient *ble_client_;
-  int ble_char_handle_ = 0;
-  esp_gatt_char_prop_t char_props_;
-  espbt::ESPBTUUID service_uuid_;
-  espbt::ESPBTUUID char_uuid_;
-};
-
-template<typename... Ts> class BLEClientWriteAction : public Action<Ts...>, public BLEWriterClientNode {
- public:
-  BLEClientWriteAction(BLEClient *ble_client) : BLEWriterClientNode(ble_client) {}
-
-  void play(Ts... x) override {
-    if (has_simple_value_) {
-      return write(this->value_simple_);
-    } else {
-      return write(this->value_template_(x...));
-    }
-  }
-
-  void set_value_template(std::function<std::vector<uint8_t>(Ts...)> func) {
-    this->value_template_ = std::move(func);
-    has_simple_value_ = false;
-  }
-
-  void set_value_simple(const std::vector<uint8_t> &value) {
-    this->value_simple_ = value;
-    has_simple_value_ = true;
-  }
-
- private:
-  bool has_simple_value_ = true;
-  std::vector<uint8_t> value_simple_;
-  std::function<std::vector<uint8_t>(Ts...)> value_template_{};
-};
-
 }  // namespace ble_client
 }  // namespace esphome
 

esphome/components/ble_client/ble_client.cpp

@@ -1,9 +1,8 @@
-#include "ble_client.h"
-#include "esphome/components/esp32_ble_client/ble_client_base.h"
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+#include "esphome/core/log.h"
 #include "esphome/core/application.h"
 #include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+#include "ble_client.h"
 
 #ifdef USE_ESP32
 
@@ -12,13 +11,22 @@ namespace ble_client {
 
 static const char *const TAG = "ble_client";
 
+float BLEClient::get_setup_priority() const { return setup_priority::AFTER_BLUETOOTH; }
+
 void BLEClient::setup() {
-  BLEClientBase::setup();
+  auto ret = esp_ble_gattc_app_register(this->app_id);
+  if (ret) {
+    ESP_LOGE(TAG, "gattc app register failed. app_id=%d code=%d", this->app_id, ret);
+    this->mark_failed();
+  }
+  this->set_states_(espbt::ClientState::IDLE);
   this->enabled = true;
 }
 
 void BLEClient::loop() {
-  BLEClientBase::loop();
+  if (this->state() == espbt::ClientState::DISCOVERED) {
+    this->connect();
+  }
   for (auto *node : this->nodes_)
     node->loop();
 }
@@ -31,7 +39,33 @@ void BLEClient::dump_config() {
 bool BLEClient::parse_device(const espbt::ESPBTDevice &device) {
   if (!this->enabled)
     return false;
-  return BLEClientBase::parse_device(device);
+  if (device.address_uint64() != this->address)
+    return false;
+  if (this->state() != espbt::ClientState::IDLE)
+    return false;
+
+  ESP_LOGD(TAG, "Found device at MAC address [%s]", device.address_str().c_str());
+  this->set_states_(espbt::ClientState::DISCOVERED);
+
+  auto addr = device.address_uint64();
+  this->remote_bda[0] = (addr >> 40) & 0xFF;
+  this->remote_bda[1] = (addr >> 32) & 0xFF;
+  this->remote_bda[2] = (addr >> 24) & 0xFF;
+  this->remote_bda[3] = (addr >> 16) & 0xFF;
+  this->remote_bda[4] = (addr >> 8) & 0xFF;
+  this->remote_bda[5] = (addr >> 0) & 0xFF;
+  return true;
+}
+
+std::string BLEClient::address_str() const {
+  char buf[20];
+  sprintf(buf, "%02x:%02x:%02x:%02x:%02x:%02x", (uint8_t)(this->address >> 40) & 0xff,
+          (uint8_t)(this->address >> 32) & 0xff, (uint8_t)(this->address >> 24) & 0xff,
+          (uint8_t)(this->address >> 16) & 0xff, (uint8_t)(this->address >> 8) & 0xff,
+          (uint8_t)(this->address >> 0) & 0xff);
+  std::string ret;
+  ret = buf;
+  return ret;
 }
 
 void BLEClient::set_enabled(bool enabled) {
@@ -39,7 +73,7 @@ void BLEClient::set_enabled(bool enabled) {
     return;
   if (!enabled && this->state() != espbt::ClientState::IDLE) {
     ESP_LOGI(TAG, "[%s] Disabling BLE client.", this->address_str().c_str());
-    auto ret = esp_ble_gattc_close(this->gattc_if_, this->conn_id_);
+    auto ret = esp_ble_gattc_close(this->gattc_if, this->conn_id);
     if (ret) {
       ESP_LOGW(TAG, "esp_ble_gattc_close error, address=%s status=%d", this->address_str().c_str(), ret);
     }
@@ -47,13 +81,115 @@ 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::connect() {
+  ESP_LOGI(TAG, "Attempting BLE connection to %s", this->address_str().c_str());
+  auto ret = esp_ble_gattc_open(this->gattc_if, this->remote_bda, BLE_ADDR_TYPE_PUBLIC, true);
+  if (ret) {
+    ESP_LOGW(TAG, "esp_ble_gattc_open error, address=%s status=%d", this->address_str().c_str(), ret);
+    this->set_states_(espbt::ClientState::IDLE);
+  } else {
+    this->set_states_(espbt::ClientState::CONNECTING);
+  }
+}
+
+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) {
+  if (event == ESP_GATTC_REG_EVT && this->app_id != param->reg.app_id)
+    return;
+  if (event != ESP_GATTC_REG_EVT && esp_gattc_if != ESP_GATT_IF_NONE && esp_gattc_if != this->gattc_if)
+    return;
+
   bool all_established = this->all_nodes_established_();
 
-  if (!BLEClientBase::gattc_event_handler(event, esp_gattc_if, param))
-    return false;
+  switch (event) {
+    case ESP_GATTC_REG_EVT: {
+      if (param->reg.status == ESP_GATT_OK) {
+        ESP_LOGV(TAG, "gattc registered app id %d", this->app_id);
+        this->gattc_if = esp_gattc_if;
+      } else {
+        ESP_LOGE(TAG, "gattc app registration failed id=%d code=%d", param->reg.app_id, param->reg.status);
+      }
+      break;
+    }
+    case ESP_GATTC_OPEN_EVT: {
+      ESP_LOGV(TAG, "[%s] ESP_GATTC_OPEN_EVT", this->address_str().c_str());
+      if (param->open.status != ESP_GATT_OK) {
+        ESP_LOGW(TAG, "connect to %s failed, status=%d", this->address_str().c_str(), param->open.status);
+        this->set_states_(espbt::ClientState::IDLE);
+        break;
+      }
+      this->conn_id = param->open.conn_id;
+      auto ret = esp_ble_gattc_send_mtu_req(this->gattc_if, param->open.conn_id);
+      if (ret) {
+        ESP_LOGW(TAG, "esp_ble_gattc_send_mtu_req failed, status=%d", ret);
+      }
+      break;
+    }
+    case ESP_GATTC_CFG_MTU_EVT: {
+      if (param->cfg_mtu.status != ESP_GATT_OK) {
+        ESP_LOGW(TAG, "cfg_mtu to %s failed, status %d", this->address_str().c_str(), param->cfg_mtu.status);
+        this->set_states_(espbt::ClientState::IDLE);
+        break;
+      }
+      ESP_LOGV(TAG, "cfg_mtu status %d, mtu %d", param->cfg_mtu.status, param->cfg_mtu.mtu);
+      esp_ble_gattc_search_service(esp_gattc_if, param->cfg_mtu.conn_id, nullptr);
+      break;
+    }
+    case ESP_GATTC_DISCONNECT_EVT: {
+      if (memcmp(param->disconnect.remote_bda, this->remote_bda, 6) != 0) {
+        return;
+      }
+      ESP_LOGV(TAG, "[%s] ESP_GATTC_DISCONNECT_EVT", this->address_str().c_str());
+      for (auto &svc : this->services_)
+        delete svc;  // NOLINT(cppcoreguidelines-owning-memory)
+      this->services_.clear();
+      this->set_states_(espbt::ClientState::IDLE);
+      break;
+    }
+    case ESP_GATTC_SEARCH_RES_EVT: {
+      BLEService *ble_service = new BLEService();  // NOLINT(cppcoreguidelines-owning-memory)
+      ble_service->uuid = espbt::ESPBTUUID::from_uuid(param->search_res.srvc_id.uuid);
+      ble_service->start_handle = param->search_res.start_handle;
+      ble_service->end_handle = param->search_res.end_handle;
+      ble_service->client = this;
+      this->services_.push_back(ble_service);
+      break;
+    }
+    case ESP_GATTC_SEARCH_CMPL_EVT: {
+      ESP_LOGV(TAG, "[%s] ESP_GATTC_SEARCH_CMPL_EVT", this->address_str().c_str());
+      for (auto &svc : this->services_) {
+        ESP_LOGI(TAG, "Service UUID: %s", svc->uuid.to_string().c_str());
+        ESP_LOGI(TAG, "  start_handle: 0x%x  end_handle: 0x%x", svc->start_handle, svc->end_handle);
+        svc->parse_characteristics();
+      }
+      this->set_states_(espbt::ClientState::CONNECTED);
+      this->set_state(espbt::ClientState::ESTABLISHED);
+      break;
+    }
+    case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
+      auto *descr = this->get_config_descriptor(param->reg_for_notify.handle);
+      if (descr == nullptr) {
+        ESP_LOGW(TAG, "No descriptor found for notify of handle 0x%x", param->reg_for_notify.handle);
+        break;
+      }
+      if (descr->uuid.get_uuid().len != ESP_UUID_LEN_16 ||
+          descr->uuid.get_uuid().uuid.uuid16 != ESP_GATT_UUID_CHAR_CLIENT_CONFIG) {
+        ESP_LOGW(TAG, "Handle 0x%x (uuid %s) is not a client config char uuid", param->reg_for_notify.handle,
+                 descr->uuid.to_string().c_str());
+        break;
+      }
+      uint8_t notify_en = 1;
+      auto status = esp_ble_gattc_write_char_descr(this->gattc_if, this->conn_id, descr->handle, sizeof(notify_en),
+                                                   &notify_en, ESP_GATT_WRITE_TYPE_RSP, ESP_GATT_AUTH_REQ_NONE);
+      if (status) {
+        ESP_LOGW(TAG, "esp_ble_gattc_write_char_descr error, status=%d", status);
+      }
+      break;
+    }
 
+    default:
+      break;
+  }
   for (auto *node : this->nodes_)
     node->gattc_event_handler(event, esp_gattc_if, param);
 
@@ -63,30 +199,209 @@ 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) {
-  BLEClientBase::gap_event_handler(event, param);
+// Parse GATT values into a float for a sensor.
+// Ref: https://www.bluetooth.com/specifications/assigned-numbers/format-types/
+float BLEClient::parse_char_value(uint8_t *value, uint16_t length) {
+  // A length of one means a single octet value.
+  if (length == 0)
+    return 0;
+  if (length == 1)
+    return (float) ((uint8_t) value[0]);
 
-  for (auto *node : this->nodes_)
-    node->gap_event_handler(event, param);
-}
-
-void BLEClient::set_state(espbt::ClientState state) {
-  BLEClientBase::set_state(state);
-  for (auto &node : nodes_)
-    node->node_state = state;
-}
-
-bool BLEClient::all_nodes_established_() {
-  if (this->state() != espbt::ClientState::ESTABLISHED)
-    return false;
-  for (auto &node : nodes_) {
-    if (node->node_state != espbt::ClientState::ESTABLISHED)
-      return false;
+  switch (value[0]) {
+    case 0x1:  // boolean.
+    case 0x2:  // 2bit.
+    case 0x3:  // nibble.
+    case 0x4:  // uint8.
+      return (float) ((uint8_t) value[1]);
+    case 0x5:  // uint12.
+    case 0x6:  // uint16.
+      if (length > 2) {
+        return (float) ((uint16_t)(value[1] << 8) + (uint16_t) value[2]);
+      }
+    case 0x7:  // uint24.
+      if (length > 3) {
+        return (float) ((uint32_t)(value[1] << 16) + (uint32_t)(value[2] << 8) + (uint32_t)(value[3]));
+      }
+    case 0x8:  // uint32.
+      if (length > 4) {
+        return (float) ((uint32_t)(value[1] << 24) + (uint32_t)(value[2] << 16) + (uint32_t)(value[3] << 8) +
+                        (uint32_t)(value[4]));
+      }
+    case 0xC:  // int8.
+      return (float) ((int8_t) value[1]);
+    case 0xD:  // int12.
+    case 0xE:  // int16.
+      if (length > 2) {
+        return (float) ((int16_t)(value[1] << 8) + (int16_t) value[2]);
+      }
+    case 0xF:  // int24.
+      if (length > 3) {
+        return (float) ((int32_t)(value[1] << 16) + (int32_t)(value[2] << 8) + (int32_t)(value[3]));
+      }
+    case 0x10:  // int32.
+      if (length > 4) {
+        return (float) ((int32_t)(value[1] << 24) + (int32_t)(value[2] << 16) + (int32_t)(value[3] << 8) +
+                        (int32_t)(value[4]));
+      }
+  }
+  ESP_LOGW(TAG, "Cannot parse characteristic value of type 0x%x length %d", value[0], length);
+  return NAN;
+}
+
+BLEService *BLEClient::get_service(espbt::ESPBTUUID uuid) {
+  for (auto *svc : this->services_) {
+    if (svc->uuid == uuid)
+      return svc;
+  }
+  return nullptr;
+}
+
+BLEService *BLEClient::get_service(uint16_t uuid) { return this->get_service(espbt::ESPBTUUID::from_uint16(uuid)); }
+
+BLECharacteristic *BLEClient::get_characteristic(espbt::ESPBTUUID service, espbt::ESPBTUUID chr) {
+  auto *svc = this->get_service(service);
+  if (svc == nullptr)
+    return nullptr;
+  return svc->get_characteristic(chr);
+}
+
+BLECharacteristic *BLEClient::get_characteristic(uint16_t service, uint16_t chr) {
+  return this->get_characteristic(espbt::ESPBTUUID::from_uint16(service), espbt::ESPBTUUID::from_uint16(chr));
+}
+
+BLEDescriptor *BLEClient::get_config_descriptor(uint16_t handle) {
+  for (auto &svc : this->services_) {
+    for (auto &chr : svc->characteristics) {
+      if (chr->handle == handle) {
+        for (auto &desc : chr->descriptors) {
+          if (desc->uuid == espbt::ESPBTUUID::from_uint16(0x2902))
+            return desc;
+        }
+      }
+    }
+  }
+  return nullptr;
+}
+
+BLECharacteristic *BLEService::get_characteristic(espbt::ESPBTUUID uuid) {
+  for (auto &chr : this->characteristics) {
+    if (chr->uuid == uuid)
+      return chr;
+  }
+  return nullptr;
+}
+
+BLECharacteristic *BLEService::get_characteristic(uint16_t uuid) {
+  return this->get_characteristic(espbt::ESPBTUUID::from_uint16(uuid));
+}
+
+BLEDescriptor *BLEClient::get_descriptor(espbt::ESPBTUUID service, espbt::ESPBTUUID chr, espbt::ESPBTUUID descr) {
+  auto *svc = this->get_service(service);
+  if (svc == nullptr)
+    return nullptr;
+  auto *ch = svc->get_characteristic(chr);
+  if (ch == nullptr)
+    return nullptr;
+  return ch->get_descriptor(descr);
+}
+
+BLEDescriptor *BLEClient::get_descriptor(uint16_t service, uint16_t chr, uint16_t descr) {
+  return this->get_descriptor(espbt::ESPBTUUID::from_uint16(service), espbt::ESPBTUUID::from_uint16(chr),
+                              espbt::ESPBTUUID::from_uint16(descr));
+}
+
+BLEService::~BLEService() {
+  for (auto &chr : this->characteristics)
+    delete chr;  // NOLINT(cppcoreguidelines-owning-memory)
+}
+
+void BLEService::parse_characteristics() {
+  uint16_t offset = 0;
+  esp_gattc_char_elem_t result;
+
+  while (true) {
+    uint16_t count = 1;
+    esp_gatt_status_t status = esp_ble_gattc_get_all_char(
+        this->client->gattc_if, this->client->conn_id, this->start_handle, this->end_handle, &result, &count, offset);
+    if (status == ESP_GATT_INVALID_OFFSET || status == ESP_GATT_NOT_FOUND) {
+      break;
+    }
+    if (status != ESP_GATT_OK) {
+      ESP_LOGW(TAG, "esp_ble_gattc_get_all_char error, status=%d", status);
+      break;
+    }
+    if (count == 0) {
+      break;
+    }
+
+    BLECharacteristic *characteristic = new BLECharacteristic();  // NOLINT(cppcoreguidelines-owning-memory)
+    characteristic->uuid = espbt::ESPBTUUID::from_uuid(result.uuid);
+    characteristic->properties = result.properties;
+    characteristic->handle = result.char_handle;
+    characteristic->service = this;
+    this->characteristics.push_back(characteristic);
+    ESP_LOGI(TAG, " characteristic %s, handle 0x%x, properties 0x%x", characteristic->uuid.to_string().c_str(),
+             characteristic->handle, characteristic->properties);
+    characteristic->parse_descriptors();
+    offset++;
+  }
+}
+
+BLECharacteristic::~BLECharacteristic() {
+  for (auto &desc : this->descriptors)
+    delete desc;  // NOLINT(cppcoreguidelines-owning-memory)
+}
+
+void BLECharacteristic::parse_descriptors() {
+  uint16_t offset = 0;
+  esp_gattc_descr_elem_t result;
+
+  while (true) {
+    uint16_t count = 1;
+    esp_gatt_status_t status = esp_ble_gattc_get_all_descr(
+        this->service->client->gattc_if, this->service->client->conn_id, this->handle, &result, &count, offset);
+    if (status == ESP_GATT_INVALID_OFFSET || status == ESP_GATT_NOT_FOUND) {
+      break;
+    }
+    if (status != ESP_GATT_OK) {
+      ESP_LOGW(TAG, "esp_ble_gattc_get_all_descr error, status=%d", status);
+      break;
+    }
+    if (count == 0) {
+      break;
+    }
+
+    BLEDescriptor *desc = new BLEDescriptor();  // NOLINT(cppcoreguidelines-owning-memory)
+    desc->uuid = espbt::ESPBTUUID::from_uuid(result.uuid);
+    desc->handle = result.handle;
+    desc->characteristic = this;
+    this->descriptors.push_back(desc);
+    ESP_LOGV(TAG, "   descriptor %s, handle 0x%x", desc->uuid.to_string().c_str(), desc->handle);
+    offset++;
+  }
+}
+
+BLEDescriptor *BLECharacteristic::get_descriptor(espbt::ESPBTUUID uuid) {
+  for (auto &desc : this->descriptors) {
+    if (desc->uuid == uuid)
+      return desc;
+  }
+  return nullptr;
+}
+BLEDescriptor *BLECharacteristic::get_descriptor(uint16_t uuid) {
+  return this->get_descriptor(espbt::ESPBTUUID::from_uint16(uuid));
+}
+
+void BLECharacteristic::write_value(uint8_t *new_val, int16_t new_val_size) {
+  auto *client = this->service->client;
+  auto status = esp_ble_gattc_write_char(client->gattc_if, client->conn_id, this->handle, new_val_size, new_val,
+                                         ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+  if (status) {
+    ESP_LOGW(TAG, "Error sending write value to BLE gattc server, status=%d", status);
   }
-  return true;
 }
 
 }  // namespace ble_client

esphome/components/ble_client/ble_client.h

@@ -1,35 +1,31 @@
 #pragma once
 
-#include "esphome/components/esp32_ble_client/ble_client_base.h"
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
 #include "esphome/core/component.h"
 #include "esphome/core/helpers.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
 
 #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>
 
 namespace esphome {
 namespace ble_client {
 
 namespace espbt = esphome::esp32_ble_tracker;
 
-using namespace esp32_ble_client;
-
 class BLEClient;
+class BLEService;
+class BLECharacteristic;
 
 class BLEClientNode {
  public:
   virtual void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                                    esp_ble_gattc_cb_param_t *param) = 0;
-  virtual void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {}
-  virtual void loop() {}
+  virtual void loop(){};
   void set_address(uint64_t address) { address_ = address; }
   espbt::ESPBTClient *client;
   // This should be transitioned to Established once the node no longer needs
@@ -45,17 +41,55 @@ class BLEClientNode {
   uint64_t address_;
 };
 
-class BLEClient : public BLEClientBase {
+class BLEDescriptor {
+ public:
+  espbt::ESPBTUUID uuid;
+  uint16_t handle;
+
+  BLECharacteristic *characteristic;
+};
+
+class BLECharacteristic {
+ public:
+  ~BLECharacteristic();
+  espbt::ESPBTUUID uuid;
+  uint16_t handle;
+  esp_gatt_char_prop_t properties;
+  std::vector<BLEDescriptor *> descriptors;
+  void parse_descriptors();
+  BLEDescriptor *get_descriptor(espbt::ESPBTUUID uuid);
+  BLEDescriptor *get_descriptor(uint16_t uuid);
+  void write_value(uint8_t *new_val, int16_t new_val_size);
+  BLEService *service;
+};
+
+class BLEService {
+ public:
+  ~BLEService();
+  espbt::ESPBTUUID uuid;
+  uint16_t start_handle;
+  uint16_t end_handle;
+  std::vector<BLECharacteristic *> characteristics;
+  BLEClient *client;
+  void parse_characteristics();
+  BLECharacteristic *get_characteristic(espbt::ESPBTUUID uuid);
+  BLECharacteristic *get_characteristic(uint16_t uuid);
+};
+
+class BLEClient : public espbt::ESPBTClient, public Component {
  public:
   void setup() override;
   void dump_config() override;
   void loop() override;
+  float get_setup_priority() const 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;
   bool parse_device(const espbt::ESPBTDevice &device) override;
+  void on_scan_end() override {}
+  void connect() override;
+
+  void set_address(uint64_t address) { this->address = address; }
 
   void set_enabled(bool enabled);
 
@@ -65,14 +99,42 @@ class BLEClient : public BLEClientBase {
     this->nodes_.push_back(node);
   }
 
-  bool enabled;
+  BLEService *get_service(espbt::ESPBTUUID uuid);
+  BLEService *get_service(uint16_t uuid);
+  BLECharacteristic *get_characteristic(espbt::ESPBTUUID service, espbt::ESPBTUUID chr);
+  BLECharacteristic *get_characteristic(uint16_t service, uint16_t chr);
+  BLEDescriptor *get_descriptor(espbt::ESPBTUUID service, espbt::ESPBTUUID chr, espbt::ESPBTUUID descr);
+  BLEDescriptor *get_descriptor(uint16_t service, uint16_t chr, uint16_t descr);
+  // Get the configuration descriptor for the given characteristic handle.
+  BLEDescriptor *get_config_descriptor(uint16_t handle);
 
-  void set_state(espbt::ClientState state) override;
+  float parse_char_value(uint8_t *value, uint16_t length);
+
+  int gattc_if;
+  esp_bd_addr_t remote_bda;
+  uint16_t conn_id;
+  uint64_t address;
+  bool enabled;
+  std::string address_str() const;
 
  protected:
-  bool all_nodes_established_();
+  void set_states_(espbt::ClientState st) {
+    this->set_state(st);
+    for (auto &node : nodes_)
+      node->node_state = st;
+  }
+  bool all_nodes_established_() {
+    if (this->state() != espbt::ClientState::ESTABLISHED)
+      return false;
+    for (auto &node : nodes_) {
+      if (node->node_state != espbt::ClientState::ESTABLISHED)
+        return false;
+    }
+    return true;
+  }
 
   std::vector<BLEClientNode *> nodes_;
+  std::vector<BLEService *> services_;
 };
 
 }  // namespace ble_client

esphome/components/ble_client/output/__init__.py

@@ -1,13 +1,13 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome.components import ble_client, esp32_ble_tracker, output
-from esphome.const import CONF_CHARACTERISTIC_UUID, CONF_ID, CONF_SERVICE_UUID
-
+from esphome.components import output, ble_client, esp32_ble_tracker
+from esphome.const import CONF_ID, CONF_SERVICE_UUID
 from .. import ble_client_ns
 
+
 DEPENDENCIES = ["ble_client"]
 
-CONF_REQUIRE_RESPONSE = "require_response"
+CONF_CHARACTERISTIC_UUID = "characteristic_uuid"
 
 BLEBinaryOutput = ble_client_ns.class_(
     "BLEBinaryOutput", output.BinaryOutput, ble_client.BLEClientNode, cg.Component
@@ -19,7 +19,6 @@ CONFIG_SCHEMA = cv.All(
             cv.Required(CONF_ID): cv.declare_id(BLEBinaryOutput),
             cv.Required(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
             cv.Required(CONF_CHARACTERISTIC_UUID): esp32_ble_tracker.bt_uuid,
-            cv.Optional(CONF_REQUIRE_RESPONSE, default=False): cv.boolean,
         }
     )
     .extend(cv.COMPONENT_SCHEMA)
@@ -62,7 +61,7 @@ def to_code(config):
             config[CONF_CHARACTERISTIC_UUID]
         )
         cg.add(var.set_char_uuid128(uuid128))
-    cg.add(var.set_require_response(config[CONF_REQUIRE_RESPONSE]))
+
     yield output.register_output(var, config)
     yield ble_client.register_ble_node(var, config)
     yield cg.register_component(var, config)

esphome/components/ble_client/output/ble_binary_output.cpp

@@ -63,11 +63,7 @@ void BLEBinaryOutput::write_state(bool state) {
 
   uint8_t state_as_uint = (uint8_t) state;
   ESP_LOGV(TAG, "[%s] Write State: %d", this->char_uuid_.to_string().c_str(), state_as_uint);
-  if (this->require_response_) {
-    chr->write_value(&state_as_uint, sizeof(state_as_uint), ESP_GATT_WRITE_TYPE_RSP);
-  } else {
-    chr->write_value(&state_as_uint, sizeof(state_as_uint), ESP_GATT_WRITE_TYPE_NO_RSP);
-  }
+  chr->write_value(&state_as_uint, sizeof(state_as_uint));
 }
 
 }  // namespace ble_client

esphome/components/ble_client/output/ble_binary_output.h

@@ -25,11 +25,9 @@ class BLEBinaryOutput : public output::BinaryOutput, public BLEClientNode, publi
   void set_char_uuid128(uint8_t *uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }
   void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                            esp_ble_gattc_cb_param_t *param) override;
-  void set_require_response(bool response) { this->require_response_ = response; }
 
  protected:
   void write_state(bool state) override;
-  bool require_response_;
   espbt::ESPBTUUID service_uuid_;
   espbt::ESPBTUUID char_uuid_;
   espbt::ClientState client_state_;

esphome/components/ble_client/sensor/__init__.py

@@ -2,26 +2,22 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import sensor, ble_client, esp32_ble_tracker
 from esphome.const import (
-    CONF_CHARACTERISTIC_UUID,
+    CONF_ID,
     CONF_LAMBDA,
+    STATE_CLASS_NONE,
     CONF_TRIGGER_ID,
-    CONF_TYPE,
     CONF_SERVICE_UUID,
-    DEVICE_CLASS_SIGNAL_STRENGTH,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_DECIBEL_MILLIWATT,
 )
 from esphome import automation
 from .. import ble_client_ns
 
 DEPENDENCIES = ["ble_client"]
 
+CONF_CHARACTERISTIC_UUID = "characteristic_uuid"
 CONF_DESCRIPTOR_UUID = "descriptor_uuid"
 
 CONF_NOTIFY = "notify"
 CONF_ON_NOTIFY = "on_notify"
-TYPE_CHARACTERISTIC = "characteristic"
-TYPE_RSSI = "rssi"
 
 adv_data_t = cg.std_vector.template(cg.uint8)
 adv_data_t_const_ref = adv_data_t.operator("ref").operator("const")
@@ -33,68 +29,35 @@ BLESensorNotifyTrigger = ble_client_ns.class_(
     "BLESensorNotifyTrigger", automation.Trigger.template(cg.float_)
 )
 
-BLEClientRssiSensor = ble_client_ns.class_(
-    "BLEClientRSSISensor", sensor.Sensor, cg.PollingComponent, ble_client.BLEClientNode
-)
-
-
-def checkType(value):
-    if CONF_TYPE not in value and CONF_SERVICE_UUID in value:
-        raise cv.Invalid(
-            "Looks like you're trying to create a ble characteristic sensor. Please add `type: characteristic` to your sensor config."
-        )
-    return value
-
-
 CONFIG_SCHEMA = cv.All(
-    checkType,
-    cv.typed_schema(
+    sensor.sensor_schema(
+        accuracy_decimals=0,
+        state_class=STATE_CLASS_NONE,
+    )
+    .extend(
         {
-            TYPE_CHARACTERISTIC: sensor.sensor_schema(
-                BLESensor,
-                accuracy_decimals=0,
-            )
-            .extend(cv.polling_component_schema("60s"))
-            .extend(ble_client.BLE_CLIENT_SCHEMA)
-            .extend(
+            cv.GenerateID(): cv.declare_id(BLESensor),
+            cv.Required(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
+            cv.Required(CONF_CHARACTERISTIC_UUID): esp32_ble_tracker.bt_uuid,
+            cv.Optional(CONF_DESCRIPTOR_UUID): esp32_ble_tracker.bt_uuid,
+            cv.Optional(CONF_LAMBDA): cv.returning_lambda,
+            cv.Optional(CONF_NOTIFY, default=False): cv.boolean,
+            cv.Optional(CONF_ON_NOTIFY): automation.validate_automation(
                 {
-                    cv.Required(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
-                    cv.Required(CONF_CHARACTERISTIC_UUID): esp32_ble_tracker.bt_uuid,
-                    cv.Optional(CONF_DESCRIPTOR_UUID): esp32_ble_tracker.bt_uuid,
-                    cv.Optional(CONF_LAMBDA): cv.returning_lambda,
-                    cv.Optional(CONF_NOTIFY, default=False): cv.boolean,
-                    cv.Optional(CONF_ON_NOTIFY): automation.validate_automation(
-                        {
-                            cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
-                                BLESensorNotifyTrigger
-                            ),
-                        }
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                        BLESensorNotifyTrigger
                     ),
                 }
             ),
-            TYPE_RSSI: sensor.sensor_schema(
-                BLEClientRssiSensor,
-                accuracy_decimals=0,
-                unit_of_measurement=UNIT_DECIBEL_MILLIWATT,
-                device_class=DEVICE_CLASS_SIGNAL_STRENGTH,
-                state_class=STATE_CLASS_MEASUREMENT,
-            )
-            .extend(cv.polling_component_schema("60s"))
-            .extend(ble_client.BLE_CLIENT_SCHEMA),
-        },
-        lower=True,
-    ),
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+    .extend(ble_client.BLE_CLIENT_SCHEMA)
 )
 
 
-async def rssi_sensor_to_code(config):
-    var = await sensor.new_sensor(config)
-    await cg.register_component(var, config)
-    await ble_client.register_ble_node(var, config)
-
-
-async def characteristic_sensor_to_code(config):
-    var = await sensor.new_sensor(config)
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
     if len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid16_format):
         cg.add(
             var.set_service_uuid16(esp32_ble_tracker.as_hex(config[CONF_SERVICE_UUID]))
@@ -161,14 +124,8 @@ async def characteristic_sensor_to_code(config):
     await cg.register_component(var, config)
     await ble_client.register_ble_node(var, config)
     cg.add(var.set_enable_notify(config[CONF_NOTIFY]))
+    await sensor.register_sensor(var, config)
     for conf in config.get(CONF_ON_NOTIFY, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
         await ble_client.register_ble_node(trigger, config)
         await automation.build_automation(trigger, [(float, "x")], conf)
-
-
-async def to_code(config):
-    if config[CONF_TYPE] == TYPE_RSSI:
-        await rssi_sensor_to_code(config)
-    elif config[CONF_TYPE] == TYPE_CHARACTERISTIC:
-        await characteristic_sensor_to_code(config)

esphome/components/ble_client/sensor/automation.h

@@ -19,8 +19,7 @@ class BLESensorNotifyTrigger : public Trigger<float>, public BLESensor {
         break;
       }
       case ESP_GATTC_NOTIFY_EVT: {
-        if (param->notify.conn_id != this->sensor_->parent()->get_conn_id() ||
-            param->notify.handle != this->sensor_->handle)
+        if (param->notify.conn_id != this->sensor_->parent()->conn_id || param->notify.handle != this->sensor_->handle)
           break;
         this->trigger(this->sensor_->parent()->parse_char_value(param->notify.value, param->notify.value_len));
       }

esphome/components/ble_client/sensor/ble_rssi_sensor.cpp

@@ -1,78 +0,0 @@
-#include "ble_rssi_sensor.h"
-#include "esphome/core/log.h"
-#include "esphome/core/application.h"
-#include "esphome/core/helpers.h"
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
-
-#ifdef USE_ESP32
-
-namespace esphome {
-namespace ble_client {
-
-static const char *const TAG = "ble_rssi_sensor";
-
-void BLEClientRSSISensor::loop() {}
-
-void BLEClientRSSISensor::dump_config() {
-  LOG_SENSOR("", "BLE Client RSSI Sensor", this);
-  ESP_LOGCONFIG(TAG, "  MAC address        : %s", this->parent()->address_str().c_str());
-  LOG_UPDATE_INTERVAL(this);
-}
-
-void BLEClientRSSISensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                                              esp_ble_gattc_cb_param_t *param) {
-  switch (event) {
-    case ESP_GATTC_OPEN_EVT: {
-      if (param->open.status == ESP_GATT_OK) {
-        ESP_LOGI(TAG, "[%s] Connected successfully!", this->get_name().c_str());
-        break;
-      }
-      break;
-    }
-    case ESP_GATTC_DISCONNECT_EVT: {
-      ESP_LOGW(TAG, "[%s] Disconnected!", this->get_name().c_str());
-      this->status_set_warning();
-      this->publish_state(NAN);
-      break;
-    }
-    case ESP_GATTC_SEARCH_CMPL_EVT:
-      this->node_state = espbt::ClientState::ESTABLISHED;
-      break;
-    default:
-      break;
-  }
-}
-
-void BLEClientRSSISensor::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
-  switch (event) {
-    // server response on RSSI request:
-    case ESP_GAP_BLE_READ_RSSI_COMPLETE_EVT:
-      if (param->read_rssi_cmpl.status == ESP_BT_STATUS_SUCCESS) {
-        int8_t rssi = param->read_rssi_cmpl.rssi;
-        ESP_LOGI(TAG, "ESP_GAP_BLE_READ_RSSI_COMPLETE_EVT RSSI: %d", rssi);
-        this->publish_state(rssi);
-      }
-      break;
-    default:
-      break;
-  }
-}
-
-void BLEClientRSSISensor::update() {
-  if (this->node_state != espbt::ClientState::ESTABLISHED) {
-    ESP_LOGW(TAG, "[%s] Cannot poll, not connected", this->get_name().c_str());
-    return;
-  }
-
-  ESP_LOGV(TAG, "requesting rssi from %s", this->parent()->address_str().c_str());
-  auto status = esp_ble_gap_read_rssi(this->parent()->get_remote_bda());
-  if (status != ESP_OK) {
-    ESP_LOGW(TAG, "esp_ble_gap_read_rssi error, address=%s, status=%d", this->parent()->address_str().c_str(), status);
-    this->status_set_warning();
-    this->publish_state(NAN);
-  }
-}
-
-}  // namespace ble_client
-}  // namespace esphome
-#endif

esphome/components/ble_client/sensor/ble_rssi_sensor.h

@@ -1,31 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/ble_client/ble_client.h"
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
-#include "esphome/components/sensor/sensor.h"
-
-#ifdef USE_ESP32
-#include <esp_gattc_api.h>
-
-namespace esphome {
-namespace ble_client {
-
-namespace espbt = esphome::esp32_ble_tracker;
-
-class BLEClientRSSISensor : public sensor::Sensor, public PollingComponent, public BLEClientNode {
- public:
-  void loop() override;
-  void update() override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::DATA; }
-
-  void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) override;
-
-  void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                           esp_ble_gattc_cb_param_t *param) override;
-};
-
-}  // namespace ble_client
-}  // namespace esphome
-#endif

esphome/components/ble_client/sensor/ble_sensor.cpp

@@ -11,6 +11,8 @@ namespace ble_client {
 
 static const char *const TAG = "ble_sensor";
 
+uint32_t BLESensor::hash_base() { return 343459825UL; }
+
 void BLESensor::loop() {}
 
 void BLESensor::dump_config() {
@@ -63,8 +65,8 @@ void BLESensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
         this->handle = descr->handle;
       }
       if (this->notify_) {
-        auto status = esp_ble_gattc_register_for_notify(this->parent()->get_gattc_if(),
-                                                        this->parent()->get_remote_bda(), chr->handle);
+        auto status =
+            esp_ble_gattc_register_for_notify(this->parent()->gattc_if, this->parent()->remote_bda, chr->handle);
         if (status) {
           ESP_LOGW(TAG, "esp_ble_gattc_register_for_notify failed, status=%d", status);
         }
@@ -74,7 +76,7 @@ void BLESensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
       break;
     }
     case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->parent()->get_conn_id())
+      if (param->read.conn_id != this->parent()->conn_id)
         break;
       if (param->read.status != ESP_GATT_OK) {
         ESP_LOGW(TAG, "Error reading char at handle %d, status=%d", param->read.handle, param->read.status);
@@ -87,7 +89,7 @@ void BLESensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
       break;
     }
     case ESP_GATTC_NOTIFY_EVT: {
-      if (param->notify.conn_id != this->parent()->get_conn_id() || param->notify.handle != this->handle)
+      if (param->notify.conn_id != this->parent()->conn_id || param->notify.handle != this->handle)
         break;
       ESP_LOGV(TAG, "[%s] ESP_GATTC_NOTIFY_EVT: handle=0x%x, value=0x%x", this->get_name().c_str(),
                param->notify.handle, param->notify.value[0]);
@@ -122,8 +124,8 @@ void BLESensor::update() {
     return;
   }
 
-  auto status = esp_ble_gattc_read_char(this->parent()->get_gattc_if(), this->parent()->get_conn_id(), this->handle,
-                                        ESP_GATT_AUTH_REQ_NONE);
+  auto status =
+      esp_ble_gattc_read_char(this->parent()->gattc_if, this->parent()->conn_id, this->handle, ESP_GATT_AUTH_REQ_NONE);
   if (status) {
     this->status_set_warning();
     this->publish_state(NAN);

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>
 
@@ -39,6 +37,7 @@ class BLESensor : public sensor::Sensor, public PollingComponent, public BLEClie
   uint16_t handle;
 
  protected:
+  uint32_t hash_base() override;
   float parse_data_(uint8_t *value, uint16_t value_len);
   optional<data_to_value_t> data_to_value_func_{};
   bool notify_;

esphome/components/ble_client/switch/__init__.py

@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import switch, ble_client
-from esphome.const import ICON_BLUETOOTH
+from esphome.const import CONF_ICON, CONF_ID, CONF_INVERTED, ICON_BLUETOOTH
 from .. import ble_client_ns
 
 BLEClientSwitch = ble_client_ns.class_(
@@ -9,13 +9,22 @@ BLEClientSwitch = ble_client_ns.class_(
 )
 
 CONFIG_SCHEMA = (
-    switch.switch_schema(BLEClientSwitch, icon=ICON_BLUETOOTH, block_inverted=True)
+    switch.SWITCH_SCHEMA.extend(
+        {
+            cv.GenerateID(): cv.declare_id(BLEClientSwitch),
+            cv.Optional(CONF_INVERTED): cv.invalid(
+                "BLE client switches do not support inverted mode!"
+            ),
+            cv.Optional(CONF_ICON, default=ICON_BLUETOOTH): switch.icon,
+        }
+    )
     .extend(ble_client.BLE_CLIENT_SCHEMA)
     .extend(cv.COMPONENT_SCHEMA)
 )
 
 
 async def to_code(config):
-    var = await switch.new_switch(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
+    await switch.register_switch(var, config)
     await ble_client.register_ble_node(var, config)

esphome/components/ble_client/text_sensor/__init__.py

@@ -1,121 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import text_sensor, ble_client, esp32_ble_tracker
-from esphome.const import (
-    CONF_CHARACTERISTIC_UUID,
-    CONF_ID,
-    CONF_TRIGGER_ID,
-    CONF_SERVICE_UUID,
-)
-from esphome import automation
-from .. import ble_client_ns
-
-DEPENDENCIES = ["ble_client"]
-
-CONF_DESCRIPTOR_UUID = "descriptor_uuid"
-
-CONF_NOTIFY = "notify"
-CONF_ON_NOTIFY = "on_notify"
-
-adv_data_t = cg.std_vector.template(cg.uint8)
-adv_data_t_const_ref = adv_data_t.operator("ref").operator("const")
-
-BLETextSensor = ble_client_ns.class_(
-    "BLETextSensor",
-    text_sensor.TextSensor,
-    cg.PollingComponent,
-    ble_client.BLEClientNode,
-)
-BLETextSensorNotifyTrigger = ble_client_ns.class_(
-    "BLETextSensorNotifyTrigger", automation.Trigger.template(cg.std_string)
-)
-
-CONFIG_SCHEMA = cv.All(
-    text_sensor.TEXT_SENSOR_SCHEMA.extend(
-        {
-            cv.GenerateID(): cv.declare_id(BLETextSensor),
-            cv.Required(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
-            cv.Required(CONF_CHARACTERISTIC_UUID): esp32_ble_tracker.bt_uuid,
-            cv.Optional(CONF_DESCRIPTOR_UUID): esp32_ble_tracker.bt_uuid,
-            cv.Optional(CONF_NOTIFY, default=False): cv.boolean,
-            cv.Optional(CONF_ON_NOTIFY): automation.validate_automation(
-                {
-                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
-                        BLETextSensorNotifyTrigger
-                    ),
-                }
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(ble_client.BLE_CLIENT_SCHEMA)
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    if len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid16_format):
-        cg.add(
-            var.set_service_uuid16(esp32_ble_tracker.as_hex(config[CONF_SERVICE_UUID]))
-        )
-    elif len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid32_format):
-        cg.add(
-            var.set_service_uuid32(esp32_ble_tracker.as_hex(config[CONF_SERVICE_UUID]))
-        )
-    elif len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid128_format):
-        uuid128 = esp32_ble_tracker.as_reversed_hex_array(config[CONF_SERVICE_UUID])
-        cg.add(var.set_service_uuid128(uuid128))
-
-    if len(config[CONF_CHARACTERISTIC_UUID]) == len(esp32_ble_tracker.bt_uuid16_format):
-        cg.add(
-            var.set_char_uuid16(
-                esp32_ble_tracker.as_hex(config[CONF_CHARACTERISTIC_UUID])
-            )
-        )
-    elif len(config[CONF_CHARACTERISTIC_UUID]) == len(
-        esp32_ble_tracker.bt_uuid32_format
-    ):
-        cg.add(
-            var.set_char_uuid32(
-                esp32_ble_tracker.as_hex(config[CONF_CHARACTERISTIC_UUID])
-            )
-        )
-    elif len(config[CONF_CHARACTERISTIC_UUID]) == len(
-        esp32_ble_tracker.bt_uuid128_format
-    ):
-        uuid128 = esp32_ble_tracker.as_reversed_hex_array(
-            config[CONF_CHARACTERISTIC_UUID]
-        )
-        cg.add(var.set_char_uuid128(uuid128))
-
-    if CONF_DESCRIPTOR_UUID in config:
-        if len(config[CONF_DESCRIPTOR_UUID]) == len(esp32_ble_tracker.bt_uuid16_format):
-            cg.add(
-                var.set_descr_uuid16(
-                    esp32_ble_tracker.as_hex(config[CONF_DESCRIPTOR_UUID])
-                )
-            )
-        elif len(config[CONF_DESCRIPTOR_UUID]) == len(
-            esp32_ble_tracker.bt_uuid32_format
-        ):
-            cg.add(
-                var.set_descr_uuid32(
-                    esp32_ble_tracker.as_hex(config[CONF_DESCRIPTOR_UUID])
-                )
-            )
-        elif len(config[CONF_DESCRIPTOR_UUID]) == len(
-            esp32_ble_tracker.bt_uuid128_format
-        ):
-            uuid128 = esp32_ble_tracker.as_reversed_hex_array(
-                config[CONF_DESCRIPTOR_UUID]
-            )
-            cg.add(var.set_descr_uuid128(uuid128))
-
-    await cg.register_component(var, config)
-    await ble_client.register_ble_node(var, config)
-    cg.add(var.set_enable_notify(config[CONF_NOTIFY]))
-    await text_sensor.register_text_sensor(var, config)
-    for conf in config.get(CONF_ON_NOTIFY, []):
-        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-        await ble_client.register_ble_node(trigger, config)
-        await automation.build_automation(trigger, [(cg.std_string, "x")], conf)

esphome/components/ble_client/text_sensor/automation.h

@@ -1,39 +0,0 @@
-#pragma once
-
-#include "esphome/core/automation.h"
-#include "esphome/components/ble_client/text_sensor/ble_text_sensor.h"
-
-#ifdef USE_ESP32
-
-namespace esphome {
-namespace ble_client {
-
-class BLETextSensorNotifyTrigger : public Trigger<std::string>, public BLETextSensor {
- public:
-  explicit BLETextSensorNotifyTrigger(BLETextSensor *sensor) { sensor_ = sensor; }
-  void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                           esp_ble_gattc_cb_param_t *param) override {
-    switch (event) {
-      case ESP_GATTC_SEARCH_CMPL_EVT: {
-        this->sensor_->node_state = espbt::ClientState::ESTABLISHED;
-        break;
-      }
-      case ESP_GATTC_NOTIFY_EVT: {
-        if (param->notify.conn_id != this->sensor_->parent()->get_conn_id() ||
-            param->notify.handle != this->sensor_->handle)
-          break;
-        this->trigger(this->sensor_->parse_data(param->notify.value, param->notify.value_len));
-      }
-      default:
-        break;
-    }
-  }
-
- protected:
-  BLETextSensor *sensor_;
-};
-
-}  // namespace ble_client
-}  // namespace esphome
-
-#endif

esphome/components/ble_client/text_sensor/ble_text_sensor.cpp

@@ -1,135 +0,0 @@
-#include "ble_text_sensor.h"
-
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
-#include "esphome/core/application.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-#ifdef USE_ESP32
-
-namespace esphome {
-namespace ble_client {
-
-static const char *const TAG = "ble_text_sensor";
-
-static const std::string EMPTY = "";
-
-void BLETextSensor::loop() {}
-
-void BLETextSensor::dump_config() {
-  LOG_TEXT_SENSOR("", "BLE Text Sensor", this);
-  ESP_LOGCONFIG(TAG, "  MAC address        : %s", this->parent()->address_str().c_str());
-  ESP_LOGCONFIG(TAG, "  Service UUID       : %s", this->service_uuid_.to_string().c_str());
-  ESP_LOGCONFIG(TAG, "  Characteristic UUID: %s", this->char_uuid_.to_string().c_str());
-  ESP_LOGCONFIG(TAG, "  Descriptor UUID    : %s", this->descr_uuid_.to_string().c_str());
-  ESP_LOGCONFIG(TAG, "  Notifications      : %s", YESNO(this->notify_));
-  LOG_UPDATE_INTERVAL(this);
-}
-
-void BLETextSensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                                        esp_ble_gattc_cb_param_t *param) {
-  switch (event) {
-    case ESP_GATTC_OPEN_EVT: {
-      if (param->open.status == ESP_GATT_OK) {
-        ESP_LOGI(TAG, "[%s] Connected successfully!", this->get_name().c_str());
-        break;
-      }
-      break;
-    }
-    case ESP_GATTC_DISCONNECT_EVT: {
-      ESP_LOGW(TAG, "[%s] Disconnected!", this->get_name().c_str());
-      this->status_set_warning();
-      this->publish_state(EMPTY);
-      break;
-    }
-    case ESP_GATTC_SEARCH_CMPL_EVT: {
-      this->handle = 0;
-      auto *chr = this->parent()->get_characteristic(this->service_uuid_, this->char_uuid_);
-      if (chr == nullptr) {
-        this->status_set_warning();
-        this->publish_state(EMPTY);
-        ESP_LOGW(TAG, "No sensor characteristic found at service %s char %s", this->service_uuid_.to_string().c_str(),
-                 this->char_uuid_.to_string().c_str());
-        break;
-      }
-      this->handle = chr->handle;
-      if (this->descr_uuid_.get_uuid().len > 0) {
-        auto *descr = chr->get_descriptor(this->descr_uuid_);
-        if (descr == nullptr) {
-          this->status_set_warning();
-          this->publish_state(EMPTY);
-          ESP_LOGW(TAG, "No sensor descriptor found at service %s char %s descr %s",
-                   this->service_uuid_.to_string().c_str(), this->char_uuid_.to_string().c_str(),
-                   this->descr_uuid_.to_string().c_str());
-          break;
-        }
-        this->handle = descr->handle;
-      }
-      if (this->notify_) {
-        auto status = esp_ble_gattc_register_for_notify(this->parent()->get_gattc_if(),
-                                                        this->parent()->get_remote_bda(), chr->handle);
-        if (status) {
-          ESP_LOGW(TAG, "esp_ble_gattc_register_for_notify failed, status=%d", status);
-        }
-      } else {
-        this->node_state = espbt::ClientState::ESTABLISHED;
-      }
-      break;
-    }
-    case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->parent()->get_conn_id())
-        break;
-      if (param->read.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "Error reading char at handle %d, status=%d", param->read.handle, param->read.status);
-        break;
-      }
-      if (param->read.handle == this->handle) {
-        this->status_clear_warning();
-        this->publish_state(this->parse_data(param->read.value, param->read.value_len));
-      }
-      break;
-    }
-    case ESP_GATTC_NOTIFY_EVT: {
-      if (param->notify.conn_id != this->parent()->get_conn_id() || param->notify.handle != this->handle)
-        break;
-      ESP_LOGV(TAG, "[%s] ESP_GATTC_NOTIFY_EVT: handle=0x%x, value=0x%x", this->get_name().c_str(),
-               param->notify.handle, param->notify.value[0]);
-      this->publish_state(this->parse_data(param->notify.value, param->notify.value_len));
-      break;
-    }
-    case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
-      this->node_state = espbt::ClientState::ESTABLISHED;
-      break;
-    }
-    default:
-      break;
-  }
-}
-
-std::string BLETextSensor::parse_data(uint8_t *value, uint16_t value_len) {
-  std::string text(value, value + value_len);
-  return text;
-}
-
-void BLETextSensor::update() {
-  if (this->node_state != espbt::ClientState::ESTABLISHED) {
-    ESP_LOGW(TAG, "[%s] Cannot poll, not connected", this->get_name().c_str());
-    return;
-  }
-  if (this->handle == 0) {
-    ESP_LOGW(TAG, "[%s] Cannot poll, no service or characteristic found", this->get_name().c_str());
-    return;
-  }
-
-  auto status = esp_ble_gattc_read_char(this->parent()->get_gattc_if(), this->parent()->get_conn_id(), this->handle,
-                                        ESP_GATT_AUTH_REQ_NONE);
-  if (status) {
-    this->status_set_warning();
-    this->publish_state(EMPTY);
-    ESP_LOGW(TAG, "[%s] Error sending read request for sensor, status=%d", this->get_name().c_str(), status);
-  }
-}
-
-}  // namespace ble_client
-}  // namespace esphome
-#endif

esphome/components/ble_client/text_sensor/ble_text_sensor.h

@@ -1,46 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/ble_client/ble_client.h"
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
-#include "esphome/components/text_sensor/text_sensor.h"
-
-#ifdef USE_ESP32
-#include <esp_gattc_api.h>
-
-namespace esphome {
-namespace ble_client {
-
-namespace espbt = esphome::esp32_ble_tracker;
-
-class BLETextSensor : public text_sensor::TextSensor, public PollingComponent, public BLEClientNode {
- public:
-  void loop() override;
-  void update() override;
-  void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                           esp_ble_gattc_cb_param_t *param) override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::DATA; }
-  void set_service_uuid16(uint16_t uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_uint16(uuid); }
-  void set_service_uuid32(uint32_t uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_uint32(uuid); }
-  void set_service_uuid128(uint8_t *uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }
-  void set_char_uuid16(uint16_t uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_uint16(uuid); }
-  void set_char_uuid32(uint32_t uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_uint32(uuid); }
-  void set_char_uuid128(uint8_t *uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }
-  void set_descr_uuid16(uint16_t uuid) { this->descr_uuid_ = espbt::ESPBTUUID::from_uint16(uuid); }
-  void set_descr_uuid32(uint32_t uuid) { this->descr_uuid_ = espbt::ESPBTUUID::from_uint32(uuid); }
-  void set_descr_uuid128(uint8_t *uuid) { this->descr_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }
-  void set_enable_notify(bool notify) { this->notify_ = notify; }
-  std::string parse_data(uint8_t *value, uint16_t value_len);
-  uint16_t handle;
-
- protected:
-  bool notify_;
-  espbt::ESPBTUUID service_uuid_;
-  espbt::ESPBTUUID char_uuid_;
-  espbt::ESPBTUUID descr_uuid_;
-};
-
-}  // namespace ble_client
-}  // namespace esphome
-#endif

esphome/components/ble_presence/binary_sensor.py

@@ -7,6 +7,7 @@ from esphome.const import (
     CONF_IBEACON_MAJOR,
     CONF_IBEACON_MINOR,
     CONF_IBEACON_UUID,
+    CONF_ID,
 )
 
 DEPENDENCIES = ["esp32_ble_tracker"]
@@ -29,9 +30,9 @@ def _validate(config):
 
 
 CONFIG_SCHEMA = cv.All(
-    binary_sensor.binary_sensor_schema(BLEPresenceDevice)
-    .extend(
+    binary_sensor.BINARY_SENSOR_SCHEMA.extend(
         {
+            cv.GenerateID(): cv.declare_id(BLEPresenceDevice),
             cv.Optional(CONF_MAC_ADDRESS): cv.mac_address,
             cv.Optional(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
             cv.Optional(CONF_IBEACON_MAJOR): cv.uint16_t,
@@ -47,9 +48,10 @@ CONFIG_SCHEMA = cv.All(
 
 
 async def to_code(config):
-    var = await binary_sensor.new_binary_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await esp32_ble_tracker.register_ble_device(var, config)
+    await binary_sensor.register_binary_sensor(var, config)
 
     if CONF_MAC_ADDRESS in config:
         cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))

esphome/components/ble_presence/ble_presence_device.h

@@ -58,7 +58,7 @@ class BLEPresenceDevice : public binary_sensor::BinarySensorInitiallyOff,
       case MATCH_BY_SERVICE_UUID:
         for (auto uuid : device.get_service_uuids()) {
           if (this->uuid_ == uuid) {
-            this->publish_state(true);
+            this->publish_state(device.get_rssi());
             this->found_ = true;
             return true;
           }
@@ -83,7 +83,7 @@ class BLEPresenceDevice : public binary_sensor::BinarySensorInitiallyOff,
           return false;
         }
 
-        this->publish_state(true);
+        this->publish_state(device.get_rssi());
         this->found_ = true;
         return true;
     }

esphome/components/ble_rssi/ble_rssi_sensor.h

@@ -12,78 +12,41 @@ namespace ble_rssi {
 class BLERSSISensor : public sensor::Sensor, public esp32_ble_tracker::ESPBTDeviceListener, public Component {
  public:
   void set_address(uint64_t address) {
-    this->match_by_ = MATCH_BY_MAC_ADDRESS;
+    this->by_address_ = true;
     this->address_ = address;
   }
   void set_service_uuid16(uint16_t uuid) {
-    this->match_by_ = MATCH_BY_SERVICE_UUID;
+    this->by_address_ = false;
     this->uuid_ = esp32_ble_tracker::ESPBTUUID::from_uint16(uuid);
   }
   void set_service_uuid32(uint32_t uuid) {
-    this->match_by_ = MATCH_BY_SERVICE_UUID;
+    this->by_address_ = false;
     this->uuid_ = esp32_ble_tracker::ESPBTUUID::from_uint32(uuid);
   }
   void set_service_uuid128(uint8_t *uuid) {
-    this->match_by_ = MATCH_BY_SERVICE_UUID;
+    this->by_address_ = false;
     this->uuid_ = esp32_ble_tracker::ESPBTUUID::from_raw(uuid);
   }
-  void set_ibeacon_uuid(uint8_t *uuid) {
-    this->match_by_ = MATCH_BY_IBEACON_UUID;
-    this->ibeacon_uuid_ = esp32_ble_tracker::ESPBTUUID::from_raw(uuid);
-  }
-  void set_ibeacon_major(uint16_t major) {
-    this->check_ibeacon_major_ = true;
-    this->ibeacon_major_ = major;
-  }
-  void set_ibeacon_minor(uint16_t minor) {
-    this->check_ibeacon_minor_ = true;
-    this->ibeacon_minor_ = minor;
-  }
   void on_scan_end() override {
     if (!this->found_)
       this->publish_state(NAN);
     this->found_ = false;
   }
   bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override {
-    switch (this->match_by_) {
-      case MATCH_BY_MAC_ADDRESS:
-        if (device.address_uint64() == this->address_) {
+    if (this->by_address_) {
+      if (device.address_uint64() == this->address_) {
+        this->publish_state(device.get_rssi());
+        this->found_ = true;
+        return true;
+      }
+    } else {
+      for (auto uuid : device.get_service_uuids()) {
+        if (this->uuid_ == uuid) {
           this->publish_state(device.get_rssi());
           this->found_ = true;
           return true;
         }
-        break;
-      case MATCH_BY_SERVICE_UUID:
-        for (auto uuid : device.get_service_uuids()) {
-          if (this->uuid_ == uuid) {
-            this->publish_state(device.get_rssi());
-            this->found_ = true;
-            return true;
-          }
-        }
-        break;
-      case MATCH_BY_IBEACON_UUID:
-        if (!device.get_ibeacon().has_value()) {
-          return false;
-        }
-
-        auto ibeacon = device.get_ibeacon().value();
-
-        if (this->ibeacon_uuid_ != ibeacon.get_uuid()) {
-          return false;
-        }
-
-        if (this->check_ibeacon_major_ && this->ibeacon_major_ != ibeacon.get_major()) {
-          return false;
-        }
-
-        if (this->check_ibeacon_minor_ && this->ibeacon_minor_ != ibeacon.get_minor()) {
-          return false;
-        }
-
-        this->publish_state(device.get_rssi());
-        this->found_ = true;
-        return true;
+      }
     }
     return false;
   }
@@ -91,20 +54,10 @@ class BLERSSISensor : public sensor::Sensor, public esp32_ble_tracker::ESPBTDevi
   float get_setup_priority() const override { return setup_priority::DATA; }
 
  protected:
-  enum MatchType { MATCH_BY_MAC_ADDRESS, MATCH_BY_SERVICE_UUID, MATCH_BY_IBEACON_UUID };
-  MatchType match_by_;
-
   bool found_{false};
-
+  bool by_address_{false};
   uint64_t address_;
-
   esp32_ble_tracker::ESPBTUUID uuid_;
-
-  esp32_ble_tracker::ESPBTUUID ibeacon_uuid_;
-  uint16_t ibeacon_major_;
-  bool check_ibeacon_major_;
-  uint16_t ibeacon_minor_;
-  bool check_ibeacon_minor_;
 };
 
 }  // namespace ble_rssi

esphome/components/ble_rssi/sensor.py

@@ -2,14 +2,12 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import sensor, esp32_ble_tracker
 from esphome.const import (
-    CONF_IBEACON_MAJOR,
-    CONF_IBEACON_MINOR,
-    CONF_IBEACON_UUID,
     CONF_SERVICE_UUID,
     CONF_MAC_ADDRESS,
+    CONF_ID,
     DEVICE_CLASS_SIGNAL_STRENGTH,
     STATE_CLASS_MEASUREMENT,
-    UNIT_DECIBEL_MILLIWATT,
+    UNIT_DECIBEL,
 )
 
 DEPENDENCIES = ["esp32_ble_tracker"]
@@ -19,43 +17,31 @@ BLERSSISensor = ble_rssi_ns.class_(
     "BLERSSISensor", sensor.Sensor, cg.Component, esp32_ble_tracker.ESPBTDeviceListener
 )
 
-
-def _validate(config):
-    if CONF_IBEACON_MAJOR in config and CONF_IBEACON_UUID not in config:
-        raise cv.Invalid("iBeacon major identifier requires iBeacon UUID")
-    if CONF_IBEACON_MINOR in config and CONF_IBEACON_UUID not in config:
-        raise cv.Invalid("iBeacon minor identifier requires iBeacon UUID")
-    return config
-
-
 CONFIG_SCHEMA = cv.All(
     sensor.sensor_schema(
-        BLERSSISensor,
-        unit_of_measurement=UNIT_DECIBEL_MILLIWATT,
+        unit_of_measurement=UNIT_DECIBEL,
         accuracy_decimals=0,
         device_class=DEVICE_CLASS_SIGNAL_STRENGTH,
         state_class=STATE_CLASS_MEASUREMENT,
     )
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(BLERSSISensor),
             cv.Optional(CONF_MAC_ADDRESS): cv.mac_address,
             cv.Optional(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
-            cv.Optional(CONF_IBEACON_MAJOR): cv.uint16_t,
-            cv.Optional(CONF_IBEACON_MINOR): cv.uint16_t,
-            cv.Optional(CONF_IBEACON_UUID): cv.uuid,
         }
     )
     .extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
     .extend(cv.COMPONENT_SCHEMA),
-    cv.has_exactly_one_key(CONF_MAC_ADDRESS, CONF_SERVICE_UUID, CONF_IBEACON_UUID),
-    _validate,
+    cv.has_exactly_one_key(CONF_MAC_ADDRESS, CONF_SERVICE_UUID),
 )
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await esp32_ble_tracker.register_ble_device(var, config)
+    await sensor.register_sensor(var, config)
 
     if CONF_MAC_ADDRESS in config:
         cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
@@ -76,13 +62,3 @@ async def to_code(config):
         elif len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid128_format):
             uuid128 = esp32_ble_tracker.as_reversed_hex_array(config[CONF_SERVICE_UUID])
             cg.add(var.set_service_uuid128(uuid128))
-
-    if CONF_IBEACON_UUID in config:
-        ibeacon_uuid = esp32_ble_tracker.as_hex_array(str(config[CONF_IBEACON_UUID]))
-        cg.add(var.set_ibeacon_uuid(ibeacon_uuid))
-
-        if CONF_IBEACON_MAJOR in config:
-            cg.add(var.set_ibeacon_major(config[CONF_IBEACON_MAJOR]))
-
-        if CONF_IBEACON_MINOR in config:
-            cg.add(var.set_ibeacon_minor(config[CONF_IBEACON_MINOR]))

esphome/components/ble_scanner/text_sensor.py

@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import text_sensor, esp32_ble_tracker
+from esphome.const import CONF_ID
 
 DEPENDENCIES = ["esp32_ble_tracker"]
 
@@ -13,13 +14,18 @@ BLEScanner = ble_scanner_ns.class_(
 )
 
 CONFIG_SCHEMA = cv.All(
-    text_sensor.text_sensor_schema(BLEScanner)
+    text_sensor.TEXT_SENSOR_SCHEMA.extend(
+        {
+            cv.GenerateID(): cv.declare_id(BLEScanner),
+        }
+    )
     .extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
     .extend(cv.COMPONENT_SCHEMA)
 )
 
 
 async def to_code(config):
-    var = await text_sensor.new_text_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await esp32_ble_tracker.register_ble_device(var, config)
+    await text_sensor.register_text_sensor(var, config)

esphome/components/bluetooth_proxy/__init__.py

@@ -1,75 +0,0 @@
-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
-
-AUTO_LOAD = ["esp32_ble_client", "esp32_ble_tracker"]
-DEPENDENCIES = ["api", "esp32"]
-CODEOWNERS = ["@jesserockz"]
-
-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
-)
-
-CONNECTION_SCHEMA = esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(BluetoothConnection),
-    }
-).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.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,
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    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)
-
-    cg.add_define("USE_BLUETOOTH_PROXY")

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

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

esphome/components/bluetooth_proxy/bluetooth_proxy.cpp

@@ -1,391 +0,0 @@
-#include "bluetooth_proxy.h"
-
-#include "esphome/core/log.h"
-
-#ifdef USE_ESP32
-
-#include "esphome/components/api/api_server.h"
-
-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])};
-}
-
-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;
-  ESP_LOGV(TAG, "Proxying packet from %s - %s. RSSI: %d dB", device.get_name().c_str(), device.address_str().c_str(),
-           device.get_rssi());
-  this->send_api_packet_(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();
-  for (auto uuid : device.get_service_uuids()) {
-    resp.service_uuids.push_back(uuid.to_string());
-  }
-  for (auto &data : device.get_service_datas()) {
-    api::BluetoothServiceData service_data;
-    service_data.uuid = data.uuid.to_string();
-    service_data.data.assign(data.data.begin(), data.data.end());
-    resp.service_data.push_back(std::move(service_data));
-  }
-  for (auto &data : device.get_manufacturer_datas()) {
-    api::BluetoothServiceData manufacturer_data;
-    manufacturer_data.uuid = data.uuid.to_string();
-    manufacturer_data.data.assign(data.data.begin(), data.data.end());
-    resp.manufacturer_data.push_back(std::move(manufacturer_data));
-  }
-  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());
-    }
-  }
-  return free;
-}
-
-void BluetoothProxy::loop() {
-  if (!api::global_api_server->is_connected()) {
-    for (auto *connection : this->connections_) {
-      if (connection->get_address() != 0) {
-        connection->disconnect();
-      }
-    }
-    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);
-      }
-      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;
-      }
-      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());
-      }
-      break;
-    }
-    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR:
-    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR:
-      break;
-  }
-}
-
-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");
-    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
-    return;
-  }
-
-  auto err = connection->read_characteristic(msg.handle);
-  if (err != ESP_OK) {
-    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");
-    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
-    return;
-  }
-
-  auto err = connection->write_characteristic(msg.handle, msg.data, msg.response);
-  if (err != ESP_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");
-    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
-    return;
-  }
-
-  auto err = connection->read_descriptor(msg.handle);
-  if (err != ESP_OK) {
-    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");
-    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
-    return;
-  }
-
-  auto err = connection->write_descriptor(msg.handle, msg.data, true);
-  if (err != ESP_OK) {
-    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");
-    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);
-    return;
-  }
-  if (connection->send_service_ ==
-      DONE_SENDING_SERVICES)  // Only start sending services if we're not already sending them
-    connection->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");
-    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);
-  }
-}
-
-BluetoothProxy *global_bluetooth_proxy = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-
-}  // namespace bluetooth_proxy
-}  // namespace esphome
-
-#endif  // USE_ESP32

esphome/components/bluetooth_proxy/bluetooth_proxy.h

@@ -1,65 +0,0 @@
-#pragma once
-
-#ifdef USE_ESP32
-
-#include <map>
-#include <vector>
-
-#include "esphome/components/api/api_pb2.h"
-#include "esphome/components/esp32_ble_client/ble_client_base.h"
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
-#include "esphome/core/automation.h"
-#include "esphome/core/component.h"
-#include "esphome/core/defines.h"
-
-#include "bluetooth_connection.h"
-
-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 {
- 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 bluetooth_device_request(const api::BluetoothDeviceRequest &msg);
-  void bluetooth_gatt_read(const api::BluetoothGATTReadRequest &msg);
-  void bluetooth_gatt_write(const api::BluetoothGATTWriteRequest &msg);
-  void bluetooth_gatt_read_descriptor(const api::BluetoothGATTReadDescriptorRequest &msg);
-  void bluetooth_gatt_write_descriptor(const api::BluetoothGATTWriteDescriptorRequest &msg);
-  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(); }
-
-  void set_active(bool active) { this->active_ = active; }
-  bool has_active() { return this->active_; }
-
- protected:
-  void send_api_packet_(const esp32_ble_tracker::ESPBTDevice &device);
-
-  BluetoothConnection *get_connection_(uint64_t address, bool reserve);
-
-  bool active_;
-
-  std::vector<BluetoothConnection *> connections_{};
-};
-
-extern BluetoothProxy *global_bluetooth_proxy;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-
-}  // namespace bluetooth_proxy
-}  // namespace esphome
-
-#endif  // USE_ESP32

esphome/components/bme280/bme280.cpp

@@ -1,5 +1,4 @@
 #include "bme280.h"
-#include "esphome/core/hal.h"
 #include "esphome/core/log.h"
 
 namespace esphome {
@@ -29,7 +28,6 @@ static const uint8_t BME280_REGISTER_DIG_H5 = 0xE5;
 static const uint8_t BME280_REGISTER_DIG_H6 = 0xE7;
 
 static const uint8_t BME280_REGISTER_CHIPID = 0xD0;
-static const uint8_t BME280_REGISTER_RESET = 0xE0;
 
 static const uint8_t BME280_REGISTER_CONTROLHUMID = 0xF2;
 static const uint8_t BME280_REGISTER_STATUS = 0xF3;
@@ -41,8 +39,6 @@ static const uint8_t BME280_REGISTER_TEMPDATA = 0xFA;
 static const uint8_t BME280_REGISTER_HUMIDDATA = 0xFD;
 
 static const uint8_t BME280_MODE_FORCED = 0b01;
-static const uint8_t BME280_SOFT_RESET = 0xB6;
-static const uint8_t BME280_STATUS_IM_UPDATE = 0b01;
 
 inline uint16_t combine_bytes(uint8_t msb, uint8_t lsb) { return ((msb & 0xFF) << 8) | (lsb & 0xFF); }
 
@@ -85,11 +81,6 @@ static const char *iir_filter_to_str(BME280IIRFilter filter) {
 void BME280Component::setup() {
   ESP_LOGCONFIG(TAG, "Setting up BME280...");
   uint8_t chip_id = 0;
-
-  // 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.
-  this->component_state_ &= ~COMPONENT_STATE_FAILED;
-
   if (!this->read_byte(BME280_REGISTER_CHIPID, &chip_id)) {
     this->error_code_ = COMMUNICATION_FAILED;
     this->mark_failed();
@@ -101,28 +92,6 @@ void BME280Component::setup() {
     return;
   }
 
-  // Send a soft reset.
-  if (!this->write_byte(BME280_REGISTER_RESET, BME280_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(BME280_REGISTER_STATUS, &status)) {
-      ESP_LOGW(TAG, "Error reading status register.");
-      this->mark_failed();
-      return;
-    }
-  } while ((status & BME280_STATUS_IM_UPDATE) && (--retry));
-  if (status & BME280_STATUS_IM_UPDATE) {
-    ESP_LOGW(TAG, "Timeout loading NVM.");
-    this->mark_failed();
-    return;
-  }
-
   // Read calibration
   this->calibration_.t1 = read_u16_le_(BME280_REGISTER_DIG_T1);
   this->calibration_.t2 = read_s16_le_(BME280_REGISTER_DIG_T2);
@@ -163,7 +132,7 @@ void BME280Component::setup() {
     return;
   }
   config_register &= ~0b11111100;
-  config_register |= 0b101 << 5;  // 1000 ms standby time
+  config_register |= 0b000 << 5;  // 0.5 ms standby time
   config_register |= (this->iir_filter_ & 0b111) << 2;
   if (!this->write_byte(BME280_REGISTER_CONFIG, config_register)) {
     this->mark_failed();

esphome/components/bme280/bme280.h

@@ -96,9 +96,9 @@ class BME280Component : public PollingComponent, public i2c::I2CDevice {
   BME280Oversampling pressure_oversampling_{BME280_OVERSAMPLING_16X};
   BME280Oversampling humidity_oversampling_{BME280_OVERSAMPLING_16X};
   BME280IIRFilter iir_filter_{BME280_IIR_FILTER_OFF};
-  sensor::Sensor *temperature_sensor_{nullptr};
-  sensor::Sensor *pressure_sensor_{nullptr};
-  sensor::Sensor *humidity_sensor_{nullptr};
+  sensor::Sensor *temperature_sensor_;
+  sensor::Sensor *pressure_sensor_;
+  sensor::Sensor *humidity_sensor_;
   enum ErrorCode {
     NONE = 0,
     COMMUNICATION_FAILED,

esphome/components/bme680/bme680.h

@@ -129,10 +129,10 @@ class BME680Component : public PollingComponent, public i2c::I2CDevice {
   uint16_t heater_temperature_{320};
   uint16_t heater_duration_{150};
 
-  sensor::Sensor *temperature_sensor_{nullptr};
-  sensor::Sensor *pressure_sensor_{nullptr};
-  sensor::Sensor *humidity_sensor_{nullptr};
-  sensor::Sensor *gas_resistance_sensor_{nullptr};
+  sensor::Sensor *temperature_sensor_;
+  sensor::Sensor *pressure_sensor_;
+  sensor::Sensor *humidity_sensor_;
+  sensor::Sensor *gas_resistance_sensor_;
 };
 
 }  // namespace bme680

esphome/components/bme680_bsec/bme680_bsec.cpp

@@ -169,14 +169,6 @@ void BME680BSECComponent::loop() {
   } else {
     this->status_clear_warning();
   }
-
-  // Process a single action from the queue. These are primarily sensor state publishes
-  // that in totality take too long to send in a single call.
-  if (this->queue_.size()) {
-    auto action = std::move(this->queue_.front());
-    this->queue_.pop();
-    action();
-  }
 }
 
 void BME680BSECComponent::run_() {
@@ -314,39 +306,37 @@ void BME680BSECComponent::read_(int64_t trigger_time_ns, bsec_bme_settings_t bme
 }
 
 void BME680BSECComponent::publish_(const bsec_output_t *outputs, uint8_t num_outputs) {
-  ESP_LOGV(TAG, "Queuing sensor state publish actions");
+  ESP_LOGV(TAG, "Publishing sensor states");
   for (uint8_t i = 0; i < num_outputs; i++) {
-    float signal = outputs[i].signal;
     switch (outputs[i].sensor_id) {
       case BSEC_OUTPUT_IAQ:
-      case BSEC_OUTPUT_STATIC_IAQ: {
-        uint8_t accuracy = outputs[i].accuracy;
-        this->queue_push_([this, signal]() { this->publish_sensor_(this->iaq_sensor_, signal); });
-        this->queue_push_([this, accuracy]() {
-          this->publish_sensor_(this->iaq_accuracy_text_sensor_, IAQ_ACCURACY_STATES[accuracy]);
-        });
-        this->queue_push_([this, accuracy]() { this->publish_sensor_(this->iaq_accuracy_sensor_, accuracy, true); });
+      case BSEC_OUTPUT_STATIC_IAQ:
+        uint8_t accuracy;
+        accuracy = outputs[i].accuracy;
+        this->publish_sensor_state_(this->iaq_sensor_, outputs[i].signal);
+        this->publish_sensor_state_(this->iaq_accuracy_text_sensor_, IAQ_ACCURACY_STATES[accuracy]);
+        this->publish_sensor_state_(this->iaq_accuracy_sensor_, accuracy, true);
 
         // Queue up an opportunity to save state
-        this->queue_push_([this, accuracy]() { this->save_state_(accuracy); });
-      } break;
+        this->defer("save_state", [this, accuracy]() { this->save_state_(accuracy); });
+        break;
       case BSEC_OUTPUT_CO2_EQUIVALENT:
-        this->queue_push_([this, signal]() { this->publish_sensor_(this->co2_equivalent_sensor_, signal); });
+        this->publish_sensor_state_(this->co2_equivalent_sensor_, outputs[i].signal);
         break;
       case BSEC_OUTPUT_BREATH_VOC_EQUIVALENT:
-        this->queue_push_([this, signal]() { this->publish_sensor_(this->breath_voc_equivalent_sensor_, signal); });
+        this->publish_sensor_state_(this->breath_voc_equivalent_sensor_, outputs[i].signal);
         break;
       case BSEC_OUTPUT_RAW_PRESSURE:
-        this->queue_push_([this, signal]() { this->publish_sensor_(this->pressure_sensor_, signal / 100.0f); });
+        this->publish_sensor_state_(this->pressure_sensor_, outputs[i].signal / 100.0f);
         break;
       case BSEC_OUTPUT_RAW_GAS:
-        this->queue_push_([this, signal]() { this->publish_sensor_(this->gas_resistance_sensor_, signal); });
+        this->publish_sensor_state_(this->gas_resistance_sensor_, outputs[i].signal);
         break;
       case BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_TEMPERATURE:
-        this->queue_push_([this, signal]() { this->publish_sensor_(this->temperature_sensor_, signal); });
+        this->publish_sensor_state_(this->temperature_sensor_, outputs[i].signal);
         break;
       case BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_HUMIDITY:
-        this->queue_push_([this, signal]() { this->publish_sensor_(this->humidity_sensor_, signal); });
+        this->publish_sensor_state_(this->humidity_sensor_, outputs[i].signal);
         break;
     }
   }
@@ -362,14 +352,14 @@ int64_t BME680BSECComponent::get_time_ns_() {
   return (time_ms + ((int64_t) this->millis_overflow_counter_ << 32)) * INT64_C(1000000);
 }
 
-void BME680BSECComponent::publish_sensor_(sensor::Sensor *sensor, float value, bool change_only) {
+void BME680BSECComponent::publish_sensor_state_(sensor::Sensor *sensor, float value, bool change_only) {
   if (!sensor || (change_only && sensor->has_state() && sensor->state == value)) {
     return;
   }
   sensor->publish_state(value);
 }
 
-void BME680BSECComponent::publish_sensor_(text_sensor::TextSensor *sensor, const std::string &value) {
+void BME680BSECComponent::publish_sensor_state_(text_sensor::TextSensor *sensor, const std::string &value) {
   if (!sensor || (sensor->has_state() && sensor->state == value)) {
     return;
   }

esphome/components/bme680_bsec/bme680_bsec.h

@@ -70,14 +70,12 @@ class BME680BSECComponent : public Component, public i2c::I2CDevice {
   void publish_(const bsec_output_t *outputs, uint8_t num_outputs);
   int64_t get_time_ns_();
 
-  void publish_sensor_(sensor::Sensor *sensor, float value, bool change_only = false);
-  void publish_sensor_(text_sensor::TextSensor *sensor, const std::string &value);
+  void publish_sensor_state_(sensor::Sensor *sensor, float value, bool change_only = false);
+  void publish_sensor_state_(text_sensor::TextSensor *sensor, const std::string &value);
 
   void load_state_();
   void save_state_(uint8_t accuracy);
 
-  void queue_push_(std::function<void()> &&f) { this->queue_.push(std::move(f)); }
-
   struct bme680_dev bme680_;
   bsec_library_return_t bsec_status_{BSEC_OK};
   int8_t bme680_status_{BME680_OK};
@@ -86,8 +84,6 @@ class BME680BSECComponent : public Component, public i2c::I2CDevice {
   uint32_t millis_overflow_counter_{0};
   int64_t next_call_ns_{0};
 
-  std::queue<std::function<void()>> queue_;
-
   ESPPreferenceObject bsec_state_;
   uint32_t state_save_interval_ms_{21600000};  // 6 hours - 4 times a day
   uint32_t last_state_save_ms_ = 0;
@@ -100,15 +96,15 @@ class BME680BSECComponent : public Component, public i2c::I2CDevice {
   SampleRate pressure_sample_rate_{SAMPLE_RATE_DEFAULT};
   SampleRate humidity_sample_rate_{SAMPLE_RATE_DEFAULT};
 
-  sensor::Sensor *temperature_sensor_{nullptr};
-  sensor::Sensor *pressure_sensor_{nullptr};
-  sensor::Sensor *humidity_sensor_{nullptr};
-  sensor::Sensor *gas_resistance_sensor_{nullptr};
-  sensor::Sensor *iaq_sensor_{nullptr};
-  text_sensor::TextSensor *iaq_accuracy_text_sensor_{nullptr};
-  sensor::Sensor *iaq_accuracy_sensor_{nullptr};
-  sensor::Sensor *co2_equivalent_sensor_{nullptr};
-  sensor::Sensor *breath_voc_equivalent_sensor_{nullptr};
+  sensor::Sensor *temperature_sensor_;
+  sensor::Sensor *pressure_sensor_;
+  sensor::Sensor *humidity_sensor_;
+  sensor::Sensor *gas_resistance_sensor_;
+  sensor::Sensor *iaq_sensor_;
+  text_sensor::TextSensor *iaq_accuracy_text_sensor_;
+  sensor::Sensor *iaq_accuracy_sensor_;
+  sensor::Sensor *co2_equivalent_sensor_;
+  sensor::Sensor *breath_voc_equivalent_sensor_;
 };
 #endif
 }  // namespace bme680_bsec

esphome/components/bme680_bsec/text_sensor.py

@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import text_sensor
+from esphome.const import CONF_ID, CONF_ICON
 from . import BME680BSECComponent, CONF_BME680_BSEC_ID
 
 DEPENDENCIES = ["bme680_bsec"]
@@ -13,8 +14,11 @@ TYPES = [CONF_IAQ_ACCURACY]
 CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(CONF_BME680_BSEC_ID): cv.use_id(BME680BSECComponent),
-        cv.Optional(CONF_IAQ_ACCURACY): text_sensor.text_sensor_schema(
-            icon=ICON_ACCURACY
+        cv.Optional(CONF_IAQ_ACCURACY): text_sensor.TEXT_SENSOR_SCHEMA.extend(
+            {
+                cv.GenerateID(): cv.declare_id(text_sensor.TextSensor),
+                cv.Optional(CONF_ICON, default=ICON_ACCURACY): cv.icon,
+            }
         ),
     }
 )
@@ -23,7 +27,8 @@ CONFIG_SCHEMA = cv.Schema(
 async def setup_conf(config, key, hub):
     if key in config:
         conf = config[key]
-        sens = await text_sensor.new_text_sensor(conf)
+        sens = cg.new_Pvariable(conf[CONF_ID])
+        await text_sensor.register_text_sensor(sens, conf)
         cg.add(getattr(hub, f"set_{key}_text_sensor")(sens))
 
 

esphome/components/bmp280/bmp280.h

@@ -81,8 +81,8 @@ class BMP280Component : public PollingComponent, public i2c::I2CDevice {
   BMP280Oversampling temperature_oversampling_{BMP280_OVERSAMPLING_16X};
   BMP280Oversampling pressure_oversampling_{BMP280_OVERSAMPLING_16X};
   BMP280IIRFilter iir_filter_{BMP280_IIR_FILTER_OFF};
-  sensor::Sensor *temperature_sensor_{nullptr};
-  sensor::Sensor *pressure_sensor_{nullptr};
+  sensor::Sensor *temperature_sensor_;
+  sensor::Sensor *pressure_sensor_;
   enum ErrorCode {
     NONE = 0,
     COMMUNICATION_FAILED,

esphome/components/bmp3xx/bmp3xx.h

@@ -125,8 +125,8 @@ class BMP3XXComponent : public PollingComponent, public i2c::I2CDevice {
   Oversampling pressure_oversampling_{OVERSAMPLING_X16};
   IIRFilter iir_filter_{IIR_FILTER_OFF};
   OperationMode operation_mode_{FORCED_MODE};
-  sensor::Sensor *temperature_sensor_{nullptr};
-  sensor::Sensor *pressure_sensor_{nullptr};
+  sensor::Sensor *temperature_sensor_;
+  sensor::Sensor *pressure_sensor_;
   enum ErrorCode {
     NONE = 0,
     ERROR_COMMUNICATION_FAILED,

esphome/components/bmp3xx/sensor.py

@@ -25,7 +25,7 @@ OVERSAMPLING_OPTIONS = {
     "4X": Oversampling.OVERSAMPLING_X4,
     "8X": Oversampling.OVERSAMPLING_X8,
     "16X": Oversampling.OVERSAMPLING_X16,
-    "32X": Oversampling.OVERSAMPLING_X32,
+    "32x": Oversampling.OVERSAMPLING_X32,
 }
 
 IIRFilter = bmp3xx_ns.enum("IIRFilter")

esphome/components/button/__init__.py

@@ -102,8 +102,8 @@ async def register_button(var, config):
     await setup_button_core_(var, config)
 
 
-async def new_button(config, *args):
-    var = cg.new_Pvariable(config[CONF_ID], *args)
+async def new_button(config):
+    var = cg.new_Pvariable(config[CONF_ID])
     await register_button(var, config)
     return var
 

esphome/components/button/button.cpp

@@ -15,9 +15,14 @@ void Button::press() {
   this->press_callback_.call();
 }
 void Button::add_on_press_callback(std::function<void()> &&callback) { this->press_callback_.add(std::move(callback)); }
+uint32_t Button::hash_base() { return 1495763804UL; }
 
 void Button::set_device_class(const std::string &device_class) { this->device_class_ = device_class; }
-std::string Button::get_device_class() { return this->device_class_; }
+std::string Button::get_device_class() {
+  if (this->device_class_.has_value())
+    return *this->device_class_;
+  return "";
+}
 
 }  // namespace button
 }  // namespace esphome

esphome/components/button/button.h

@@ -45,10 +45,12 @@ class Button : public EntityBase {
  protected:
   /** You should implement this virtual method if you want to create your own button.
    */
-  virtual void press_action() = 0;
+  virtual void press_action(){};
+
+  uint32_t hash_base() override;
 
   CallbackManager<void()> press_callback_{};
-  std::string device_class_{};
+  optional<std::string> device_class_{};
 };
 
 }  // namespace button

esphome/components/canbus/__init__.py

@@ -8,22 +8,16 @@ CODEOWNERS = ["@mvturnho", "@danielschramm"]
 IS_PLATFORM_COMPONENT = True
 
 CONF_CAN_ID = "can_id"
-CONF_CAN_ID_MASK = "can_id_mask"
 CONF_USE_EXTENDED_ID = "use_extended_id"
-CONF_REMOTE_TRANSMISSION_REQUEST = "remote_transmission_request"
 CONF_CANBUS_ID = "canbus_id"
 CONF_BIT_RATE = "bit_rate"
 CONF_ON_FRAME = "on_frame"
 
 
-def validate_id(config):
-    if CONF_CAN_ID in config:
-        id_value = config[CONF_CAN_ID]
-        id_ext = config[CONF_USE_EXTENDED_ID]
-        if not id_ext:
-            if id_value > 0x7FF:
-                raise cv.Invalid("Standard IDs must be 11 Bit (0x000-0x7ff / 0-2047)")
-    return config
+def validate_id(id_value, id_ext):
+    if not id_ext:
+        if id_value > 0x7FF:
+            raise cv.Invalid("Standard IDs must be 11 Bit (0x000-0x7ff / 0-2047)")
 
 
 def validate_raw_data(value):
@@ -40,7 +34,7 @@ canbus_ns = cg.esphome_ns.namespace("canbus")
 CanbusComponent = canbus_ns.class_("CanbusComponent", cg.Component)
 CanbusTrigger = canbus_ns.class_(
     "CanbusTrigger",
-    automation.Trigger.template(cg.std_vector.template(cg.uint8), cg.uint32),
+    automation.Trigger.template(cg.std_vector.template(cg.uint8)),
     cg.Component,
 )
 CanSpeed = canbus_ns.enum("CAN_SPEED")
@@ -73,22 +67,23 @@ CANBUS_SCHEMA = cv.Schema(
         cv.Optional(CONF_ON_FRAME): automation.validate_automation(
             {
                 cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(CanbusTrigger),
-                cv.Required(CONF_CAN_ID): cv.int_range(min=0, max=0x1FFFFFFF),
-                cv.Optional(CONF_CAN_ID_MASK, default=0x1FFFFFFF): cv.int_range(
-                    min=0, max=0x1FFFFFFF
-                ),
+                cv.GenerateID(CONF_CAN_ID): cv.int_range(min=0, max=0x1FFFFFFF),
                 cv.Optional(CONF_USE_EXTENDED_ID, default=False): cv.boolean,
-                cv.Optional(CONF_REMOTE_TRANSMISSION_REQUEST): cv.boolean,
-            },
-            validate_id,
+                cv.Optional(CONF_ON_FRAME): automation.validate_automation(
+                    {
+                        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(CanbusTrigger),
+                        cv.GenerateID(CONF_CAN_ID): cv.int_range(min=0, max=0x1FFFFFFF),
+                        cv.Optional(CONF_USE_EXTENDED_ID, default=False): cv.boolean,
+                    }
+                ),
+            }
         ),
-    },
+    }
 ).extend(cv.COMPONENT_SCHEMA)
 
-CANBUS_SCHEMA.add_extra(validate_id)
-
 
 async def setup_canbus_core_(var, config):
+    validate_id(config[CONF_CAN_ID], config[CONF_USE_EXTENDED_ID])
     await cg.register_component(var, config)
     cg.add(var.set_can_id([config[CONF_CAN_ID]]))
     cg.add(var.set_use_extended_id([config[CONF_USE_EXTENDED_ID]]))
@@ -96,26 +91,12 @@ async def setup_canbus_core_(var, config):
 
     for conf in config.get(CONF_ON_FRAME, []):
         can_id = conf[CONF_CAN_ID]
-        can_id_mask = conf[CONF_CAN_ID_MASK]
         ext_id = conf[CONF_USE_EXTENDED_ID]
-        trigger = cg.new_Pvariable(
-            conf[CONF_TRIGGER_ID], var, can_id, can_id_mask, ext_id
-        )
-        if CONF_REMOTE_TRANSMISSION_REQUEST in conf:
-            cg.add(
-                trigger.set_remote_transmission_request(
-                    conf[CONF_REMOTE_TRANSMISSION_REQUEST]
-                )
-            )
+        validate_id(can_id, ext_id)
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var, can_id, ext_id)
         await cg.register_component(trigger, conf)
         await automation.build_automation(
-            trigger,
-            [
-                (cg.std_vector.template(cg.uint8), "x"),
-                (cg.uint32, "can_id"),
-                (cg.bool_, "remote_transmission_request"),
-            ],
-            conf,
+            trigger, [(cg.std_vector.template(cg.uint8), "x")], conf
         )
 
 
@@ -134,30 +115,25 @@ async def register_canbus(var, config):
             cv.GenerateID(CONF_CANBUS_ID): cv.use_id(CanbusComponent),
             cv.Optional(CONF_CAN_ID): cv.int_range(min=0, max=0x1FFFFFFF),
             cv.Optional(CONF_USE_EXTENDED_ID, default=False): cv.boolean,
-            cv.Optional(CONF_REMOTE_TRANSMISSION_REQUEST, default=False): cv.boolean,
             cv.Required(CONF_DATA): cv.templatable(validate_raw_data),
         },
-        validate_id,
         key=CONF_DATA,
     ),
 )
 async def canbus_action_to_code(config, action_id, template_arg, args):
+    validate_id(config[CONF_CAN_ID], config[CONF_USE_EXTENDED_ID])
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_CANBUS_ID])
 
     if CONF_CAN_ID in config:
         can_id = await cg.templatable(config[CONF_CAN_ID], args, cg.uint32)
         cg.add(var.set_can_id(can_id))
+
     use_extended_id = await cg.templatable(
         config[CONF_USE_EXTENDED_ID], args, cg.uint32
     )
     cg.add(var.set_use_extended_id(use_extended_id))
 
-    remote_transmission_request = await cg.templatable(
-        config[CONF_REMOTE_TRANSMISSION_REQUEST], args, bool
-    )
-    cg.add(var.set_remote_transmission_request(remote_transmission_request))
-
     data = config[CONF_DATA]
     if isinstance(data, bytes):
         data = [int(x) for x in data]

esphome/components/canbus/canbus.cpp

@@ -22,22 +22,20 @@ void Canbus::dump_config() {
   }
 }
 
-void Canbus::send_data(uint32_t can_id, bool use_extended_id, bool remote_transmission_request,
-                       const std::vector<uint8_t> &data) {
+void Canbus::send_data(uint32_t can_id, bool use_extended_id, const std::vector<uint8_t> &data) {
   struct CanFrame can_message;
 
   uint8_t size = static_cast<uint8_t>(data.size());
   if (use_extended_id) {
-    ESP_LOGD(TAG, "send extended id=0x%08x rtr=%s size=%d", can_id, TRUEFALSE(remote_transmission_request), size);
+    ESP_LOGD(TAG, "send extended id=0x%08x size=%d", can_id, size);
   } else {
-    ESP_LOGD(TAG, "send extended id=0x%03x rtr=%s size=%d", can_id, TRUEFALSE(remote_transmission_request), size);
+    ESP_LOGD(TAG, "send extended id=0x%03x size=%d", can_id, size);
   }
   if (size > CAN_MAX_DATA_LENGTH)
     size = CAN_MAX_DATA_LENGTH;
   can_message.can_data_length_code = size;
   can_message.can_id = can_id;
   can_message.use_extended_id = use_extended_id;
-  can_message.remote_transmission_request = remote_transmission_request;
 
   for (int i = 0; i < size; i++) {
     can_message.data[i] = data[i];
@@ -58,15 +56,13 @@ void Canbus::add_trigger(CanbusTrigger *trigger) {
 
 void Canbus::loop() {
   struct CanFrame can_message;
-  // read all messages until queue is empty
-  int message_counter = 0;
-  while (this->read_message(&can_message) == canbus::ERROR_OK) {
-    message_counter++;
+  // readmessage
+  if (this->read_message(&can_message) == canbus::ERROR_OK) {
     if (can_message.use_extended_id) {
-      ESP_LOGD(TAG, "received can message (#%d) extended can_id=0x%x size=%d", message_counter, can_message.can_id,
+      ESP_LOGD(TAG, "received can message extended can_id=0x%x size=%d", can_message.can_id,
                can_message.can_data_length_code);
     } else {
-      ESP_LOGD(TAG, "received can message (#%d) std can_id=0x%x size=%d", message_counter, can_message.can_id,
+      ESP_LOGD(TAG, "received can message std can_id=0x%x size=%d", can_message.can_id,
                can_message.can_data_length_code);
     }
 
@@ -80,11 +76,8 @@ void Canbus::loop() {
 
     // fire all triggers
     for (auto *trigger : this->triggers_) {
-      if ((trigger->can_id_ == (can_message.can_id & trigger->can_id_mask_)) &&
-          (trigger->use_extended_id_ == can_message.use_extended_id) &&
-          (!trigger->remote_transmission_request_.has_value() ||
-           trigger->remote_transmission_request_.value() == can_message.remote_transmission_request)) {
-        trigger->trigger(data, can_message.can_id, can_message.remote_transmission_request);
+      if ((trigger->can_id_ == can_message.can_id) && (trigger->use_extended_id_ == can_message.use_extended_id)) {
+        trigger->trigger(data);
       }
     }
   }

esphome/components/canbus/canbus.h

@@ -4,8 +4,6 @@
 #include "esphome/core/component.h"
 #include "esphome/core/optional.h"
 
-#include <vector>
-
 namespace esphome {
 namespace canbus {
 
@@ -64,12 +62,7 @@ class Canbus : public Component {
   float get_setup_priority() const override { return setup_priority::HARDWARE; }
   void loop() override;
 
-  void send_data(uint32_t can_id, bool use_extended_id, bool remote_transmission_request,
-                 const std::vector<uint8_t> &data);
-  void send_data(uint32_t can_id, bool use_extended_id, const std::vector<uint8_t> &data) {
-    // for backwards compatibility only
-    this->send_data(can_id, use_extended_id, false, data);
-  }
+  void send_data(uint32_t can_id, bool use_extended_id, const std::vector<uint8_t> &data);
   void set_can_id(uint32_t can_id) { this->can_id_ = can_id; }
   void set_use_extended_id(bool use_extended_id) { this->use_extended_id_ = use_extended_id; }
   void set_bitrate(CanSpeed bit_rate) { this->bit_rate_ = bit_rate; }
@@ -103,51 +96,38 @@ template<typename... Ts> class CanbusSendAction : public Action<Ts...>, public P
 
   void set_use_extended_id(bool use_extended_id) { this->use_extended_id_ = use_extended_id; }
 
-  void set_remote_transmission_request(bool remote_transmission_request) {
-    this->remote_transmission_request_ = remote_transmission_request;
-  }
-
   void play(Ts... x) override {
     auto can_id = this->can_id_.has_value() ? *this->can_id_ : this->parent_->can_id_;
     auto use_extended_id =
         this->use_extended_id_.has_value() ? *this->use_extended_id_ : this->parent_->use_extended_id_;
     if (this->static_) {
-      this->parent_->send_data(can_id, use_extended_id, this->remote_transmission_request_, this->data_static_);
+      this->parent_->send_data(can_id, use_extended_id, this->data_static_);
     } else {
       auto val = this->data_func_(x...);
-      this->parent_->send_data(can_id, use_extended_id, this->remote_transmission_request_, val);
+      this->parent_->send_data(can_id, use_extended_id, val);
     }
   }
 
  protected:
   optional<uint32_t> can_id_{};
   optional<bool> use_extended_id_{};
-  bool remote_transmission_request_{false};
   bool static_{false};
   std::function<std::vector<uint8_t>(Ts...)> data_func_{};
   std::vector<uint8_t> data_static_{};
 };
 
-class CanbusTrigger : public Trigger<std::vector<uint8_t>, uint32_t, bool>, public Component {
+class CanbusTrigger : public Trigger<std::vector<uint8_t>>, public Component {
   friend class Canbus;
 
  public:
-  explicit CanbusTrigger(Canbus *parent, const std::uint32_t can_id, const std::uint32_t can_id_mask,
-                         const bool use_extended_id)
-      : parent_(parent), can_id_(can_id), can_id_mask_(can_id_mask), use_extended_id_(use_extended_id){};
-
-  void set_remote_transmission_request(bool remote_transmission_request) {
-    this->remote_transmission_request_ = remote_transmission_request;
-  }
-
+  explicit CanbusTrigger(Canbus *parent, const std::uint32_t can_id, const bool use_extended_id)
+      : parent_(parent), can_id_(can_id), use_extended_id_(use_extended_id){};
   void setup() override { this->parent_->add_trigger(this); }
 
  protected:
   Canbus *parent_;
   uint32_t can_id_;
-  uint32_t can_id_mask_;
   bool use_extended_id_;
-  optional<bool> remote_transmission_request_{};
 };
 
 }  // namespace canbus

esphome/components/cap1188/binary_sensor.py

@@ -1,14 +1,15 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import binary_sensor
-from esphome.const import CONF_CHANNEL
+from esphome.const import CONF_CHANNEL, CONF_ID
 from . import cap1188_ns, CAP1188Component, CONF_CAP1188_ID
 
 DEPENDENCIES = ["cap1188"]
 CAP1188Channel = cap1188_ns.class_("CAP1188Channel", binary_sensor.BinarySensor)
 
-CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(CAP1188Channel).extend(
+CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
     {
+        cv.GenerateID(): cv.declare_id(CAP1188Channel),
         cv.GenerateID(CONF_CAP1188_ID): cv.use_id(CAP1188Component),
         cv.Required(CONF_CHANNEL): cv.int_range(min=0, max=7),
     }
@@ -16,7 +17,8 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(CAP1188Channel).extend(
 
 
 async def to_code(config):
-    var = await binary_sensor.new_binary_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
+    await binary_sensor.register_binary_sensor(var, config)
     hub = await cg.get_variable(config[CONF_CAP1188_ID])
     cg.add(var.set_channel(config[CONF_CHANNEL]))
 

esphome/components/cap1188/cap1188.h

@@ -6,8 +6,6 @@
 #include "esphome/components/output/binary_output.h"
 #include "esphome/components/binary_sensor/binary_sensor.h"
 
-#include <vector>
-
 namespace esphome {
 namespace cap1188 {
 

esphome/components/captive_portal/__init__.py

@@ -22,7 +22,6 @@ CONFIG_SCHEMA = cv.All(
         }
     ).extend(cv.COMPONENT_SCHEMA),
     cv.only_with_arduino,
-    cv.only_on(["esp32", "esp8266"]),
 )
 
 

esphome/components/captive_portal/captive_index.h

@@ -1,107 +0,0 @@
-#pragma once
-// Generated from https://github.com/esphome/esphome-webserver
-#include "esphome/core/hal.h"
-namespace esphome {
-
-namespace captive_portal {
-
-const uint8_t INDEX_GZ[] PROGMEM = {
-    0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0xdd, 0x58, 0x09, 0x6f, 0xdc, 0x36, 0x16, 0xfe, 0x2b,
-    0xac, 0x92, 0x74, 0x34, 0x8d, 0xc5, 0xd1, 0x31, 0x97, 0x35, 0xd2, 0x14, 0x89, 0x37, 0x45, 0x0b, 0x24, 0x69, 0x00,
-    0xbb, 0x5d, 0x14, 0x69, 0x00, 0x73, 0x24, 0x6a, 0xc4, 0x58, 0xa2, 0x54, 0x91, 0x9a, 0x23, 0x83, 0xd9, 0xdf, 0xde,
-    0x47, 0x52, 0x73, 0x38, 0x6b, 0x2f, 0x90, 0x62, 0x8b, 0xa2, 0x4d, 0x6c, 0x9a, 0xc7, 0x3b, 0x3f, 0xf2, 0xf1, 0x3d,
-    0x2a, 0xfa, 0x2a, 0xad, 0x12, 0xb9, 0xad, 0x29, 0xca, 0x65, 0x59, 0xcc, 0x23, 0xd5, 0xa2, 0x82, 0xf0, 0x65, 0x4c,
-    0x39, 0x8c, 0x28, 0x49, 0xe7, 0x51, 0x49, 0x25, 0x41, 0x49, 0x4e, 0x1a, 0x41, 0x65, 0xfc, 0xd3, 0xcd, 0x77, 0xce,
-    0x14, 0x0d, 0xe6, 0x51, 0xc1, 0xf8, 0x1d, 0x6a, 0x68, 0x11, 0xb3, 0xa4, 0xe2, 0x28, 0x6f, 0x68, 0x16, 0xa7, 0x44,
-    0x92, 0x90, 0x95, 0x64, 0x49, 0x15, 0x81, 0x66, 0xe3, 0xa4, 0xa4, 0xf1, 0x8a, 0xd1, 0x75, 0x5d, 0x35, 0x12, 0x01,
-    0xa5, 0xa4, 0x5c, 0xc6, 0xd6, 0x9a, 0xa5, 0x32, 0x8f, 0x53, 0xba, 0x62, 0x09, 0x75, 0xf4, 0xe0, 0x82, 0x71, 0x26,
-    0x19, 0x29, 0x1c, 0x91, 0x90, 0x82, 0xc6, 0xde, 0x45, 0x2b, 0x68, 0xa3, 0x07, 0x64, 0x01, 0x63, 0x5e, 0x59, 0x20,
-    0x52, 0x24, 0x0d, 0xab, 0x25, 0x52, 0xf6, 0xc6, 0x65, 0x95, 0xb6, 0x05, 0x9d, 0x67, 0x2d, 0x4f, 0x24, 0x03, 0x0b,
-    0x84, 0xcd, 0xfb, 0xbb, 0x82, 0x4a, 0x44, 0xe3, 0x37, 0x44, 0xe6, 0xb8, 0x24, 0x1b, 0xdb, 0x74, 0x18, 0xb7, 0xfd,
-    0x6f, 0x6c, 0xfe, 0xdc, 0x73, 0xdd, 0xfe, 0x85, 0x6e, 0xdc, 0xfe, 0x00, 0xfe, 0xce, 0x1a, 0x2a, 0xdb, 0x86, 0x23,
-    0x62, 0xdf, 0x46, 0x35, 0x50, 0xa2, 0x34, 0xb6, 0x4a, 0xcf, 0xc7, 0xae, 0x3b, 0x45, 0xde, 0x25, 0xf6, 0x47, 0x8e,
-    0xe7, 0xe1, 0xc0, 0xf1, 0x46, 0xc9, 0xc4, 0x19, 0x21, 0x6f, 0x08, 0x8d, 0xef, 0xe3, 0x11, 0x72, 0x3f, 0x59, 0x28,
-    0x63, 0x45, 0x11, 0x5b, 0xbc, 0xe2, 0xd4, 0x42, 0x42, 0x36, 0xd5, 0x1d, 0x8d, 0xad, 0xa4, 0x6d, 0x1a, 0xf0, 0xee,
-    0xaa, 0x2a, 0xaa, 0x06, 0xac, 0xfd, 0x95, 0xa3, 0x7b, 0xff, 0xbe, 0x58, 0x87, 0x6c, 0x08, 0x17, 0x59, 0xd5, 0x94,
-    0xb1, 0xa5, 0x41, 0xb1, 0x9f, 0xee, 0xe8, 0x1e, 0xa9, 0xa6, 0x7f, 0xb6, 0xe8, 0x54, 0x0d, 0x5b, 0x32, 0x1e, 0x5b,
-    0x9e, 0x8f, 0xbc, 0x29, 0xe8, 0xbd, 0xed, 0xef, 0x8f, 0xa0, 0x10, 0x05, 0x4a, 0xe7, 0x66, 0x65, 0xbf, 0xbf, 0x8d,
-    0xc4, 0x6a, 0x89, 0x36, 0x65, 0xc1, 0x45, 0x6c, 0xe5, 0x52, 0xd6, 0xe1, 0x60, 0xb0, 0x5e, 0xaf, 0xf1, 0x3a, 0xc0,
-    0x55, 0xb3, 0x1c, 0xf8, 0xae, 0xeb, 0x0e, 0x80, 0xc2, 0x42, 0x66, 0x7f, 0x2c, 0x7f, 0x68, 0xa1, 0x9c, 0xb2, 0x65,
-    0x2e, 0x75, 0x7f, 0xfe, 0x74, 0xc7, 0xf7, 0x91, 0xa2, 0x98, 0xdf, 0x7e, 0x38, 0xd3, 0xd2, 0x9c, 0x69, 0xe1, 0xdf,
-    0x12, 0xdb, 0x3a, 0xb8, 0xda, 0x7b, 0xa3, 0x8c, 0x9a, 0x10, 0x1f, 0xf9, 0xc8, 0xd5, 0xff, 0x7d, 0x47, 0xf5, 0xbb,
-    0x91, 0xf3, 0xd9, 0x08, 0x9d, 0x8d, 0xe0, 0xaf, 0x02, 0xd0, 0x2f, 0xc7, 0xce, 0xe5, 0x91, 0xdf, 0x53, 0xeb, 0x2b,
-    0xcf, 0x3d, 0x4d, 0x28, 0xa6, 0xef, 0xc7, 0xe7, 0x63, 0xc7, 0xff, 0x59, 0x11, 0x68, 0xf4, 0x8f, 0x5c, 0x8e, 0x9f,
-    0x7b, 0x3f, 0x8f, 0xc9, 0x08, 0x8d, 0xba, 0x99, 0x91, 0xa3, 0xfa, 0xc7, 0x91, 0xd6, 0x85, 0x46, 0x2b, 0x20, 0x2b,
-    0x9d, 0xb1, 0x33, 0x22, 0x01, 0x0a, 0x3a, 0xab, 0xa0, 0x07, 0xd3, 0x63, 0xe0, 0x3e, 0x9b, 0x73, 0x82, 0x4f, 0xbd,
-    0xc1, 0xdc, 0xea, 0x87, 0x96, 0x75, 0x82, 0xa1, 0x3a, 0x87, 0x01, 0x7f, 0xac, 0xe0, 0xdc, 0x59, 0x56, 0x7f, 0x6f,
-    0x7d, 0x2b, 0xc8, 0x8a, 0x5a, 0x71, 0x1c, 0x43, 0xa8, 0xb5, 0x25, 0x9c, 0x10, 0x5c, 0x54, 0x09, 0x51, 0x2c, 0x58,
-    0x50, 0xd2, 0x24, 0xf9, 0xd7, 0x5f, 0xdb, 0xc7, 0xa5, 0x25, 0x95, 0xaf, 0x0a, 0xaa, 0xba, 0xe2, 0xe5, 0xf6, 0x86,
-    0x2c, 0xdf, 0x42, 0x00, 0xd9, 0x16, 0x11, 0x2c, 0xa5, 0x56, 0xff, 0xbd, 0xfb, 0x01, 0x0b, 0xb9, 0x2d, 0x28, 0x4e,
-    0x99, 0xa8, 0x0b, 0xb2, 0x8d, 0xad, 0x05, 0xc8, 0xba, 0xb3, 0xfa, 0x17, 0x19, 0x95, 0x49, 0x6e, 0x5b, 0x03, 0x08,
-    0xb1, 0x8c, 0x2d, 0xf1, 0x47, 0x51, 0x71, 0xab, 0x8f, 0x65, 0x4e, 0xb9, 0x6d, 0x1f, 0x2c, 0x54, 0xf6, 0x71, 0xbd,
-    0x64, 0x3f, 0xb4, 0x74, 0xb4, 0x41, 0x32, 0xa9, 0x42, 0x0e, 0xab, 0xe0, 0xbd, 0x38, 0xce, 0x2e, 0xaa, 0x74, 0xfb,
-    0x88, 0x79, 0xb9, 0x67, 0x6c, 0x63, 0x9c, 0xd3, 0xe6, 0x86, 0x6e, 0xe0, 0xb8, 0xfc, 0x9b, 0x7d, 0xc7, 0xd0, 0x5b,
-    0x2a, 0xd7, 0x55, 0x73, 0x27, 0x42, 0x64, 0x3d, 0x37, 0xe2, 0x66, 0x26, 0x42, 0x39, 0x26, 0xb5, 0xc0, 0xa2, 0x80,
-    0xf0, 0xb7, 0xbd, 0x3e, 0xc4, 0x6a, 0x7d, 0xdf, 0x14, 0x83, 0xe2, 0x6d, 0x94, 0xb2, 0x15, 0x4a, 0x0a, 0x22, 0xe0,
-    0xb8, 0x72, 0x23, 0xcb, 0x42, 0x87, 0xb8, 0xaa, 0x78, 0x02, 0xfc, 0x77, 0xb1, 0xf5, 0x00, 0x76, 0x2f, 0xb7, 0x3f,
-    0xa4, 0x76, 0x4f, 0x00, 0x6a, 0xbd, 0x3e, 0x5e, 0x91, 0xa2, 0xa5, 0x28, 0x46, 0x32, 0x67, 0xe2, 0x64, 0xe2, 0xec,
-    0x51, 0xb6, 0x5a, 0xdc, 0x01, 0x57, 0x06, 0xcb, 0xc2, 0xee, 0x5b, 0xc7, 0x38, 0x8e, 0x88, 0xb9, 0xe5, 0xac, 0x27,
-    0xd6, 0x67, 0x36, 0x39, 0x05, 0xcd, 0xa4, 0x75, 0x16, 0xf0, 0x4f, 0x77, 0x70, 0x1b, 0xe1, 0x06, 0xf4, 0xf7, 0xf7,
-    0xa7, 0xd9, 0x48, 0xd4, 0x84, 0x7f, 0xce, 0xaa, 0x6c, 0xd4, 0x81, 0x85, 0x55, 0x4f, 0x45, 0x17, 0x10, 0x9d, 0x74,
-    0x0e, 0xc8, 0xb1, 0xff, 0x74, 0x07, 0x71, 0xa6, 0x8e, 0xce, 0xdd, 0x49, 0x68, 0x34, 0x00, 0x84, 0xe6, 0xb7, 0xfb,
-    0x7e, 0xff, 0xe4, 0xce, 0x6f, 0x2d, 0x6d, 0xb6, 0xd7, 0xb4, 0xa0, 0x89, 0xac, 0x1a, 0xdb, 0x7a, 0x02, 0x9a, 0xe0,
-    0x24, 0x68, 0xbf, 0xbf, 0xbf, 0x79, 0xf3, 0x3a, 0xae, 0x6c, 0xda, 0xbf, 0x78, 0x8c, 0x5a, 0xdd, 0xea, 0xef, 0xe1,
-    0x56, 0xff, 0x4f, 0xdc, 0x53, 0xf7, 0x7a, 0xef, 0x03, 0xb0, 0x1a, 0xaf, 0x4f, 0x97, 0xbb, 0xba, 0x00, 0x9e, 0xc3,
-    0x25, 0x72, 0x61, 0x3d, 0x17, 0xb6, 0x33, 0x1e, 0xf5, 0x41, 0x3d, 0xfc, 0x80, 0xe9, 0xfa, 0x7a, 0x86, 0x6b, 0x5a,
-    0x1d, 0xd1, 0xf9, 0x37, 0xbb, 0x45, 0xb5, 0x71, 0x04, 0xfb, 0xc4, 0xf8, 0x32, 0x64, 0x3c, 0xa7, 0x0d, 0x93, 0x7b,
-    0x30, 0x17, 0x6e, 0xfa, 0xba, 0x95, 0xbb, 0x9a, 0xa4, 0xa9, 0x5a, 0x19, 0xd5, 0x9b, 0x59, 0x06, 0x79, 0x41, 0x51,
-    0xd2, 0xd0, 0xa3, 0xe5, 0xde, 0xac, 0xeb, 0x2b, 0x28, 0xbc, 0x1c, 0x3d, 0xdb, 0xab, 0x83, 0xb7, 0x93, 0xb0, 0x65,
-    0x0e, 0x29, 0xd8, 0x92, 0x87, 0x09, 0xd8, 0x4d, 0x1b, 0xc3, 0x94, 0x91, 0x92, 0x15, 0xdb, 0x50, 0xc0, 0x65, 0xe8,
-    0x40, 0xc2, 0x60, 0xd9, 0x7e, 0xd1, 0x4a, 0x59, 0x71, 0xd0, 0xdd, 0xa4, 0xb4, 0x09, 0xdd, 0x99, 0xe9, 0x38, 0x0d,
-    0x49, 0x59, 0x2b, 0x42, 0x1c, 0x34, 0xb4, 0x9c, 0x2d, 0x48, 0x72, 0xb7, 0x6c, 0xaa, 0x96, 0xa7, 0x4e, 0xa2, 0x6e,
-    0xeb, 0xf0, 0x89, 0x97, 0x91, 0x80, 0x26, 0xb3, 0x6e, 0x94, 0x65, 0xd9, 0x0c, 0x90, 0xa0, 0x8e, 0xb9, 0xfc, 0x42,
-    0x1f, 0x0f, 0x15, 0xdb, 0x99, 0x99, 0xd8, 0x57, 0x13, 0xc6, 0x46, 0x48, 0x25, 0xcf, 0x66, 0x07, 0x77, 0xdc, 0x19,
-    0xa4, 0x01, 0x01, 0x42, 0x6a, 0x88, 0x7f, 0x30, 0x73, 0x5f, 0x12, 0xc6, 0xcf, 0xad, 0x57, 0x67, 0x65, 0xd6, 0x85,
-    0x2f, 0xc0, 0xa2, 0xd5, 0xe8, 0x20, 0x9e, 0x41, 0xa2, 0x32, 0xb9, 0x30, 0xf4, 0xc7, 0x6e, 0xbd, 0xd9, 0xe3, 0xee,
-    0x8c, 0xec, 0x0e, 0xd4, 0x59, 0x41, 0x37, 0xb3, 0x8f, 0xad, 0x90, 0x2c, 0xdb, 0x3a, 0x5d, 0x2e, 0x0d, 0xe1, 0xbc,
-    0x40, 0x0e, 0x5d, 0x00, 0x29, 0xa5, 0x7c, 0xa6, 0x75, 0x38, 0x4c, 0xd2, 0x52, 0x74, 0x38, 0x1d, 0xc5, 0xe8, 0x53,
-    0x7a, 0x5f, 0xd6, 0xff, 0xa2, 0x56, 0xc7, 0x71, 0x57, 0x92, 0x06, 0x72, 0x8b, 0xb3, 0xa8, 0x00, 0xd3, 0x32, 0x74,
-    0x26, 0xb0, 0x57, 0xdd, 0x94, 0x12, 0x06, 0x9e, 0x83, 0x99, 0xfa, 0x6e, 0x3a, 0xe0, 0xed, 0xd5, 0x1b, 0x24, 0xaa,
-    0x82, 0xa5, 0x1d, 0x9d, 0x26, 0x41, 0xee, 0x11, 0x1e, 0x0f, 0xb6, 0x1b, 0xa9, 0xb9, 0x03, 0xd4, 0xc3, 0x6c, 0x4a,
-    0x3c, 0xf7, 0x81, 0x1d, 0x49, 0xb3, 0xcc, 0x5f, 0x64, 0x47, 0xa4, 0x54, 0xaa, 0xdd, 0xb3, 0xee, 0x54, 0xf8, 0x43,
-    0x10, 0x70, 0xd8, 0x1b, 0xe8, 0xef, 0x99, 0x8e, 0x8b, 0xdd, 0x99, 0x14, 0x7d, 0x52, 0xc3, 0xb6, 0x29, 0xec, 0x87,
-    0x4e, 0xee, 0xb3, 0xe0, 0xea, 0x94, 0x09, 0x7b, 0x8f, 0x67, 0xc2, 0x1e, 0x52, 0xb5, 0xcb, 0xcb, 0x6a, 0x13, 0xf7,
-    0x74, 0x4e, 0x1a, 0xc2, 0x4f, 0xef, 0x59, 0xf0, 0x0a, 0xf8, 0xff, 0x2f, 0x29, 0xee, 0x0f, 0xa7, 0xb7, 0x2f, 0x48,
-    0x6d, 0x5f, 0x98, 0xd5, 0x8c, 0x77, 0xca, 0x79, 0xe8, 0x41, 0xfa, 0x62, 0x58, 0xb0, 0xa5, 0xf7, 0x67, 0x40, 0xfb,
-    0xdf, 0x38, 0x06, 0x2f, 0xbc, 0x29, 0xbe, 0x44, 0xba, 0x31, 0x10, 0xe1, 0x60, 0x8a, 0x26, 0x57, 0x43, 0x3c, 0xf4,
-    0x90, 0xaa, 0x9a, 0xc6, 0x68, 0x82, 0xa7, 0x40, 0x30, 0xc6, 0xc1, 0x04, 0x26, 0x90, 0xef, 0xe1, 0xd1, 0x6b, 0x3f,
-    0xc0, 0xe3, 0x11, 0x50, 0xf9, 0x2e, 0x0e, 0x7c, 0x64, 0x68, 0xc7, 0xd8, 0x07, 0x71, 0x8a, 0x24, 0x28, 0x01, 0xe8,
-    0x24, 0xc0, 0xee, 0x04, 0xc4, 0x8d, 0xb1, 0x7b, 0x89, 0xa7, 0x63, 0x34, 0xc5, 0x13, 0x80, 0x0e, 0x0f, 0x47, 0x85,
-    0x33, 0xc2, 0x1e, 0x4c, 0x07, 0x63, 0x32, 0xc5, 0xc3, 0x00, 0xe9, 0xc6, 0xc0, 0x31, 0x01, 0x11, 0x0e, 0x76, 0xbd,
-    0xd7, 0x01, 0xf6, 0x27, 0xa0, 0x77, 0x38, 0x7c, 0x01, 0x62, 0x2f, 0x87, 0xc8, 0xb4, 0x06, 0x5e, 0x50, 0x30, 0x7a,
-    0x0c, 0x34, 0xff, 0x9f, 0x0b, 0x1a, 0x40, 0xe2, 0xa1, 0x00, 0x5f, 0x42, 0xec, 0x7a, 0x8a, 0xdf, 0xb4, 0x06, 0x37,
-    0xcf, 0x43, 0xee, 0x1f, 0xc6, 0x2c, 0xf8, 0xe7, 0x62, 0xe6, 0x29, 0x04, 0xa0, 0x0b, 0xba, 0x41, 0x0e, 0xd2, 0x8d,
-    0xd1, 0x0d, 0xcc, 0xd3, 0xab, 0x4b, 0x34, 0x05, 0xae, 0xf1, 0x14, 0x5d, 0xa2, 0x91, 0x42, 0x17, 0xd8, 0x87, 0x86,
-    0xc9, 0x01, 0xa6, 0x2f, 0x84, 0x71, 0xf8, 0x37, 0x86, 0xf1, 0x31, 0x9f, 0xfe, 0xc6, 0x2e, 0xfd, 0x15, 0x57, 0x10,
-    0x94, 0x63, 0xba, 0x0c, 0x8b, 0x06, 0xe6, 0x15, 0xaf, 0xaa, 0x28, 0x78, 0x94, 0x43, 0x35, 0x02, 0xef, 0x7a, 0x0f,
-    0xb1, 0x34, 0xce, 0xbd, 0xf9, 0xbd, 0x2a, 0x1d, 0x28, 0xbd, 0x79, 0xa4, 0xd3, 0xf9, 0xfc, 0x26, 0xa7, 0xe8, 0xd5,
-    0xf5, 0x3b, 0x78, 0x08, 0x16, 0x05, 0xe2, 0xd5, 0x1a, 0xde, 0x9b, 0x5b, 0x24, 0x2b, 0xf5, 0x82, 0xe7, 0x50, 0x2a,
-    0xaa, 0x2e, 0x3c, 0x20, 0x50, 0x57, 0x2c, 0x60, 0x8c, 0xa3, 0x45, 0x33, 0x7f, 0x57, 0x50, 0x22, 0x28, 0x5a, 0xb2,
-    0x15, 0x45, 0x4c, 0x42, 0x1d, 0x50, 0x52, 0x24, 0x99, 0x6a, 0x8e, 0x8c, 0x9a, 0xee, 0x6d, 0x25, 0x69, 0x88, 0xae,
-    0xaa, 0x7a, 0xab, 0x85, 0x24, 0x39, 0xe1, 0x4b, 0x9a, 0x1e, 0x84, 0x29, 0xea, 0x6d, 0xd5, 0x36, 0xe8, 0x97, 0x17,
-    0x6f, 0x5e, 0xab, 0x87, 0x36, 0x45, 0x4e, 0xa7, 0x6c, 0x23, 0xd1, 0x8f, 0x37, 0x2f, 0x50, 0x5b, 0xc3, 0xa6, 0x53,
-    0x63, 0x5b, 0xb5, 0xa2, 0xcd, 0x1a, 0x2a, 0x4b, 0xaa, 0x48, 0x40, 0xb9, 0xa0, 0x52, 0x42, 0xa1, 0x21, 0x30, 0x94,
-    0xce, 0xda, 0x13, 0x53, 0x75, 0x83, 0xbb, 0x20, 0x7e, 0xde, 0x95, 0xd7, 0x51, 0x1e, 0x18, 0xd7, 0xaf, 0x3b, 0x6a,
-    0x70, 0x3d, 0x98, 0x47, 0xea, 0x39, 0x8d, 0x88, 0x7e, 0x84, 0xc4, 0x83, 0x35, 0xcb, 0x98, 0x7a, 0xb8, 0xcd, 0x23,
-    0x5d, 0x8f, 0x2a, 0x09, 0xaa, 0x24, 0x32, 0x5f, 0x34, 0x74, 0xaf, 0xa0, 0x7c, 0x09, 0xaf, 0x64, 0xd8, 0x70, 0xa8,
-    0x50, 0x12, 0x9a, 0x57, 0x05, 0x54, 0x40, 0xf1, 0xf5, 0xf5, 0x0f, 0xff, 0x52, 0x9f, 0x3f, 0xc0, 0xcf, 0x13, 0x27,
-    0x3c, 0x29, 0x0c, 0xa3, 0xea, 0x74, 0x7c, 0xe3, 0xa1, 0xf9, 0x90, 0x51, 0xc3, 0x7b, 0x00, 0xfc, 0x4e, 0xef, 0x49,
-    0x79, 0x77, 0x98, 0xec, 0x24, 0xe9, 0x5f, 0x5d, 0xd9, 0x1a, 0x26, 0xd1, 0x2e, 0x4a, 0x26, 0xe7, 0xd7, 0x60, 0x60,
-    0x34, 0x30, 0x0b, 0xe0, 0x9c, 0x72, 0xc0, 0xd0, 0xe6, 0x1d, 0x0f, 0xec, 0xa8, 0x42, 0xec, 0x27, 0x8d, 0x98, 0xd9,
-    0x60, 0xed, 0x65, 0x49, 0x65, 0x5e, 0xa5, 0xf1, 0xbb, 0x1f, 0xaf, 0x6f, 0x8e, 0x1e, 0x77, 0xb0, 0x52, 0x9e, 0x98,
-    0x0f, 0x2c, 0x6d, 0x21, 0x59, 0x4d, 0x1a, 0xa9, 0xc5, 0x3a, 0x2a, 0xce, 0x0e, 0x1e, 0xe9, 0x75, 0xbd, 0x33, 0xda,
-    0xa9, 0x8e, 0x71, 0x30, 0x47, 0x0f, 0xd9, 0x78, 0xd0, 0xfd, 0x99, 0x95, 0x03, 0x73, 0x14, 0x07, 0xe6, 0x5c, 0x0e,
-    0xf4, 0xe7, 0xa7, 0xdf, 0x01, 0xf1, 0x69, 0xfc, 0xac, 0x8e, 0x12, 0x00, 0x00};
-
-}  // namespace captive_portal
-}  // namespace esphome

esphome/components/captive_portal/captive_portal.cpp

@@ -4,27 +4,60 @@
 #include "esphome/core/log.h"
 #include "esphome/core/application.h"
 #include "esphome/components/wifi/wifi_component.h"
-#include "captive_index.h"
 
 namespace esphome {
 namespace captive_portal {
 
 static const char *const TAG = "captive_portal";
 
-void CaptivePortal::handle_config(AsyncWebServerRequest *request) {
-  AsyncResponseStream *stream = request->beginResponseStream("application/json");
-  stream->addHeader("cache-control", "public, max-age=0, must-revalidate");
-  stream->printf(R"({"name":"%s","aps":[{})", App.get_name().c_str());
+void CaptivePortal::handle_index(AsyncWebServerRequest *request) {
+  AsyncResponseStream *stream = request->beginResponseStream("text/html");
+  stream->print(F("<!DOCTYPE html><html lang=\"en\"><head><meta charset=\"UTF-8\"><meta name=\"viewport\" "
+                  "content=\"width=device-width,initial-scale=1,user-scalable=no\"/><title>"));
+  stream->print(App.get_name().c_str());
+  stream->print(F("</title><link rel=\"stylesheet\" href=\"/stylesheet.css\">"));
+  stream->print(F("<script>function c(l){document.getElementById('ssid').value=l.innerText||l.textContent; "
+                  "document.getElementById('psk').focus();}</script>"));
+  stream->print(F("</head>"));
+  stream->print(F("<body><div class=\"main\"><h1>WiFi Networks</h1>"));
+
+  if (request->hasArg("save")) {
+    stream->print(F("<div class=\"info\">The ESP will now try to connect to the network...<br/>Please give it some "
+                    "time to connect.<br/>Note: Copy the changed network to your YAML file - the next OTA update will "
+                    "overwrite these settings.</div>"));
+  }
 
   for (auto &scan : wifi::global_wifi_component->get_scan_result()) {
     if (scan.get_is_hidden())
       continue;
 
-    // Assumes no " in ssid, possible unicode isses?
-    stream->printf(R"(,{"ssid":"%s","rssi":%d,"lock":%d})", scan.get_ssid().c_str(), scan.get_rssi(),
-                   scan.get_with_auth());
+    stream->print(F("<div class=\"network\" onclick=\"c(this)\"><a href=\"#\" class=\"network-left\">"));
+
+    if (scan.get_rssi() >= -50) {
+      stream->print(F("<img src=\"/wifi-strength-4.svg\">"));
+    } else if (scan.get_rssi() >= -65) {
+      stream->print(F("<img src=\"/wifi-strength-3.svg\">"));
+    } else if (scan.get_rssi() >= -85) {
+      stream->print(F("<img src=\"/wifi-strength-2.svg\">"));
+    } else {
+      stream->print(F("<img src=\"/wifi-strength-1.svg\">"));
+    }
+
+    stream->print(F("<span class=\"network-ssid\">"));
+    stream->print(scan.get_ssid().c_str());
+    stream->print(F("</span></a>"));
+    if (scan.get_with_auth()) {
+      stream->print(F("<img src=\"/lock.svg\">"));
+    }
+    stream->print(F("</div>"));
   }
-  stream->print(F("]}"));
+
+  stream->print(F("<h3>WiFi Settings</h3><form method=\"GET\" action=\"/wifisave\"><input id=\"ssid\" name=\"ssid\" "
+                  "length=32 placeholder=\"SSID\"><br/><input id=\"psk\" name=\"psk\" length=64 type=\"password\" "
+                  "placeholder=\"Password\"><br/><br/><button type=\"submit\">Save</button></form><br><hr><br>"));
+  stream->print(F("<h1>OTA Update</h1><form method=\"POST\" action=\"/update\" enctype=\"multipart/form-data\"><input "
+                  "type=\"file\" name=\"update\"><button type=\"submit\">Update</button></form>"));
+  stream->print(F("</div></body></html>"));
   request->send(stream);
 }
 void CaptivePortal::handle_wifisave(AsyncWebServerRequest *request) {
@@ -35,7 +68,7 @@ void CaptivePortal::handle_wifisave(AsyncWebServerRequest *request) {
   ESP_LOGI(TAG, "  Password=" LOG_SECRET("'%s'"), psk.c_str());
   wifi::global_wifi_component->save_wifi_sta(ssid, psk);
   wifi::global_wifi_component->start_scanning();
-  request->redirect("/?save");
+  request->redirect("/?save=true");
 }
 
 void CaptivePortal::setup() {}
@@ -65,21 +98,44 @@ void CaptivePortal::start() {
   this->active_ = true;
 }
 
+const char STYLESHEET_CSS[] PROGMEM =
+    R"(*{box-sizing:inherit}div,input{padding:5px;font-size:1em}input{width:95%}body{text-align:center;font-family:sans-serif}button{border:0;border-radius:.3rem;background-color:#1fa3ec;color:#fff;line-height:2.4rem;font-size:1.2rem;width:100%;padding:0}.main{text-align:left;display:inline-block;min-width:260px}.network{display:flex;justify-content:space-between;align-items:center}.network-left{display:flex;align-items:center}.network-ssid{margin-bottom:-7px;margin-left:10px}.info{border:1px solid;margin:10px 0;padding:15px 10px;color:#4f8a10;background-color:#dff2bf})";
+const char LOCK_SVG[] PROGMEM =
+    R"(<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24"><path d="M12 17a2 2 0 0 0 2-2 2 2 0 0 0-2-2 2 2 0 0 0-2 2 2 2 0 0 0 2 2m6-9a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V10a2 2 0 0 1 2-2h1V6a5 5 0 0 1 5-5 5 5 0 0 1 5 5v2h1m-6-5a3 3 0 0 0-3 3v2h6V6a3 3 0 0 0-3-3z"/></svg>)";
+
 void CaptivePortal::handleRequest(AsyncWebServerRequest *req) {
   if (req->url() == "/") {
-    AsyncWebServerResponse *response = req->beginResponse_P(200, "text/html", INDEX_GZ, sizeof(INDEX_GZ));
-    response->addHeader("Content-Encoding", "gzip");
-    req->send(response);
-    return;
-  } else if (req->url() == "/config.json") {
-    this->handle_config(req);
+    this->handle_index(req);
     return;
   } else if (req->url() == "/wifisave") {
     this->handle_wifisave(req);
     return;
+  } else if (req->url() == "/stylesheet.css") {
+    req->send_P(200, "text/css", STYLESHEET_CSS);
+    return;
+  } else if (req->url() == "/lock.svg") {
+    req->send_P(200, "image/svg+xml", LOCK_SVG);
+    return;
   }
-}
 
+  AsyncResponseStream *stream = req->beginResponseStream("image/svg+xml");
+  stream->print(F("<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"24\" height=\"24\"><path d=\"M12 3A18.9 18.9 0 0 "
+                  "0 .38 7C4.41 12.06 7.89 16.37 12 21.5L23.65 7C20.32 4.41 16.22 3 12 "));
+  if (req->url() == "/wifi-strength-4.svg") {
+    stream->print(F("3z"));
+  } else {
+    if (req->url() == "/wifi-strength-1.svg") {
+      stream->print(F("3m0 2c3.07 0 6.09.86 8.71 2.45l-5.1 6.36a8.43 8.43 0 0 0-7.22-.01L3.27 7.4"));
+    } else if (req->url() == "/wifi-strength-2.svg") {
+      stream->print(F("3m0 2c3.07 0 6.09.86 8.71 2.45l-3.21 3.98a11.32 11.32 0 0 0-11 0L3.27 7.4"));
+    } else if (req->url() == "/wifi-strength-3.svg") {
+      stream->print(F("3m0 2c3.07 0 6.09.86 8.71 2.45l-1.94 2.43A13.6 13.6 0 0 0 12 8C9 8 6.68 9 5.21 9.84l-1.94-2."));
+    }
+    stream->print(F("4A16.94 16.94 0 0 1 12 5z"));
+  }
+  stream->print(F("\"/></svg>"));
+  req->send(stream);
+}
 CaptivePortal::CaptivePortal(web_server_base::WebServerBase *base) : base_(base) { global_captive_portal = this; }
 float CaptivePortal::get_setup_priority() const {
   // Before WiFi

esphome/components/captive_portal/captive_portal.h

@@ -39,7 +39,17 @@ class CaptivePortal : public AsyncWebHandler, public Component {
     if (request->method() == HTTP_GET) {
       if (request->url() == "/")
         return true;
-      if (request->url() == "/config.json")
+      if (request->url() == "/stylesheet.css")
+        return true;
+      if (request->url() == "/wifi-strength-1.svg")
+        return true;
+      if (request->url() == "/wifi-strength-2.svg")
+        return true;
+      if (request->url() == "/wifi-strength-3.svg")
+        return true;
+      if (request->url() == "/wifi-strength-4.svg")
+        return true;
+      if (request->url() == "/lock.svg")
         return true;
       if (request->url() == "/wifisave")
         return true;
@@ -48,7 +58,7 @@ class CaptivePortal : public AsyncWebHandler, public Component {
     return false;
   }
 
-  void handle_config(AsyncWebServerRequest *request);
+  void handle_index(AsyncWebServerRequest *request);
 
   void handle_wifisave(AsyncWebServerRequest *request);
 

esphome/components/captive_portal/index.html

@@ -0,0 +1,55 @@
+<!-- HTTP_HEAD -->
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/>
+    <title>{{ App.get_name() }}</title>
+    <link rel="stylesheet" href="./stylesheet.css">
+    <script>
+        function c(l) {
+            document.getElementById('ssid').value = l.innerText || l.textContent;
+            document.getElementById('psk').focus();
+        }
+    </script>
+</head>
+<body>
+<div class="main">
+    <h1>WiFi Networks</h1>
+    <div class="info">
+        The ESP will now try to connect to the network...<br/>
+        Please give it some time to connect.<br/>
+        Note: Copy the changed network to your YAML file - the next OTA update will overwrite these settings.
+    </div>
+    <div class="network" onclick="c(this)">
+        <a href="#" class="network-left">
+            <img src="./wifi-strength-4.svg">
+            <span class="network-ssid">AP1</span>
+        </a>
+        <img src="./lock.svg">
+    </div>
+    <div class="network" onclick="c(this)">
+        <a href="#" class="network-left">
+            <img src="./wifi-strength-2.svg">
+            <span class="network-ssid">AP2</span>
+        </a>
+    </div>
+
+    <h3>WiFi Settings</h3>
+    <form method="GET" action="/wifisave">
+        <input id="ssid" name="ssid" length=32 placeholder="SSID"><br/>
+        <input id="psk" name="psk" length=64 type="password" placeholder="Password"><br/>
+        <br/>
+        <button type="submit">Save</button>
+    </form>
+    <br><hr>
+    <br>
+
+    <h1>OTA Update</h1>
+    <form method="POST" action="/update" enctype="multipart/form-data">
+        <input type="file" name="update">
+        <button type="submit">Update</button>
+    </form>
+</div>
+</body>
+</html>

esphome/components/captive_portal/lock.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24"><path d="M12 17a2 2 0 0 0 2-2 2 2 0 0 0-2-2 2 2 0 0 0-2 2 2 2 0 0 0 2 2m6-9a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V10a2 2 0 0 1 2-2h1V6a5 5 0 0 1 5-5 5 5 0 0 1 5 5v2h1m-6-5a3 3 0 0 0-3 3v2h6V6a3 3 0 0 0-3-3z"/></svg>

esphome/components/captive_portal/stylesheet.css

@@ -0,0 +1,58 @@
+* {
+    box-sizing: inherit;
+}
+
+div, input {
+    padding: 5px;
+    font-size: 1em;
+}
+
+input {
+    width: 95%;
+}
+
+body {
+    text-align: center;
+    font-family: sans-serif;
+}
+
+button {
+    border: 0;
+    border-radius: 0.3rem;
+    background-color: #1fa3ec;
+    color: #fff;
+    line-height: 2.4rem;
+    font-size: 1.2rem;
+    width: 100%;
+    padding: 0;
+}
+
+.main {
+    text-align: left;
+    display: inline-block;
+    min-width: 260px;
+}
+
+.network {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.network-left {
+    display: flex;
+    align-items: center;
+}
+
+.network-ssid {
+    margin-bottom: -7px;
+    margin-left: 10px;
+}
+
+.info {
+    border: 1px solid;
+    margin: 10px 0px;
+    padding: 15px 10px;
+    color: #4f8a10;
+    background-color: #dff2bf;
+}

esphome/components/captive_portal/wifi-strength-1.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M12 3A18.9 18.9 0 0 0 .38 7C4.41 12.06 7.89 16.37 12 21.5L23.65 7C20.32 4.41 16.22 3 12 3m0 2c3.07 0 6.09.86 8.71 2.45l-5.1 6.36a8.43 8.43 0 0 0-7.22-.01L3.27 7.44A16.94 16.94 0 0 1 12 5z"/></svg>

esphome/components/captive_portal/wifi-strength-2.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M12 3A18.9 18.9 0 0 0 .38 7C4.41 12.06 7.89 16.37 12 21.5L23.65 7C20.32 4.41 16.22 3 12 3m0 2c3.07 0 6.09.86 8.71 2.45l-3.21 3.98a11.32 11.32 0 0 0-11 0L3.27 7.44A16.94 16.94 0 0 1 12 5z"/></svg>

esphome/components/captive_portal/wifi-strength-3.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M12 3A18.9 18.9 0 0 0 .38 7C4.41 12.06 7.89 16.37 12 21.5L23.65 7C20.32 4.41 16.22 3 12 3m0 2c3.07 0 6.09.86 8.71 2.45l-1.94 2.43A13.6 13.6 0 0 0 12 8C9 8 6.68 9 5.21 9.84l-1.94-2.4A16.94 16.94 0 0 1 12 5z"/></svg>

esphome/components/captive_portal/wifi-strength-4.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M12 3A18.9 18.9 0 0 0 .38 7C4.41 12.06 7.89 16.37 12 21.5L23.65 7C20.32 4.41 16.22 3 12 3z"/></svg>

esphome/components/ccs811/sensor.py

@@ -2,6 +2,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import i2c, sensor, text_sensor
 from esphome.const import (
+    CONF_ICON,
     CONF_ID,
     ICON_RADIATOR,
     ICON_RESTART,
@@ -46,8 +47,11 @@ CONFIG_SCHEMA = (
                 device_class=DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS,
                 state_class=STATE_CLASS_MEASUREMENT,
             ),
-            cv.Optional(CONF_VERSION): text_sensor.text_sensor_schema(
-                icon=ICON_RESTART
+            cv.Optional(CONF_VERSION): text_sensor.TEXT_SENSOR_SCHEMA.extend(
+                {
+                    cv.GenerateID(): cv.declare_id(text_sensor.TextSensor),
+                    cv.Optional(CONF_ICON, default=ICON_RESTART): cv.icon,
+                }
             ),
             cv.Optional(CONF_BASELINE): cv.hex_uint16_t,
             cv.Optional(CONF_TEMPERATURE): cv.use_id(sensor.Sensor),
@@ -70,7 +74,8 @@ async def to_code(config):
     cg.add(var.set_tvoc(sens))
 
     if CONF_VERSION in config:
-        sens = await text_sensor.new_text_sensor(config[CONF_VERSION])
+        sens = cg.new_Pvariable(config[CONF_VERSION][CONF_ID])
+        await text_sensor.register_text_sensor(sens, config[CONF_VERSION])
         cg.add(var.set_version(sens))
 
     if CONF_BASELINE in config:

esphome/components/cd74hc4067/sensor.py

@@ -25,7 +25,6 @@ CONF_CD74HC4067_ID = "cd74hc4067_id"
 
 CONFIG_SCHEMA = (
     sensor.sensor_schema(
-        CD74HC4067Sensor,
         unit_of_measurement=UNIT_VOLT,
         accuracy_decimals=3,
         device_class=DEVICE_CLASS_VOLTAGE,
@@ -34,6 +33,7 @@ CONFIG_SCHEMA = (
     )
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(CD74HC4067Sensor),
             cv.GenerateID(CONF_CD74HC4067_ID): cv.use_id(CD74HC4067Component),
             cv.Required(CONF_NUMBER): cv.int_range(0, 15),
             cv.Required(CONF_SENSOR): cv.use_id(voltage_sampler.VoltageSampler),
@@ -47,8 +47,8 @@ async def to_code(config):
     parent = await cg.get_variable(config[CONF_CD74HC4067_ID])
 
     var = cg.new_Pvariable(config[CONF_ID], parent)
-    await sensor.register_sensor(var, config)
     await cg.register_component(var, config)
+    await sensor.register_sensor(var, config)
     cg.add(var.set_pin(config[CONF_NUMBER]))
 
     sens = await cg.get_variable(config[CONF_SENSOR])

esphome/components/climate/__init__.py

@@ -113,9 +113,7 @@ CLIMATE_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).
             {
                 cv.Optional(CONF_MIN_TEMPERATURE): cv.temperature,
                 cv.Optional(CONF_MAX_TEMPERATURE): cv.temperature,
-                cv.Optional(CONF_TEMPERATURE_STEP): cv.float_with_unit(
-                    "visual_temperature", "(°C|° C|°|C|° K|° K|K|°F|° F|F)?"
-                ),
+                cv.Optional(CONF_TEMPERATURE_STEP): cv.temperature,
             }
         ),
         cv.Optional(CONF_ACTION_STATE_TOPIC): cv.All(
@@ -289,11 +287,9 @@ CLIMATE_CONTROL_ACTION_SCHEMA = cv.Schema(
         cv.Exclusive(CONF_FAN_MODE, "fan_mode"): cv.templatable(
             validate_climate_fan_mode
         ),
-        cv.Exclusive(CONF_CUSTOM_FAN_MODE, "fan_mode"): cv.templatable(
-            cv.string_strict
-        ),
+        cv.Exclusive(CONF_CUSTOM_FAN_MODE, "fan_mode"): cv.string_strict,
         cv.Exclusive(CONF_PRESET, "preset"): cv.templatable(validate_climate_preset),
-        cv.Exclusive(CONF_CUSTOM_PRESET, "preset"): cv.templatable(cv.string_strict),
+        cv.Exclusive(CONF_CUSTOM_PRESET, "preset"): cv.string_strict,
         cv.Optional(CONF_SWING_MODE): cv.templatable(validate_climate_swing_mode),
     }
 )
@@ -328,17 +324,13 @@ async def climate_control_to_code(config, action_id, template_arg, args):
         template_ = await cg.templatable(config[CONF_FAN_MODE], args, ClimateFanMode)
         cg.add(var.set_fan_mode(template_))
     if CONF_CUSTOM_FAN_MODE in config:
-        template_ = await cg.templatable(
-            config[CONF_CUSTOM_FAN_MODE], args, cg.std_string
-        )
+        template_ = await cg.templatable(config[CONF_CUSTOM_FAN_MODE], args, str)
         cg.add(var.set_custom_fan_mode(template_))
     if CONF_PRESET in config:
         template_ = await cg.templatable(config[CONF_PRESET], args, ClimatePreset)
         cg.add(var.set_preset(template_))
     if CONF_CUSTOM_PRESET in config:
-        template_ = await cg.templatable(
-            config[CONF_CUSTOM_PRESET], args, cg.std_string
-        )
+        template_ = await cg.templatable(config[CONF_CUSTOM_PRESET], args, str)
         cg.add(var.set_custom_preset(template_))
     if CONF_SWING_MODE in config:
         template_ = await cg.templatable(

esphome/components/climate/climate.cpp

@@ -1,5 +1,4 @@
 #include "climate.h"
-#include "esphome/core/macros.h"
 
 namespace esphome {
 namespace climate {
@@ -327,17 +326,14 @@ optional<ClimateDeviceRestoreState> Climate::restore_state_() {
   return recovered;
 }
 void Climate::save_state_() {
-#if (defined(USE_ESP_IDF) || (defined(USE_ESP8266) && USE_ARDUINO_VERSION_CODE >= VERSION_CODE(3, 0, 0))) && \
-    !defined(CLANG_TIDY)
+#if defined(USE_ESP_IDF) && !defined(CLANG_TIDY)
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
-#define TEMP_IGNORE_MEMACCESS
 #endif
   ClimateDeviceRestoreState state{};
   // initialize as zero to prevent random data on stack triggering erase
   memset(&state, 0, sizeof(ClimateDeviceRestoreState));
-#ifdef TEMP_IGNORE_MEMACCESS
+#if USE_ESP_IDF && !defined(CLANG_TIDY)
 #pragma GCC diagnostic pop
-#undef TEMP_IGNORE_MEMACCESS
 #endif
 
   state.mode = this->mode;
@@ -419,6 +415,7 @@ void Climate::publish_state() {
   // Save state
   this->save_state_();
 }
+uint32_t Climate::hash_base() { return 3104134496UL; }
 
 ClimateTraits Climate::get_traits() {
   auto traits = this->traits();
@@ -540,15 +537,12 @@ void Climate::dump_traits_(const char *tag) {
   ESP_LOGCONFIG(tag, "      - Min: %.1f", traits.get_visual_min_temperature());
   ESP_LOGCONFIG(tag, "      - Max: %.1f", traits.get_visual_max_temperature());
   ESP_LOGCONFIG(tag, "      - Step: %.1f", traits.get_visual_temperature_step());
-  if (traits.get_supports_current_temperature()) {
+  if (traits.get_supports_current_temperature())
     ESP_LOGCONFIG(tag, "  [x] Supports current temperature");
-  }
-  if (traits.get_supports_two_point_target_temperature()) {
+  if (traits.get_supports_two_point_target_temperature())
     ESP_LOGCONFIG(tag, "  [x] Supports two-point target temperature");
-  }
-  if (traits.get_supports_action()) {
+  if (traits.get_supports_action())
     ESP_LOGCONFIG(tag, "  [x] Supports action");
-  }
   if (!traits.get_supported_modes().empty()) {
     ESP_LOGCONFIG(tag, "  [x] Supported modes:");
     for (ClimateMode m : traits.get_supported_modes())

esphome/components/climate/climate.h

@@ -282,6 +282,7 @@ class Climate : public EntityBase {
    */
   void save_state_();
 
+  uint32_t hash_base() override;
   void dump_traits_(const char *tag);
 
   CallbackManager<void()> state_callback_{};

esphome/components/climate/climate_mode.h

@@ -76,7 +76,7 @@ enum ClimateSwingMode : uint8_t {
   CLIMATE_SWING_HORIZONTAL = 3,
 };
 
-/// Enum for all preset modes
+/// Enum for all modes a climate swing can be in
 enum ClimatePreset : uint8_t {
   /// No preset is active
   CLIMATE_PRESET_NONE = 0,
@@ -108,7 +108,7 @@ const LogString *climate_fan_mode_to_string(ClimateFanMode mode);
 /// Convert the given ClimateSwingMode to a human-readable string.
 const LogString *climate_swing_mode_to_string(ClimateSwingMode mode);
 
-/// Convert the given PresetMode to a human-readable string.
+/// Convert the given ClimateSwingMode to a human-readable string.
 const LogString *climate_preset_to_string(ClimatePreset preset);
 
 }  // namespace climate

esphome/components/climate/climate_traits.cpp

@@ -1,10 +1,19 @@
 #include "climate_traits.h"
+#include <cstdio>
 
 namespace esphome {
 namespace climate {
 
 int8_t ClimateTraits::get_temperature_accuracy_decimals() const {
-  return step_to_accuracy_decimals(this->visual_temperature_step_);
+  // use printf %g to find number of digits based on temperature step
+  char buf[32];
+  sprintf(buf, "%.5g", this->visual_temperature_step_);
+  std::string str{buf};
+  size_t dot_pos = str.find('.');
+  if (dot_pos == std::string::npos)
+    return 0;
+
+  return str.length() - dot_pos - 1;
 }
 
 }  // namespace climate

esphome/components/climate/climate_traits.h

@@ -141,7 +141,7 @@ class ClimateTraits {
   }
   bool supports_swing_mode(ClimateSwingMode swing_mode) const { return supported_swing_modes_.count(swing_mode); }
   bool get_supports_swing_modes() const { return !supported_swing_modes_.empty(); }
-  std::set<ClimateSwingMode> get_supported_swing_modes() const { return supported_swing_modes_; }
+  std::set<ClimateSwingMode> get_supported_swing_modes() { return supported_swing_modes_; }
 
   float get_visual_min_temperature() const { return visual_min_temperature_; }
   void set_visual_min_temperature(float visual_min_temperature) { visual_min_temperature_ = visual_min_temperature; }

esphome/components/copy/__init__.py

@@ -1,5 +0,0 @@
-import esphome.codegen as cg
-
-CODEOWNERS = ["@OttoWinter"]
-
-copy_ns = cg.esphome_ns.namespace("copy")