Merge pull request #4992 from esphome/bump-2023.6.1

2023.6.1

.clang-tidy

@@ -5,12 +5,9 @@ Checks: >-
   -altera-*,
   -android-*,
   -boost-*,
-  -bugprone-easily-swappable-parameters,
-  -bugprone-implicit-widening-of-multiplication-result,
   -bugprone-narrowing-conversions,
   -bugprone-signed-char-misuse,
   -cert-dcl50-cpp,
-  -cert-err33-c,
   -cert-err58-cpp,
   -cert-oop57-cpp,
   -cert-str34-c,
@@ -18,7 +15,6 @@ Checks: >-
   -clang-analyzer-osx.*,
   -clang-diagnostic-delete-abstract-non-virtual-dtor,
   -clang-diagnostic-delete-non-abstract-non-virtual-dtor,
-  -clang-diagnostic-ignored-optimization-argument,
   -clang-diagnostic-shadow-field,
   -clang-diagnostic-unused-const-variable,
   -clang-diagnostic-unused-parameter,
@@ -29,7 +25,6 @@ Checks: >-
   -cppcoreguidelines-macro-usage,
   -cppcoreguidelines-narrowing-conversions,
   -cppcoreguidelines-non-private-member-variables-in-classes,
-  -cppcoreguidelines-prefer-member-initializer,
   -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
   -cppcoreguidelines-pro-bounds-constant-array-index,
   -cppcoreguidelines-pro-bounds-pointer-arithmetic,
@@ -41,7 +36,6 @@ Checks: >-
   -cppcoreguidelines-pro-type-union-access,
   -cppcoreguidelines-pro-type-vararg,
   -cppcoreguidelines-special-member-functions,
-  -cppcoreguidelines-virtual-class-destructor,
   -fuchsia-multiple-inheritance,
   -fuchsia-overloaded-operator,
   -fuchsia-statically-constructed-objects,
@@ -74,7 +68,6 @@ Checks: >-
   -modernize-use-nodiscard,
   -mpi-*,
   -objc-*,
-  -readability-container-data-pointer,
   -readability-convert-member-functions-to-static,
   -readability-else-after-return,
   -readability-function-cognitive-complexity,
@@ -89,6 +82,8 @@ WarningsAsErrors: '*'
 AnalyzeTemporaryDtors: false
 FormatStyle:     google
 CheckOptions:
+  - key:             google-readability-braces-around-statements.ShortStatementLines
+    value:           '1'
   - key:             google-readability-function-size.StatementThreshold
     value:           '800'
   - key:             google-runtime-int.TypeSuffix
@@ -163,9 +158,3 @@ CheckOptions:
     value:           ''
   - key:             readability-qualified-auto.AddConstToQualified
     value:           0
-  - key:             readability-identifier-length.MinimumVariableNameLength
-    value:           0
-  - key:             readability-identifier-length.MinimumParameterNameLength
-    value:           0
-  - key:             readability-identifier-length.MinimumLoopCounterNameLength
-    value:           0

.devcontainer/devcontainer.json

@@ -1,13 +1,17 @@
 {
   "name": "ESPHome Dev",
   "image": "ghcr.io/esphome/esphome-lint:dev",
-  "postCreateCommand": ["script/devcontainer-post-create"],
+  "postCreateCommand": [
+    "script/devcontainer-post-create"
+  ],
   "containerEnv": {
-    "DEVCONTAINER": "1",
-    "PIP_BREAK_SYSTEM_PACKAGES": "1",
-    "PIP_ROOT_USER_ACTION": "ignore"
+    "DEVCONTAINER": "1"
   },
-  "runArgs": ["--privileged", "-e", "ESPHOME_DASHBOARD_USE_PING=1"],
+  "runArgs": [
+    "--privileged",
+    "-e",
+    "ESPHOME_DASHBOARD_USE_PING=1"
+  ],
   "appPort": 6052,
   "customizations": {
     "vscode": {
@@ -20,7 +24,7 @@
         // cpp
         "ms-vscode.cpptools",
         // editorconfig
-        "editorconfig.editorconfig"
+        "editorconfig.editorconfig",
       ],
       "settings": {
         "python.languageServer": "Pylance",

.github/PULL_REQUEST_TEMPLATE.md

@@ -19,8 +19,6 @@
 - [ ] ESP32 IDF
 - [ ] ESP8266
 - [ ] RP2040
-- [ ] BK72xx
-- [ ] RTL87xx
 
 ## Example entry for `config.yaml`:
 <!--

.github/actions/restore-python/action.yml

@@ -1,38 +0,0 @@
-name: Restore Python
-inputs:
-  python-version:
-    description: Python version to restore
-    required: true
-    type: string
-  cache-key:
-    description: Cache key to use
-    required: true
-    type: string
-outputs:
-  python-version:
-    description: Python version restored
-    value: ${{ steps.python.outputs.python-version }}
-runs:
-  using: "composite"
-  steps:
-    - name: Set up Python ${{ inputs.python-version }}
-      id: python
-      uses: actions/setup-python@v4.7.0
-      with:
-        python-version: ${{ inputs.python-version }}
-    - name: Restore Python virtual environment
-      id: cache-venv
-      uses: actions/cache/restore@v3.3.2
-      with:
-        path: venv
-        # yamllint disable-line rule:line-length
-        key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{ inputs.cache-key }}
-    - name: Create Python virtual environment
-      if: steps.cache-venv.outputs.cache-hit != 'true'
-      shell: bash
-      run: |
-        python -m venv venv
-        . venv/bin/activate
-        python --version
-        pip install -r requirements.txt -r requirements_optional.txt -r requirements_test.txt
-        pip install -e .

.github/workflows/ci-docker.yml

@@ -8,7 +8,7 @@ on:
     branches: [dev, beta, release]
     paths:
       - "docker/**"
-      - ".github/workflows/ci-docker.yml"
+      - ".github/workflows/**"
       - "requirements*.txt"
       - "platformio.ini"
       - "script/platformio_install_deps.py"
@@ -16,7 +16,7 @@ on:
   pull_request:
     paths:
       - "docker/**"
-      - ".github/workflows/ci-docker.yml"
+      - ".github/workflows/**"
       - "requirements*.txt"
       - "platformio.ini"
       - "script/platformio_install_deps.py"
@@ -40,15 +40,15 @@ jobs:
         arch: [amd64, armv7, aarch64]
         build_type: ["ha-addon", "docker", "lint"]
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v4.7.1
+        uses: actions/setup-python@v4
         with:
           python-version: "3.9"
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
+        uses: docker/setup-buildx-action@v2
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
+        uses: docker/setup-qemu-action@v2
 
       - name: Set TAG
         run: |

.github/workflows/ci.yml

@@ -7,10 +7,6 @@ on:
     branches: [dev, beta, release]
 
   pull_request:
-    paths:
-      - "**"
-      - "!.github/workflows/*.yml"
-      - ".github/workflows/ci.yml"
   merge_group:
 
 permissions:
@@ -30,26 +26,20 @@ jobs:
   common:
     name: Create common environment
     runs-on: ubuntu-latest
-    outputs:
-      cache-key: ${{ steps.cache-key.outputs.key }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
-      - name: Generate cache-key
-        id: cache-key
-        run: echo key="${{ hashFiles('requirements.txt', 'requirements_optional.txt', 'requirements_test.txt') }}" >> $GITHUB_OUTPUT
+        uses: actions/checkout@v3.5.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        id: python
-        uses: actions/setup-python@v4.7.1
+        uses: actions/setup-python@v4.6.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.3.2
+        uses: actions/cache@v3.3.1
         with:
           path: venv
           # yamllint disable-line rule:line-length
-          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{ steps.cache-key.outputs.key }}
+          key: ${{ runner.os }}-${{ env.DEFAULT_PYTHON }}-venv-${{ hashFiles('requirements.txt', 'requirements_optional.txt', 'requirements_test.txt') }}
       - name: Create Python virtual environment
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
@@ -59,6 +49,15 @@ jobs:
           pip install -r requirements.txt -r requirements_optional.txt -r requirements_test.txt
           pip install -e .
 
+  yamllint:
+    name: yamllint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v3.5.2
+      - name: Run yamllint
+        uses: frenck/action-yamllint@v1.4.1
+
   black:
     name: Check black
     runs-on: ubuntu-latest
@@ -66,12 +65,13 @@ jobs:
       - common
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
+        uses: actions/checkout@v3.5.2
+      - name: Restore Python virtual environment
+        uses: actions/cache/restore@v3.3.1
         with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
+          path: venv
+          # yamllint disable-line rule:line-length
+          key: ${{ runner.os }}-${{ env.DEFAULT_PYTHON }}-venv-${{ hashFiles('requirements.txt', 'requirements_optional.txt', 'requirements_test.txt') }}
       - name: Run black
         run: |
           . venv/bin/activate
@@ -87,12 +87,13 @@ jobs:
       - common
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
+        uses: actions/checkout@v3.5.2
+      - name: Restore Python virtual environment
+        uses: actions/cache/restore@v3.3.1
         with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
+          path: venv
+          # yamllint disable-line rule:line-length
+          key: ${{ runner.os }}-${{ env.DEFAULT_PYTHON }}-venv-${{ hashFiles('requirements.txt', 'requirements_optional.txt', 'requirements_test.txt') }}
       - name: Run flake8
         run: |
           . venv/bin/activate
@@ -108,12 +109,13 @@ jobs:
       - common
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
+        uses: actions/checkout@v3.5.2
+      - name: Restore Python virtual environment
+        uses: actions/cache/restore@v3.3.1
         with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
+          path: venv
+          # yamllint disable-line rule:line-length
+          key: ${{ runner.os }}-${{ env.DEFAULT_PYTHON }}-venv-${{ hashFiles('requirements.txt', 'requirements_optional.txt', 'requirements_test.txt') }}
       - name: Run pylint
         run: |
           . venv/bin/activate
@@ -129,12 +131,13 @@ jobs:
       - common
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
+        uses: actions/checkout@v3.5.2
+      - name: Restore Python virtual environment
+        uses: actions/cache/restore@v3.3.1
         with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
+          path: venv
+          # yamllint disable-line rule:line-length
+          key: ${{ runner.os }}-${{ env.DEFAULT_PYTHON }}-venv-${{ hashFiles('requirements.txt', 'requirements_optional.txt', 'requirements_test.txt') }}
       - name: Run pyupgrade
         run: |
           . venv/bin/activate
@@ -150,12 +153,13 @@ jobs:
       - common
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
+        uses: actions/checkout@v3.5.2
+      - name: Restore Python virtual environment
+        uses: actions/cache/restore@v3.3.1
         with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
+          path: venv
+          # yamllint disable-line rule:line-length
+          key: ${{ runner.os }}-${{ env.DEFAULT_PYTHON }}-venv-${{ hashFiles('requirements.txt', 'requirements_optional.txt', 'requirements_test.txt') }}
       - name: Register matcher
         run: echo "::add-matcher::.github/workflows/matchers/ci-custom.json"
       - name: Run script/ci-custom
@@ -171,12 +175,13 @@ jobs:
       - common
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
+        uses: actions/checkout@v3.5.2
+      - name: Restore Python virtual environment
+        uses: actions/cache/restore@v3.3.1
         with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
+          path: venv
+          # yamllint disable-line rule:line-length
+          key: ${{ runner.os }}-${{ env.DEFAULT_PYTHON }}-venv-${{ hashFiles('requirements.txt', 'requirements_optional.txt', 'requirements_test.txt') }}
       - name: Register matcher
         run: echo "::add-matcher::.github/workflows/matchers/pytest.json"
       - name: Run pytest
@@ -191,12 +196,13 @@ jobs:
       - common
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
+        uses: actions/checkout@v3.5.2
+      - name: Restore Python virtual environment
+        uses: actions/cache/restore@v3.3.1
         with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
+          path: venv
+          # yamllint disable-line rule:line-length
+          key: ${{ runner.os }}-${{ env.DEFAULT_PYTHON }}-venv-${{ hashFiles('requirements.txt', 'requirements_optional.txt', 'requirements_test.txt') }}
       - name: Install clang-format
         run: |
           . venv/bin/activate
@@ -210,40 +216,6 @@ jobs:
         run: script/ci-suggest-changes
         if: always()
 
-  compile-tests-list:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
-      - name: Find all YAML test files
-        id: set-matrix
-        run: echo "matrix=$(ls tests/test*.yaml | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
-
-  validate-tests:
-    name: Validate YAML test ${{ matrix.file }}
-    runs-on: ubuntu-latest
-    needs:
-      - common
-      - compile-tests-list
-    strategy:
-      fail-fast: false
-      matrix:
-        file: ${{ fromJson(needs.compile-tests-list.outputs.matrix) }}
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-      - name: Run esphome config ${{ matrix.file }}
-        run: |
-          . venv/bin/activate
-          esphome config ${{ matrix.file }}
-
   compile-tests:
     name: Run YAML test ${{ matrix.file }}
     runs-on: ubuntu-latest
@@ -256,25 +228,31 @@ jobs:
       - pylint
       - pytest
       - pyupgrade
-      - compile-tests-list
-      - validate-tests
+      - yamllint
     strategy:
       fail-fast: false
       max-parallel: 2
       matrix:
-        file: ${{ fromJson(needs.compile-tests-list.outputs.matrix) }}
+        file: [1, 2, 3, 3.1, 4, 5, 6, 7, 8]
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
+        uses: actions/checkout@v3.5.2
+      - name: Restore Python virtual environment
+        uses: actions/cache/restore@v3.3.1
         with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-      - name: Run esphome compile ${{ matrix.file }}
+          path: venv
+          # yamllint disable-line rule:line-length
+          key: ${{ runner.os }}-${{ env.DEFAULT_PYTHON }}-venv-${{ hashFiles('requirements.txt', 'requirements_optional.txt', 'requirements_test.txt') }}
+      - name: Cache platformio
+        uses: actions/cache@v3.3.1
+        with:
+          path: ~/.platformio
+          # yamllint disable-line rule:line-length
+          key: platformio-test${{ matrix.file }}-${{ hashFiles('platformio.ini') }}
+      - name: Run esphome compile tests/test${{ matrix.file }}.yaml
         run: |
           . venv/bin/activate
-          esphome compile ${{ matrix.file }}
+          esphome compile tests/test${{ matrix.file }}.yaml
 
   clang-tidy:
     name: ${{ matrix.name }}
@@ -288,6 +266,7 @@ jobs:
       - pylint
       - pytest
       - pyupgrade
+      - yamllint
     strategy:
       fail-fast: false
       max-parallel: 2
@@ -320,21 +299,23 @@ jobs:
 
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
+        uses: actions/checkout@v3.5.2
+      - name: Restore Python virtual environment
+        uses: actions/cache/restore@v3.3.1
         with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
+          path: venv
+          # yamllint disable-line rule:line-length
+          key: ${{ runner.os }}-${{ env.DEFAULT_PYTHON }}-venv-${{ hashFiles('requirements.txt', 'requirements_optional.txt', 'requirements_test.txt') }}
+        # Use per check platformio cache because checks use different parts
       - name: Cache platformio
-        uses: actions/cache@v3.3.2
+        uses: actions/cache@v3.3.1
         with:
           path: ~/.platformio
           # yamllint disable-line rule:line-length
           key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}
 
       - name: Install clang-tidy
-        run: sudo apt-get install clang-tidy-14
+        run: sudo apt-get install clang-tidy-11
 
       - name: Register problem matchers
         run: |
@@ -366,6 +347,7 @@ jobs:
       - pylint
       - pytest
       - pyupgrade
+      - yamllint
       - compile-tests
       - clang-tidy
     if: always()

.github/workflows/lock.yml

@@ -18,7 +18,7 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v4.0.1
+      - uses: dessant/lock-threads@v4
         with:
           pr-inactive-days: "1"
           pr-lock-reason: ""

.github/workflows/needs-docs.yml

@@ -1,24 +0,0 @@
-name: Needs Docs
-
-on:
-  pull_request:
-    types: [labeled, unlabeled]
-
-jobs:
-  check:
-    name: Check
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check for needs-docs label
-        uses: actions/github-script@v6.4.1
-        with:
-          script: |
-            const { data: labels } = await github.rest.issues.listLabelsOnIssue({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number
-            });
-            const needsDocs = labels.find(label => label.name === 'needs-docs');
-            if (needsDocs) {
-              core.setFailed('Pull request needs docs');
-            }

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
     outputs:
       tag: ${{ steps.tag.outputs.tag }}
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v3
       - name: Get tag
         id: tag
         # yamllint disable rule:line-length
@@ -43,9 +43,9 @@ jobs:
     if: github.repository == 'esphome/esphome' && github.event_name == 'release'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v4.7.1
+        uses: actions/setup-python@v4
         with:
           python-version: "3.x"
       - name: Set up python environment
@@ -88,24 +88,24 @@ jobs:
             target: "lint"
             baseimg: "docker"
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v4.7.1
+        uses: actions/setup-python@v4
         with:
           python-version: "3.9"
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
+        uses: docker/setup-buildx-action@v2
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
+        uses: docker/setup-qemu-action@v2
 
       - name: Log in to docker hub
-        uses: docker/login-action@v3.0.0
+        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@v3.0.0
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -119,7 +119,7 @@ jobs:
             --suffix "${{ matrix.image.suffix }}"
 
       - name: Build and push
-        uses: docker/build-push-action@v5.0.0
+        uses: docker/build-push-action@v4
         with:
           context: .
           file: ./docker/Dockerfile
@@ -141,7 +141,7 @@ jobs:
     needs: [deploy-docker]
     steps:
       - name: Trigger Workflow
-        uses: actions/github-script@v6.4.1
+        uses: actions/github-script@v6
         with:
           github-token: ${{ secrets.DEPLOY_HA_ADDON_REPO_TOKEN }}
           script: |

.github/workflows/stale.yml

@@ -18,7 +18,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8.0.0
+      - uses: actions/stale@v8
         with:
           days-before-pr-stale: 90
           days-before-pr-close: 7
@@ -38,7 +38,7 @@ jobs:
   close-issues:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8.0.0
+      - uses: actions/stale@v8
         with:
           days-before-pr-stale: -1
           days-before-pr-close: -1

.github/workflows/sync-device-classes.yml

@@ -4,25 +4,28 @@ name: Synchronise Device Classes from Home Assistant
 on:
   workflow_dispatch:
   schedule:
-    - cron: "45 6 * * *"
+    - cron: '45 6 * * *'
+
+permissions:
+  contents: write
+  pull-requests: write
 
 jobs:
   sync:
     name: Sync Device Classes
     runs-on: ubuntu-latest
-    if: github.repository == 'esphome/esphome'
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v3
 
       - name: Checkout Home Assistant
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v3
         with:
           repository: home-assistant/core
           path: lib/home-assistant
 
       - name: Setup Python
-        uses: actions/setup-python@v4.7.1
+        uses: actions/setup-python@v4
         with:
           python-version: 3.11
 
@@ -35,8 +38,17 @@ jobs:
         run: |
           python ./script/sync-device_class.py
 
+      - name: Get PR template
+        id: pr-template-body
+        run: |
+          body=$(cat .github/PULL_REQUEST_TEMPLATE.md)
+          delimiter="$(openssl rand -hex 8)"
+          echo "body<<$delimiter" >> $GITHUB_OUTPUT
+          echo "$body" >> $GITHUB_OUTPUT
+          echo "$delimiter" >> $GITHUB_OUTPUT
+
       - name: Commit changes
-        uses: peter-evans/create-pull-request@v5.0.2
+        uses: peter-evans/create-pull-request@v5
         with:
           commit-message: "Synchronise Device Classes from Home Assistant"
           committer: esphomebot <esphome@nabucasa.com>
@@ -44,5 +56,5 @@ jobs:
           branch: sync/device-classes
           delete-branch: true
           title: "Synchronise Device Classes from Home Assistant"
-          body-path: .github/PULL_REQUEST_TEMPLATE.md
+          body: ${{ steps.pr-template-body.outputs.body }}
           token: ${{ secrets.DEVICE_CLASS_SYNC_TOKEN }}

.github/workflows/yaml-lint.yml

@@ -1,22 +0,0 @@
-name: YAML lint
-
-on:
-  push:
-    branches: [dev, beta, release]
-    paths:
-      - "**.yaml"
-      - "**.yml"
-  pull_request:
-    paths:
-      - "**.yaml"
-      - "**.yml"
-
-jobs:
-  yamllint:
-    name: yamllint
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
-      - name: Run yamllint
-        uses: frenck/action-yamllint@v1.4.1

.gitignore

@@ -13,12 +13,6 @@ __pycache__/
 # Intellij Idea
 .idea
 
-# Eclipse
-.project
-.cproject
-.pydevproject
-.settings/
-
 # Vim
 *.swp
 
@@ -135,6 +129,4 @@ tests/.esphome/
 sdkconfig.*
 !sdkconfig.defaults
 
-.tests/
-
-/components
+.tests/

.pre-commit-config.yaml

@@ -2,8 +2,8 @@
 # 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-pre-commit-mirror
-    rev: 23.10.1
+  - repo: https://github.com/psf/black
+    rev: 23.3.0
     hooks:
       - id: black
         args:
@@ -11,7 +11,7 @@ repos:
           - --quiet
         files: ^((esphome|script|tests)/.+)?[^/]+\.py$
   - repo: https://github.com/PyCQA/flake8
-    rev: 6.1.0
+    rev: 6.0.0
     hooks:
       - id: flake8
         additional_dependencies:
@@ -27,7 +27,7 @@ repos:
           - --branch=release
           - --branch=beta
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
+    rev: v3.4.0
     hooks:
       - id: pyupgrade
         args: [--py39-plus]

CODEOWNERS

@@ -11,21 +11,16 @@ esphome/*.py @esphome/core
 esphome/core/* @esphome/core
 
 # Integrations
-esphome/components/a01nyub/* @MrSuicideParrot
 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/ade7953/* @angelnu
-esphome/components/ade7953_i2c/* @angelnu
-esphome/components/ade7953_spi/* @angelnu
 esphome/components/airthings_ble/* @jeromelaban
-esphome/components/airthings_wave_base/* @jeromelaban @kpfleming @ncareau
+esphome/components/airthings_wave_base/* @jeromelaban @ncareau
 esphome/components/airthings_wave_mini/* @ncareau
 esphome/components/airthings_wave_plus/* @jeromelaban
 esphome/components/alarm_control_panel/* @grahambrown11
-esphome/components/alpha3/* @jan-hofmeier
 esphome/components/am43/* @buxtronix
 esphome/components/am43/cover/* @buxtronix
 esphome/components/am43/sensor/* @buxtronix
@@ -36,7 +31,6 @@ esphome/components/api/* @OttoWinter
 esphome/components/as7341/* @mrgnr
 esphome/components/async_tcp/* @OttoWinter
 esphome/components/atc_mithermometer/* @ahpohl
-esphome/components/atm90e26/* @danieltwagner
 esphome/components/b_parasite/* @rbaron
 esphome/components/ballu/* @bazuchan
 esphome/components/bang_bang/* @OttoWinter
@@ -45,21 +39,18 @@ esphome/components/bedjet/climate/* @jhansche
 esphome/components/bedjet/fan/* @jhansche
 esphome/components/bh1750/* @OttoWinter
 esphome/components/binary_sensor/* @esphome/core
-esphome/components/bk72xx/* @kuba2k2
 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/bmi160/* @flaviut
 esphome/components/bmp3xx/* @martgras
-esphome/components/bmp581/* @kahrendt
 esphome/components/bp1658cj/* @Cossid
 esphome/components/bp5758d/* @Cossid
 esphome/components/button/* @esphome/core
 esphome/components/canbus/* @danielschramm @mvturnho
-esphome/components/cap1188/* @mreditor97
+esphome/components/cap1188/* @MrEditor97
 esphome/components/captive_portal/* @OttoWinter
 esphome/components/ccs811/* @habbie
 esphome/components/cd74hc4067/* @asoehlke
@@ -80,21 +71,18 @@ esphome/components/dashboard_import/* @esphome/core
 esphome/components/debug/* @OttoWinter
 esphome/components/delonghi/* @grob6000
 esphome/components/dfplayer/* @glmnet
-esphome/components/dfrobot_sen0395/* @niklasweber
 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/duty_time/* @dudanov
 esphome/components/ee895/* @Stock-M
 esphome/components/ektf2232/* @jesserockz
-esphome/components/emc2101/* @ellull
 esphome/components/ens210/* @itn3rd77
 esphome/components/esp32/* @esphome/core
-esphome/components/esp32_ble/* @Rapsssito @jesserockz
+esphome/components/esp32_ble/* @jesserockz
 esphome/components/esp32_ble_client/* @jesserockz
-esphome/components/esp32_ble_server/* @Rapsssito @clydebarrow @jesserockz
+esphome/components/esp32_ble_server/* @jesserockz
 esphome/components/esp32_camera_web_server/* @ayufan
 esphome/components/esp32_can/* @Sympatron
 esphome/components/esp32_improv/* @jesserockz
@@ -109,16 +97,13 @@ esphome/components/fastled_base/* @OttoWinter
 esphome/components/feedback/* @ianchi
 esphome/components/fingerprint_grow/* @OnFreund @loongyh
 esphome/components/fs3000/* @kahrendt
-esphome/components/gcja5/* @gcormier
 esphome/components/globals/* @esphome/core
 esphome/components/gp8403/* @jesserockz
 esphome/components/gpio/* @esphome/core
 esphome/components/gps/* @coogle
 esphome/components/graph/* @synco
-esphome/components/gree/* @orestismers
-esphome/components/grove_tb6612fng/* @max246
 esphome/components/growatt_solar/* @leeuwte
-esphome/components/haier/* @paveldn
+esphome/components/haier/* @Yarikx
 esphome/components/havells_solar/* @sourabhjaiswal
 esphome/components/hbridge/fan/* @WeekendWarrior
 esphome/components/hbridge/light/* @DotNetDann
@@ -127,7 +112,6 @@ esphome/components/hitachi_ac424/* @sourabhjaiswal
 esphome/components/hm3301/* @freekode
 esphome/components/homeassistant/* @OttoWinter
 esphome/components/honeywellabp/* @RubyBailey
-esphome/components/honeywellabp2_i2c/* @jpfaff
 esphome/components/host/* @esphome/core
 esphome/components/hrxl_maxsonar_wr/* @netmikey
 esphome/components/hte501/* @Stock-M
@@ -138,11 +122,10 @@ esphome/components/i2s_audio/* @jesserockz
 esphome/components/i2s_audio/media_player/* @jesserockz
 esphome/components/i2s_audio/microphone/* @jesserockz
 esphome/components/i2s_audio/speaker/* @jesserockz
-esphome/components/iaqcore/* @yozik04
-esphome/components/ili9xxx/* @clydebarrow @nielsnl68
+esphome/components/ili9xxx/* @nielsnl68
 esphome/components/improv_base/* @esphome/core
 esphome/components/improv_serial/* @esphome/core
-esphome/components/ina260/* @mreditor97
+esphome/components/ina260/* @MrEditor97
 esphome/components/inkbird_ibsth1_mini/* @fkirill
 esphome/components/inkplate6/* @jesserockz
 esphome/components/integration/* @OttoWinter
@@ -154,13 +137,9 @@ esphome/components/key_collector/* @ssieb
 esphome/components/key_provider/* @ssieb
 esphome/components/kuntze/* @ssieb
 esphome/components/lcd_menu/* @numo68
-esphome/components/ld2410/* @regevbr @sebcaps
-esphome/components/ld2420/* @descipher
+esphome/components/ld2410/* @sebcaps
 esphome/components/ledc/* @OttoWinter
-esphome/components/libretiny/* @kuba2k2
-esphome/components/libretiny_pwm/* @kuba2k2
 esphome/components/light/* @esphome/core
-esphome/components/lightwaverf/* @max246
 esphome/components/lilygo_t5_47/touchscreen/* @jesserockz
 esphome/components/lock/* @esphome/core
 esphome/components/logger/* @esphome/core
@@ -182,12 +161,11 @@ esphome/components/mcp2515/* @danielschramm @mvturnho
 esphome/components/mcp3204/* @rsumner
 esphome/components/mcp4728/* @berfenger
 esphome/components/mcp47a1/* @jesserockz
-esphome/components/mcp9600/* @mreditor97
+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/micronova/* @jorre05
 esphome/components/microphone/* @jesserockz
 esphome/components/mics_4514/* @jesserockz
 esphome/components/midea/* @dudanov
@@ -196,7 +174,6 @@ esphome/components/mitsubishi/* @RubyBailey
 esphome/components/mlx90393/* @functionpointer
 esphome/components/mlx90614/* @jesserockz
 esphome/components/mmc5603/* @benhoff
-esphome/components/mmc5983/* @agoode
 esphome/components/modbus_controller/* @martgras
 esphome/components/modbus_controller/binary_sensor/* @martgras
 esphome/components/modbus_controller/number/* @martgras
@@ -217,43 +194,37 @@ esphome/components/nextion/sensor/* @senexcrenshaw
 esphome/components/nextion/switch/* @senexcrenshaw
 esphome/components/nextion/text_sensor/* @senexcrenshaw
 esphome/components/nfc/* @jesserockz
-esphome/components/noblex/* @AGalfra
 esphome/components/number/* @esphome/core
 esphome/components/ota/* @esphome/core
 esphome/components/output/* @esphome/core
 esphome/components/pca6416a/* @Mat931
-esphome/components/pca9554/* @clydebarrow @hwstar
+esphome/components/pca9554/* @hwstar
 esphome/components/pcf85063/* @brogon
-esphome/components/pcf8563/* @KoenBreeman
 esphome/components/pid/* @OttoWinter
 esphome/components/pipsolar/* @andreashergert1984
 esphome/components/pm1006/* @habbie
 esphome/components/pmsa003i/* @sjtrny
-esphome/components/pmwcs3/* @SeByDocKy
 esphome/components/pn532/* @OttoWinter @jesserockz
 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/* @TrentHouliston @cstaahl @stevebaxter
+esphome/components/pulse_meter/* @cstaahl @stevebaxter
 esphome/components/pvvx_mithermometer/* @pasiz
 esphome/components/qmp6988/* @andrewpc
 esphome/components/qr_code/* @wjtje
-esphome/components/qwiic_pir/* @kahrendt
 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/resistance_sampler/* @jesserockz
 esphome/components/restart/* @esphome/core
 esphome/components/rf_bridge/* @jesserockz
 esphome/components/rgbct/* @jesserockz
 esphome/components/rp2040/* @jesserockz
 esphome/components/rp2040_pio_led_strip/* @Papa-DMan
 esphome/components/rp2040_pwm/* @jesserockz
-esphome/components/rtl87xx/* @kuba2k2
 esphome/components/rtttl/* @glmnet
 esphome/components/safe_mode/* @jsuanet @paulmonigatti
 esphome/components/scd4x/* @martgras @sjtrny
@@ -262,12 +233,10 @@ esphome/components/sdm_meter/* @jesserockz @polyfaces
 esphome/components/sdp3x/* @Azimath
 esphome/components/selec_meter/* @sourabhjaiswal
 esphome/components/select/* @esphome/core
-esphome/components/sen0321/* @notjj
 esphome/components/sen21231/* @shreyaskarnik
 esphome/components/sen5x/* @martgras
 esphome/components/sensirion_common/* @martgras
 esphome/components/sensor/* @esphome/core
-esphome/components/sfa30/* @ghsensdev
 esphome/components/sgp40/* @SenexCrenshaw
 esphome/components/sgp4x/* @SenexCrenshaw @martgras
 esphome/components/shelly_dimmer/* @edge90 @rnauber
@@ -285,9 +254,7 @@ esphome/components/sn74hc165/* @jesserockz
 esphome/components/socket/* @esphome/core
 esphome/components/sonoff_d1/* @anatoly-savchenkov
 esphome/components/speaker/* @jesserockz
-esphome/components/spi/* @clydebarrow @esphome/core
-esphome/components/spi_device/* @clydebarrow
-esphome/components/spi_led_strip/* @clydebarrow
+esphome/components/spi/* @esphome/core
 esphome/components/sprinkler/* @kbx81
 esphome/components/sps30/* @martgras
 esphome/components/ssd1322_base/* @kbx81
@@ -313,7 +280,6 @@ esphome/components/tcl112/* @glmnet
 esphome/components/tee501/* @Stock-M
 esphome/components/teleinfo/* @0hax
 esphome/components/template/alarm_control_panel/* @grahambrown11
-esphome/components/text/* @mauritskorse
 esphome/components/thermostat/* @kbx81
 esphome/components/time/* @OttoWinter
 esphome/components/tlc5947/* @rnauber
@@ -328,7 +294,6 @@ esphome/components/tof10120/* @wstrzalka
 esphome/components/toshiba/* @kbx81
 esphome/components/touchscreen/* @jesserockz
 esphome/components/tsl2591/* @wjcarpenter
-esphome/components/tt21100/* @kroimon
 esphome/components/tuya/binary_sensor/* @jesserockz
 esphome/components/tuya/climate/* @jesserockz
 esphome/components/tuya/number/* @frankiboy1
@@ -337,7 +302,6 @@ esphome/components/tuya/sensor/* @jesserockz
 esphome/components/tuya/switch/* @jesserockz
 esphome/components/tuya/text_sensor/* @dentra
 esphome/components/uart/* @esphome/core
-esphome/components/uart/button/* @ssieb
 esphome/components/ufire_ec/* @pvizeli
 esphome/components/ufire_ise/* @pvizeli
 esphome/components/ultrasonic/* @OttoWinter
@@ -346,19 +310,13 @@ esphome/components/version/* @esphome/core
 esphome/components/voice_assistant/* @jesserockz
 esphome/components/wake_on_lan/* @willwill2will54
 esphome/components/web_server_base/* @OttoWinter
-esphome/components/web_server_idf/* @dentra
 esphome/components/whirlpool/* @glmnet
 esphome/components/whynter/* @aeonsablaze
 esphome/components/wiegand/* @ssieb
-esphome/components/wireguard/* @droscy @lhoracek @thomas0bernard
 esphome/components/wl_134/* @hobbypunk90
 esphome/components/x9c/* @EtienneMD
-esphome/components/xgzp68xx/* @gcormier
 esphome/components/xiaomi_lywsd03mmc/* @ahpohl
 esphome/components/xiaomi_mhoc303/* @drug123
 esphome/components/xiaomi_mhoc401/* @vevsvevs
 esphome/components/xiaomi_rtcgq02lm/* @jesserockz
-esphome/components/xl9535/* @mreditor97
 esphome/components/xpt2046/* @nielsnl68 @numo68
-esphome/components/zhlt01/* @cfeenstra1024
-esphome/components/zio_ultrasonic/* @kahrendt

docker/Dockerfile

@@ -5,54 +5,33 @@
 # One of "docker", "hassio"
 ARG BASEIMGTYPE=docker
 
-
 # https://github.com/hassio-addons/addon-debian-base/releases
-FROM ghcr.io/hassio-addons/debian-base:7.2.0 AS base-hassio
-# https://hub.docker.com/_/debian?tab=tags&page=1&name=bookworm
-FROM debian:12.2-slim AS base-docker
+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 base-${BASEIMGTYPE} AS base
 
-
 ARG TARGETARCH
 ARG TARGETVARIANT
 
-
-# Note that --break-system-packages is used below because
-# https://peps.python.org/pep-0668/ added a safety check that prevents
-# installing packages with the same name as a system package. This is
-# not a problem for us because we are not concerned about overwriting
-# system packages because we are running in an isolated container.
-
 RUN \
     apt-get update \
     # Use pinned versions so that we get updates with build caching
     && apt-get install -y --no-install-recommends \
-        python3-pip=23.0.1+dfsg-1 \
-        python3-setuptools=66.1.1-1 \
-        python3-venv=3.11.2-1+b1 \
-        python3-wheel=0.38.4-2 \
-        iputils-ping=3:20221126-1 \
-        git=1:2.39.2-1.1 \
-        curl=7.88.1-10+deb12u4 \
-        openssh-client=1:9.2p1-2+deb12u1 \
-        python3-cffi=1.15.1-5 \
-        libcairo2=1.16.0-7 \
-        patch=2.7.6-7; \
-    if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
-        apt-get install -y --no-install-recommends \
-          build-essential=12.9 \
-          python3-dev=3.11.2-1+b1 \
-          zlib1g-dev=1:1.2.13.dfsg-1 \
-          libjpeg-dev=1:2.1.5-2 \
-          libfreetype-dev=2.12.1+dfsg-5 \
-          libssl-dev=3.0.11-1~deb12u2 \
-          libffi-dev=3.4.4-1 \
-          cargo=0.66.0+ds1-1 \
-          pkg-config=1.8.1-1 \
-          gcc-arm-linux-gnueabihf=4:12.2.0-3; \
-    fi; \
-    rm -rf \
+        python3=3.9.2-3 \
+        python3-pip=20.3.4-4+deb11u1 \
+        python3-setuptools=52.0.0-4 \
+        python3-pil=8.1.2+dfsg-0.3+deb11u1 \
+        python3-cryptography=3.3.2-1 \
+        python3-venv=3.9.2-3 \
+        iputils-ping=3:20210202-1 \
+        git=1:2.30.2-1+deb11u2 \
+        curl=7.74.0-1.3+deb11u7 \
+        openssh-client=1:8.4p1-5+deb11u1 \
+        libcairo2=1.16.0-5 \
+        python3-cffi=1.14.5-1 \
+    && rm -rf \
         /tmp/* \
         /var/{cache,log}/* \
         /var/lib/apt/lists/*
@@ -73,12 +52,9 @@ RUN \
 
 RUN \
     # Ubuntu python3-pip is missing wheel
-    if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
-        export PIP_EXTRA_INDEX_URL="https://www.piwheels.org/simple"; \
-    fi; \
-    pip3 install \
-    --break-system-packages --no-cache-dir \
-    platformio==6.1.11 \
+    pip3 install --no-cache-dir \
+        wheel==0.37.1 \
+        platformio==6.1.7 \
     # Change some platformio settings
     && platformio settings set enable_telemetry No \
     && platformio settings set check_platformio_interval 1000000 \
@@ -86,15 +62,9 @@ RUN \
 
 
 # First install requirements to leverage caching when requirements don't change
-# tmpfs is for https://github.com/rust-lang/cargo/issues/8719
-
 COPY requirements.txt requirements_optional.txt script/platformio_install_deps.py platformio.ini /
-RUN --mount=type=tmpfs,target=/root/.cargo if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
-        export PIP_EXTRA_INDEX_URL="https://www.piwheels.org/simple"; \
-    fi; \
-    CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse CARGO_HOME=/root/.cargo \
-    pip3 install \
-    --break-system-packages --no-cache-dir -r /requirements.txt -r /requirements_optional.txt \
+RUN \
+    pip3 install --no-cache-dir -r /requirements.txt -r /requirements_optional.txt \
     && /platformio_install_deps.py /platformio.ini --libraries
 
 
@@ -103,11 +73,7 @@ FROM base AS docker
 
 # Copy esphome and install
 COPY . /esphome
-RUN if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
-        export PIP_EXTRA_INDEX_URL="https://www.piwheels.org/simple"; \
-  fi; \
-  pip3 install \
-  --break-system-packages --no-cache-dir --no-use-pep517 -e /esphome
+RUN pip3 install --no-cache-dir --no-use-pep517 -e /esphome
 
 # Settings for dashboard
 ENV USERNAME="" PASSWORD=""
@@ -115,10 +81,6 @@ ENV USERNAME="" PASSWORD=""
 # Expose the dashboard to Docker
 EXPOSE 6052
 
-# Run healthcheck (heartbeat)
-HEALTHCHECK --interval=30s --timeout=30s \
-  CMD curl --fail http://localhost:6052/version -A "HealthCheck" || exit 1
-
 COPY docker/docker_entrypoint.sh /entrypoint.sh
 
 # The directory the user should mount their configuration files to
@@ -140,7 +102,7 @@ RUN \
     apt-get update \
     # Use pinned versions so that we get updates with build caching
     && apt-get install -y --no-install-recommends \
-        nginx-light=1.22.1-9 \
+        nginx-light=1.18.0-6.1+deb11u3 \
     && rm -rf \
         /tmp/* \
         /var/{cache,log}/* \
@@ -153,11 +115,7 @@ COPY docker/ha-addon-rootfs/ /
 
 # Copy esphome and install
 COPY . /esphome
-RUN if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
-        export PIP_EXTRA_INDEX_URL="https://www.piwheels.org/simple"; \
-  fi; \
-  pip3 install \
-  --break-system-packages --no-cache-dir --no-use-pep517 -e /esphome
+RUN pip3 install --no-cache-dir --no-use-pep517 -e /esphome
 
 # Labels
 LABEL \
@@ -180,24 +138,20 @@ 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-11+b2 \
-        clang-tidy-14=1:14.0.6-12 \
+        clang-format-13=1:13.0.1-6~deb11u1 \
+        clang-tidy-11=1:11.0.1-2 \
         patch=2.7.6-7 \
-        software-properties-common=0.99.30-4 \
-        nano=7.2-1 \
+        software-properties-common=0.96.20.2-2.1 \
+        nano=5.4-2+deb11u2 \
         build-essential=12.9 \
-        python3-dev=3.11.2-1+b1 \
+        python3-dev=3.9.2-3 \
     && rm -rf \
         /tmp/* \
         /var/{cache,log}/* \
         /var/lib/apt/lists/*
 
 COPY requirements_test.txt /
-RUN if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
-        export PIP_EXTRA_INDEX_URL="https://www.piwheels.org/simple"; \
-  fi; \
-  pip3 install \
-  --break-system-packages --no-cache-dir -r /requirements_test.txt
+RUN pip3 install --no-cache-dir -r /requirements_test.txt
 
 VOLUME ["/esphome"]
 WORKDIR /esphome

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

@@ -35,23 +35,11 @@ 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
+        export ESPHOME_DEFAULT_COMPILE_PROCESS_LIMIT=1;
     fi
 fi
 
 mkdir -p "${pio_cache_base}"
 
-mkdir -p /config/esphome
-
-if bashio::fs.directory_exists '/config/esphome/.esphome'; then
-    bashio::log.info "Migrating old .esphome directory..."
-    if bashio::fs.file_exists '/config/esphome/.esphome/esphome.json'; then
-        mv /config/esphome/.esphome/esphome.json /data/esphome.json
-    fi
-    mkdir -p "/data/storage"
-    mv /config/esphome/.esphome/*.json /data/storage/ || true
-    rm -rf /config/esphome/.esphome
-fi
-
 bashio::log.info "Starting ESPHome dashboard..."
 exec esphome dashboard /config/esphome --socket /var/run/esphome.sock --ha-addon

esphome/__main__.py

@@ -1,4 +1,3 @@
-# PYTHON_ARGCOMPLETE_OK
 import argparse
 import functools
 import logging
@@ -8,8 +7,6 @@ import sys
 import time
 from datetime import datetime
 
-import argcomplete
-
 from esphome import const, writer, yaml_util
 import esphome.codegen as cg
 from esphome.config import iter_components, read_config, strip_default_ids
@@ -29,15 +26,13 @@ from esphome.const import (
     CONF_ESPHOME,
     CONF_PLATFORMIO_OPTIONS,
     CONF_SUBSTITUTIONS,
-    PLATFORM_BK72XX,
-    PLATFORM_RTL87XX,
     PLATFORM_ESP32,
     PLATFORM_ESP8266,
     PLATFORM_RP2040,
     SECRETS_FILES,
 )
 from esphome.core import CORE, EsphomeError, coroutine
-from esphome.helpers import indent, is_ip_address
+from esphome.helpers import indent
 from esphome.util import (
     run_external_command,
     run_external_process,
@@ -88,8 +83,6 @@ def choose_upload_log_host(
     options = []
     for port in get_serial_ports():
         options.append((f"{port.path} ({port.description})", port.path))
-    if default == "SERIAL":
-        return choose_prompt(options, purpose=purpose)
     if (show_ota and "ota" in CORE.config) or (show_api and "api" in CORE.config):
         options.append((f"Over The Air ({CORE.address})", CORE.address))
         if default == "OTA":
@@ -223,16 +216,14 @@ def compile_program(args, config):
     return 0 if idedata is not None else 1
 
 
-def upload_using_esptool(config, port, file):
+def upload_using_esptool(config, port):
     from esphome import platformio_api
 
     first_baudrate = config[CONF_ESPHOME][CONF_PLATFORMIO_OPTIONS].get(
         "upload_speed", 460800
     )
 
-    if file is not None:
-        flash_images = [platformio_api.FlashImage(path=file, offset="0x0")]
-    else:
+    def run_esptool(baud_rate):
         idedata = platformio_api.get_idedata(config)
 
         firmware_offset = "0x10000" if CORE.is_esp32 else "0x0"
@@ -243,13 +234,12 @@ def upload_using_esptool(config, port, file):
             *idedata.extra_flash_images,
         ]
 
-    mcu = "esp8266"
-    if CORE.is_esp32:
-        from esphome.components.esp32 import get_esp32_variant
+        mcu = "esp8266"
+        if CORE.is_esp32:
+            from esphome.components.esp32 import get_esp32_variant
 
-        mcu = get_esp32_variant().lower()
+            mcu = get_esp32_variant().lower()
 
-    def run_esptool(baud_rate):
         cmd = [
             "esptool.py",
             "--before",
@@ -288,26 +278,20 @@ def upload_using_esptool(config, port, file):
     return run_esptool(115200)
 
 
-def upload_using_platformio(config, port):
-    from esphome import platformio_api
-
-    upload_args = ["-t", "upload", "-t", "nobuild"]
-    if port is not None:
-        upload_args += ["--upload-port", port]
-    return platformio_api.run_platformio_cli_run(config, CORE.verbose, *upload_args)
-
-
 def upload_program(config, args, host):
     if get_port_type(host) == "SERIAL":
         if CORE.target_platform in (PLATFORM_ESP32, PLATFORM_ESP8266):
-            file = getattr(args, "file", None)
-            return upload_using_esptool(config, host, file)
+            return upload_using_esptool(config, host)
 
         if CORE.target_platform in (PLATFORM_RP2040):
-            return upload_using_platformio(config, args.device)
+            from esphome import platformio_api
 
-        if CORE.target_platform in (PLATFORM_BK72XX, PLATFORM_RTL87XX):
-            return upload_using_platformio(config, host)
+            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
 
@@ -324,10 +308,8 @@ def upload_program(config, args, host):
     password = ota_conf.get(CONF_PASSWORD, "")
 
     if (
-        not is_ip_address(CORE.address)
-        and (get_port_type(host) == "MQTT" or config[CONF_MDNS][CONF_DISABLED])
-        and CONF_MQTT in config
-    ):
+        get_port_type(host) == "MQTT" or config[CONF_MDNS][CONF_DISABLED]
+    ) and CONF_MQTT in config:
         from esphome import mqtt
 
         host = mqtt.get_esphome_device_ip(
@@ -381,16 +363,10 @@ def command_wizard(args):
 
 
 def command_config(args, config):
+    _LOGGER.info("Configuration is valid!")
     if not CORE.verbose:
         config = strip_default_ids(config)
-    output = yaml_util.dump(config, args.show_secrets)
-    # add the console decoration so the front-end can hide the secrets
-    if not args.show_secrets:
-        output = re.sub(
-            r"(password|key|psk|ssid)\: (.+)", r"\1: \\033[5m\2\\033[6m", output
-        )
-    safe_print(output)
-    _LOGGER.info("Configuration is valid!")
+    safe_print(yaml_util.dump(config, args.show_secrets))
     return 0
 
 
@@ -969,7 +945,6 @@ def parse_args(argv):
     # Finally, run the new-style parser again with the possibly swapped arguments,
     # and let it error out if the command is unparsable.
     parser.set_defaults(deprecated_argv_suggestion=deprecated_argv_suggestion)
-    argcomplete.autocomplete(parser)
     return parser.parse_args(arguments)
 
 

esphome/automation.py

@@ -11,7 +11,6 @@ from esphome.const import (
     CONF_TRIGGER_ID,
     CONF_TYPE_ID,
     CONF_TIME,
-    CONF_UPDATE_INTERVAL,
 )
 from esphome.schema_extractors import SCHEMA_EXTRACT, schema_extractor
 from esphome.util import Registry
@@ -70,8 +69,6 @@ WhileAction = cg.esphome_ns.class_("WhileAction", Action)
 RepeatAction = cg.esphome_ns.class_("RepeatAction", Action)
 WaitUntilAction = cg.esphome_ns.class_("WaitUntilAction", Action, cg.Component)
 UpdateComponentAction = cg.esphome_ns.class_("UpdateComponentAction", Action)
-SuspendComponentAction = cg.esphome_ns.class_("SuspendComponentAction", Action)
-ResumeComponentAction = cg.esphome_ns.class_("ResumeComponentAction", Action)
 Automation = cg.esphome_ns.class_("Automation")
 
 LambdaCondition = cg.esphome_ns.class_("LambdaCondition", Condition)
@@ -141,7 +138,6 @@ AUTOMATION_SCHEMA = cv.Schema(
 AndCondition = cg.esphome_ns.class_("AndCondition", Condition)
 OrCondition = cg.esphome_ns.class_("OrCondition", Condition)
 NotCondition = cg.esphome_ns.class_("NotCondition", Condition)
-XorCondition = cg.esphome_ns.class_("XorCondition", Condition)
 
 
 @register_condition("and", AndCondition, validate_condition_list)
@@ -162,12 +158,6 @@ async def not_condition_to_code(config, condition_id, template_arg, args):
     return cg.new_Pvariable(condition_id, template_arg, condition)
 
 
-@register_condition("xor", XorCondition, validate_condition_list)
-async def xor_condition_to_code(config, condition_id, template_arg, args):
-    conditions = await build_condition_list(config, template_arg, args)
-    return cg.new_Pvariable(condition_id, template_arg, conditions)
-
-
 @register_condition("lambda", LambdaCondition, cv.returning_lambda)
 async def lambda_condition_to_code(config, condition_id, template_arg, args):
     lambda_ = await cg.process_lambda(config, args, return_type=bool)
@@ -313,41 +303,6 @@ async def component_update_action_to_code(config, action_id, template_arg, args)
     return cg.new_Pvariable(action_id, template_arg, comp)
 
 
-@register_action(
-    "component.suspend",
-    SuspendComponentAction,
-    maybe_simple_id(
-        {
-            cv.Required(CONF_ID): cv.use_id(cg.PollingComponent),
-        }
-    ),
-)
-async def component_suspend_action_to_code(config, action_id, template_arg, args):
-    comp = await cg.get_variable(config[CONF_ID])
-    return cg.new_Pvariable(action_id, template_arg, comp)
-
-
-@register_action(
-    "component.resume",
-    ResumeComponentAction,
-    maybe_simple_id(
-        {
-            cv.Required(CONF_ID): cv.use_id(cg.PollingComponent),
-            cv.Optional(CONF_UPDATE_INTERVAL): cv.templatable(
-                cv.positive_time_period_milliseconds
-            ),
-        }
-    ),
-)
-async def component_resume_action_to_code(config, action_id, template_arg, args):
-    comp = await cg.get_variable(config[CONF_ID])
-    var = cg.new_Pvariable(action_id, template_arg, comp)
-    if CONF_UPDATE_INTERVAL in config:
-        template_ = await cg.templatable(config[CONF_UPDATE_INTERVAL], args, int)
-        cg.add(var.set_update_interval(template_))
-    return var
-
-
 async def build_action(full_config, template_arg, args):
     registry_entry, config = cg.extract_registry_entry_config(
         ACTION_REGISTRY, full_config

esphome/components/a01nyub/__init__.py

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

esphome/components/a01nyub/a01nyub.cpp

@@ -1,57 +0,0 @@
-// Datasheet https://wiki.dfrobot.com/A01NYUB%20Waterproof%20Ultrasonic%20Sensor%20SKU:%20SEN0313
-
-#include "a01nyub.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace a01nyub {
-
-static const char *const TAG = "a01nyub.sensor";
-static const uint8_t MAX_DATA_LENGTH_BYTES = 4;
-
-void A01nyubComponent::loop() {
-  uint8_t data;
-  while (this->available() > 0) {
-    if (this->read_byte(&data)) {
-      buffer_.push_back(data);
-      this->check_buffer_();
-    }
-  }
-}
-
-void A01nyubComponent::check_buffer_() {
-  if (this->buffer_.size() >= MAX_DATA_LENGTH_BYTES) {
-    size_t i;
-    for (i = 0; i < this->buffer_.size(); i++) {
-      // Look for the first packet
-      if (this->buffer_[i] == 0xFF) {
-        if (i + 1 + 3 < this->buffer_.size()) {  // Packet is not complete
-          return;                                // Wait for completion
-        }
-
-        uint8_t checksum = (this->buffer_[i] + this->buffer_[i + 1] + this->buffer_[i + 2]) & 0xFF;
-        if (this->buffer_[i + 3] == checksum) {
-          float distance = (this->buffer_[i + 1] << 8) + this->buffer_[i + 2];
-          if (distance > 280) {
-            float meters = distance / 1000.0;
-            ESP_LOGV(TAG, "Distance from sensor: %f mm, %f m", distance, meters);
-            this->publish_state(meters);
-          } else {
-            ESP_LOGW(TAG, "Invalid data read from sensor: %s", format_hex_pretty(this->buffer_).c_str());
-          }
-        }
-        break;
-      }
-    }
-    this->buffer_.clear();
-  }
-}
-
-void A01nyubComponent::dump_config() {
-  ESP_LOGCONFIG(TAG, "A01nyub Sensor:");
-  LOG_SENSOR("  ", "Distance", this);
-}
-
-}  // namespace a01nyub
-}  // namespace esphome

esphome/components/a01nyub/a01nyub.h

@@ -1,27 +0,0 @@
-#pragma once
-
-#include <vector>
-
-#include "esphome/core/component.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/uart/uart.h"
-
-namespace esphome {
-namespace a01nyub {
-
-class A01nyubComponent : public sensor::Sensor, public Component, public uart::UARTDevice {
- public:
-  // Nothing really public.
-
-  // ========== INTERNAL METHODS ==========
-  void loop() override;
-  void dump_config() override;
-
- protected:
-  void check_buffer_();
-
-  std::vector<uint8_t> buffer_;
-};
-
-}  // namespace a01nyub
-}  // namespace esphome

esphome/components/a01nyub/sensor.py

@@ -1,41 +0,0 @@
-import esphome.codegen as cg
-from esphome.components import sensor, uart
-from esphome.const import (
-    STATE_CLASS_MEASUREMENT,
-    UNIT_METER,
-    ICON_ARROW_EXPAND_VERTICAL,
-    DEVICE_CLASS_DISTANCE,
-)
-
-CODEOWNERS = ["@MrSuicideParrot"]
-DEPENDENCIES = ["uart"]
-
-a01nyub_ns = cg.esphome_ns.namespace("a01nyub")
-A01nyubComponent = a01nyub_ns.class_(
-    "A01nyubComponent", sensor.Sensor, cg.Component, uart.UARTDevice
-)
-
-CONFIG_SCHEMA = sensor.sensor_schema(
-    A01nyubComponent,
-    unit_of_measurement=UNIT_METER,
-    icon=ICON_ARROW_EXPAND_VERTICAL,
-    accuracy_decimals=3,
-    state_class=STATE_CLASS_MEASUREMENT,
-    device_class=DEVICE_CLASS_DISTANCE,
-).extend(uart.UART_DEVICE_SCHEMA)
-
-FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
-    "a01nyub",
-    baud_rate=9600,
-    require_tx=False,
-    require_rx=True,
-    data_bits=8,
-    parity=None,
-    stop_bits=1,
-)
-
-
-async def to_code(config):
-    var = await sensor.new_sensor(config)
-    await cg.register_component(var, config)
-    await uart.register_uart_device(var, config)

esphome/components/a4988/stepper.py

@@ -28,6 +28,6 @@ async def to_code(config):
     dir_pin = await cg.gpio_pin_expression(config[CONF_DIR_PIN])
     cg.add(var.set_dir_pin(dir_pin))
 
-    if sleep_pin_config := config.get(CONF_SLEEP_PIN):
-        sleep_pin = await cg.gpio_pin_expression(sleep_pin_config)
+    if CONF_SLEEP_PIN in config:
+        sleep_pin = await cg.gpio_pin_expression(config[CONF_SLEEP_PIN])
         cg.add(var.set_sleep_pin(sleep_pin))

esphome/components/adc/__init__.py

@@ -1,16 +1,13 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import pins
-from esphome.const import CONF_ANALOG, CONF_INPUT
+from esphome.const import CONF_INPUT
 
 from esphome.core import CORE
 from esphome.components.esp32 import get_esp32_variant
-from esphome.const import PLATFORM_ESP8266
 from esphome.components.esp32.const import (
     VARIANT_ESP32,
-    VARIANT_ESP32C2,
     VARIANT_ESP32C3,
-    VARIANT_ESP32C6,
     VARIANT_ESP32H2,
     VARIANT_ESP32S2,
     VARIANT_ESP32S3,
@@ -27,7 +24,6 @@ ATTENUATION_MODES = {
 }
 
 adc1_channel_t = cg.global_ns.enum("adc1_channel_t")
-adc2_channel_t = cg.global_ns.enum("adc2_channel_t")
 
 # From https://github.com/espressif/esp-idf/blob/master/components/driver/include/driver/adc_common.h
 # pin to adc1 channel mapping
@@ -73,22 +69,6 @@ ESP32_VARIANT_ADC1_PIN_TO_CHANNEL = {
         3: adc1_channel_t.ADC1_CHANNEL_3,
         4: adc1_channel_t.ADC1_CHANNEL_4,
     },
-    VARIANT_ESP32C2: {
-        0: adc1_channel_t.ADC1_CHANNEL_0,
-        1: adc1_channel_t.ADC1_CHANNEL_1,
-        2: adc1_channel_t.ADC1_CHANNEL_2,
-        3: adc1_channel_t.ADC1_CHANNEL_3,
-        4: adc1_channel_t.ADC1_CHANNEL_4,
-    },
-    VARIANT_ESP32C6: {
-        0: adc1_channel_t.ADC1_CHANNEL_0,
-        1: adc1_channel_t.ADC1_CHANNEL_1,
-        2: adc1_channel_t.ADC1_CHANNEL_2,
-        3: adc1_channel_t.ADC1_CHANNEL_3,
-        4: adc1_channel_t.ADC1_CHANNEL_4,
-        5: adc1_channel_t.ADC1_CHANNEL_5,
-        6: adc1_channel_t.ADC1_CHANNEL_6,
-    },
     VARIANT_ESP32H2: {
         0: adc1_channel_t.ADC1_CHANNEL_0,
         1: adc1_channel_t.ADC1_CHANNEL_1,
@@ -98,55 +78,10 @@ ESP32_VARIANT_ADC1_PIN_TO_CHANNEL = {
     },
 }
 
-ESP32_VARIANT_ADC2_PIN_TO_CHANNEL = {
-    # TODO: add other variants
-    VARIANT_ESP32: {
-        4: adc2_channel_t.ADC2_CHANNEL_0,
-        0: adc2_channel_t.ADC2_CHANNEL_1,
-        2: adc2_channel_t.ADC2_CHANNEL_2,
-        15: adc2_channel_t.ADC2_CHANNEL_3,
-        13: adc2_channel_t.ADC2_CHANNEL_4,
-        12: adc2_channel_t.ADC2_CHANNEL_5,
-        14: adc2_channel_t.ADC2_CHANNEL_6,
-        27: adc2_channel_t.ADC2_CHANNEL_7,
-        25: adc2_channel_t.ADC2_CHANNEL_8,
-        26: adc2_channel_t.ADC2_CHANNEL_9,
-    },
-    VARIANT_ESP32S2: {
-        11: adc2_channel_t.ADC2_CHANNEL_0,
-        12: adc2_channel_t.ADC2_CHANNEL_1,
-        13: adc2_channel_t.ADC2_CHANNEL_2,
-        14: adc2_channel_t.ADC2_CHANNEL_3,
-        15: adc2_channel_t.ADC2_CHANNEL_4,
-        16: adc2_channel_t.ADC2_CHANNEL_5,
-        17: adc2_channel_t.ADC2_CHANNEL_6,
-        18: adc2_channel_t.ADC2_CHANNEL_7,
-        19: adc2_channel_t.ADC2_CHANNEL_8,
-        20: adc2_channel_t.ADC2_CHANNEL_9,
-    },
-    VARIANT_ESP32S3: {
-        11: adc2_channel_t.ADC2_CHANNEL_0,
-        12: adc2_channel_t.ADC2_CHANNEL_1,
-        13: adc2_channel_t.ADC2_CHANNEL_2,
-        14: adc2_channel_t.ADC2_CHANNEL_3,
-        15: adc2_channel_t.ADC2_CHANNEL_4,
-        16: adc2_channel_t.ADC2_CHANNEL_5,
-        17: adc2_channel_t.ADC2_CHANNEL_6,
-        18: adc2_channel_t.ADC2_CHANNEL_7,
-        19: adc2_channel_t.ADC2_CHANNEL_8,
-        20: adc2_channel_t.ADC2_CHANNEL_9,
-    },
-    VARIANT_ESP32C3: {
-        5: adc2_channel_t.ADC2_CHANNEL_0,
-    },
-}
-
 
 def validate_adc_pin(value):
     if str(value).upper() == "VCC":
-        if CORE.is_rp2040:
-            return pins.internal_gpio_input_pin_schema(29)
-        return cv.only_on([PLATFORM_ESP8266])("VCC")
+        return cv.only_on_esp8266("VCC")
 
     if str(value).upper() == "TEMPERATURE":
         return cv.only_on_rp2040("TEMPERATURE")
@@ -154,27 +89,22 @@ def validate_adc_pin(value):
     if CORE.is_esp32:
         value = pins.internal_gpio_input_pin_number(value)
         variant = get_esp32_variant()
-        if (
-            variant not in ESP32_VARIANT_ADC1_PIN_TO_CHANNEL
-            and variant not in ESP32_VARIANT_ADC2_PIN_TO_CHANNEL
-        ):
+        if variant not in ESP32_VARIANT_ADC1_PIN_TO_CHANNEL:
             raise cv.Invalid(f"This ESP32 variant ({variant}) is not supported")
 
-        if (
-            value not in ESP32_VARIANT_ADC1_PIN_TO_CHANNEL[variant]
-            and value not in ESP32_VARIANT_ADC2_PIN_TO_CHANNEL[variant]
-        ):
+        if value not in ESP32_VARIANT_ADC1_PIN_TO_CHANNEL[variant]:
             raise cv.Invalid(f"{variant} doesn't support ADC on this pin")
-
         return pins.internal_gpio_input_pin_schema(value)
 
     if CORE.is_esp8266:
+        from esphome.components.esp8266.gpio import CONF_ANALOG
+
         value = pins.internal_gpio_pin_number({CONF_ANALOG: True, CONF_INPUT: True})(
             value
         )
 
         if value != 17:  # A0
-            raise cv.Invalid("ESP8266: Only pin A0 (GPIO17) supports ADC")
+            raise cv.Invalid("ESP8266: Only pin A0 (GPIO17) supports ADC.")
         return pins.gpio_pin_schema(
             {CONF_ANALOG: True, CONF_INPUT: True}, internal=True
         )(value)
@@ -182,12 +112,7 @@ def validate_adc_pin(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")
+            raise cv.Invalid("RP2040: Only pins 26, 27, 28 and 29 support ADC.")
         return pins.internal_gpio_input_pin_schema(value)
 
-    if CORE.is_libretiny:
-        return pins.gpio_pin_schema(
-            {CONF_ANALOG: True, CONF_INPUT: True}, internal=True
-        )(value)
-
     raise NotImplementedError

esphome/components/adc/adc_sensor.cpp

@@ -1,6 +1,6 @@
 #include "adc_sensor.h"
-#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
 
 #ifdef USE_ESP8266
 #ifdef USE_ADC_SENSOR_VCC
@@ -12,9 +12,6 @@ ADC_MODE(ADC_VCC)
 #endif
 
 #ifdef USE_RP2040
-#ifdef CYW43_USES_VSYS_PIN
-#include "pico/cyw43_arch.h"
-#endif
 #include <hardware/adc.h>
 #endif
 
@@ -23,15 +20,15 @@ namespace adc {
 
 static const char *const TAG = "adc";
 
-// 13-bit for S2, 12-bit for all other ESP32 variants
+// 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 int32_t SOC_ADC_RTC_MAX_BITWIDTH = 13;
+static const int SOC_ADC_RTC_MAX_BITWIDTH = 13;
 #else
-static const int32_t SOC_ADC_RTC_MAX_BITWIDTH = 12;
+static const int SOC_ADC_RTC_MAX_BITWIDTH = 12;
 #endif
 #endif
 
@@ -50,21 +47,14 @@ extern "C"
 #endif
 
 #ifdef USE_ESP32
-  if (channel1_ != ADC1_CHANNEL_MAX) {
-    adc1_config_width(ADC_WIDTH_MAX_SOC_BITS);
-    if (!autorange_) {
-      adc1_config_channel_atten(channel1_, attenuation_);
-    }
-  } else if (channel2_ != ADC2_CHANNEL_MAX) {
-    if (!autorange_) {
-      adc2_config_channel_atten(channel2_, attenuation_);
-    }
+  adc1_config_width(ADC_WIDTH_MAX_SOC_BITS);
+  if (!autorange_) {
+    adc1_config_channel_atten(channel_, attenuation_);
   }
 
   // load characteristics for each attenuation
-  for (int32_t i = 0; i <= ADC_ATTEN_DB_11; i++) {
-    auto adc_unit = channel1_ != ADC1_CHANNEL_MAX ? ADC_UNIT_1 : ADC_UNIT_2;
-    auto cal_value = esp_adc_cal_characterize(adc_unit, (adc_atten_t) i, ADC_WIDTH_MAX_SOC_BITS,
+  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,
                                               1100,  // default vref
                                               &cal_characteristics_[i]);
     switch (cal_value) {
@@ -95,13 +85,13 @@ extern "C"
 
 void ADCSensor::dump_config() {
   LOG_SENSOR("", "ADC Sensor", this);
-#if defined(USE_ESP8266) || defined(USE_LIBRETINY)
+#ifdef USE_ESP8266
 #ifdef USE_ADC_SENSOR_VCC
   ESP_LOGCONFIG(TAG, "  Pin: VCC");
 #else
   LOG_PIN("  Pin: ", pin_);
 #endif
-#endif  // USE_ESP8266 || USE_LIBRETINY
+#endif  // USE_ESP8266
 
 #ifdef USE_ESP32
   LOG_PIN("  Pin: ", pin_);
@@ -126,19 +116,13 @@ void ADCSensor::dump_config() {
     }
   }
 #endif  // USE_ESP32
-
 #ifdef USE_RP2040
   if (this->is_temperature_) {
     ESP_LOGCONFIG(TAG, "  Pin: Temperature");
   } else {
-#ifdef USE_ADC_SENSOR_VCC
-    ESP_LOGCONFIG(TAG, "  Pin: VCC");
-#else
     LOG_PIN("  Pin: ", pin_);
-#endif  // USE_ADC_SENSOR_VCC
   }
-#endif  // USE_RP2040
-
+#endif
   LOG_UPDATE_INTERVAL(this);
 }
 
@@ -152,9 +136,9 @@ void ADCSensor::update() {
 #ifdef USE_ESP8266
 float ADCSensor::sample() {
 #ifdef USE_ADC_SENSOR_VCC
-  int32_t raw = ESP.getVcc();  // NOLINT(readability-static-accessed-through-instance)
+  int raw = ESP.getVcc();  // NOLINT(readability-static-accessed-through-instance)
 #else
-  int32_t raw = analogRead(this->pin_->get_pin());  // NOLINT
+  int raw = analogRead(this->pin_->get_pin());  // NOLINT
 #endif
   if (output_raw_) {
     return raw;
@@ -166,53 +150,29 @@ float ADCSensor::sample() {
 #ifdef USE_ESP32
 float ADCSensor::sample() {
   if (!autorange_) {
-    int raw = -1;
-    if (channel1_ != ADC1_CHANNEL_MAX) {
-      raw = adc1_get_raw(channel1_);
-    } else if (channel2_ != ADC2_CHANNEL_MAX) {
-      adc2_get_raw(channel2_, ADC_WIDTH_MAX_SOC_BITS, &raw);
-    }
-
+    int raw = adc1_get_raw(channel_);
     if (raw == -1) {
       return NAN;
     }
     if (output_raw_) {
       return raw;
     }
-    uint32_t mv = esp_adc_cal_raw_to_voltage(raw, &cal_characteristics_[(int32_t) attenuation_]);
+    uint32_t mv = esp_adc_cal_raw_to_voltage(raw, &cal_characteristics_[(int) attenuation_]);
     return mv / 1000.0f;
   }
 
-  int raw11 = ADC_MAX, raw6 = ADC_MAX, raw2 = ADC_MAX, raw0 = ADC_MAX;
-
-  if (channel1_ != ADC1_CHANNEL_MAX) {
-    adc1_config_channel_atten(channel1_, ADC_ATTEN_DB_11);
-    raw11 = adc1_get_raw(channel1_);
-    if (raw11 < ADC_MAX) {
-      adc1_config_channel_atten(channel1_, ADC_ATTEN_DB_6);
-      raw6 = adc1_get_raw(channel1_);
-      if (raw6 < ADC_MAX) {
-        adc1_config_channel_atten(channel1_, ADC_ATTEN_DB_2_5);
-        raw2 = adc1_get_raw(channel1_);
-        if (raw2 < ADC_MAX) {
-          adc1_config_channel_atten(channel1_, ADC_ATTEN_DB_0);
-          raw0 = adc1_get_raw(channel1_);
-        }
-      }
-    }
-  } else if (channel2_ != ADC2_CHANNEL_MAX) {
-    adc2_config_channel_atten(channel2_, ADC_ATTEN_DB_11);
-    adc2_get_raw(channel2_, ADC_WIDTH_MAX_SOC_BITS, &raw11);
-    if (raw11 < ADC_MAX) {
-      adc2_config_channel_atten(channel2_, ADC_ATTEN_DB_6);
-      adc2_get_raw(channel2_, ADC_WIDTH_MAX_SOC_BITS, &raw6);
-      if (raw6 < ADC_MAX) {
-        adc2_config_channel_atten(channel2_, ADC_ATTEN_DB_2_5);
-        adc2_get_raw(channel2_, ADC_WIDTH_MAX_SOC_BITS, &raw2);
-        if (raw2 < ADC_MAX) {
-          adc2_config_channel_atten(channel2_, ADC_ATTEN_DB_0);
-          adc2_get_raw(channel2_, ADC_WIDTH_MAX_SOC_BITS, &raw0);
-        }
+  int raw11, raw6 = ADC_MAX, raw2 = ADC_MAX, raw0 = ADC_MAX;
+  adc1_config_channel_atten(channel_, ADC_ATTEN_DB_11);
+  raw11 = adc1_get_raw(channel_);
+  if (raw11 < ADC_MAX) {
+    adc1_config_channel_atten(channel_, ADC_ATTEN_DB_6);
+    raw6 = adc1_get_raw(channel_);
+    if (raw6 < ADC_MAX) {
+      adc1_config_channel_atten(channel_, ADC_ATTEN_DB_2_5);
+      raw2 = adc1_get_raw(channel_);
+      if (raw2 < ADC_MAX) {
+        adc1_config_channel_atten(channel_, ADC_ATTEN_DB_0);
+        raw0 = adc1_get_raw(channel_);
       }
     }
   }
@@ -221,10 +181,10 @@ float ADCSensor::sample() {
     return NAN;
   }
 
-  uint32_t mv11 = esp_adc_cal_raw_to_voltage(raw11, &cal_characteristics_[(int32_t) ADC_ATTEN_DB_11]);
-  uint32_t mv6 = esp_adc_cal_raw_to_voltage(raw6, &cal_characteristics_[(int32_t) ADC_ATTEN_DB_6]);
-  uint32_t mv2 = esp_adc_cal_raw_to_voltage(raw2, &cal_characteristics_[(int32_t) ADC_ATTEN_DB_2_5]);
-  uint32_t mv0 = esp_adc_cal_raw_to_voltage(raw0, &cal_characteristics_[(int32_t) ADC_ATTEN_DB_0]);
+  uint32_t mv11 = esp_adc_cal_raw_to_voltage(raw11, &cal_characteristics_[(int) ADC_ATTEN_DB_11]);
+  uint32_t mv6 = esp_adc_cal_raw_to_voltage(raw6, &cal_characteristics_[(int) ADC_ATTEN_DB_6]);
+  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);
@@ -246,54 +206,23 @@ float ADCSensor::sample() {
     adc_set_temp_sensor_enabled(true);
     delay(1);
     adc_select_input(4);
-
-    int32_t raw = adc_read();
-    adc_set_temp_sensor_enabled(false);
-    if (this->output_raw_) {
-      return raw;
-    }
-    return raw * 3.3f / 4096.0f;
   } else {
     uint8_t pin = this->pin_->get_pin();
-#ifdef CYW43_USES_VSYS_PIN
-    if (pin == PICO_VSYS_PIN) {
-      // Measuring VSYS on Raspberry Pico W needs to be wrapped with
-      // `cyw43_thread_enter()`/`cyw43_thread_exit()` as discussed in
-      // https://github.com/raspberrypi/pico-sdk/issues/1222, since Wifi chip and
-      // VSYS ADC both share GPIO29
-      cyw43_thread_enter();
-    }
-#endif  // CYW43_USES_VSYS_PIN
-
     adc_gpio_init(pin);
     adc_select_input(pin - 26);
-
-    int32_t raw = adc_read();
-
-#ifdef CYW43_USES_VSYS_PIN
-    if (pin == PICO_VSYS_PIN) {
-      cyw43_thread_exit();
-    }
-#endif  // CYW43_USES_VSYS_PIN
-
-    if (output_raw_) {
-      return raw;
-    }
-    float coeff = pin == PICO_VSYS_PIN ? 3.0 : 1.0;
-    return raw * 3.3f / 4096.0f * coeff;
   }
+
+  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_LIBRETINY
-float ADCSensor::sample() {
-  if (output_raw_) {
-    return analogRead(this->pin_->get_pin());  // NOLINT
-  }
-  return analogReadVoltage(this->pin_->get_pin()) / 1000.0f;  // NOLINT
-}
-#endif  // USE_LIBRETINY
-
 #ifdef USE_ESP8266
 std::string ADCSensor::unique_id() { return get_mac_address() + "-adc"; }
 #endif

esphome/components/adc/adc_sensor.h

@@ -19,23 +19,16 @@ class ADCSensor : public sensor::Sensor, public PollingComponent, public voltage
 #ifdef USE_ESP32
   /// Set the attenuation for this pin. Only available on the ESP32.
   void set_attenuation(adc_atten_t attenuation) { attenuation_ = attenuation; }
-  void set_channel1(adc1_channel_t channel) {
-    channel1_ = channel;
-    channel2_ = ADC2_CHANNEL_MAX;
-  }
-  void set_channel2(adc2_channel_t channel) {
-    channel2_ = channel;
-    channel1_ = ADC1_CHANNEL_MAX;
-  }
+  void set_channel(adc1_channel_t channel) { channel_ = channel; }
   void set_autorange(bool autorange) { autorange_ = autorange; }
 #endif
 
-  /// Update ADC values
+  /// Update adc values.
   void update() override;
-  /// Setup ADC
+  /// Setup ADc
   void setup() override;
   void dump_config() override;
-  /// `HARDWARE_LATE` setup priority
+  /// `HARDWARE_LATE` setup priority.
   float get_setup_priority() const override;
   void set_pin(InternalGPIOPin *pin) { this->pin_ = pin; }
   void set_output_raw(bool output_raw) { output_raw_ = output_raw; }
@@ -59,14 +52,9 @@ class ADCSensor : public sensor::Sensor, public PollingComponent, public voltage
 
 #ifdef USE_ESP32
   adc_atten_t attenuation_{ADC_ATTEN_DB_0};
-  adc1_channel_t channel1_{ADC1_CHANNEL_MAX};
-  adc2_channel_t channel2_{ADC2_CHANNEL_MAX};
+  adc1_channel_t channel_{};
   bool autorange_{false};
-#if ESP_IDF_VERSION_MAJOR >= 5
-  esp_adc_cal_characteristics_t cal_characteristics_[SOC_ADC_ATTEN_NUM] = {};
-#else
-  esp_adc_cal_characteristics_t cal_characteristics_[ADC_ATTEN_MAX] = {};
-#endif
+  esp_adc_cal_characteristics_t cal_characteristics_[(int) ADC_ATTEN_MAX] = {};
 #endif
 };
 

esphome/components/adc/sensor.py

@@ -1,7 +1,5 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-import esphome.final_validate as fv
-from esphome.core import CORE
 from esphome.components import sensor, voltage_sampler
 from esphome.components.esp32 import get_esp32_variant
 from esphome.const import (
@@ -10,15 +8,15 @@ from esphome.const import (
     CONF_NUMBER,
     CONF_PIN,
     CONF_RAW,
-    CONF_WIFI,
     DEVICE_CLASS_VOLTAGE,
     STATE_CLASS_MEASUREMENT,
     UNIT_VOLT,
 )
+from esphome.core import CORE
+
 from . import (
     ATTENUATION_MODES,
     ESP32_VARIANT_ADC1_PIN_TO_CHANNEL,
-    ESP32_VARIANT_ADC2_PIN_TO_CHANNEL,
     validate_adc_pin,
 )
 
@@ -27,23 +25,7 @@ AUTO_LOAD = ["voltage_sampler"]
 
 def validate_config(config):
     if config[CONF_RAW] and config.get(CONF_ATTENUATION, None) == "auto":
-        raise cv.Invalid("Automatic attenuation cannot be used when raw output is set")
-
-    return config
-
-
-def final_validate_config(config):
-    if CORE.is_esp32:
-        variant = get_esp32_variant()
-        if (
-            CONF_WIFI in fv.full_config.get()
-            and config[CONF_PIN][CONF_NUMBER]
-            in ESP32_VARIANT_ADC2_PIN_TO_CHANNEL[variant]
-        ):
-            raise cv.Invalid(
-                f"{variant} doesn't support ADC on this pin when Wi-Fi is configured"
-            )
-
+        raise cv.Invalid("Automatic attenuation cannot be used when raw output is set.")
     return config
 
 
@@ -73,8 +55,6 @@ CONFIG_SCHEMA = cv.All(
     validate_config,
 )
 
-FINAL_VALIDATE_SCHEMA = final_validate_config
-
 
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
@@ -89,26 +69,17 @@ async def to_code(config):
         pin = await cg.gpio_pin_expression(config[CONF_PIN])
         cg.add(var.set_pin(pin))
 
-    cg.add(var.set_output_raw(config[CONF_RAW]))
+    if CONF_RAW in config:
+        cg.add(var.set_output_raw(config[CONF_RAW]))
 
-    if attenuation := config.get(CONF_ATTENUATION):
-        if attenuation == "auto":
+    if CONF_ATTENUATION in config:
+        if config[CONF_ATTENUATION] == "auto":
             cg.add(var.set_autorange(cg.global_ns.true))
         else:
-            cg.add(var.set_attenuation(attenuation))
+            cg.add(var.set_attenuation(config[CONF_ATTENUATION]))
 
     if CORE.is_esp32:
         variant = get_esp32_variant()
         pin_num = config[CONF_PIN][CONF_NUMBER]
-        if (
-            variant in ESP32_VARIANT_ADC1_PIN_TO_CHANNEL
-            and pin_num in ESP32_VARIANT_ADC1_PIN_TO_CHANNEL[variant]
-        ):
-            chan = ESP32_VARIANT_ADC1_PIN_TO_CHANNEL[variant][pin_num]
-            cg.add(var.set_channel1(chan))
-        elif (
-            variant in ESP32_VARIANT_ADC2_PIN_TO_CHANNEL
-            and pin_num in ESP32_VARIANT_ADC2_PIN_TO_CHANNEL[variant]
-        ):
-            chan = ESP32_VARIANT_ADC2_PIN_TO_CHANNEL[variant][pin_num]
-            cg.add(var.set_channel2(chan))
+        chan = ESP32_VARIANT_ADC1_PIN_TO_CHANNEL[variant][pin_num]
+        cg.add(var.set_channel(chan))

esphome/components/addressable_light/display.py

@@ -48,16 +48,16 @@ async def to_code(config):
     await cg.register_component(var, config)
     await display.register_display(var, config)
 
-    if pixel_mapper := config.get(CONF_PIXEL_MAPPER):
+    if CONF_PIXEL_MAPPER in config:
         pixel_mapper_template_ = await cg.process_lambda(
-            pixel_mapper,
+            config[CONF_PIXEL_MAPPER],
             [(int, "x"), (int, "y")],
             return_type=cg.int_,
         )
         cg.add(var.set_pixel_mapper(pixel_mapper_template_))
 
-    if lambda_config := config.get(CONF_LAMBDA):
+    if CONF_LAMBDA in config:
         lambda_ = await cg.process_lambda(
-            lambda_config, [(display.DisplayRef, "it")], return_type=cg.void
+            config[CONF_LAMBDA], [(display.DisplayBufferRef, "it")], return_type=cg.void
         )
         cg.add(var.set_writer(lambda_))

esphome/components/ade7953/__init__.py

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

esphome/components/ade7953/ade7953.cpp

@@ -0,0 +1,53 @@
+#include "ade7953.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace ade7953 {
+
+static const char *const TAG = "ade7953";
+
+void ADE7953::dump_config() {
+  ESP_LOGCONFIG(TAG, "ADE7953:");
+  LOG_PIN("  IRQ Pin: ", irq_pin_);
+  LOG_I2C_DEVICE(this);
+  LOG_UPDATE_INTERVAL(this);
+  LOG_SENSOR("  ", "Voltage Sensor", this->voltage_sensor_);
+  LOG_SENSOR("  ", "Current A Sensor", this->current_a_sensor_);
+  LOG_SENSOR("  ", "Current B Sensor", this->current_b_sensor_);
+  LOG_SENSOR("  ", "Active Power A Sensor", this->active_power_a_sensor_);
+  LOG_SENSOR("  ", "Active Power B Sensor", this->active_power_b_sensor_);
+}
+
+#define ADE_PUBLISH_(name, val, factor) \
+  if (err == i2c::ERROR_OK && this->name##_sensor_) { \
+    float value = (val) / (factor); \
+    this->name##_sensor_->publish_state(value); \
+  }
+#define ADE_PUBLISH(name, val, factor) ADE_PUBLISH_(name, val, factor)
+
+void ADE7953::update() {
+  if (!this->is_setup_)
+    return;
+
+  uint32_t val;
+  i2c::ErrorCode err = ade_read_32_(0x0312, &val);
+  ADE_PUBLISH(active_power_a, (int32_t) val, 154.0f);
+  err = ade_read_32_(0x0313, &val);
+  ADE_PUBLISH(active_power_b, (int32_t) val, 154.0f);
+  err = ade_read_32_(0x031A, &val);
+  ADE_PUBLISH(current_a, (uint32_t) val, 100000.0f);
+  err = ade_read_32_(0x031B, &val);
+  ADE_PUBLISH(current_b, (uint32_t) val, 100000.0f);
+  err = ade_read_32_(0x031C, &val);
+  ADE_PUBLISH(voltage, (uint32_t) val, 26000.0f);
+
+  //    auto apparent_power_a = this->ade_read_<int32_t>(0x0310);
+  //    auto apparent_power_b = this->ade_read_<int32_t>(0x0311);
+  //    auto reactive_power_a = this->ade_read_<int32_t>(0x0314);
+  //    auto reactive_power_b = this->ade_read_<int32_t>(0x0315);
+  //    auto power_factor_a = this->ade_read_<int16_t>(0x010A);
+  //    auto power_factor_b = this->ade_read_<int16_t>(0x010B);
+}
+
+}  // namespace ade7953
+}  // namespace esphome

esphome/components/ade7953/ade7953.h

@@ -0,0 +1,97 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+#include "esphome/components/i2c/i2c.h"
+#include "esphome/components/sensor/sensor.h"
+
+#include <vector>
+
+namespace esphome {
+namespace ade7953 {
+
+class ADE7953 : public i2c::I2CDevice, public PollingComponent {
+ public:
+  void set_irq_pin(InternalGPIOPin *irq_pin) { irq_pin_ = irq_pin; }
+  void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
+  void set_current_a_sensor(sensor::Sensor *current_a_sensor) { current_a_sensor_ = current_a_sensor; }
+  void set_current_b_sensor(sensor::Sensor *current_b_sensor) { current_b_sensor_ = current_b_sensor; }
+  void set_active_power_a_sensor(sensor::Sensor *active_power_a_sensor) {
+    active_power_a_sensor_ = active_power_a_sensor;
+  }
+  void set_active_power_b_sensor(sensor::Sensor *active_power_b_sensor) {
+    active_power_b_sensor_ = active_power_b_sensor;
+  }
+
+  void setup() override {
+    if (this->irq_pin_ != nullptr) {
+      this->irq_pin_->setup();
+    }
+    this->set_timeout(100, [this]() {
+      this->ade_write_8_(0x0010, 0x04);
+      this->ade_write_8_(0x00FE, 0xAD);
+      this->ade_write_16_(0x0120, 0x0030);
+      this->is_setup_ = true;
+    });
+  }
+
+  void dump_config() override;
+
+  void update() override;
+
+ protected:
+  i2c::ErrorCode ade_write_8_(uint16_t reg, uint8_t value) {
+    std::vector<uint8_t> data;
+    data.push_back(reg >> 8);
+    data.push_back(reg >> 0);
+    data.push_back(value);
+    return write(data.data(), data.size());
+  }
+  i2c::ErrorCode ade_write_16_(uint16_t reg, uint16_t value) {
+    std::vector<uint8_t> data;
+    data.push_back(reg >> 8);
+    data.push_back(reg >> 0);
+    data.push_back(value >> 8);
+    data.push_back(value >> 0);
+    return write(data.data(), data.size());
+  }
+  i2c::ErrorCode ade_write_32_(uint16_t reg, uint32_t value) {
+    std::vector<uint8_t> data;
+    data.push_back(reg >> 8);
+    data.push_back(reg >> 0);
+    data.push_back(value >> 24);
+    data.push_back(value >> 16);
+    data.push_back(value >> 8);
+    data.push_back(value >> 0);
+    return write(data.data(), data.size());
+  }
+  i2c::ErrorCode ade_read_32_(uint16_t reg, uint32_t *value) {
+    uint8_t reg_data[2];
+    reg_data[0] = reg >> 8;
+    reg_data[1] = reg >> 0;
+    i2c::ErrorCode err = write(reg_data, 2);
+    if (err != i2c::ERROR_OK)
+      return err;
+    uint8_t recv[4];
+    err = read(recv, 4);
+    if (err != i2c::ERROR_OK)
+      return err;
+    *value = 0;
+    *value |= ((uint32_t) recv[0]) << 24;
+    *value |= ((uint32_t) recv[1]) << 16;
+    *value |= ((uint32_t) recv[2]) << 8;
+    *value |= ((uint32_t) recv[3]);
+    return i2c::ERROR_OK;
+  }
+
+  InternalGPIOPin *irq_pin_{nullptr};
+  bool is_setup_{false};
+  sensor::Sensor *voltage_sensor_{nullptr};
+  sensor::Sensor *current_a_sensor_{nullptr};
+  sensor::Sensor *current_b_sensor_{nullptr};
+  sensor::Sensor *active_power_a_sensor_{nullptr};
+  sensor::Sensor *active_power_b_sensor_{nullptr};
+};
+
+}  // namespace ade7953
+}  // namespace esphome

esphome/components/ade7953/sensor.py

@@ -1,5 +1,90 @@
+import esphome.codegen as cg
 import esphome.config_validation as cv
-
-CONFIG_SCHEMA = CONFIG_SCHEMA = cv.invalid(
-    "The ade7953 sensor component has been renamed to ade7953_i2c."
+from esphome.components import sensor, i2c
+from esphome import pins
+from esphome.const import (
+    CONF_ID,
+    CONF_VOLTAGE,
+    DEVICE_CLASS_CURRENT,
+    DEVICE_CLASS_POWER,
+    DEVICE_CLASS_VOLTAGE,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_VOLT,
+    UNIT_AMPERE,
+    UNIT_WATT,
 )
+
+DEPENDENCIES = ["i2c"]
+
+ade7953_ns = cg.esphome_ns.namespace("ade7953")
+ADE7953 = ade7953_ns.class_("ADE7953", cg.PollingComponent, i2c.I2CDevice)
+
+CONF_IRQ_PIN = "irq_pin"
+CONF_CURRENT_A = "current_a"
+CONF_CURRENT_B = "current_b"
+CONF_ACTIVE_POWER_A = "active_power_a"
+CONF_ACTIVE_POWER_B = "active_power_b"
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(ADE7953),
+            cv.Optional(CONF_IRQ_PIN): pins.internal_gpio_input_pin_schema,
+            cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(
+                unit_of_measurement=UNIT_VOLT,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_VOLTAGE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_CURRENT_A): sensor.sensor_schema(
+                unit_of_measurement=UNIT_AMPERE,
+                accuracy_decimals=2,
+                device_class=DEVICE_CLASS_CURRENT,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_CURRENT_B): sensor.sensor_schema(
+                unit_of_measurement=UNIT_AMPERE,
+                accuracy_decimals=2,
+                device_class=DEVICE_CLASS_CURRENT,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_ACTIVE_POWER_A): sensor.sensor_schema(
+                unit_of_measurement=UNIT_WATT,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_POWER,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_ACTIVE_POWER_B): sensor.sensor_schema(
+                unit_of_measurement=UNIT_WATT,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_POWER,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+    .extend(i2c.i2c_device_schema(0x38))
+)
+
+
+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)
+
+    if CONF_IRQ_PIN in config:
+        irq_pin = await cg.gpio_pin_expression(config[CONF_IRQ_PIN])
+        cg.add(var.set_irq_pin(irq_pin))
+
+    for key in [
+        CONF_VOLTAGE,
+        CONF_CURRENT_A,
+        CONF_CURRENT_B,
+        CONF_ACTIVE_POWER_A,
+        CONF_ACTIVE_POWER_B,
+    ]:
+        if key not in config:
+            continue
+        conf = config[key]
+        sens = await sensor.new_sensor(conf)
+        cg.add(getattr(var, f"set_{key}_sensor")(sens))

esphome/components/ade7953_base/__init__.py

@@ -1,196 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor
-from esphome import pins
-from esphome.const import (
-    CONF_IRQ_PIN,
-    CONF_VOLTAGE,
-    CONF_FREQUENCY,
-    DEVICE_CLASS_CURRENT,
-    DEVICE_CLASS_APPARENT_POWER,
-    DEVICE_CLASS_POWER,
-    DEVICE_CLASS_REACTIVE_POWER,
-    DEVICE_CLASS_POWER_FACTOR,
-    DEVICE_CLASS_VOLTAGE,
-    DEVICE_CLASS_FREQUENCY,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_VOLT,
-    UNIT_HERTZ,
-    UNIT_AMPERE,
-    UNIT_VOLT_AMPS,
-    UNIT_WATT,
-    UNIT_VOLT_AMPS_REACTIVE,
-    UNIT_PERCENT,
-)
-
-CONF_CURRENT_A = "current_a"
-CONF_CURRENT_B = "current_b"
-CONF_ACTIVE_POWER_A = "active_power_a"
-CONF_ACTIVE_POWER_B = "active_power_b"
-CONF_APPARENT_POWER_A = "apparent_power_a"
-CONF_APPARENT_POWER_B = "apparent_power_b"
-CONF_REACTIVE_POWER_A = "reactive_power_a"
-CONF_REACTIVE_POWER_B = "reactive_power_b"
-CONF_POWER_FACTOR_A = "power_factor_a"
-CONF_POWER_FACTOR_B = "power_factor_b"
-CONF_VOLTAGE_PGA_GAIN = "voltage_pga_gain"
-CONF_CURRENT_PGA_GAIN_A = "current_pga_gain_a"
-CONF_CURRENT_PGA_GAIN_B = "current_pga_gain_b"
-CONF_VOLTAGE_GAIN = "voltage_gain"
-CONF_CURRENT_GAIN_A = "current_gain_a"
-CONF_CURRENT_GAIN_B = "current_gain_b"
-CONF_ACTIVE_POWER_GAIN_A = "active_power_gain_a"
-CONF_ACTIVE_POWER_GAIN_B = "active_power_gain_b"
-PGA_GAINS = {
-    "1x": 0b000,
-    "2x": 0b001,
-    "4x": 0b010,
-    "8x": 0b011,
-    "16x": 0b100,
-    "22x": 0b101,
-}
-
-ade7953_base_ns = cg.esphome_ns.namespace("ade7953_base")
-ADE7953 = ade7953_base_ns.class_("ADE7953", cg.PollingComponent)
-
-ADE7953_CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.Optional(CONF_IRQ_PIN): pins.internal_gpio_input_pin_schema,
-        cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(
-            unit_of_measurement=UNIT_VOLT,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_VOLTAGE,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_FREQUENCY): sensor.sensor_schema(
-            unit_of_measurement=UNIT_HERTZ,
-            accuracy_decimals=2,
-            device_class=DEVICE_CLASS_FREQUENCY,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_CURRENT_A): sensor.sensor_schema(
-            unit_of_measurement=UNIT_AMPERE,
-            accuracy_decimals=2,
-            device_class=DEVICE_CLASS_CURRENT,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_CURRENT_B): sensor.sensor_schema(
-            unit_of_measurement=UNIT_AMPERE,
-            accuracy_decimals=2,
-            device_class=DEVICE_CLASS_CURRENT,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_ACTIVE_POWER_A): sensor.sensor_schema(
-            unit_of_measurement=UNIT_WATT,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_POWER,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_ACTIVE_POWER_B): sensor.sensor_schema(
-            unit_of_measurement=UNIT_WATT,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_POWER,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_APPARENT_POWER_A): sensor.sensor_schema(
-            unit_of_measurement=UNIT_VOLT_AMPS,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_APPARENT_POWER,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_APPARENT_POWER_B): sensor.sensor_schema(
-            unit_of_measurement=UNIT_VOLT_AMPS,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_APPARENT_POWER,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_REACTIVE_POWER_A): sensor.sensor_schema(
-            unit_of_measurement=UNIT_VOLT_AMPS_REACTIVE,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_REACTIVE_POWER,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_REACTIVE_POWER_B): sensor.sensor_schema(
-            unit_of_measurement=UNIT_VOLT_AMPS_REACTIVE,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_REACTIVE_POWER,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_POWER_FACTOR_A): sensor.sensor_schema(
-            unit_of_measurement=UNIT_PERCENT,
-            accuracy_decimals=2,
-            device_class=DEVICE_CLASS_POWER_FACTOR,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_POWER_FACTOR_B): sensor.sensor_schema(
-            unit_of_measurement=UNIT_PERCENT,
-            accuracy_decimals=2,
-            device_class=DEVICE_CLASS_POWER_FACTOR,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(
-            CONF_VOLTAGE_PGA_GAIN,
-            default="1x",
-        ): cv.one_of(*PGA_GAINS, lower=True),
-        cv.Optional(
-            CONF_CURRENT_PGA_GAIN_A,
-            default="1x",
-        ): cv.one_of(*PGA_GAINS, lower=True),
-        cv.Optional(
-            CONF_CURRENT_PGA_GAIN_B,
-            default="1x",
-        ): cv.one_of(*PGA_GAINS, lower=True),
-        cv.Optional(CONF_VOLTAGE_GAIN, default=0x400000): cv.hex_int_range(
-            min=0x100000, max=0x800000
-        ),
-        cv.Optional(CONF_CURRENT_GAIN_A, default=0x400000): cv.hex_int_range(
-            min=0x100000, max=0x800000
-        ),
-        cv.Optional(CONF_CURRENT_GAIN_B, default=0x400000): cv.hex_int_range(
-            min=0x100000, max=0x800000
-        ),
-        cv.Optional(CONF_ACTIVE_POWER_GAIN_A, default=0x400000): cv.hex_int_range(
-            min=0x100000, max=0x800000
-        ),
-        cv.Optional(CONF_ACTIVE_POWER_GAIN_B, default=0x400000): cv.hex_int_range(
-            min=0x100000, max=0x800000
-        ),
-    }
-).extend(cv.polling_component_schema("60s"))
-
-
-async def register_ade7953(var, config):
-    await cg.register_component(var, config)
-
-    if irq_pin_config := config.get(CONF_IRQ_PIN):
-        irq_pin = await cg.gpio_pin_expression(irq_pin_config)
-        cg.add(var.set_irq_pin(irq_pin))
-
-    cg.add(var.set_pga_v(PGA_GAINS[config.get(CONF_VOLTAGE_PGA_GAIN)]))
-    cg.add(var.set_pga_ia(PGA_GAINS[config.get(CONF_CURRENT_PGA_GAIN_A)]))
-    cg.add(var.set_pga_ib(PGA_GAINS[config.get(CONF_CURRENT_PGA_GAIN_B)]))
-    cg.add(var.set_vgain(config.get(CONF_VOLTAGE_GAIN)))
-    cg.add(var.set_aigain(config.get(CONF_CURRENT_GAIN_A)))
-    cg.add(var.set_bigain(config.get(CONF_CURRENT_GAIN_B)))
-    cg.add(var.set_awgain(config.get(CONF_ACTIVE_POWER_GAIN_A)))
-    cg.add(var.set_bwgain(config.get(CONF_ACTIVE_POWER_GAIN_B)))
-
-    for key in [
-        CONF_VOLTAGE,
-        CONF_FREQUENCY,
-        CONF_CURRENT_A,
-        CONF_CURRENT_B,
-        CONF_POWER_FACTOR_A,
-        CONF_POWER_FACTOR_B,
-        CONF_APPARENT_POWER_A,
-        CONF_APPARENT_POWER_B,
-        CONF_ACTIVE_POWER_A,
-        CONF_ACTIVE_POWER_B,
-        CONF_REACTIVE_POWER_A,
-        CONF_REACTIVE_POWER_B,
-    ]:
-        if key not in config:
-            continue
-        conf = config[key]
-        sens = await sensor.new_sensor(conf)
-        cg.add(getattr(var, f"set_{key}_sensor")(sens))

esphome/components/ade7953_base/ade7953_base.cpp

@@ -1,129 +0,0 @@
-#include "ade7953_base.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace ade7953_base {
-
-static const char *const TAG = "ade7953";
-
-void ADE7953::setup() {
-  if (this->irq_pin_ != nullptr) {
-    this->irq_pin_->setup();
-  }
-
-  // The chip might take up to 100ms to initialise
-  this->set_timeout(100, [this]() {
-    // this->ade_write_8(0x0010, 0x04);
-    this->ade_write_8(0x00FE, 0xAD);
-    this->ade_write_16(0x0120, 0x0030);
-    // Set gains
-    this->ade_write_8(PGA_V_8, pga_v_);
-    this->ade_write_8(PGA_IA_8, pga_ia_);
-    this->ade_write_8(PGA_IB_8, pga_ib_);
-    this->ade_write_32(AVGAIN_32, vgain_);
-    this->ade_write_32(AIGAIN_32, aigain_);
-    this->ade_write_32(BIGAIN_32, bigain_);
-    this->ade_write_32(AWGAIN_32, awgain_);
-    this->ade_write_32(BWGAIN_32, bwgain_);
-    // Read back gains for debugging
-    this->ade_read_8(PGA_V_8, &pga_v_);
-    this->ade_read_8(PGA_IA_8, &pga_ia_);
-    this->ade_read_8(PGA_IB_8, &pga_ib_);
-    this->ade_read_32(AVGAIN_32, &vgain_);
-    this->ade_read_32(AIGAIN_32, &aigain_);
-    this->ade_read_32(BIGAIN_32, &bigain_);
-    this->ade_read_32(AWGAIN_32, &awgain_);
-    this->ade_read_32(BWGAIN_32, &bwgain_);
-    this->is_setup_ = true;
-  });
-}
-
-void ADE7953::dump_config() {
-  LOG_PIN("  IRQ Pin: ", irq_pin_);
-  LOG_UPDATE_INTERVAL(this);
-  LOG_SENSOR("  ", "Voltage Sensor", this->voltage_sensor_);
-  LOG_SENSOR("  ", "Current A Sensor", this->current_a_sensor_);
-  LOG_SENSOR("  ", "Current B Sensor", this->current_b_sensor_);
-  LOG_SENSOR("  ", "Power Factor A Sensor", this->power_factor_a_sensor_);
-  LOG_SENSOR("  ", "Power Factor B Sensor", this->power_factor_b_sensor_);
-  LOG_SENSOR("  ", "Apparent Power A Sensor", this->apparent_power_a_sensor_);
-  LOG_SENSOR("  ", "Apparent Power B Sensor", this->apparent_power_b_sensor_);
-  LOG_SENSOR("  ", "Active Power A Sensor", this->active_power_a_sensor_);
-  LOG_SENSOR("  ", "Active Power B Sensor", this->active_power_b_sensor_);
-  LOG_SENSOR("  ", "Rective Power A Sensor", this->reactive_power_a_sensor_);
-  LOG_SENSOR("  ", "Reactive Power B Sensor", this->reactive_power_b_sensor_);
-  ESP_LOGCONFIG(TAG, "  PGA_V_8: 0x%X", pga_v_);
-  ESP_LOGCONFIG(TAG, "  PGA_IA_8: 0x%X", pga_ia_);
-  ESP_LOGCONFIG(TAG, "  PGA_IB_8: 0x%X", pga_ib_);
-  ESP_LOGCONFIG(TAG, "  VGAIN_32: 0x%08jX", (uintmax_t) vgain_);
-  ESP_LOGCONFIG(TAG, "  AIGAIN_32: 0x%08jX", (uintmax_t) aigain_);
-  ESP_LOGCONFIG(TAG, "  BIGAIN_32: 0x%08jX", (uintmax_t) bigain_);
-  ESP_LOGCONFIG(TAG, "  AWGAIN_32: 0x%08jX", (uintmax_t) awgain_);
-  ESP_LOGCONFIG(TAG, "  BWGAIN_32: 0x%08jX", (uintmax_t) bwgain_);
-}
-
-#define ADE_PUBLISH_(name, val, factor) \
-  if (err == 0 && this->name##_sensor_) { \
-    float value = (val) / (factor); \
-    this->name##_sensor_->publish_state(value); \
-  }
-#define ADE_PUBLISH(name, val, factor) ADE_PUBLISH_(name, val, factor)
-
-void ADE7953::update() {
-  if (!this->is_setup_)
-    return;
-
-  bool err;
-
-  uint32_t interrupts_a = 0;
-  uint32_t interrupts_b = 0;
-  if (this->irq_pin_ != nullptr) {
-    // Read and reset interrupts
-    this->ade_read_32(0x032E, &interrupts_a);
-    this->ade_read_32(0x0331, &interrupts_b);
-  }
-
-  uint32_t val;
-  uint16_t val_16;
-
-  // Power factor
-  err = this->ade_read_16(0x010A, &val_16);
-  ADE_PUBLISH(power_factor_a, (int16_t) val_16, (0x7FFF / 100.0f));
-  err = this->ade_read_16(0x010B, &val_16);
-  ADE_PUBLISH(power_factor_b, (int16_t) val_16, (0x7FFF / 100.0f));
-
-  // Apparent power
-  err = this->ade_read_32(0x0310, &val);
-  ADE_PUBLISH(apparent_power_a, (int32_t) val, 154.0f);
-  err = this->ade_read_32(0x0311, &val);
-  ADE_PUBLISH(apparent_power_b, (int32_t) val, 154.0f);
-
-  // Active power
-  err = this->ade_read_32(0x0312, &val);
-  ADE_PUBLISH(active_power_a, (int32_t) val, 154.0f);
-  err = this->ade_read_32(0x0313, &val);
-  ADE_PUBLISH(active_power_b, (int32_t) val, 154.0f);
-
-  // Reactive power
-  err = this->ade_read_32(0x0314, &val);
-  ADE_PUBLISH(reactive_power_a, (int32_t) val, 154.0f);
-  err = this->ade_read_32(0x0315, &val);
-  ADE_PUBLISH(reactive_power_b, (int32_t) val, 154.0f);
-
-  // Current
-  err = this->ade_read_32(0x031A, &val);
-  ADE_PUBLISH(current_a, (uint32_t) val, 100000.0f);
-  err = this->ade_read_32(0x031B, &val);
-  ADE_PUBLISH(current_b, (uint32_t) val, 100000.0f);
-
-  // Voltage
-  err = this->ade_read_32(0x031C, &val);
-  ADE_PUBLISH(voltage, (uint32_t) val, 26000.0f);
-
-  // Frequency
-  err = this->ade_read_16(0x010E, &val_16);
-  ADE_PUBLISH(frequency, 223750.0f, 1 + val_16);
-}
-
-}  // namespace ade7953_base
-}  // namespace esphome

esphome/components/ade7953_base/ade7953_base.h

@@ -1,121 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/hal.h"
-#include "esphome/components/sensor/sensor.h"
-
-#include <vector>
-
-namespace esphome {
-namespace ade7953_base {
-
-static const uint8_t PGA_V_8 =
-    0x007;  // PGA_V,  (R/W) Default: 0x00, Unsigned, Voltage channel gain configuration (Bits[2:0])
-static const uint8_t PGA_IA_8 =
-    0x008;  // PGA_IA, (R/W) Default: 0x00, Unsigned, Current Channel A gain configuration (Bits[2:0])
-static const uint8_t PGA_IB_8 =
-    0x009;  // PGA_IB, (R/W) Default: 0x00, Unsigned, Current Channel B gain configuration (Bits[2:0])
-
-static const uint32_t AIGAIN_32 =
-    0x380;  // AIGAIN, (R/W)   Default: 0x400000, Unsigned,Current channel gain (Current Channel A)(32 bit)
-static const uint32_t AVGAIN_32 = 0x381;  // AVGAIN, (R/W)   Default: 0x400000, Unsigned,Voltage channel gain(32 bit)
-static const uint32_t AWGAIN_32 =
-    0x382;  // AWGAIN, (R/W)   Default: 0x400000, Unsigned,Active power gain (Current Channel A)(32 bit)
-static const uint32_t AVARGAIN_32 =
-    0x383;  // AVARGAIN, (R/W) Default: 0x400000, Unsigned, Reactive power gain (Current Channel A)(32 bit)
-static const uint32_t AVAGAIN_32 =
-    0x384;  // AVAGAIN, (R/W)  Default: 0x400000, Unsigned,Apparent power gain (Current Channel A)(32 bit)
-
-static const uint32_t BIGAIN_32 =
-    0x38C;  // BIGAIN, (R/W)   Default: 0x400000, Unsigned,Current channel gain (Current Channel B)(32 bit)
-static const uint32_t BVGAIN_32 = 0x38D;  // BVGAIN, (R/W)   Default: 0x400000, Unsigned,Voltage channel gain(32 bit)
-static const uint32_t BWGAIN_32 =
-    0x38E;  // BWGAIN, (R/W)   Default: 0x400000, Unsigned,Active power gain (Current Channel B)(32 bit)
-static const uint32_t BVARGAIN_32 =
-    0x38F;  // BVARGAIN, (R/W) Default: 0x400000, Unsigned, Reactive power gain (Current Channel B)(32 bit)
-static const uint32_t BVAGAIN_32 =
-    0x390;  // BVAGAIN, (R/W)  Default: 0x400000, Unsigned,Apparent power gain (Current Channel B)(32 bit)
-
-class ADE7953 : public PollingComponent, public sensor::Sensor {
- public:
-  void set_irq_pin(InternalGPIOPin *irq_pin) { irq_pin_ = irq_pin; }
-
-  // Set PGA input gains: 0 1x, 1 2x, 0b10 4x
-  void set_pga_v(uint8_t pga_v) { pga_v_ = pga_v; }
-  void set_pga_ia(uint8_t pga_ia) { pga_ia_ = pga_ia; }
-  void set_pga_ib(uint8_t pga_ib) { pga_ib_ = pga_ib; }
-
-  // Set input gains
-  void set_vgain(uint32_t vgain) { vgain_ = vgain; }
-  void set_aigain(uint32_t aigain) { aigain_ = aigain; }
-  void set_bigain(uint32_t bigain) { bigain_ = bigain; }
-  void set_awgain(uint32_t awgain) { awgain_ = awgain; }
-  void set_bwgain(uint32_t bwgain) { bwgain_ = bwgain; }
-
-  void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
-  void set_frequency_sensor(sensor::Sensor *frequency_sensor) { frequency_sensor_ = frequency_sensor; }
-
-  void set_power_factor_a_sensor(sensor::Sensor *power_factor_a) { power_factor_a_sensor_ = power_factor_a; }
-  void set_power_factor_b_sensor(sensor::Sensor *power_factor_b) { power_factor_b_sensor_ = power_factor_b; }
-
-  void set_current_a_sensor(sensor::Sensor *current_a_sensor) { current_a_sensor_ = current_a_sensor; }
-  void set_current_b_sensor(sensor::Sensor *current_b_sensor) { current_b_sensor_ = current_b_sensor; }
-
-  void set_apparent_power_a_sensor(sensor::Sensor *apparent_power_a) { apparent_power_a_sensor_ = apparent_power_a; }
-  void set_apparent_power_b_sensor(sensor::Sensor *apparent_power_b) { apparent_power_b_sensor_ = apparent_power_b; }
-
-  void set_active_power_a_sensor(sensor::Sensor *active_power_a_sensor) {
-    active_power_a_sensor_ = active_power_a_sensor;
-  }
-  void set_active_power_b_sensor(sensor::Sensor *active_power_b_sensor) {
-    active_power_b_sensor_ = active_power_b_sensor;
-  }
-
-  void set_reactive_power_a_sensor(sensor::Sensor *reactive_power_a) { reactive_power_a_sensor_ = reactive_power_a; }
-  void set_reactive_power_b_sensor(sensor::Sensor *reactive_power_b) { reactive_power_b_sensor_ = reactive_power_b; }
-
-  void setup() override;
-
-  void dump_config() override;
-
-  void update() override;
-
- protected:
-  InternalGPIOPin *irq_pin_{nullptr};
-  bool is_setup_{false};
-  sensor::Sensor *voltage_sensor_{nullptr};
-  sensor::Sensor *frequency_sensor_{nullptr};
-  sensor::Sensor *current_a_sensor_{nullptr};
-  sensor::Sensor *current_b_sensor_{nullptr};
-  sensor::Sensor *apparent_power_a_sensor_{nullptr};
-  sensor::Sensor *apparent_power_b_sensor_{nullptr};
-  sensor::Sensor *active_power_a_sensor_{nullptr};
-  sensor::Sensor *active_power_b_sensor_{nullptr};
-  sensor::Sensor *reactive_power_a_sensor_{nullptr};
-  sensor::Sensor *reactive_power_b_sensor_{nullptr};
-  sensor::Sensor *power_factor_a_sensor_{nullptr};
-  sensor::Sensor *power_factor_b_sensor_{nullptr};
-  uint8_t pga_v_;
-  uint8_t pga_ia_;
-  uint8_t pga_ib_;
-  uint32_t vgain_;
-  uint32_t aigain_;
-  uint32_t bigain_;
-  uint32_t awgain_;
-  uint32_t bwgain_;
-
-  virtual bool ade_write_8(uint16_t reg, uint8_t value) = 0;
-
-  virtual bool ade_write_16(uint16_t reg, uint16_t value) = 0;
-
-  virtual bool ade_write_32(uint16_t reg, uint32_t value) = 0;
-
-  virtual bool ade_read_8(uint16_t reg, uint8_t *value) = 0;
-
-  virtual bool ade_read_16(uint16_t reg, uint16_t *value) = 0;
-
-  virtual bool ade_read_32(uint16_t reg, uint32_t *value) = 0;
-};
-
-}  // namespace ade7953_base
-}  // namespace esphome

esphome/components/ade7953_i2c/__init__.py

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

esphome/components/ade7953_i2c/ade7953_i2c.cpp

@@ -1,80 +0,0 @@
-#include "ade7953_i2c.h"
-#include "esphome/core/log.h"
-#include "esphome/core/helpers.h"
-
-namespace esphome {
-namespace ade7953_i2c {
-
-static const char *const TAG = "ade7953";
-
-void AdE7953I2c::dump_config() {
-  ESP_LOGCONFIG(TAG, "ADE7953_i2c:");
-  LOG_I2C_DEVICE(this);
-  ade7953_base::ADE7953::dump_config();
-}
-bool AdE7953I2c::ade_write_8(uint16_t reg, uint8_t value) {
-  std::vector<uint8_t> data(3);
-  data.push_back(reg >> 8);
-  data.push_back(reg >> 0);
-  data.push_back(value);
-  return this->write(data.data(), data.size()) != i2c::ERROR_OK;
-}
-bool AdE7953I2c::ade_write_16(uint16_t reg, uint16_t value) {
-  std::vector<uint8_t> data(4);
-  data.push_back(reg >> 8);
-  data.push_back(reg >> 0);
-  data.push_back(value >> 8);
-  data.push_back(value >> 0);
-  return this->write(data.data(), data.size()) != i2c::ERROR_OK;
-}
-bool AdE7953I2c::ade_write_32(uint16_t reg, uint32_t value) {
-  std::vector<uint8_t> data(6);
-  data.push_back(reg >> 8);
-  data.push_back(reg >> 0);
-  data.push_back(value >> 24);
-  data.push_back(value >> 16);
-  data.push_back(value >> 8);
-  data.push_back(value >> 0);
-  return this->write(data.data(), data.size()) != i2c::ERROR_OK;
-}
-bool AdE7953I2c::ade_read_8(uint16_t reg, uint8_t *value) {
-  uint8_t reg_data[2];
-  reg_data[0] = reg >> 8;
-  reg_data[1] = reg >> 0;
-  i2c::ErrorCode err = this->write(reg_data, 2);
-  if (err != i2c::ERROR_OK)
-    return true;
-  err = this->read(value, 1);
-  return (err != i2c::ERROR_OK);
-}
-bool AdE7953I2c::ade_read_16(uint16_t reg, uint16_t *value) {
-  uint8_t reg_data[2];
-  reg_data[0] = reg >> 8;
-  reg_data[1] = reg >> 0;
-  i2c::ErrorCode err = this->write(reg_data, 2);
-  if (err != i2c::ERROR_OK)
-    return true;
-  uint8_t recv[2];
-  err = this->read(recv, 2);
-  if (err != i2c::ERROR_OK)
-    return true;
-  *value = encode_uint16(recv[0], recv[1]);
-  return false;
-}
-bool AdE7953I2c::ade_read_32(uint16_t reg, uint32_t *value) {
-  uint8_t reg_data[2];
-  reg_data[0] = reg >> 8;
-  reg_data[1] = reg >> 0;
-  i2c::ErrorCode err = this->write(reg_data, 2);
-  if (err != i2c::ERROR_OK)
-    return true;
-  uint8_t recv[4];
-  err = this->read(recv, 4);
-  if (err != i2c::ERROR_OK)
-    return true;
-  *value = encode_uint32(recv[0], recv[1], recv[2], recv[3]);
-  return false;
-}
-
-}  // namespace ade7953_i2c
-}  // namespace esphome

esphome/components/ade7953_i2c/ade7953_i2c.h

@@ -1,28 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/hal.h"
-#include "esphome/components/i2c/i2c.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/ade7953_base/ade7953_base.h"
-
-#include <vector>
-
-namespace esphome {
-namespace ade7953_i2c {
-
-class AdE7953I2c : public ade7953_base::ADE7953, public i2c::I2CDevice {
- public:
-  void dump_config() override;
-
- protected:
-  bool ade_write_8(uint16_t reg, uint8_t value) override;
-  bool ade_write_16(uint16_t reg, uint16_t value) override;
-  bool ade_write_32(uint16_t reg, uint32_t value) override;
-  bool ade_read_8(uint16_t reg, uint8_t *value) override;
-  bool ade_read_16(uint16_t reg, uint16_t *value) override;
-  bool ade_read_32(uint16_t reg, uint32_t *value) override;
-};
-
-}  // namespace ade7953_i2c
-}  // namespace esphome

esphome/components/ade7953_i2c/sensor.py

@@ -1,27 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import i2c, ade7953_base
-from esphome.const import CONF_ID
-
-
-DEPENDENCIES = ["i2c"]
-AUTO_LOAD = ["ade7953_base"]
-
-ade7953_ns = cg.esphome_ns.namespace("ade7953_i2c")
-ADE7953 = ade7953_ns.class_("AdE7953I2c", ade7953_base.ADE7953, i2c.I2CDevice)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(ADE7953),
-        }
-    )
-    .extend(ade7953_base.ADE7953_CONFIG_SCHEMA)
-    .extend(i2c.i2c_device_schema(0x38))
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await i2c.register_i2c_device(var, config)
-    await ade7953_base.register_ade7953(var, config)

esphome/components/ade7953_spi/__init__.py

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

esphome/components/ade7953_spi/ade7953_spi.cpp

@@ -1,81 +0,0 @@
-#include "ade7953_spi.h"
-#include "esphome/core/log.h"
-#include "esphome/core/helpers.h"
-
-namespace esphome {
-namespace ade7953_spi {
-
-static const char *const TAG = "ade7953";
-
-void AdE7953Spi::setup() {
-  this->spi_setup();
-  ade7953_base::ADE7953::setup();
-}
-
-void AdE7953Spi::dump_config() {
-  ESP_LOGCONFIG(TAG, "ADE7953_spi:");
-  LOG_PIN("  CS Pin: ", this->cs_);
-  ade7953_base::ADE7953::dump_config();
-}
-
-bool AdE7953Spi::ade_write_8(uint16_t reg, uint8_t value) {
-  this->enable();
-  this->write_byte16(reg);
-  this->transfer_byte(0);
-  this->transfer_byte(value);
-  this->disable();
-  return false;
-}
-
-bool AdE7953Spi::ade_write_16(uint16_t reg, uint16_t value) {
-  this->enable();
-  this->write_byte16(reg);
-  this->transfer_byte(0);
-  this->write_byte16(value);
-  this->disable();
-  return false;
-}
-
-bool AdE7953Spi::ade_write_32(uint16_t reg, uint32_t value) {
-  this->enable();
-  this->write_byte16(reg);
-  this->transfer_byte(0);
-  this->write_byte16(value >> 16);
-  this->write_byte16(value & 0xFFFF);
-  this->disable();
-  return false;
-}
-
-bool AdE7953Spi::ade_read_8(uint16_t reg, uint8_t *value) {
-  this->enable();
-  this->write_byte16(reg);
-  this->transfer_byte(0x80);
-  *value = this->read_byte();
-  this->disable();
-  return false;
-}
-
-bool AdE7953Spi::ade_read_16(uint16_t reg, uint16_t *value) {
-  this->enable();
-  this->write_byte16(reg);
-  this->transfer_byte(0x80);
-  uint8_t recv[2];
-  this->read_array(recv, 4);
-  *value = encode_uint16(recv[0], recv[1]);
-  this->disable();
-  return false;
-}
-
-bool AdE7953Spi::ade_read_32(uint16_t reg, uint32_t *value) {
-  this->enable();
-  this->write_byte16(reg);
-  this->transfer_byte(0x80);
-  uint8_t recv[4];
-  this->read_array(recv, 4);
-  *value = encode_uint32(recv[0], recv[1], recv[2], recv[3]);
-  this->disable();
-  return false;
-}
-
-}  // namespace ade7953_spi
-}  // namespace esphome

esphome/components/ade7953_spi/ade7953_spi.h

@@ -1,32 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/hal.h"
-#include "esphome/components/spi/spi.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/ade7953_base/ade7953_base.h"
-
-#include <vector>
-
-namespace esphome {
-namespace ade7953_spi {
-
-class AdE7953Spi : public ade7953_base::ADE7953,
-                   public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_HIGH, spi::CLOCK_PHASE_LEADING,
-                                         spi::DATA_RATE_1MHZ> {
- public:
-  void setup() override;
-
-  void dump_config() override;
-
- protected:
-  bool ade_write_8(uint16_t reg, uint8_t value) override;
-  bool ade_write_16(uint16_t reg, uint16_t value) override;
-  bool ade_write_32(uint16_t reg, uint32_t value) override;
-  bool ade_read_8(uint16_t reg, uint8_t *value) override;
-  bool ade_read_16(uint16_t reg, uint16_t *value) override;
-  bool ade_read_32(uint16_t reg, uint32_t *value) override;
-};
-
-}  // namespace ade7953_spi
-}  // namespace esphome

esphome/components/ade7953_spi/sensor.py

@@ -1,27 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import spi, ade7953_base
-from esphome.const import CONF_ID
-
-
-DEPENDENCIES = ["spi"]
-AUTO_LOAD = ["ade7953_base"]
-
-ade7953_ns = cg.esphome_ns.namespace("ade7953_spi")
-ADE7953 = ade7953_ns.class_("AdE7953Spi", ade7953_base.ADE7953, spi.SPIDevice)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(ADE7953),
-        }
-    )
-    .extend(ade7953_base.ADE7953_CONFIG_SCHEMA)
-    .extend(spi.spi_device_schema())
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await spi.register_spi_device(var, config)
-    await ade7953_base.register_ade7953(var, config)

esphome/components/aht10/aht10.cpp

@@ -15,7 +15,6 @@
 #include "aht10.h"
 #include "esphome/core/log.h"
 #include "esphome/core/hal.h"
-#include <cinttypes>
 
 namespace esphome {
 namespace aht10 {
@@ -73,7 +72,7 @@ void AHT10Component::update() {
     delay_ms = AHT10_HUMIDITY_DELAY;
   bool success = false;
   for (int i = 0; i < AHT10_ATTEMPTS; ++i) {
-    ESP_LOGVV(TAG, "Attempt %d at %6" PRIu32, i, millis());
+    ESP_LOGVV(TAG, "Attempt %d at %6u", i, millis());
     delay(delay_ms);
     if (this->read(data, 6) != i2c::ERROR_OK) {
       ESP_LOGD(TAG, "Communication with AHT10 failed, waiting...");
@@ -97,7 +96,7 @@ void AHT10Component::update() {
       }
     } else {
       // data is valid, we can break the loop
-      ESP_LOGVV(TAG, "Answer at %6" PRIu32, millis());
+      ESP_LOGVV(TAG, "Answer at %6u", millis());
       success = true;
       break;
     }

esphome/components/aht10/sensor.py

@@ -45,10 +45,10 @@ async def to_code(config):
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if temperature := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature)
+    if CONF_TEMPERATURE in config:
+        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
         cg.add(var.set_temperature_sensor(sens))
 
-    if humidity := config.get(CONF_HUMIDITY):
-        sens = await sensor.new_sensor(humidity)
+    if CONF_HUMIDITY in config:
+        sens = await sensor.new_sensor(config[CONF_HUMIDITY])
         cg.add(var.set_humidity_sensor(sens))

esphome/components/airthings_ble/airthings_listener.cpp

@@ -1,6 +1,5 @@
 #include "airthings_listener.h"
 #include "esphome/core/log.h"
-#include <cinttypes>
 
 #ifdef USE_ESP32
 
@@ -20,7 +19,7 @@ bool AirthingsListener::parse_device(const esp32_ble_tracker::ESPBTDevice &devic
       sn |= ((uint32_t) it.data[2] << 16);
       sn |= ((uint32_t) it.data[3] << 24);
 
-      ESP_LOGD(TAG, "Found AirThings device Serial:%" PRIu32 " (MAC: %s)", sn, device.address_str().c_str());
+      ESP_LOGD(TAG, "Found AirThings device Serial:%u (MAC: %s)", sn, device.address_str().c_str());
       return true;
     }
   }

esphome/components/airthings_wave_base/__init__.py

@@ -3,31 +3,26 @@ import esphome.config_validation as cv
 from esphome.components import sensor, ble_client
 
 from esphome.const import (
-    CONF_BATTERY_VOLTAGE,
-    CONF_HUMIDITY,
-    CONF_PRESSURE,
-    CONF_TEMPERATURE,
-    CONF_TVOC,
-    DEVICE_CLASS_VOLTAGE,
     DEVICE_CLASS_HUMIDITY,
-    DEVICE_CLASS_PRESSURE,
     DEVICE_CLASS_TEMPERATURE,
-    DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS_PARTS,
-    ENTITY_CATEGORY_DIAGNOSTIC,
+    DEVICE_CLASS_PRESSURE,
     STATE_CLASS_MEASUREMENT,
+    UNIT_PERCENT,
     UNIT_CELSIUS,
     UNIT_HECTOPASCAL,
+    CONF_HUMIDITY,
+    CONF_TVOC,
+    CONF_PRESSURE,
+    CONF_TEMPERATURE,
+    DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS_PARTS,
     UNIT_PARTS_PER_BILLION,
-    UNIT_PERCENT,
-    UNIT_VOLT,
+    ICON_RADIATOR,
 )
 
-CODEOWNERS = ["@ncareau", "@jeromelaban", "@kpfleming"]
+CODEOWNERS = ["@ncareau", "@jeromelaban"]
 
 DEPENDENCIES = ["ble_client"]
 
-CONF_BATTERY_UPDATE_INTERVAL = "battery_update_interval"
-
 airthings_wave_base_ns = cg.esphome_ns.namespace("airthings_wave_base")
 AirthingsWaveBase = airthings_wave_base_ns.class_(
     "AirthingsWaveBase", cg.PollingComponent, ble_client.BLEClientNode
@@ -39,9 +34,9 @@ BASE_SCHEMA = (
         {
             cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(
                 unit_of_measurement=UNIT_PERCENT,
-                accuracy_decimals=0,
                 device_class=DEVICE_CLASS_HUMIDITY,
                 state_class=STATE_CLASS_MEASUREMENT,
+                accuracy_decimals=0,
             ),
             cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
                 unit_of_measurement=UNIT_CELSIUS,
@@ -57,21 +52,11 @@ BASE_SCHEMA = (
             ),
             cv.Optional(CONF_TVOC): sensor.sensor_schema(
                 unit_of_measurement=UNIT_PARTS_PER_BILLION,
+                icon=ICON_RADIATOR,
                 accuracy_decimals=0,
                 device_class=DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS_PARTS,
                 state_class=STATE_CLASS_MEASUREMENT,
             ),
-            cv.Optional(CONF_BATTERY_VOLTAGE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_VOLT,
-                accuracy_decimals=3,
-                device_class=DEVICE_CLASS_VOLTAGE,
-                state_class=STATE_CLASS_MEASUREMENT,
-                entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
-            ),
-            cv.Optional(
-                CONF_BATTERY_UPDATE_INTERVAL,
-                default="24h",
-            ): cv.update_interval,
         }
     )
     .extend(cv.polling_component_schema("5min"))
@@ -84,20 +69,15 @@ async def wave_base_to_code(var, config):
 
     await ble_client.register_ble_node(var, config)
 
-    if config_humidity := config.get(CONF_HUMIDITY):
-        sens = await sensor.new_sensor(config_humidity)
+    if CONF_HUMIDITY in config:
+        sens = await sensor.new_sensor(config[CONF_HUMIDITY])
         cg.add(var.set_humidity(sens))
-    if config_temperature := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(config_temperature)
+    if CONF_TEMPERATURE in config:
+        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
         cg.add(var.set_temperature(sens))
-    if config_pressure := config.get(CONF_PRESSURE):
-        sens = await sensor.new_sensor(config_pressure)
+    if CONF_PRESSURE in config:
+        sens = await sensor.new_sensor(config[CONF_PRESSURE])
         cg.add(var.set_pressure(sens))
-    if config_tvoc := config.get(CONF_TVOC):
-        sens = await sensor.new_sensor(config_tvoc)
+    if CONF_TVOC in config:
+        sens = await sensor.new_sensor(config[CONF_TVOC])
         cg.add(var.set_tvoc(sens))
-    if config_battery_voltage := config.get(CONF_BATTERY_VOLTAGE):
-        sens = await sensor.new_sensor(config_battery_voltage)
-        cg.add(var.set_battery_voltage(sens))
-    if config_battery_update_interval := config.get(CONF_BATTERY_UPDATE_INTERVAL):
-        cg.add(var.set_battery_update_interval(config_battery_update_interval))

esphome/components/airthings_wave_base/airthings_wave_base.cpp

@@ -1,8 +1,5 @@
 #include "airthings_wave_base.h"
 
-// All information related to reading battery information came from the sensors.airthings_wave
-// project by Sverre Hamre (https://github.com/sverrham/sensor.airthings_wave)
-
 #ifdef USE_ESP32
 
 namespace esphome {
@@ -21,26 +18,22 @@ void AirthingsWaveBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt
     }
 
     case ESP_GATTC_DISCONNECT_EVT: {
-      this->handle_ = 0;
-      this->acp_handle_ = 0;
-      this->cccd_handle_ = 0;
       ESP_LOGW(TAG, "Disconnected!");
       break;
     }
 
     case ESP_GATTC_SEARCH_CMPL_EVT: {
-      if (this->request_read_values_()) {
-        if (!this->read_battery_next_update_) {
-          this->node_state = espbt::ClientState::ESTABLISHED;
-        } else {
-          // delay setting node_state to ESTABLISHED until confirmation of the notify registration
-          this->request_battery_();
-        }
+      this->handle_ = 0;
+      auto *chr = this->parent()->get_characteristic(this->service_uuid_, this->sensors_data_characteristic_uuid_);
+      if (chr == nullptr) {
+        ESP_LOGW(TAG, "No sensor characteristic found at service %s char %s", this->service_uuid_.to_string().c_str(),
+                 this->sensors_data_characteristic_uuid_.to_string().c_str());
+        break;
       }
+      this->handle_ = chr->handle;
+      this->node_state = esp32_ble_tracker::ClientState::ESTABLISHED;
 
-      // ensure that the client will be disconnected even if no responses arrive
-      this->set_response_timeout_();
-
+      this->request_read_values_();
       break;
     }
 
@@ -57,29 +50,15 @@ void AirthingsWaveBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt
       break;
     }
 
-    case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
-      this->node_state = espbt::ClientState::ESTABLISHED;
-      break;
-    }
-
-    case ESP_GATTC_NOTIFY_EVT: {
-      if (param->notify.conn_id != this->parent()->get_conn_id())
-        break;
-      if (param->notify.handle == this->acp_handle_) {
-        this->read_battery_(param->notify.value, param->notify.value_len);
-      }
-      break;
-    }
-
     default:
       break;
   }
 }
 
-bool AirthingsWaveBase::is_valid_voc_value_(uint16_t voc) { return voc <= 16383; }
+bool AirthingsWaveBase::is_valid_voc_value_(uint16_t voc) { return 0 <= voc && voc <= 16383; }
 
 void AirthingsWaveBase::update() {
-  if (this->node_state != espbt::ClientState::ESTABLISHED) {
+  if (this->node_state != esp32_ble_tracker::ClientState::ESTABLISHED) {
     if (!this->parent()->enabled) {
       ESP_LOGW(TAG, "Reconnecting to device");
       this->parent()->set_enabled(true);
@@ -90,119 +69,12 @@ void AirthingsWaveBase::update() {
   }
 }
 
-bool AirthingsWaveBase::request_read_values_() {
-  auto *chr = this->parent()->get_characteristic(this->service_uuid_, this->sensors_data_characteristic_uuid_);
-  if (chr == nullptr) {
-    ESP_LOGW(TAG, "No sensor characteristic found at service %s char %s", this->service_uuid_.to_string().c_str(),
-             this->sensors_data_characteristic_uuid_.to_string().c_str());
-    return false;
-  }
-
-  this->handle_ = chr->handle;
-
+void AirthingsWaveBase::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);
   if (status) {
     ESP_LOGW(TAG, "Error sending read request for sensor, status=%d", status);
-    return false;
   }
-
-  this->response_pending_();
-  return true;
-}
-
-bool AirthingsWaveBase::request_battery_() {
-  uint8_t battery_command = ACCESS_CONTROL_POINT_COMMAND;
-  uint8_t cccd_value[2] = {1, 0};
-
-  auto *chr = this->parent()->get_characteristic(this->service_uuid_, this->access_control_point_characteristic_uuid_);
-  if (chr == nullptr) {
-    ESP_LOGW(TAG, "No access control point characteristic found at service %s char %s",
-             this->service_uuid_.to_string().c_str(),
-             this->access_control_point_characteristic_uuid_.to_string().c_str());
-    return false;
-  }
-
-  auto *descr = this->parent()->get_descriptor(this->service_uuid_, this->access_control_point_characteristic_uuid_,
-                                               CLIENT_CHARACTERISTIC_CONFIGURATION_DESCRIPTOR_UUID);
-  if (descr == nullptr) {
-    ESP_LOGW(TAG, "No CCC descriptor found at service %s char %s", this->service_uuid_.to_string().c_str(),
-             this->access_control_point_characteristic_uuid_.to_string().c_str());
-    return false;
-  }
-
-  auto reg_status =
-      esp_ble_gattc_register_for_notify(this->parent()->get_gattc_if(), this->parent()->get_remote_bda(), chr->handle);
-  if (reg_status) {
-    ESP_LOGW(TAG, "esp_ble_gattc_register_for_notify failed, status=%d", reg_status);
-    return false;
-  }
-
-  this->acp_handle_ = chr->handle;
-  this->cccd_handle_ = descr->handle;
-
-  auto descr_status =
-      esp_ble_gattc_write_char_descr(this->parent()->get_gattc_if(), this->parent()->get_conn_id(), this->cccd_handle_,
-                                     2, cccd_value, ESP_GATT_WRITE_TYPE_RSP, ESP_GATT_AUTH_REQ_NONE);
-  if (descr_status) {
-    ESP_LOGW(TAG, "Error sending CCC descriptor write request, status=%d", descr_status);
-    return false;
-  }
-
-  auto chr_status =
-      esp_ble_gattc_write_char(this->parent()->get_gattc_if(), this->parent()->get_conn_id(), this->acp_handle_, 1,
-                               &battery_command, ESP_GATT_WRITE_TYPE_RSP, ESP_GATT_AUTH_REQ_NONE);
-  if (chr_status) {
-    ESP_LOGW(TAG, "Error sending read request for battery, status=%d", chr_status);
-    return false;
-  }
-
-  this->response_pending_();
-  return true;
-}
-
-void AirthingsWaveBase::read_battery_(uint8_t *raw_value, uint16_t value_len) {
-  auto *value = (AccessControlPointResponse *) (&raw_value[2]);
-
-  if ((value_len >= (sizeof(AccessControlPointResponse) + 2)) && (raw_value[0] == ACCESS_CONTROL_POINT_COMMAND)) {
-    ESP_LOGD(TAG, "Battery received: %u mV", (unsigned int) value->battery);
-
-    if (this->battery_voltage_ != nullptr) {
-      float voltage = value->battery / 1000.0f;
-
-      this->battery_voltage_->publish_state(voltage);
-    }
-
-    // read the battery again at the configured update interval
-    if (this->battery_update_interval_ != this->update_interval_) {
-      this->read_battery_next_update_ = false;
-      this->set_timeout("battery", this->battery_update_interval_,
-                        [this]() { this->read_battery_next_update_ = true; });
-    }
-  }
-
-  this->response_received_();
-}
-
-void AirthingsWaveBase::response_pending_() {
-  this->responses_pending_++;
-  this->set_response_timeout_();
-}
-
-void AirthingsWaveBase::response_received_() {
-  if (--this->responses_pending_ == 0) {
-    // This instance must not stay connected
-    // so other clients can connect to it (e.g. the
-    // mobile app).
-    this->parent()->set_enabled(false);
-  }
-}
-
-void AirthingsWaveBase::set_response_timeout_() {
-  this->set_timeout("response_timeout", 30 * 1000, [this]() {
-    this->responses_pending_ = 1;
-    this->response_received_();
-  });
 }
 
 }  // namespace airthings_wave_base

esphome/components/airthings_wave_base/airthings_wave_base.h

@@ -1,8 +1,5 @@
 #pragma once
 
-// All information related to reading battery levels came from the sensors.airthings_wave
-// project by Sverre Hamre (https://github.com/sverrham/sensor.airthings_wave)
-
 #ifdef USE_ESP32
 
 #include <esp_gattc_api.h>
@@ -17,11 +14,6 @@
 namespace esphome {
 namespace airthings_wave_base {
 
-namespace espbt = esphome::esp32_ble_tracker;
-
-static const uint8_t ACCESS_CONTROL_POINT_COMMAND = 0x6d;
-static const auto CLIENT_CHARACTERISTIC_CONFIGURATION_DESCRIPTOR_UUID = espbt::ESPBTUUID::from_uint16(0x2902);
-
 class AirthingsWaveBase : public PollingComponent, public ble_client::BLEClientNode {
  public:
   AirthingsWaveBase() = default;
@@ -35,53 +27,21 @@ class AirthingsWaveBase : public PollingComponent, public ble_client::BLEClientN
   void set_humidity(sensor::Sensor *humidity) { humidity_sensor_ = humidity; }
   void set_pressure(sensor::Sensor *pressure) { pressure_sensor_ = pressure; }
   void set_tvoc(sensor::Sensor *tvoc) { tvoc_sensor_ = tvoc; }
-  void set_battery_voltage(sensor::Sensor *voltage) {
-    battery_voltage_ = voltage;
-    this->read_battery_next_update_ = true;
-  }
-  void set_battery_update_interval(uint32_t interval) { battery_update_interval_ = interval; }
 
  protected:
   bool is_valid_voc_value_(uint16_t voc);
 
-  bool request_read_values_();
-  virtual void read_sensors(uint8_t *raw_value, uint16_t value_len) = 0;
+  virtual void read_sensors(uint8_t *value, uint16_t value_len) = 0;
+  void request_read_values_();
 
   sensor::Sensor *temperature_sensor_{nullptr};
   sensor::Sensor *humidity_sensor_{nullptr};
   sensor::Sensor *pressure_sensor_{nullptr};
   sensor::Sensor *tvoc_sensor_{nullptr};
-  sensor::Sensor *battery_voltage_{nullptr};
 
   uint16_t handle_;
-  espbt::ESPBTUUID service_uuid_;
-  espbt::ESPBTUUID sensors_data_characteristic_uuid_;
-
-  uint16_t acp_handle_{0};
-  uint16_t cccd_handle_{0};
-  espbt::ESPBTUUID access_control_point_characteristic_uuid_;
-
-  uint8_t responses_pending_{0};
-  void response_pending_();
-  void response_received_();
-  void set_response_timeout_();
-
-  // default to *not* reading battery voltage from the device; the
-  // set_* function for the battery sensor will set this to 'true'
-  bool read_battery_next_update_{false};
-  bool request_battery_();
-  void read_battery_(uint8_t *raw_value, uint16_t value_len);
-  uint32_t battery_update_interval_{};
-
-  struct AccessControlPointResponse {
-    uint32_t unused1;
-    uint8_t unused2;
-    uint8_t illuminance;
-    uint8_t unused3[10];
-    uint16_t unused4[4];
-    uint16_t battery;
-    uint16_t unused5;
-  };
+  esp32_ble_tracker::ESPBTUUID service_uuid_;
+  esp32_ble_tracker::ESPBTUUID sensors_data_characteristic_uuid_;
 };
 
 }  // namespace airthings_wave_base

esphome/components/airthings_wave_mini/airthings_wave_mini.cpp

@@ -26,9 +26,12 @@ void AirthingsWaveMini::read_sensors(uint8_t *raw_value, uint16_t value_len) {
     if ((this->tvoc_sensor_ != nullptr) && this->is_valid_voc_value_(value->voc)) {
       this->tvoc_sensor_->publish_state(value->voc);
     }
-  }
 
-  this->response_received_();
+    // This instance must not stay connected
+    // so other clients can connect to it (e.g. the
+    // mobile app).
+    this->parent()->set_enabled(false);
+  }
 }
 
 void AirthingsWaveMini::dump_config() {
@@ -39,14 +42,11 @@ void AirthingsWaveMini::dump_config() {
   LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
   LOG_SENSOR("  ", "Pressure", this->pressure_sensor_);
   LOG_SENSOR("  ", "TVOC", this->tvoc_sensor_);
-  LOG_SENSOR("  ", "Battery Voltage", this->battery_voltage_);
 }
 
 AirthingsWaveMini::AirthingsWaveMini() {
-  this->service_uuid_ = espbt::ESPBTUUID::from_raw(SERVICE_UUID);
-  this->sensors_data_characteristic_uuid_ = espbt::ESPBTUUID::from_raw(CHARACTERISTIC_UUID);
-  this->access_control_point_characteristic_uuid_ =
-      espbt::ESPBTUUID::from_raw(ACCESS_CONTROL_POINT_CHARACTERISTIC_UUID);
+  this->service_uuid_ = esp32_ble_tracker::ESPBTUUID::from_raw(SERVICE_UUID);
+  this->sensors_data_characteristic_uuid_ = esp32_ble_tracker::ESPBTUUID::from_raw(CHARACTERISTIC_UUID);
 }
 
 }  // namespace airthings_wave_mini

esphome/components/airthings_wave_mini/airthings_wave_mini.h

@@ -7,11 +7,8 @@
 namespace esphome {
 namespace airthings_wave_mini {
 
-namespace espbt = esphome::esp32_ble_tracker;
-
 static const char *const SERVICE_UUID = "b42e3882-ade7-11e4-89d3-123b93f75cba";
 static const char *const CHARACTERISTIC_UUID = "b42e3b98-ade7-11e4-89d3-123b93f75cba";
-static const char *const ACCESS_CONTROL_POINT_CHARACTERISTIC_UUID = "b42e3ef4-ade7-11e4-89d3-123b93f75cba";
 
 class AirthingsWaveMini : public airthings_wave_base::AirthingsWaveBase {
  public:
@@ -20,7 +17,7 @@ class AirthingsWaveMini : public airthings_wave_base::AirthingsWaveBase {
   void dump_config() override;
 
  protected:
-  void read_sensors(uint8_t *raw_value, uint16_t value_len) override;
+  void read_sensors(uint8_t *value, uint16_t value_len) override;
 
   struct WaveMiniReadings {
     uint16_t unused01;

esphome/components/airthings_wave_plus/airthings_wave_plus.cpp

@@ -43,17 +43,20 @@ void AirthingsWavePlus::read_sensors(uint8_t *raw_value, uint16_t value_len) {
       if ((this->tvoc_sensor_ != nullptr) && this->is_valid_voc_value_(value->voc)) {
         this->tvoc_sensor_->publish_state(value->voc);
       }
+
+      // This instance must not stay connected
+      // so other clients can connect to it (e.g. the
+      // mobile app).
+      this->parent()->set_enabled(false);
     } else {
       ESP_LOGE(TAG, "Invalid payload version (%d != 1, newer version or not a Wave Plus?)", value->version);
     }
   }
-
-  this->response_received_();
 }
 
-bool AirthingsWavePlus::is_valid_radon_value_(uint16_t radon) { return radon <= 16383; }
+bool AirthingsWavePlus::is_valid_radon_value_(uint16_t radon) { return 0 <= radon && radon <= 16383; }
 
-bool AirthingsWavePlus::is_valid_co2_value_(uint16_t co2) { return co2 <= 16383; }
+bool AirthingsWavePlus::is_valid_co2_value_(uint16_t co2) { return 0 <= co2 && co2 <= 16383; }
 
 void AirthingsWavePlus::dump_config() {
   // these really don't belong here, but there doesn't seem to be a
@@ -63,7 +66,6 @@ void AirthingsWavePlus::dump_config() {
   LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
   LOG_SENSOR("  ", "Pressure", this->pressure_sensor_);
   LOG_SENSOR("  ", "TVOC", this->tvoc_sensor_);
-  LOG_SENSOR("  ", "Battery Voltage", this->battery_voltage_);
 
   LOG_SENSOR("  ", "Radon", this->radon_sensor_);
   LOG_SENSOR("  ", "Radon Long Term", this->radon_long_term_sensor_);
@@ -71,10 +73,8 @@ void AirthingsWavePlus::dump_config() {
 }
 
 AirthingsWavePlus::AirthingsWavePlus() {
-  this->service_uuid_ = espbt::ESPBTUUID::from_raw(SERVICE_UUID);
-  this->sensors_data_characteristic_uuid_ = espbt::ESPBTUUID::from_raw(CHARACTERISTIC_UUID);
-  this->access_control_point_characteristic_uuid_ =
-      espbt::ESPBTUUID::from_raw(ACCESS_CONTROL_POINT_CHARACTERISTIC_UUID);
+  this->service_uuid_ = esp32_ble_tracker::ESPBTUUID::from_raw(SERVICE_UUID);
+  this->sensors_data_characteristic_uuid_ = esp32_ble_tracker::ESPBTUUID::from_raw(CHARACTERISTIC_UUID);
 }
 
 }  // namespace airthings_wave_plus

esphome/components/airthings_wave_plus/airthings_wave_plus.h

@@ -7,11 +7,8 @@
 namespace esphome {
 namespace airthings_wave_plus {
 
-namespace espbt = esphome::esp32_ble_tracker;
-
 static const char *const SERVICE_UUID = "b42e1c08-ade7-11e4-89d3-123b93f75cba";
 static const char *const CHARACTERISTIC_UUID = "b42e2a68-ade7-11e4-89d3-123b93f75cba";
-static const char *const ACCESS_CONTROL_POINT_CHARACTERISTIC_UUID = "b42e2d06-ade7-11e4-89d3-123b93f75cba";
 
 class AirthingsWavePlus : public airthings_wave_base::AirthingsWaveBase {
  public:
@@ -27,7 +24,7 @@ class AirthingsWavePlus : public airthings_wave_base::AirthingsWaveBase {
   bool is_valid_radon_value_(uint16_t radon);
   bool is_valid_co2_value_(uint16_t co2);
 
-  void read_sensors(uint8_t *raw_value, uint16_t value_len) override;
+  void read_sensors(uint8_t *value, uint16_t value_len) override;
 
   sensor::Sensor *radon_sensor_{nullptr};
   sensor::Sensor *radon_long_term_sensor_{nullptr};

esphome/components/airthings_wave_plus/sensor.py

@@ -53,12 +53,12 @@ async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await airthings_wave_base.wave_base_to_code(var, config)
 
-    if config_radon := config.get(CONF_RADON):
-        sens = await sensor.new_sensor(config_radon)
+    if CONF_RADON in config:
+        sens = await sensor.new_sensor(config[CONF_RADON])
         cg.add(var.set_radon(sens))
-    if config_radon_long_term := config.get(CONF_RADON_LONG_TERM):
-        sens = await sensor.new_sensor(config_radon_long_term)
+    if CONF_RADON_LONG_TERM in config:
+        sens = await sensor.new_sensor(config[CONF_RADON_LONG_TERM])
         cg.add(var.set_radon_long_term(sens))
-    if config_co2 := config.get(CONF_CO2):
-        sens = await sensor.new_sensor(config_co2)
+    if CONF_CO2 in config:
+        sens = await sensor.new_sensor(config[CONF_CO2])
         cg.add(var.set_co2(sens))

esphome/components/alarm_control_panel/__init__.py

@@ -16,12 +16,6 @@ IS_PLATFORM_COMPONENT = True
 
 CONF_ON_TRIGGERED = "on_triggered"
 CONF_ON_CLEARED = "on_cleared"
-CONF_ON_ARMING = "on_arming"
-CONF_ON_PENDING = "on_pending"
-CONF_ON_ARMED_HOME = "on_armed_home"
-CONF_ON_ARMED_NIGHT = "on_armed_night"
-CONF_ON_ARMED_AWAY = "on_armed_away"
-CONF_ON_DISARMED = "on_disarmed"
 
 alarm_control_panel_ns = cg.esphome_ns.namespace("alarm_control_panel")
 AlarmControlPanel = alarm_control_panel_ns.class_("AlarmControlPanel", cg.EntityBase)
@@ -35,27 +29,8 @@ TriggeredTrigger = alarm_control_panel_ns.class_(
 ClearedTrigger = alarm_control_panel_ns.class_(
     "ClearedTrigger", automation.Trigger.template()
 )
-ArmingTrigger = alarm_control_panel_ns.class_(
-    "ArmingTrigger", automation.Trigger.template()
-)
-PendingTrigger = alarm_control_panel_ns.class_(
-    "PendingTrigger", automation.Trigger.template()
-)
-ArmedHomeTrigger = alarm_control_panel_ns.class_(
-    "ArmedHomeTrigger", automation.Trigger.template()
-)
-ArmedNightTrigger = alarm_control_panel_ns.class_(
-    "ArmedNightTrigger", automation.Trigger.template()
-)
-ArmedAwayTrigger = alarm_control_panel_ns.class_(
-    "ArmedAwayTrigger", automation.Trigger.template()
-)
-DisarmedTrigger = alarm_control_panel_ns.class_(
-    "DisarmedTrigger", automation.Trigger.template()
-)
 ArmAwayAction = alarm_control_panel_ns.class_("ArmAwayAction", automation.Action)
 ArmHomeAction = alarm_control_panel_ns.class_("ArmHomeAction", automation.Action)
-ArmNightAction = alarm_control_panel_ns.class_("ArmNightAction", automation.Action)
 DisarmAction = alarm_control_panel_ns.class_("DisarmAction", automation.Action)
 PendingAction = alarm_control_panel_ns.class_("PendingAction", automation.Action)
 TriggeredAction = alarm_control_panel_ns.class_("TriggeredAction", automation.Action)
@@ -76,36 +51,6 @@ ALARM_CONTROL_PANEL_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(
                 cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(TriggeredTrigger),
             }
         ),
-        cv.Optional(CONF_ON_ARMING): automation.validate_automation(
-            {
-                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ArmingTrigger),
-            }
-        ),
-        cv.Optional(CONF_ON_PENDING): automation.validate_automation(
-            {
-                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(PendingTrigger),
-            }
-        ),
-        cv.Optional(CONF_ON_ARMED_HOME): automation.validate_automation(
-            {
-                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ArmedHomeTrigger),
-            }
-        ),
-        cv.Optional(CONF_ON_ARMED_NIGHT): automation.validate_automation(
-            {
-                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ArmedNightTrigger),
-            }
-        ),
-        cv.Optional(CONF_ON_ARMED_AWAY): automation.validate_automation(
-            {
-                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ArmedAwayTrigger),
-            }
-        ),
-        cv.Optional(CONF_ON_DISARMED): automation.validate_automation(
-            {
-                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(DisarmedTrigger),
-            }
-        ),
         cv.Optional(CONF_ON_CLEARED): automation.validate_automation(
             {
                 cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ClearedTrigger),
@@ -136,24 +81,6 @@ async def setup_alarm_control_panel_core_(var, config):
     for conf in config.get(CONF_ON_TRIGGERED, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
         await automation.build_automation(trigger, [], conf)
-    for conf in config.get(CONF_ON_ARMING, []):
-        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-        await automation.build_automation(trigger, [], conf)
-    for conf in config.get(CONF_ON_PENDING, []):
-        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-        await automation.build_automation(trigger, [], conf)
-    for conf in config.get(CONF_ON_ARMED_HOME, []):
-        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-        await automation.build_automation(trigger, [], conf)
-    for conf in config.get(CONF_ON_ARMED_NIGHT, []):
-        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-        await automation.build_automation(trigger, [], conf)
-    for conf in config.get(CONF_ON_ARMED_AWAY, []):
-        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-        await automation.build_automation(trigger, [], conf)
-    for conf in config.get(CONF_ON_DISARMED, []):
-        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-        await automation.build_automation(trigger, [], conf)
     for conf in config.get(CONF_ON_CLEARED, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
         await automation.build_automation(trigger, [], conf)
@@ -172,8 +99,8 @@ async def register_alarm_control_panel(var, config):
 async def alarm_action_arm_away_to_code(config, action_id, template_arg, args):
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
-    if code_config := config.get(CONF_CODE):
-        templatable_ = await cg.templatable(code_config, args, cg.std_string)
+    if CONF_CODE in config:
+        templatable_ = await cg.templatable(config[CONF_CODE], args, cg.std_string)
         cg.add(var.set_code(templatable_))
     return var
 
@@ -182,18 +109,6 @@ async def alarm_action_arm_away_to_code(config, action_id, template_arg, args):
     "alarm_control_panel.arm_home", ArmHomeAction, ALARM_CONTROL_PANEL_ACTION_SCHEMA
 )
 async def alarm_action_arm_home_to_code(config, action_id, template_arg, args):
-    paren = await cg.get_variable(config[CONF_ID])
-    var = cg.new_Pvariable(action_id, template_arg, paren)
-    if code_config := config.get(CONF_CODE):
-        templatable_ = await cg.templatable(code_config, args, cg.std_string)
-        cg.add(var.set_code(templatable_))
-    return var
-
-
-@automation.register_action(
-    "alarm_control_panel.arm_night", ArmNightAction, ALARM_CONTROL_PANEL_ACTION_SCHEMA
-)
-async def alarm_action_arm_night_to_code(config, action_id, template_arg, args):
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
     if CONF_CODE in config:
@@ -208,8 +123,8 @@ async def alarm_action_arm_night_to_code(config, action_id, template_arg, args):
 async def alarm_action_disarm_to_code(config, action_id, template_arg, args):
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
-    if code_config := config.get(CONF_CODE):
-        templatable_ = await cg.templatable(code_config, args, cg.std_string)
+    if CONF_CODE in config:
+        templatable_ = await cg.templatable(config[CONF_CODE], args, cg.std_string)
         cg.add(var.set_code(templatable_))
     return var
 

esphome/components/alarm_control_panel/alarm_control_panel.cpp

@@ -36,20 +36,7 @@ void AlarmControlPanel::publish_state(AlarmControlPanelState state) {
     this->state_callback_.call();
     if (state == ACP_STATE_TRIGGERED) {
       this->triggered_callback_.call();
-    } else if (state == ACP_STATE_ARMING) {
-      this->arming_callback_.call();
-    } else if (state == ACP_STATE_PENDING) {
-      this->pending_callback_.call();
-    } else if (state == ACP_STATE_ARMED_HOME) {
-      this->armed_home_callback_.call();
-    } else if (state == ACP_STATE_ARMED_NIGHT) {
-      this->armed_night_callback_.call();
-    } else if (state == ACP_STATE_ARMED_AWAY) {
-      this->armed_away_callback_.call();
-    } else if (state == ACP_STATE_DISARMED) {
-      this->disarmed_callback_.call();
     }
-
     if (prev_state == ACP_STATE_TRIGGERED) {
       this->cleared_callback_.call();
     }
@@ -68,30 +55,6 @@ void AlarmControlPanel::add_on_triggered_callback(std::function<void()> &&callba
   this->triggered_callback_.add(std::move(callback));
 }
 
-void AlarmControlPanel::add_on_arming_callback(std::function<void()> &&callback) {
-  this->arming_callback_.add(std::move(callback));
-}
-
-void AlarmControlPanel::add_on_armed_home_callback(std::function<void()> &&callback) {
-  this->armed_home_callback_.add(std::move(callback));
-}
-
-void AlarmControlPanel::add_on_armed_night_callback(std::function<void()> &&callback) {
-  this->armed_night_callback_.add(std::move(callback));
-}
-
-void AlarmControlPanel::add_on_armed_away_callback(std::function<void()> &&callback) {
-  this->armed_away_callback_.add(std::move(callback));
-}
-
-void AlarmControlPanel::add_on_pending_callback(std::function<void()> &&callback) {
-  this->pending_callback_.add(std::move(callback));
-}
-
-void AlarmControlPanel::add_on_disarmed_callback(std::function<void()> &&callback) {
-  this->disarmed_callback_.add(std::move(callback));
-}
-
 void AlarmControlPanel::add_on_cleared_callback(std::function<void()> &&callback) {
   this->cleared_callback_.add(std::move(callback));
 }

esphome/components/alarm_control_panel/alarm_control_panel.h

@@ -47,42 +47,6 @@ class AlarmControlPanel : public EntityBase {
    */
   void add_on_triggered_callback(std::function<void()> &&callback);
 
-  /** Add a callback for when the state of the alarm_control_panel chanes to arming
-   *
-   * @param callback The callback function
-   */
-  void add_on_arming_callback(std::function<void()> &&callback);
-
-  /** Add a callback for when the state of the alarm_control_panel changes to pending
-   *
-   * @param callback The callback function
-   */
-  void add_on_pending_callback(std::function<void()> &&callback);
-
-  /** Add a callback for when the state of the alarm_control_panel changes to armed_home
-   *
-   * @param callback The callback function
-   */
-  void add_on_armed_home_callback(std::function<void()> &&callback);
-
-  /** Add a callback for when the state of the alarm_control_panel changes to armed_night
-   *
-   * @param callback The callback function
-   */
-  void add_on_armed_night_callback(std::function<void()> &&callback);
-
-  /** Add a callback for when the state of the alarm_control_panel changes to armed_away
-   *
-   * @param callback The callback function
-   */
-  void add_on_armed_away_callback(std::function<void()> &&callback);
-
-  /** Add a callback for when the state of the alarm_control_panel changes to disarmed
-   *
-   * @param callback The callback function
-   */
-  void add_on_disarmed_callback(std::function<void()> &&callback);
-
   /** Add a callback for when the state of the alarm_control_panel clears from triggered
    *
    * @param callback The callback function
@@ -164,18 +128,6 @@ class AlarmControlPanel : public EntityBase {
   CallbackManager<void()> state_callback_{};
   // trigger callback
   CallbackManager<void()> triggered_callback_{};
-  // arming callback
-  CallbackManager<void()> arming_callback_{};
-  // pending callback
-  CallbackManager<void()> pending_callback_{};
-  // armed_home callback
-  CallbackManager<void()> armed_home_callback_{};
-  // armed_night callback
-  CallbackManager<void()> armed_night_callback_{};
-  // armed_away callback
-  CallbackManager<void()> armed_away_callback_{};
-  // disarmed callback
-  CallbackManager<void()> disarmed_callback_{};
   // clear callback
   CallbackManager<void()> cleared_callback_{};
 };

esphome/components/alarm_control_panel/alarm_control_panel_call.cpp

@@ -85,11 +85,6 @@ void AlarmControlPanelCall::validate_() {
       this->state_.reset();
       return;
     }
-    if (state == ACP_STATE_ARMED_NIGHT && (this->parent_->get_supported_features() & ACP_FEAT_ARM_NIGHT) == 0) {
-      ESP_LOGW(TAG, "Cannot arm night when not supported");
-      this->state_.reset();
-      return;
-    }
   }
 }
 

esphome/components/alarm_control_panel/alarm_control_panel_state.cpp

@@ -12,7 +12,7 @@ const LogString *alarm_control_panel_state_to_string(AlarmControlPanelState stat
     case ACP_STATE_ARMED_AWAY:
       return LOG_STR("ARMED_AWAY");
     case ACP_STATE_ARMED_NIGHT:
-      return LOG_STR("ARMED_NIGHT");
+      return LOG_STR("NIGHT");
     case ACP_STATE_ARMED_VACATION:
       return LOG_STR("ARMED_VACATION");
     case ACP_STATE_ARMED_CUSTOM_BYPASS:

esphome/components/alarm_control_panel/automation.h

@@ -20,48 +20,6 @@ class TriggeredTrigger : public Trigger<> {
   }
 };
 
-class ArmingTrigger : public Trigger<> {
- public:
-  explicit ArmingTrigger(AlarmControlPanel *alarm_control_panel) {
-    alarm_control_panel->add_on_arming_callback([this]() { this->trigger(); });
-  }
-};
-
-class PendingTrigger : public Trigger<> {
- public:
-  explicit PendingTrigger(AlarmControlPanel *alarm_control_panel) {
-    alarm_control_panel->add_on_pending_callback([this]() { this->trigger(); });
-  }
-};
-
-class ArmedHomeTrigger : public Trigger<> {
- public:
-  explicit ArmedHomeTrigger(AlarmControlPanel *alarm_control_panel) {
-    alarm_control_panel->add_on_armed_home_callback([this]() { this->trigger(); });
-  }
-};
-
-class ArmedNightTrigger : public Trigger<> {
- public:
-  explicit ArmedNightTrigger(AlarmControlPanel *alarm_control_panel) {
-    alarm_control_panel->add_on_armed_night_callback([this]() { this->trigger(); });
-  }
-};
-
-class ArmedAwayTrigger : public Trigger<> {
- public:
-  explicit ArmedAwayTrigger(AlarmControlPanel *alarm_control_panel) {
-    alarm_control_panel->add_on_armed_away_callback([this]() { this->trigger(); });
-  }
-};
-
-class DisarmedTrigger : public Trigger<> {
- public:
-  explicit DisarmedTrigger(AlarmControlPanel *alarm_control_panel) {
-    alarm_control_panel->add_on_disarmed_callback([this]() { this->trigger(); });
-  }
-};
-
 class ClearedTrigger : public Trigger<> {
  public:
   explicit ClearedTrigger(AlarmControlPanel *alarm_control_panel) {
@@ -109,26 +67,6 @@ template<typename... Ts> class ArmHomeAction : public Action<Ts...> {
   AlarmControlPanel *alarm_control_panel_;
 };
 
-template<typename... Ts> class ArmNightAction : public Action<Ts...> {
- public:
-  explicit ArmNightAction(AlarmControlPanel *alarm_control_panel) : alarm_control_panel_(alarm_control_panel) {}
-
-  TEMPLATABLE_VALUE(std::string, code)
-
-  void play(Ts... x) override {
-    auto call = this->alarm_control_panel_->make_call();
-    auto code = this->code_.optional_value(x...);
-    if (code.has_value()) {
-      call.set_code(code.value());
-    }
-    call.arm_night();
-    call.perform();
-  }
-
- protected:
-  AlarmControlPanel *alarm_control_panel_;
-};
-
 template<typename... Ts> class DisarmAction : public Action<Ts...> {
  public:
   explicit DisarmAction(AlarmControlPanel *alarm_control_panel) : alarm_control_panel_(alarm_control_panel) {}

esphome/components/alpha3/__init__.py

@@ -1 +0,0 @@
-CODEOWNERS = ["@jan-hofmeier"]

esphome/components/alpha3/alpha3.cpp

@@ -1,189 +0,0 @@
-#include "alpha3.h"
-#include "esphome/core/log.h"
-#include "esphome/core/application.h"
-#include <lwip/sockets.h>  //gives ntohl
-
-#ifdef USE_ESP32
-
-namespace esphome {
-namespace alpha3 {
-
-static const char *const TAG = "alpha3";
-
-void Alpha3::dump_config() {
-  ESP_LOGCONFIG(TAG, "ALPHA3");
-  LOG_SENSOR(" ", "Flow", this->flow_sensor_);
-  LOG_SENSOR(" ", "Head", this->head_sensor_);
-  LOG_SENSOR(" ", "Power", this->power_sensor_);
-  LOG_SENSOR(" ", "Current", this->current_sensor_);
-  LOG_SENSOR(" ", "Speed", this->speed_sensor_);
-  LOG_SENSOR(" ", "Voltage", this->voltage_sensor_);
-}
-
-void Alpha3::setup() {}
-
-void Alpha3::extract_publish_sensor_value_(const uint8_t *response, int16_t length, int16_t response_offset,
-                                           int16_t value_offset, sensor::Sensor *sensor, float factor) {
-  if (sensor == nullptr)
-    return;
-  // we need to handle cases where a value is split over two packets
-  const int16_t value_length = 4;  // 32bit float
-  // offset inside current response packet
-  auto rel_offset = value_offset - response_offset;
-  if (rel_offset <= -value_length)
-    return;  // aready passed the value completly
-  if (rel_offset >= length)
-    return;  // value not in this packet
-
-  auto start_offset = std::max(0, rel_offset);
-  auto end_offset = std::min((int16_t) (rel_offset + value_length), length);
-  auto copy_length = end_offset - start_offset;
-  auto buffer_offset = std::max(-rel_offset, 0);
-  std::memcpy(this->buffer_ + buffer_offset, response + start_offset, copy_length);
-
-  if (rel_offset + value_length <= length) {
-    // we have the whole value
-    void *buffer = this->buffer_;                          // to prevent warnings when casting the pointer
-    *((int32_t *) buffer) = ntohl(*((int32_t *) buffer));  // values are big endian
-    float fvalue = *((float *) buffer);
-    sensor->publish_state(fvalue * factor);
-  }
-}
-
-bool Alpha3::is_current_response_type_(const uint8_t *response_type) {
-  return !std::memcmp(this->response_type_, response_type, GENI_RESPONSE_TYPE_LENGTH);
-}
-
-void Alpha3::handle_geni_response_(const uint8_t *response, uint16_t length) {
-  if (this->response_offset_ >= this->response_length_) {
-    ESP_LOGD(TAG, "[%s] GENI response begin", this->parent_->address_str().c_str());
-    if (length < GENI_RESPONSE_HEADER_LENGTH) {
-      ESP_LOGW(TAG, "[%s] response to short", this->parent_->address_str().c_str());
-      return;
-    }
-    if (response[0] != 36 || response[2] != 248 || response[3] != 231 || response[4] != 10) {
-      ESP_LOGW(TAG, "[%s] response bytes %d %d %d %d %d don't match GENI HEADER", this->parent_->address_str().c_str(),
-               response[0], response[1], response[2], response[3], response[4]);
-      return;
-    }
-    this->response_length_ = response[1] - GENI_RESPONSE_HEADER_LENGTH + 2;  // maybe 2 byte checksum
-    this->response_offset_ = -GENI_RESPONSE_HEADER_LENGTH;
-    std::memcpy(this->response_type_, response + 5, GENI_RESPONSE_TYPE_LENGTH);
-  }
-
-  auto extract_publish_sensor_value = [response, length, this](int16_t value_offset, sensor::Sensor *sensor,
-                                                               float factor) {
-    this->extract_publish_sensor_value_(response, length, this->response_offset_, value_offset, sensor, factor);
-  };
-
-  if (this->is_current_response_type_(GENI_RESPONSE_TYPE_FLOW_HEAD)) {
-    ESP_LOGD(TAG, "[%s] FLOW HEAD Response", this->parent_->address_str().c_str());
-    extract_publish_sensor_value(GENI_RESPONSE_FLOW_OFFSET, this->flow_sensor_, 3600.0F);
-    extract_publish_sensor_value(GENI_RESPONSE_HEAD_OFFSET, this->head_sensor_, .0001F);
-  } else if (this->is_current_response_type_(GENI_RESPONSE_TYPE_POWER)) {
-    ESP_LOGD(TAG, "[%s] POWER Response", this->parent_->address_str().c_str());
-    extract_publish_sensor_value(GENI_RESPONSE_POWER_OFFSET, this->power_sensor_, 1.0F);
-    extract_publish_sensor_value(GENI_RESPONSE_CURRENT_OFFSET, this->current_sensor_, 1.0F);
-    extract_publish_sensor_value(GENI_RESPONSE_MOTOR_SPEED_OFFSET, this->speed_sensor_, 1.0F);
-    extract_publish_sensor_value(GENI_RESPONSE_VOLTAGE_AC_OFFSET, this->voltage_sensor_, 1.0F);
-  } else {
-    ESP_LOGW(TAG, "unkown GENI response Type %d %d %d %d %d %d %d %d", this->response_type_[0], this->response_type_[1],
-             this->response_type_[2], this->response_type_[3], this->response_type_[4], this->response_type_[5],
-             this->response_type_[6], this->response_type_[7]);
-  }
-  this->response_offset_ += length;
-}
-
-void Alpha3::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if, esp_ble_gattc_cb_param_t *param) {
-  switch (event) {
-    case ESP_GATTC_OPEN_EVT: {
-      this->response_offset_ = 0;
-      this->response_length_ = 0;
-      ESP_LOGI(TAG, "[%s] connection open", this->parent_->address_str().c_str());
-      break;
-    }
-    case ESP_GATTC_CONNECT_EVT: {
-      if (std::memcmp(param->connect.remote_bda, this->parent_->get_remote_bda(), 6) != 0)
-        return;
-      auto ret = esp_ble_set_encryption(param->connect.remote_bda, ESP_BLE_SEC_ENCRYPT);
-      if (ret) {
-        ESP_LOGW(TAG, "esp_ble_set_encryption failed, status=%x", ret);
-      }
-      break;
-    }
-    case ESP_GATTC_DISCONNECT_EVT: {
-      this->node_state = espbt::ClientState::IDLE;
-      if (this->flow_sensor_ != nullptr)
-        this->flow_sensor_->publish_state(NAN);
-      if (this->head_sensor_ != nullptr)
-        this->head_sensor_->publish_state(NAN);
-      if (this->power_sensor_ != nullptr)
-        this->power_sensor_->publish_state(NAN);
-      if (this->current_sensor_ != nullptr)
-        this->current_sensor_->publish_state(NAN);
-      if (this->speed_sensor_ != nullptr)
-        this->speed_sensor_->publish_state(NAN);
-      if (this->speed_sensor_ != nullptr)
-        this->voltage_sensor_->publish_state(NAN);
-      break;
-    }
-    case ESP_GATTC_SEARCH_CMPL_EVT: {
-      auto *chr = this->parent_->get_characteristic(ALPHA3_GENI_SERVICE_UUID, ALPHA3_GENI_CHARACTERISTIC_UUID);
-      if (chr == nullptr) {
-        ESP_LOGE(TAG, "[%s] No GENI service found at device, not an Alpha3..?", this->parent_->address_str().c_str());
-        break;
-      }
-      auto status = esp_ble_gattc_register_for_notify(this->parent_->get_gattc_if(), this->parent_->get_remote_bda(),
-                                                      chr->handle);
-      if (status) {
-        ESP_LOGW(TAG, "esp_ble_gattc_register_for_notify failed, status=%d", status);
-      }
-      this->geni_handle_ = chr->handle;
-      break;
-    }
-    case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
-      this->node_state = espbt::ClientState::ESTABLISHED;
-      this->update();
-      break;
-    }
-    case ESP_GATTC_NOTIFY_EVT: {
-      if (param->notify.handle == this->geni_handle_) {
-        this->handle_geni_response_(param->notify.value, param->notify.value_len);
-      }
-      break;
-    }
-    default:
-      break;
-  }
-}
-
-void Alpha3::send_request_(uint8_t *request, size_t len) {
-  auto status =
-      esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->geni_handle_, len,
-                               request, 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);
-}
-
-void Alpha3::update() {
-  if (this->node_state != espbt::ClientState::ESTABLISHED) {
-    ESP_LOGW(TAG, "[%s] Cannot poll, not connected", this->parent_->address_str().c_str());
-    return;
-  }
-
-  if (this->flow_sensor_ != nullptr || this->head_sensor_ != nullptr) {
-    uint8_t geni_request_flow_head[] = {39, 7, 231, 248, 10, 3, 93, 1, 33, 82, 31};
-    this->send_request_(geni_request_flow_head, sizeof(geni_request_flow_head));
-    delay(25);  // need to wait between requests
-  }
-  if (this->power_sensor_ != nullptr || this->current_sensor_ != nullptr || this->speed_sensor_ != nullptr ||
-      this->voltage_sensor_ != nullptr) {
-    uint8_t geni_request_power[] = {39, 7, 231, 248, 10, 3, 87, 0, 69, 138, 205};
-    this->send_request_(geni_request_power, sizeof(geni_request_power));
-    delay(25);  // need to wait between requests
-  }
-}
-}  // namespace alpha3
-}  // namespace esphome
-
-#endif

esphome/components/alpha3/alpha3.h

@@ -1,73 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/ble_client/ble_client.h"
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
-#include "esphome/components/sensor/sensor.h"
-
-#ifdef USE_ESP32
-
-#include <esp_gattc_api.h>
-
-namespace esphome {
-namespace alpha3 {
-
-namespace espbt = esphome::esp32_ble_tracker;
-
-static const espbt::ESPBTUUID ALPHA3_GENI_SERVICE_UUID = espbt::ESPBTUUID::from_uint16(0xfe5d);
-static const espbt::ESPBTUUID ALPHA3_GENI_CHARACTERISTIC_UUID =
-    espbt::ESPBTUUID::from_raw({static_cast<char>(0xa9), 0x7b, static_cast<char>(0xb8), static_cast<char>(0x85), 0x0,
-                                0x1a, 0x28, static_cast<char>(0xaa), 0x2a, 0x43, 0x6e, 0x3, static_cast<char>(0xd1),
-                                static_cast<char>(0xff), static_cast<char>(0x9c), static_cast<char>(0x85)});
-static const int16_t GENI_RESPONSE_HEADER_LENGTH = 13;
-static const size_t GENI_RESPONSE_TYPE_LENGTH = 8;
-
-static const uint8_t GENI_RESPONSE_TYPE_FLOW_HEAD[GENI_RESPONSE_TYPE_LENGTH] = {31, 0, 1, 48, 1, 0, 0, 24};
-static const int16_t GENI_RESPONSE_FLOW_OFFSET = 0;
-static const int16_t GENI_RESPONSE_HEAD_OFFSET = 4;
-
-static const uint8_t GENI_RESPONSE_TYPE_POWER[GENI_RESPONSE_TYPE_LENGTH] = {44, 0, 1, 0, 1, 0, 0, 37};
-static const int16_t GENI_RESPONSE_VOLTAGE_AC_OFFSET = 0;
-static const int16_t GENI_RESPONSE_VOLTAGE_DC_OFFSET = 4;
-static const int16_t GENI_RESPONSE_CURRENT_OFFSET = 8;
-static const int16_t GENI_RESPONSE_POWER_OFFSET = 12;
-static const int16_t GENI_RESPONSE_MOTOR_POWER_OFFSET = 16;  // not sure
-static const int16_t GENI_RESPONSE_MOTOR_SPEED_OFFSET = 20;
-
-class Alpha3 : public esphome::ble_client::BLEClientNode, public PollingComponent {
- public:
-  void setup() override;
-  void update() override;
-  void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                           esp_ble_gattc_cb_param_t *param) override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::DATA; }
-  void set_flow_sensor(sensor::Sensor *sensor) { this->flow_sensor_ = sensor; }
-  void set_head_sensor(sensor::Sensor *sensor) { this->head_sensor_ = sensor; }
-  void set_power_sensor(sensor::Sensor *sensor) { this->power_sensor_ = sensor; }
-  void set_current_sensor(sensor::Sensor *sensor) { this->current_sensor_ = sensor; }
-  void set_speed_sensor(sensor::Sensor *sensor) { this->speed_sensor_ = sensor; }
-  void set_voltage_sensor(sensor::Sensor *sensor) { this->voltage_sensor_ = sensor; }
-
- protected:
-  sensor::Sensor *flow_sensor_{nullptr};
-  sensor::Sensor *head_sensor_{nullptr};
-  sensor::Sensor *power_sensor_{nullptr};
-  sensor::Sensor *current_sensor_{nullptr};
-  sensor::Sensor *speed_sensor_{nullptr};
-  sensor::Sensor *voltage_sensor_{nullptr};
-  uint16_t geni_handle_;
-  int16_t response_length_;
-  int16_t response_offset_;
-  uint8_t response_type_[GENI_RESPONSE_TYPE_LENGTH];
-  uint8_t buffer_[4];
-  void extract_publish_sensor_value_(const uint8_t *response, int16_t length, int16_t response_offset,
-                                     int16_t value_offset, sensor::Sensor *sensor, float factor);
-  void handle_geni_response_(const uint8_t *response, uint16_t length);
-  void send_request_(uint8_t *request, size_t len);
-  bool is_current_response_type_(const uint8_t *response_type);
-};
-}  // namespace alpha3
-}  // namespace esphome
-
-#endif

esphome/components/alpha3/sensor.py

@@ -1,85 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor, ble_client
-from esphome.const import (
-    CONF_ID,
-    CONF_CURRENT,
-    CONF_FLOW,
-    CONF_HEAD,
-    CONF_POWER,
-    CONF_SPEED,
-    CONF_VOLTAGE,
-    UNIT_AMPERE,
-    UNIT_VOLT,
-    UNIT_WATT,
-    UNIT_METER,
-    UNIT_CUBIC_METER_PER_HOUR,
-    UNIT_REVOLUTIONS_PER_MINUTE,
-)
-
-alpha3_ns = cg.esphome_ns.namespace("alpha3")
-Alpha3 = alpha3_ns.class_("Alpha3", ble_client.BLEClientNode, cg.PollingComponent)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(Alpha3),
-            cv.Optional(CONF_FLOW): sensor.sensor_schema(
-                unit_of_measurement=UNIT_CUBIC_METER_PER_HOUR,
-                accuracy_decimals=2,
-            ),
-            cv.Optional(CONF_HEAD): sensor.sensor_schema(
-                unit_of_measurement=UNIT_METER,
-                accuracy_decimals=2,
-            ),
-            cv.Optional(CONF_POWER): sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT,
-                accuracy_decimals=2,
-            ),
-            cv.Optional(CONF_CURRENT): sensor.sensor_schema(
-                unit_of_measurement=UNIT_AMPERE,
-                accuracy_decimals=2,
-            ),
-            cv.Optional(CONF_SPEED): sensor.sensor_schema(
-                unit_of_measurement=UNIT_REVOLUTIONS_PER_MINUTE,
-                accuracy_decimals=2,
-            ),
-            cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_VOLT,
-                accuracy_decimals=2,
-            ),
-        }
-    )
-    .extend(ble_client.BLE_CLIENT_SCHEMA)
-    .extend(cv.polling_component_schema("15s"))
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await ble_client.register_ble_node(var, config)
-
-    if flow_config := config.get(CONF_FLOW):
-        sens = await sensor.new_sensor(flow_config)
-        cg.add(var.set_flow_sensor(sens))
-
-    if head_config := config.get(CONF_HEAD):
-        sens = await sensor.new_sensor(head_config)
-        cg.add(var.set_head_sensor(sens))
-
-    if power_config := config.get(CONF_POWER):
-        sens = await sensor.new_sensor(power_config)
-        cg.add(var.set_power_sensor(sens))
-
-    if current_config := config.get(CONF_CURRENT):
-        sens = await sensor.new_sensor(current_config)
-        cg.add(var.set_current_sensor(sens))
-
-    if speed_config := config.get(CONF_SPEED):
-        sens = await sensor.new_sensor(speed_config)
-        cg.add(var.set_speed_sensor(sens))
-
-    if voltage_config := config.get(CONF_VOLTAGE):
-        sens = await sensor.new_sensor(voltage_config)
-        cg.add(var.set_voltage_sensor(sens))

esphome/components/am2320/sensor.py

@@ -47,10 +47,10 @@ async def to_code(config):
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
+    if CONF_TEMPERATURE in config:
+        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
         cg.add(var.set_temperature_sensor(sens))
 
-    if humidity_config := config.get(CONF_HUMIDITY):
-        sens = await sensor.new_sensor(humidity_config)
+    if CONF_HUMIDITY in config:
+        sens = await sensor.new_sensor(config[CONF_HUMIDITY])
         cg.add(var.set_humidity_sensor(sens))

esphome/components/am43/sensor/__init__.py

@@ -44,10 +44,10 @@ async def to_code(config):
     await cg.register_component(var, config)
     await ble_client.register_ble_node(var, config)
 
-    if battery_level_config := config.get(CONF_BATTERY_LEVEL):
-        sens = await sensor.new_sensor(battery_level_config)
+    if CONF_BATTERY_LEVEL in config:
+        sens = await sensor.new_sensor(config[CONF_BATTERY_LEVEL])
         cg.add(var.set_battery(sens))
 
-    if illuminance_config := config.get(CONF_ILLUMINANCE):
-        sens = await sensor.new_sensor(illuminance_config)
+    if CONF_ILLUMINANCE in config:
+        sens = await sensor.new_sensor(config[CONF_ILLUMINANCE])
         cg.add(var.set_illuminance(sens))

esphome/components/animation/__init__.py

@@ -1,7 +1,7 @@
 import logging
 
-from esphome import automation, core
-from esphome.components import font
+from esphome import core
+from esphome.components import display, font
 import esphome.components.image as espImage
 from esphome.components.image import CONF_USE_TRANSPARENCY
 import esphome.config_validation as cv
@@ -18,30 +18,14 @@ from esphome.core import CORE, HexInt
 
 _LOGGER = logging.getLogger(__name__)
 
-AUTO_LOAD = ["image"]
-CODEOWNERS = ["@syndlex"]
 DEPENDENCIES = ["display"]
 MULTI_CONF = True
 
 CONF_LOOP = "loop"
 CONF_START_FRAME = "start_frame"
 CONF_END_FRAME = "end_frame"
-CONF_FRAME = "frame"
 
-animation_ns = cg.esphome_ns.namespace("animation")
-
-Animation_ = animation_ns.class_("Animation", espImage.Image_)
-
-# Actions
-NextFrameAction = animation_ns.class_(
-    "AnimationNextFrameAction", automation.Action, cg.Parented.template(Animation_)
-)
-PrevFrameAction = animation_ns.class_(
-    "AnimationPrevFrameAction", automation.Action, cg.Parented.template(Animation_)
-)
-SetFrameAction = animation_ns.class_(
-    "AnimationSetFrameAction", automation.Action, cg.Parented.template(Animation_)
-)
+Animation_ = display.display_ns.class_("Animation", espImage.Image_)
 
 
 def validate_cross_dependencies(config):
@@ -90,35 +74,7 @@ ANIMATION_SCHEMA = cv.Schema(
 
 CONFIG_SCHEMA = cv.All(font.validate_pillow_installed, ANIMATION_SCHEMA)
 
-NEXT_FRAME_SCHEMA = automation.maybe_simple_id(
-    {
-        cv.GenerateID(): cv.use_id(Animation_),
-    }
-)
-PREV_FRAME_SCHEMA = automation.maybe_simple_id(
-    {
-        cv.GenerateID(): cv.use_id(Animation_),
-    }
-)
-SET_FRAME_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.use_id(Animation_),
-        cv.Required(CONF_FRAME): cv.uint16_t,
-    }
-)
-
-
-@automation.register_action("animation.next_frame", NextFrameAction, NEXT_FRAME_SCHEMA)
-@automation.register_action("animation.prev_frame", PrevFrameAction, PREV_FRAME_SCHEMA)
-@automation.register_action("animation.set_frame", SetFrameAction, SET_FRAME_SCHEMA)
-async def animation_action_to_code(config, action_id, template_arg, args):
-    paren = await cg.get_variable(config[CONF_ID])
-    var = cg.new_Pvariable(action_id, template_arg, paren)
-
-    if (frame := config.get(CONF_FRAME)) is not None:
-        template_ = await cg.templatable(frame, args, cg.uint16)
-        cg.add(var.set_frame(template_))
-    return var
+CODEOWNERS = ["@syndlex"]
 
 
 async def to_code(config):
@@ -151,7 +107,7 @@ async def to_code(config):
         pos = 0
         for frameIndex in range(frames):
             image.seek(frameIndex)
-            frame = image.convert("LA", dither=Image.Dither.NONE)
+            frame = image.convert("LA", dither=Image.NONE)
             if CONF_RESIZE in config:
                 frame = frame.resize([width, height])
             pixels = list(frame.getdata())
@@ -259,7 +215,7 @@ async def to_code(config):
             if transparent:
                 alpha = image.split()[-1]
                 has_alpha = alpha.getextrema()[0] < 0xFF
-            frame = image.convert("1", dither=Image.Dither.NONE)
+            frame = image.convert("1", dither=Image.NONE)
             if CONF_RESIZE in config:
                 frame = frame.resize([width, height])
                 if transparent:
@@ -289,8 +245,8 @@ async def to_code(config):
         espImage.IMAGE_TYPE[config[CONF_TYPE]],
     )
     cg.add(var.set_transparency(transparent))
-    if loop_config := config.get(CONF_LOOP):
-        start = loop_config[CONF_START_FRAME]
-        end = loop_config.get(CONF_END_FRAME, frames)
-        count = loop_config.get(CONF_REPEAT, -1)
+    if CONF_LOOP in config:
+        start = config[CONF_LOOP][CONF_START_FRAME]
+        end = config[CONF_LOOP].get(CONF_END_FRAME, frames)
+        count = config[CONF_LOOP].get(CONF_REPEAT, -1)
         cg.add(var.set_loop(start, end, count))

esphome/components/animation/animation.h

@@ -1,67 +0,0 @@
-#pragma once
-#include "esphome/components/image/image.h"
-
-#include "esphome/core/automation.h"
-
-namespace esphome {
-namespace animation {
-
-class Animation : public image::Image {
- public:
-  Animation(const uint8_t *data_start, int width, int height, uint32_t animation_frame_count, image::ImageType type);
-
-  uint32_t get_animation_frame_count() const;
-  int get_current_frame() const;
-  void next_frame();
-  void prev_frame();
-
-  /** Selects a specific frame within the animation.
-   *
-   * @param frame If possitive, advance to the frame. If negative, recede to that frame from the end frame.
-   */
-  void set_frame(int frame);
-
-  void set_loop(uint32_t start_frame, uint32_t end_frame, int count);
-
- protected:
-  void update_data_start_();
-
-  const uint8_t *animation_data_start_;
-  int current_frame_;
-  uint32_t animation_frame_count_;
-  uint32_t loop_start_frame_;
-  uint32_t loop_end_frame_;
-  int loop_count_;
-  int loop_current_iteration_;
-};
-
-template<typename... Ts> class AnimationNextFrameAction : public Action<Ts...> {
- public:
-  AnimationNextFrameAction(Animation *parent) : parent_(parent) {}
-  void play(Ts... x) override { this->parent_->next_frame(); }
-
- protected:
-  Animation *parent_;
-};
-
-template<typename... Ts> class AnimationPrevFrameAction : public Action<Ts...> {
- public:
-  AnimationPrevFrameAction(Animation *parent) : parent_(parent) {}
-  void play(Ts... x) override { this->parent_->prev_frame(); }
-
- protected:
-  Animation *parent_;
-};
-
-template<typename... Ts> class AnimationSetFrameAction : public Action<Ts...> {
- public:
-  AnimationSetFrameAction(Animation *parent) : parent_(parent) {}
-  TEMPLATABLE_VALUE(uint16_t, frame)
-  void play(Ts... x) override { this->parent_->set_frame(this->frame_.value(x...)); }
-
- protected:
-  Animation *parent_;
-};
-
-}  // namespace animation
-}  // namespace esphome

esphome/components/api/__init__.py

@@ -18,8 +18,6 @@ from esphome.const import (
     CONF_TRIGGER_ID,
     CONF_EVENT,
     CONF_TAG,
-    CONF_ON_CLIENT_CONNECTED,
-    CONF_ON_CLIENT_DISCONNECTED,
 )
 from esphome.core import coroutine_with_priority
 
@@ -89,12 +87,6 @@ CONFIG_SCHEMA = cv.Schema(
                 cv.Required(CONF_KEY): validate_encryption_key,
             }
         ),
-        cv.Optional(CONF_ON_CLIENT_CONNECTED): automation.validate_automation(
-            single=True
-        ),
-        cv.Optional(CONF_ON_CLIENT_DISCONNECTED): automation.validate_automation(
-            single=True
-        ),
     }
 ).extend(cv.COMPONENT_SCHEMA)
 
@@ -124,22 +116,9 @@ async def to_code(config):
         cg.add(var.register_user_service(trigger))
         await automation.build_automation(trigger, func_args, conf)
 
-    if CONF_ON_CLIENT_CONNECTED in config:
-        await automation.build_automation(
-            var.get_client_connected_trigger(),
-            [(cg.std_string, "client_info"), (cg.std_string, "client_address")],
-            config[CONF_ON_CLIENT_CONNECTED],
-        )
-
-    if CONF_ON_CLIENT_DISCONNECTED in config:
-        await automation.build_automation(
-            var.get_client_disconnected_trigger(),
-            [(cg.std_string, "client_info"), (cg.std_string, "client_address")],
-            config[CONF_ON_CLIENT_DISCONNECTED],
-        )
-
-    if encryption_config := config.get(CONF_ENCRYPTION):
-        decoded = base64.b64decode(encryption_config[CONF_KEY])
+    if CONF_ENCRYPTION in config:
+        conf = config[CONF_ENCRYPTION]
+        decoded = base64.b64decode(conf[CONF_KEY])
         cg.add(var.set_noise_psk(list(decoded)))
         cg.add_define("USE_API_NOISE")
         cg.add_library("esphome/noise-c", "0.1.4")

esphome/components/api/api.proto

@@ -39,7 +39,6 @@ service APIConnection {
   rpc camera_image (CameraImageRequest) returns (void) {}
   rpc climate_command (ClimateCommandRequest) returns (void) {}
   rpc number_command (NumberCommandRequest) returns (void) {}
-  rpc text_command (TextCommandRequest) returns (void) {}
   rpc select_command (SelectCommandRequest) returns (void) {}
   rpc button_command (ButtonCommandRequest) returns (void) {}
   rpc lock_command (LockCommandRequest) returns (void) {}
@@ -217,8 +216,6 @@ message DeviceInfoResponse {
   string friendly_name = 13;
 
   uint32 voice_assistant_version = 14;
-
-  string suggested_area = 16;
 }
 
 message ListEntitiesRequest {
@@ -1416,18 +1413,6 @@ message SubscribeVoiceAssistantRequest {
   bool subscribe = 1;
 }
 
-enum VoiceAssistantRequestFlag {
-  VOICE_ASSISTANT_REQUEST_NONE = 0;
-  VOICE_ASSISTANT_REQUEST_USE_VAD = 1;
-  VOICE_ASSISTANT_REQUEST_USE_WAKE_WORD = 2;
-}
-
-message VoiceAssistantAudioSettings {
-  uint32 noise_suppression_level = 1;
-  uint32 auto_gain = 2;
-  float volume_multiplier = 3;
-}
-
 message VoiceAssistantRequest {
   option (id) = 90;
   option (source) = SOURCE_SERVER;
@@ -1435,8 +1420,6 @@ message VoiceAssistantRequest {
 
   bool start = 1;
   string conversation_id = 2;
-  uint32 flags = 3;
-  VoiceAssistantAudioSettings audio_settings = 4;
 }
 
 message VoiceAssistantResponse {
@@ -1458,12 +1441,6 @@ enum VoiceAssistantEvent {
   VOICE_ASSISTANT_INTENT_END = 6;
   VOICE_ASSISTANT_TTS_START = 7;
   VOICE_ASSISTANT_TTS_END = 8;
-  VOICE_ASSISTANT_WAKE_WORD_START = 9;
-  VOICE_ASSISTANT_WAKE_WORD_END = 10;
-  VOICE_ASSISTANT_STT_VAD_START = 11;
-  VOICE_ASSISTANT_STT_VAD_END = 12;
-  VOICE_ASSISTANT_TTS_STREAM_START = 98;
-  VOICE_ASSISTANT_TTS_STREAM_END = 99;
 }
 
 message VoiceAssistantEventData {
@@ -1539,48 +1516,3 @@ message AlarmControlPanelCommandRequest {
   AlarmControlPanelStateCommand command = 2;
   string code = 3;
 }
-
-// ===================== TEXT =====================
-enum TextMode {
-  TEXT_MODE_TEXT = 0;
-  TEXT_MODE_PASSWORD = 1;
-}
-message ListEntitiesTextResponse {
-  option (id) = 97;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_TEXT";
-
-  string object_id = 1;
-  fixed32 key = 2;
-  string name = 3;
-  string unique_id = 4;
-  string icon = 5;
-  bool disabled_by_default = 6;
-  EntityCategory entity_category = 7;
-
-  uint32 min_length = 8;
-  uint32 max_length = 9;
-  string pattern = 10;
-  TextMode mode = 11;
-}
-message TextStateResponse {
-  option (id) = 98;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_TEXT";
-  option (no_delay) = true;
-
-  fixed32 key = 1;
-  string state = 2;
-  // If the Text does not have a valid state yet.
-  // Equivalent to `!obj->has_state()` - inverse logic to make state packets smaller
-  bool missing_state = 3;
-}
-message TextCommandRequest {
-  option (id) = 99;
-  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_TEXT";
-  option (no_delay) = true;
-
-  fixed32 key = 1;
-  string state = 2;
-}

esphome/components/api/api_connection.cpp

@@ -1,7 +1,6 @@
 #include "api_connection.h"
 #include <cerrno>
 #include <cinttypes>
-#include <utility>
 #include "esphome/components/network/util.h"
 #include "esphome/core/entity_base.h"
 #include "esphome/core/hal.h"
@@ -32,9 +31,9 @@ APIConnection::APIConnection(std::unique_ptr<socket::Socket> sock, APIServer *pa
   this->proto_write_buffer_.reserve(64);
 
 #if defined(USE_API_PLAINTEXT)
-  this->helper_ = std::unique_ptr<APIFrameHelper>{new APIPlaintextFrameHelper(std::move(sock))};
+  helper_ = std::unique_ptr<APIFrameHelper>{new APIPlaintextFrameHelper(std::move(sock))};
 #elif defined(USE_API_NOISE)
-  this->helper_ = std::unique_ptr<APIFrameHelper>{new APINoiseFrameHelper(std::move(sock), parent->get_noise_ctx())};
+  helper_ = std::unique_ptr<APIFrameHelper>{new APINoiseFrameHelper(std::move(sock), parent->get_noise_ctx())};
 #else
 #error "No frame helper defined"
 #endif
@@ -42,16 +41,14 @@ APIConnection::APIConnection(std::unique_ptr<socket::Socket> sock, APIServer *pa
 void APIConnection::start() {
   this->last_traffic_ = millis();
 
-  APIError err = this->helper_->init();
+  APIError err = helper_->init();
   if (err != APIError::OK) {
     on_fatal_error();
-    ESP_LOGW(TAG, "%s: Helper init failed: %s errno=%d", this->client_combined_info_.c_str(), api_error_to_str(err),
-             errno);
+    ESP_LOGW(TAG, "%s: Helper init failed: %s errno=%d", client_info_.c_str(), api_error_to_str(err), errno);
     return;
   }
-  this->client_info_ = helper_->getpeername();
-  this->client_peername_ = this->client_info_;
-  this->helper_->set_log_info(this->client_info_);
+  client_info_ = helper_->getpeername();
+  helper_->set_log_info(client_info_);
 }
 
 APIConnection::~APIConnection() {
@@ -60,11 +57,6 @@ APIConnection::~APIConnection() {
     bluetooth_proxy::global_bluetooth_proxy->unsubscribe_api_connection(this);
   }
 #endif
-#ifdef USE_VOICE_ASSISTANT
-  if (voice_assistant::global_voice_assistant->get_api_connection() == this) {
-    voice_assistant::global_voice_assistant->client_subscription(this, false);
-  }
-#endif
 }
 
 void APIConnection::loop() {
@@ -75,7 +67,7 @@ void APIConnection::loop() {
     // when network is disconnected force disconnect immediately
     // don't wait for timeout
     this->on_fatal_error();
-    ESP_LOGW(TAG, "%s: Network unavailable, disconnecting", this->client_combined_info_.c_str());
+    ESP_LOGW(TAG, "%s: Network unavailable, disconnecting", client_info_.c_str());
     return;
   }
   if (this->next_close_) {
@@ -85,26 +77,24 @@ void APIConnection::loop() {
     return;
   }
 
-  APIError err = this->helper_->loop();
+  APIError err = helper_->loop();
   if (err != APIError::OK) {
     on_fatal_error();
-    ESP_LOGW(TAG, "%s: Socket operation failed: %s errno=%d", this->client_combined_info_.c_str(),
-             api_error_to_str(err), errno);
+    ESP_LOGW(TAG, "%s: Socket operation failed: %s errno=%d", client_info_.c_str(), api_error_to_str(err), errno);
     return;
   }
   ReadPacketBuffer buffer;
-  err = this->helper_->read_packet(&buffer);
+  err = helper_->read_packet(&buffer);
   if (err == APIError::WOULD_BLOCK) {
     // pass
   } else if (err != APIError::OK) {
     on_fatal_error();
     if (err == APIError::SOCKET_READ_FAILED && errno == ECONNRESET) {
-      ESP_LOGW(TAG, "%s: Connection reset", this->client_combined_info_.c_str());
+      ESP_LOGW(TAG, "%s: Connection reset", client_info_.c_str());
     } else if (err == APIError::CONNECTION_CLOSED) {
-      ESP_LOGW(TAG, "%s: Connection closed", this->client_combined_info_.c_str());
+      ESP_LOGW(TAG, "%s: Connection closed", client_info_.c_str());
     } else {
-      ESP_LOGW(TAG, "%s: Reading failed: %s errno=%d", this->client_combined_info_.c_str(), api_error_to_str(err),
-               errno);
+      ESP_LOGW(TAG, "%s: Reading failed: %s errno=%d", client_info_.c_str(), api_error_to_str(err), errno);
     }
     return;
   } else {
@@ -124,7 +114,7 @@ void APIConnection::loop() {
     // Disconnect if not responded within 2.5*keepalive
     if (now - this->last_traffic_ > (keepalive * 5) / 2) {
       on_fatal_error();
-      ESP_LOGW(TAG, "%s didn't respond to ping request in time. Disconnecting...", this->client_combined_info_.c_str());
+      ESP_LOGW(TAG, "%s didn't respond to ping request in time. Disconnecting...", this->client_info_.c_str());
     }
   } else if (now - this->last_traffic_ > keepalive) {
     ESP_LOGVV(TAG, "Sending keepalive PING...");
@@ -178,7 +168,7 @@ DisconnectResponse APIConnection::disconnect(const DisconnectRequest &msg) {
   // remote initiated disconnect_client
   // don't close yet, we still need to send the disconnect response
   // close will happen on next loop
-  ESP_LOGD(TAG, "%s requested disconnected", this->client_combined_info_.c_str());
+  ESP_LOGD(TAG, "%s requested disconnected", client_info_.c_str());
   this->next_close_ = true;
   DisconnectResponse resp;
   return resp;
@@ -665,44 +655,6 @@ void APIConnection::number_command(const NumberCommandRequest &msg) {
 }
 #endif
 
-#ifdef USE_TEXT
-bool APIConnection::send_text_state(text::Text *text, std::string state) {
-  if (!this->state_subscription_)
-    return false;
-
-  TextStateResponse resp{};
-  resp.key = text->get_object_id_hash();
-  resp.state = std::move(state);
-  resp.missing_state = !text->has_state();
-  return this->send_text_state_response(resp);
-}
-bool APIConnection::send_text_info(text::Text *text) {
-  ListEntitiesTextResponse msg;
-  msg.key = text->get_object_id_hash();
-  msg.object_id = text->get_object_id();
-  msg.name = text->get_name();
-  msg.icon = text->get_icon();
-  msg.disabled_by_default = text->is_disabled_by_default();
-  msg.entity_category = static_cast<enums::EntityCategory>(text->get_entity_category());
-  msg.mode = static_cast<enums::TextMode>(text->traits.get_mode());
-
-  msg.min_length = text->traits.get_min_length();
-  msg.max_length = text->traits.get_max_length();
-  msg.pattern = text->traits.get_pattern();
-
-  return this->send_list_entities_text_response(msg);
-}
-void APIConnection::text_command(const TextCommandRequest &msg) {
-  text::Text *text = App.get_text_by_key(msg.key);
-  if (text == nullptr)
-    return;
-
-  auto call = text->make_call();
-  call.set_value(msg.state);
-  call.perform();
-}
-#endif
-
 #ifdef USE_SELECT
 bool APIConnection::send_select_state(select::Select *select, std::string state) {
   if (!this->state_subscription_)
@@ -955,33 +907,24 @@ BluetoothConnectionsFreeResponse APIConnection::subscribe_bluetooth_connections_
 #endif
 
 #ifdef USE_VOICE_ASSISTANT
-void APIConnection::subscribe_voice_assistant(const SubscribeVoiceAssistantRequest &msg) {
-  if (voice_assistant::global_voice_assistant != nullptr) {
-    voice_assistant::global_voice_assistant->client_subscription(this, msg.subscribe);
-  }
+bool APIConnection::request_voice_assistant(bool start, const std::string &conversation_id) {
+  if (!this->voice_assistant_subscription_)
+    return false;
+  VoiceAssistantRequest msg;
+  msg.start = start;
+  msg.conversation_id = conversation_id;
+  return this->send_voice_assistant_request(msg);
 }
 void APIConnection::on_voice_assistant_response(const VoiceAssistantResponse &msg) {
   if (voice_assistant::global_voice_assistant != nullptr) {
-    if (voice_assistant::global_voice_assistant->get_api_connection() != this) {
-      return;
-    }
-
-    if (msg.error) {
-      voice_assistant::global_voice_assistant->failed_to_start();
-      return;
-    }
     struct sockaddr_storage storage;
     socklen_t len = sizeof(storage);
     this->helper_->getpeername((struct sockaddr *) &storage, &len);
-    voice_assistant::global_voice_assistant->start_streaming(&storage, msg.port);
+    voice_assistant::global_voice_assistant->start(&storage, msg.port);
   }
 };
 void APIConnection::on_voice_assistant_event_response(const VoiceAssistantEventResponse &msg) {
   if (voice_assistant::global_voice_assistant != nullptr) {
-    if (voice_assistant::global_voice_assistant->get_api_connection() != this) {
-      return;
-    }
-
     voice_assistant::global_voice_assistant->on_event(msg);
   }
 }
@@ -1061,14 +1004,12 @@ bool APIConnection::send_log_message(int level, const char *tag, const char *lin
 }
 
 HelloResponse APIConnection::hello(const HelloRequest &msg) {
-  this->client_info_ = msg.client_info;
-  this->client_peername_ = this->helper_->getpeername();
-  this->client_combined_info_ = this->client_info_ + " (" + this->client_peername_ + ")";
-  this->helper_->set_log_info(this->client_combined_info_);
+  this->client_info_ = msg.client_info + " (" + this->helper_->getpeername() + ")";
+  this->helper_->set_log_info(client_info_);
   this->client_api_version_major_ = msg.api_version_major;
   this->client_api_version_minor_ = msg.api_version_minor;
-  ESP_LOGV(TAG, "Hello from client: '%s' | %s | API Version %" PRIu32 ".%" PRIu32, this->client_info_.c_str(),
-           this->client_peername_.c_str(), this->client_api_version_major_, this->client_api_version_minor_);
+  ESP_LOGV(TAG, "Hello from client: '%s' | API Version %" PRIu32 ".%" PRIu32, this->client_info_.c_str(),
+           this->client_api_version_major_, this->client_api_version_minor_);
 
   HelloResponse resp;
   resp.api_version_major = 1;
@@ -1086,9 +1027,9 @@ ConnectResponse APIConnection::connect(const ConnectRequest &msg) {
   // bool invalid_password = 1;
   resp.invalid_password = !correct;
   if (correct) {
-    ESP_LOGD(TAG, "%s: Connected successfully", this->client_combined_info_.c_str());
+    ESP_LOGD(TAG, "%s: Connected successfully", this->client_info_.c_str());
     this->connection_state_ = ConnectionState::AUTHENTICATED;
-    this->parent_->get_client_connected_trigger()->trigger(this->client_info_, this->client_peername_);
+
 #ifdef USE_HOMEASSISTANT_TIME
     if (homeassistant::global_homeassistant_time != nullptr) {
       this->send_time_request();
@@ -1102,7 +1043,6 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
   resp.uses_password = this->parent_->uses_password();
   resp.name = App.get_name();
   resp.friendly_name = App.get_friendly_name();
-  resp.suggested_area = App.get_area();
   resp.mac_address = get_mac_address_pretty();
   resp.esphome_version = ESPHOME_VERSION;
   resp.compilation_time = App.get_compilation_time();
@@ -1110,10 +1050,6 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
   resp.manufacturer = "Espressif";
 #elif defined(USE_RP2040)
   resp.manufacturer = "Raspberry Pi";
-#elif defined(USE_BK72XX)
-  resp.manufacturer = "Beken";
-#elif defined(USE_RTL87XX)
-  resp.manufacturer = "Realtek";
 #elif defined(USE_HOST)
   resp.manufacturer = "Host";
 #endif
@@ -1163,11 +1099,10 @@ bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint32_t message_type)
     return false;
   if (!this->helper_->can_write_without_blocking()) {
     delay(0);
-    APIError err = this->helper_->loop();
+    APIError err = helper_->loop();
     if (err != APIError::OK) {
       on_fatal_error();
-      ESP_LOGW(TAG, "%s: Socket operation failed: %s errno=%d", this->client_combined_info_.c_str(),
-               api_error_to_str(err), errno);
+      ESP_LOGW(TAG, "%s: Socket operation failed: %s errno=%d", client_info_.c_str(), api_error_to_str(err), errno);
       return false;
     }
     if (!this->helper_->can_write_without_blocking()) {
@@ -1186,10 +1121,9 @@ bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint32_t message_type)
   if (err != APIError::OK) {
     on_fatal_error();
     if (err == APIError::SOCKET_WRITE_FAILED && errno == ECONNRESET) {
-      ESP_LOGW(TAG, "%s: Connection reset", this->client_combined_info_.c_str());
+      ESP_LOGW(TAG, "%s: Connection reset", client_info_.c_str());
     } else {
-      ESP_LOGW(TAG, "%s: Packet write failed %s errno=%d", this->client_combined_info_.c_str(), api_error_to_str(err),
-               errno);
+      ESP_LOGW(TAG, "%s: Packet write failed %s errno=%d", client_info_.c_str(), api_error_to_str(err), errno);
     }
     return false;
   }
@@ -1198,11 +1132,11 @@ bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint32_t message_type)
 }
 void APIConnection::on_unauthenticated_access() {
   this->on_fatal_error();
-  ESP_LOGD(TAG, "%s: tried to access without authentication.", this->client_combined_info_.c_str());
+  ESP_LOGD(TAG, "%s: tried to access without authentication.", this->client_info_.c_str());
 }
 void APIConnection::on_no_setup_connection() {
   this->on_fatal_error();
-  ESP_LOGD(TAG, "%s: tried to access without full connection.", this->client_combined_info_.c_str());
+  ESP_LOGD(TAG, "%s: tried to access without full connection.", this->client_info_.c_str());
 }
 void APIConnection::on_fatal_error() {
   this->helper_->close();

esphome/components/api/api_connection.h

@@ -72,11 +72,6 @@ class APIConnection : public APIServerConnection {
   bool send_number_info(number::Number *number);
   void number_command(const NumberCommandRequest &msg) override;
 #endif
-#ifdef USE_TEXT
-  bool send_text_state(text::Text *text, std::string state);
-  bool send_text_info(text::Text *text);
-  void text_command(const TextCommandRequest &msg) override;
-#endif
 #ifdef USE_SELECT
   bool send_select_state(select::Select *select, std::string state);
   bool send_select_info(select::Select *select);
@@ -126,7 +121,10 @@ class APIConnection : public APIServerConnection {
 #endif
 
 #ifdef USE_VOICE_ASSISTANT
-  void subscribe_voice_assistant(const SubscribeVoiceAssistantRequest &msg) override;
+  void subscribe_voice_assistant(const SubscribeVoiceAssistantRequest &msg) override {
+    this->voice_assistant_subscription_ = msg.subscribe;
+  }
+  bool request_voice_assistant(bool start, const std::string &conversation_id);
   void on_voice_assistant_response(const VoiceAssistantResponse &msg) override;
   void on_voice_assistant_event_response(const VoiceAssistantEventResponse &msg) override;
 #endif
@@ -185,8 +183,6 @@ class APIConnection : public APIServerConnection {
   }
   bool send_buffer(ProtoWriteBuffer buffer, uint32_t message_type) override;
 
-  std::string get_client_combined_info() const { return this->client_combined_info_; }
-
  protected:
   friend APIServer;
 
@@ -206,8 +202,6 @@ class APIConnection : public APIServerConnection {
   std::unique_ptr<APIFrameHelper> helper_;
 
   std::string client_info_;
-  std::string client_peername_;
-  std::string client_combined_info_;
   uint32_t client_api_version_major_{0};
   uint32_t client_api_version_minor_{0};
 #ifdef USE_ESP32_CAMERA
@@ -219,6 +213,9 @@ class APIConnection : public APIServerConnection {
   uint32_t last_traffic_;
   bool sent_ping_{false};
   bool service_call_subscription_{false};
+#ifdef USE_VOICE_ASSISTANT
+  bool voice_assistant_subscription_{false};
+#endif
   bool next_close_ = false;
   APIServer *parent_;
   InitialStateIterator initial_state_iterator_;

esphome/components/api/api_pb2.h

@@ -165,11 +165,6 @@ enum BluetoothDeviceRequestType : uint32_t {
   BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE = 5,
   BLUETOOTH_DEVICE_REQUEST_TYPE_CLEAR_CACHE = 6,
 };
-enum VoiceAssistantRequestFlag : uint32_t {
-  VOICE_ASSISTANT_REQUEST_NONE = 0,
-  VOICE_ASSISTANT_REQUEST_USE_VAD = 1,
-  VOICE_ASSISTANT_REQUEST_USE_WAKE_WORD = 2,
-};
 enum VoiceAssistantEvent : uint32_t {
   VOICE_ASSISTANT_ERROR = 0,
   VOICE_ASSISTANT_RUN_START = 1,
@@ -180,12 +175,6 @@ enum VoiceAssistantEvent : uint32_t {
   VOICE_ASSISTANT_INTENT_END = 6,
   VOICE_ASSISTANT_TTS_START = 7,
   VOICE_ASSISTANT_TTS_END = 8,
-  VOICE_ASSISTANT_WAKE_WORD_START = 9,
-  VOICE_ASSISTANT_WAKE_WORD_END = 10,
-  VOICE_ASSISTANT_STT_VAD_START = 11,
-  VOICE_ASSISTANT_STT_VAD_END = 12,
-  VOICE_ASSISTANT_TTS_STREAM_START = 98,
-  VOICE_ASSISTANT_TTS_STREAM_END = 99,
 };
 enum AlarmControlPanelState : uint32_t {
   ALARM_STATE_DISARMED = 0,
@@ -208,10 +197,6 @@ enum AlarmControlPanelStateCommand : uint32_t {
   ALARM_CONTROL_PANEL_ARM_CUSTOM_BYPASS = 5,
   ALARM_CONTROL_PANEL_TRIGGER = 6,
 };
-enum TextMode : uint32_t {
-  TEXT_MODE_TEXT = 0,
-  TEXT_MODE_PASSWORD = 1,
-};
 
 }  // namespace enums
 
@@ -328,7 +313,6 @@ class DeviceInfoResponse : public ProtoMessage {
   std::string manufacturer{};
   std::string friendly_name{};
   uint32_t voice_assistant_version{0};
-  std::string suggested_area{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -1667,26 +1651,10 @@ class SubscribeVoiceAssistantRequest : public ProtoMessage {
  protected:
   bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class VoiceAssistantAudioSettings : public ProtoMessage {
- public:
-  uint32_t noise_suppression_level{0};
-  uint32_t auto_gain{0};
-  float volume_multiplier{0.0f};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
 class VoiceAssistantRequest : public ProtoMessage {
  public:
   bool start{false};
   std::string conversation_id{};
-  uint32_t flags{0};
-  VoiceAssistantAudioSettings audio_settings{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -1783,57 +1751,6 @@ class AlarmControlPanelCommandRequest : public ProtoMessage {
   bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
   bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class ListEntitiesTextResponse : public ProtoMessage {
- public:
-  std::string object_id{};
-  uint32_t key{0};
-  std::string name{};
-  std::string unique_id{};
-  std::string icon{};
-  bool disabled_by_default{false};
-  enums::EntityCategory entity_category{};
-  uint32_t min_length{0};
-  uint32_t max_length{0};
-  std::string pattern{};
-  enums::TextMode mode{};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class TextStateResponse : public ProtoMessage {
- public:
-  uint32_t key{0};
-  std::string state{};
-  bool missing_state{false};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class TextCommandRequest : public ProtoMessage {
- public:
-  uint32_t key{0};
-  std::string state{};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-};
 
 }  // namespace api
 }  // namespace esphome

esphome/components/api/api_pb2_service.cpp

@@ -495,24 +495,6 @@ bool APIServerConnectionBase::send_alarm_control_panel_state_response(const Alar
 #endif
 #ifdef USE_ALARM_CONTROL_PANEL
 #endif
-#ifdef USE_TEXT
-bool APIServerConnectionBase::send_list_entities_text_response(const ListEntitiesTextResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_text_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesTextResponse>(msg, 97);
-}
-#endif
-#ifdef USE_TEXT
-bool APIServerConnectionBase::send_text_state_response(const TextStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_text_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<TextStateResponse>(msg, 98);
-}
-#endif
-#ifdef USE_TEXT
-#endif
 bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) {
   switch (msg_type) {
     case 1: {
@@ -931,17 +913,6 @@ bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
       ESP_LOGVV(TAG, "on_alarm_control_panel_command_request: %s", msg.dump().c_str());
 #endif
       this->on_alarm_control_panel_command_request(msg);
-#endif
-      break;
-    }
-    case 99: {
-#ifdef USE_TEXT
-      TextCommandRequest msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_text_command_request: %s", msg.dump().c_str());
-#endif
-      this->on_text_command_request(msg);
 #endif
       break;
     }
@@ -1153,19 +1124,6 @@ void APIServerConnection::on_number_command_request(const NumberCommandRequest &
   this->number_command(msg);
 }
 #endif
-#ifdef USE_TEXT
-void APIServerConnection::on_text_command_request(const TextCommandRequest &msg) {
-  if (!this->is_connection_setup()) {
-    this->on_no_setup_connection();
-    return;
-  }
-  if (!this->is_authenticated()) {
-    this->on_unauthenticated_access();
-    return;
-  }
-  this->text_command(msg);
-}
-#endif
 #ifdef USE_SELECT
 void APIServerConnection::on_select_command_request(const SelectCommandRequest &msg) {
   if (!this->is_connection_setup()) {

esphome/components/api/api_pb2_service.h

@@ -248,15 +248,6 @@ class APIServerConnectionBase : public ProtoService {
 #endif
 #ifdef USE_ALARM_CONTROL_PANEL
   virtual void on_alarm_control_panel_command_request(const AlarmControlPanelCommandRequest &value){};
-#endif
-#ifdef USE_TEXT
-  bool send_list_entities_text_response(const ListEntitiesTextResponse &msg);
-#endif
-#ifdef USE_TEXT
-  bool send_text_state_response(const TextStateResponse &msg);
-#endif
-#ifdef USE_TEXT
-  virtual void on_text_command_request(const TextCommandRequest &value){};
 #endif
  protected:
   bool read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) override;
@@ -297,9 +288,6 @@ class APIServerConnection : public APIServerConnectionBase {
 #ifdef USE_NUMBER
   virtual void number_command(const NumberCommandRequest &msg) = 0;
 #endif
-#ifdef USE_TEXT
-  virtual void text_command(const TextCommandRequest &msg) = 0;
-#endif
 #ifdef USE_SELECT
   virtual void select_command(const SelectCommandRequest &msg) = 0;
 #endif
@@ -383,9 +371,6 @@ class APIServerConnection : public APIServerConnectionBase {
 #ifdef USE_NUMBER
   void on_number_command_request(const NumberCommandRequest &msg) override;
 #endif
-#ifdef USE_TEXT
-  void on_text_command_request(const TextCommandRequest &msg) override;
-#endif
 #ifdef USE_SELECT
   void on_select_command_request(const SelectCommandRequest &msg) override;
 #endif

esphome/components/api/api_server.cpp

@@ -1,13 +1,13 @@
 #include "api_server.h"
-#include <cerrno>
 #include "api_connection.h"
-#include "esphome/components/network/util.h"
 #include "esphome/core/application.h"
 #include "esphome/core/defines.h"
-#include "esphome/core/hal.h"
 #include "esphome/core/log.h"
 #include "esphome/core/util.h"
 #include "esphome/core/version.h"
+#include "esphome/core/hal.h"
+#include "esphome/components/network/util.h"
+#include <cerrno>
 
 #ifdef USE_LOGGER
 #include "esphome/components/logger/logger.h"
@@ -111,7 +111,6 @@ void APIServer::loop() {
                                 [](const std::unique_ptr<APIConnection> &conn) { return !conn->remove_; });
   // print disconnection messages
   for (auto it = new_end; it != this->clients_.end(); ++it) {
-    this->client_disconnected_trigger_->trigger((*it)->client_info_, (*it)->client_peername_);
     ESP_LOGV(TAG, "Removing connection to %s", (*it)->client_info_.c_str());
   }
   // resize vector
@@ -255,15 +254,6 @@ void APIServer::on_number_update(number::Number *obj, float state) {
 }
 #endif
 
-#ifdef USE_TEXT
-void APIServer::on_text_update(text::Text *obj, const std::string &state) {
-  if (obj->is_internal())
-    return;
-  for (auto &c : this->clients_)
-    c->send_text_state(obj, state);
-}
-#endif
-
 #ifdef USE_SELECT
 void APIServer::on_select_update(select::Select *obj, const std::string &state, size_t index) {
   if (obj->is_internal())
@@ -332,6 +322,22 @@ void APIServer::on_shutdown() {
   delay(10);
 }
 
+#ifdef USE_VOICE_ASSISTANT
+bool APIServer::start_voice_assistant(const std::string &conversation_id) {
+  for (auto &c : this->clients_) {
+    if (c->request_voice_assistant(true, conversation_id))
+      return true;
+  }
+  return false;
+}
+void APIServer::stop_voice_assistant() {
+  for (auto &c : this->clients_) {
+    if (c->request_voice_assistant(false, ""))
+      return;
+  }
+}
+#endif
+
 #ifdef USE_ALARM_CONTROL_PANEL
 void APIServer::on_alarm_control_panel_update(alarm_control_panel::AlarmControlPanel *obj) {
   if (obj->is_internal())

esphome/components/api/api_server.h

@@ -1,17 +1,16 @@
 #pragma once
 
-#include "api_noise_context.h"
-#include "api_pb2.h"
-#include "api_pb2_service.h"
-#include "esphome/components/socket/socket.h"
-#include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 #include "esphome/core/controller.h"
 #include "esphome/core/defines.h"
 #include "esphome/core/log.h"
+#include "esphome/components/socket/socket.h"
+#include "api_pb2.h"
+#include "api_pb2_service.h"
 #include "list_entities.h"
 #include "subscribe_state.h"
 #include "user_services.h"
+#include "api_noise_context.h"
 
 #include <vector>
 
@@ -66,9 +65,6 @@ class APIServer : public Component, public Controller {
 #ifdef USE_NUMBER
   void on_number_update(number::Number *obj, float state) override;
 #endif
-#ifdef USE_TEXT
-  void on_text_update(text::Text *obj, const std::string &state) override;
-#endif
 #ifdef USE_SELECT
   void on_select_update(select::Select *obj, const std::string &state, size_t index) override;
 #endif
@@ -84,6 +80,11 @@ class APIServer : public Component, public Controller {
   void request_time();
 #endif
 
+#ifdef USE_VOICE_ASSISTANT
+  bool start_voice_assistant(const std::string &conversation_id);
+  void stop_voice_assistant();
+#endif
+
 #ifdef USE_ALARM_CONTROL_PANEL
   void on_alarm_control_panel_update(alarm_control_panel::AlarmControlPanel *obj) override;
 #endif
@@ -101,11 +102,6 @@ class APIServer : public Component, public Controller {
   const std::vector<HomeAssistantStateSubscription> &get_state_subs() const;
   const std::vector<UserServiceDescriptor *> &get_user_services() const { return this->user_services_; }
 
-  Trigger<std::string, std::string> *get_client_connected_trigger() const { return this->client_connected_trigger_; }
-  Trigger<std::string, std::string> *get_client_disconnected_trigger() const {
-    return this->client_disconnected_trigger_;
-  }
-
  protected:
   std::unique_ptr<socket::Socket> socket_ = nullptr;
   uint16_t port_{6053};
@@ -115,8 +111,6 @@ class APIServer : public Component, public Controller {
   std::string password_;
   std::vector<HomeAssistantStateSubscription> state_subs_;
   std::vector<UserServiceDescriptor *> user_services_;
-  Trigger<std::string, std::string> *client_connected_trigger_ = new Trigger<std::string, std::string>();
-  Trigger<std::string, std::string> *client_disconnected_trigger_ = new Trigger<std::string, std::string>();
 
 #ifdef USE_API_NOISE
   std::shared_ptr<APINoiseContext> noise_ctx_ = std::make_shared<APINoiseContext>();

esphome/components/api/client.py

@@ -47,7 +47,7 @@ async def async_run_logs(config, address):
         except APIConnectionError:
             cli.disconnect()
 
-    async def on_disconnect(expected_disconnect: bool) -> None:
+    async def on_disconnect():
         _LOGGER.warning("Disconnected from API")
 
     zc = zeroconf.Zeroconf()

esphome/components/api/list_entities.cpp

@@ -60,10 +60,6 @@ bool ListEntitiesIterator::on_climate(climate::Climate *climate) { return this->
 bool ListEntitiesIterator::on_number(number::Number *number) { return this->client_->send_number_info(number); }
 #endif
 
-#ifdef USE_TEXT
-bool ListEntitiesIterator::on_text(text::Text *text) { return this->client_->send_text_info(text); }
-#endif
-
 #ifdef USE_SELECT
 bool ListEntitiesIterator::on_select(select::Select *select) { return this->client_->send_select_info(select); }
 #endif

esphome/components/api/list_entities.h

@@ -46,9 +46,6 @@ class ListEntitiesIterator : public ComponentIterator {
 #ifdef USE_NUMBER
   bool on_number(number::Number *number) override;
 #endif
-#ifdef USE_TEXT
-  bool on_text(text::Text *text) override;
-#endif
 #ifdef USE_SELECT
   bool on_select(select::Select *select) override;
 #endif

esphome/components/api/subscribe_state.cpp

@@ -42,9 +42,6 @@ bool InitialStateIterator::on_number(number::Number *number) {
   return this->client_->send_number_state(number, number->state);
 }
 #endif
-#ifdef USE_TEXT
-bool InitialStateIterator::on_text(text::Text *text) { return this->client_->send_text_state(text, text->state); }
-#endif
 #ifdef USE_SELECT
 bool InitialStateIterator::on_select(select::Select *select) {
   return this->client_->send_select_state(select, select->state);

esphome/components/api/subscribe_state.h

@@ -43,9 +43,6 @@ class InitialStateIterator : public ComponentIterator {
 #ifdef USE_NUMBER
   bool on_number(number::Number *number) override;
 #endif
-#ifdef USE_TEXT
-  bool on_text(text::Text *text) override;
-#endif
 #ifdef USE_SELECT
   bool on_select(select::Select *select) override;
 #endif

esphome/components/api/user_services.cpp

@@ -5,7 +5,7 @@ namespace esphome {
 namespace api {
 
 template<> bool get_execute_arg_value<bool>(const ExecuteServiceArgument &arg) { return arg.bool_; }
-template<> int32_t get_execute_arg_value<int32_t>(const ExecuteServiceArgument &arg) {
+template<> int get_execute_arg_value<int>(const ExecuteServiceArgument &arg) {
   if (arg.legacy_int != 0)
     return arg.legacy_int;
   return arg.int_;
@@ -26,13 +26,11 @@ template<> std::vector<std::string> get_execute_arg_value<std::vector<std::strin
 }
 
 template<> enums::ServiceArgType to_service_arg_type<bool>() { return enums::SERVICE_ARG_TYPE_BOOL; }
-template<> enums::ServiceArgType to_service_arg_type<int32_t>() { return enums::SERVICE_ARG_TYPE_INT; }
+template<> enums::ServiceArgType to_service_arg_type<int>() { return enums::SERVICE_ARG_TYPE_INT; }
 template<> enums::ServiceArgType to_service_arg_type<float>() { return enums::SERVICE_ARG_TYPE_FLOAT; }
 template<> enums::ServiceArgType to_service_arg_type<std::string>() { return enums::SERVICE_ARG_TYPE_STRING; }
 template<> enums::ServiceArgType to_service_arg_type<std::vector<bool>>() { return enums::SERVICE_ARG_TYPE_BOOL_ARRAY; }
-template<> enums::ServiceArgType to_service_arg_type<std::vector<int32_t>>() {
-  return enums::SERVICE_ARG_TYPE_INT_ARRAY;
-}
+template<> enums::ServiceArgType to_service_arg_type<std::vector<int>>() { return enums::SERVICE_ARG_TYPE_INT_ARRAY; }
 template<> enums::ServiceArgType to_service_arg_type<std::vector<float>>() {
   return enums::SERVICE_ARG_TYPE_FLOAT_ARRAY;
 }

esphome/components/as3935/__init__.py

@@ -2,17 +2,14 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import pins
 from esphome.const import (
-    CONF_CAPACITANCE,
-    CONF_DIV_RATIO,
     CONF_INDOOR,
-    CONF_IRQ_PIN,
-    CONF_LIGHTNING_THRESHOLD,
-    CONF_MASK_DISTURBER,
-    CONF_CALIBRATION,
-    CONF_TUNE_ANTENNA,
+    CONF_WATCHDOG_THRESHOLD,
     CONF_NOISE_LEVEL,
     CONF_SPIKE_REJECTION,
-    CONF_WATCHDOG_THRESHOLD,
+    CONF_LIGHTNING_THRESHOLD,
+    CONF_MASK_DISTURBER,
+    CONF_DIV_RATIO,
+    CONF_CAPACITANCE,
 )
 
 MULTI_CONF = True
@@ -22,6 +19,7 @@ CONF_AS3935_ID = "as3935_id"
 as3935_ns = cg.esphome_ns.namespace("as3935")
 AS3935 = as3935_ns.class_("AS3935Component", cg.Component)
 
+CONF_IRQ_PIN = "irq_pin"
 AS3935_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(AS3935),
@@ -36,8 +34,6 @@ AS3935_SCHEMA = cv.Schema(
         cv.Optional(CONF_MASK_DISTURBER, default=False): cv.boolean,
         cv.Optional(CONF_DIV_RATIO, default=0): cv.one_of(0, 16, 32, 64, 128, int=True),
         cv.Optional(CONF_CAPACITANCE, default=0): cv.int_range(min=0, max=15),
-        cv.Optional(CONF_TUNE_ANTENNA, default=False): cv.boolean,
-        cv.Optional(CONF_CALIBRATION, default=True): cv.boolean,
     }
 )
 
@@ -55,5 +51,3 @@ async def setup_as3935(var, config):
     cg.add(var.set_mask_disturber(config[CONF_MASK_DISTURBER]))
     cg.add(var.set_div_ratio(config[CONF_DIV_RATIO]))
     cg.add(var.set_capacitance(config[CONF_CAPACITANCE]))
-    cg.add(var.set_tune_antenna(config[CONF_TUNE_ANTENNA]))
-    cg.add(var.set_calibration(config[CONF_CALIBRATION]))

esphome/components/as3935/as3935.cpp

@@ -21,14 +21,6 @@ void AS3935Component::setup() {
   this->write_mask_disturber(this->mask_disturber_);
   this->write_div_ratio(this->div_ratio_);
   this->write_capacitance(this->capacitance_);
-
-  // Handle setting up tuning or auto-calibration
-  if (this->tune_antenna_) {
-    ESP_LOGCONFIG(TAG, "  Antenna tuning: ENABLED - lightning detection will not function in this mode");
-    this->tune_antenna();
-  } else if (this->calibration_) {
-    this->calibrate_oscillator();
-  }
 }
 
 void AS3935Component::dump_config() {
@@ -235,87 +227,6 @@ uint32_t AS3935Component::get_lightning_energy_() {
   return pure_light;
 }
 
-// REG0x03, bit [7:6], manufacturer default: 0 (16 division ratio).
-// This function returns the current division ratio of the resonance frequency.
-// The antenna resonance frequency should be within 3.5 percent of 500kHz, and
-// so when modifying the resonance frequency with the internal capacitors
-// (tuneCap()) it's important to keep in mind that the displayed frequency on
-// the IRQ pin is divided by this number.
-uint8_t AS3935Component::read_div_ratio() {
-  ESP_LOGV(TAG, "Calling read_div_ratio");
-  uint8_t reg_val = this->read_register_(INT_MASK_ANT, DIV_MASK);
-  reg_val >>= 6;  // Front of the line.
-
-  if (reg_val == 0) {
-    return 16;
-  } else if (reg_val == 1) {
-    return 32;
-  } else if (reg_val == 2) {
-    return 64;
-  } else if (reg_val == 3) {
-    return 128;
-  }
-  ESP_LOGW(TAG, "Unknown response received for div_ratio");
-  return 0;
-}
-
-uint8_t AS3935Component::read_capacitance() {
-  ESP_LOGV(TAG, "Calling read_capacitance");
-  uint8_t reg_val = this->read_register_(FREQ_DISP_IRQ, CAP_MASK) * 8;
-  return (reg_val);
-}
-
-// REG0x08, bits [5,6,7], manufacturer default: 0.
-// This will send the frequency of the oscillators to the IRQ pin.
-//  _osc 1, bit[5] = TRCO - System RCO at 32.768kHz
-//  _osc 2, bit[6] = SRCO - Timer RCO Oscillators 1.1MHz
-//  _osc 3, bit[7] = LCO - Frequency of the Antenna
-void AS3935Component::display_oscillator(bool state, uint8_t osc) {
-  if ((osc < 1) || (osc > 3))
-    return;
-
-  this->write_register(FREQ_DISP_IRQ, OSC_MASK, state, 4 + osc);
-}
-
-// REG0x3D, bits[7:0]
-// This function calibrates both internal oscillators The oscillators are tuned
-// based on the resonance frequency of the antenna and so it should be trimmed
-// before the calibration is done.
-bool AS3935Component::calibrate_oscillator() {
-  ESP_LOGI(TAG, "Starting oscillators calibration...");
-  this->write_register(CALIB_RCO, WIPE_ALL, DIRECT_COMMAND, 0);  // Send command to calibrate the oscillators
-
-  this->display_oscillator(true, 2);
-  delay(2);  // Give time for the internal oscillators to start up.
-  this->display_oscillator(false, 2);
-
-  // Check it they were calibrated successfully.
-  uint8_t reg_val_srco = this->read_register_(CALIB_SRCO, CALIB_MASK_NOK);
-  uint8_t reg_val_trco = this->read_register_(CALIB_TRCO, CALIB_MASK_NOK);
-
-  // reg_val_srco &= CALIB_MASK;
-  // reg_val_srco >>= 6;
-  // reg_val_trco &= CALIB_MASK;
-  // reg_val_trco >>= 6;
-  if (!reg_val_srco && !reg_val_trco) {  // Zero upon success
-    ESP_LOGI(TAG, "Calibration was succesful");
-    return true;
-  } else {
-    ESP_LOGW(TAG, "Calibration was NOT succesful");
-    return false;
-  }
-}
-
-void AS3935Component::tune_antenna() {
-  ESP_LOGI(TAG, "Starting antenna tuning...");
-  uint8_t div_ratio = this->read_div_ratio();
-  uint8_t tune_val = this->read_capacitance();
-  ESP_LOGI(TAG, "Division Ratio is set to: %d", div_ratio);
-  ESP_LOGI(TAG, "Internal Capacitor is set to: %d", tune_val);
-  ESP_LOGI(TAG, "Displaying oscillator on INT pin. Measure its frequency - multiply value by Division Ratio");
-  this->display_oscillator(true, ANTFREQ);
-}
-
 uint8_t AS3935Component::read_register_(uint8_t reg, uint8_t mask) {
   uint8_t value = this->read_register(reg);
   value &= (~mask);

esphome/components/as3935/as3935.h

@@ -13,9 +13,6 @@
 namespace esphome {
 namespace as3935 {
 
-static const uint8_t DIRECT_COMMAND = 0x96;
-static const uint8_t ANTFREQ = 3;
-
 enum AS3935RegisterNames {
   AFE_GAIN = 0x00,
   THRESHOLD,
@@ -33,7 +30,6 @@ enum AS3935RegisterNames {
 };
 
 enum AS3935RegisterMasks {
-  WIPE_ALL = 0x0,
   GAIN_MASK = 0x3E,
   SPIKE_MASK = 0xF,
   IO_MASK = 0xC1,
@@ -48,7 +44,6 @@ enum AS3935RegisterMasks {
   NOISE_FLOOR_MASK = 0x70,
   OSC_MASK = 0xE0,
   CALIB_MASK = 0x7F,
-  CALIB_MASK_NOK = 0xBF,
   DIV_MASK = 0x3F
 };
 
@@ -95,13 +90,6 @@ class AS3935Component : public Component {
   void write_div_ratio(uint8_t div_ratio);
   void set_capacitance(uint8_t capacitance) { capacitance_ = capacitance; }
   void write_capacitance(uint8_t capacitance);
-  uint8_t read_div_ratio();
-  uint8_t read_capacitance();
-  bool calibrate_oscillator();
-  void display_oscillator(bool state, uint8_t osc);
-  void tune_antenna();
-  void set_tune_antenna(bool tune_antenna) { tune_antenna_ = tune_antenna; }
-  void set_calibration(bool calibration) { calibration_ = calibration; }
 
  protected:
   uint8_t read_interrupt_register_();
@@ -124,8 +112,6 @@ class AS3935Component : public Component {
   bool mask_disturber_;
   uint8_t div_ratio_;
   uint8_t capacitance_;
-  bool tune_antenna_;
-  bool calibration_;
 };
 
 }  // namespace as3935

esphome/components/as3935/sensor.py

@@ -31,10 +31,12 @@ CONFIG_SCHEMA = cv.Schema(
 async def to_code(config):
     hub = await cg.get_variable(config[CONF_AS3935_ID])
 
-    if distance_config := config.get(CONF_DISTANCE):
-        sens = await sensor.new_sensor(distance_config)
-        cg.add(hub.set_distance_sensor(sens))
+    if CONF_DISTANCE in config:
+        conf = config[CONF_DISTANCE]
+        distance_sensor = await sensor.new_sensor(conf)
+        cg.add(hub.set_distance_sensor(distance_sensor))
 
-    if lightning_energy_config := config.get(CONF_LIGHTNING_ENERGY):
-        sens = await sensor.new_sensor(lightning_energy_config)
-        cg.add(hub.set_energy_sensor(sens))
+    if CONF_LIGHTNING_ENERGY in config:
+        conf = config[CONF_LIGHTNING_ENERGY]
+        lightning_energy_sensor = await sensor.new_sensor(conf)
+        cg.add(hub.set_energy_sensor(lightning_energy_sensor))

esphome/components/as7341/sensor.py

@@ -107,6 +107,6 @@ async def to_code(config):
     cg.add(var.set_astep(config[CONF_ASTEP]))
 
     for conf_id, set_sensor_func in SENSORS.items():
-        if sens_config := config.get(conf_id):
-            sens = await sensor.new_sensor(sens_config)
+        if conf_id in config:
+            sens = await sensor.new_sensor(config[conf_id])
             cg.add(getattr(var, set_sensor_func)(sens))

esphome/components/async_tcp/__init__.py

@@ -2,27 +2,21 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.core import CORE, coroutine_with_priority
-from esphome.const import (
-    PLATFORM_ESP32,
-    PLATFORM_ESP8266,
-    PLATFORM_BK72XX,
-    PLATFORM_RTL87XX,
-)
 
 CODEOWNERS = ["@OttoWinter"]
 
 CONFIG_SCHEMA = cv.All(
     cv.Schema({}),
     cv.only_with_arduino,
-    cv.only_on([PLATFORM_ESP32, PLATFORM_ESP8266, PLATFORM_BK72XX, PLATFORM_RTL87XX]),
+    cv.only_on(["esp32", "esp8266"]),
 )
 
 
 @coroutine_with_priority(200.0)
 async def to_code(config):
-    if CORE.is_esp32 or CORE.is_libretiny:
+    if CORE.is_esp32:
         # https://github.com/esphome/AsyncTCP/blob/master/library.json
-        cg.add_library("esphome/AsyncTCP-esphome", "2.0.1")
+        cg.add_library("esphome/AsyncTCP-esphome", "1.2.2")
     elif CORE.is_esp8266:
         # https://github.com/esphome/ESPAsyncTCP
-        cg.add_library("esphome/ESPAsyncTCP-esphome", "2.0.0")
+        cg.add_library("esphome/ESPAsyncTCP-esphome", "1.2.3")

esphome/components/atc_mithermometer/sensor.py

@@ -83,18 +83,18 @@ async def to_code(config):
 
     cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
 
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
+    if CONF_TEMPERATURE in config:
+        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
         cg.add(var.set_temperature(sens))
-    if humidity_config := config.get(CONF_HUMIDITY):
-        sens = await sensor.new_sensor(humidity_config)
+    if CONF_HUMIDITY in config:
+        sens = await sensor.new_sensor(config[CONF_HUMIDITY])
         cg.add(var.set_humidity(sens))
-    if battery_level_config := config.get(CONF_BATTERY_LEVEL):
-        sens = await sensor.new_sensor(battery_level_config)
+    if CONF_BATTERY_LEVEL in config:
+        sens = await sensor.new_sensor(config[CONF_BATTERY_LEVEL])
         cg.add(var.set_battery_level(sens))
-    if battery_voltage_config := config.get(CONF_BATTERY_VOLTAGE):
-        sens = await sensor.new_sensor(battery_voltage_config)
+    if CONF_BATTERY_VOLTAGE in config:
+        sens = await sensor.new_sensor(config[CONF_BATTERY_VOLTAGE])
         cg.add(var.set_battery_voltage(sens))
-    if signal_strength_config := config.get(CONF_SIGNAL_STRENGTH):
-        sens = await sensor.new_sensor(signal_strength_config)
+    if CONF_SIGNAL_STRENGTH in config:
+        sens = await sensor.new_sensor(config[CONF_SIGNAL_STRENGTH])
         cg.add(var.set_signal_strength(sens))

esphome/components/atm90e26/__init__.py

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

esphome/components/atm90e26/atm90e26.cpp

@@ -1,235 +0,0 @@
-#include "atm90e26.h"
-#include "atm90e26_reg.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace atm90e26 {
-
-static const char *const TAG = "atm90e26";
-
-void ATM90E26Component::update() {
-  if (this->read16_(ATM90E26_REGISTER_FUNCEN) != 0x0030) {
-    this->status_set_warning();
-    return;
-  }
-
-  if (this->voltage_sensor_ != nullptr) {
-    this->voltage_sensor_->publish_state(this->get_line_voltage_());
-  }
-  if (this->current_sensor_ != nullptr) {
-    this->current_sensor_->publish_state(this->get_line_current_());
-  }
-  if (this->power_sensor_ != nullptr) {
-    this->power_sensor_->publish_state(this->get_active_power_());
-  }
-  if (this->reactive_power_sensor_ != nullptr) {
-    this->reactive_power_sensor_->publish_state(this->get_reactive_power_());
-  }
-  if (this->power_factor_sensor_ != nullptr) {
-    this->power_factor_sensor_->publish_state(this->get_power_factor_());
-  }
-  if (this->forward_active_energy_sensor_ != nullptr) {
-    this->forward_active_energy_sensor_->publish_state(this->get_forward_active_energy_());
-  }
-  if (this->reverse_active_energy_sensor_ != nullptr) {
-    this->reverse_active_energy_sensor_->publish_state(this->get_reverse_active_energy_());
-  }
-  if (this->freq_sensor_ != nullptr) {
-    this->freq_sensor_->publish_state(this->get_frequency_());
-  }
-  this->status_clear_warning();
-}
-
-void ATM90E26Component::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up ATM90E26 Component...");
-  this->spi_setup();
-
-  uint16_t mmode = 0x422;  // default values for everything but L/N line current gains
-  mmode |= (gain_pga_ & 0x7) << 13;
-  mmode |= (n_line_gain_ & 0x3) << 11;
-
-  this->write16_(ATM90E26_REGISTER_SOFTRESET, 0x789A);  // Perform soft reset
-  this->write16_(ATM90E26_REGISTER_FUNCEN,
-                 0x0030);  // Voltage sag irq=1, report on warnout pin=1, energy dir change irq=0
-  uint16_t read = this->read16_(ATM90E26_REGISTER_LASTDATA);
-  if (read != 0x0030) {
-    ESP_LOGW(TAG, "Could not initialize ATM90E26 IC, check SPI settings: %d", read);
-    this->mark_failed();
-    return;
-  }
-  // TODO: 100 * <nominal voltage, e.g. 230> * sqrt(2) * <fraction of nominal, e.g. 0.9> / (4 * gain_voltage/32768)
-  this->write16_(ATM90E26_REGISTER_SAGTH, 0x17DD);  // Voltage sag threshhold 0x1F2F
-
-  // Set metering calibration values
-  this->write16_(ATM90E26_REGISTER_CALSTART, 0x5678);  // CAL Metering calibration startup command
-
-  // Configure
-  this->write16_(ATM90E26_REGISTER_MMODE, mmode);  // Metering Mode Configuration (see above)
-
-  this->write16_(ATM90E26_REGISTER_PLCONSTH, (pl_const_ >> 16));   // PL Constant MSB
-  this->write16_(ATM90E26_REGISTER_PLCONSTL, pl_const_ & 0xFFFF);  // PL Constant LSB
-
-  // Calibrate this to be 1 pulse per Wh
-  this->write16_(ATM90E26_REGISTER_LGAIN, gain_metering_);  // L Line Calibration Gain (active power metering)
-  this->write16_(ATM90E26_REGISTER_LPHI, 0x0000);           // L Line Calibration Angle
-  this->write16_(ATM90E26_REGISTER_NGAIN, 0x0000);          // N Line Calibration Gain
-  this->write16_(ATM90E26_REGISTER_NPHI, 0x0000);           // N Line Calibration Angle
-  this->write16_(ATM90E26_REGISTER_PSTARTTH, 0x08BD);       // Active Startup Power Threshold (default) = 2237
-  this->write16_(ATM90E26_REGISTER_PNOLTH, 0x0000);         // Active No-Load Power Threshold
-  this->write16_(ATM90E26_REGISTER_QSTARTTH, 0x0AEC);       // Reactive Startup Power Threshold (default) = 2796
-  this->write16_(ATM90E26_REGISTER_QNOLTH, 0x0000);         // Reactive No-Load Power Threshold
-
-  // Compute Checksum for the registers we set above
-  // low byte = sum of all bytes
-  uint16_t cs =
-      ((mmode >> 8) + (mmode & 0xFF) + (pl_const_ >> 24) + ((pl_const_ >> 16) & 0xFF) + ((pl_const_ >> 8) & 0xFF) +
-       (pl_const_ & 0xFF) + (gain_metering_ >> 8) + (gain_metering_ & 0xFF) + 0x08 + 0xBD + 0x0A + 0xEC) &
-      0xFF;
-  // high byte = XOR of all bytes
-  cs |= ((mmode >> 8) ^ (mmode & 0xFF) ^ (pl_const_ >> 24) ^ ((pl_const_ >> 16) & 0xFF) ^ ((pl_const_ >> 8) & 0xFF) ^
-         (pl_const_ & 0xFF) ^ (gain_metering_ >> 8) ^ (gain_metering_ & 0xFF) ^ 0x08 ^ 0xBD ^ 0x0A ^ 0xEC)
-        << 8;
-
-  this->write16_(ATM90E26_REGISTER_CS1, cs);
-  ESP_LOGVV(TAG, "Set CS1 to: 0x%04X", cs);
-
-  // Set measurement calibration values
-  this->write16_(ATM90E26_REGISTER_ADJSTART, 0x5678);      // Measurement calibration startup command, registers 31-3A
-  this->write16_(ATM90E26_REGISTER_UGAIN, gain_voltage_);  // Voltage RMS gain
-  this->write16_(ATM90E26_REGISTER_IGAINL, gain_ct_);      // L line current RMS gain
-  this->write16_(ATM90E26_REGISTER_IGAINN, 0x7530);        // N Line Current RMS Gain
-  this->write16_(ATM90E26_REGISTER_UOFFSET, 0x0000);       // Voltage Offset
-  this->write16_(ATM90E26_REGISTER_IOFFSETL, 0x0000);      // L Line Current Offset
-  this->write16_(ATM90E26_REGISTER_IOFFSETN, 0x0000);      // N Line Current Offse
-  this->write16_(ATM90E26_REGISTER_POFFSETL, 0x0000);      // L Line Active Power Offset
-  this->write16_(ATM90E26_REGISTER_QOFFSETL, 0x0000);      // L Line Reactive Power Offset
-  this->write16_(ATM90E26_REGISTER_POFFSETN, 0x0000);      // N Line Active Power Offset
-  this->write16_(ATM90E26_REGISTER_QOFFSETN, 0x0000);      // N Line Reactive Power Offset
-
-  // Compute Checksum for the registers we set above
-  cs = ((gain_voltage_ >> 8) + (gain_voltage_ & 0xFF) + (gain_ct_ >> 8) + (gain_ct_ & 0xFF) + 0x75 + 0x30) & 0xFF;
-  cs |= ((gain_voltage_ >> 8) ^ (gain_voltage_ & 0xFF) ^ (gain_ct_ >> 8) ^ (gain_ct_ & 0xFF) ^ 0x75 ^ 0x30) << 8;
-  this->write16_(ATM90E26_REGISTER_CS2, cs);
-  ESP_LOGVV(TAG, "Set CS2 to: 0x%04X", cs);
-
-  this->write16_(ATM90E26_REGISTER_CALSTART,
-                 0x8765);  // Checks correctness of 21-2B registers and starts normal metering if ok
-  this->write16_(ATM90E26_REGISTER_ADJSTART,
-                 0x8765);  // Checks correctness of 31-3A registers and starts normal measurement  if ok
-
-  uint16_t sys_status = this->read16_(ATM90E26_REGISTER_SYSSTATUS);
-  if (sys_status & 0xC000) {  // Checksum 1 Error
-
-    ESP_LOGW(TAG, "Could not initialize ATM90E26 IC: CS1 was incorrect, expected: 0x%04X",
-             this->read16_(ATM90E26_REGISTER_CS1));
-    this->mark_failed();
-  }
-  if (sys_status & 0x3000) {  // Checksum 2 Error
-    ESP_LOGW(TAG, "Could not initialize ATM90E26 IC: CS2 was incorrect, expected: 0x%04X",
-             this->read16_(ATM90E26_REGISTER_CS2));
-    this->mark_failed();
-  }
-}
-
-void ATM90E26Component::dump_config() {
-  ESP_LOGCONFIG("", "ATM90E26:");
-  LOG_PIN("  CS Pin: ", this->cs_);
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with ATM90E26 failed!");
-  }
-  LOG_UPDATE_INTERVAL(this);
-  LOG_SENSOR("  ", "Voltage A", this->voltage_sensor_);
-  LOG_SENSOR("  ", "Current A", this->current_sensor_);
-  LOG_SENSOR("  ", "Power A", this->power_sensor_);
-  LOG_SENSOR("  ", "Reactive Power A", this->reactive_power_sensor_);
-  LOG_SENSOR("  ", "PF A", this->power_factor_sensor_);
-  LOG_SENSOR("  ", "Active Forward Energy A", this->forward_active_energy_sensor_);
-  LOG_SENSOR("  ", "Active Reverse Energy A", this->reverse_active_energy_sensor_);
-  LOG_SENSOR("  ", "Frequency", this->freq_sensor_);
-}
-float ATM90E26Component::get_setup_priority() const { return setup_priority::DATA; }
-
-uint16_t ATM90E26Component::read16_(uint8_t a_register) {
-  uint8_t data[2];
-  uint16_t output;
-
-  this->enable();
-  delayMicroseconds(4);
-  this->write_byte(a_register | 0x80);
-  delayMicroseconds(4);
-  this->read_array(data, 2);
-  this->disable();
-
-  output = (uint16_t(data[0] & 0xFF) << 8) | (data[1] & 0xFF);
-  ESP_LOGVV(TAG, "read16_ 0x%04X output 0x%04X", a_register, output);
-  return output;
-}
-
-void ATM90E26Component::write16_(uint8_t a_register, uint16_t val) {
-  ESP_LOGVV(TAG, "write16_ 0x%04X val 0x%04X", a_register, val);
-  this->enable();
-  delayMicroseconds(4);
-  this->write_byte(a_register & 0x7F);
-  delayMicroseconds(4);
-  this->write_byte((val >> 8) & 0xFF);
-  this->write_byte(val & 0xFF);
-  this->disable();
-}
-
-float ATM90E26Component::get_line_current_() {
-  uint16_t current = this->read16_(ATM90E26_REGISTER_IRMS);
-  return current / 1000.0f;
-}
-
-float ATM90E26Component::get_line_voltage_() {
-  uint16_t voltage = this->read16_(ATM90E26_REGISTER_URMS);
-  return voltage / 100.0f;
-}
-
-float ATM90E26Component::get_active_power_() {
-  int16_t val = this->read16_(ATM90E26_REGISTER_PMEAN);  // two's complement
-  return (float) val;
-}
-
-float ATM90E26Component::get_reactive_power_() {
-  int16_t val = this->read16_(ATM90E26_REGISTER_QMEAN);  // two's complement
-  return (float) val;
-}
-
-float ATM90E26Component::get_power_factor_() {
-  uint16_t val = this->read16_(ATM90E26_REGISTER_POWERF);  // signed
-  if (val & 0x8000) {
-    return -(val & 0x7FF) / 1000.0f;
-  } else {
-    return val / 1000.0f;
-  }
-}
-
-float ATM90E26Component::get_forward_active_energy_() {
-  uint16_t val = this->read16_(ATM90E26_REGISTER_APENERGY);
-  if ((UINT32_MAX - this->cumulative_forward_active_energy_) > val) {
-    this->cumulative_forward_active_energy_ += val;
-  } else {
-    this->cumulative_forward_active_energy_ = val;
-  }
-  // The register holds thenths of pulses, we want to output Wh
-  return (this->cumulative_forward_active_energy_ * 100.0f / meter_constant_);
-}
-
-float ATM90E26Component::get_reverse_active_energy_() {
-  uint16_t val = this->read16_(ATM90E26_REGISTER_ANENERGY);
-  if (UINT32_MAX - this->cumulative_reverse_active_energy_ > val) {
-    this->cumulative_reverse_active_energy_ += val;
-  } else {
-    this->cumulative_reverse_active_energy_ = val;
-  }
-  return (this->cumulative_reverse_active_energy_ * 100.0f / meter_constant_);
-}
-
-float ATM90E26Component::get_frequency_() {
-  uint16_t freq = this->read16_(ATM90E26_REGISTER_FREQ);
-  return freq / 100.0f;
-}
-
-}  // namespace atm90e26
-}  // namespace esphome

esphome/components/atm90e26/atm90e26.h

@@ -1,72 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/spi/spi.h"
-
-namespace esphome {
-namespace atm90e26 {
-
-class ATM90E26Component : public PollingComponent,
-                          public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_HIGH,
-                                                spi::CLOCK_PHASE_TRAILING, spi::DATA_RATE_200KHZ> {
- public:
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override;
-  void update() override;
-
-  void set_voltage_sensor(sensor::Sensor *obj) { this->voltage_sensor_ = obj; }
-  void set_current_sensor(sensor::Sensor *obj) { this->current_sensor_ = obj; }
-  void set_power_sensor(sensor::Sensor *obj) { this->power_sensor_ = obj; }
-  void set_reactive_power_sensor(sensor::Sensor *obj) { this->reactive_power_sensor_ = obj; }
-  void set_forward_active_energy_sensor(sensor::Sensor *obj) { this->forward_active_energy_sensor_ = obj; }
-  void set_reverse_active_energy_sensor(sensor::Sensor *obj) { this->reverse_active_energy_sensor_ = obj; }
-  void set_power_factor_sensor(sensor::Sensor *obj) { this->power_factor_sensor_ = obj; }
-  void set_freq_sensor(sensor::Sensor *freq_sensor) { freq_sensor_ = freq_sensor; }
-  void set_line_freq(int freq) { line_freq_ = freq; }
-  void set_meter_constant(float val) { meter_constant_ = val; }
-  void set_pl_const(uint32_t pl_const) { pl_const_ = pl_const; }
-  void set_gain_metering(uint16_t gain) { this->gain_metering_ = gain; }
-  void set_gain_voltage(uint16_t gain) { this->gain_voltage_ = gain; }
-  void set_gain_ct(uint16_t gain) { this->gain_ct_ = gain; }
-  void set_gain_pga(uint16_t gain) { gain_pga_ = gain; }
-  void set_n_line_gain(uint16_t gain) { n_line_gain_ = gain; }
-
- protected:
-  uint16_t read16_(uint8_t a_register);
-  int read32_(uint8_t addr_h, uint8_t addr_l);
-  void write16_(uint8_t a_register, uint16_t val);
-
-  float get_line_voltage_();
-  float get_line_current_();
-  float get_active_power_();
-  float get_reactive_power_();
-  float get_power_factor_();
-  float get_forward_active_energy_();
-  float get_reverse_active_energy_();
-  float get_frequency_();
-  float get_chip_temperature_();
-
-  sensor::Sensor *freq_sensor_{nullptr};
-  sensor::Sensor *voltage_sensor_{nullptr};
-  sensor::Sensor *current_sensor_{nullptr};
-  sensor::Sensor *power_sensor_{nullptr};
-  sensor::Sensor *reactive_power_sensor_{nullptr};
-  sensor::Sensor *power_factor_sensor_{nullptr};
-  sensor::Sensor *forward_active_energy_sensor_{nullptr};
-  sensor::Sensor *reverse_active_energy_sensor_{nullptr};
-  uint32_t cumulative_forward_active_energy_{0};
-  uint32_t cumulative_reverse_active_energy_{0};
-  uint16_t gain_metering_{7481};
-  uint16_t gain_voltage_{26400};
-  uint16_t gain_ct_{31251};
-  uint16_t gain_pga_{0x4};
-  uint16_t n_line_gain_{0x2};
-  int line_freq_{60};
-  float meter_constant_{3200.0f};
-  uint32_t pl_const_{1429876};
-};
-
-}  // namespace atm90e26
-}  // namespace esphome

esphome/components/atm90e26/atm90e26_reg.h

@@ -1,70 +0,0 @@
-#pragma once
-
-namespace esphome {
-namespace atm90e26 {
-
-/* Status and Special Register */
-static const uint8_t ATM90E26_REGISTER_SOFTRESET = 0x00;  // Software Reset
-static const uint8_t ATM90E26_REGISTER_SYSSTATUS = 0x01;  // System Status
-static const uint8_t ATM90E26_REGISTER_FUNCEN = 0x02;     // Function Enable
-static const uint8_t ATM90E26_REGISTER_SAGTH = 0x03;      // Voltage Sag Threshold
-static const uint8_t ATM90E26_REGISTER_SMALLPMOD = 0x04;  // Small-Power Mode
-static const uint8_t ATM90E26_REGISTER_LASTDATA = 0x06;   // Last Read/Write SPI/UART Value
-
-/* Metering Calibration and Configuration Register */
-static const uint8_t ATM90E26_REGISTER_LSB = 0x08;       // RMS/Power 16-bit LSB
-static const uint8_t ATM90E26_REGISTER_CALSTART = 0x20;  // Calibration Start Command
-static const uint8_t ATM90E26_REGISTER_PLCONSTH = 0x21;  // High Word of PL_Constant
-static const uint8_t ATM90E26_REGISTER_PLCONSTL = 0x22;  // Low Word of PL_Constant
-static const uint8_t ATM90E26_REGISTER_LGAIN = 0x23;     // L Line Calibration Gain
-static const uint8_t ATM90E26_REGISTER_LPHI = 0x24;      // L Line Calibration Angle
-static const uint8_t ATM90E26_REGISTER_NGAIN = 0x25;     // N Line Calibration Gain
-static const uint8_t ATM90E26_REGISTER_NPHI = 0x26;      // N Line Calibration Angle
-static const uint8_t ATM90E26_REGISTER_PSTARTTH = 0x27;  // Active Startup Power Threshold
-static const uint8_t ATM90E26_REGISTER_PNOLTH = 0x28;    // Active No-Load Power Threshold
-static const uint8_t ATM90E26_REGISTER_QSTARTTH = 0x29;  // Reactive Startup Power Threshold
-static const uint8_t ATM90E26_REGISTER_QNOLTH = 0x2A;    // Reactive No-Load Power Threshold
-static const uint8_t ATM90E26_REGISTER_MMODE = 0x2B;     // Metering Mode Configuration
-static const uint8_t ATM90E26_REGISTER_CS1 = 0x2C;       // Checksum 1
-
-/* Measurement Calibration Register */
-static const uint8_t ATM90E26_REGISTER_ADJSTART = 0x30;  // Measurement Calibration Start Command
-static const uint8_t ATM90E26_REGISTER_UGAIN = 0x31;     // Voltage RMS Gain
-static const uint8_t ATM90E26_REGISTER_IGAINL = 0x32;    // L Line Current RMS Gain
-static const uint8_t ATM90E26_REGISTER_IGAINN = 0x33;    // N Line Current RMS Gain
-static const uint8_t ATM90E26_REGISTER_UOFFSET = 0x34;   // Voltage Offset
-static const uint8_t ATM90E26_REGISTER_IOFFSETL = 0x35;  // L Line Current Offset
-static const uint8_t ATM90E26_REGISTER_IOFFSETN = 0x36;  // N Line Current Offse
-static const uint8_t ATM90E26_REGISTER_POFFSETL = 0x37;  // L Line Active Power Offset
-static const uint8_t ATM90E26_REGISTER_QOFFSETL = 0x38;  // L Line Reactive Power Offset
-static const uint8_t ATM90E26_REGISTER_POFFSETN = 0x39;  // N Line Active Power Offset
-static const uint8_t ATM90E26_REGISTER_QOFFSETN = 0x3A;  // N Line Reactive Power Offset
-static const uint8_t ATM90E26_REGISTER_CS2 = 0x3B;       // Checksum 2
-
-/* Energy Register */
-static const uint8_t ATM90E26_REGISTER_APENERGY = 0x40;  // Forward Active Energy
-static const uint8_t ATM90E26_REGISTER_ANENERGY = 0x41;  // Reverse Active Energy
-static const uint8_t ATM90E26_REGISTER_ATENERGY = 0x42;  // Absolute Active Energy
-static const uint8_t ATM90E26_REGISTER_RPENERGY = 0x43;  // Forward (Inductive) Reactive Energy
-static const uint8_t ATM90E26_REGISTER_RNENERG = 0x44;   // Reverse (Capacitive) Reactive Energy
-static const uint8_t ATM90E26_REGISTER_RTENERGY = 0x45;  // Absolute Reactive Energy
-static const uint8_t ATM90E26_REGISTER_ENSTATUS = 0x46;  // Metering Status
-
-/* Measurement Register */
-static const uint8_t ATM90E26_REGISTER_IRMS = 0x48;     // L Line Current RMS
-static const uint8_t ATM90E26_REGISTER_URMS = 0x49;     // Voltage RMS
-static const uint8_t ATM90E26_REGISTER_PMEAN = 0x4A;    // L Line Mean Active Power
-static const uint8_t ATM90E26_REGISTER_QMEAN = 0x4B;    // L Line Mean Reactive Power
-static const uint8_t ATM90E26_REGISTER_FREQ = 0x4C;     // Voltage Frequency
-static const uint8_t ATM90E26_REGISTER_POWERF = 0x4D;   // L Line Power Factor
-static const uint8_t ATM90E26_REGISTER_PANGLE = 0x4E;   // Phase Angle between Voltage and L Line Current
-static const uint8_t ATM90E26_REGISTER_SMEAN = 0x4F;    // L Line Mean Apparent Power
-static const uint8_t ATM90E26_REGISTER_IRMS2 = 0x68;    // N Line Current rms
-static const uint8_t ATM90E26_REGISTER_PMEAN2 = 0x6A;   // N Line Mean Active Power
-static const uint8_t ATM90E26_REGISTER_QMEAN2 = 0x6B;   // N Line Mean Reactive Power
-static const uint8_t ATM90E26_REGISTER_POWERF2 = 0x6D;  // N Line Power Factor
-static const uint8_t ATM90E26_REGISTER_PANGLE2 = 0x6E;  // Phase Angle between Voltage and N Line Current
-static const uint8_t ATM90E26_REGISTER_SMEAN2 = 0x6F;   // N Line Mean Apparent Power
-
-}  // namespace atm90e26
-}  // namespace esphome

esphome/components/atm90e26/sensor.py

@@ -1,157 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor, spi
-from esphome.const import (
-    CONF_ID,
-    CONF_REACTIVE_POWER,
-    CONF_VOLTAGE,
-    CONF_CURRENT,
-    CONF_POWER,
-    CONF_POWER_FACTOR,
-    CONF_FREQUENCY,
-    CONF_FORWARD_ACTIVE_ENERGY,
-    CONF_REVERSE_ACTIVE_ENERGY,
-    DEVICE_CLASS_CURRENT,
-    DEVICE_CLASS_ENERGY,
-    DEVICE_CLASS_POWER,
-    DEVICE_CLASS_POWER_FACTOR,
-    DEVICE_CLASS_VOLTAGE,
-    ICON_LIGHTBULB,
-    ICON_CURRENT_AC,
-    STATE_CLASS_MEASUREMENT,
-    STATE_CLASS_TOTAL_INCREASING,
-    UNIT_HERTZ,
-    UNIT_VOLT,
-    UNIT_AMPERE,
-    UNIT_WATT,
-    UNIT_VOLT_AMPS_REACTIVE,
-    UNIT_WATT_HOURS,
-)
-
-CONF_LINE_FREQUENCY = "line_frequency"
-CONF_METER_CONSTANT = "meter_constant"
-CONF_PL_CONST = "pl_const"
-CONF_GAIN_PGA = "gain_pga"
-CONF_GAIN_METERING = "gain_metering"
-CONF_GAIN_VOLTAGE = "gain_voltage"
-CONF_GAIN_CT = "gain_ct"
-LINE_FREQS = {
-    "50HZ": 50,
-    "60HZ": 60,
-}
-PGA_GAINS = {
-    "1X": 0x4,
-    "4X": 0x0,
-    "8X": 0x1,
-    "16X": 0x2,
-    "24X": 0x3,
-}
-
-atm90e26_ns = cg.esphome_ns.namespace("atm90e26")
-ATM90E26Component = atm90e26_ns.class_(
-    "ATM90E26Component", cg.PollingComponent, spi.SPIDevice
-)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(ATM90E26Component),
-            cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_VOLT,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_VOLTAGE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_CURRENT): sensor.sensor_schema(
-                unit_of_measurement=UNIT_AMPERE,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_CURRENT,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_POWER): sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_POWER,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_REACTIVE_POWER): sensor.sensor_schema(
-                unit_of_measurement=UNIT_VOLT_AMPS_REACTIVE,
-                icon=ICON_LIGHTBULB,
-                accuracy_decimals=2,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_POWER_FACTOR): sensor.sensor_schema(
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_POWER_FACTOR,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_FORWARD_ACTIVE_ENERGY): sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT_HOURS,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_ENERGY,
-                state_class=STATE_CLASS_TOTAL_INCREASING,
-            ),
-            cv.Optional(CONF_REVERSE_ACTIVE_ENERGY): sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT_HOURS,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_ENERGY,
-                state_class=STATE_CLASS_TOTAL_INCREASING,
-            ),
-            cv.Optional(CONF_FREQUENCY): sensor.sensor_schema(
-                unit_of_measurement=UNIT_HERTZ,
-                icon=ICON_CURRENT_AC,
-                accuracy_decimals=1,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Required(CONF_LINE_FREQUENCY): cv.enum(LINE_FREQS, upper=True),
-            cv.Required(CONF_METER_CONSTANT): cv.positive_float,
-            cv.Optional(CONF_PL_CONST, default=1429876): cv.uint32_t,
-            cv.Optional(CONF_GAIN_METERING, default=7481): cv.uint16_t,
-            cv.Optional(CONF_GAIN_VOLTAGE, default=26400): cv.int_range(
-                min=0, max=32767
-            ),
-            cv.Optional(CONF_GAIN_CT, default=31251): cv.uint16_t,
-            cv.Optional(CONF_GAIN_PGA, default="1X"): cv.enum(PGA_GAINS, upper=True),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(spi.spi_device_schema())
-)
-
-
-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)
-
-    if voltage_config := config.get(CONF_VOLTAGE):
-        sens = await sensor.new_sensor(voltage_config)
-        cg.add(var.set_voltage_sensor(sens))
-    if current_config := config.get(CONF_CURRENT):
-        sens = await sensor.new_sensor(current_config)
-        cg.add(var.set_current_sensor(sens))
-    if power_config := config.get(CONF_POWER):
-        sens = await sensor.new_sensor(power_config)
-        cg.add(var.set_power_sensor(sens))
-    if reactive_power_config := config.get(CONF_REACTIVE_POWER):
-        sens = await sensor.new_sensor(reactive_power_config)
-        cg.add(var.set_reactive_power_sensor(sens))
-    if power_factor_config := config.get(CONF_POWER_FACTOR):
-        sens = await sensor.new_sensor(power_factor_config)
-        cg.add(var.set_power_factor_sensor(sens))
-    if forward_active_energy_config := config.get(CONF_FORWARD_ACTIVE_ENERGY):
-        sens = await sensor.new_sensor(forward_active_energy_config)
-        cg.add(var.set_forward_active_energy_sensor(sens))
-    if reverse_active_energy_config := config.get(CONF_REVERSE_ACTIVE_ENERGY):
-        sens = await sensor.new_sensor(reverse_active_energy_config)
-        cg.add(var.set_reverse_active_energy_sensor(sens))
-    if frequency_config := config.get(CONF_FREQUENCY):
-        sens = await sensor.new_sensor(frequency_config)
-        cg.add(var.set_freq_sensor(sens))
-    cg.add(var.set_line_freq(config[CONF_LINE_FREQUENCY]))
-    cg.add(var.set_meter_constant(config[CONF_METER_CONSTANT]))
-    cg.add(var.set_pl_const(config[CONF_PL_CONST]))
-    cg.add(var.set_gain_metering(config[CONF_GAIN_METERING]))
-    cg.add(var.set_gain_voltage(config[CONF_GAIN_VOLTAGE]))
-    cg.add(var.set_gain_ct(config[CONF_GAIN_CT]))
-    cg.add(var.set_gain_pga(config[CONF_GAIN_PGA]))

esphome/components/atm90e32/atm90e32.cpp

@@ -1,7 +1,6 @@
 #include "atm90e32.h"
 #include "atm90e32_reg.h"
 #include "esphome/core/log.h"
-#include <cinttypes>
 
 namespace esphome {
 namespace atm90e32 {
@@ -174,7 +173,7 @@ uint16_t ATM90E32Component::read16_(uint16_t a_register) {
   this->disable();
 
   output = (uint16_t(data[0] & 0xFF) << 8) | (data[1] & 0xFF);
-  ESP_LOGVV(TAG, "read16_ 0x%04" PRIX16 " output 0x%04" PRIX16, a_register, output);
+  ESP_LOGVV(TAG, "read16_ 0x%04X output 0x%04X", a_register, output);
   return output;
 }
 
@@ -183,10 +182,8 @@ int ATM90E32Component::read32_(uint16_t addr_h, uint16_t addr_l) {
   uint16_t val_l = this->read16_(addr_l);
   int32_t val = (val_h << 16) | val_l;
 
-  ESP_LOGVV(TAG,
-            "read32_ addr_h 0x%04" PRIX16 " val_h 0x%04" PRIX16 " addr_l 0x%04" PRIX16 " val_l 0x%04" PRIX16
-            " = %" PRId32,
-            addr_h, val_h, addr_l, val_l, val);
+  ESP_LOGVV(TAG, "read32_ addr_h 0x%04X val_h 0x%04X addr_l 0x%04X val_l 0x%04X = %d", addr_h, val_h, addr_l, val_l,
+            val);
 
   return val;
 }
@@ -195,7 +192,7 @@ void ATM90E32Component::write16_(uint16_t a_register, uint16_t val) {
   uint8_t addrh = (a_register >> 8) & 0x03;
   uint8_t addrl = (a_register & 0xFF);
 
-  ESP_LOGVV(TAG, "write16_ 0x%04" PRIX16 " val 0x%04" PRIX16, a_register, val);
+  ESP_LOGVV(TAG, "write16_ 0x%04X val 0x%04X", a_register, val);
   this->enable();
   delayMicroseconds(10);
   this->write_byte(addrh);

esphome/components/atm90e32/sensor.py

@@ -6,9 +6,6 @@ from esphome.const import (
     CONF_REACTIVE_POWER,
     CONF_VOLTAGE,
     CONF_CURRENT,
-    CONF_PHASE_A,
-    CONF_PHASE_B,
-    CONF_PHASE_C,
     CONF_POWER,
     CONF_POWER_FACTOR,
     CONF_FREQUENCY,
@@ -34,6 +31,10 @@ from esphome.const import (
     UNIT_WATT_HOURS,
 )
 
+CONF_PHASE_A = "phase_a"
+CONF_PHASE_B = "phase_b"
+CONF_PHASE_C = "phase_c"
+
 CONF_LINE_FREQUENCY = "line_frequency"
 CONF_CHIP_TEMPERATURE = "chip_temperature"
 CONF_GAIN_PGA = "gain_pga"
@@ -150,35 +151,33 @@ async def to_code(config):
         conf = config[phase]
         cg.add(var.set_volt_gain(i, conf[CONF_GAIN_VOLTAGE]))
         cg.add(var.set_ct_gain(i, conf[CONF_GAIN_CT]))
-        if voltage_config := conf.get(CONF_VOLTAGE):
-            sens = await sensor.new_sensor(voltage_config)
+        if CONF_VOLTAGE in conf:
+            sens = await sensor.new_sensor(conf[CONF_VOLTAGE])
             cg.add(var.set_voltage_sensor(i, sens))
-        if current_config := conf.get(CONF_CURRENT):
-            sens = await sensor.new_sensor(current_config)
+        if CONF_CURRENT in conf:
+            sens = await sensor.new_sensor(conf[CONF_CURRENT])
             cg.add(var.set_current_sensor(i, sens))
-        if power_config := conf.get(CONF_POWER):
-            sens = await sensor.new_sensor(power_config)
+        if CONF_POWER in conf:
+            sens = await sensor.new_sensor(conf[CONF_POWER])
             cg.add(var.set_power_sensor(i, sens))
-        if reactive_power_config := conf.get(CONF_REACTIVE_POWER):
-            sens = await sensor.new_sensor(reactive_power_config)
+        if CONF_REACTIVE_POWER in conf:
+            sens = await sensor.new_sensor(conf[CONF_REACTIVE_POWER])
             cg.add(var.set_reactive_power_sensor(i, sens))
-        if power_factor_config := conf.get(CONF_POWER_FACTOR):
-            sens = await sensor.new_sensor(power_factor_config)
+        if CONF_POWER_FACTOR in conf:
+            sens = await sensor.new_sensor(conf[CONF_POWER_FACTOR])
             cg.add(var.set_power_factor_sensor(i, sens))
-        if forward_active_energy_config := conf.get(CONF_FORWARD_ACTIVE_ENERGY):
-            sens = await sensor.new_sensor(forward_active_energy_config)
+        if CONF_FORWARD_ACTIVE_ENERGY in conf:
+            sens = await sensor.new_sensor(conf[CONF_FORWARD_ACTIVE_ENERGY])
             cg.add(var.set_forward_active_energy_sensor(i, sens))
-        if reverse_active_energy_config := conf.get(CONF_REVERSE_ACTIVE_ENERGY):
-            sens = await sensor.new_sensor(reverse_active_energy_config)
+        if CONF_REVERSE_ACTIVE_ENERGY in conf:
+            sens = await sensor.new_sensor(conf[CONF_REVERSE_ACTIVE_ENERGY])
             cg.add(var.set_reverse_active_energy_sensor(i, sens))
-
-    if frequency_config := config.get(CONF_FREQUENCY):
-        sens = await sensor.new_sensor(frequency_config)
+    if CONF_FREQUENCY in config:
+        sens = await sensor.new_sensor(config[CONF_FREQUENCY])
         cg.add(var.set_freq_sensor(sens))
-    if chip_temperature_config := config.get(CONF_CHIP_TEMPERATURE):
-        sens = await sensor.new_sensor(chip_temperature_config)
+    if CONF_CHIP_TEMPERATURE in config:
+        sens = await sensor.new_sensor(config[CONF_CHIP_TEMPERATURE])
         cg.add(var.set_chip_temperature_sensor(sens))
-
     cg.add(var.set_line_freq(config[CONF_LINE_FREQUENCY]))
     cg.add(var.set_current_phases(config[CONF_CURRENT_PHASES]))
     cg.add(var.set_pga_gain(config[CONF_GAIN_PGA]))

esphome/components/b_parasite/sensor.py

@@ -87,6 +87,6 @@ async def to_code(config):
         (CONF_MOISTURE, var.set_soil_moisture),
         (CONF_ILLUMINANCE, var.set_illuminance),
     ]:
-        if sensor_config := config.get(config_key):
-            sens = await sensor.new_sensor(sensor_config)
+        if config_key in config:
+            sens = await sensor.new_sensor(config[config_key])
             cg.add(setter(sens))