Code tidy

The OralB toothbrushes expose some of their information in their bluetooth advertisement data.

This data lets us see the state (idle, running), brush mode (daily clean, tongue, whitening, etc.), pressure and some other bits of data.

This component lets you expose that data with config as follows:

```
esp32_ble_tracker:

sensor:
  - platform: oralb_brush
    mac_address: 00:00:00:00:00:00
    state:
      name: "Toothbrush State"
```

Checkout https://github.com/zewelor/bt-mqtt-gateway/blob/master/workers/toothbrush_homeassistant.py and https://esphome.io/components/esp32_ble_tracker.html for more information.

.clang-tidy

@@ -68,6 +68,8 @@ Checks: >-
   -modernize-use-nodiscard,
   -mpi-*,
   -objc-*,
+  -readability-braces-around-statements,
+  -readability-const-return-type,
   -readability-convert-member-functions-to-static,
   -readability-else-after-return,
   -readability-function-cognitive-complexity,
@@ -75,6 +77,10 @@ Checks: >-
   -readability-isolate-declaration,
   -readability-magic-numbers,
   -readability-make-member-function-const,
+  -readability-named-parameter,
+  -readability-qualified-auto,
+  -readability-redundant-access-specifiers,
+  -readability-redundant-member-init,
   -readability-redundant-string-init,
   -readability-uppercase-literal-suffix,
   -readability-use-anyofallof,
@@ -108,8 +114,6 @@ CheckOptions:
     value:           'make_unique'
   - key:             modernize-make-unique.MakeSmartPtrFunctionHeader
     value:           'esphome/core/helpers.h'
-  - key:             readability-braces-around-statements.ShortStatementLines
-    value:           2
   - key:             readability-identifier-naming.LocalVariableCase
     value:           'lower_case'
   - key:             readability-identifier-naming.ClassCase
@@ -156,5 +160,3 @@ CheckOptions:
     value:           'lower_case'
   - key:             readability-identifier-naming.VirtualMethodSuffix
     value:           ''
-  - key:             readability-qualified-auto.AddConstToQualified
-    value:           0

.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"
   ],
@@ -51,6 +51,6 @@
     "files.associations": {
       "**/.vscode/*.json": "jsonc"
     },
-    "C_Cpp.clang_format_path": "/usr/bin/clang-format-13",
+    "C_Cpp.clang_format_path": "/usr/bin/clang-format-11",
   }
 }

.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? 
 
-<!-- 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`:
 <!--

.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,61 +1,53 @@
----
 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
   packages: read
 
-concurrency:
-  # yamllint disable-line rule:line-length
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
   check-docker:
     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,19 +1,15 @@
----
 name: CI
 
-# yamllint disable-line rule:truthy
 on:
   push:
     branches: [dev, beta, release]
 
   pull_request:
-  merge_group:
 
 permissions:
   contents: read
 
 concurrency:
-  # yamllint disable-line rule:line-length
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
@@ -41,10 +37,6 @@ jobs:
             file: tests/test3.yaml
             name: Test tests/test3.yaml
             pio_cache_key: test3
-          - id: test
-            file: tests/test3.1.yaml
-            name: Test tests/test3.1.yaml
-            pio_cache_key: test3.1
           - id: test
             file: tests/test4.yaml
             name: Test tests/test4.yaml
@@ -53,64 +45,52 @@ jobs:
             file: tests/test5.yaml
             name: Test tests/test5.yaml
             pio_cache_key: test5
-          - id: test
-            file: tests/test6.yaml
-            name: Test tests/test6.yaml
-            pio_cache_key: test6
-          - id: test
-            file: tests/test7.yaml
-            name: Test tests/test7.yaml
-            pio_cache_key: test7
           - id: pytest
             name: Run pytest
           - id: clang-format
             name: Run script/clang-format
           - id: clang-tidy
             name: Run script/clang-tidy for ESP8266
-            options: --environment esp8266-arduino-tidy --grep USE_ESP8266
+            options: --environment esp8266-tidy --grep USE_ESP8266
             pio_cache_key: tidyesp8266
           - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 Arduino 1/4
-            options: --environment esp32-arduino-tidy --split-num 4 --split-at 1
+            name: Run script/clang-tidy for ESP32 1/4
+            options: --environment esp32-tidy --split-num 4 --split-at 1
             pio_cache_key: tidyesp32
           - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 Arduino 2/4
-            options: --environment esp32-arduino-tidy --split-num 4 --split-at 2
+            name: Run script/clang-tidy for ESP32 2/4
+            options: --environment esp32-tidy --split-num 4 --split-at 2
             pio_cache_key: tidyesp32
           - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 Arduino 3/4
-            options: --environment esp32-arduino-tidy --split-num 4 --split-at 3
+            name: Run script/clang-tidy for ESP32 3/4
+            options: --environment esp32-tidy --split-num 4 --split-at 3
             pio_cache_key: tidyesp32
           - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 Arduino 4/4
-            options: --environment esp32-arduino-tidy --split-num 4 --split-at 4
+            name: Run script/clang-tidy for ESP32 4/4
+            options: --environment esp32-tidy --split-num 4 --split-at 4
             pio_cache_key: tidyesp32
           - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 IDF
+            name: Run script/clang-tidy for ESP32 esp-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
@@ -119,21 +99,19 @@ 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'
 
       - name: Install clang tools
         run: |
           sudo apt-get install \
-              clang-format-13 \
+              clang-format-11 \
               clang-tidy-11
         if: matrix.id == 'clang-tidy' || matrix.id == 'clang-format'
 
@@ -153,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 }}
@@ -167,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
@@ -184,24 +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.4.0
-
       - name: Suggested changes
         run: script/ci-suggest-changes
-        # yamllint disable-line rule:line-length
-        if: always() && (matrix.id == 'clang-tidy' || matrix.id == 'clang-format' || matrix.id == 'lint-python')
-
-  ci-status:
-    name: CI Status
-    runs-on: ubuntu-latest
-    needs: [ci]
-    if: always()
-    steps:
-      - name: Successful deploy
-        if: ${{ !(contains(needs.*.result, 'failure')) }}
-        run: exit 0
-      - name: Failing deploy
-        if: ${{ contains(needs.*.result, 'failure') }}
-        run: exit 1
+        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/}"
@@ -30,24 +27,19 @@ jobs:
             TAG=$(cat esphome/const.py | sed -n -E "s/^__version__\s+=\s+\"(.+)\"$/\1/p")
             today="$(date --utc '+%Y%m%d')"
             TAG="${TAG}${today}"
-            BRANCH=${GITHUB_REF#refs/heads/}
-            if [[ "$BRANCH" != "dev" ]]; then
-              TAG="${TAG}-${BRANCH}"
-            fi
           fi
-          echo "tag=${TAG}" >> $GITHUB_OUTPUT
-        # 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
@@ -61,95 +53,102 @@ jobs:
         run: twine upload dist/*
 
   deploy-docker:
-    name: Build and publish ESPHome ${{ matrix.image.title}}
+    name: Build and publish docker containers
     if: github.repository == 'esphome/esphome'
     permissions:
       contents: read
       packages: write
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.image.title == 'lint' }}
     needs: [init]
     strategy:
-      fail-fast: false
       matrix:
-        image:
-          - title: "ha-addon"
-            suffix: "hassio"
-            target: "hassio"
-            baseimg: "hassio"
-          - title: "docker"
-            suffix: ""
-            target: "docker"
-            baseimg: "docker"
-          - title: "lint"
-            suffix: "lint"
-            target: "lint"
-            baseimg: "docker"
+        arch: [amd64, armv7, aarch64]
+        build_type: ["ha-addon", "docker", "lint"]
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python
-        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: Generate short tags
-        id: tags
-        run: |
-          docker/generate_tags.py \
-            --tag "${{ needs.init.outputs.tag }}" \
-            --suffix "${{ matrix.image.suffix }}"
+    - 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
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: ./docker/Dockerfile
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
-          target: ${{ matrix.image.target }}
-          push: true
-          # yamllint disable rule:line-length
-          cache-from: type=registry,ref=ghcr.io/${{ steps.tags.outputs.image }}:cache-${{ steps.tags.outputs.channel }}
-          cache-to: type=registry,ref=ghcr.io/${{ steps.tags.outputs.image }}:cache-${{ steps.tags.outputs.channel }},mode=max
-          # yamllint enable rule:line-length
-          tags: ${{ steps.tags.outputs.tags }}
-          build-args: |
-            BASEIMGTYPE=${{ matrix.image.baseimg }}
-            BUILD_VERSION=${{ needs.init.outputs.tag }}
+  deploy-docker-manifest:
+    if: github.repository == 'esphome/esphome'
+    permissions:
+      contents: read
+      packages: write
+    runs-on: ubuntu-latest
+    needs: [init, deploy-docker]
+    strategy:
+      matrix:
+        build_type: ["ha-addon", "docker", "lint"]
+    steps:
+    - uses: actions/checkout@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
 
-  deploy-ha-addon-repo:
+    - 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
+
+  deploy-hassio-repo:
     if: github.repository == 'esphome/esphome' && github.event_name == 'release'
     runs-on: ubuntu-latest
     needs: [deploy-docker]
     steps:
-      - name: Trigger Workflow
-        uses: actions/github-script@v6
-        with:
-          github-token: ${{ secrets.DEPLOY_HA_ADDON_REPO_TOKEN }}
-          script: |
-            github.rest.actions.createWorkflowDispatch({
-              owner: "esphome",
-              repo: "home-assistant-addon",
-              workflow_id: "bump-version.yml",
-              ref: "main",
-              inputs: {
-                version: "${{ github.event.release.tag_name }}",
-                content: ${{ toJSON(github.event.release.body) }}
-              }
-            })
+      - env:
+          TOKEN: ${{ secrets.DEPLOY_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/hassio/actions/workflows/bump-version.yml/dispatches \
+            -d "{\"ref\":\"main\",\"inputs\":{\"version\":\"$TAG\"}}"

.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@v8
+      - 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@v8
+      - 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/
@@ -128,5 +127,3 @@ tests/.esphome/
 
 sdkconfig.*
 !sdkconfig.defaults
-
-.tests/

.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 config dashboard

.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/psf/black
-    rev: 23.1.0
+  - repo: https://github.com/ambv/black
+    rev: 20.8b1
     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: 3.8.4
     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.1
-    hooks:
-      - id: pyupgrade
-        args: [--py39-plus]

.yamllint

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

CODEOWNERS

@@ -11,133 +11,80 @@ esphome/*.py @esphome/core
 esphome/core/* @esphome/core
 
 # Integrations
-esphome/components/absolute_humidity/* @DAVe3283
 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
-esphome/components/as7341/* @mrgnr
 esphome/components/async_tcp/* @OttoWinter
 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/bp1658cj/* @Cossid
-esphome/components/bp5758d/* @Cossid
 esphome/components/button/* @esphome/core
 esphome/components/canbus/* @danielschramm @mvturnho
 esphome/components/cap1188/* @MrEditor97
 esphome/components/captive_portal/* @OttoWinter
 esphome/components/ccs811/* @habbie
-esphome/components/cd74hc4067/* @asoehlke
 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/ee895/* @Stock-M
-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/fs3000/* @kahrendt
 esphome/components/globals/* @esphome/core
 esphome/components/gpio/* @esphome/core
 esphome/components/gps/* @coogle
 esphome/components/graph/* @synco
 esphome/components/growatt_solar/* @leeuwte
-esphome/components/haier/* @Yarikx
 esphome/components/havells_solar/* @sourabhjaiswal
 esphome/components/hbridge/fan/* @WeekendWarrior
 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/hte501/* @Stock-M
-esphome/components/hydreon_rgxx/* @functionpointer
 esphome/components/i2c/* @esphome/core
-esphome/components/i2s_audio/* @jesserockz
-esphome/components/ili9xxx/* @nielsnl68
-esphome/components/improv_base/* @esphome/core
 esphome/components/improv_serial/* @esphome/core
-esphome/components/ina260/* @MrEditor97
 esphome/components/inkbird_ibsth1_mini/* @fkirill
 esphome/components/inkplate6/* @jesserockz
 esphome/components/integration/* @OttoWinter
-esphome/components/internal_temperature/* @Mat931
 esphome/components/interval/* @esphome/core
 esphome/components/json/* @OttoWinter
-esphome/components/kalman_combinator/* @Cat-Ion
-esphome/components/key_collector/* @ssieb
-esphome/components/key_provider/* @ssieb
-esphome/components/kuntze/* @ssieb
-esphome/components/lcd_menu/* @numo68
-esphome/components/ld2410/* @sebcaps
 esphome/components/ledc/* @OttoWinter
 esphome/components/light/* @esphome/core
-esphome/components/lilygo_t5_47/touchscreen/* @jesserockz
-esphome/components/lock/* @esphome/core
 esphome/components/logger/* @esphome/core
 esphome/components/ltr390/* @sjtrny
-esphome/components/matrix_keypad/* @ssieb
-esphome/components/max31865/* @DAVe3283
-esphome/components/max44009/* @berfenger
 esphome/components/max7219digit/* @rspaargaren
-esphome/components/max9611/* @mckaymatthew
 esphome/components/mcp23008/* @jesserockz
 esphome/components/mcp23017/* @jesserockz
 esphome/components/mcp23s08/* @SenexCrenshaw @jesserockz
@@ -146,32 +93,18 @@ esphome/components/mcp23x08_base/* @jesserockz
 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/mics_4514/* @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/* @Fabian-Schmidt @spbrogan
-esphome/components/mopeka_pro_check/* @spbrogan
-esphome/components/mopeka_std_check/* @Fabian-Schmidt
-esphome/components/mpl3115a2/* @kbickar
-esphome/components/mpu6886/* @fabaff
 esphome/components/network/* @esphome/core
 esphome/components/nextion/* @senexcrenshaw
 esphome/components/nextion/binary_sensor/* @senexcrenshaw
@@ -182,8 +115,6 @@ esphome/components/nfc/* @jesserockz
 esphome/components/number/* @esphome/core
 esphome/components/ota/* @esphome/core
 esphome/components/output/* @esphome/core
-esphome/components/pca9554/* @hwstar
-esphome/components/pcf85063/* @brogon
 esphome/components/pid/* @OttoWinter
 esphome/components/pipsolar/* @andreashergert1984
 esphome/components/pm1006/* @habbie
@@ -193,52 +124,30 @@ esphome/components/pn532_i2c/* @OttoWinter @jesserockz
 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/sen21231/* @shreyaskarnik
-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/sigma_delta_output/* @Cat-Ion
 esphome/components/sim800l/* @glmnet
-esphome/components/sm10bit_base/* @Cossid
 esphome/components/sm2135/* @BoukeHaarsma23
-esphome/components/sm2235/* @Cossid
-esphome/components/sm2335/* @Cossid
-esphome/components/sml/* @alengwenus
-esphome/components/smt100/* @piechade
-esphome/components/sn74hc165/* @jesserockz
 esphome/components/socket/* @esphome/core
-esphome/components/sonoff_d1/* @anatoly-savchenkov
 esphome/components/spi/* @esphome/core
-esphome/components/sprinkler/* @kbx81
-esphome/components/sps30/* @martgras
 esphome/components/ssd1322_base/* @kbx81
 esphome/components/ssd1322_spi/* @kbx81
 esphome/components/ssd1325_base/* @kbx81
@@ -259,42 +168,27 @@ esphome/components/switch/* @esphome/core
 esphome/components/t6615/* @tylermenezes
 esphome/components/tca9548a/* @andreashergert1984
 esphome/components/tcl112/* @glmnet
-esphome/components/tee501/* @Stock-M
 esphome/components/teleinfo/* @0hax
 esphome/components/thermostat/* @kbx81
 esphome/components/time/* @OttoWinter
 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
 esphome/components/toshiba/* @kbx81
-esphome/components/touchscreen/* @jesserockz
 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/vbus/* @ssieb
 esphome/components/version/* @esphome/core
-esphome/components/wake_on_lan/* @willwill2will54
 esphome/components/web_server_base/* @OttoWinter
 esphome/components/whirlpool/* @glmnet
-esphome/components/whynter/* @aeonsablaze
-esphome/components/wiegand/* @ssieb
-esphome/components/wl_134/* @hobbypunk90
-esphome/components/x9c/* @EtienneMD
 esphome/components/xiaomi_lywsd03mmc/* @ahpohl
-esphome/components/xiaomi_mhoc303/* @drug123
 esphome/components/xiaomi_mhoc401/* @vevsvevs
-esphome/components/xiaomi_rtcgq02lm/* @jesserockz
-esphome/components/xpt2046/* @nielsnl68 @numo68
+esphome/components/xpt2046/* @numo68

MANIFEST.in

@@ -1,6 +1,7 @@
 include LICENSE
 include README.md
 include requirements.txt
-recursive-include esphome *.cpp *.h *.tcc *.c
-recursive-include esphome *.py.script
+include esphome/dashboard/templates/*.html
+recursive-include esphome/dashboard/static *.ico *.js *.css *.woff* LICENSE
+recursive-include esphome *.cpp *.h *.tcc
 recursive-include esphome LICENSE.txt

docker/Dockerfile

@@ -5,29 +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.2.3 AS base-hassio
-# https://hub.docker.com/_/debian?tab=tags&page=1&name=bullseye
-FROM debian:bullseye-20230208-slim AS base-docker
+FROM ghcr.io/hassio-addons/debian-base/amd64:5.1.1 AS base-hassio-amd64
+FROM ghcr.io/hassio-addons/debian-base/aarch64:5.1.1 AS base-hassio-arm64
+FROM ghcr.io/hassio-addons/debian-base/armv7:5.1.1 AS base-hassio-armv7
+FROM debian:bullseye-20211011-slim AS base-docker-amd64
+FROM debian:bullseye-20211011-slim AS base-docker-arm64
+FROM debian:bullseye-20211011-slim AS base-docker-armv7
 
-FROM base-${BASEIMGTYPE} AS base
-
-ARG TARGETARCH
-ARG TARGETVARIANT
+# Use TARGETARCH/TARGETVARIANT defined by docker
+# https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
+FROM base-${BASEIMGTYPE}-${TARGETARCH}${TARGETVARIANT} AS base
 
 RUN \
     apt-get update \
     # 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-pil=8.1.2+dfsg-0.3 \
         python3-cryptography=3.3.2-1 \
         iputils-ping=3:20210202-1 \
         git=1:2.30.2-1 \
-        curl=7.74.0-1.3+deb11u7 \
-        openssh-client=1:8.4p1-5+deb11u1 \
+        curl=7.74.0-1.3+b1 \
     && rm -rf \
         /tmp/* \
         /var/{cache,log}/* \
@@ -39,38 +39,32 @@ ENV \
   # Store globally installed pio libs in /piolibs
   PLATFORMIO_GLOBALLIB_DIR=/piolibs
 
-# Support legacy binaries on Debian multiarch system. There is no "correct" way
-# to do this, other than using properly built toolchains...
-# See: https://unix.stackexchange.com/questions/553743/correct-way-to-add-lib-ld-linux-so-3-in-debian
-RUN \
-    if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
-        ln -s /lib/arm-linux-gnueabihf/ld-linux.so.3 /lib/ld-linux.so.3; \
-    fi
-
 RUN \
     # Ubuntu python3-pip is missing wheel
     pip3 install --no-cache-dir \
-        wheel==0.37.1 \
-        platformio==6.1.6 \
+        wheel==0.36.2 \
+        platformio==5.2.2 \
     # 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
+RUN pip3 install --no-cache-dir -e /esphome
 
 # Settings for dashboard
 ENV USERNAME="" PASSWORD=""
@@ -99,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}/* \
@@ -108,11 +102,17 @@ 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
-RUN pip3 install --no-cache-dir --no-use-pep517 -e /esphome
+RUN pip3 install --no-cache-dir -e /esphome
 
 # Labels
 LABEL \
@@ -135,11 +135,11 @@ RUN \
     apt-get update \
     # Use pinned versions so that we get updates with build caching
     && apt-get install -y --no-install-recommends \
-        clang-format-13=1:13.0.1-6~deb11u1 \
+        clang-format-11=1:11.0.1-2 \
         clang-tidy-11=1:11.0.1-2 \
         patch=2.7.6-7 \
         software-properties-common=0.96.20.2-2.1 \
-        nano=5.4-2+deb11u2 \
+        nano=5.4-2 \
         build-essential=12.9 \
         python3-dev=3.9.2-3 \
     && rm -rf \
@@ -147,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

@@ -8,49 +8,31 @@ import re
 import sys
 
 
-CHANNEL_DEV = "dev"
-CHANNEL_BETA = "beta"
-CHANNEL_RELEASE = "release"
+CHANNEL_DEV = 'dev'
+CHANNEL_BETA = 'beta'
+CHANNEL_RELEASE = 'release'
 CHANNELS = [CHANNEL_DEV, CHANNEL_BETA, CHANNEL_RELEASE]
 
-ARCH_AMD64 = "amd64"
-ARCH_ARMV7 = "armv7"
-ARCH_AARCH64 = "aarch64"
+ARCH_AMD64 = 'amd64'
+ARCH_ARMV7 = 'armv7'
+ARCH_AARCH64 = 'aarch64'
 ARCHS = [ARCH_AMD64, ARCH_ARMV7, ARCH_AARCH64]
 
-TYPE_DOCKER = "docker"
-TYPE_HA_ADDON = "ha-addon"
-TYPE_LINT = "lint"
+TYPE_DOCKER = 'docker'
+TYPE_HA_ADDON = 'ha-addon'
+TYPE_LINT = 'lint'
 TYPES = [TYPE_DOCKER, TYPE_HA_ADDON, TYPE_LINT]
 
 
 parser = argparse.ArgumentParser()
-parser.add_argument(
-    "--tag",
-    type=str,
-    required=True,
-    help="The main docker tag to push to. If a version number also adds latest and/or beta tag",
-)
-parser.add_argument(
-    "--arch", choices=ARCHS, required=False, help="The architecture to build for"
-)
-parser.add_argument(
-    "--build-type", choices=TYPES, required=True, help="The type of build to run"
-)
-parser.add_argument(
-    "--dry-run", action="store_true", help="Don't run any commands, just print them"
-)
-subparsers = parser.add_subparsers(
-    help="Action to perform", dest="command", required=True
-)
+parser.add_argument("--tag", type=str, required=True, help="The main docker tag to push to. If a version number also adds latest and/or beta tag")
+parser.add_argument("--arch", choices=ARCHS, required=False, help="The architecture to build for")
+parser.add_argument("--build-type", choices=TYPES, required=True, help="The type of build to run")
+parser.add_argument("--dry-run", action="store_true", help="Don't run any commands, just print them")
+subparsers = parser.add_subparsers(help="Action to perform", dest="command", required=True)
 build_parser = subparsers.add_parser("build", help="Build the image")
 build_parser.add_argument("--push", help="Also push the images", action="store_true")
-build_parser.add_argument(
-    "--load", help="Load the docker image locally", action="store_true"
-)
-manifest_parser = subparsers.add_parser(
-    "manifest", help="Create a manifest from already pushed images"
-)
+manifest_parser = subparsers.add_parser("manifest", help="Create a manifest from already pushed images")
 
 
 @dataclass(frozen=True)
@@ -66,7 +48,7 @@ class DockerParams:
         prefix = {
             TYPE_DOCKER: "esphome/esphome",
             TYPE_HA_ADDON: "esphome/esphome-hassio",
-            TYPE_LINT: "esphome/esphome-lint",
+            TYPE_LINT: "esphome/esphome-lint"
         }[build_type]
         build_to = f"{prefix}-{arch}"
         baseimgtype = {
@@ -105,12 +87,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
@@ -125,11 +105,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)
@@ -145,28 +120,18 @@ def main():
 
         # 3. build
         cmd = [
-            "docker",
-            "buildx",
-            "build",
-            "--build-arg",
-            f"BASEIMGTYPE={params.baseimgtype}",
-            "--build-arg",
-            f"BUILD_VERSION={args.tag}",
-            "--cache-from",
-            f"type=registry,ref={cache_img}",
-            "--file",
-            "docker/Dockerfile",
-            "--platform",
-            params.platform,
-            "--target",
-            params.target,
+            "docker", "buildx", "build",
+            "--build-arg", f"BASEIMGTYPE={params.baseimgtype}",
+            "--build-arg", f"BUILD_VERSION={args.tag}",
+            "--cache-from", f"type=registry,ref={cache_img}",
+            "--file", "docker/Dockerfile",
+            "--platform", params.platform,
+            "--target", params.target,
         ]
         for img in imgs:
             cmd += ["--tag", img]
         if args.push:
             cmd += ["--push", "--cache-to", f"type=registry,ref={cache_img},mode=max"]
-        if args.load:
-            cmd += ["--load"]
 
         run_command(*cmd, ".")
     elif args.command == "manifest":
@@ -185,7 +150,9 @@ def main():
             run_command(*cmd)
         # 2. Push manifests
         for target in targets:
-            run_command("docker", "manifest", "push", target)
+            run_command(
+                "docker", "manifest", "push", target
+            )
 
 
 if __name__ == "__main__":

docker/generate_tags.py

@@ -1,68 +0,0 @@
-#!/usr/bin/env python3
-import re
-import os
-import argparse
-import json
-
-CHANNEL_DEV = "dev"
-CHANNEL_BETA = "beta"
-CHANNEL_RELEASE = "release"
-
-parser = argparse.ArgumentParser()
-parser.add_argument(
-    "--tag",
-    type=str,
-    required=True,
-    help="The main docker tag to push to. If a version number also adds latest and/or beta tag",
-)
-parser.add_argument(
-    "--suffix",
-    type=str,
-    required=True,
-    help="The suffix of the tag.",
-)
-
-
-def main():
-    args = parser.parse_args()
-
-    # detect channel from tag
-    match = re.match(r"^(\d+\.\d+)(?:\.\d+)?(b\d+)?$", args.tag)
-    major_minor_version = None
-    if match is None:
-        channel = CHANNEL_DEV
-    elif match.group(2) is None:
-        major_minor_version = match.group(1)
-        channel = CHANNEL_RELEASE
-    else:
-        channel = CHANNEL_BETA
-
-    tags_to_push = [args.tag]
-    if channel == CHANNEL_DEV:
-        tags_to_push.append("dev")
-    elif channel == CHANNEL_BETA:
-        tags_to_push.append("beta")
-    elif channel == CHANNEL_RELEASE:
-        # Additionally push to beta
-        tags_to_push.append("beta")
-        tags_to_push.append("latest")
-
-        if major_minor_version:
-            tags_to_push.append("stable")
-            tags_to_push.append(major_minor_version)
-
-    suffix = f"-{args.suffix}" if args.suffix else ""
-
-    with open(os.environ["GITHUB_OUTPUT"], "w") as f:
-        print(f"channel={channel}", file=f)
-        print(f"image=esphome/esphome{suffix}", file=f)
-        full_tags = []
-
-        for tag in tags_to_push:
-            full_tags += [f"ghcr.io/esphome/esphome{suffix}:{tag}"]
-            full_tags += [f"esphome/esphome{suffix}:{tag}"]
-        print(f"tags={','.join(full_tags)}", file=f)
-
-
-if __name__ == "__main__":
-    main()

docker/ha-addon-rootfs/etc/nginx/includes/ssl_params.conf

@@ -1,8 +0,0 @@
-ssl_protocols TLSv1.2 TLSv1.3;
-ssl_prefer_server_ciphers off;
-ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
-ssl_session_timeout  10m;
-ssl_session_cache shared:SSL:10m;
-ssl_session_tickets off;
-ssl_stapling on;
-ssl_stapling_verify on;

docker/ha-addon-rootfs/etc/nginx/includes/upstream.conf

@@ -1,3 +0,0 @@
-upstream esphome {
-    server unix:/var/run/esphome.sock;
-}

docker/ha-addon-rootfs/etc/nginx/servers/.gitkeep

@@ -1 +0,0 @@
-Without requirements or design, programming is the art of adding bugs to an empty text file. (Louis Srygley)

docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/run

@@ -1,32 +0,0 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
-# ==============================================================================
-# Home Assistant Add-on: ESPHome
-# Sends discovery information to Home Assistant.
-# ==============================================================================
-declare config
-declare port
-
-# We only disable it when disabled explicitly
-if bashio::config.false 'home_assistant_dashboard_integration';
-then
-    bashio::log.info "Home Assistant discovery is disabled for this add-on."
-    bashio::exit.ok
-fi
-
-port=$(bashio::addon.ingress_port)
-
-# Wait for NGINX to become available
-bashio::net.wait_for "${port}" "127.0.0.1" 300
-
-config=$(\
-    bashio::var.json \
-        host "127.0.0.1" \
-        port "^${port}" \
-)
-
-if bashio::discovery "esphome" "${config}" > /dev/null; then
-    bashio::log.info "Successfully send discovery information to Home Assistant."
-else
-    bashio::log.error "Discovery message to Home Assistant failed!"
-fi

docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/type

@@ -1 +0,0 @@
-oneshot

docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/up

@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/discovery/run

docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/finish

@@ -1,26 +0,0 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
-# ==============================================================================
-# Home Assistant Community Add-on: ESPHome
-# Take down the S6 supervision tree when ESPHome dashboard fails
-# ==============================================================================
-declare exit_code
-readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
-readonly exit_code_service="${1}"
-readonly exit_code_signal="${2}"
-
-bashio::log.info \
-  "Service ESPHome dashboard exited with code ${exit_code_service}" \
-  "(by signal ${exit_code_signal})"
-
-if [[ "${exit_code_service}" -eq 256 ]]; then
-  if [[ "${exit_code_container}" -eq 0 ]]; then
-    echo $((128 + $exit_code_signal)) > /run/s6-linux-init-container-results/exitcode
-  fi
-  [[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt
-elif [[ "${exit_code_service}" -ne 0 ]]; then
-  if [[ "${exit_code_container}" -eq 0 ]]; then
-    echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode
-  fi
-  exec /run/s6/basedir/bin/halt
-fi

docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/type

@@ -1 +0,0 @@
-longrun

docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run

@@ -1,27 +0,0 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# Configures NGINX for use with ESPHome
-# ==============================================================================
-mkdir -p /var/log/nginx
-
-# Generate Ingress configuration
-bashio::var.json \
-    interface "$(bashio::addon.ip_address)" \
-    port "^$(bashio::addon.ingress_port)" \
-    | tempio \
-        -template /etc/nginx/templates/ingress.gtpl \
-        -out /etc/nginx/servers/ingress.conf
-
-# Generate direct access configuration, if enabled.
-if bashio::var.has_value "$(bashio::addon.port 6052)"; then
-    bashio::config.require.ssl
-    bashio::var.json \
-        certfile "$(bashio::config 'certfile')" \
-        keyfile "$(bashio::config 'keyfile')" \
-        ssl "^$(bashio::config 'ssl')" \
-        | tempio \
-            -template /etc/nginx/templates/direct.gtpl \
-            -out /etc/nginx/servers/direct.conf
-fi

docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type

@@ -1 +0,0 @@
-oneshot

docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up

@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-nginx/run

docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/finish

@@ -1,25 +0,0 @@
-#!/command/with-contenv bashio
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# Take down the S6 supervision tree when NGINX fails
-# ==============================================================================
-declare exit_code
-readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
-readonly exit_code_service="${1}"
-readonly exit_code_signal="${2}"
-
-bashio::log.info \
-  "Service NGINX exited with code ${exit_code_service}" \
-  "(by signal ${exit_code_signal})"
-
-if [[ "${exit_code_service}" -eq 256 ]]; then
-  if [[ "${exit_code_container}" -eq 0 ]]; then
-    echo $((128 + $exit_code_signal)) > /run/s6-linux-init-container-results/exitcode
-  fi
-  [[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt
-elif [[ "${exit_code_service}" -ne 0 ]]; then
-  if [[ "${exit_code_container}" -eq 0 ]]; then
-    echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode
-  fi
-  exec /run/s6/basedir/bin/halt
-fi

docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/type

@@ -1 +0,0 @@
-longrun

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

@@ -0,0 +1,41 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# Community Hass.io Add-ons: ESPHome
+# This files check if all user configuration requirements are met
+# ==============================================================================
+
+# Check SSL requirements, if enabled
+if bashio::config.true 'ssl'; then
+    if ! bashio::config.has_value 'certfile'; then
+        bashio::fatal 'SSL is enabled, but no certfile was specified.'
+        bashio::exit.nok
+    fi
+
+    if ! bashio::config.has_value 'keyfile'; then
+        bashio::fatal 'SSL is enabled, but no keyfile was specified'
+        bashio::exit.nok
+    fi
+
+
+    certfile="/ssl/$(bashio::config 'certfile')"
+    keyfile="/ssl/$(bashio::config 'keyfile')"
+
+    if ! bashio::fs.file_exists "${certfile}"; then
+        if ! bashio::fs.file_exists "${keyfile}"; then
+            # Both files are missing, let's print a friendlier error message
+            bashio::log.fatal 'You enabled encrypted connections using the "ssl": true option.'
+            bashio::log.fatal "However, the SSL files '${certfile}' and '${keyfile}'"
+            bashio::log.fatal "were not found. If you're using Hass.io on your local network and don't want"
+            bashio::log.fatal 'to encrypt connections to the ESPHome dashboard, you can manually disable'
+            bashio::log.fatal 'SSL by setting "ssl" to false."'
+            bashio::exit.nok
+        fi
+        bashio::log.fatal "The configured certfile '${certfile}' was not found."
+        bashio::exit.nok
+    fi
+
+    if ! bashio::fs.file_exists "/ssl/$(bashio::config 'keyfile')"; then
+        bashio::log.fatal "The configured keyfile '${keyfile}' was not found."
+        bashio::exit.nok
+    fi
+fi

docker/hassio-rootfs/etc/cont-init.d/20-nginx.sh

@@ -0,0 +1,34 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# Community Hass.io Add-ons: ESPHome
+# Configures NGINX for use with ESPHome
+# ==============================================================================
+
+declare certfile
+declare keyfile
+declare direct_port
+declare ingress_interface
+declare ingress_port
+
+mkdir -p /var/log/nginx
+
+direct_port=$(bashio::addon.port 6052)
+if bashio::var.has_value "${direct_port}"; then
+    if bashio::config.true 'ssl'; then
+        certfile=$(bashio::config 'certfile')
+        keyfile=$(bashio::config 'keyfile')
+
+        mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf
+        sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/servers/direct.conf
+        sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/servers/direct.conf
+    else
+        mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf
+    fi
+
+    sed -i "s/%%port%%/${direct_port}/g" /etc/nginx/servers/direct.conf
+fi
+
+ingress_port=$(bashio::addon.ingress_port)
+ingress_interface=$(bashio::addon.ip_address)
+sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf
+sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf

docker/hassio-rootfs/etc/cont-init.d/30-dirs.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# Community Hass.io Add-ons: ESPHome
+# This files creates all directories used by esphome
+# ==============================================================================
+
+pio_cache_base=/data/cache/platformio
+
+mkdir -p "${pio_cache_base}"

docker/hassio-rootfs/etc/nginx/includes/proxy_params.conf

@@ -1,9 +1,9 @@
-proxy_http_version          1.1;
-proxy_ignore_client_abort   off;
-proxy_read_timeout          86400s;
-proxy_redirect              off;
-proxy_send_timeout          86400s;
-proxy_max_temp_file_size    0;
+proxy_http_version 1.1;
+proxy_ignore_client_abort off;
+proxy_read_timeout 86400s;
+proxy_redirect off;
+proxy_send_timeout 86400s;
+proxy_max_temp_file_size 0;
 
 proxy_set_header Accept-Encoding "";
 proxy_set_header Connection $connection_upgrade;

docker/hassio-rootfs/etc/nginx/includes/server_params.conf

@@ -1,7 +1,5 @@
-root            /dev/null;
-server_name     $hostname;
-
-client_max_body_size 512m;
+root /dev/null;
+server_name $hostname;
 
 add_header X-Content-Type-Options nosniff;
 add_header X-XSS-Protection "1; mode=block";

docker/hassio-rootfs/etc/nginx/includes/ssl_params.conf

@@ -0,0 +1,9 @@
+ssl_protocols TLSv1.2;
+ssl_prefer_server_ciphers on;
+ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA;
+ssl_ecdh_curve secp384r1;
+ssl_session_timeout  10m;
+ssl_session_cache shared:SSL:10m;
+ssl_session_tickets off;
+ssl_stapling on;
+ssl_stapling_verify on;

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

@@ -2,6 +2,7 @@ daemon off;
 user root;
 pid /var/run/nginx.pid;
 worker_processes 1;
+# Hass.io addon log
 error_log /proc/1/fd/1 error;
 events {
     worker_connections 1024;
@@ -9,22 +10,24 @@ events {
 
 http {
     include /etc/nginx/includes/mime.types;
-
-    access_log              off;
-    default_type            application/octet-stream;
-    gzip                    on;
-    keepalive_timeout       65;
-    sendfile                on;
-    server_tokens           off;
-
-    tcp_nodelay             on;
-    tcp_nopush              on;
+    access_log stdout;
+    default_type application/octet-stream;
+    gzip on;
+    keepalive_timeout 65;
+    sendfile on;
+    server_tokens off;
 
     map $http_upgrade $connection_upgrade {
         default upgrade;
         ''      close;
     }
 
-    include /etc/nginx/includes/upstream.conf;
+    # Use Hass.io supervisor as resolver
+    resolver 172.30.32.2;
+
+    upstream esphome {
+        server unix:/var/run/esphome.sock;
+    }
+
     include /etc/nginx/servers/*.conf;
 }

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

@@ -1,26 +1,20 @@
 server {
-    {{ if not .ssl }}
-    listen 6052 default_server;
-    {{ else }}
-    listen 6052 default_server ssl http2;
-    {{ end }}
+    listen %%port%% default_server ssl http2;
 
     include /etc/nginx/includes/server_params.conf;
     include /etc/nginx/includes/proxy_params.conf;
-
-    {{ if .ssl }}
     include /etc/nginx/includes/ssl_params.conf;
 
-    ssl_certificate /ssl/{{ .certfile }};
-    ssl_certificate_key /ssl/{{ .keyfile }};
+    ssl on;
+    ssl_certificate /ssl/%%certfile%%;
+    ssl_certificate_key /ssl/%%keyfile%%;
+
+    # Clear Hass.io Ingress header
+    proxy_set_header X-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/
     error_page 497 https://$http_host$request_uri;
-    {{ end }}
-
-    # Clear Home Assistant Ingress header
-    proxy_set_header X-HA-Ingress "";
 
     location / {
         proxy_pass http://esphome;

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

@@ -0,0 +1,12 @@
+server {
+    listen %%port%% default_server;
+
+    include /etc/nginx/includes/server_params.conf;
+    include /etc/nginx/includes/proxy_params.conf;
+    # Clear Hass.io Ingress header
+    proxy_set_header X-Hassio-Ingress "";
+
+    location / {
+        proxy_pass http://esphome;
+    }
+}

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

@@ -1,16 +1,14 @@
 server {
-    listen 127.0.0.1:{{ .port }} default_server;
-    listen {{ .interface }}:{{ .port }} default_server;
+    listen %%interface%%:%%port%% default_server;
 
     include /etc/nginx/includes/server_params.conf;
     include /etc/nginx/includes/proxy_params.conf;
-
-    # Set Home Assistant Ingress header
-    proxy_set_header X-HA-Ingress "YES";
+    # Set Hass.io Ingress header
+    proxy_set_header X-Hassio-Ingress "YES";
 
     location / {
+        # Only allow from Hass.io supervisor
         allow   172.30.32.2;
-        allow   127.0.0.1;
         deny    all;
 
         proxy_pass http://esphome;

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

@@ -1,19 +1,10 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
+#!/usr/bin/with-contenv bashio
 # ==============================================================================
 # Community Hass.io Add-ons: ESPHome
 # Runs the ESPHome dashboard
 # ==============================================================================
-readonly pio_cache_base=/data/cache/platformio
 
-export ESPHOME_IS_HA_ADDON=true
-export PLATFORMIO_GLOBALLIB_DIR=/piolibs
-
-# we can't set core_dir, because the settings file is stored in `core_dir/appstate.json`
-# setting `core_dir` would therefore prevent pio from accessing
-export PLATFORMIO_PLATFORMS_DIR="${pio_cache_base}/platforms"
-export PLATFORMIO_PACKAGES_DIR="${pio_cache_base}/packages"
-export PLATFORMIO_CACHE_DIR="${pio_cache_base}/cache"
+export ESPHOME_IS_HASSIO=true
 
 if bashio::config.true 'leave_front_door_open'; then
     export DISABLE_HA_AUTHENTICATION=true
@@ -31,15 +22,14 @@ if bashio::config.has_value 'relative_url'; then
     export ESPHOME_DASHBOARD_RELATIVE_URL=$(bashio::config 'relative_url')
 fi
 
-if bashio::config.has_value 'default_compile_process_limit'; then
-    export ESPHOME_DEFAULT_COMPILE_PROCESS_LIMIT=$(bashio::config 'default_compile_process_limit')
-else
-    if grep -q 'Raspberry Pi 3' /proc/cpuinfo; then
-        export ESPHOME_DEFAULT_COMPILE_PROCESS_LIMIT=1;
-    fi
-fi
+pio_cache_base=/data/cache/platformio
+# we can't set core_dir, because the settings file is stored in `core_dir/appstate.json`
+# setting `core_dir` would therefore prevent pio from accessing
+export PLATFORMIO_PLATFORMS_DIR="${pio_cache_base}/platforms"
+export PLATFORMIO_PACKAGES_DIR="${pio_cache_base}/packages"
+export PLATFORMIO_CACHE_DIR="${pio_cache_base}/cache"
 
-mkdir -p "${pio_cache_base}"
+export PLATFORMIO_GLOBALLIB_DIR=/piolibs
 
 bashio::log.info "Starting ESPHome dashboard..."
-exec esphome dashboard /config/esphome --socket /var/run/esphome.sock --ha-addon
+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

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

@@ -1,11 +1,10 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
+#!/usr/bin/with-contenv bashio
 # ==============================================================================
 # Community Hass.io Add-ons: ESPHome
 # Runs the NGINX proxy
 # ==============================================================================
 
-bashio::log.info "Waiting for ESPHome dashboard to come up..."
+bashio::log.info "Waiting for dashboard to come up..."
 
 while [[ ! -S /var/run/esphome.sock ]]; do
   sleep 0.5

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
 
@@ -339,7 +310,7 @@ def command_config(args, config):
     _LOGGER.info("Configuration is valid!")
     if not CORE.verbose:
         config = strip_default_ids(config)
-    safe_print(yaml_util.dump(config, args.show_secrets))
+    safe_print(yaml_util.dump(config))
     return 0
 
 
@@ -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,
 }
 
 
@@ -665,9 +543,6 @@ def parse_args(argv):
     parser_config.add_argument(
         "configuration", help="Your YAML configuration file(s).", nargs="+"
     )
-    parser_config.add_argument(
-        "--show-secrets", help="Show secrets in output.", action="store_true"
-    )
 
     parser_compile = subparsers.add_parser(
         "compile", help="Read the configuration and compile a program."
@@ -691,10 +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",
@@ -790,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
@@ -810,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>.
     #
@@ -916,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)
@@ -254,25 +257,26 @@ async def repeat_action_to_code(config, action_id, template_arg, args):
     var = cg.new_Pvariable(action_id, template_arg)
     count_template = await cg.templatable(config[CONF_COUNT], args, cg.uint32)
     cg.add(var.set_count(count_template))
-    actions = await build_action_list(
-        config[CONF_THEN],
-        cg.TemplateArguments(cg.uint32, *template_arg.args),
-        [(cg.uint32, "iteration"), *args],
-    )
+    actions = await build_action_list(config[CONF_THEN], template_arg, args)
     cg.add(var.add_then(actions))
     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,
@@ -47,7 +46,6 @@ from esphome.cpp_helpers import (  # noqa
     build_registry_list,
     extract_registry_entry_config,
     register_parented,
-    past_safe_mode,
 )
 from esphome.cpp_types import (  # noqa
     global_ns,
@@ -64,10 +62,7 @@ from esphome.cpp_types import (  # noqa
     uint16,
     uint32,
     uint64,
-    int16,
     int32,
-    int64,
-    size_t,
     const_char_ptr,
     NAN,
     esphome_ns,
@@ -80,11 +75,11 @@ from esphome.cpp_types import (  # noqa
     optional,
     arduino_json_ns,
     JsonObject,
-    JsonObjectConst,
+    JsonObjectRef,
+    JsonObjectConstRef,
     Controller,
     GPIOPin,
     InternalGPIOPin,
     gpio_Flags,
     EntityCategory,
-    Parented,
 )

esphome/components/a4988/a4988.cpp

@@ -46,7 +46,6 @@ void A4988::loop() {
     return;
 
   this->dir_pin_->digital_write(dir == 1);
-  delayMicroseconds(50);
   this->step_pin_->digital_write(true);
   delayMicroseconds(5);
   this->step_pin_->digital_write(false);

esphome/components/absolute_humidity/__init__.py

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

esphome/components/absolute_humidity/absolute_humidity.cpp

@@ -1,182 +0,0 @@
-#include "esphome/core/log.h"
-#include "absolute_humidity.h"
-
-namespace esphome {
-namespace absolute_humidity {
-
-static const char *const TAG = "absolute_humidity.sensor";
-
-void AbsoluteHumidityComponent::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up absolute humidity '%s'...", this->get_name().c_str());
-
-  ESP_LOGD(TAG, "  Added callback for temperature '%s'", this->temperature_sensor_->get_name().c_str());
-  this->temperature_sensor_->add_on_state_callback([this](float state) { this->temperature_callback_(state); });
-  if (this->temperature_sensor_->has_state()) {
-    this->temperature_callback_(this->temperature_sensor_->get_state());
-  }
-
-  ESP_LOGD(TAG, "  Added callback for relative humidity '%s'", this->humidity_sensor_->get_name().c_str());
-  this->humidity_sensor_->add_on_state_callback([this](float state) { this->humidity_callback_(state); });
-  if (this->humidity_sensor_->has_state()) {
-    this->humidity_callback_(this->humidity_sensor_->get_state());
-  }
-}
-
-void AbsoluteHumidityComponent::dump_config() {
-  LOG_SENSOR("", "Absolute Humidity", this);
-
-  switch (this->equation_) {
-    case BUCK:
-      ESP_LOGCONFIG(TAG, "Saturation Vapor Pressure Equation: Buck");
-      break;
-    case TETENS:
-      ESP_LOGCONFIG(TAG, "Saturation Vapor Pressure Equation: Tetens");
-      break;
-    case WOBUS:
-      ESP_LOGCONFIG(TAG, "Saturation Vapor Pressure Equation: Wobus");
-      break;
-    default:
-      ESP_LOGE(TAG, "Invalid saturation vapor pressure equation selection!");
-      break;
-  }
-
-  ESP_LOGCONFIG(TAG, "Sources");
-  ESP_LOGCONFIG(TAG, "  Temperature: '%s'", this->temperature_sensor_->get_name().c_str());
-  ESP_LOGCONFIG(TAG, "  Relative Humidity: '%s'", this->humidity_sensor_->get_name().c_str());
-}
-
-float AbsoluteHumidityComponent::get_setup_priority() const { return setup_priority::DATA; }
-
-void AbsoluteHumidityComponent::loop() {
-  if (!this->next_update_) {
-    return;
-  }
-  this->next_update_ = false;
-
-  // Ensure we have source data
-  const bool no_temperature = std::isnan(this->temperature_);
-  const bool no_humidity = std::isnan(this->humidity_);
-  if (no_temperature || no_humidity) {
-    if (no_temperature) {
-      ESP_LOGW(TAG, "No valid state from temperature sensor!");
-    }
-    if (no_humidity) {
-      ESP_LOGW(TAG, "No valid state from temperature sensor!");
-    }
-    ESP_LOGW(TAG, "Unable to calculate absolute humidity.");
-    this->publish_state(NAN);
-    this->status_set_warning();
-    return;
-  }
-
-  // Convert to desired units
-  const float temperature_c = this->temperature_;
-  const float temperature_k = temperature_c + 273.15;
-  const float hr = this->humidity_ / 100;
-
-  // Calculate saturation vapor pressure
-  float es;
-  switch (this->equation_) {
-    case BUCK:
-      es = es_buck(temperature_c);
-      break;
-    case TETENS:
-      es = es_tetens(temperature_c);
-      break;
-    case WOBUS:
-      es = es_wobus(temperature_c);
-      break;
-    default:
-      ESP_LOGE(TAG, "Invalid saturation vapor pressure equation selection!");
-      this->publish_state(NAN);
-      this->status_set_error();
-      return;
-  }
-  ESP_LOGD(TAG, "Saturation vapor pressure %f kPa", es);
-
-  // Calculate absolute humidity
-  const float absolute_humidity = vapor_density(es, hr, temperature_k);
-
-  // Publish absolute humidity
-  ESP_LOGD(TAG, "Publishing absolute humidity %f g/m³", absolute_humidity);
-  this->status_clear_warning();
-  this->publish_state(absolute_humidity);
-}
-
-// Buck equation (https://en.wikipedia.org/wiki/Arden_Buck_equation)
-// More accurate than Tetens in normal meteorologic conditions
-float AbsoluteHumidityComponent::es_buck(float temperature_c) {
-  float a, b, c, d;
-  if (temperature_c >= 0) {
-    a = 0.61121;
-    b = 18.678;
-    c = 234.5;
-    d = 257.14;
-  } else {
-    a = 0.61115;
-    b = 18.678;
-    c = 233.7;
-    d = 279.82;
-  }
-  return a * expf((b - (temperature_c / c)) * (temperature_c / (d + temperature_c)));
-}
-
-// Tetens equation (https://en.wikipedia.org/wiki/Tetens_equation)
-float AbsoluteHumidityComponent::es_tetens(float temperature_c) {
-  float a, b;
-  if (temperature_c >= 0) {
-    a = 17.27;
-    b = 237.3;
-  } else {
-    a = 21.875;
-    b = 265.5;
-  }
-  return 0.61078 * expf((a * temperature_c) / (temperature_c + b));
-}
-
-// Wobus equation
-// https://wahiduddin.net/calc/density_altitude.htm
-// https://wahiduddin.net/calc/density_algorithms.htm
-// Calculate the saturation vapor pressure (kPa)
-float AbsoluteHumidityComponent::es_wobus(float t) {
-  // THIS FUNCTION RETURNS THE SATURATION VAPOR PRESSURE ESW (MILLIBARS)
-  // OVER LIQUID WATER GIVEN THE TEMPERATURE T (CELSIUS). THE POLYNOMIAL
-  // APPROXIMATION BELOW IS DUE TO HERMAN WOBUS, A MATHEMATICIAN WHO
-  // WORKED AT THE NAVY WEATHER RESEARCH FACILITY, NORFOLK, VIRGINIA,
-  // BUT WHO IS NOW RETIRED. THE COEFFICIENTS OF THE POLYNOMIAL WERE
-  // CHOSEN TO FIT THE VALUES IN TABLE 94 ON PP. 351-353 OF THE SMITH-
-  // SONIAN METEOROLOGICAL TABLES BY ROLAND LIST (6TH EDITION). THE
-  // APPROXIMATION IS VALID FOR -50 < T < 100C.
-  //
-  //     Baker, Schlatter  17-MAY-1982     Original version.
-
-  const float c0 = +0.99999683e00;
-  const float c1 = -0.90826951e-02;
-  const float c2 = +0.78736169e-04;
-  const float c3 = -0.61117958e-06;
-  const float c4 = +0.43884187e-08;
-  const float c5 = -0.29883885e-10;
-  const float c6 = +0.21874425e-12;
-  const float c7 = -0.17892321e-14;
-  const float c8 = +0.11112018e-16;
-  const float c9 = -0.30994571e-19;
-  const float p = c0 + t * (c1 + t * (c2 + t * (c3 + t * (c4 + t * (c5 + t * (c6 + t * (c7 + t * (c8 + t * (c9)))))))));
-  return 0.61078 / pow(p, 8);
-}
-
-// From https://www.environmentalbiophysics.org/chalk-talk-how-to-calculate-absolute-humidity/
-// H/T to https://esphome.io/cookbook/bme280_environment.html
-// H/T to https://carnotcycle.wordpress.com/2012/08/04/how-to-convert-relative-humidity-to-absolute-humidity/
-float AbsoluteHumidityComponent::vapor_density(float es, float hr, float ta) {
-  // es = saturated vapor pressure (kPa)
-  // hr = relative humidity [0-1]
-  // ta = absolute temperature (K)
-
-  const float ea = hr * es * 1000;   // vapor pressure of the air (Pa)
-  const float mw = 18.01528;         // molar mass of water (g⋅mol⁻¹)
-  const float r = 8.31446261815324;  // molar gas constant (J⋅K⁻¹)
-  return (ea * mw) / (r * ta);
-}
-
-}  // namespace absolute_humidity
-}  // namespace esphome

esphome/components/absolute_humidity/absolute_humidity.h

@@ -1,76 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/sensor/sensor.h"
-
-namespace esphome {
-namespace absolute_humidity {
-
-/// Enum listing all implemented saturation vapor pressure equations.
-enum SaturationVaporPressureEquation {
-  BUCK,
-  TETENS,
-  WOBUS,
-};
-
-/// This class implements calculation of absolute humidity from temperature and relative humidity.
-class AbsoluteHumidityComponent : public sensor::Sensor, public Component {
- public:
-  AbsoluteHumidityComponent() = default;
-
-  void set_temperature_sensor(sensor::Sensor *temperature_sensor) { this->temperature_sensor_ = temperature_sensor; }
-  void set_humidity_sensor(sensor::Sensor *humidity_sensor) { this->humidity_sensor_ = humidity_sensor; }
-  void set_equation(SaturationVaporPressureEquation equation) { this->equation_ = equation; }
-
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override;
-  void loop() override;
-
- protected:
-  void temperature_callback_(float state) {
-    this->next_update_ = true;
-    this->temperature_ = state;
-  }
-  void humidity_callback_(float state) {
-    this->next_update_ = true;
-    this->humidity_ = state;
-  }
-
-  /** Buck equation for saturation vapor pressure in kPa.
-   *
-   * @param temperature_c Air temperature in °C.
-   */
-  static float es_buck(float temperature_c);
-  /** Tetens equation for saturation vapor pressure in kPa.
-   *
-   * @param temperature_c Air temperature in °C.
-   */
-  static float es_tetens(float temperature_c);
-  /** Wobus equation for saturation vapor pressure in kPa.
-   *
-   * @param temperature_c Air temperature in °C.
-   */
-  static float es_wobus(float temperature_c);
-
-  /** Calculate vapor density (absolute humidity) in g/m³.
-   *
-   * @param es Saturation vapor pressure in kPa.
-   * @param hr Relative humidity 0 to 1.
-   * @param ta Absolute temperature in K.
-   * @param heater_duration The duration in ms that the heater should turn on for when measuring.
-   */
-  static float vapor_density(float es, float hr, float ta);
-
-  sensor::Sensor *temperature_sensor_{nullptr};
-  sensor::Sensor *humidity_sensor_{nullptr};
-
-  bool next_update_{false};
-
-  float temperature_{NAN};
-  float humidity_{NAN};
-  SaturationVaporPressureEquation equation_;
-};
-
-}  // namespace absolute_humidity
-}  // namespace esphome

esphome/components/absolute_humidity/sensor.py

@@ -1,56 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor
-from esphome.const import (
-    CONF_HUMIDITY,
-    CONF_TEMPERATURE,
-    STATE_CLASS_MEASUREMENT,
-    CONF_EQUATION,
-    ICON_WATER,
-    UNIT_GRAMS_PER_CUBIC_METER,
-)
-
-absolute_humidity_ns = cg.esphome_ns.namespace("absolute_humidity")
-AbsoluteHumidityComponent = absolute_humidity_ns.class_(
-    "AbsoluteHumidityComponent", sensor.Sensor, cg.Component
-)
-
-SaturationVaporPressureEquation = absolute_humidity_ns.enum(
-    "SaturationVaporPressureEquation"
-)
-EQUATION = {
-    "BUCK": SaturationVaporPressureEquation.BUCK,
-    "TETENS": SaturationVaporPressureEquation.TETENS,
-    "WOBUS": SaturationVaporPressureEquation.WOBUS,
-}
-
-CONFIG_SCHEMA = (
-    sensor.sensor_schema(
-        unit_of_measurement=UNIT_GRAMS_PER_CUBIC_METER,
-        icon=ICON_WATER,
-        accuracy_decimals=2,
-        state_class=STATE_CLASS_MEASUREMENT,
-    )
-    .extend(
-        {
-            cv.GenerateID(): cv.declare_id(AbsoluteHumidityComponent),
-            cv.Required(CONF_TEMPERATURE): cv.use_id(sensor.Sensor),
-            cv.Required(CONF_HUMIDITY): cv.use_id(sensor.Sensor),
-            cv.Optional(CONF_EQUATION, default="WOBUS"): cv.enum(EQUATION, upper=True),
-        }
-    )
-    .extend(cv.COMPONENT_SCHEMA)
-)
-
-
-async def to_code(config):
-    var = await sensor.new_sensor(config)
-    await cg.register_component(var, config)
-
-    temperature_sensor = await cg.get_variable(config[CONF_TEMPERATURE])
-    cg.add(var.set_temperature_sensor(temperature_sensor))
-
-    humidity_sensor = await cg.get_variable(config[CONF_HUMIDITY])
-    cg.add(var.set_humidity_sensor(humidity_sensor))
-
-    cg.add(var.set_equation(config[CONF_EQUATION]))

esphome/components/ac_dimmer/ac_dimmer.cpp

@@ -52,10 +52,10 @@ uint32_t IRAM_ATTR HOT AcDimmerDataStore::timer_intr(uint32_t now) {
     this->gate_pin.digital_write(false);
   }
 
-  if (time_since_zc < this->enable_time_us) {
+  if (time_since_zc < this->enable_time_us)
     // Next event is enable, return time until that event
     return this->enable_time_us - time_since_zc;
-  } else if (time_since_zc < disable_time_us) {
+  else if (time_since_zc < disable_time_us) {
     // Next event is disable, return time until that event
     return this->disable_time_us - time_since_zc;
   }
@@ -74,10 +74,9 @@ uint32_t IRAM_ATTR HOT timer_interrupt() {
   uint32_t min_dt_us = 1000;
   uint32_t now = micros();
   for (auto *dimmer : all_dimmers) {
-    if (dimmer == nullptr) {
+    if (dimmer == nullptr)
       // no more dimmers
       break;
-    }
     uint32_t res = dimmer->timer_intr(now);
     if (res != 0 && res < min_dt_us)
       min_dt_us = res;
@@ -122,7 +121,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 +201,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_;
@@ -215,13 +212,12 @@ void AcDimmer::dump_config() {
   LOG_PIN("  Zero-Cross Pin: ", this->zero_cross_pin_);
   ESP_LOGCONFIG(TAG, "   Min Power: %.1f%%", this->store_.min_power / 10.0f);
   ESP_LOGCONFIG(TAG, "   Init with half cycle: %s", YESNO(this->init_with_half_cycle_));
-  if (method_ == DIM_METHOD_LEADING_PULSE) {
+  if (method_ == DIM_METHOD_LEADING_PULSE)
     ESP_LOGCONFIG(TAG, "   Method: leading pulse");
-  } else if (method_ == DIM_METHOD_LEADING) {
+  else if (method_ == DIM_METHOD_LEADING)
     ESP_LOGCONFIG(TAG, "   Method: leading");
-  } else {
+  else
     ESP_LOGCONFIG(TAG, "   Method: trailing");
-  }
 
   LOG_FLOAT_OUTPUT(this);
   ESP_LOGV(TAG, "  Estimated Frequency: %.3fHz", 1e6f / this->store_.cycle_time_us / 2);

esphome/components/adalight/adalight_light_effect.h

@@ -13,6 +13,7 @@ class AdalightLightEffect : public light::AddressableLightEffect, public uart::U
  public:
   AdalightLightEffect(const std::string &name);
 
+ public:
   void start() override;
   void stop() override;
   void apply(light::AddressableLight &it, const Color &current_color) override;
@@ -29,6 +30,7 @@ class AdalightLightEffect : public light::AddressableLightEffect, public uart::U
   void blank_all_leds_(light::AddressableLight &it);
   Frame parse_frame_(light::AddressableLight &it);
 
+ protected:
   uint32_t last_ack_{0};
   uint32_t last_byte_{0};
   uint32_t last_reset_{0};

esphome/components/adc/adc_sensor.cpp

@@ -11,50 +11,26 @@ 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
-#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
 
 #ifdef USE_ESP32
-  adc1_config_width(ADC_WIDTH_MAX_SOC_BITS);
+  adc1_config_width(ADC_WIDTH_BIT_12);
   if (!autorange_) {
     adc1_config_channel_atten(channel_, attenuation_);
   }
 
   // load characteristics for each attenuation
   for (int i = 0; i < (int) ADC_ATTEN_MAX; i++) {
-    auto cal_value = esp_adc_cal_characterize(ADC_UNIT_1, (adc_atten_t) i, ADC_WIDTH_MAX_SOC_BITS,
+    auto cal_value = esp_adc_cal_characterize(ADC_UNIT_1, (adc_atten_t) i, ADC_WIDTH_BIT_12,
                                               1100,  // default vref
                                               &cal_characteristics_[i]);
     switch (cal_value) {
@@ -70,17 +46,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() {
@@ -95,34 +65,26 @@ void ADCSensor::dump_config() {
 
 #ifdef USE_ESP32
   LOG_PIN("  Pin: ", pin_);
-  if (autorange_) {
+  if (autorange_)
     ESP_LOGCONFIG(TAG, " Attenuation: auto");
-  } else {
+  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 +123,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 +148,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,38 +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(ADC128S102Sensor)
-    .extend(
-        {
-            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.cpp

@@ -9,7 +9,7 @@ static const char *const TAG = "ads1115";
 static const uint8_t ADS1115_REGISTER_CONVERSION = 0x00;
 static const uint8_t ADS1115_REGISTER_CONFIG = 0x01;
 
-static const uint8_t ADS1115_DATA_RATE_860_SPS = 0b111;  // 3300_SPS for ADS1015
+static const uint8_t ADS1115_DATA_RATE_860_SPS = 0b111;
 
 void ADS1115Component::setup() {
   ESP_LOGCONFIG(TAG, "Setting up ADS1115...");
@@ -18,9 +18,6 @@ void ADS1115Component::setup() {
     this->mark_failed();
     return;
   }
-
-  ESP_LOGCONFIG(TAG, "Configuring ADS1115...");
-
   uint16_t config = 0;
   // Clear single-shot bit
   //        0b0xxxxxxxxxxxxxxx
@@ -80,7 +77,6 @@ void ADS1115Component::dump_config() {
     LOG_SENSOR("  ", "Sensor", sensor);
     ESP_LOGCONFIG(TAG, "    Multiplexer: %u", sensor->get_multiplexer());
     ESP_LOGCONFIG(TAG, "    Gain: %u", sensor->get_gain());
-    ESP_LOGCONFIG(TAG, "    Resolution: %u", sensor->get_resolution());
   }
 }
 float ADS1115Component::request_measurement(ADS1115Sensor *sensor) {
@@ -131,45 +127,27 @@ float ADS1115Component::request_measurement(ADS1115Sensor *sensor) {
     this->status_set_warning();
     return NAN;
   }
-
-  if (sensor->get_resolution() == ADS1015_12_BITS) {
-    bool negative = (raw_conversion >> 15) == 1;
-
-    // shift raw_conversion as it's only 12-bits, left justified
-    raw_conversion = raw_conversion >> (16 - ADS1015_12_BITS);
-
-    // check if number was negative in order to keep the sign
-    if (negative) {
-      // the number was negative
-      // 1) set the negative bit back
-      raw_conversion |= 0x8000;
-      // 2) reset the former (shifted) negative bit
-      raw_conversion &= 0xF7FF;
-    }
-  }
-
   auto signed_conversion = static_cast<int16_t>(raw_conversion);
 
   float millivolts;
-  float divider = (sensor->get_resolution() == ADS1115_16_BITS) ? 32768.0f : 2048.0f;
   switch (sensor->get_gain()) {
     case ADS1115_GAIN_6P144:
-      millivolts = (signed_conversion * 6144) / divider;
+      millivolts = signed_conversion * 0.187500f;
       break;
     case ADS1115_GAIN_4P096:
-      millivolts = (signed_conversion * 4096) / divider;
+      millivolts = signed_conversion * 0.125000f;
       break;
     case ADS1115_GAIN_2P048:
-      millivolts = (signed_conversion * 2048) / divider;
+      millivolts = signed_conversion * 0.062500f;
       break;
     case ADS1115_GAIN_1P024:
-      millivolts = (signed_conversion * 1024) / divider;
+      millivolts = signed_conversion * 0.031250f;
       break;
     case ADS1115_GAIN_0P512:
-      millivolts = (signed_conversion * 512) / divider;
+      millivolts = signed_conversion * 0.015625f;
       break;
     case ADS1115_GAIN_0P256:
-      millivolts = (signed_conversion * 256) / divider;
+      millivolts = signed_conversion * 0.007813f;
       break;
     default:
       millivolts = NAN;

esphome/components/ads1115/ads1115.h

@@ -5,8 +5,6 @@
 #include "esphome/components/i2c/i2c.h"
 #include "esphome/components/voltage_sampler/voltage_sampler.h"
 
-#include <vector>
-
 namespace esphome {
 namespace ads1115 {
 
@@ -30,11 +28,6 @@ enum ADS1115Gain {
   ADS1115_GAIN_0P256 = 0b101,
 };
 
-enum ADS1115Resolution {
-  ADS1115_16_BITS = 16,
-  ADS1015_12_BITS = 12,
-};
-
 class ADS1115Sensor;
 
 class ADS1115Component : public Component, public i2c::I2CDevice {
@@ -63,17 +56,15 @@ class ADS1115Sensor : public sensor::Sensor, public PollingComponent, public vol
   void update() override;
   void set_multiplexer(ADS1115Multiplexer multiplexer) { multiplexer_ = multiplexer; }
   void set_gain(ADS1115Gain gain) { gain_ = gain; }
-  void set_resolution(ADS1115Resolution resolution) { resolution_ = resolution; }
+
   float sample() override;
   uint8_t get_multiplexer() const { return multiplexer_; }
   uint8_t get_gain() const { return gain_; }
-  uint8_t get_resolution() const { return resolution_; }
 
  protected:
   ADS1115Component *parent_;
   ADS1115Multiplexer multiplexer_;
   ADS1115Gain gain_;
-  ADS1115Resolution resolution_;
 };
 
 }  // namespace ads1115

esphome/components/ads1115/sensor.py

@@ -4,7 +4,6 @@ from esphome.components import sensor, voltage_sampler
 from esphome.const import (
     CONF_GAIN,
     CONF_MULTIPLEXER,
-    CONF_RESOLUTION,
     DEVICE_CLASS_VOLTAGE,
     STATE_CLASS_MEASUREMENT,
     UNIT_VOLT,
@@ -36,12 +35,6 @@ GAIN = {
     "0.256": ADS1115Gain.ADS1115_GAIN_0P256,
 }
 
-ADS1115Resolution = ads1115_ns.enum("ADS1115Resolution")
-RESOLUTION = {
-    "16_BITS": ADS1115Resolution.ADS1115_16_BITS,
-    "12_BITS": ADS1115Resolution.ADS1015_12_BITS,
-}
-
 
 def validate_gain(value):
     if isinstance(value, float):
@@ -59,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,
@@ -67,12 +59,10 @@ 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,
-            cv.Optional(CONF_RESOLUTION, default="16_BITS"): cv.enum(
-                RESOLUTION, upper=True, space="_"
-            ),
         }
     )
     .extend(cv.polling_component_schema("60s"))
@@ -87,6 +77,5 @@ async def to_code(config):
 
     cg.add(var.set_multiplexer(config[CONF_MULTIPLEXER]))
     cg.add(var.set_gain(config[CONF_GAIN]))
-    cg.add(var.set_resolution(config[CONF_RESOLUTION]))
 
     cg.add(paren.register_sensor(var))

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

@@ -24,7 +24,7 @@ void AirthingsWaveMini::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt
 
     case ESP_GATTC_SEARCH_CMPL_EVT: {
       this->handle_ = 0;
-      auto *chr = this->parent()->get_characteristic(service_uuid_, sensors_data_characteristic_uuid_);
+      auto chr = this->parent()->get_characteristic(service_uuid_, sensors_data_characteristic_uuid_);
       if (chr == nullptr) {
         ESP_LOGW(TAG, "No sensor characteristic found at service %s char %s", service_uuid_.to_string().c_str(),
                  sensors_data_characteristic_uuid_.to_string().c_str());
@@ -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);
@@ -56,7 +56,7 @@ void AirthingsWaveMini::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt
 }
 
 void AirthingsWaveMini::read_sensors_(uint8_t *raw_value, uint16_t value_len) {
-  auto *value = (WaveMiniReadings *) raw_value;
+  auto value = (WaveMiniReadings *) raw_value;
 
   if (sizeof(WaveMiniReadings) <= value_len) {
     this->humidity_sensor_->publish_state(value->humidity / 100.0f);
@@ -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

@@ -24,7 +24,7 @@ void AirthingsWavePlus::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt
 
     case ESP_GATTC_SEARCH_CMPL_EVT: {
       this->handle_ = 0;
-      auto *chr = this->parent()->get_characteristic(service_uuid_, sensors_data_characteristic_uuid_);
+      auto chr = this->parent()->get_characteristic(service_uuid_, sensors_data_characteristic_uuid_);
       if (chr == nullptr) {
         ESP_LOGW(TAG, "No sensor characteristic found at service %s char %s", service_uuid_.to_string().c_str(),
                  sensors_data_characteristic_uuid_.to_string().c_str());
@@ -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);
@@ -56,7 +56,7 @@ void AirthingsWavePlus::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt
 }
 
 void AirthingsWavePlus::read_sensors_(uint8_t *raw_value, uint16_t value_len) {
-  auto *value = (WavePlusReadings *) raw_value;
+  auto value = (WavePlusReadings *) raw_value;
 
   if (sizeof(WavePlusReadings) <= value_len) {
     ESP_LOGD(TAG, "version = %d", value->version);
@@ -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,31 @@
 //  - 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 +96,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

@@ -39,7 +39,7 @@ void Am43::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_i
       break;
     }
     case ESP_GATTC_SEARCH_CMPL_EVT: {
-      auto *chr = this->parent_->get_characteristic(AM43_SERVICE_UUID, AM43_CHARACTERISTIC_UUID);
+      auto chr = this->parent_->get_characteristic(AM43_SERVICE_UUID, AM43_CHARACTERISTIC_UUID);
       if (chr == nullptr) {
         if (this->parent_->get_characteristic(AM43_TUYA_SERVICE_UUID, AM43_TUYA_CHARACTERISTIC_UUID) != nullptr) {
           ESP_LOGE(TAG, "[%s] Detected a Tuya AM43 which is not supported, sorry.",
@@ -75,14 +75,13 @@ 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);
-          if (status) {
+          auto packet = this->encoder_->get_light_level_request();
+          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);
-          }
         }
         this->current_sensor_ = 0;
       }
@@ -100,13 +99,12 @@ void Am43::update() {
   }
   if (this->current_sensor_ == 0) {
     if (this->battery_ != nullptr) {
-      auto *packet = this->encoder_->get_battery_level_request();
+      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/__init__.py

@@ -5,7 +5,7 @@ from esphome.const import CONF_ID, CONF_PIN
 
 CODEOWNERS = ["@buxtronix"]
 DEPENDENCIES = ["ble_client"]
-AUTO_LOAD = ["am43", "sensor"]
+AUTO_LOAD = ["am43"]
 
 CONF_INVERT_POSITION = "invert_position"
 

esphome/components/am43/cover/am43_cover.cpp

@@ -25,16 +25,15 @@ void Am43Component::setup() {
 
 void Am43Component::loop() {
   if (this->node_state == espbt::ClientState::ESTABLISHED && !this->logged_in_) {
-    auto *packet = this->encoder_->get_send_pin_request(this->pin_);
+    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) {
+    if (status)
       ESP_LOGW(TAG, "[%s] Error writing set_pin to device, error = %d", this->get_name().c_str(), status);
-    } else {
+    else
       this->logged_in_ = true;
-    }
   }
 }
 
@@ -52,26 +51,24 @@ void Am43Component::control(const CoverCall &call) {
     return;
   }
   if (call.get_stop()) {
-    auto *packet = this->encoder_->get_stop_request();
+    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();
 
     if (this->invert_position_)
       pos = 1 - pos;
-    auto *packet = this->encoder_->get_set_position_request(100 - (uint8_t) (pos * 100));
+    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);
-    }
   }
 }
 
@@ -83,7 +80,7 @@ void Am43Component::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
       break;
     }
     case ESP_GATTC_SEARCH_CMPL_EVT: {
-      auto *chr = this->parent_->get_characteristic(AM43_SERVICE_UUID, AM43_CHARACTERISTIC_UUID);
+      auto chr = this->parent_->get_characteristic(AM43_SERVICE_UUID, AM43_CHARACTERISTIC_UUID);
       if (chr == nullptr) {
         if (this->parent_->get_characteristic(AM43_TUYA_SERVICE_UUID, AM43_TUYA_CHARACTERISTIC_UUID) != nullptr) {
           ESP_LOGE(TAG, "[%s] Detected a Tuya AM43 which is not supported, sorry.", this->get_name().c_str());
@@ -94,8 +91,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);
       }
@@ -124,25 +120,22 @@ void Am43Component::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
       if (this->decoder_->has_pin_response()) {
         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 packet = this->encoder_->get_position_request();
+          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,50 +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(AnalogThresholdBinarySensor)
-    .extend(
-        {
-            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(
     {
@@ -92,30 +92,7 @@ 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] in ["BINARY", "TRANSPARENT_BINARY"]:
+    elif config[CONF_TYPE] == "BINARY":
         width8 = ((width + 7) // 8) * 8
         data = [0 for _ in range((height * width8 // 8) * frames)]
         for frameIndex in range(frames):

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 pkt = this->codec_->get_set_target_temp_request(*call.get_target_temperature());
+    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);
-    }
   }
 }
 
@@ -61,7 +57,7 @@ void Anova::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_
       break;
     }
     case ESP_GATTC_SEARCH_CMPL_EVT: {
-      auto *chr = this->parent_->get_characteristic(ANOVA_SERVICE_UUID, ANOVA_CHARACTERISTIC_UUID);
+      auto chr = this->parent_->get_characteristic(ANOVA_SERVICE_UUID, ANOVA_CHARACTERISTIC_UUID);
       if (chr == nullptr) {
         ESP_LOGW(TAG, "[%s] No control service found at device, not an Anova..?", this->get_name().c_str());
         ESP_LOGW(TAG, "[%s] Note, this component does not currently support Anova Nano.", this->get_name().c_str());
@@ -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,12 +112,11 @@ 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);
-          if (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);
-          }
         }
       }
       break;
@@ -139,15 +133,13 @@ void Anova::update() {
     return;
 
   if (this->current_request_ < 2) {
-    auto *pkt = this->codec_->get_read_device_status_request();
+    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/anova/anova.h

@@ -36,7 +36,7 @@ class Anova : public climate::Climate, public esphome::ble_client::BLEClientNode
     traits.set_visual_temperature_step(0.1);
     return traits;
   }
-  void set_unit_of_measurement(const char *unit);
+  void set_unit_of_measurement(const char *);
 
  protected:
   std::unique_ptr<AnovaCodec> codec_;

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