InterruptLock per core for rp2040

.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,74 +1,56 @@
 {
   "name": "ESPHome Dev",
   "image": "ghcr.io/esphome/esphome-lint:dev",
-  "postCreateCommand": ["script/devcontainer-post-create"],
-  "containerEnv": {
-    "DEVCONTAINER": "1",
-    "PIP_BREAK_SYSTEM_PACKAGES": "1",
-    "PIP_ROOT_USER_ACTION": "ignore"
-  },
+  "postCreateCommand": [
+    "script/devcontainer-post-create"
+  ],
   "runArgs": [
     "--privileged",
     "-e",
     "ESPHOME_DASHBOARD_USE_PING=1"
-    // uncomment and edit the path in order to pass though local USB serial to the conatiner
-    // , "--device=/dev/ttyACM0"
   ],
   "appPort": 6052,
-  // if you are using avahi in the host device, uncomment these to allow the
-  // devcontainer to find devices via mdns
-  //"mounts": [
-  //  "type=bind,source=/dev/bus/usb,target=/dev/bus/usb",
-  //  "type=bind,source=/var/run/dbus,target=/var/run/dbus",
-  //  "type=bind,source=/var/run/avahi-daemon/socket,target=/var/run/avahi-daemon/socket"
-  //],
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        // python
-        "ms-python.python",
-        "visualstudioexptteam.vscodeintellicode",
-        // yaml
-        "redhat.vscode-yaml",
-        // cpp
-        "ms-vscode.cpptools",
-        // editorconfig
-        "editorconfig.editorconfig"
-      ],
-      "settings": {
-        "python.languageServer": "Pylance",
-        "python.pythonPath": "/usr/bin/python3",
-        "python.linting.pylintEnabled": true,
-        "python.linting.enabled": true,
-        "python.formatting.provider": "black",
-        "editor.formatOnPaste": false,
-        "editor.formatOnSave": true,
-        "editor.formatOnType": true,
-        "files.trimTrailingWhitespace": true,
-        "terminal.integrated.defaultProfile.linux": "bash",
-        "yaml.customTags": [
-          "!secret scalar",
-          "!lambda scalar",
-          "!extend scalar",
-          "!remove scalar",
-          "!include_dir_named scalar",
-          "!include_dir_list scalar",
-          "!include_dir_merge_list scalar",
-          "!include_dir_merge_named scalar"
-        ],
-        "files.exclude": {
-          "**/.git": true,
-          "**/.DS_Store": true,
-          "**/*.pyc": {
-            "when": "$(basename).py"
-          },
-          "**/__pycache__": true
-        },
-        "files.associations": {
-          "**/.vscode/*.json": "jsonc"
-        },
-        "C_Cpp.clang_format_path": "/usr/bin/clang-format-13"
-      }
-    }
+  "extensions": [
+    // python
+    "ms-python.python",
+    "visualstudioexptteam.vscodeintellicode",
+    // yaml
+    "redhat.vscode-yaml",
+    // cpp
+    "ms-vscode.cpptools",
+    // editorconfig
+    "editorconfig.editorconfig",
+  ],
+  "settings": {
+    "python.languageServer": "Pylance",
+    "python.pythonPath": "/usr/bin/python3",
+    "python.linting.pylintEnabled": true,
+    "python.linting.enabled": true,
+    "python.formatting.provider": "black",
+    "editor.formatOnPaste": false,
+    "editor.formatOnSave": true,
+    "editor.formatOnType": true,
+    "files.trimTrailingWhitespace": true,
+    "terminal.integrated.defaultProfile.linux": "bash",
+    "yaml.customTags": [
+      "!secret scalar",
+      "!lambda scalar",
+      "!include_dir_named scalar",
+      "!include_dir_list scalar",
+      "!include_dir_merge_list scalar",
+      "!include_dir_merge_named scalar"
+    ],
+    "files.exclude": {
+      "**/.git": true,
+      "**/.DS_Store": true,
+      "**/*.pyc": {
+        "when": "$(basename).py"
+      },
+      "**/__pycache__": true
+    },
+    "files.associations": {
+      "**/.vscode/*.json": "jsonc"
+    },
+    "C_Cpp.clang_format_path": "/usr/bin/clang-format-13",
   }
 }

.gitattributes

@@ -1,3 +1,2 @@
 # Normalize line endings to LF in the repository
 * text eol=lf
-*.png binary

.github/PULL_REQUEST_TEMPLATE.md

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

.github/actions/build-image/action.yaml

@@ -1,97 +0,0 @@
-name: Build Image
-inputs:
-  platform:
-    description: "Platform to build for"
-    required: true
-    example: "linux/amd64"
-  target:
-    description: "Target to build"
-    required: true
-    example: "docker"
-  baseimg:
-    description: "Base image type"
-    required: true
-    example: "docker"
-  suffix:
-    description: "Suffix to add to tags"
-    required: true
-  version:
-    description: "Version to build"
-    required: true
-    example: "2023.12.0"
-runs:
-  using: "composite"
-  steps:
-    - name: Generate short tags
-      id: tags
-      shell: bash
-      run: |
-        output=$(docker/generate_tags.py \
-          --tag "${{ inputs.version }}" \
-          --suffix "${{ inputs.suffix }}")
-        echo $output
-        for l in $output; do
-          echo $l >> $GITHUB_OUTPUT
-        done
-
-    - name: Build and push to ghcr by digest
-      id: build-ghcr
-      uses: docker/build-push-action@v5.2.0
-      with:
-        context: .
-        file: ./docker/Dockerfile
-        platforms: ${{ inputs.platform }}
-        target: ${{ inputs.target }}
-        cache-from: type=gha
-        cache-to: type=gha,mode=max
-        build-args: |
-          BASEIMGTYPE=${{ inputs.baseimg }}
-          BUILD_VERSION=${{ inputs.version }}
-        outputs: |
-          type=image,name=ghcr.io/${{ steps.tags.outputs.image_name }},push-by-digest=true,name-canonical=true,push=true
-
-    - name: Export ghcr digests
-      shell: bash
-      run: |
-        mkdir -p /tmp/digests/${{ inputs.target }}/ghcr
-        digest="${{ steps.build-ghcr.outputs.digest }}"
-        touch "/tmp/digests/${{ inputs.target }}/ghcr/${digest#sha256:}"
-
-    - name: Upload ghcr digest
-      uses: actions/upload-artifact@v3.1.3
-      with:
-        name: digests-${{ inputs.target }}-ghcr
-        path: /tmp/digests/${{ inputs.target }}/ghcr/*
-        if-no-files-found: error
-        retention-days: 1
-
-    - name: Build and push to dockerhub by digest
-      id: build-dockerhub
-      uses: docker/build-push-action@v5.2.0
-      with:
-        context: .
-        file: ./docker/Dockerfile
-        platforms: ${{ inputs.platform }}
-        target: ${{ inputs.target }}
-        cache-from: type=gha
-        cache-to: type=gha,mode=max
-        build-args: |
-          BASEIMGTYPE=${{ inputs.baseimg }}
-          BUILD_VERSION=${{ inputs.version }}
-        outputs: |
-          type=image,name=docker.io/${{ steps.tags.outputs.image_name }},push-by-digest=true,name-canonical=true,push=true
-
-    - name: Export dockerhub digests
-      shell: bash
-      run: |
-        mkdir -p /tmp/digests/${{ inputs.target }}/dockerhub
-        digest="${{ steps.build-dockerhub.outputs.digest }}"
-        touch "/tmp/digests/${{ inputs.target }}/dockerhub/${digest#sha256:}"
-
-    - name: Upload dockerhub digest
-      uses: actions/upload-artifact@v3.1.3
-      with:
-        name: digests-${{ inputs.target }}-dockerhub
-        path: /tmp/digests/${{ inputs.target }}/dockerhub/*
-        if-no-files-found: error
-        retention-days: 1

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

@@ -1,47 +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@v5.0.0
-      with:
-        python-version: ${{ inputs.python-version }}
-    - name: Restore Python virtual environment
-      id: cache-venv
-      uses: actions/cache/restore@v4.0.1
-      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' && runner.os != 'Windows'
-      shell: bash
-      run: |
-        python -m venv venv
-        source venv/bin/activate
-        python --version
-        pip install -r requirements.txt -r requirements_optional.txt -r requirements_test.txt
-        pip install -e .
-    - name: Create Python virtual environment
-      if: steps.cache-venv.outputs.cache-hit != 'true' && runner.os == 'Windows'
-      shell: bash
-      run: |
-        python -m venv venv
-        ./venv/Scripts/activate
-        python --version
-        pip install -r requirements.txt -r requirements_optional.txt -r requirements_test.txt
-        pip install -e .

.github/dependabot.yml

@@ -13,13 +13,3 @@ updates:
     schedule:
       interval: daily
     open-pull-requests-limit: 10
-  - package-ecosystem: github-actions
-    directory: "/.github/actions/build-image"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 10
-  - package-ecosystem: github-actions
-    directory: "/.github/actions/restore-python"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 10

.github/workflows/ci-docker.yml

@@ -8,18 +8,16 @@ on:
     branches: [dev, beta, release]
     paths:
       - "docker/**"
-      - ".github/workflows/ci-docker.yml"
+      - ".github/workflows/**"
       - "requirements*.txt"
       - "platformio.ini"
-      - "script/platformio_install_deps.py"
 
   pull_request:
     paths:
       - "docker/**"
-      - ".github/workflows/ci-docker.yml"
+      - ".github/workflows/**"
       - "requirements*.txt"
       - "platformio.ini"
-      - "script/platformio_install_deps.py"
 
 permissions:
   contents: read
@@ -40,15 +38,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@v5.0.0
+        uses: actions/setup-python@v4
         with:
           python-version: "3.9"
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.1.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,332 +7,64 @@ on:
     branches: [dev, beta, release]
 
   pull_request:
-    paths:
-      - "**"
-      - "!.github/workflows/*.yml"
-      - ".github/workflows/ci.yml"
-      - "!.yamllint"
-      - "!.github/dependabot.yml"
   merge_group:
 
 permissions:
   contents: read
 
-env:
-  DEFAULT_PYTHON: "3.9"
-  PYUPGRADE_TARGET: "--py39-plus"
-  CLANG_FORMAT_VERSION: "13.0.1"
-
 concurrency:
   # yamllint disable-line rule:line-length
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 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
-      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        id: python
-        uses: actions/setup-python@v5.0.0
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-      - name: Restore Python virtual environment
-        id: cache-venv
-        uses: actions/cache@v4.0.1
-        with:
-          path: venv
-          # yamllint disable-line rule:line-length
-          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{ steps.cache-key.outputs.key }}
-      - name: Create Python virtual environment
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        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 .
-
-  black:
-    name: Check black
-    runs-on: ubuntu-latest
-    needs:
-      - common
-    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 black
-        run: |
-          . venv/bin/activate
-          black --verbose esphome tests
-      - name: Suggested changes
-        run: script/ci-suggest-changes
-        if: always()
-
-  flake8:
-    name: Check flake8
-    runs-on: ubuntu-latest
-    needs:
-      - common
-    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 flake8
-        run: |
-          . venv/bin/activate
-          flake8 esphome
-      - name: Suggested changes
-        run: script/ci-suggest-changes
-        if: always()
-
-  pylint:
-    name: Check pylint
-    runs-on: ubuntu-latest
-    needs:
-      - common
-    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 pylint
-        run: |
-          . venv/bin/activate
-          pylint -f parseable --persistent=n esphome
-      - name: Suggested changes
-        run: script/ci-suggest-changes
-        if: always()
-
-  pyupgrade:
-    name: Check pyupgrade
-    runs-on: ubuntu-latest
-    needs:
-      - common
-    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 pyupgrade
-        run: |
-          . venv/bin/activate
-          pyupgrade ${{ env.PYUPGRADE_TARGET }} `find esphome -name "*.py" -type f`
-      - name: Suggested changes
-        run: script/ci-suggest-changes
-        if: always()
-
-  ci-custom:
-    name: Run script/ci-custom
-    runs-on: ubuntu-latest
-    needs:
-      - common
-    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: Register matcher
-        run: echo "::add-matcher::.github/workflows/matchers/ci-custom.json"
-      - name: Run script/ci-custom
-        run: |
-          . venv/bin/activate
-          script/ci-custom.py
-          script/build_codeowners.py --check
-
-  pytest:
-    name: Run pytest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version:
-          - "3.9"
-          - "3.10"
-          - "3.11"
-          - "3.12"
-        os:
-          - ubuntu-latest
-          - macOS-latest
-          - windows-latest
-        exclude:
-          # Minimize CI resource usage
-          # by only running the Python version
-          # version used for docker images on Windows and macOS
-          - python-version: "3.12"
-            os: windows-latest
-          - python-version: "3.10"
-            os: windows-latest
-          - python-version: "3.9"
-            os: windows-latest
-          - python-version: "3.12"
-            os: macOS-latest
-          - python-version: "3.10"
-            os: macOS-latest
-          - python-version: "3.9"
-            os: macOS-latest
-    runs-on: ${{ matrix.os }}
-    needs:
-      - common
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-      - name: Register matcher
-        run: echo "::add-matcher::.github/workflows/matchers/pytest.json"
-      - name: Run pytest
-        if: matrix.os == 'windows-latest'
-        run: |
-          ./venv/Scripts/activate
-          pytest -vv --cov-report=xml --tb=native tests
-      - name: Run pytest
-        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macOS-latest'
-        run: |
-          . venv/bin/activate
-          pytest -vv --cov-report=xml --tb=native tests
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-
-  clang-format:
-    name: Check clang-format
-    runs-on: ubuntu-latest
-    needs:
-      - common
-    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: Install clang-format
-        run: |
-          . venv/bin/activate
-          pip install clang-format==${{ env.CLANG_FORMAT_VERSION }}
-      - name: Run clang-format
-        run: |
-          . venv/bin/activate
-          script/clang-format -i
-          git diff-index --quiet HEAD --
-      - name: Suggested changes
-        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
-    needs:
-      - common
-      - black
-      - ci-custom
-      - clang-format
-      - flake8
-      - pylint
-      - pytest
-      - pyupgrade
-      - compile-tests-list
-      - validate-tests
-    strategy:
-      fail-fast: false
-      max-parallel: 2
-      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 compile ${{ matrix.file }}
-        run: |
-          . venv/bin/activate
-          esphome compile ${{ matrix.file }}
-
-  clang-tidy:
+  ci:
     name: ${{ matrix.name }}
     runs-on: ubuntu-latest
-    needs:
-      - common
-      - black
-      - ci-custom
-      - clang-format
-      - flake8
-      - pylint
-      - pytest
-      - pyupgrade
     strategy:
       fail-fast: false
-      max-parallel: 2
       matrix:
         include:
+          - id: ci-custom
+            name: Run script/ci-custom
+          - id: lint-python
+            name: Run script/lint-python
+          - id: test
+            file: tests/test1.yaml
+            name: Test tests/test1.yaml
+            pio_cache_key: test1
+          - id: test
+            file: tests/test2.yaml
+            name: Test tests/test2.yaml
+            pio_cache_key: test2
+          - id: test
+            file: tests/test3.yaml
+            name: Test tests/test3.yaml
+            pio_cache_key: test3
+          - id: test
+            file: tests/test3.1.yaml
+            name: Test tests/test3.1.yaml
+            pio_cache_key: test3.1
+          - id: test
+            file: tests/test4.yaml
+            name: Test tests/test4.yaml
+            pio_cache_key: test4
+          - id: test
+            file: tests/test5.yaml
+            name: Test tests/test5.yaml
+            pio_cache_key: test5
+          - id: test
+            file: tests/test6.yaml
+            name: Test tests/test6.yaml
+            pio_cache_key: test6
+          - id: test
+            file: tests/test7.yaml
+            name: Test tests/test7.yaml
+            pio_cache_key: test7
+          - id: pytest
+            name: Run pytest
+          - id: clang-format
+            name: Run script/clang-format
           - id: clang-tidy
             name: Run script/clang-tidy for ESP8266
             options: --environment esp8266-arduino-tidy --grep USE_ESP8266
@@ -357,127 +89,119 @@ jobs:
             name: Run script/clang-tidy for ESP32 IDF
             options: --environment esp32-idf-tidy --grep USE_ESP_IDF
             pio_cache_key: tidyesp32-idf
+          - id: yamllint
+            name: Run yamllint
 
     steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        id: python
         with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
+          python-version: "3.9"
+
+      - name: Cache virtualenv
+        uses: actions/cache@v3
+        with:
+          path: .venv
+          # yamllint disable-line rule:line-length
+          key: venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements*.txt') }}
+          restore-keys: |
+            venv-${{ steps.python.outputs.python-version }}-
+
+      - name: Set up virtualenv
+        # yamllint disable rule:line-length
+        run: |
+          python -m venv .venv
+          source .venv/bin/activate
+          pip install -U pip
+          pip install -r requirements.txt -r requirements_optional.txt -r requirements_test.txt
+          pip install -e .
+          echo "$GITHUB_WORKSPACE/.venv/bin" >> $GITHUB_PATH
+          echo "VIRTUAL_ENV=$GITHUB_WORKSPACE/.venv" >> $GITHUB_ENV
+        # yamllint enable rule:line-length
+
+      # Use per check platformio cache because checks use different parts
       - name: Cache platformio
-        uses: actions/cache@v4.0.1
+        uses: actions/cache@v3
         with:
           path: ~/.platformio
           # yamllint disable-line rule:line-length
           key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}
+        if: matrix.id == 'test' || matrix.id == 'clang-tidy'
 
-      - name: Install clang-tidy
-        run: sudo apt-get install clang-tidy-14
+      - name: Install clang tools
+        run: |
+          sudo apt-get install \
+              clang-format-13 \
+              clang-tidy-11
+        if: matrix.id == 'clang-tidy' || matrix.id == 'clang-format'
 
       - name: Register problem matchers
         run: |
+          echo "::add-matcher::.github/workflows/matchers/ci-custom.json"
+          echo "::add-matcher::.github/workflows/matchers/lint-python.json"
+          echo "::add-matcher::.github/workflows/matchers/python.json"
+          echo "::add-matcher::.github/workflows/matchers/pytest.json"
           echo "::add-matcher::.github/workflows/matchers/gcc.json"
           echo "::add-matcher::.github/workflows/matchers/clang-tidy.json"
 
-      - name: Run clang-tidy
+      - name: Lint Custom
         run: |
-          . venv/bin/activate
-          script/clang-tidy --all-headers --fix ${{ matrix.options }}
+          script/ci-custom.py
+          script/build_codeowners.py --check
+        if: matrix.id == 'ci-custom'
+
+      - name: Lint Python
+        run: script/lint-python -a
+        if: matrix.id == 'lint-python'
+
+      - run: esphome compile ${{ matrix.file }}
+        if: matrix.id == 'test'
         env:
           # Also cache libdeps, store them in a ~/.platformio subfolder
           PLATFORMIO_LIBDEPS_DIR: ~/.platformio/libdeps
 
+      - name: Run pytest
+        run: |
+          pytest -vv --tb=native tests
+        if: matrix.id == 'pytest'
+
+      # Also run git-diff-index so that the step is marked as failed on
+      # formatting errors, since clang-format doesn't do anything but
+      # change files if -i is passed.
+      - name: Run clang-format
+        run: |
+          script/clang-format -i
+          git diff-index --quiet HEAD --
+        if: matrix.id == 'clang-format'
+
+      - name: Run clang-tidy
+        run: |
+          script/clang-tidy --all-headers --fix ${{ matrix.options }}
+        if: matrix.id == 'clang-tidy'
+        env:
+          # Also cache libdeps, store them in a ~/.platformio subfolder
+          PLATFORMIO_LIBDEPS_DIR: ~/.platformio/libdeps
+
+      - name: Run yamllint
+        if: matrix.id == 'yamllint'
+        uses: frenck/action-yamllint@v1.4.0
+
       - name: Suggested changes
         run: script/ci-suggest-changes
         # yamllint disable-line rule:line-length
-        if: always()
-
-  list-components:
-    runs-on: ubuntu-latest
-    needs:
-      - common
-    if: github.event_name == 'pull_request'
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
-        with:
-          # Fetch enough history so `git merge-base refs/remotes/origin/dev HEAD` works.
-          fetch-depth: 500
-      - name: Get target branch
-        id: target-branch
-        run: |
-          echo "branch=${{ github.event.pull_request.base.ref }}" >> $GITHUB_OUTPUT
-      - name: Fetch ${{ steps.target-branch.outputs.branch }} branch
-        run: |
-          git -c protocol.version=2 fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +refs/heads/${{ steps.target-branch.outputs.branch }}:refs/remotes/origin/${{ steps.target-branch.outputs.branch }}
-          git merge-base refs/remotes/origin/${{ steps.target-branch.outputs.branch }} HEAD
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-      - name: Find changed components
-        id: set-matrix
-        run: |
-          . venv/bin/activate
-          echo "matrix=$(script/list-components.py --changed --branch ${{ steps.target-branch.outputs.branch }} | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
-
-  test-build-components:
-    name: Component test ${{ matrix.file }}
-    runs-on: ubuntu-latest
-    needs:
-      - common
-      - list-components
-    if: ${{ github.event_name == 'pull_request' && needs.list-components.outputs.matrix != '[]' && needs.list-components.outputs.matrix != '' }}
-    strategy:
-      fail-fast: false
-      max-parallel: 2
-      matrix:
-        file: ${{ fromJson(needs.list-components.outputs.matrix) }}
-    steps:
-      - name: Install libsodium
-        run: sudo apt-get install libsodium-dev
-
-      - 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: test_build_components -e config -c ${{ matrix.file }}
-        run: |
-          . venv/bin/activate
-          ./script/test_build_components -e config -c ${{ matrix.file }}
-      - name: test_build_components -e compile -c ${{ matrix.file }}
-        run: |
-          . venv/bin/activate
-          ./script/test_build_components -e compile -c ${{ matrix.file }}
+        if: always() && (matrix.id == 'clang-tidy' || matrix.id == 'clang-format' || matrix.id == 'lint-python')
 
   ci-status:
     name: CI Status
     runs-on: ubuntu-latest
-    needs:
-      - common
-      - black
-      - ci-custom
-      - clang-format
-      - flake8
-      - pylint
-      - pytest
-      - pyupgrade
-      - compile-tests
-      - clang-tidy
-      - test-build-components
+    needs: [ci]
     if: always()
     steps:
-      - name: Success
+      - name: Successful deploy
         if: ${{ !(contains(needs.*.result, 'failure')) }}
         run: exit 0
-      - name: Failure
+      - name: Failing deploy
         if: ${{ contains(needs.*.result, 'failure') }}
         run: exit 1

.github/workflows/lock.yml

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

.github/workflows/needs-docs.yml

@@ -1,25 +0,0 @@
-name: Needs Docs
-
-# yamllint disable-line rule:truthy
-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@v7.0.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,17 +43,15 @@ 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@v5.0.0
+        uses: actions/setup-python@v4
         with:
           python-version: "3.x"
       - name: Set up python environment
-        env:
-          ESPHOME_NO_VENV: 1
         run: |
           script/setup
-          pip install twine
+          pip install setuptools wheel twine
       - name: Build
         run: python setup.py sdist bdist_wheel
       - name: Upload
@@ -63,117 +61,49 @@ jobs:
         run: twine upload dist/*
 
   deploy-docker:
-    name: Build ESPHome ${{ matrix.platform }}
+    name: Build and publish ESPHome ${{ matrix.image.title}}
     if: github.repository == 'esphome/esphome'
     permissions:
       contents: read
       packages: write
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.image.title == 'lint' }}
     needs: [init]
-    strategy:
-      fail-fast: false
-      matrix:
-        platform:
-          - linux/amd64
-          - linux/arm/v7
-          - linux/arm64
-    steps:
-      - uses: actions/checkout@v4.1.1
-      - name: Set up Python
-        uses: actions/setup-python@v5.0.0
-        with:
-          python-version: "3.9"
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.1.0
-      - name: Set up QEMU
-        if: matrix.platform != 'linux/amd64'
-        uses: docker/setup-qemu-action@v3.0.0
-
-      - name: Log in to docker hub
-        uses: docker/login-action@v3.0.0
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Log in to the GitHub container registry
-        uses: docker/login-action@v3.0.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build docker
-        uses: ./.github/actions/build-image
-        with:
-          platform: ${{ matrix.platform }}
-          target: docker
-          baseimg: docker
-          suffix: ""
-          version: ${{ needs.init.outputs.tag }}
-
-      - name: Build ha-addon
-        uses: ./.github/actions/build-image
-        with:
-          platform: ${{ matrix.platform }}
-          target: hassio
-          baseimg: hassio
-          suffix: "hassio"
-          version: ${{ needs.init.outputs.tag }}
-
-      - name: Build lint
-        uses: ./.github/actions/build-image
-        with:
-          platform: ${{ matrix.platform }}
-          target: lint
-          baseimg: docker
-          suffix: lint
-          version: ${{ needs.init.outputs.tag }}
-
-  deploy-manifest:
-    name: Publish ESPHome ${{ matrix.image.title }} to ${{ matrix.registry }}
-    runs-on: ubuntu-latest
-    needs:
-      - init
-      - deploy-docker
-    if: github.repository == 'esphome/esphome'
-    permissions:
-      contents: read
-      packages: write
     strategy:
       fail-fast: false
       matrix:
         image:
           - title: "ha-addon"
-            target: "hassio"
             suffix: "hassio"
+            target: "hassio"
+            baseimg: "hassio"
           - title: "docker"
-            target: "docker"
             suffix: ""
+            target: "docker"
+            baseimg: "docker"
           - title: "lint"
-            target: "lint"
             suffix: "lint"
-        registry:
-          - ghcr
-          - dockerhub
+            target: "lint"
+            baseimg: "docker"
     steps:
-      - uses: actions/checkout@v4.1.1
-      - name: Download digests
-        uses: actions/download-artifact@v3.0.2
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
         with:
-          name: digests-${{ matrix.image.target }}-${{ matrix.registry }}
-          path: /tmp/digests
+          python-version: "3.9"
+
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.1.0
+        uses: docker/setup-buildx-action@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
 
       - name: Log in to docker hub
-        if: matrix.registry == 'dockerhub'
-        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
-        if: matrix.registry == 'ghcr'
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -182,28 +112,34 @@ jobs:
       - name: Generate short tags
         id: tags
         run: |
-          output=$(docker/generate_tags.py \
+          docker/generate_tags.py \
             --tag "${{ needs.init.outputs.tag }}" \
-            --suffix "${{ matrix.image.suffix }}" \
-            --registry "${{ matrix.registry }}")
-          echo $output
-          for l in $output; do
-            echo $l >> $GITHUB_OUTPUT
-          done
+            --suffix "${{ matrix.image.suffix }}"
 
-      - name: Create manifest list and push
-        working-directory: /tmp/digests
-        run: |
-          docker buildx imagetools create $(jq -Rcnr 'inputs | . / "," | map("-t " + .) | join(" ")' <<< "${{ steps.tags.outputs.tags}}") \
-            $(printf '${{ steps.tags.outputs.image }}@sha256:%s ' *)
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          target: ${{ matrix.image.target }}
+          push: true
+          # yamllint disable rule:line-length
+          cache-from: type=registry,ref=ghcr.io/${{ steps.tags.outputs.image }}:cache-${{ steps.tags.outputs.channel }}
+          cache-to: type=registry,ref=ghcr.io/${{ steps.tags.outputs.image }}:cache-${{ steps.tags.outputs.channel }},mode=max
+          # yamllint enable rule:line-length
+          tags: ${{ steps.tags.outputs.tags }}
+          build-args: |
+            BASEIMGTYPE=${{ matrix.image.baseimg }}
+            BUILD_VERSION=${{ needs.init.outputs.tag }}
 
   deploy-ha-addon-repo:
     if: github.repository == 'esphome/esphome' && github.event_name == 'release'
     runs-on: ubuntu-latest
-    needs: [deploy-manifest]
+    needs: [deploy-docker]
     steps:
       - name: Trigger Workflow
-        uses: actions/github-script@v7.0.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@v9.0.0
+      - uses: actions/stale@v7
         with:
           days-before-pr-stale: 90
           days-before-pr-close: 7
@@ -26,7 +26,7 @@ jobs:
           days-before-issue-close: -1
           remove-stale-when-updated: true
           stale-pr-label: "stale"
-          exempt-pr-labels: "not-stale"
+          exempt-pr-labels: "no-stale"
           stale-pr-message: >
             There hasn't been any activity on this pull request recently. This
             pull request has been automatically marked as stale because of that
@@ -38,7 +38,7 @@ jobs:
   close-issues:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9.0.0
+      - uses: actions/stale@v7
         with:
           days-before-pr-stale: -1
           days-before-pr-close: -1

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

@@ -1,49 +0,0 @@
----
-name: Synchronise Device Classes from Home Assistant
-
-# yamllint disable-line rule:truthy
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "45 6 * * *"
-
-jobs:
-  sync:
-    name: Sync Device Classes
-    runs-on: ubuntu-latest
-    if: github.repository == 'esphome/esphome'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
-
-      - name: Checkout Home Assistant
-        uses: actions/checkout@v4.1.1
-        with:
-          repository: home-assistant/core
-          path: lib/home-assistant
-
-      - name: Setup Python
-        uses: actions/setup-python@v5.0.0
-        with:
-          python-version: 3.11
-
-      - name: Install Home Assistant
-        run: |
-          python -m pip install --upgrade pip
-          pip install -e lib/home-assistant
-
-      - name: Sync
-        run: |
-          python ./script/sync-device_class.py
-
-      - name: Commit changes
-        uses: peter-evans/create-pull-request@v6.0.1
-        with:
-          commit-message: "Synchronise Device Classes from Home Assistant"
-          committer: esphomebot <esphome@nabucasa.com>
-          author: esphomebot <esphome@nabucasa.com>
-          branch: sync/device-classes
-          delete-branch: true
-          title: "Synchronise Device Classes from Home Assistant"
-          body-path: .github/PULL_REQUEST_TEMPLATE.md
-          token: ${{ secrets.DEVICE_CLASS_SYNC_TOKEN }}

.github/workflows/yaml-lint.yml

@@ -1,26 +0,0 @@
----
-name: YAML lint
-
-# yamllint disable-line rule:truthy
-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.5.0
-        with:
-          strict: true

.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: 24.2.0
+  - repo: https://github.com/ambv/black
+    rev: 23.1.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.1
+    rev: v3.3.1
     hooks:
       - id: pyupgrade
         args: [--py39-plus]

.vscode/tasks.json

@@ -2,24 +2,15 @@
   "version": "2.0.0",
   "tasks": [
     {
-      "label": "Run Dashboard",
+      "label": "run",
       "type": "shell",
-      "command": "${command:python.interpreterPath}",
-      "args": [
-        "-m",
-        "esphome",
-        "dashboard",
-        "config/"
-      ],
+      "command": "python3 -m esphome dashboard config/",
       "problemMatcher": []
     },
     {
       "label": "clang-tidy",
       "type": "shell",
-      "command": "${command:python.interpreterPath}",
-      "args": [
-        "./script/clang-tidy"
-      ],
+      "command": "./script/clang-tidy",
       "problemMatcher": [
         {
           "owner": "clang-tidy",
@@ -36,24 +27,6 @@
           ]
         }
       ]
-    },
-    {
-      "label": "Generate proto files",
-      "type": "shell",
-      "command": "${command:python.interpreterPath}",
-      "args": [
-        "./script/api_protobuf/api_protobuf.py"
-      ],
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      },
-      "presentation": {
-        "reveal": "never",
-        "close": true,
-        "panel": "new"
-      },
-      "problemMatcher": []
     }
   ]
 }

.yamllint

@@ -1,18 +1,3 @@
 ---
-extends: default
-
-ignore-from-file: .gitignore
-
-rules:
-  document-start: disable
-  empty-lines:
-    level: error
-    max: 1
-    max-start: 0
-    max-end: 1
-  indentation:
-    level: error
-    spaces: 2
-    indent-sequences: true
-    check-multi-line-strings: false
-  line-length: disable
+ignore: |
+  venv/

CODEOWNERS

@@ -11,39 +11,23 @@ esphome/*.py @esphome/core
 esphome/core/* @esphome/core
 
 # Integrations
-esphome/components/a01nyub/* @MrSuicideParrot
-esphome/components/a02yyuw/* @TH-Braemer
 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/ade7880/* @kpfleming
-esphome/components/ade7953/* @angelnu
-esphome/components/ade7953_i2c/* @angelnu
-esphome/components/ade7953_spi/* @angelnu
-esphome/components/ads1118/* @solomondg1
-esphome/components/ags10/* @mak-42
 esphome/components/airthings_ble/* @jeromelaban
-esphome/components/airthings_wave_base/* @jeromelaban @kpfleming @ncareau
 esphome/components/airthings_wave_mini/* @ncareau
 esphome/components/airthings_wave_plus/* @jeromelaban
-esphome/components/alarm_control_panel/* @grahambrown11 @hwstar
-esphome/components/alpha3/* @jan-hofmeier
-esphome/components/am2315c/* @swoboda1337
 esphome/components/am43/* @buxtronix
 esphome/components/am43/cover/* @buxtronix
-esphome/components/am43/sensor/* @buxtronix
 esphome/components/analog_threshold/* @ianchi
 esphome/components/animation/* @syndlex
 esphome/components/anova/* @buxtronix
 esphome/components/api/* @OttoWinter
-esphome/components/as5600/* @ammmze
-esphome/components/as5600/sensor/* @ammmze
 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
@@ -52,68 +36,53 @@ 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 @clydebarrow
+esphome/components/ble_client/* @buxtronix
 esphome/components/bluetooth_proxy/* @jesserockz
-esphome/components/bme280_base/* @esphome/core
-esphome/components/bme280_spi/* @apbodrov
 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
 esphome/components/climate/* @esphome/core
 esphome/components/climate_ir/* @glmnet
 esphome/components/color_temperature/* @jesserockz
-esphome/components/combination/* @Cat-Ion @kahrendt
 esphome/components/coolix/* @glmnet
 esphome/components/copy/* @OttoWinter
 esphome/components/cover/* @esphome/core
 esphome/components/cs5460a/* @balrog-kun
 esphome/components/cse7761/* @berfenger
-esphome/components/cst226/* @clydebarrow
-esphome/components/cst816/* @clydebarrow
 esphome/components/ct_clamp/* @jesserockz
 esphome/components/current_based/* @djwmarcx
 esphome/components/dac7678/* @NickB1
 esphome/components/daikin_brc/* @hagak
 esphome/components/daly_bms/* @s1lvi0
 esphome/components/dashboard_import/* @esphome/core
-esphome/components/datetime/* @rfdarter
 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/touchscreen/* @jesserockz
-esphome/components/emc2101/* @ellull
-esphome/components/emmeti/* @E440QF
-esphome/components/ens160/* @vincentscode
+esphome/components/ektf2232/* @jesserockz
 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
-esphome/components/esp32_rmt_led_strip/* @jesserockz
 esphome/components/esp8266/* @esphome/core
 esphome/components/ethernet_info/* @gtjadsonsantos
 esphome/components/exposure_notifications/* @OttoWinter
@@ -122,69 +91,44 @@ esphome/components/ezo_pmp/* @carlos-sarmiento
 esphome/components/factory_reset/* @anatoly-savchenkov
 esphome/components/fastled_base/* @OttoWinter
 esphome/components/feedback/* @ianchi
-esphome/components/fingerprint_grow/* @OnFreund @alexborro @loongyh
-esphome/components/font/* @clydebarrow @esphome/core
+esphome/components/fingerprint_grow/* @OnFreund @loongyh
 esphome/components/fs3000/* @kahrendt
-esphome/components/ft5x06/* @clydebarrow
-esphome/components/ft63x6/* @gpambrozio
-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/graphical_display_menu/* @MrMDavidson
-esphome/components/gree/* @orestismers
-esphome/components/grove_tb6612fng/* @max246
 esphome/components/growatt_solar/* @leeuwte
-esphome/components/gt911/* @clydebarrow @jesserockz
-esphome/components/haier/* @paveldn
+esphome/components/haier/* @Yarikx
 esphome/components/havells_solar/* @sourabhjaiswal
 esphome/components/hbridge/fan/* @WeekendWarrior
 esphome/components/hbridge/light/* @DotNetDann
-esphome/components/he60r/* @clydebarrow
 esphome/components/heatpumpir/* @rob-deutsch
 esphome/components/hitachi_ac424/* @sourabhjaiswal
-esphome/components/hm3301/* @freekode
 esphome/components/homeassistant/* @OttoWinter
-esphome/components/honeywell_hih_i2c/* @Benichou34
 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
-esphome/components/htu31d/* @betterengineering
 esphome/components/hydreon_rgxx/* @functionpointer
-esphome/components/hyt271/* @Philippe12
 esphome/components/i2c/* @esphome/core
 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/ina226/* @Sergio303 @latonita
-esphome/components/ina260/* @mreditor97
+esphome/components/ina260/* @MrEditor97
 esphome/components/inkbird_ibsth1_mini/* @fkirill
 esphome/components/inkplate6/* @jesserockz
 esphome/components/integration/* @OttoWinter
 esphome/components/internal_temperature/* @Mat931
 esphome/components/interval/* @esphome/core
 esphome/components/json/* @OttoWinter
-esphome/components/kamstrup_kmp/* @cfeenstra1024
+esphome/components/kalman_combinator/* @Cat-Ion
 esphome/components/key_collector/* @ssieb
 esphome/components/key_provider/* @ssieb
 esphome/components/kuntze/* @ssieb
 esphome/components/lcd_menu/* @numo68
-esphome/components/ld2410/* @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
@@ -192,7 +136,6 @@ esphome/components/ltr390/* @sjtrny
 esphome/components/matrix_keypad/* @ssieb
 esphome/components/max31865/* @DAVe3283
 esphome/components/max44009/* @berfenger
-esphome/components/max6956/* @looping40
 esphome/components/max7219digit/* @rspaargaren
 esphome/components/max9611/* @mckaymatthew
 esphome/components/mcp23008/* @jesserockz
@@ -206,22 +149,16 @@ 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/micro_wake_word/* @jesserockz @kahrendt
-esphome/components/micronova/* @jorre05
-esphome/components/microphone/* @jesserockz
 esphome/components/mics_4514/* @jesserockz
 esphome/components/midea/* @dudanov
 esphome/components/midea_ir/* @dudanov
 esphome/components/mitsubishi/* @RubyBailey
 esphome/components/mlx90393/* @functionpointer
-esphome/components/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
@@ -235,74 +172,54 @@ esphome/components/mopeka_pro_check/* @spbrogan
 esphome/components/mopeka_std_check/* @Fabian-Schmidt
 esphome/components/mpl3115a2/* @kbickar
 esphome/components/mpu6886/* @fabaff
-esphome/components/ms8607/* @e28eta
 esphome/components/network/* @esphome/core
 esphome/components/nextion/* @senexcrenshaw
 esphome/components/nextion/binary_sensor/* @senexcrenshaw
 esphome/components/nextion/sensor/* @senexcrenshaw
 esphome/components/nextion/switch/* @senexcrenshaw
 esphome/components/nextion/text_sensor/* @senexcrenshaw
-esphome/components/nfc/* @jesserockz @kbx81
-esphome/components/noblex/* @AGalfra
+esphome/components/nfc/* @jesserockz
 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/pn7150/* @jesserockz @kbx81
-esphome/components/pn7150_i2c/* @jesserockz @kbx81
-esphome/components/pn7160/* @jesserockz @kbx81
-esphome/components/pn7160_i2c/* @jesserockz @kbx81
-esphome/components/pn7160_spi/* @jesserockz @kbx81
 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/pylontech/* @functionpointer
 esphome/components/qmp6988/* @andrewpc
 esphome/components/qr_code/* @wjtje
-esphome/components/qspi_amoled/* @clydebarrow
-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/rpi_dpi_rgb/* @clydebarrow
-esphome/components/rtl87xx/* @kuba2k2
 esphome/components/rtttl/* @glmnet
 esphome/components/safe_mode/* @jsuanet @paulmonigatti
 esphome/components/scd4x/* @martgras @sjtrny
 esphome/components/script/* @esphome/core
 esphome/components/sdm_meter/* @jesserockz @polyfaces
 esphome/components/sdp3x/* @Azimath
-esphome/components/seeed_mr24hpc1/* @limengdu
 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
@@ -311,7 +228,7 @@ esphome/components/shutdown/* @esphome/core @jsuanet
 esphome/components/sigma_delta_output/* @Cat-Ion
 esphome/components/sim800l/* @glmnet
 esphome/components/sm10bit_base/* @Cossid
-esphome/components/sm2135/* @BoukeHaarsma23 @dd32 @matika77
+esphome/components/sm2135/* @BoukeHaarsma23
 esphome/components/sm2235/* @Cossid
 esphome/components/sm2335/* @Cossid
 esphome/components/sml/* @alengwenus
@@ -319,10 +236,7 @@ esphome/components/smt100/* @piechade
 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
@@ -336,10 +250,6 @@ esphome/components/ssd1331_base/* @kbx81
 esphome/components/ssd1331_spi/* @kbx81
 esphome/components/ssd1351_base/* @kbx81
 esphome/components/ssd1351_spi/* @kbx81
-esphome/components/st7567_base/* @latonita
-esphome/components/st7567_i2c/* @latonita
-esphome/components/st7567_spi/* @latonita
-esphome/components/st7701s/* @clydebarrow
 esphome/components/st7735/* @SenexCrenshaw
 esphome/components/st7789v/* @kbx81
 esphome/components/st7920/* @marsjan155
@@ -351,25 +261,18 @@ esphome/components/tca9548a/* @andreashergert1984
 esphome/components/tcl112/* @glmnet
 esphome/components/tee501/* @Stock-M
 esphome/components/teleinfo/* @0hax
-esphome/components/template/alarm_control_panel/* @grahambrown11 @hwstar
-esphome/components/template/datetime/* @rfdarter
-esphome/components/template/fan/* @ssieb
-esphome/components/text/* @mauritskorse
 esphome/components/thermostat/* @kbx81
 esphome/components/time/* @OttoWinter
 esphome/components/tlc5947/* @rnauber
 esphome/components/tm1621/* @Philippe12
 esphome/components/tm1637/* @glmnet
 esphome/components/tm1638/* @skykingjwc
-esphome/components/tm1651/* @freekode
 esphome/components/tmp102/* @timsavage
-esphome/components/tmp1075/* @sybrenstuvel
 esphome/components/tmp117/* @Azimath
 esphome/components/tof10120/* @wstrzalka
 esphome/components/toshiba/* @kbx81
-esphome/components/touchscreen/* @jesserockz @nielsnl68
+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
@@ -378,32 +281,20 @@ 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
-esphome/components/uponor_smatrix/* @kroimon
 esphome/components/vbus/* @ssieb
-esphome/components/veml3235/* @kbx81
-esphome/components/veml7700/* @latonita
 esphome/components/version/* @esphome/core
-esphome/components/voice_assistant/* @jesserockz
 esphome/components/wake_on_lan/* @willwill2will54
-esphome/components/waveshare_epaper/* @clydebarrow
 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/touchscreen/* @nielsnl68 @numo68
-esphome/components/zhlt01/* @cfeenstra1024
-esphome/components/zio_ultrasonic/* @kahrendt
+esphome/components/xpt2046/* @nielsnl68 @numo68

CONTRIBUTING.md

@@ -10,3 +10,5 @@ Things to note when contributing:
    for more information.
  - Please also update the tests in the `tests/` folder. You can do so by just adding a line in one of the YAML files
    which checks if your new feature compiles correctly.
+ - Sometimes I will let pull requests linger because I'm not 100% sure about them. Please feel free to ping
+   me after some time.

docker/Dockerfile

@@ -5,57 +5,30 @@
 # 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+deb12u5 \
-        openssh-client=1:9.2p1-2+deb12u2 \
-        python3-cffi=1.15.1-5 \
-        libcairo2=1.16.0-7 \
-        libmagic1=1:5.44-3 \
-        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 \
-          libopenjp2-7=2.5.0-2 \
-          libtiff6=4.5.0-6+deb12u1 \
-          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 \
+        iputils-ping=3:20210202-1 \
+        git=1:2.30.2-1 \
+        curl=7.74.0-1.3+deb11u7 \
+        openssh-client=1:8.4p1-5+deb11u1 \
+    && rm -rf \
         /tmp/* \
         /var/{cache,log}/* \
         /var/lib/apt/lists/*
@@ -71,17 +44,14 @@ ENV \
 # See: https://unix.stackexchange.com/questions/553743/correct-way-to-add-lib-ld-linux-so-3-in-debian
 RUN \
     if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
-        ln -s /lib/arm-linux-gnueabihf/ld-linux-armhf.so.3 /lib/ld-linux.so.3; \
+        ln -s /lib/arm-linux-gnueabihf/ld-linux.so.3 /lib/ld-linux.so.3; \
     fi
 
 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.13 \
+    pip3 install --no-cache-dir \
+        wheel==0.37.1 \
+        platformio==6.1.6 \
     # Change some platformio settings
     && platformio settings set enable_telemetry No \
     && platformio settings set check_platformio_interval 1000000 \
@@ -89,16 +59,10 @@ 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 \
-    && /platformio_install_deps.py /platformio.ini --libraries
+COPY requirements.txt requirements_optional.txt docker/platformio_install_deps.py platformio.ini /
+RUN \
+    pip3 install --no-cache-dir -r /requirements.txt -r /requirements_optional.txt \
+    && /platformio_install_deps.py /platformio.ini
 
 
 # ======================= docker-type image =======================
@@ -106,11 +70,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=""
@@ -118,10 +78,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
@@ -143,7 +99,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}/* \
@@ -156,11 +112,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 \
@@ -183,24 +135,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/docker_entrypoint.sh

@@ -21,10 +21,4 @@ export PLATFORMIO_PLATFORMS_DIR="${pio_cache_base}/platforms"
 export PLATFORMIO_PACKAGES_DIR="${pio_cache_base}/packages"
 export PLATFORMIO_CACHE_DIR="${pio_cache_base}/cache"
 
-# If /build is mounted, use that as the build path
-# otherwise use path in /config (so that builds aren't lost on container restart)
-if [[ -d /build ]]; then
-    export ESPHOME_BUILD_PATH=/build
-fi
-
 exec esphome "$@"

docker/generate_tags.py

@@ -1,14 +1,13 @@
 #!/usr/bin/env python3
 import re
+import os
 import argparse
+import json
 
 CHANNEL_DEV = "dev"
 CHANNEL_BETA = "beta"
 CHANNEL_RELEASE = "release"
 
-GHCR = "ghcr"
-DOCKERHUB = "dockerhub"
-
 parser = argparse.ArgumentParser()
 parser.add_argument(
     "--tag",
@@ -22,31 +21,21 @@ parser.add_argument(
     required=True,
     help="The suffix of the tag.",
 )
-parser.add_argument(
-    "--registry",
-    type=str,
-    choices=[GHCR, DOCKERHUB],
-    required=False,
-    action="append",
-    help="The registry to build tags for.",
-)
 
 
 def main():
     args = parser.parse_args()
 
     # detect channel from tag
-    match = re.match(r"^(\d+\.\d+)(?:\.\d+)(?:(b\d+)|(-dev\d+))?$", args.tag)
+    match = re.match(r"^(\d+\.\d+)(?:\.\d+)?(b\d+)?$", args.tag)
     major_minor_version = None
-    if match is None:  # eg 2023.12.0-dev20231109-testbranch
-        channel = None  # Ran with custom tag for a branch etc
-    elif match.group(3) is not None:  # eg 2023.12.0-dev20231109
+    if match is None:
         channel = CHANNEL_DEV
-    elif match.group(2) is not None:  # eg 2023.12.0b1
-        channel = CHANNEL_BETA
-    else:  # eg 2023.12.0
+    elif match.group(2) is None:
         major_minor_version = match.group(1)
         channel = CHANNEL_RELEASE
+    else:
+        channel = CHANNEL_BETA
 
     tags_to_push = [args.tag]
     if channel == CHANNEL_DEV:
@@ -64,28 +53,15 @@ def main():
 
     suffix = f"-{args.suffix}" if args.suffix else ""
 
-    image_name = f"esphome/esphome{suffix}"
+    with open(os.environ["GITHUB_OUTPUT"], "w") as f:
+        print(f"channel={channel}", file=f)
+        print(f"image=esphome/esphome{suffix}", file=f)
+        full_tags = []
 
-    print(f"channel={channel}")
-
-    if args.registry is None:
-        args.registry = [GHCR, DOCKERHUB]
-    elif len(args.registry) == 1:
-        if GHCR in args.registry:
-            print(f"image=ghcr.io/{image_name}")
-        if DOCKERHUB in args.registry:
-            print(f"image=docker.io/{image_name}")
-
-    print(f"image_name={image_name}")
-
-    full_tags = []
-
-    for tag in tags_to_push:
-        if GHCR in args.registry:
-            full_tags += [f"ghcr.io/{image_name}:{tag}"]
-        if DOCKERHUB in args.registry:
-            full_tags += [f"docker.io/{image_name}:{tag}"]
-    print(f"tags={','.join(full_tags)}")
+        for tag in tags_to_push:
+            full_tags += [f"ghcr.io/esphome/esphome{suffix}:{tag}"]
+            full_tags += [f"esphome/esphome{suffix}:{tag}"]
+        print(f"tags={','.join(full_tags)}", file=f)
 
 
 if __name__ == "__main__":

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

docker/platformio_install_deps.py

@@ -0,0 +1,30 @@
+#!/usr/bin/env python3
+# This script is used in the docker containers to preinstall
+# all platformio libraries in the global storage
+
+import configparser
+import subprocess
+import sys
+
+config = configparser.ConfigParser(inline_comment_prefixes=(';', ))
+config.read(sys.argv[1])
+
+libs = []
+# Extract from every lib_deps key in all sections
+for section in config.sections():
+    conf = config[section]
+    if "lib_deps" not in conf:
+        continue
+    for lib_dep in conf["lib_deps"].splitlines():
+        if not lib_dep:
+            # Empty line or comment
+            continue
+        if lib_dep.startswith("${"):
+            # Extending from another section
+            continue
+        if "@" not in lib_dep:
+            # No version pinned, this is an internal lib
+            continue
+        libs.append(lib_dep)
+
+subprocess.check_call(['platformio', 'lib', '-g', 'install', *libs])

esphome/__main__.py

@@ -1,4 +1,3 @@
-# PYTHON_ARGCOMPLETE_OK
 import argparse
 import functools
 import logging
@@ -8,11 +7,9 @@ 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_component_configs, read_config, strip_default_ids
+from esphome.config import iter_components, read_config, strip_default_ids
 from esphome.const import (
     ALLOWED_NAME_CHARS,
     CONF_BAUD_RATE,
@@ -21,23 +18,18 @@ from esphome.const import (
     CONF_LOGGER,
     CONF_NAME,
     CONF_OTA,
-    CONF_MQTT,
-    CONF_MDNS,
-    CONF_DISABLED,
     CONF_PASSWORD,
     CONF_PORT,
     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,
@@ -50,7 +42,7 @@ from esphome.log import color, setup_log, Fore
 _LOGGER = logging.getLogger(__name__)
 
 
-def choose_prompt(options, purpose: str = None):
+def choose_prompt(options):
     if not options:
         raise EsphomeError(
             "Found no valid options for upload/logging, please make sure relevant "
@@ -61,9 +53,7 @@ def choose_prompt(options, purpose: str = None):
     if len(options) == 1:
         return options[0][1]
 
-    safe_print(
-        f'Found multiple options{f" for {purpose}" if purpose else ""}, please choose one:'
-    )
+    safe_print("Found multiple options, please choose one:")
     for i, (desc, _) in enumerate(options):
         safe_print(f"  [{i+1}] {desc}")
 
@@ -82,19 +72,15 @@ def choose_prompt(options, purpose: str = None):
     return options[opt - 1][1]
 
 
-def choose_upload_log_host(
-    default, check_default, show_ota, show_mqtt, show_api, purpose: str = None
-):
+def choose_upload_log_host(default, check_default, show_ota, show_mqtt, show_api):
     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":
             return CORE.address
-    if show_mqtt and CONF_MQTT in CORE.config:
+    if show_mqtt and "mqtt" in CORE.config:
         options.append((f"MQTT ({CORE.config['mqtt'][CONF_BROKER]})", "MQTT"))
         if default == "OTA":
             return "MQTT"
@@ -102,7 +88,7 @@ def choose_upload_log_host(
         return default
     if check_default is not None and check_default in [opt[1] for opt in options]:
         return check_default
-    return choose_prompt(options, purpose=purpose)
+    return choose_prompt(options)
 
 
 def get_port_type(port):
@@ -166,8 +152,6 @@ def run_miniterm(config, port):
         _LOGGER.error("Could not connect to serial port %s", port)
         return 1
 
-    return 0
-
 
 def wrap_to_code(name, comp):
     coro = coroutine(comp.to_code)
@@ -196,7 +180,7 @@ def write_cpp(config):
 def generate_cpp_contents(config):
     _LOGGER.info("Generating C++ source...")
 
-    for name, component, conf in iter_component_configs(CORE.config):
+    for name, component, conf in iter_components(CORE.config):
         if component.to_code is not None:
             coro = wrap_to_code(name, component)
             CORE.add_job(coro, conf)
@@ -223,16 +207,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 +225,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,74 +269,36 @@ 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 check_permissions(port):
-    if os.name == "posix" and get_port_type(port) == "SERIAL":
-        # Check if we can open selected serial port
-        if not os.access(port, os.F_OK):
-            raise EsphomeError(
-                "The selected serial port does not exist. To resolve this issue, "
-                "check that the device is connected to this computer with a USB cable and that "
-                "the USB cable can be used for data and is not a power-only cable."
-            )
-        if not (os.access(port, os.R_OK | os.W_OK)):
-            raise EsphomeError(
-                "You do not have read or write permission on the selected serial port. "
-                "To resolve this issue, you can add your user to the dialout group "
-                f"by running the following command: sudo usermod -a -G dialout {os.getlogin()}. "
-                "You will need to log out & back in or reboot to activate the new group access."
-            )
-
-
 def upload_program(config, args, host):
     if get_port_type(host) == "SERIAL":
-        check_permissions(host)
         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
 
+    from esphome import espota2
+
     if CONF_OTA not in config:
         raise EsphomeError(
             "Cannot upload Over the Air as the config does not include the ota: "
             "component"
         )
 
-    from esphome import espota2
-
     ota_conf = config[CONF_OTA]
     remote_port = ota_conf[CONF_PORT]
     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
-    ):
-        from esphome import mqtt
-
-        host = mqtt.get_esphome_device_ip(
-            config, args.username, args.password, args.client_id
-        )
-
     if getattr(args, "file", None) is not None:
         return espota2.run_ota(host, remote_port, password, args.file)
-
     return espota2.run_ota(host, remote_port, password, CORE.firmware_bin)
 
 
@@ -363,16 +306,8 @@ def show_logs(config, args, port):
     if "logger" not in config:
         raise EsphomeError("Logger is not configured!")
     if get_port_type(port) == "SERIAL":
-        check_permissions(port)
         return run_miniterm(config, port)
     if get_port_type(port) == "NETWORK" and "api" in config:
-        if config[CONF_MDNS][CONF_DISABLED] and CONF_MQTT in config:
-            from esphome import mqtt
-
-            port = mqtt.get_esphome_device_ip(
-                config, args.username, args.password, args.client_id
-            )
-
         from esphome.components.api.client import run_logs
 
         return run_logs(config, port)
@@ -401,17 +336,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
-        )
-    if not CORE.quiet:
-        safe_print(output)
-    _LOGGER.info("Configuration is valid!")
+    safe_print(yaml_util.dump(config, args.show_secrets))
     return 0
 
 
@@ -444,7 +372,6 @@ def command_upload(args, config):
         show_ota=True,
         show_mqtt=False,
         show_api=False,
-        purpose="uploading",
     )
     exit_code = upload_program(config, args, port)
     if exit_code != 0:
@@ -453,15 +380,6 @@ def command_upload(args, config):
     return 0
 
 
-def command_discover(args, config):
-    if "mqtt" in config:
-        from esphome import mqtt
-
-        return mqtt.show_discover(config, args.username, args.password, args.client_id)
-
-    raise EsphomeError("No discover method configured (mqtt)")
-
-
 def command_logs(args, config):
     port = choose_upload_log_host(
         default=args.device,
@@ -469,7 +387,6 @@ def command_logs(args, config):
         show_ota=False,
         show_mqtt=True,
         show_api=True,
-        purpose="logging",
     )
     return show_logs(config, args, port)
 
@@ -488,7 +405,6 @@ def command_run(args, config):
         show_ota=True,
         show_mqtt=False,
         show_api=True,
-        purpose="uploading",
     )
     exit_code = upload_program(config, args, port)
     if exit_code != 0:
@@ -502,7 +418,6 @@ def command_run(args, config):
         show_ota=False,
         show_mqtt=True,
         show_api=True,
-        purpose="logging",
     )
     return show_logs(config, args, port)
 
@@ -535,7 +450,7 @@ def command_clean(args, config):
 def command_dashboard(args):
     from esphome.dashboard import dashboard
 
-    return dashboard.start_dashboard(args)
+    return dashboard.start_web_server(args)
 
 
 def command_update_all(args):
@@ -706,7 +621,6 @@ POST_CONFIG_ACTIONS = {
     "clean": command_clean,
     "idedata": command_idedata,
     "rename": command_rename,
-    "discover": command_discover,
 }
 
 
@@ -795,15 +709,6 @@ def parse_args(argv):
         help="Manually specify the serial port/address to use, for example /dev/ttyUSB0.",
     )
 
-    parser_discover = subparsers.add_parser(
-        "discover",
-        help="Validate the configuration and show all discovered devices.",
-        parents=[mqtt_options],
-    )
-    parser_discover.add_argument(
-        "configuration", help="Your YAML configuration file.", nargs=1
-    )
-
     parser_run = subparsers.add_parser(
         "run",
         help="Validate the configuration, create a binary, upload it, and start logs.",
@@ -990,7 +895,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)
 
 
@@ -1026,8 +930,6 @@ def run_esphome(argv):
             _LOGGER.error(e, exc_info=args.verbose)
             return 1
 
-    _LOGGER.info("ESPHome %s", const.__version__)
-
     for conf_path in args.configuration:
         if any(os.path.basename(conf_path) == x for x in SECRETS_FILES):
             _LOGGER.warning("Skipping secrets file %s", conf_path)

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/codegen.py

@@ -87,5 +87,4 @@ from esphome.cpp_types import (  # noqa
     gpio_Flags,
     EntityCategory,
     Parented,
-    ESPTime,
 )

esphome/components/a01nyub/__init__.py

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

esphome/components/a01nyub/a01nyub.cpp

@@ -1,44 +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";
-
-void A01nyubComponent::loop() {
-  uint8_t data;
-  while (this->available() > 0) {
-    this->read_byte(&data);
-    if (this->buffer_.empty() && (data != 0xff))
-      continue;
-    buffer_.push_back(data);
-    if (this->buffer_.size() == 4)
-      this->check_buffer_();
-  }
-}
-
-void A01nyubComponent::check_buffer_() {
-  uint8_t checksum = this->buffer_[0] + this->buffer_[1] + this->buffer_[2];
-  if (this->buffer_[3] == checksum) {
-    float distance = (this->buffer_[1] << 8) + this->buffer_[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());
-    }
-  } else {
-    ESP_LOGW(TAG, "checksum failed: %02x != %02x", checksum, this->buffer_[3]);
-  }
-  this->buffer_.clear();
-}
-
-void A01nyubComponent::dump_config() { LOG_SENSOR("", "A01nyub Sensor", 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/a02yyuw/__init__.py

@@ -1 +0,0 @@
-CODEOWNERS = ["@TH-Braemer"]

esphome/components/a02yyuw/a02yyuw.cpp

@@ -1,43 +0,0 @@
-// Datasheet https://wiki.dfrobot.com/_A02YYUW_Waterproof_Ultrasonic_Sensor_SKU_SEN0311
-
-#include "a02yyuw.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace a02yyuw {
-
-static const char *const TAG = "a02yyuw.sensor";
-
-void A02yyuwComponent::loop() {
-  uint8_t data;
-  while (this->available() > 0) {
-    this->read_byte(&data);
-    if (this->buffer_.empty() && (data != 0xff))
-      continue;
-    buffer_.push_back(data);
-    if (this->buffer_.size() == 4)
-      this->check_buffer_();
-  }
-}
-
-void A02yyuwComponent::check_buffer_() {
-  uint8_t checksum = this->buffer_[0] + this->buffer_[1] + this->buffer_[2];
-  if (this->buffer_[3] == checksum) {
-    float distance = (this->buffer_[1] << 8) + this->buffer_[2];
-    if (distance > 30) {
-      ESP_LOGV(TAG, "Distance from sensor: %f mm", distance);
-      this->publish_state(distance);
-    } else {
-      ESP_LOGW(TAG, "Invalid data read from sensor: %s", format_hex_pretty(this->buffer_).c_str());
-    }
-  } else {
-    ESP_LOGW(TAG, "checksum failed: %02x != %02x", checksum, this->buffer_[3]);
-  }
-  this->buffer_.clear();
-}
-
-void A02yyuwComponent::dump_config() { LOG_SENSOR("", "A02yyuw Sensor", this); }
-
-}  // namespace a02yyuw
-}  // namespace esphome

esphome/components/a02yyuw/a02yyuw.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 a02yyuw {
-
-class A02yyuwComponent : 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 a02yyuw
-}  // namespace esphome

esphome/components/a02yyuw/sensor.py

@@ -1,41 +0,0 @@
-import esphome.codegen as cg
-from esphome.components import sensor, uart
-from esphome.const import (
-    STATE_CLASS_MEASUREMENT,
-    ICON_ARROW_EXPAND_VERTICAL,
-    DEVICE_CLASS_DISTANCE,
-)
-
-CODEOWNERS = ["@TH-Braemer"]
-DEPENDENCIES = ["uart"]
-UNIT_MILLIMETERS = "mm"
-
-a02yyuw_ns = cg.esphome_ns.namespace("a02yyuw")
-A02yyuwComponent = a02yyuw_ns.class_(
-    "A02yyuwComponent", sensor.Sensor, cg.Component, uart.UARTDevice
-)
-
-CONFIG_SCHEMA = sensor.sensor_schema(
-    A02yyuwComponent,
-    unit_of_measurement=UNIT_MILLIMETERS,
-    icon=ICON_ARROW_EXPAND_VERTICAL,
-    accuracy_decimals=0,
-    state_class=STATE_CLASS_MEASUREMENT,
-    device_class=DEVICE_CLASS_DISTANCE,
-).extend(uart.UART_DEVICE_SCHEMA)
-
-FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
-    "a02yyuw",
-    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,196 +1 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome import pins
-from esphome.const import CONF_ANALOG, CONF_INPUT, CONF_NUMBER
-
-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,
-)
-
 CODEOWNERS = ["@esphome/core"]
-
-ATTENUATION_MODES = {
-    "0db": cg.global_ns.ADC_ATTEN_DB_0,
-    "2.5db": cg.global_ns.ADC_ATTEN_DB_2_5,
-    "6db": cg.global_ns.ADC_ATTEN_DB_6,
-    "11db": cg.global_ns.ADC_ATTEN_DB_11,
-    "auto": "auto",
-}
-
-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
-ESP32_VARIANT_ADC1_PIN_TO_CHANNEL = {
-    VARIANT_ESP32: {
-        36: adc1_channel_t.ADC1_CHANNEL_0,
-        37: adc1_channel_t.ADC1_CHANNEL_1,
-        38: adc1_channel_t.ADC1_CHANNEL_2,
-        39: adc1_channel_t.ADC1_CHANNEL_3,
-        32: adc1_channel_t.ADC1_CHANNEL_4,
-        33: adc1_channel_t.ADC1_CHANNEL_5,
-        34: adc1_channel_t.ADC1_CHANNEL_6,
-        35: adc1_channel_t.ADC1_CHANNEL_7,
-    },
-    VARIANT_ESP32S2: {
-        1: adc1_channel_t.ADC1_CHANNEL_0,
-        2: adc1_channel_t.ADC1_CHANNEL_1,
-        3: adc1_channel_t.ADC1_CHANNEL_2,
-        4: adc1_channel_t.ADC1_CHANNEL_3,
-        5: adc1_channel_t.ADC1_CHANNEL_4,
-        6: adc1_channel_t.ADC1_CHANNEL_5,
-        7: adc1_channel_t.ADC1_CHANNEL_6,
-        8: adc1_channel_t.ADC1_CHANNEL_7,
-        9: adc1_channel_t.ADC1_CHANNEL_8,
-        10: adc1_channel_t.ADC1_CHANNEL_9,
-    },
-    VARIANT_ESP32S3: {
-        1: adc1_channel_t.ADC1_CHANNEL_0,
-        2: adc1_channel_t.ADC1_CHANNEL_1,
-        3: adc1_channel_t.ADC1_CHANNEL_2,
-        4: adc1_channel_t.ADC1_CHANNEL_3,
-        5: adc1_channel_t.ADC1_CHANNEL_4,
-        6: adc1_channel_t.ADC1_CHANNEL_5,
-        7: adc1_channel_t.ADC1_CHANNEL_6,
-        8: adc1_channel_t.ADC1_CHANNEL_7,
-        9: adc1_channel_t.ADC1_CHANNEL_8,
-        10: adc1_channel_t.ADC1_CHANNEL_9,
-    },
-    VARIANT_ESP32C3: {
-        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_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,
-        2: adc1_channel_t.ADC1_CHANNEL_2,
-        3: adc1_channel_t.ADC1_CHANNEL_3,
-        4: adc1_channel_t.ADC1_CHANNEL_4,
-    },
-}
-
-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,
-    },
-    VARIANT_ESP32C2: {},
-    VARIANT_ESP32C6: {},
-    VARIANT_ESP32H2: {},
-}
-
-
-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")
-
-    if str(value).upper() == "TEMPERATURE":
-        return cv.only_on_rp2040("TEMPERATURE")
-
-    if CORE.is_esp32:
-        conf = pins.internal_gpio_input_pin_schema(value)
-        value = conf[CONF_NUMBER]
-        variant = get_esp32_variant()
-        if (
-            variant not in ESP32_VARIANT_ADC1_PIN_TO_CHANNEL
-            and variant not in ESP32_VARIANT_ADC2_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]
-        ):
-            raise cv.Invalid(f"{variant} doesn't support ADC on this pin")
-
-        return conf
-
-    if CORE.is_esp8266:
-        conf = pins.gpio_pin_schema(
-            {CONF_ANALOG: True, CONF_INPUT: True}, internal=True
-        )(value)
-
-        if conf[CONF_NUMBER] != 17:  # A0
-            raise cv.Invalid("ESP8266: Only pin A0 (GPIO17) supports ADC")
-        return conf
-
-    if CORE.is_rp2040:
-        conf = pins.internal_gpio_input_pin_schema(value)
-        number = conf[CONF_NUMBER]
-        if number not in (26, 27, 28, 29):
-            raise cv.Invalid("RP2040: Only pins 26, 27, 28 and 29 support ADC")
-        return conf
-
-    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,49 +1,137 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-import esphome.final_validate as fv
-from esphome.core import CORE
+from esphome import pins
 from esphome.components import sensor, voltage_sampler
-from esphome.components.esp32 import get_esp32_variant
 from esphome.const import (
     CONF_ATTENUATION,
+    CONF_RAW,
     CONF_ID,
+    CONF_INPUT,
     CONF_NUMBER,
     CONF_PIN,
-    CONF_RAW,
-    CONF_WIFI,
     DEVICE_CLASS_VOLTAGE,
     STATE_CLASS_MEASUREMENT,
     UNIT_VOLT,
 )
-from . import (
-    ATTENUATION_MODES,
-    ESP32_VARIANT_ADC1_PIN_TO_CHANNEL,
-    ESP32_VARIANT_ADC2_PIN_TO_CHANNEL,
-    validate_adc_pin,
+from esphome.core import CORE
+from esphome.components.esp32 import get_esp32_variant
+from esphome.components.esp32.const import (
+    VARIANT_ESP32,
+    VARIANT_ESP32C3,
+    VARIANT_ESP32H2,
+    VARIANT_ESP32S2,
+    VARIANT_ESP32S3,
 )
 
+
 AUTO_LOAD = ["voltage_sampler"]
 
+ATTENUATION_MODES = {
+    "0db": cg.global_ns.ADC_ATTEN_DB_0,
+    "2.5db": cg.global_ns.ADC_ATTEN_DB_2_5,
+    "6db": cg.global_ns.ADC_ATTEN_DB_6,
+    "11db": cg.global_ns.ADC_ATTEN_DB_11,
+    "auto": "auto",
+}
+
+adc1_channel_t = cg.global_ns.enum("adc1_channel_t")
+
+# From https://github.com/espressif/esp-idf/blob/master/components/driver/include/driver/adc_common.h
+# pin to adc1 channel mapping
+ESP32_VARIANT_ADC1_PIN_TO_CHANNEL = {
+    VARIANT_ESP32: {
+        36: adc1_channel_t.ADC1_CHANNEL_0,
+        37: adc1_channel_t.ADC1_CHANNEL_1,
+        38: adc1_channel_t.ADC1_CHANNEL_2,
+        39: adc1_channel_t.ADC1_CHANNEL_3,
+        32: adc1_channel_t.ADC1_CHANNEL_4,
+        33: adc1_channel_t.ADC1_CHANNEL_5,
+        34: adc1_channel_t.ADC1_CHANNEL_6,
+        35: adc1_channel_t.ADC1_CHANNEL_7,
+    },
+    VARIANT_ESP32S2: {
+        1: adc1_channel_t.ADC1_CHANNEL_0,
+        2: adc1_channel_t.ADC1_CHANNEL_1,
+        3: adc1_channel_t.ADC1_CHANNEL_2,
+        4: adc1_channel_t.ADC1_CHANNEL_3,
+        5: adc1_channel_t.ADC1_CHANNEL_4,
+        6: adc1_channel_t.ADC1_CHANNEL_5,
+        7: adc1_channel_t.ADC1_CHANNEL_6,
+        8: adc1_channel_t.ADC1_CHANNEL_7,
+        9: adc1_channel_t.ADC1_CHANNEL_8,
+        10: adc1_channel_t.ADC1_CHANNEL_9,
+    },
+    VARIANT_ESP32S3: {
+        1: adc1_channel_t.ADC1_CHANNEL_0,
+        2: adc1_channel_t.ADC1_CHANNEL_1,
+        3: adc1_channel_t.ADC1_CHANNEL_2,
+        4: adc1_channel_t.ADC1_CHANNEL_3,
+        5: adc1_channel_t.ADC1_CHANNEL_4,
+        6: adc1_channel_t.ADC1_CHANNEL_5,
+        7: adc1_channel_t.ADC1_CHANNEL_6,
+        8: adc1_channel_t.ADC1_CHANNEL_7,
+        9: adc1_channel_t.ADC1_CHANNEL_8,
+        10: adc1_channel_t.ADC1_CHANNEL_9,
+    },
+    VARIANT_ESP32C3: {
+        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_ESP32H2: {
+        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,
+    },
+}
+
+
+def validate_adc_pin(value):
+    if str(value).upper() == "VCC":
+        return cv.only_on_esp8266("VCC")
+
+    if str(value).upper() == "TEMPERATURE":
+        return cv.only_on_rp2040("TEMPERATURE")
+
+    if CORE.is_esp32:
+        value = pins.internal_gpio_input_pin_number(value)
+        variant = get_esp32_variant()
+        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]:
+            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.")
+        return pins.gpio_pin_schema(
+            {CONF_ANALOG: True, CONF_INPUT: True}, internal=True
+        )(value)
+
+    if CORE.is_rp2040:
+        value = pins.internal_gpio_input_pin_number(value)
+        if value not in (26, 27, 28, 29):
+            raise cv.Invalid("RP2040: Only pins 26, 27, 28 and 29 support ADC.")
+        return pins.internal_gpio_input_pin_schema(value)
+
+    raise NotImplementedError
+
 
 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 +161,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 +175,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/addressable_light_display.h

@@ -10,7 +10,7 @@
 namespace esphome {
 namespace addressable_light {
 
-class AddressableLightDisplay : public display::DisplayBuffer {
+class AddressableLightDisplay : public display::DisplayBuffer, public PollingComponent {
  public:
   light::AddressableLight *get_light() const { return this->light_; }
 

esphome/components/addressable_light/display.py

@@ -45,18 +45,19 @@ async def to_code(config):
     cg.add(var.set_height(config[CONF_HEIGHT]))
     cg.add(var.set_light(wrapped_light))
 
+    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/ade7880/__init__.py

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

esphome/components/ade7880/ade7880.cpp

@@ -1,302 +0,0 @@
-// This component was developed using knowledge gathered by a number
-// of people who reverse-engineered the Shelly 3EM:
-//
-// @AndreKR on GitHub
-// Axel (@Axel830 on GitHub)
-// Marko (@goodkiller on GitHub)
-// Michaël Piron (@michaelpiron on GitHub)
-// Theo Arends (@arendst on GitHub)
-
-#include "ade7880.h"
-#include "ade7880_registers.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace ade7880 {
-
-static const char *const TAG = "ade7880";
-
-void IRAM_ATTR ADE7880Store::gpio_intr(ADE7880Store *arg) { arg->reset_done = true; }
-
-void ADE7880::setup() {
-  if (this->irq0_pin_ != nullptr) {
-    this->irq0_pin_->setup();
-  }
-  this->irq1_pin_->setup();
-  if (this->reset_pin_ != nullptr) {
-    this->reset_pin_->setup();
-  }
-  this->store_.irq1_pin = this->irq1_pin_->to_isr();
-  this->irq1_pin_->attach_interrupt(ADE7880Store::gpio_intr, &this->store_, gpio::INTERRUPT_FALLING_EDGE);
-
-  // if IRQ1 is already asserted, the cause must be determined
-  if (this->irq1_pin_->digital_read() == 0) {
-    ESP_LOGD(TAG, "IRQ1 found asserted during setup()");
-    auto status1 = read_u32_register16_(STATUS1);
-    if ((status1 & ~STATUS1_RSTDONE) != 0) {
-      // not safe to proceed, must initiate reset
-      ESP_LOGD(TAG, "IRQ1 asserted for !RSTDONE, resetting device");
-      this->reset_device_();
-      return;
-    }
-    if ((status1 & STATUS1_RSTDONE) == STATUS1_RSTDONE) {
-      // safe to proceed, device has just completed reset cycle
-      ESP_LOGD(TAG, "Acknowledging RSTDONE");
-      this->write_u32_register16_(STATUS0, 0xFFFF);
-      this->write_u32_register16_(STATUS1, 0xFFFF);
-      this->init_device_();
-      return;
-    }
-  }
-
-  this->reset_device_();
-}
-
-void ADE7880::loop() {
-  // check for completion of a reset cycle
-  if (!this->store_.reset_done) {
-    return;
-  }
-
-  ESP_LOGD(TAG, "Acknowledging RSTDONE");
-  this->write_u32_register16_(STATUS0, 0xFFFF);
-  this->write_u32_register16_(STATUS1, 0xFFFF);
-  this->init_device_();
-  this->store_.reset_done = false;
-  this->store_.reset_pending = false;
-}
-
-template<typename F>
-void ADE7880::update_sensor_from_s24zp_register16_(sensor::Sensor *sensor, uint16_t a_register, F &&f) {
-  if (sensor == nullptr) {
-    return;
-  }
-
-  float val = this->read_s24zp_register16_(a_register);
-  sensor->publish_state(f(val));
-}
-
-template<typename F>
-void ADE7880::update_sensor_from_s16_register16_(sensor::Sensor *sensor, uint16_t a_register, F &&f) {
-  if (sensor == nullptr) {
-    return;
-  }
-
-  float val = this->read_s16_register16_(a_register);
-  sensor->publish_state(f(val));
-}
-
-template<typename F>
-void ADE7880::update_sensor_from_s32_register16_(sensor::Sensor *sensor, uint16_t a_register, F &&f) {
-  if (sensor == nullptr) {
-    return;
-  }
-
-  float val = this->read_s32_register16_(a_register);
-  sensor->publish_state(f(val));
-}
-
-void ADE7880::update() {
-  if (this->store_.reset_pending) {
-    return;
-  }
-
-  auto start = millis();
-
-  if (this->channel_n_ != nullptr) {
-    auto *chan = this->channel_n_;
-    this->update_sensor_from_s24zp_register16_(chan->current, NIRMS, [](float val) { return val / 100000.0f; });
-  }
-
-  if (this->channel_a_ != nullptr) {
-    auto *chan = this->channel_a_;
-    this->update_sensor_from_s24zp_register16_(chan->current, AIRMS, [](float val) { return val / 100000.0f; });
-    this->update_sensor_from_s24zp_register16_(chan->voltage, BVRMS, [](float val) { return val / 10000.0f; });
-    this->update_sensor_from_s24zp_register16_(chan->active_power, AWATT, [](float val) { return val / 100.0f; });
-    this->update_sensor_from_s24zp_register16_(chan->apparent_power, AVA, [](float val) { return val / 100.0f; });
-    this->update_sensor_from_s16_register16_(chan->power_factor, APF,
-                                             [](float val) { return std::abs(val / -327.68f); });
-    this->update_sensor_from_s32_register16_(chan->forward_active_energy, AFWATTHR, [&chan](float val) {
-      return chan->forward_active_energy_total += val / 14400.0f;
-    });
-    this->update_sensor_from_s32_register16_(chan->reverse_active_energy, AFWATTHR, [&chan](float val) {
-      return chan->reverse_active_energy_total += val / 14400.0f;
-    });
-  }
-
-  if (this->channel_b_ != nullptr) {
-    auto *chan = this->channel_b_;
-    this->update_sensor_from_s24zp_register16_(chan->current, BIRMS, [](float val) { return val / 100000.0f; });
-    this->update_sensor_from_s24zp_register16_(chan->voltage, BVRMS, [](float val) { return val / 10000.0f; });
-    this->update_sensor_from_s24zp_register16_(chan->active_power, BWATT, [](float val) { return val / 100.0f; });
-    this->update_sensor_from_s24zp_register16_(chan->apparent_power, BVA, [](float val) { return val / 100.0f; });
-    this->update_sensor_from_s16_register16_(chan->power_factor, BPF,
-                                             [](float val) { return std::abs(val / -327.68f); });
-    this->update_sensor_from_s32_register16_(chan->forward_active_energy, BFWATTHR, [&chan](float val) {
-      return chan->forward_active_energy_total += val / 14400.0f;
-    });
-    this->update_sensor_from_s32_register16_(chan->reverse_active_energy, BFWATTHR, [&chan](float val) {
-      return chan->reverse_active_energy_total += val / 14400.0f;
-    });
-  }
-
-  if (this->channel_c_ != nullptr) {
-    auto *chan = this->channel_c_;
-    this->update_sensor_from_s24zp_register16_(chan->current, CIRMS, [](float val) { return val / 100000.0f; });
-    this->update_sensor_from_s24zp_register16_(chan->voltage, CVRMS, [](float val) { return val / 10000.0f; });
-    this->update_sensor_from_s24zp_register16_(chan->active_power, CWATT, [](float val) { return val / 100.0f; });
-    this->update_sensor_from_s24zp_register16_(chan->apparent_power, CVA, [](float val) { return val / 100.0f; });
-    this->update_sensor_from_s16_register16_(chan->power_factor, CPF,
-                                             [](float val) { return std::abs(val / -327.68f); });
-    this->update_sensor_from_s32_register16_(chan->forward_active_energy, CFWATTHR, [&chan](float val) {
-      return chan->forward_active_energy_total += val / 14400.0f;
-    });
-    this->update_sensor_from_s32_register16_(chan->reverse_active_energy, CFWATTHR, [&chan](float val) {
-      return chan->reverse_active_energy_total += val / 14400.0f;
-    });
-  }
-
-  ESP_LOGD(TAG, "update took %u ms", millis() - start);
-}
-
-void ADE7880::dump_config() {
-  ESP_LOGCONFIG(TAG, "ADE7880:");
-  LOG_PIN("  IRQ0  Pin: ", this->irq0_pin_);
-  LOG_PIN("  IRQ1  Pin: ", this->irq1_pin_);
-  LOG_PIN("  RESET Pin: ", this->reset_pin_);
-  ESP_LOGCONFIG(TAG, "  Frequency: %.0f Hz", this->frequency_);
-
-  if (this->channel_a_ != nullptr) {
-    ESP_LOGCONFIG(TAG, "  Phase A:");
-    LOG_SENSOR("    ", "Current", this->channel_a_->current);
-    LOG_SENSOR("    ", "Voltage", this->channel_a_->voltage);
-    LOG_SENSOR("    ", "Active Power", this->channel_a_->active_power);
-    LOG_SENSOR("    ", "Apparent Power", this->channel_a_->apparent_power);
-    LOG_SENSOR("    ", "Power Factor", this->channel_a_->power_factor);
-    LOG_SENSOR("    ", "Forward Active Energy", this->channel_a_->forward_active_energy);
-    LOG_SENSOR("    ", "Reverse Active Energy", this->channel_a_->reverse_active_energy);
-    ESP_LOGCONFIG(TAG, "    Calibration:");
-    ESP_LOGCONFIG(TAG, "     Current: %u", this->channel_a_->current_gain_calibration);
-    ESP_LOGCONFIG(TAG, "     Voltage: %d", this->channel_a_->voltage_gain_calibration);
-    ESP_LOGCONFIG(TAG, "     Power: %d", this->channel_a_->power_gain_calibration);
-    ESP_LOGCONFIG(TAG, "     Phase Angle: %u", this->channel_a_->phase_angle_calibration);
-  }
-
-  if (this->channel_b_ != nullptr) {
-    ESP_LOGCONFIG(TAG, "  Phase B:");
-    LOG_SENSOR("    ", "Current", this->channel_b_->current);
-    LOG_SENSOR("    ", "Voltage", this->channel_b_->voltage);
-    LOG_SENSOR("    ", "Active Power", this->channel_b_->active_power);
-    LOG_SENSOR("    ", "Apparent Power", this->channel_b_->apparent_power);
-    LOG_SENSOR("    ", "Power Factor", this->channel_b_->power_factor);
-    LOG_SENSOR("    ", "Forward Active Energy", this->channel_b_->forward_active_energy);
-    LOG_SENSOR("    ", "Reverse Active Energy", this->channel_b_->reverse_active_energy);
-    ESP_LOGCONFIG(TAG, "    Calibration:");
-    ESP_LOGCONFIG(TAG, "     Current: %u", this->channel_b_->current_gain_calibration);
-    ESP_LOGCONFIG(TAG, "     Voltage: %d", this->channel_b_->voltage_gain_calibration);
-    ESP_LOGCONFIG(TAG, "     Power: %d", this->channel_b_->power_gain_calibration);
-    ESP_LOGCONFIG(TAG, "     Phase Angle: %u", this->channel_b_->phase_angle_calibration);
-  }
-
-  if (this->channel_c_ != nullptr) {
-    ESP_LOGCONFIG(TAG, "  Phase C:");
-    LOG_SENSOR("    ", "Current", this->channel_c_->current);
-    LOG_SENSOR("    ", "Voltage", this->channel_c_->voltage);
-    LOG_SENSOR("    ", "Active Power", this->channel_c_->active_power);
-    LOG_SENSOR("    ", "Apparent Power", this->channel_c_->apparent_power);
-    LOG_SENSOR("    ", "Power Factor", this->channel_c_->power_factor);
-    LOG_SENSOR("    ", "Forward Active Energy", this->channel_c_->forward_active_energy);
-    LOG_SENSOR("    ", "Reverse Active Energy", this->channel_c_->reverse_active_energy);
-    ESP_LOGCONFIG(TAG, "    Calibration:");
-    ESP_LOGCONFIG(TAG, "     Current: %u", this->channel_c_->current_gain_calibration);
-    ESP_LOGCONFIG(TAG, "     Voltage: %d", this->channel_c_->voltage_gain_calibration);
-    ESP_LOGCONFIG(TAG, "     Power: %d", this->channel_c_->power_gain_calibration);
-    ESP_LOGCONFIG(TAG, "     Phase Angle: %u", this->channel_c_->phase_angle_calibration);
-  }
-
-  if (this->channel_n_ != nullptr) {
-    ESP_LOGCONFIG(TAG, "  Neutral:");
-    LOG_SENSOR("    ", "Current", this->channel_n_->current);
-    ESP_LOGCONFIG(TAG, "    Calibration:");
-    ESP_LOGCONFIG(TAG, "     Current: %u", this->channel_n_->current_gain_calibration);
-  }
-
-  LOG_I2C_DEVICE(this);
-  LOG_UPDATE_INTERVAL(this);
-}
-
-void ADE7880::calibrate_s10zp_reading_(uint16_t a_register, int16_t calibration) {
-  if (calibration == 0) {
-    return;
-  }
-
-  this->write_s10zp_register16_(a_register, calibration);
-}
-
-void ADE7880::calibrate_s24zpse_reading_(uint16_t a_register, int32_t calibration) {
-  if (calibration == 0) {
-    return;
-  }
-
-  this->write_s24zpse_register16_(a_register, calibration);
-}
-
-void ADE7880::init_device_() {
-  this->write_u8_register16_(CONFIG2, CONFIG2_I2C_LOCK);
-
-  this->write_u16_register16_(GAIN, 0);
-
-  if (this->frequency_ > 55) {
-    this->write_u16_register16_(COMPMODE, COMPMODE_DEFAULT | COMPMODE_SELFREQ);
-  }
-
-  if (this->channel_n_ != nullptr) {
-    this->calibrate_s24zpse_reading_(NIGAIN, this->channel_n_->current_gain_calibration);
-  }
-
-  if (this->channel_a_ != nullptr) {
-    this->calibrate_s24zpse_reading_(AIGAIN, this->channel_a_->current_gain_calibration);
-    this->calibrate_s24zpse_reading_(AVGAIN, this->channel_a_->voltage_gain_calibration);
-    this->calibrate_s24zpse_reading_(APGAIN, this->channel_a_->power_gain_calibration);
-    this->calibrate_s10zp_reading_(APHCAL, this->channel_a_->phase_angle_calibration);
-  }
-
-  if (this->channel_b_ != nullptr) {
-    this->calibrate_s24zpse_reading_(BIGAIN, this->channel_b_->current_gain_calibration);
-    this->calibrate_s24zpse_reading_(BVGAIN, this->channel_b_->voltage_gain_calibration);
-    this->calibrate_s24zpse_reading_(BPGAIN, this->channel_b_->power_gain_calibration);
-    this->calibrate_s10zp_reading_(BPHCAL, this->channel_b_->phase_angle_calibration);
-  }
-
-  if (this->channel_c_ != nullptr) {
-    this->calibrate_s24zpse_reading_(CIGAIN, this->channel_c_->current_gain_calibration);
-    this->calibrate_s24zpse_reading_(CVGAIN, this->channel_c_->voltage_gain_calibration);
-    this->calibrate_s24zpse_reading_(CPGAIN, this->channel_c_->power_gain_calibration);
-    this->calibrate_s10zp_reading_(CPHCAL, this->channel_c_->phase_angle_calibration);
-  }
-
-  // write three default values to data memory RAM to flush the I2C write queue
-  this->write_s32_register16_(VLEVEL, 0);
-  this->write_s32_register16_(VLEVEL, 0);
-  this->write_s32_register16_(VLEVEL, 0);
-
-  this->write_u8_register16_(DSPWP_SEL, DSPWP_SEL_SET);
-  this->write_u8_register16_(DSPWP_SET, DSPWP_SET_RO);
-  this->write_u16_register16_(RUN, RUN_ENABLE);
-}
-
-void ADE7880::reset_device_() {
-  if (this->reset_pin_ != nullptr) {
-    ESP_LOGD(TAG, "Reset device using RESET pin");
-    this->reset_pin_->digital_write(false);
-    delay(1);
-    this->reset_pin_->digital_write(true);
-  } else {
-    ESP_LOGD(TAG, "Reset device using SWRST command");
-    this->write_u16_register16_(CONFIG, CONFIG_SWRST);
-  }
-  this->store_.reset_pending = true;
-}
-
-}  // namespace ade7880
-}  // namespace esphome

esphome/components/ade7880/ade7880.h

@@ -1,131 +0,0 @@
-#pragma once
-
-// This component was developed using knowledge gathered by a number
-// of people who reverse-engineered the Shelly 3EM:
-//
-// @AndreKR on GitHub
-// Axel (@Axel830 on GitHub)
-// Marko (@goodkiller on GitHub)
-// Michaël Piron (@michaelpiron on GitHub)
-// Theo Arends (@arendst on GitHub)
-
-#include "esphome/core/component.h"
-#include "esphome/core/hal.h"
-#include "esphome/components/i2c/i2c.h"
-#include "esphome/components/sensor/sensor.h"
-
-#include "ade7880_registers.h"
-
-namespace esphome {
-namespace ade7880 {
-
-struct NeutralChannel {
-  void set_current(sensor::Sensor *sens) { this->current = sens; }
-
-  void set_current_gain_calibration(int32_t val) { this->current_gain_calibration = val; }
-
-  sensor::Sensor *current{nullptr};
-  int32_t current_gain_calibration{0};
-};
-
-struct PowerChannel {
-  void set_current(sensor::Sensor *sens) { this->current = sens; }
-  void set_voltage(sensor::Sensor *sens) { this->voltage = sens; }
-  void set_active_power(sensor::Sensor *sens) { this->active_power = sens; }
-  void set_apparent_power(sensor::Sensor *sens) { this->apparent_power = sens; }
-  void set_power_factor(sensor::Sensor *sens) { this->power_factor = sens; }
-  void set_forward_active_energy(sensor::Sensor *sens) { this->forward_active_energy = sens; }
-  void set_reverse_active_energy(sensor::Sensor *sens) { this->reverse_active_energy = sens; }
-
-  void set_current_gain_calibration(int32_t val) { this->current_gain_calibration = val; }
-  void set_voltage_gain_calibration(int32_t val) { this->voltage_gain_calibration = val; }
-  void set_power_gain_calibration(int32_t val) { this->power_gain_calibration = val; }
-  void set_phase_angle_calibration(int32_t val) { this->phase_angle_calibration = val; }
-
-  sensor::Sensor *current{nullptr};
-  sensor::Sensor *voltage{nullptr};
-  sensor::Sensor *active_power{nullptr};
-  sensor::Sensor *apparent_power{nullptr};
-  sensor::Sensor *power_factor{nullptr};
-  sensor::Sensor *forward_active_energy{nullptr};
-  sensor::Sensor *reverse_active_energy{nullptr};
-  int32_t current_gain_calibration{0};
-  int32_t voltage_gain_calibration{0};
-  int32_t power_gain_calibration{0};
-  uint16_t phase_angle_calibration{0};
-  float forward_active_energy_total{0};
-  float reverse_active_energy_total{0};
-};
-
-// Store data in a class that doesn't use multiple-inheritance (no vtables in flash!)
-struct ADE7880Store {
-  volatile bool reset_done{false};
-  bool reset_pending{false};
-  ISRInternalGPIOPin irq1_pin;
-
-  static void gpio_intr(ADE7880Store *arg);
-};
-
-class ADE7880 : public i2c::I2CDevice, public PollingComponent {
- public:
-  void set_irq0_pin(InternalGPIOPin *pin) { this->irq0_pin_ = pin; }
-  void set_irq1_pin(InternalGPIOPin *pin) { this->irq1_pin_ = pin; }
-  void set_reset_pin(InternalGPIOPin *pin) { this->reset_pin_ = pin; }
-  void set_frequency(float frequency) { this->frequency_ = frequency; }
-  void set_channel_n(NeutralChannel *channel) { this->channel_n_ = channel; }
-  void set_channel_a(PowerChannel *channel) { this->channel_a_ = channel; }
-  void set_channel_b(PowerChannel *channel) { this->channel_b_ = channel; }
-  void set_channel_c(PowerChannel *channel) { this->channel_c_ = channel; }
-
-  void setup() override;
-
-  void loop() override;
-
-  void update() override;
-
-  void dump_config() override;
-
-  float get_setup_priority() const override { return setup_priority::DATA; }
-
- protected:
-  ADE7880Store store_{};
-  InternalGPIOPin *irq0_pin_{nullptr};
-  InternalGPIOPin *irq1_pin_{nullptr};
-  InternalGPIOPin *reset_pin_{nullptr};
-  float frequency_;
-  NeutralChannel *channel_n_{nullptr};
-  PowerChannel *channel_a_{nullptr};
-  PowerChannel *channel_b_{nullptr};
-  PowerChannel *channel_c_{nullptr};
-
-  void calibrate_s10zp_reading_(uint16_t a_register, int16_t calibration);
-  void calibrate_s24zpse_reading_(uint16_t a_register, int32_t calibration);
-
-  void init_device_();
-
-  // each of these functions allow the caller to pass in a lambda (or any other callable)
-  // which modifies the value read from the register before it is passed to the sensor
-  // the callable will be passed a 'float' value and is expected to return a 'float'
-  template<typename F> void update_sensor_from_s24zp_register16_(sensor::Sensor *sensor, uint16_t a_register, F &&f);
-  template<typename F> void update_sensor_from_s16_register16_(sensor::Sensor *sensor, uint16_t a_register, F &&f);
-  template<typename F> void update_sensor_from_s32_register16_(sensor::Sensor *sensor, uint16_t a_register, F &&f);
-
-  void reset_device_();
-
-  uint8_t read_u8_register16_(uint16_t a_register);
-  int16_t read_s16_register16_(uint16_t a_register);
-  uint16_t read_u16_register16_(uint16_t a_register);
-  int32_t read_s24zp_register16_(uint16_t a_register);
-  int32_t read_s32_register16_(uint16_t a_register);
-  uint32_t read_u32_register16_(uint16_t a_register);
-
-  void write_u8_register16_(uint16_t a_register, uint8_t value);
-  void write_s10zp_register16_(uint16_t a_register, int16_t value);
-  void write_u16_register16_(uint16_t a_register, uint16_t value);
-  void write_s24zpse_register16_(uint16_t a_register, int32_t value);
-  void write_s32_register16_(uint16_t a_register, int32_t value);
-  void write_u32_register16_(uint16_t a_register, uint32_t value);
-};
-
-}  // namespace ade7880
-}  // namespace esphome

esphome/components/ade7880/ade7880_i2c.cpp

@@ -1,101 +0,0 @@
-// This component was developed using knowledge gathered by a number
-// of people who reverse-engineered the Shelly 3EM:
-//
-// @AndreKR on GitHub
-// Axel (@Axel830 on GitHub)
-// Marko (@goodkiller on GitHub)
-// Michaël Piron (@michaelpiron on GitHub)
-// Theo Arends (@arendst on GitHub)
-
-#include "ade7880.h"
-
-namespace esphome {
-namespace ade7880 {
-
-// adapted from https://stackoverflow.com/a/55912127/1886371
-template<size_t Bits, typename T> inline T sign_extend(const T &v) noexcept {
-  using S = struct { signed Val : Bits; };
-  return reinterpret_cast<const S *>(&v)->Val;
-}
-
-// Register types
-// unsigned 8-bit (uint8_t)
-// signed 10-bit - 16-bit ZP on wire (int16_t, needs sign extension)
-// unsigned 16-bit (uint16_t)
-// unsigned 20-bit - 32-bit ZP on wire (uint32_t)
-// signed 24-bit - 32-bit ZPSE on wire (int32_t, needs sign extension)
-// signed 24-bit - 32-bit ZP on wire (int32_t, needs sign extension)
-// signed 24-bit - 32-bit SE on wire (int32_t)
-// signed 28-bit - 32-bit ZP on wire (int32_t, needs sign extension)
-// unsigned 32-bit (uint32_t)
-// signed 32-bit (int32_t)
-
-uint8_t ADE7880::read_u8_register16_(uint16_t a_register) {
-  uint8_t in;
-  this->read_register16(a_register, &in, sizeof(in));
-  return in;
-}
-
-int16_t ADE7880::read_s16_register16_(uint16_t a_register) {
-  int16_t in;
-  this->read_register16(a_register, reinterpret_cast<uint8_t *>(&in), sizeof(in));
-  return convert_big_endian(in);
-}
-
-uint16_t ADE7880::read_u16_register16_(uint16_t a_register) {
-  uint16_t in;
-  this->read_register16(a_register, reinterpret_cast<uint8_t *>(&in), sizeof(in));
-  return convert_big_endian(in);
-}
-
-int32_t ADE7880::read_s24zp_register16_(uint16_t a_register) {
-  // s24zp means 24 bit signed value in the lower 24 bits of a 32-bit register
-  int32_t in;
-  this->read_register16(a_register, reinterpret_cast<uint8_t *>(&in), sizeof(in));
-  return sign_extend<24>(convert_big_endian(in));
-}
-
-int32_t ADE7880::read_s32_register16_(uint16_t a_register) {
-  int32_t in;
-  this->read_register16(a_register, reinterpret_cast<uint8_t *>(&in), sizeof(in));
-  return convert_big_endian(in);
-}
-
-uint32_t ADE7880::read_u32_register16_(uint16_t a_register) {
-  uint32_t in;
-  this->read_register16(a_register, reinterpret_cast<uint8_t *>(&in), sizeof(in));
-  return convert_big_endian(in);
-}
-
-void ADE7880::write_u8_register16_(uint16_t a_register, uint8_t value) {
-  this->write_register16(a_register, &value, sizeof(value));
-}
-
-void ADE7880::write_s10zp_register16_(uint16_t a_register, int16_t value) {
-  int16_t out = convert_big_endian(value & 0x03FF);
-  this->write_register16(a_register, reinterpret_cast<uint8_t *>(&out), sizeof(out));
-}
-
-void ADE7880::write_u16_register16_(uint16_t a_register, uint16_t value) {
-  uint16_t out = convert_big_endian(value);
-  this->write_register16(a_register, reinterpret_cast<uint8_t *>(&out), sizeof(out));
-}
-
-void ADE7880::write_s24zpse_register16_(uint16_t a_register, int32_t value) {
-  // s24zpse means a 24-bit signed value, sign-extended to 28 bits, in the lower 28 bits of a 32-bit register
-  int32_t out = convert_big_endian(value & 0x0FFFFFFF);
-  this->write_register16(a_register, reinterpret_cast<uint8_t *>(&out), sizeof(out));
-}
-
-void ADE7880::write_s32_register16_(uint16_t a_register, int32_t value) {
-  int32_t out = convert_big_endian(value);
-  this->write_register16(a_register, reinterpret_cast<uint8_t *>(&out), sizeof(out));
-}
-
-void ADE7880::write_u32_register16_(uint16_t a_register, uint32_t value) {
-  uint32_t out = convert_big_endian(value);
-  this->write_register16(a_register, reinterpret_cast<uint8_t *>(&out), sizeof(out));
-}
-
-}  // namespace ade7880
-}  // namespace esphome

esphome/components/ade7880/ade7880_registers.h

@@ -1,243 +0,0 @@
-#pragma once
-
-// This file is a modified version of the one created by Michaël Piron (@michaelpiron on GitHub)
-
-// Source: https://www.analog.com/media/en/technical-documentation/application-notes/AN-1127.pdf
-
-namespace esphome {
-namespace ade7880 {
-
-// DSP Data Memory RAM registers
-constexpr uint16_t AIGAIN = 0x4380;
-constexpr uint16_t AVGAIN = 0x4381;
-constexpr uint16_t BIGAIN = 0x4382;
-constexpr uint16_t BVGAIN = 0x4383;
-constexpr uint16_t CIGAIN = 0x4384;
-constexpr uint16_t CVGAIN = 0x4385;
-constexpr uint16_t NIGAIN = 0x4386;
-
-constexpr uint16_t DICOEFF = 0x4388;
-
-constexpr uint16_t APGAIN = 0x4389;
-constexpr uint16_t AWATTOS = 0x438A;
-constexpr uint16_t BPGAIN = 0x438B;
-constexpr uint16_t BWATTOS = 0x438C;
-constexpr uint16_t CPGAIN = 0x438D;
-constexpr uint16_t CWATTOS = 0x438E;
-constexpr uint16_t AIRMSOS = 0x438F;
-constexpr uint16_t AVRMSOS = 0x4390;
-constexpr uint16_t BIRMSOS = 0x4391;
-constexpr uint16_t BVRMSOS = 0x4392;
-constexpr uint16_t CIRMSOS = 0x4393;
-constexpr uint16_t CVRMSOS = 0x4394;
-constexpr uint16_t NIRMSOS = 0x4395;
-constexpr uint16_t HPGAIN = 0x4398;
-constexpr uint16_t ISUMLVL = 0x4399;
-
-constexpr uint16_t VLEVEL = 0x439F;
-
-constexpr uint16_t AFWATTOS = 0x43A2;
-constexpr uint16_t BFWATTOS = 0x43A3;
-constexpr uint16_t CFWATTOS = 0x43A4;
-
-constexpr uint16_t AFVAROS = 0x43A5;
-constexpr uint16_t BFVAROS = 0x43A6;
-constexpr uint16_t CFVAROS = 0x43A7;
-
-constexpr uint16_t AFIRMSOS = 0x43A8;
-constexpr uint16_t BFIRMSOS = 0x43A9;
-constexpr uint16_t CFIRMSOS = 0x43AA;
-
-constexpr uint16_t AFVRMSOS = 0x43AB;
-constexpr uint16_t BFVRMSOS = 0x43AC;
-constexpr uint16_t CFVRMSOS = 0x43AD;
-
-constexpr uint16_t HXWATTOS = 0x43AE;
-constexpr uint16_t HYWATTOS = 0x43AF;
-constexpr uint16_t HZWATTOS = 0x43B0;
-constexpr uint16_t HXVAROS = 0x43B1;
-constexpr uint16_t HYVAROS = 0x43B2;
-constexpr uint16_t HZVAROS = 0x43B3;
-
-constexpr uint16_t HXIRMSOS = 0x43B4;
-constexpr uint16_t HYIRMSOS = 0x43B5;
-constexpr uint16_t HZIRMSOS = 0x43B6;
-constexpr uint16_t HXVRMSOS = 0x43B7;
-constexpr uint16_t HYVRMSOS = 0x43B8;
-constexpr uint16_t HZVRMSOS = 0x43B9;
-
-constexpr uint16_t AIRMS = 0x43C0;
-constexpr uint16_t AVRMS = 0x43C1;
-constexpr uint16_t BIRMS = 0x43C2;
-constexpr uint16_t BVRMS = 0x43C3;
-constexpr uint16_t CIRMS = 0x43C4;
-constexpr uint16_t CVRMS = 0x43C5;
-constexpr uint16_t NIRMS = 0x43C6;
-
-constexpr uint16_t ISUM = 0x43C7;
-
-// Internal DSP Memory RAM registers
-constexpr uint16_t RUN = 0xE228;
-
-constexpr uint16_t AWATTHR = 0xE400;
-constexpr uint16_t BWATTHR = 0xE401;
-constexpr uint16_t CWATTHR = 0xE402;
-constexpr uint16_t AFWATTHR = 0xE403;
-constexpr uint16_t BFWATTHR = 0xE404;
-constexpr uint16_t CFWATTHR = 0xE405;
-constexpr uint16_t AFVARHR = 0xE409;
-constexpr uint16_t BFVARHR = 0xE40A;
-constexpr uint16_t CFVARHR = 0xE40B;
-
-constexpr uint16_t AVAHR = 0xE40C;
-constexpr uint16_t BVAHR = 0xE40D;
-constexpr uint16_t CVAHR = 0xE40E;
-
-constexpr uint16_t IPEAK = 0xE500;
-constexpr uint16_t VPEAK = 0xE501;
-
-constexpr uint16_t STATUS0 = 0xE502;
-constexpr uint16_t STATUS1 = 0xE503;
-
-constexpr uint16_t AIMAV = 0xE504;
-constexpr uint16_t BIMAV = 0xE505;
-constexpr uint16_t CIMAV = 0xE506;
-
-constexpr uint16_t OILVL = 0xE507;
-constexpr uint16_t OVLVL = 0xE508;
-constexpr uint16_t SAGLVL = 0xE509;
-constexpr uint16_t MASK0 = 0xE50A;
-constexpr uint16_t MASK1 = 0xE50B;
-
-constexpr uint16_t IAWV = 0xE50C;
-constexpr uint16_t IBWV = 0xE50D;
-constexpr uint16_t ICWV = 0xE50E;
-constexpr uint16_t INWV = 0xE50F;
-constexpr uint16_t VAWV = 0xE510;
-constexpr uint16_t VBWV = 0xE511;
-constexpr uint16_t VCWV = 0xE512;
-
-constexpr uint16_t AWATT = 0xE513;
-constexpr uint16_t BWATT = 0xE514;
-constexpr uint16_t CWATT = 0xE515;
-
-constexpr uint16_t AFVAR = 0xE516;
-constexpr uint16_t BFVAR = 0xE517;
-constexpr uint16_t CFVAR = 0xE518;
-
-constexpr uint16_t AVA = 0xE519;
-constexpr uint16_t BVA = 0xE51A;
-constexpr uint16_t CVA = 0xE51B;
-
-constexpr uint16_t CHECKSUM = 0xE51F;
-constexpr uint16_t VNOM = 0xE520;
-constexpr uint16_t LAST_RWDATA_24BIT = 0xE5FF;
-constexpr uint16_t PHSTATUS = 0xE600;
-constexpr uint16_t ANGLE0 = 0xE601;
-constexpr uint16_t ANGLE1 = 0xE602;
-constexpr uint16_t ANGLE2 = 0xE603;
-constexpr uint16_t PHNOLOAD = 0xE608;
-constexpr uint16_t LINECYC = 0xE60C;
-constexpr uint16_t ZXTOUT = 0xE60D;
-constexpr uint16_t COMPMODE = 0xE60E;
-constexpr uint16_t GAIN = 0xE60F;
-constexpr uint16_t CFMODE = 0xE610;
-constexpr uint16_t CF1DEN = 0xE611;
-constexpr uint16_t CF2DEN = 0xE612;
-constexpr uint16_t CF3DEN = 0xE613;
-constexpr uint16_t APHCAL = 0xE614;
-constexpr uint16_t BPHCAL = 0xE615;
-constexpr uint16_t CPHCAL = 0xE616;
-constexpr uint16_t PHSIGN = 0xE617;
-constexpr uint16_t CONFIG = 0xE618;
-constexpr uint16_t MMODE = 0xE700;
-constexpr uint16_t ACCMODE = 0xE701;
-constexpr uint16_t LCYCMODE = 0xE702;
-constexpr uint16_t PEAKCYC = 0xE703;
-constexpr uint16_t SAGCYC = 0xE704;
-constexpr uint16_t CFCYC = 0xE705;
-constexpr uint16_t HSDC_CFG = 0xE706;
-constexpr uint16_t VERSION = 0xE707;
-constexpr uint16_t DSPWP_SET = 0xE7E3;
-constexpr uint16_t LAST_RWDATA_8BIT = 0xE7FD;
-constexpr uint16_t DSPWP_SEL = 0xE7FE;
-constexpr uint16_t FVRMS = 0xE880;
-constexpr uint16_t FIRMS = 0xE881;
-constexpr uint16_t FWATT = 0xE882;
-constexpr uint16_t FVAR = 0xE883;
-constexpr uint16_t FVA = 0xE884;
-constexpr uint16_t FPF = 0xE885;
-constexpr uint16_t VTHDN = 0xE886;
-constexpr uint16_t ITHDN = 0xE887;
-constexpr uint16_t HXVRMS = 0xE888;
-constexpr uint16_t HXIRMS = 0xE889;
-constexpr uint16_t HXWATT = 0xE88A;
-constexpr uint16_t HXVAR = 0xE88B;
-constexpr uint16_t HXVA = 0xE88C;
-constexpr uint16_t HXPF = 0xE88D;
-constexpr uint16_t HXVHD = 0xE88E;
-constexpr uint16_t HXIHD = 0xE88F;
-constexpr uint16_t HYVRMS = 0xE890;
-constexpr uint16_t HYIRMS = 0xE891;
-constexpr uint16_t HYWATT = 0xE892;
-constexpr uint16_t HYVAR = 0xE893;
-constexpr uint16_t HYVA = 0xE894;
-constexpr uint16_t HYPF = 0xE895;
-constexpr uint16_t HYVHD = 0xE896;
-constexpr uint16_t HYIHD = 0xE897;
-constexpr uint16_t HZVRMS = 0xE898;
-constexpr uint16_t HZIRMS = 0xE899;
-constexpr uint16_t HZWATT = 0xE89A;
-constexpr uint16_t HZVAR = 0xE89B;
-constexpr uint16_t HZVA = 0xE89C;
-constexpr uint16_t HZPF = 0xE89D;
-constexpr uint16_t HZVHD = 0xE89E;
-constexpr uint16_t HZIHD = 0xE89F;
-constexpr uint16_t HCONFIG = 0xE900;
-constexpr uint16_t APF = 0xE902;
-constexpr uint16_t BPF = 0xE903;
-constexpr uint16_t CPF = 0xE904;
-constexpr uint16_t APERIOD = 0xE905;
-constexpr uint16_t BPERIOD = 0xE906;
-constexpr uint16_t CPERIOD = 0xE907;
-constexpr uint16_t APNOLOAD = 0xE908;
-constexpr uint16_t VARNOLOAD = 0xE909;
-constexpr uint16_t VANOLOAD = 0xE90A;
-constexpr uint16_t LAST_ADD = 0xE9FE;
-constexpr uint16_t LAST_RWDATA_16BIT = 0xE9FF;
-constexpr uint16_t CONFIG3 = 0xEA00;
-constexpr uint16_t LAST_OP = 0xEA01;
-constexpr uint16_t WTHR = 0xEA02;
-constexpr uint16_t VARTHR = 0xEA03;
-constexpr uint16_t VATHR = 0xEA04;
-
-constexpr uint16_t HX_REG = 0xEA08;
-constexpr uint16_t HY_REG = 0xEA09;
-constexpr uint16_t HZ_REG = 0xEA0A;
-constexpr uint16_t LPOILVL = 0xEC00;
-constexpr uint16_t CONFIG2 = 0xEC01;
-
-// STATUS1 Register Bits
-constexpr uint32_t STATUS1_RSTDONE = (1 << 15);
-
-// CONFIG Register Bits
-constexpr uint16_t CONFIG_SWRST = (1 << 7);
-
-// CONFIG2 Register Bits
-constexpr uint8_t CONFIG2_I2C_LOCK = (1 << 1);
-
-// COMPMODE Register Bits
-constexpr uint16_t COMPMODE_DEFAULT = 0x01FF;
-constexpr uint16_t COMPMODE_SELFREQ = (1 << 14);
-
-// RUN Register Bits
-constexpr uint16_t RUN_ENABLE = (1 << 0);
-
-// DSPWP_SET Register Bits
-constexpr uint8_t DSPWP_SET_RO = (1 << 7);
-
-// DSPWP_SEL Register Bits
-constexpr uint8_t DSPWP_SEL_SET = 0xAD;
-
-}  // namespace ade7880
-}  // namespace esphome

esphome/components/ade7880/sensor.py

@@ -1,290 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor, i2c
-from esphome import pins
-from esphome.const import (
-    CONF_ACTIVE_POWER,
-    CONF_APPARENT_POWER,
-    CONF_CALIBRATION,
-    CONF_CURRENT,
-    CONF_FORWARD_ACTIVE_ENERGY,
-    CONF_FREQUENCY,
-    CONF_ID,
-    CONF_NAME,
-    CONF_PHASE_A,
-    CONF_PHASE_ANGLE,
-    CONF_PHASE_B,
-    CONF_PHASE_C,
-    CONF_POWER_FACTOR,
-    CONF_RESET_PIN,
-    CONF_REVERSE_ACTIVE_ENERGY,
-    CONF_VOLTAGE,
-    DEVICE_CLASS_APPARENT_POWER,
-    DEVICE_CLASS_CURRENT,
-    DEVICE_CLASS_ENERGY,
-    DEVICE_CLASS_POWER,
-    DEVICE_CLASS_POWER_FACTOR,
-    DEVICE_CLASS_VOLTAGE,
-    STATE_CLASS_MEASUREMENT,
-    STATE_CLASS_TOTAL_INCREASING,
-    UNIT_AMPERE,
-    UNIT_PERCENT,
-    UNIT_VOLT,
-    UNIT_VOLT_AMPS,
-    UNIT_VOLT_AMPS_REACTIVE_HOURS,
-    UNIT_WATT,
-    UNIT_WATT_HOURS,
-)
-
-DEPENDENCIES = ["i2c"]
-
-ade7880_ns = cg.esphome_ns.namespace("ade7880")
-ADE7880 = ade7880_ns.class_("ADE7880", cg.PollingComponent, i2c.I2CDevice)
-NeutralChannel = ade7880_ns.struct("NeutralChannel")
-PowerChannel = ade7880_ns.struct("PowerChannel")
-
-CONF_CURRENT_GAIN = "current_gain"
-CONF_IRQ0_PIN = "irq0_pin"
-CONF_IRQ1_PIN = "irq1_pin"
-CONF_POWER_GAIN = "power_gain"
-CONF_VOLTAGE_GAIN = "voltage_gain"
-
-CONF_NEUTRAL = "neutral"
-
-NEUTRAL_CHANNEL_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(NeutralChannel),
-        cv.Optional(CONF_NAME): cv.string_strict,
-        cv.Required(CONF_CURRENT): cv.maybe_simple_value(
-            sensor.sensor_schema(
-                unit_of_measurement=UNIT_AMPERE,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_CURRENT,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            key=CONF_NAME,
-        ),
-        cv.Required(CONF_CALIBRATION): cv.Schema(
-            {
-                cv.Required(CONF_CURRENT_GAIN): cv.int_,
-            },
-        ),
-    }
-)
-
-POWER_CHANNEL_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(PowerChannel),
-        cv.Optional(CONF_NAME): cv.string_strict,
-        cv.Optional(CONF_VOLTAGE): cv.maybe_simple_value(
-            sensor.sensor_schema(
-                unit_of_measurement=UNIT_VOLT,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_VOLTAGE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            key=CONF_NAME,
-        ),
-        cv.Optional(CONF_CURRENT): cv.maybe_simple_value(
-            sensor.sensor_schema(
-                unit_of_measurement=UNIT_AMPERE,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_CURRENT,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            key=CONF_NAME,
-        ),
-        cv.Optional(CONF_ACTIVE_POWER): cv.maybe_simple_value(
-            sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_POWER,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            key=CONF_NAME,
-        ),
-        cv.Optional(CONF_APPARENT_POWER): cv.maybe_simple_value(
-            sensor.sensor_schema(
-                unit_of_measurement=UNIT_VOLT_AMPS,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_APPARENT_POWER,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            key=CONF_NAME,
-        ),
-        cv.Optional(CONF_POWER_FACTOR): cv.maybe_simple_value(
-            sensor.sensor_schema(
-                unit_of_measurement=UNIT_PERCENT,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_POWER_FACTOR,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            key=CONF_NAME,
-        ),
-        cv.Optional(CONF_FORWARD_ACTIVE_ENERGY): cv.maybe_simple_value(
-            sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT_HOURS,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_ENERGY,
-                state_class=STATE_CLASS_TOTAL_INCREASING,
-            ),
-            key=CONF_NAME,
-        ),
-        cv.Optional(CONF_REVERSE_ACTIVE_ENERGY): cv.maybe_simple_value(
-            sensor.sensor_schema(
-                unit_of_measurement=UNIT_VOLT_AMPS_REACTIVE_HOURS,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_ENERGY,
-                state_class=STATE_CLASS_TOTAL_INCREASING,
-            ),
-            key=CONF_NAME,
-        ),
-        cv.Required(CONF_CALIBRATION): cv.Schema(
-            {
-                cv.Required(CONF_CURRENT_GAIN): cv.int_,
-                cv.Required(CONF_VOLTAGE_GAIN): cv.int_,
-                cv.Required(CONF_POWER_GAIN): cv.int_,
-                cv.Required(CONF_PHASE_ANGLE): cv.int_,
-            },
-        ),
-    }
-)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(ADE7880),
-            cv.Optional(CONF_FREQUENCY, default="50Hz"): cv.All(
-                cv.frequency, cv.Range(min=45.0, max=66.0)
-            ),
-            cv.Optional(CONF_IRQ0_PIN): pins.internal_gpio_input_pin_schema,
-            cv.Required(CONF_IRQ1_PIN): pins.internal_gpio_input_pin_schema,
-            cv.Optional(CONF_RESET_PIN): pins.internal_gpio_output_pin_schema,
-            cv.Optional(CONF_PHASE_A): POWER_CHANNEL_SCHEMA,
-            cv.Optional(CONF_PHASE_B): POWER_CHANNEL_SCHEMA,
-            cv.Optional(CONF_PHASE_C): POWER_CHANNEL_SCHEMA,
-            cv.Optional(CONF_NEUTRAL): NEUTRAL_CHANNEL_SCHEMA,
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(i2c.i2c_device_schema(0x38))
-)
-
-
-async def neutral_channel(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-
-    current = config[CONF_CURRENT]
-    sens = await sensor.new_sensor(current)
-    cg.add(var.set_current(sens))
-
-    cg.add(
-        var.set_current_gain_calibration(config[CONF_CALIBRATION][CONF_CURRENT_GAIN])
-    )
-
-    return var
-
-
-async def power_channel(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-
-    for sensor_type in [
-        CONF_CURRENT,
-        CONF_VOLTAGE,
-        CONF_ACTIVE_POWER,
-        CONF_APPARENT_POWER,
-        CONF_POWER_FACTOR,
-        CONF_FORWARD_ACTIVE_ENERGY,
-        CONF_REVERSE_ACTIVE_ENERGY,
-    ]:
-        if conf := config.get(sensor_type):
-            sens = await sensor.new_sensor(conf)
-            cg.add(getattr(var, f"set_{sensor_type}")(sens))
-
-    for calib_type in [
-        CONF_CURRENT_GAIN,
-        CONF_VOLTAGE_GAIN,
-        CONF_POWER_GAIN,
-        CONF_PHASE_ANGLE,
-    ]:
-        cg.add(
-            getattr(var, f"set_{calib_type}_calibration")(
-                config[CONF_CALIBRATION][calib_type]
-            )
-        )
-
-    return var
-
-
-def final_validate(config):
-    for channel in [CONF_PHASE_A, CONF_PHASE_B, CONF_PHASE_C]:
-        if channel := config.get(channel):
-            channel_name = channel.get(CONF_NAME)
-
-            for sensor_type in [
-                CONF_CURRENT,
-                CONF_VOLTAGE,
-                CONF_ACTIVE_POWER,
-                CONF_APPARENT_POWER,
-                CONF_POWER_FACTOR,
-                CONF_FORWARD_ACTIVE_ENERGY,
-                CONF_REVERSE_ACTIVE_ENERGY,
-            ]:
-                if conf := channel.get(sensor_type):
-                    sensor_name = conf.get(CONF_NAME)
-                    if (
-                        sensor_name
-                        and channel_name
-                        and not sensor_name.startswith(channel_name)
-                    ):
-                        conf[CONF_NAME] = f"{channel_name} {sensor_name}"
-
-    if channel := config.get(CONF_NEUTRAL):
-        channel_name = channel.get(CONF_NAME)
-        if conf := channel.get(CONF_CURRENT):
-            sensor_name = conf.get(CONF_NAME)
-            if (
-                sensor_name
-                and channel_name
-                and not sensor_name.startswith(channel_name)
-            ):
-                conf[CONF_NAME] = f"{channel_name} {sensor_name}"
-
-
-FINAL_VALIDATE_SCHEMA = final_validate
-
-
-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 irq0_pin := config.get(CONF_IRQ0_PIN):
-        pin = await cg.gpio_pin_expression(irq0_pin)
-        cg.add(var.set_irq0_pin(pin))
-
-    pin = await cg.gpio_pin_expression(config[CONF_IRQ1_PIN])
-    cg.add(var.set_irq1_pin(pin))
-
-    if reset_pin := config.get(CONF_RESET_PIN):
-        pin = await cg.gpio_pin_expression(reset_pin)
-        cg.add(var.set_reset_pin(pin))
-
-    if frequency := config.get(CONF_FREQUENCY):
-        cg.add(var.set_frequency(frequency))
-
-    if channel := config.get(CONF_PHASE_A):
-        chan = await power_channel(channel)
-        cg.add(var.set_channel_a(chan))
-
-    if channel := config.get(CONF_PHASE_B):
-        chan = await power_channel(channel)
-        cg.add(var.set_channel_b(chan))
-
-    if channel := config.get(CONF_PHASE_C):
-        chan = await power_channel(channel)
-        cg.add(var.set_channel_c(chan))
-
-    if channel := config.get(CONF_NEUTRAL):
-        chan = await neutral_channel(channel)
-        cg.add(var.set_channel_n(chan))

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,201 +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"
-CONF_USE_ACCUMULATED_ENERGY_REGISTERS = "use_accumulated_energy_registers"
-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
-        ),
-        cv.Optional(CONF_USE_ACCUMULATED_ENERGY_REGISTERS, default=False): cv.boolean,
-    }
-).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)))
-    cg.add(
-        var.set_use_acc_energy_regs(config.get(CONF_USE_ACCUMULATED_ENERGY_REGISTERS))
-    )
-
-    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,148 +0,0 @@
-#include "ade7953_base.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace ade7953_base {
-
-static const char *const TAG = "ade7953";
-
-static const float ADE_POWER_FACTOR = 154.0f;
-static const float ADE_WATTSEC_POWER_FACTOR = ADE_POWER_FACTOR * ADE_POWER_FACTOR / 3600;
-
-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->last_update_ = millis();
-    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, "  USE_ACC_ENERGY_REGS: %d", this->use_acc_energy_regs_);
-  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;
-  uint16_t reg;
-
-  // 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));
-
-  float pf = ADE_POWER_FACTOR;
-  if (this->use_acc_energy_regs_) {
-    const uint32_t now = millis();
-    const auto diff = now - this->last_update_;
-    this->last_update_ = now;
-    // prevent DIV/0
-    pf = ADE_WATTSEC_POWER_FACTOR * (diff < 10 ? 10 : diff) / 1000;
-    ESP_LOGVV(TAG, "ADE7953::update() diff=%d pf=%f", diff, pf);
-  }
-
-  // Apparent power
-  reg = this->use_acc_energy_regs_ ? 0x0322 : 0x0310;
-  err = this->ade_read_32(reg, &val);
-  ADE_PUBLISH(apparent_power_a, (int32_t) val, pf);
-  err = this->ade_read_32(reg + 1, &val);
-  ADE_PUBLISH(apparent_power_b, (int32_t) val, pf);
-
-  // Active power
-  reg = this->use_acc_energy_regs_ ? 0x031E : 0x0312;
-  err = this->ade_read_32(reg, &val);
-  ADE_PUBLISH(active_power_a, (int32_t) val, pf);
-  err = this->ade_read_32(reg + 1, &val);
-  ADE_PUBLISH(active_power_b, (int32_t) val, pf);
-
-  // Reactive power
-  reg = this->use_acc_energy_regs_ ? 0x0320 : 0x0314;
-  err = this->ade_read_32(reg, &val);
-  ADE_PUBLISH(reactive_power_a, (int32_t) val, pf);
-  err = this->ade_read_32(reg + 1, &val);
-  ADE_PUBLISH(reactive_power_b, (int32_t) val, pf);
-
-  // 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,125 +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_use_acc_energy_regs(bool use_acc_energy_regs) { use_acc_energy_regs_ = use_acc_energy_regs; }
-
-  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_;
-  bool use_acc_energy_regs_{false};
-  uint32_t last_update_;
-
-  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) {
-  uint8_t data[3];
-  data[0] = reg >> 8;
-  data[1] = reg >> 0;
-  data[2] = value;
-  return this->write(data, 3) != i2c::ERROR_OK;
-}
-bool AdE7953I2c::ade_write_16(uint16_t reg, uint16_t value) {
-  uint8_t data[4];
-  data[0] = reg >> 8;
-  data[1] = reg >> 0;
-  data[2] = value >> 8;
-  data[3] = value >> 0;
-  return this->write(data, 4) != i2c::ERROR_OK;
-}
-bool AdE7953I2c::ade_write_32(uint16_t reg, uint32_t value) {
-  uint8_t data[6];
-  data[0] = reg >> 8;
-  data[1] = reg >> 0;
-  data[2] = value >> 24;
-  data[3] = value >> 16;
-  data[4] = value >> 8;
-  data[5] = value >> 0;
-  return this->write(data, 6) != 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/ads1118/__init__.py

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

esphome/components/ads1118/ads1118.cpp

@@ -1,126 +0,0 @@
-#include "ads1118.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace ads1118 {
-
-static const char *const TAG = "ads1118";
-static const uint8_t ADS1118_DATA_RATE_860_SPS = 0b111;
-
-void ADS1118::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up ads1118");
-  this->spi_setup();
-
-  this->config_ = 0;
-  // Setup multiplexer
-  //        0bx000xxxxxxxxxxxx
-  this->config_ |= ADS1118_MULTIPLEXER_P0_NG << 12;
-
-  // Setup Gain
-  //        0bxxxx000xxxxxxxxx
-  this->config_ |= ADS1118_GAIN_6P144 << 9;
-
-  // Set singleshot mode
-  //        0bxxxxxxx1xxxxxxxx
-  this->config_ |= 0b0000000100000000;
-
-  // Set data rate - 860 samples per second (we're in singleshot mode)
-  //        0bxxxxxxxx100xxxxx
-  this->config_ |= ADS1118_DATA_RATE_860_SPS << 5;
-
-  // Set temperature sensor mode - ADC
-  //        0bxxxxxxxxxxx0xxxx
-  this->config_ |= 0b0000000000000000;
-
-  // Set DOUT pull up - enable
-  //        0bxxxxxxxxxxxx0xxx
-  this->config_ |= 0b0000000000001000;
-
-  // NOP - must be 01
-  //        0bxxxxxxxxxxxxx01x
-  this->config_ |= 0b0000000000000010;
-
-  // Not used - can be 0 or 1, lets be positive
-  //        0bxxxxxxxxxxxxxxx1
-  this->config_ |= 0b0000000000000001;
-}
-
-void ADS1118::dump_config() {
-  ESP_LOGCONFIG(TAG, "ADS1118:");
-  LOG_PIN("  CS Pin:", this->cs_);
-}
-
-float ADS1118::request_measurement(ADS1118Multiplexer multiplexer, ADS1118Gain gain, bool temperature_mode) {
-  uint16_t temp_config = this->config_;
-  // Multiplexer
-  //        0bxBBBxxxxxxxxxxxx
-  temp_config &= 0b1000111111111111;
-  temp_config |= (multiplexer & 0b111) << 12;
-
-  // Gain
-  //        0bxxxxBBBxxxxxxxxx
-  temp_config &= 0b1111000111111111;
-  temp_config |= (gain & 0b111) << 9;
-
-  if (temperature_mode) {
-    // Set temperature sensor mode
-    //        0bxxxxxxxxxxx1xxxx
-    temp_config |= 0b0000000000010000;
-  } else {
-    // Set ADC mode
-    //        0bxxxxxxxxxxx0xxxx
-    temp_config &= 0b1111111111101111;
-  }
-
-  // Start conversion
-  temp_config |= 0b1000000000000000;
-
-  this->enable();
-  this->write_byte16(temp_config);
-  this->disable();
-
-  // about 1.2 ms with 860 samples per second
-  delay(2);
-
-  this->enable();
-  uint8_t adc_first_byte = this->read_byte();
-  uint8_t adc_second_byte = this->read_byte();
-  this->disable();
-  uint16_t raw_conversion = encode_uint16(adc_first_byte, adc_second_byte);
-
-  auto signed_conversion = static_cast<int16_t>(raw_conversion);
-
-  if (temperature_mode) {
-    return (signed_conversion >> 2) * 0.03125f;
-  } else {
-    float millivolts;
-    float divider = 32768.0f;
-    switch (gain) {
-      case ADS1118_GAIN_6P144:
-        millivolts = (signed_conversion * 6144) / divider;
-        break;
-      case ADS1118_GAIN_4P096:
-        millivolts = (signed_conversion * 4096) / divider;
-        break;
-      case ADS1118_GAIN_2P048:
-        millivolts = (signed_conversion * 2048) / divider;
-        break;
-      case ADS1118_GAIN_1P024:
-        millivolts = (signed_conversion * 1024) / divider;
-        break;
-      case ADS1118_GAIN_0P512:
-        millivolts = (signed_conversion * 512) / divider;
-        break;
-      case ADS1118_GAIN_0P256:
-        millivolts = (signed_conversion * 256) / divider;
-        break;
-      default:
-        millivolts = NAN;
-    }
-
-    return millivolts / 1e3f;
-  }
-}
-
-}  // namespace ads1118
-}  // namespace esphome

esphome/components/ads1118/ads1118.h

@@ -1,46 +0,0 @@
-#pragma once
-
-#include "esphome/components/spi/spi.h"
-#include "esphome/core/component.h"
-#include "esphome/core/hal.h"
-
-namespace esphome {
-namespace ads1118 {
-
-enum ADS1118Multiplexer {
-  ADS1118_MULTIPLEXER_P0_N1 = 0b000,
-  ADS1118_MULTIPLEXER_P0_N3 = 0b001,
-  ADS1118_MULTIPLEXER_P1_N3 = 0b010,
-  ADS1118_MULTIPLEXER_P2_N3 = 0b011,
-  ADS1118_MULTIPLEXER_P0_NG = 0b100,
-  ADS1118_MULTIPLEXER_P1_NG = 0b101,
-  ADS1118_MULTIPLEXER_P2_NG = 0b110,
-  ADS1118_MULTIPLEXER_P3_NG = 0b111,
-};
-
-enum ADS1118Gain {
-  ADS1118_GAIN_6P144 = 0b000,
-  ADS1118_GAIN_4P096 = 0b001,
-  ADS1118_GAIN_2P048 = 0b010,
-  ADS1118_GAIN_1P024 = 0b011,
-  ADS1118_GAIN_0P512 = 0b100,
-  ADS1118_GAIN_0P256 = 0b101,
-};
-
-class ADS1118 : public Component,
-                public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW, spi::CLOCK_PHASE_TRAILING,
-                                      spi::DATA_RATE_1MHZ> {
- public:
-  ADS1118() = default;
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::DATA; }
-  /// Helper method to request a measurement from a sensor.
-  float request_measurement(ADS1118Multiplexer multiplexer, ADS1118Gain gain, bool temperature_mode);
-
- protected:
-  uint16_t config_{0};
-};
-
-}  // namespace ads1118
-}  // namespace esphome

esphome/components/ads1118/sensor/__init__.py

@@ -1,97 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor, voltage_sampler
-from esphome.const import (
-    CONF_GAIN,
-    CONF_MULTIPLEXER,
-    DEVICE_CLASS_VOLTAGE,
-    DEVICE_CLASS_TEMPERATURE,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_CELSIUS,
-    UNIT_VOLT,
-    CONF_TYPE,
-)
-from .. import ads1118_ns, ADS1118, CONF_ADS1118_ID
-
-AUTO_LOAD = ["voltage_sampler"]
-DEPENDENCIES = ["ads1118"]
-
-ADS1118Multiplexer = ads1118_ns.enum("ADS1118Multiplexer")
-MUX = {
-    "A0_A1": ADS1118Multiplexer.ADS1118_MULTIPLEXER_P0_N1,
-    "A0_A3": ADS1118Multiplexer.ADS1118_MULTIPLEXER_P0_N3,
-    "A1_A3": ADS1118Multiplexer.ADS1118_MULTIPLEXER_P1_N3,
-    "A2_A3": ADS1118Multiplexer.ADS1118_MULTIPLEXER_P2_N3,
-    "A0_GND": ADS1118Multiplexer.ADS1118_MULTIPLEXER_P0_NG,
-    "A1_GND": ADS1118Multiplexer.ADS1118_MULTIPLEXER_P1_NG,
-    "A2_GND": ADS1118Multiplexer.ADS1118_MULTIPLEXER_P2_NG,
-    "A3_GND": ADS1118Multiplexer.ADS1118_MULTIPLEXER_P3_NG,
-}
-
-ADS1118Gain = ads1118_ns.enum("ADS1118Gain")
-GAIN = {
-    "6.144": ADS1118Gain.ADS1118_GAIN_6P144,
-    "4.096": ADS1118Gain.ADS1118_GAIN_4P096,
-    "2.048": ADS1118Gain.ADS1118_GAIN_2P048,
-    "1.024": ADS1118Gain.ADS1118_GAIN_1P024,
-    "0.512": ADS1118Gain.ADS1118_GAIN_0P512,
-    "0.256": ADS1118Gain.ADS1118_GAIN_0P256,
-}
-
-
-ADS1118Sensor = ads1118_ns.class_(
-    "ADS1118Sensor",
-    cg.PollingComponent,
-    sensor.Sensor,
-    voltage_sampler.VoltageSampler,
-    cg.Parented.template(ADS1118),
-)
-
-TYPE_ADC = "adc"
-TYPE_TEMPERATURE = "temperature"
-
-CONFIG_SCHEMA = cv.typed_schema(
-    {
-        TYPE_ADC: sensor.sensor_schema(
-            ADS1118Sensor,
-            unit_of_measurement=UNIT_VOLT,
-            accuracy_decimals=3,
-            device_class=DEVICE_CLASS_VOLTAGE,
-            state_class=STATE_CLASS_MEASUREMENT,
-        )
-        .extend(
-            {
-                cv.GenerateID(CONF_ADS1118_ID): cv.use_id(ADS1118),
-                cv.Required(CONF_MULTIPLEXER): cv.enum(MUX, upper=True, space="_"),
-                cv.Required(CONF_GAIN): cv.enum(GAIN, string=True),
-            }
-        )
-        .extend(cv.polling_component_schema("60s")),
-        TYPE_TEMPERATURE: sensor.sensor_schema(
-            ADS1118Sensor,
-            unit_of_measurement=UNIT_CELSIUS,
-            accuracy_decimals=2,
-            device_class=DEVICE_CLASS_TEMPERATURE,
-            state_class=STATE_CLASS_MEASUREMENT,
-        )
-        .extend(
-            {
-                cv.GenerateID(CONF_ADS1118_ID): cv.use_id(ADS1118),
-            }
-        )
-        .extend(cv.polling_component_schema("60s")),
-    },
-    default_type=TYPE_ADC,
-)
-
-
-async def to_code(config):
-    var = await sensor.new_sensor(config)
-    await cg.register_component(var, config)
-    await cg.register_parented(var, config[CONF_ADS1118_ID])
-
-    if config[CONF_TYPE] == TYPE_ADC:
-        cg.add(var.set_multiplexer(config[CONF_MULTIPLEXER]))
-        cg.add(var.set_gain(config[CONF_GAIN]))
-    if config[CONF_TYPE] == TYPE_TEMPERATURE:
-        cg.add(var.set_temperature_mode(True))

esphome/components/ads1118/sensor/ads1118_sensor.cpp

@@ -1,29 +0,0 @@
-#include "ads1118_sensor.h"
-
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace ads1118 {
-
-static const char *const TAG = "ads1118.sensor";
-
-void ADS1118Sensor::dump_config() {
-  LOG_SENSOR("  ", "ADS1118 Sensor", this);
-  ESP_LOGCONFIG(TAG, "    Multiplexer: %u", this->multiplexer_);
-  ESP_LOGCONFIG(TAG, "    Gain: %u", this->gain_);
-}
-
-float ADS1118Sensor::sample() {
-  return this->parent_->request_measurement(this->multiplexer_, this->gain_, this->temperature_mode_);
-}
-
-void ADS1118Sensor::update() {
-  float v = this->sample();
-  if (!std::isnan(v)) {
-    ESP_LOGD(TAG, "'%s': Got Voltage=%fV", this->get_name().c_str(), v);
-    this->publish_state(v);
-  }
-}
-
-}  // namespace ads1118
-}  // namespace esphome

esphome/components/ads1118/sensor/ads1118_sensor.h

@@ -1,36 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/helpers.h"
-
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/voltage_sampler/voltage_sampler.h"
-
-#include "../ads1118.h"
-
-namespace esphome {
-namespace ads1118 {
-
-class ADS1118Sensor : public PollingComponent,
-                      public sensor::Sensor,
-                      public voltage_sampler::VoltageSampler,
-                      public Parented<ADS1118> {
- public:
-  void update() override;
-
-  void set_multiplexer(ADS1118Multiplexer multiplexer) { this->multiplexer_ = multiplexer; }
-  void set_gain(ADS1118Gain gain) { this->gain_ = gain; }
-  void set_temperature_mode(bool temp) { this->temperature_mode_ = temp; }
-
-  float sample() override;
-
-  void dump_config() override;
-
- protected:
-  ADS1118Multiplexer multiplexer_{ADS1118_MULTIPLEXER_P0_NG};
-  ADS1118Gain gain_{ADS1118_GAIN_6P144};
-  bool temperature_mode_;
-};
-
-}  // namespace ads1118
-}  // namespace esphome

esphome/components/ags10/__init__.py

@@ -1 +0,0 @@
-CODEOWNERS = ["@mak-42"]

esphome/components/ags10/ags10.cpp

@@ -1,212 +0,0 @@
-#include "ags10.h"
-
-namespace esphome {
-namespace ags10 {
-static const char *const TAG = "ags10";
-
-// Data acquisition.
-static const uint8_t REG_TVOC = 0x00;
-// Zero-point calibration.
-static const uint8_t REG_CALIBRATION = 0x01;
-// Read version.
-static const uint8_t REG_VERSION = 0x11;
-// Read current resistance.
-static const uint8_t REG_RESISTANCE = 0x20;
-// Modify target address.
-static const uint8_t REG_ADDRESS = 0x21;
-
-// Zero-point calibration with current resistance.
-static const uint16_t ZP_CURRENT = 0x0000;
-// Zero-point reset.
-static const uint16_t ZP_DEFAULT = 0xFFFF;
-
-void AGS10Component::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up ags10...");
-
-  auto version = this->read_version_();
-  if (version) {
-    ESP_LOGD(TAG, "AGS10 Sensor Version: 0x%02X", *version);
-    if (this->version_ != nullptr) {
-      this->version_->publish_state(*version);
-    }
-  } else {
-    ESP_LOGE(TAG, "AGS10 Sensor Version: unknown");
-  }
-
-  auto resistance = this->read_resistance_();
-  if (resistance) {
-    ESP_LOGD(TAG, "AGS10 Sensor Resistance: 0x%08X", *resistance);
-    if (this->resistance_ != nullptr) {
-      this->resistance_->publish_state(*resistance);
-    }
-  } else {
-    ESP_LOGE(TAG, "AGS10 Sensor Resistance: unknown");
-  }
-
-  ESP_LOGD(TAG, "Sensor initialized");
-}
-
-void AGS10Component::update() {
-  auto tvoc = this->read_tvoc_();
-  if (tvoc) {
-    this->tvoc_->publish_state(*tvoc);
-    this->status_clear_warning();
-  } else {
-    this->status_set_warning();
-  }
-}
-
-void AGS10Component::dump_config() {
-  ESP_LOGCONFIG(TAG, "AGS10:");
-  LOG_I2C_DEVICE(this);
-  switch (this->error_code_) {
-    case NONE:
-      break;
-    case COMMUNICATION_FAILED:
-      ESP_LOGE(TAG, "Communication with AGS10 failed!");
-      break;
-    case CRC_CHECK_FAILED:
-      ESP_LOGE(TAG, "The crc check failed");
-      break;
-    case ILLEGAL_STATUS:
-      ESP_LOGE(TAG, "AGS10 is not ready to return TVOC data or sensor in pre-heat stage.");
-      break;
-    case UNSUPPORTED_UNITS:
-      ESP_LOGE(TAG, "AGS10 returns TVOC data in unsupported units.");
-      break;
-    default:
-      ESP_LOGE(TAG, "Unknown error: %d", this->error_code_);
-      break;
-  }
-  LOG_UPDATE_INTERVAL(this);
-  LOG_SENSOR("  ", "TVOC Sensor", this->tvoc_);
-  LOG_SENSOR("  ", "Firmware Version Sensor", this->version_);
-  LOG_SENSOR("  ", "Resistance Sensor", this->resistance_);
-}
-
-/**
- * Sets new I2C address of AGS10.
- */
-bool AGS10Component::new_i2c_address(uint8_t newaddress) {
-  uint8_t rev_newaddress = ~newaddress;
-  std::array<uint8_t, 5> data{newaddress, rev_newaddress, newaddress, rev_newaddress, 0};
-  data[4] = calc_crc8_(data, 4);
-  if (!this->write_bytes(REG_ADDRESS, data)) {
-    this->error_code_ = COMMUNICATION_FAILED;
-    this->status_set_warning();
-    ESP_LOGE(TAG, "couldn't write the new I2C address 0x%02X", newaddress);
-    return false;
-  }
-  this->set_i2c_address(newaddress);
-  ESP_LOGW(TAG, "changed I2C address to 0x%02X", newaddress);
-  this->error_code_ = NONE;
-  this->status_clear_warning();
-  return true;
-}
-
-bool AGS10Component::set_zero_point_with_factory_defaults() { return this->set_zero_point_with(ZP_DEFAULT); }
-
-bool AGS10Component::set_zero_point_with_current_resistance() { return this->set_zero_point_with(ZP_CURRENT); }
-
-bool AGS10Component::set_zero_point_with(uint16_t value) {
-  std::array<uint8_t, 5> data{0x00, 0x0C, (uint8_t) ((value >> 8) & 0xFF), (uint8_t) (value & 0xFF), 0};
-  data[4] = calc_crc8_(data, 4);
-  if (!this->write_bytes(REG_CALIBRATION, data)) {
-    this->error_code_ = COMMUNICATION_FAILED;
-    this->status_set_warning();
-    ESP_LOGE(TAG, "unable to set zero-point calibration with 0x%02X", value);
-    return false;
-  }
-  if (value == ZP_CURRENT) {
-    ESP_LOGI(TAG, "zero-point calibration has been set with current resistance");
-  } else if (value == ZP_DEFAULT) {
-    ESP_LOGI(TAG, "zero-point calibration has been reset to the factory defaults");
-  } else {
-    ESP_LOGI(TAG, "zero-point calibration has been set with 0x%02X", value);
-  }
-  this->error_code_ = NONE;
-  this->status_clear_warning();
-  return true;
-}
-
-optional<uint32_t> AGS10Component::read_tvoc_() {
-  auto data = this->read_and_check_<5>(REG_TVOC);
-  if (!data) {
-    return nullopt;
-  }
-
-  auto res = *data;
-  auto status_byte = res[0];
-
-  int units = status_byte & 0x0e;
-  int status_bit = status_byte & 0x01;
-
-  if (status_bit != 0) {
-    this->error_code_ = ILLEGAL_STATUS;
-    ESP_LOGW(TAG, "Reading AGS10 data failed: illegal status (not ready or sensor in pre-heat stage)!");
-    return nullopt;
-  }
-
-  if (units != 0) {
-    this->error_code_ = UNSUPPORTED_UNITS;
-    ESP_LOGE(TAG, "Reading AGS10 data failed: unsupported units (%d)!", units);
-    return nullopt;
-  }
-
-  return encode_uint24(res[1], res[2], res[3]);
-}
-
-optional<uint8_t> AGS10Component::read_version_() {
-  auto data = this->read_and_check_<5>(REG_VERSION);
-  if (data) {
-    auto res = *data;
-    return res[3];
-  }
-  return nullopt;
-}
-
-optional<uint32_t> AGS10Component::read_resistance_() {
-  auto data = this->read_and_check_<5>(REG_RESISTANCE);
-  if (data) {
-    auto res = *data;
-    return encode_uint32(res[0], res[1], res[2], res[3]);
-  }
-  return nullopt;
-}
-
-template<size_t N> optional<std::array<uint8_t, N>> AGS10Component::read_and_check_(uint8_t a_register) {
-  auto data = this->read_bytes<N>(a_register);
-  if (!data.has_value()) {
-    this->error_code_ = COMMUNICATION_FAILED;
-    ESP_LOGE(TAG, "Reading AGS10 version failed!");
-    return optional<std::array<uint8_t, N>>();
-  }
-  auto len = N - 1;
-  auto res = *data;
-  auto crc_byte = res[len];
-
-  if (crc_byte != calc_crc8_(res, len)) {
-    this->error_code_ = CRC_CHECK_FAILED;
-    ESP_LOGE(TAG, "Reading AGS10 version failed: crc error!");
-    return optional<std::array<uint8_t, N>>();
-  }
-
-  return data;
-}
-
-template<size_t N> uint8_t AGS10Component::calc_crc8_(std::array<uint8_t, N> dat, uint8_t num) {
-  uint8_t i, byte1, crc = 0xFF;
-  for (byte1 = 0; byte1 < num; byte1++) {
-    crc ^= (dat[byte1]);
-    for (i = 0; i < 8; i++) {
-      if (crc & 0x80) {
-        crc = (crc << 1) ^ 0x31;
-      } else {
-        crc = (crc << 1);
-      }
-    }
-  }
-  return crc;
-}
-}  // namespace ags10
-}  // namespace esphome

esphome/components/ags10/ags10.h

@@ -1,152 +0,0 @@
-#pragma once
-
-#include "esphome/core/automation.h"
-#include "esphome/core/component.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/i2c/i2c.h"
-
-namespace esphome {
-namespace ags10 {
-
-class AGS10Component : public PollingComponent, public i2c::I2CDevice {
- public:
-  /**
-   * Sets TVOC sensor.
-   */
-  void set_tvoc(sensor::Sensor *tvoc) { this->tvoc_ = tvoc; }
-
-  /**
-   * Sets version info sensor.
-   */
-  void set_version(sensor::Sensor *version) { this->version_ = version; }
-
-  /**
-   * Sets resistance info sensor.
-   */
-  void set_resistance(sensor::Sensor *resistance) { this->resistance_ = resistance; }
-
-  void setup() override;
-
-  void update() override;
-
-  void dump_config() override;
-
-  float get_setup_priority() const override { return setup_priority::DATA; }
-
-  /**
-   * Modifies target address of AGS10.
-   *
-   * New address is saved and takes effect immediately even after power-off.
-   */
-  bool new_i2c_address(uint8_t newaddress);
-
-  /**
-   * Sets zero-point with factory defaults.
-   */
-  bool set_zero_point_with_factory_defaults();
-
-  /**
-   * Sets zero-point with current sensor resistance.
-   */
-  bool set_zero_point_with_current_resistance();
-
-  /**
-   * Sets zero-point with the value.
-   */
-  bool set_zero_point_with(uint16_t value);
-
- protected:
-  /**
-   *  TVOC.
-   */
-  sensor::Sensor *tvoc_{nullptr};
-
-  /**
-   * Firmvare version.
-   */
-  sensor::Sensor *version_{nullptr};
-
-  /**
-   * Resistance.
-   */
-  sensor::Sensor *resistance_{nullptr};
-
-  /**
-   *  Last operation error code.
-   */
-  enum ErrorCode {
-    NONE = 0,
-    COMMUNICATION_FAILED,
-    CRC_CHECK_FAILED,
-    ILLEGAL_STATUS,
-    UNSUPPORTED_UNITS,
-  } error_code_{NONE};
-
-  /**
-   *  Reads and returns value of TVOC.
-   */
-  optional<uint32_t> read_tvoc_();
-
-  /**
-   *  Reads and returns a firmware version of AGS10.
-   */
-  optional<uint8_t> read_version_();
-
-  /**
-   * Reads and returns the resistance of AGS10.
-   */
-  optional<uint32_t> read_resistance_();
-
-  /**
-   * Read, checks and returns data from the sensor.
-   */
-  template<size_t N> optional<std::array<uint8_t, N>> read_and_check_(uint8_t a_register);
-
-  /**
-   * Calculates CRC8 value.
-   *
-   * CRC8 calculation, initial value: 0xFF, polynomial: 0x31 (x8+ x5+ x4+1)
-   *
-   * @param[in] dat the data buffer
-   * @param num number of bytes in the buffer
-   */
-  template<size_t N> uint8_t calc_crc8_(std::array<uint8_t, N> dat, uint8_t num);
-};
-
-template<typename... Ts> class AGS10NewI2cAddressAction : public Action<Ts...>, public Parented<AGS10Component> {
- public:
-  TEMPLATABLE_VALUE(uint8_t, new_address)
-
-  void play(Ts... x) override { this->parent_->new_i2c_address(this->new_address_.value(x...)); }
-};
-
-enum AGS10SetZeroPointActionMode {
-  // Zero-point reset.
-  FACTORY_DEFAULT,
-  // Zero-point calibration with current resistance.
-  CURRENT_VALUE,
-  // Zero-point calibration with custom resistance.
-  CUSTOM_VALUE,
-};
-
-template<typename... Ts> class AGS10SetZeroPointAction : public Action<Ts...>, public Parented<AGS10Component> {
- public:
-  TEMPLATABLE_VALUE(uint16_t, value)
-  TEMPLATABLE_VALUE(AGS10SetZeroPointActionMode, mode)
-
-  void play(Ts... x) override {
-    switch (this->mode_.value(x...)) {
-      case FACTORY_DEFAULT:
-        this->parent_->set_zero_point_with_factory_defaults();
-        break;
-      case CURRENT_VALUE:
-        this->parent_->set_zero_point_with_current_resistance();
-        break;
-      case CUSTOM_VALUE:
-        this->parent_->set_zero_point_with(this->value_.value(x...));
-        break;
-    }
-  }
-};
-}  // namespace ags10
-}  // namespace esphome

esphome/components/ags10/sensor.py

@@ -1,132 +0,0 @@
-import esphome.codegen as cg
-from esphome import automation
-import esphome.config_validation as cv
-from esphome.components import i2c, sensor
-from esphome.const import (
-    CONF_ID,
-    ICON_RADIATOR,
-    ICON_RESTART,
-    DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS_PARTS,
-    ENTITY_CATEGORY_DIAGNOSTIC,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_OHM,
-    UNIT_PARTS_PER_BILLION,
-    CONF_ADDRESS,
-    CONF_TVOC,
-    CONF_VERSION,
-    CONF_MODE,
-    CONF_VALUE,
-)
-
-CONF_RESISTANCE = "resistance"
-
-DEPENDENCIES = ["i2c"]
-
-ags10_ns = cg.esphome_ns.namespace("ags10")
-AGS10Component = ags10_ns.class_("AGS10Component", cg.PollingComponent, i2c.I2CDevice)
-
-# Actions
-AGS10NewI2cAddressAction = ags10_ns.class_(
-    "AGS10NewI2cAddressAction", automation.Action
-)
-AGS10SetZeroPointAction = ags10_ns.class_("AGS10SetZeroPointAction", automation.Action)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(AGS10Component),
-            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_VERSION): sensor.sensor_schema(
-                icon=ICON_RESTART,
-                entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
-            ),
-            cv.Optional(CONF_RESISTANCE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_OHM,
-                icon=ICON_RESTART,
-                accuracy_decimals=0,
-                state_class=STATE_CLASS_MEASUREMENT,
-                entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(i2c.i2c_device_schema(0x1A))
-)
-
-FINAL_VALIDATE_SCHEMA = i2c.final_validate_device_schema("ags10", max_frequency="15khz")
-
-
-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)
-
-    sens = await sensor.new_sensor(config[CONF_TVOC])
-    cg.add(var.set_tvoc(sens))
-
-    if version_config := config.get(CONF_VERSION):
-        sens = await sensor.new_sensor(version_config)
-        cg.add(var.set_version(sens))
-
-    if resistance_config := config.get(CONF_RESISTANCE):
-        sens = await sensor.new_sensor(resistance_config)
-        cg.add(var.set_resistance(sens))
-
-
-AGS10_NEW_I2C_ADDRESS_SCHEMA = cv.maybe_simple_value(
-    {
-        cv.GenerateID(): cv.use_id(AGS10Component),
-        cv.Required(CONF_ADDRESS): cv.templatable(cv.i2c_address),
-    },
-    key=CONF_ADDRESS,
-)
-
-
-@automation.register_action(
-    "ags10.new_i2c_address",
-    AGS10NewI2cAddressAction,
-    AGS10_NEW_I2C_ADDRESS_SCHEMA,
-)
-async def ags10newi2caddress_to_code(config, action_id, template_arg, args):
-    var = cg.new_Pvariable(action_id, template_arg)
-    await cg.register_parented(var, config[CONF_ID])
-    address = await cg.templatable(config[CONF_ADDRESS], args, int)
-    cg.add(var.set_new_address(address))
-    return var
-
-
-AGS10SetZeroPointActionMode = ags10_ns.enum("AGS10SetZeroPointActionMode")
-AGS10_SET_ZERO_POINT_ACTION_MODE = {
-    "FACTORY_DEFAULT": AGS10SetZeroPointActionMode.FACTORY_DEFAULT,
-    "CURRENT_VALUE": AGS10SetZeroPointActionMode.CURRENT_VALUE,
-    "CUSTOM_VALUE": AGS10SetZeroPointActionMode.CUSTOM_VALUE,
-}
-
-AGS10_SET_ZERO_POINT_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.use_id(AGS10Component),
-        cv.Required(CONF_MODE): cv.enum(AGS10_SET_ZERO_POINT_ACTION_MODE, upper=True),
-        cv.Optional(CONF_VALUE, default=0xFFFF): cv.templatable(cv.uint16_t),
-    },
-)
-
-
-@automation.register_action(
-    "ags10.set_zero_point",
-    AGS10SetZeroPointAction,
-    AGS10_SET_ZERO_POINT_SCHEMA,
-)
-async def ags10setzeropoint_to_code(config, action_id, template_arg, args):
-    var = cg.new_Pvariable(action_id, template_arg)
-    await cg.register_parented(var, config[CONF_ID])
-    mode = await cg.templatable(config.get(CONF_MODE), args, enumerate)
-    cg.add(var.set_mode(mode))
-    value = await cg.templatable(config[CONF_VALUE], args, int)
-    cg.add(var.set_value(value))
-    return var

esphome/components/aht10/aht10.cpp

@@ -15,76 +15,53 @@
 #include "aht10.h"
 #include "esphome/core/log.h"
 #include "esphome/core/hal.h"
-#include <cinttypes>
 
 namespace esphome {
 namespace aht10 {
 
 static const char *const TAG = "aht10";
-static const uint8_t AHT10_INITIALIZE_CMD[] = {0xE1, 0x08, 0x00};
-static const uint8_t AHT20_INITIALIZE_CMD[] = {0xBE, 0x08, 0x00};
+static const uint8_t AHT10_CALIBRATE_CMD[] = {0xE1};
 static const uint8_t AHT10_MEASURE_CMD[] = {0xAC, 0x33, 0x00};
-static const uint8_t AHT10_SOFTRESET_CMD[] = {0xBA};
-
-static const uint8_t AHT10_DEFAULT_DELAY = 5;     // ms, for initialization and temperature measurement
-static const uint8_t AHT10_HUMIDITY_DELAY = 30;   // ms
-static const uint8_t AHT10_SOFTRESET_DELAY = 30;  // ms
-
-static const uint8_t AHT10_ATTEMPTS = 3;  // safety margin, normally 3 attempts are enough: 3*30=90ms
-static const uint8_t AHT10_INIT_ATTEMPTS = 10;
-
-static const uint8_t AHT10_STATUS_BUSY = 0x80;
+static const uint8_t AHT10_DEFAULT_DELAY = 5;    // ms, for calibration and temperature measurement
+static const uint8_t AHT10_HUMIDITY_DELAY = 30;  // ms
+static const uint8_t AHT10_ATTEMPTS = 3;         // safety margin, normally 3 attempts are enough: 3*30=90ms
 
 void AHT10Component::setup() {
-  if (this->write(AHT10_SOFTRESET_CMD, sizeof(AHT10_SOFTRESET_CMD)) != i2c::ERROR_OK) {
-    ESP_LOGE(TAG, "Reset AHT10 failed!");
-  }
-  delay(AHT10_SOFTRESET_DELAY);
+  ESP_LOGCONFIG(TAG, "Setting up AHT10...");
 
-  const uint8_t *init_cmd;
-  switch (this->variant_) {
-    case AHT10Variant::AHT20:
-      init_cmd = AHT20_INITIALIZE_CMD;
-      ESP_LOGCONFIG(TAG, "Setting up AHT20");
-      break;
-    case AHT10Variant::AHT10:
-    default:
-      init_cmd = AHT10_INITIALIZE_CMD;
-      ESP_LOGCONFIG(TAG, "Setting up AHT10");
-  }
-
-  if (this->write(init_cmd, sizeof(init_cmd)) != i2c::ERROR_OK) {
+  if (!this->write_bytes(0, AHT10_CALIBRATE_CMD, sizeof(AHT10_CALIBRATE_CMD))) {
     ESP_LOGE(TAG, "Communication with AHT10 failed!");
     this->mark_failed();
     return;
   }
-  uint8_t data = AHT10_STATUS_BUSY;
-  int cal_attempts = 0;
-  while (data & AHT10_STATUS_BUSY) {
-    delay(AHT10_DEFAULT_DELAY);
-    if (this->read(&data, 1) != i2c::ERROR_OK) {
-      ESP_LOGE(TAG, "Communication with AHT10 failed!");
-      this->mark_failed();
-      return;
-    }
-    ++cal_attempts;
-    if (cal_attempts > AHT10_INIT_ATTEMPTS) {
-      ESP_LOGE(TAG, "AHT10 initialization timed out!");
-      this->mark_failed();
-      return;
-    }
+  uint8_t data = 0;
+  if (this->write(&data, 1) != i2c::ERROR_OK) {
+    ESP_LOGD(TAG, "Communication with AHT10 failed!");
+    this->mark_failed();
+    return;
+  }
+  delay(AHT10_DEFAULT_DELAY);
+  if (this->read(&data, 1) != i2c::ERROR_OK) {
+    ESP_LOGD(TAG, "Communication with AHT10 failed!");
+    this->mark_failed();
+    return;
+  }
+  if (this->read(&data, 1) != i2c::ERROR_OK) {
+    ESP_LOGD(TAG, "Communication with AHT10 failed!");
+    this->mark_failed();
+    return;
   }
   if ((data & 0x68) != 0x08) {  // Bit[6:5] = 0b00, NORMAL mode and Bit[3] = 0b1, CALIBRATED
-    ESP_LOGE(TAG, "AHT10 initialization failed!");
+    ESP_LOGE(TAG, "AHT10 calibration failed!");
     this->mark_failed();
     return;
   }
 
-  ESP_LOGV(TAG, "AHT10 initialization");
+  ESP_LOGV(TAG, "AHT10 calibrated");
 }
 
 void AHT10Component::update() {
-  if (this->write(AHT10_MEASURE_CMD, sizeof(AHT10_MEASURE_CMD)) != i2c::ERROR_OK) {
+  if (!this->write_bytes(0, AHT10_MEASURE_CMD, sizeof(AHT10_MEASURE_CMD))) {
     ESP_LOGE(TAG, "Communication with AHT10 failed!");
     this->status_set_warning();
     return;
@@ -95,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...");
@@ -111,7 +88,7 @@ void AHT10Component::update() {
         break;
       } else {
         ESP_LOGD(TAG, "ATH10 Unrealistic humidity (0x0), retrying...");
-        if (this->write(AHT10_MEASURE_CMD, sizeof(AHT10_MEASURE_CMD)) != i2c::ERROR_OK) {
+        if (!this->write_bytes(0, AHT10_MEASURE_CMD, sizeof(AHT10_MEASURE_CMD))) {
           ESP_LOGE(TAG, "Communication with AHT10 failed!");
           this->status_set_warning();
           return;
@@ -119,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/aht10.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <utility>
-
 #include "esphome/core/component.h"
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/i2c/i2c.h"
@@ -9,15 +7,12 @@
 namespace esphome {
 namespace aht10 {
 
-enum AHT10Variant { AHT10, AHT20 };
-
 class AHT10Component : public PollingComponent, public i2c::I2CDevice {
  public:
   void setup() override;
   void update() override;
   void dump_config() override;
   float get_setup_priority() const override;
-  void set_variant(AHT10Variant variant) { this->variant_ = variant; }
 
   void set_temperature_sensor(sensor::Sensor *temperature_sensor) { temperature_sensor_ = temperature_sensor; }
   void set_humidity_sensor(sensor::Sensor *humidity_sensor) { humidity_sensor_ = humidity_sensor; }
@@ -25,7 +20,6 @@ class AHT10Component : public PollingComponent, public i2c::I2CDevice {
  protected:
   sensor::Sensor *temperature_sensor_{nullptr};
   sensor::Sensor *humidity_sensor_{nullptr};
-  AHT10Variant variant_{};
 };
 
 }  // namespace aht10

esphome/components/aht10/sensor.py

@@ -10,7 +10,6 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
     UNIT_PERCENT,
-    CONF_VARIANT,
 )
 
 DEPENDENCIES = ["i2c"]
@@ -18,12 +17,6 @@ DEPENDENCIES = ["i2c"]
 aht10_ns = cg.esphome_ns.namespace("aht10")
 AHT10Component = aht10_ns.class_("AHT10Component", cg.PollingComponent, i2c.I2CDevice)
 
-AHT10Variant = aht10_ns.enum("AHT10Variant")
-AHT10_VARIANTS = {
-    "AHT10": AHT10Variant.AHT10,
-    "AHT20": AHT10Variant.AHT20,
-}
-
 CONFIG_SCHEMA = (
     cv.Schema(
         {
@@ -40,9 +33,6 @@ CONFIG_SCHEMA = (
                 device_class=DEVICE_CLASS_HUMIDITY,
                 state_class=STATE_CLASS_MEASUREMENT,
             ),
-            cv.Optional(CONF_VARIANT, default="AHT10"): cv.enum(
-                AHT10_VARIANTS, upper=True
-            ),
         }
     )
     .extend(cv.polling_component_schema("60s"))
@@ -54,12 +44,11 @@ async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
-    cg.add(var.set_variant(config[CONF_VARIANT]))
 
-    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

@@ -1,103 +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_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,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_CELSIUS,
-    UNIT_HECTOPASCAL,
-    UNIT_PARTS_PER_BILLION,
-    UNIT_PERCENT,
-    UNIT_VOLT,
-)
-
-CODEOWNERS = ["@ncareau", "@jeromelaban", "@kpfleming"]
-
-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
-)
-
-
-BASE_SCHEMA = (
-    sensor.SENSOR_SCHEMA.extend(
-        {
-            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,
-            ),
-            cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_CELSIUS,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_TEMPERATURE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_PRESSURE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_HECTOPASCAL,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_PRESSURE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_TVOC): sensor.sensor_schema(
-                unit_of_measurement=UNIT_PARTS_PER_BILLION,
-                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"))
-    .extend(ble_client.BLE_CLIENT_SCHEMA)
-)
-
-
-async def wave_base_to_code(var, config):
-    await cg.register_component(var, config)
-
-    await ble_client.register_ble_node(var, config)
-
-    if config_humidity := config.get(CONF_HUMIDITY):
-        sens = await sensor.new_sensor(config_humidity)
-        cg.add(var.set_humidity(sens))
-    if config_temperature := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(config_temperature)
-        cg.add(var.set_temperature(sens))
-    if config_pressure := config.get(CONF_PRESSURE):
-        sens = await sensor.new_sensor(config_pressure)
-        cg.add(var.set_pressure(sens))
-    if config_tvoc := config.get(CONF_TVOC):
-        sens = await sensor.new_sensor(config_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,211 +0,0 @@
-#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 {
-namespace airthings_wave_base {
-
-static const char *const TAG = "airthings_wave_base";
-
-void AirthingsWaveBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                                            esp_ble_gattc_cb_param_t *param) {
-  switch (event) {
-    case ESP_GATTC_OPEN_EVT: {
-      if (param->open.status == ESP_GATT_OK) {
-        ESP_LOGI(TAG, "Connected successfully!");
-      }
-      break;
-    }
-
-    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_();
-        }
-      }
-
-      // ensure that the client will be disconnected even if no responses arrive
-      this->set_response_timeout_();
-
-      break;
-    }
-
-    case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->parent()->get_conn_id())
-        break;
-      if (param->read.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "Error reading char at handle %d, status=%d", param->read.handle, param->read.status);
-        break;
-      }
-      if (param->read.handle == this->handle_) {
-        this->read_sensors(param->read.value, param->read.value_len);
-      }
-      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; }
-
-void AirthingsWaveBase::update() {
-  if (this->node_state != espbt::ClientState::ESTABLISHED) {
-    if (!this->parent()->enabled) {
-      ESP_LOGW(TAG, "Reconnecting to device");
-      this->parent()->set_enabled(true);
-      this->parent()->connect();
-    } else {
-      ESP_LOGW(TAG, "Connection in progress");
-    }
-  }
-}
-
-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;
-
-  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
-}  // namespace esphome
-
-#endif  // USE_ESP32

esphome/components/airthings_wave_base/airthings_wave_base.h

@@ -1,90 +0,0 @@
-#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>
-#include <algorithm>
-#include <iterator>
-#include "esphome/components/ble_client/ble_client.h"
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/core/component.h"
-#include "esphome/core/log.h"
-
-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;
-
-  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 set_temperature(sensor::Sensor *temperature) { temperature_sensor_ = temperature; }
-  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;
-
-  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;
-  };
-};
-
-}  // namespace airthings_wave_base
-}  // namespace esphome
-
-#endif  // USE_ESP32

esphome/components/airthings_wave_mini/airthings_wave_mini.cpp

@@ -7,47 +7,105 @@ namespace airthings_wave_mini {
 
 static const char *const TAG = "airthings_wave_mini";
 
-void AirthingsWaveMini::read_sensors(uint8_t *raw_value, uint16_t value_len) {
+void AirthingsWaveMini::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
+                                            esp_ble_gattc_cb_param_t *param) {
+  switch (event) {
+    case ESP_GATTC_OPEN_EVT: {
+      if (param->open.status == ESP_GATT_OK) {
+        ESP_LOGI(TAG, "Connected successfully!");
+      }
+      break;
+    }
+
+    case ESP_GATTC_DISCONNECT_EVT: {
+      ESP_LOGW(TAG, "Disconnected!");
+      break;
+    }
+
+    case ESP_GATTC_SEARCH_CMPL_EVT: {
+      this->handle_ = 0;
+      auto *chr = this->parent()->get_characteristic(service_uuid_, sensors_data_characteristic_uuid_);
+      if (chr == nullptr) {
+        ESP_LOGW(TAG, "No sensor characteristic found at service %s char %s", service_uuid_.to_string().c_str(),
+                 sensors_data_characteristic_uuid_.to_string().c_str());
+        break;
+      }
+      this->handle_ = chr->handle;
+      this->node_state = esp32_ble_tracker::ClientState::ESTABLISHED;
+
+      request_read_values_();
+      break;
+    }
+
+    case ESP_GATTC_READ_CHAR_EVT: {
+      if (param->read.conn_id != this->parent()->get_conn_id())
+        break;
+      if (param->read.status != ESP_GATT_OK) {
+        ESP_LOGW(TAG, "Error reading char at handle %d, status=%d", param->read.handle, param->read.status);
+        break;
+      }
+      if (param->read.handle == this->handle_) {
+        read_sensors_(param->read.value, param->read.value_len);
+      }
+      break;
+    }
+
+    default:
+      break;
+  }
+}
+
+void AirthingsWaveMini::read_sensors_(uint8_t *raw_value, uint16_t value_len) {
   auto *value = (WaveMiniReadings *) raw_value;
 
   if (sizeof(WaveMiniReadings) <= value_len) {
-    if (this->humidity_sensor_ != nullptr) {
-      this->humidity_sensor_->publish_state(value->humidity / 100.0f);
-    }
-
-    if (this->pressure_sensor_ != nullptr) {
-      this->pressure_sensor_->publish_state(value->pressure / 50.0f);
-    }
-
-    if (this->temperature_sensor_ != nullptr) {
-      this->temperature_sensor_->publish_state(value->temperature / 100.0f - 273.15f);
-    }
-
-    if ((this->tvoc_sensor_ != nullptr) && this->is_valid_voc_value_(value->voc)) {
+    this->humidity_sensor_->publish_state(value->humidity / 100.0f);
+    this->pressure_sensor_->publish_state(value->pressure / 50.0f);
+    this->temperature_sensor_->publish_state(value->temperature / 100.0f - 273.15f);
+    if (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).
+    parent()->set_enabled(false);
+  }
+}
+
+bool AirthingsWaveMini::is_valid_voc_value_(uint16_t voc) { return 0 <= voc && voc <= 16383; }
+
+void AirthingsWaveMini::update() {
+  if (this->node_state != esp32_ble_tracker::ClientState::ESTABLISHED) {
+    if (!parent()->enabled) {
+      ESP_LOGW(TAG, "Reconnecting to device");
+      parent()->set_enabled(true);
+      parent()->connect();
+    } else {
+      ESP_LOGW(TAG, "Connection in progress");
+    }
+  }
+}
+
+void AirthingsWaveMini::request_read_values_() {
+  auto status = esp_ble_gattc_read_char(this->parent()->get_gattc_if(), this->parent()->get_conn_id(), this->handle_,
+                                        ESP_GATT_AUTH_REQ_NONE);
+  if (status) {
+    ESP_LOGW(TAG, "Error sending read request for sensor, status=%d", status);
+  }
 }
 
 void AirthingsWaveMini::dump_config() {
-  // these really don't belong here, but there doesn't seem to be a
-  // practical way to have the base class use LOG_SENSOR and include
-  // the TAG from this component
   LOG_SENSOR("  ", "Humidity", this->humidity_sensor_);
   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);
-}
+AirthingsWaveMini::AirthingsWaveMini()
+    : PollingComponent(10000),
+      service_uuid_(esp32_ble_tracker::ESPBTUUID::from_raw(SERVICE_UUID)),
+      sensors_data_characteristic_uuid_(esp32_ble_tracker::ESPBTUUID::from_raw(CHARACTERISTIC_UUID)) {}
 
 }  // namespace airthings_wave_mini
 }  // namespace esphome

esphome/components/airthings_wave_mini/airthings_wave_mini.h

@@ -2,25 +2,50 @@
 
 #ifdef USE_ESP32
 
-#include "esphome/components/airthings_wave_base/airthings_wave_base.h"
+#include <esp_gattc_api.h>
+#include <algorithm>
+#include <iterator>
+#include "esphome/components/ble_client/ble_client.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/core/component.h"
+#include "esphome/core/log.h"
 
 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 {
+class AirthingsWaveMini : public PollingComponent, public ble_client::BLEClientNode {
  public:
   AirthingsWaveMini();
 
   void dump_config() 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 set_temperature(sensor::Sensor *temperature) { temperature_sensor_ = temperature; }
+  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; }
 
  protected:
-  void read_sensors(uint8_t *raw_value, uint16_t value_len) override;
+  bool is_valid_voc_value_(uint16_t voc);
+
+  void read_sensors_(uint8_t *value, uint16_t value_len);
+  void request_read_values_();
+
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
+  sensor::Sensor *pressure_sensor_{nullptr};
+  sensor::Sensor *tvoc_sensor_{nullptr};
+
+  uint16_t handle_;
+  esp32_ble_tracker::ESPBTUUID service_uuid_;
+  esp32_ble_tracker::ESPBTUUID sensors_data_characteristic_uuid_;
 
   struct WaveMiniReadings {
     uint16_t unused01;

esphome/components/airthings_wave_mini/sensor.py

@@ -1,28 +1,82 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome.components import airthings_wave_base
+from esphome.components import sensor, ble_client
 
 from esphome.const import (
+    DEVICE_CLASS_HUMIDITY,
+    DEVICE_CLASS_TEMPERATURE,
+    DEVICE_CLASS_PRESSURE,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_PERCENT,
+    UNIT_CELSIUS,
+    UNIT_HECTOPASCAL,
     CONF_ID,
+    CONF_HUMIDITY,
+    CONF_TVOC,
+    CONF_PRESSURE,
+    CONF_TEMPERATURE,
+    UNIT_PARTS_PER_BILLION,
+    ICON_RADIATOR,
 )
 
-DEPENDENCIES = airthings_wave_base.DEPENDENCIES
-
-AUTO_LOAD = ["airthings_wave_base"]
+DEPENDENCIES = ["ble_client"]
 
 airthings_wave_mini_ns = cg.esphome_ns.namespace("airthings_wave_mini")
 AirthingsWaveMini = airthings_wave_mini_ns.class_(
-    "AirthingsWaveMini", airthings_wave_base.AirthingsWaveBase
+    "AirthingsWaveMini", cg.PollingComponent, ble_client.BLEClientNode
 )
 
 
-CONFIG_SCHEMA = airthings_wave_base.BASE_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(AirthingsWaveMini),
-    }
+CONFIG_SCHEMA = cv.All(
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(AirthingsWaveMini),
+            cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(
+                unit_of_measurement=UNIT_PERCENT,
+                device_class=DEVICE_CLASS_HUMIDITY,
+                state_class=STATE_CLASS_MEASUREMENT,
+                accuracy_decimals=2,
+            ),
+            cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
+                unit_of_measurement=UNIT_CELSIUS,
+                accuracy_decimals=2,
+                device_class=DEVICE_CLASS_TEMPERATURE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_PRESSURE): sensor.sensor_schema(
+                unit_of_measurement=UNIT_HECTOPASCAL,
+                accuracy_decimals=2,
+                device_class=DEVICE_CLASS_PRESSURE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_TVOC): sensor.sensor_schema(
+                unit_of_measurement=UNIT_PARTS_PER_BILLION,
+                icon=ICON_RADIATOR,
+                accuracy_decimals=0,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+        }
+    )
+    .extend(cv.polling_component_schema("5min"))
+    .extend(ble_client.BLE_CLIENT_SCHEMA),
 )
 
 
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
-    await airthings_wave_base.wave_base_to_code(var, config)
+    await cg.register_component(var, config)
+
+    await ble_client.register_ble_node(var, config)
+
+    if CONF_HUMIDITY in config:
+        sens = await sensor.new_sensor(config[CONF_HUMIDITY])
+        cg.add(var.set_humidity(sens))
+    if CONF_TEMPERATURE in config:
+        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
+        cg.add(var.set_temperature(sens))
+    if CONF_PRESSURE in config:
+        sens = await sensor.new_sensor(config[CONF_PRESSURE])
+        cg.add(var.set_pressure(sens))
+    if CONF_TVOC in config:
+        sens = await sensor.new_sensor(config[CONF_TVOC])
+        cg.add(var.set_tvoc(sens))

esphome/components/airthings_wave_plus/airthings_wave_plus.cpp

@@ -7,7 +7,55 @@ namespace airthings_wave_plus {
 
 static const char *const TAG = "airthings_wave_plus";
 
-void AirthingsWavePlus::read_sensors(uint8_t *raw_value, uint16_t value_len) {
+void AirthingsWavePlus::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
+                                            esp_ble_gattc_cb_param_t *param) {
+  switch (event) {
+    case ESP_GATTC_OPEN_EVT: {
+      if (param->open.status == ESP_GATT_OK) {
+        ESP_LOGI(TAG, "Connected successfully!");
+      }
+      break;
+    }
+
+    case ESP_GATTC_DISCONNECT_EVT: {
+      ESP_LOGW(TAG, "Disconnected!");
+      break;
+    }
+
+    case ESP_GATTC_SEARCH_CMPL_EVT: {
+      this->handle_ = 0;
+      auto *chr = this->parent()->get_characteristic(service_uuid_, sensors_data_characteristic_uuid_);
+      if (chr == nullptr) {
+        ESP_LOGW(TAG, "No sensor characteristic found at service %s char %s", service_uuid_.to_string().c_str(),
+                 sensors_data_characteristic_uuid_.to_string().c_str());
+        break;
+      }
+      this->handle_ = chr->handle;
+      this->node_state = esp32_ble_tracker::ClientState::ESTABLISHED;
+
+      request_read_values_();
+      break;
+    }
+
+    case ESP_GATTC_READ_CHAR_EVT: {
+      if (param->read.conn_id != this->parent()->get_conn_id())
+        break;
+      if (param->read.status != ESP_GATT_OK) {
+        ESP_LOGW(TAG, "Error reading char at handle %d, status=%d", param->read.handle, param->read.status);
+        break;
+      }
+      if (param->read.handle == this->handle_) {
+        read_sensors_(param->read.value, param->read.value_len);
+      }
+      break;
+    }
+
+    default:
+      break;
+  }
+}
+
+void AirthingsWavePlus::read_sensors_(uint8_t *raw_value, uint16_t value_len) {
   auto *value = (WavePlusReadings *) raw_value;
 
   if (sizeof(WavePlusReadings) <= value_len) {
@@ -16,66 +64,72 @@ void AirthingsWavePlus::read_sensors(uint8_t *raw_value, uint16_t value_len) {
     if (value->version == 1) {
       ESP_LOGD(TAG, "ambient light = %d", value->ambientLight);
 
-      if (this->humidity_sensor_ != nullptr) {
-        this->humidity_sensor_->publish_state(value->humidity / 2.0f);
-      }
-
-      if ((this->radon_sensor_ != nullptr) && this->is_valid_radon_value_(value->radon)) {
+      this->humidity_sensor_->publish_state(value->humidity / 2.0f);
+      if (is_valid_radon_value_(value->radon)) {
         this->radon_sensor_->publish_state(value->radon);
       }
-
-      if ((this->radon_long_term_sensor_ != nullptr) && this->is_valid_radon_value_(value->radon_lt)) {
+      if (is_valid_radon_value_(value->radon_lt)) {
         this->radon_long_term_sensor_->publish_state(value->radon_lt);
       }
-
-      if (this->temperature_sensor_ != nullptr) {
-        this->temperature_sensor_->publish_state(value->temperature / 100.0f);
-      }
-
-      if (this->pressure_sensor_ != nullptr) {
-        this->pressure_sensor_->publish_state(value->pressure / 50.0f);
-      }
-
-      if ((this->co2_sensor_ != nullptr) && this->is_valid_co2_value_(value->co2)) {
+      this->temperature_sensor_->publish_state(value->temperature / 100.0f);
+      this->pressure_sensor_->publish_state(value->pressure / 50.0f);
+      if (is_valid_co2_value_(value->co2)) {
         this->co2_sensor_->publish_state(value->co2);
       }
-
-      if ((this->tvoc_sensor_ != nullptr) && this->is_valid_voc_value_(value->voc)) {
+      if (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).
+      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_voc_value_(uint16_t voc) { return 0 <= voc && voc <= 16383; }
+
+bool AirthingsWavePlus::is_valid_co2_value_(uint16_t co2) { return 0 <= co2 && co2 <= 16383; }
+
+void AirthingsWavePlus::update() {
+  if (this->node_state != esp32_ble_tracker::ClientState::ESTABLISHED) {
+    if (!parent()->enabled) {
+      ESP_LOGW(TAG, "Reconnecting to device");
+      parent()->set_enabled(true);
+      parent()->connect();
+    } else {
+      ESP_LOGW(TAG, "Connection in progress");
+    }
+  }
+}
+
+void AirthingsWavePlus::request_read_values_() {
+  auto status = esp_ble_gattc_read_char(this->parent()->get_gattc_if(), this->parent()->get_conn_id(), this->handle_,
+                                        ESP_GATT_AUTH_REQ_NONE);
+  if (status) {
+    ESP_LOGW(TAG, "Error sending read request for sensor, status=%d", status);
+  }
+}
 
 void AirthingsWavePlus::dump_config() {
-  // these really don't belong here, but there doesn't seem to be a
-  // practical way to have the base class use LOG_SENSOR and include
-  // the TAG from this component
   LOG_SENSOR("  ", "Humidity", this->humidity_sensor_);
-  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_);
+  LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
+  LOG_SENSOR("  ", "Pressure", this->pressure_sensor_);
   LOG_SENSOR("  ", "CO2", this->co2_sensor_);
+  LOG_SENSOR("  ", "TVOC", this->tvoc_sensor_);
 }
 
-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);
-}
+AirthingsWavePlus::AirthingsWavePlus()
+    : PollingComponent(10000),
+      service_uuid_(esp32_ble_tracker::ESPBTUUID::from_raw(SERVICE_UUID)),
+      sensors_data_characteristic_uuid_(esp32_ble_tracker::ESPBTUUID::from_raw(CHARACTERISTIC_UUID)) {}
 
 }  // namespace airthings_wave_plus
 }  // namespace esphome

esphome/components/airthings_wave_plus/airthings_wave_plus.h

@@ -2,36 +2,58 @@
 
 #ifdef USE_ESP32
 
-#include "esphome/components/airthings_wave_base/airthings_wave_base.h"
+#include <esp_gattc_api.h>
+#include <algorithm>
+#include <iterator>
+#include "esphome/components/ble_client/ble_client.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/core/component.h"
+#include "esphome/core/log.h"
 
 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 {
+class AirthingsWavePlus : public PollingComponent, public ble_client::BLEClientNode {
  public:
   AirthingsWavePlus();
 
   void dump_config() 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 set_temperature(sensor::Sensor *temperature) { temperature_sensor_ = temperature; }
   void set_radon(sensor::Sensor *radon) { radon_sensor_ = radon; }
   void set_radon_long_term(sensor::Sensor *radon_long_term) { radon_long_term_sensor_ = radon_long_term; }
+  void set_humidity(sensor::Sensor *humidity) { humidity_sensor_ = humidity; }
+  void set_pressure(sensor::Sensor *pressure) { pressure_sensor_ = pressure; }
   void set_co2(sensor::Sensor *co2) { co2_sensor_ = co2; }
+  void set_tvoc(sensor::Sensor *tvoc) { tvoc_sensor_ = tvoc; }
 
  protected:
   bool is_valid_radon_value_(uint16_t radon);
+  bool is_valid_voc_value_(uint16_t voc);
   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);
+  void request_read_values_();
 
+  sensor::Sensor *temperature_sensor_{nullptr};
   sensor::Sensor *radon_sensor_{nullptr};
   sensor::Sensor *radon_long_term_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
+  sensor::Sensor *pressure_sensor_{nullptr};
   sensor::Sensor *co2_sensor_{nullptr};
+  sensor::Sensor *tvoc_sensor_{nullptr};
+
+  uint16_t handle_;
+  esp32_ble_tracker::ESPBTUUID service_uuid_;
+  esp32_ble_tracker::ESPBTUUID sensors_data_characteristic_uuid_;
 
   struct WavePlusReadings {
     uint8_t version;

esphome/components/airthings_wave_plus/sensor.py

@@ -1,64 +1,116 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome.components import sensor, airthings_wave_base
+from esphome.components import sensor, ble_client
 
 from esphome.const import (
     DEVICE_CLASS_CARBON_DIOXIDE,
+    DEVICE_CLASS_HUMIDITY,
+    DEVICE_CLASS_TEMPERATURE,
+    DEVICE_CLASS_PRESSURE,
     STATE_CLASS_MEASUREMENT,
+    UNIT_PERCENT,
+    UNIT_CELSIUS,
+    UNIT_HECTOPASCAL,
     ICON_RADIOACTIVE,
     CONF_ID,
     CONF_RADON,
     CONF_RADON_LONG_TERM,
+    CONF_HUMIDITY,
+    CONF_TVOC,
     CONF_CO2,
+    CONF_PRESSURE,
+    CONF_TEMPERATURE,
     UNIT_BECQUEREL_PER_CUBIC_METER,
     UNIT_PARTS_PER_MILLION,
+    UNIT_PARTS_PER_BILLION,
+    ICON_RADIATOR,
 )
 
-DEPENDENCIES = airthings_wave_base.DEPENDENCIES
-
-AUTO_LOAD = ["airthings_wave_base"]
+DEPENDENCIES = ["ble_client"]
 
 airthings_wave_plus_ns = cg.esphome_ns.namespace("airthings_wave_plus")
 AirthingsWavePlus = airthings_wave_plus_ns.class_(
-    "AirthingsWavePlus", airthings_wave_base.AirthingsWaveBase
+    "AirthingsWavePlus", cg.PollingComponent, ble_client.BLEClientNode
 )
 
 
-CONFIG_SCHEMA = airthings_wave_base.BASE_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(AirthingsWavePlus),
-        cv.Optional(CONF_RADON): sensor.sensor_schema(
-            unit_of_measurement=UNIT_BECQUEREL_PER_CUBIC_METER,
-            icon=ICON_RADIOACTIVE,
-            accuracy_decimals=0,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_RADON_LONG_TERM): sensor.sensor_schema(
-            unit_of_measurement=UNIT_BECQUEREL_PER_CUBIC_METER,
-            icon=ICON_RADIOACTIVE,
-            accuracy_decimals=0,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_CO2): sensor.sensor_schema(
-            unit_of_measurement=UNIT_PARTS_PER_MILLION,
-            accuracy_decimals=0,
-            device_class=DEVICE_CLASS_CARBON_DIOXIDE,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-    }
+CONFIG_SCHEMA = cv.All(
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(AirthingsWavePlus),
+            cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(
+                unit_of_measurement=UNIT_PERCENT,
+                device_class=DEVICE_CLASS_HUMIDITY,
+                state_class=STATE_CLASS_MEASUREMENT,
+                accuracy_decimals=0,
+            ),
+            cv.Optional(CONF_RADON): sensor.sensor_schema(
+                unit_of_measurement=UNIT_BECQUEREL_PER_CUBIC_METER,
+                icon=ICON_RADIOACTIVE,
+                accuracy_decimals=0,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_RADON_LONG_TERM): sensor.sensor_schema(
+                unit_of_measurement=UNIT_BECQUEREL_PER_CUBIC_METER,
+                icon=ICON_RADIOACTIVE,
+                accuracy_decimals=0,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
+                unit_of_measurement=UNIT_CELSIUS,
+                accuracy_decimals=2,
+                device_class=DEVICE_CLASS_TEMPERATURE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_PRESSURE): sensor.sensor_schema(
+                unit_of_measurement=UNIT_HECTOPASCAL,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_PRESSURE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_CO2): sensor.sensor_schema(
+                unit_of_measurement=UNIT_PARTS_PER_MILLION,
+                accuracy_decimals=0,
+                device_class=DEVICE_CLASS_CARBON_DIOXIDE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_TVOC): sensor.sensor_schema(
+                unit_of_measurement=UNIT_PARTS_PER_BILLION,
+                icon=ICON_RADIATOR,
+                accuracy_decimals=0,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+        }
+    )
+    .extend(cv.polling_component_schema("5min"))
+    .extend(ble_client.BLE_CLIENT_SCHEMA),
 )
 
 
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
-    await airthings_wave_base.wave_base_to_code(var, config)
+    await cg.register_component(var, config)
 
-    if config_radon := config.get(CONF_RADON):
-        sens = await sensor.new_sensor(config_radon)
+    await ble_client.register_ble_node(var, config)
+
+    if CONF_HUMIDITY in config:
+        sens = await sensor.new_sensor(config[CONF_HUMIDITY])
+        cg.add(var.set_humidity(sens))
+    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_TEMPERATURE in config:
+        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
+        cg.add(var.set_temperature(sens))
+    if CONF_PRESSURE in config:
+        sens = await sensor.new_sensor(config[CONF_PRESSURE])
+        cg.add(var.set_pressure(sens))
+    if CONF_CO2 in config:
+        sens = await sensor.new_sensor(config[CONF_CO2])
         cg.add(var.set_co2(sens))
+    if CONF_TVOC in config:
+        sens = await sensor.new_sensor(config[CONF_TVOC])
+        cg.add(var.set_tvoc(sens))

esphome/components/alarm_control_panel/__init__.py

@@ -1,301 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome import automation
-from esphome.automation import maybe_simple_id
-from esphome.core import CORE, coroutine_with_priority
-from esphome.const import (
-    CONF_ID,
-    CONF_ON_STATE,
-    CONF_TRIGGER_ID,
-    CONF_CODE,
-)
-from esphome.cpp_helpers import setup_entity
-
-CODEOWNERS = ["@grahambrown11", "@hwstar"]
-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"
-CONF_ON_CHIME = "on_chime"
-CONF_ON_READY = "on_ready"
-
-alarm_control_panel_ns = cg.esphome_ns.namespace("alarm_control_panel")
-AlarmControlPanel = alarm_control_panel_ns.class_("AlarmControlPanel", cg.EntityBase)
-
-StateTrigger = alarm_control_panel_ns.class_(
-    "StateTrigger", automation.Trigger.template()
-)
-TriggeredTrigger = alarm_control_panel_ns.class_(
-    "TriggeredTrigger", automation.Trigger.template()
-)
-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()
-)
-ChimeTrigger = alarm_control_panel_ns.class_(
-    "ChimeTrigger", automation.Trigger.template()
-)
-ReadyTrigger = alarm_control_panel_ns.class_(
-    "ReadyTrigger", 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)
-ChimeAction = alarm_control_panel_ns.class_("ChimeAction", automation.Action)
-ReadyAction = alarm_control_panel_ns.class_("ReadyAction", automation.Action)
-
-AlarmControlPanelCondition = alarm_control_panel_ns.class_(
-    "AlarmControlPanelCondition", automation.Condition
-)
-
-ALARM_CONTROL_PANEL_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(AlarmControlPanel),
-        cv.Optional(CONF_ON_STATE): automation.validate_automation(
-            {
-                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(StateTrigger),
-            }
-        ),
-        cv.Optional(CONF_ON_TRIGGERED): automation.validate_automation(
-            {
-                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),
-            }
-        ),
-        cv.Optional(CONF_ON_CHIME): automation.validate_automation(
-            {
-                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ChimeTrigger),
-            }
-        ),
-        cv.Optional(CONF_ON_READY): automation.validate_automation(
-            {
-                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ReadyTrigger),
-            }
-        ),
-    }
-)
-
-ALARM_CONTROL_PANEL_ACTION_SCHEMA = maybe_simple_id(
-    {
-        cv.GenerateID(): cv.use_id(AlarmControlPanel),
-        cv.Optional(CONF_CODE): cv.templatable(cv.string),
-    }
-)
-
-ALARM_CONTROL_PANEL_CONDITION_SCHEMA = maybe_simple_id(
-    {
-        cv.GenerateID(): cv.use_id(AlarmControlPanel),
-    }
-)
-
-
-async def setup_alarm_control_panel_core_(var, config):
-    await setup_entity(var, config)
-    for conf in config.get(CONF_ON_STATE, []):
-        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-        await automation.build_automation(trigger, [], conf)
-    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)
-    for conf in config.get(CONF_ON_CHIME, []):
-        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-        await automation.build_automation(trigger, [], conf)
-    for conf in config.get(CONF_ON_READY, []):
-        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-        await automation.build_automation(trigger, [], conf)
-
-
-async def register_alarm_control_panel(var, config):
-    if not CORE.has_id(config[CONF_ID]):
-        var = cg.Pvariable(config[CONF_ID], var)
-    cg.add(cg.App.register_alarm_control_panel(var))
-    await setup_alarm_control_panel_core_(var, config)
-
-
-@automation.register_action(
-    "alarm_control_panel.arm_away", ArmAwayAction, ALARM_CONTROL_PANEL_ACTION_SCHEMA
-)
-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)
-        cg.add(var.set_code(templatable_))
-    return var
-
-
-@automation.register_action(
-    "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:
-        templatable_ = await cg.templatable(config[CONF_CODE], args, cg.std_string)
-        cg.add(var.set_code(templatable_))
-    return var
-
-
-@automation.register_action(
-    "alarm_control_panel.disarm", DisarmAction, ALARM_CONTROL_PANEL_ACTION_SCHEMA
-)
-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)
-        cg.add(var.set_code(templatable_))
-    return var
-
-
-@automation.register_action(
-    "alarm_control_panel.pending", PendingAction, ALARM_CONTROL_PANEL_ACTION_SCHEMA
-)
-async def alarm_action_pending_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)
-    return var
-
-
-@automation.register_action(
-    "alarm_control_panel.triggered", TriggeredAction, ALARM_CONTROL_PANEL_ACTION_SCHEMA
-)
-async def alarm_action_trigger_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)
-    return var
-
-
-@automation.register_action(
-    "alarm_control_panel.chime", ChimeAction, ALARM_CONTROL_PANEL_ACTION_SCHEMA
-)
-async def alarm_action_chime_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)
-    return var
-
-
-@automation.register_action(
-    "alarm_control_panel.ready", ReadyAction, ALARM_CONTROL_PANEL_ACTION_SCHEMA
-)
-@automation.register_condition(
-    "alarm_control_panel.ready",
-    AlarmControlPanelCondition,
-    ALARM_CONTROL_PANEL_CONDITION_SCHEMA,
-)
-async def alarm_action_ready_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)
-    return var
-
-
-@automation.register_condition(
-    "alarm_control_panel.is_armed",
-    AlarmControlPanelCondition,
-    ALARM_CONTROL_PANEL_CONDITION_SCHEMA,
-)
-async def alarm_control_panel_is_armed_to_code(
-    config, condition_id, template_arg, args
-):
-    paren = await cg.get_variable(config[CONF_ID])
-    return cg.new_Pvariable(condition_id, template_arg, paren)
-
-
-@coroutine_with_priority(100.0)
-async def to_code(config):
-    cg.add_global(alarm_control_panel_ns.using)
-    cg.add_define("USE_ALARM_CONTROL_PANEL")

esphome/components/alarm_control_panel/alarm_control_panel.cpp

@@ -1,156 +0,0 @@
-#include <utility>
-
-#include "alarm_control_panel.h"
-
-#include "esphome/core/application.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace alarm_control_panel {
-
-static const char *const TAG = "alarm_control_panel";
-
-AlarmControlPanelCall AlarmControlPanel::make_call() { return AlarmControlPanelCall(this); }
-
-bool AlarmControlPanel::is_state_armed(AlarmControlPanelState state) {
-  switch (state) {
-    case ACP_STATE_ARMED_AWAY:
-    case ACP_STATE_ARMED_HOME:
-    case ACP_STATE_ARMED_NIGHT:
-    case ACP_STATE_ARMED_VACATION:
-    case ACP_STATE_ARMED_CUSTOM_BYPASS:
-      return true;
-    default:
-      return false;
-  }
-};
-
-void AlarmControlPanel::publish_state(AlarmControlPanelState state) {
-  this->last_update_ = millis();
-  if (state != this->current_state_) {
-    auto prev_state = this->current_state_;
-    ESP_LOGD(TAG, "Set state to: %s, previous: %s", LOG_STR_ARG(alarm_control_panel_state_to_string(state)),
-             LOG_STR_ARG(alarm_control_panel_state_to_string(prev_state)));
-    this->current_state_ = 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();
-    }
-    if (state == this->desired_state_) {
-      // only store when in the desired state
-      this->pref_.save(&state);
-    }
-  }
-}
-
-void AlarmControlPanel::add_on_state_callback(std::function<void()> &&callback) {
-  this->state_callback_.add(std::move(callback));
-}
-
-void AlarmControlPanel::add_on_triggered_callback(std::function<void()> &&callback) {
-  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));
-}
-
-void AlarmControlPanel::add_on_chime_callback(std::function<void()> &&callback) {
-  this->chime_callback_.add(std::move(callback));
-}
-
-void AlarmControlPanel::add_on_ready_callback(std::function<void()> &&callback) {
-  this->ready_callback_.add(std::move(callback));
-}
-
-void AlarmControlPanel::arm_away(optional<std::string> code) {
-  auto call = this->make_call();
-  call.arm_away();
-  if (code.has_value())
-    call.set_code(code.value());
-  call.perform();
-}
-
-void AlarmControlPanel::arm_home(optional<std::string> code) {
-  auto call = this->make_call();
-  call.arm_home();
-  if (code.has_value())
-    call.set_code(code.value());
-  call.perform();
-}
-
-void AlarmControlPanel::arm_night(optional<std::string> code) {
-  auto call = this->make_call();
-  call.arm_night();
-  if (code.has_value())
-    call.set_code(code.value());
-  call.perform();
-}
-
-void AlarmControlPanel::arm_vacation(optional<std::string> code) {
-  auto call = this->make_call();
-  call.arm_vacation();
-  if (code.has_value())
-    call.set_code(code.value());
-  call.perform();
-}
-
-void AlarmControlPanel::arm_custom_bypass(optional<std::string> code) {
-  auto call = this->make_call();
-  call.arm_custom_bypass();
-  if (code.has_value())
-    call.set_code(code.value());
-  call.perform();
-}
-
-void AlarmControlPanel::disarm(optional<std::string> code) {
-  auto call = this->make_call();
-  call.disarm();
-  if (code.has_value())
-    call.set_code(code.value());
-  call.perform();
-}
-
-}  // namespace alarm_control_panel
-}  // namespace esphome

esphome/components/alarm_control_panel/alarm_control_panel.h

@@ -1,200 +0,0 @@
-#pragma once
-
-#include <map>
-
-#include "alarm_control_panel_call.h"
-#include "alarm_control_panel_state.h"
-
-#include "esphome/core/automation.h"
-#include "esphome/core/entity_base.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace alarm_control_panel {
-
-enum AlarmControlPanelFeature : uint8_t {
-  // Matches Home Assistant values
-  ACP_FEAT_ARM_HOME = 1 << 0,
-  ACP_FEAT_ARM_AWAY = 1 << 1,
-  ACP_FEAT_ARM_NIGHT = 1 << 2,
-  ACP_FEAT_TRIGGER = 1 << 3,
-  ACP_FEAT_ARM_CUSTOM_BYPASS = 1 << 4,
-  ACP_FEAT_ARM_VACATION = 1 << 5,
-};
-
-class AlarmControlPanel : public EntityBase {
- public:
-  /** Make a AlarmControlPanelCall
-   *
-   */
-  AlarmControlPanelCall make_call();
-
-  /** Set the state of the alarm_control_panel.
-   *
-   * @param state The AlarmControlPanelState.
-   */
-  void publish_state(AlarmControlPanelState state);
-
-  /** Add a callback for when the state of the alarm_control_panel changes
-   *
-   * @param callback The callback function
-   */
-  void add_on_state_callback(std::function<void()> &&callback);
-
-  /** Add a callback for when the state of the alarm_control_panel chanes to triggered
-   *
-   * @param callback The callback function
-   */
-  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
-   */
-  void add_on_cleared_callback(std::function<void()> &&callback);
-
-  /** Add a callback for when a chime zone goes from closed to open
-   *
-   * @param callback The callback function
-   */
-  void add_on_chime_callback(std::function<void()> &&callback);
-
-  /** Add a callback for when a ready state changes
-   *
-   * @param callback The callback function
-   */
-  void add_on_ready_callback(std::function<void()> &&callback);
-
-  /** A numeric representation of the supported features as per HomeAssistant
-   *
-   */
-  virtual uint32_t get_supported_features() const = 0;
-
-  /** Returns if the alarm_control_panel has a code
-   *
-   */
-  virtual bool get_requires_code() const = 0;
-
-  /** Returns if the alarm_control_panel requires a code to arm
-   *
-   */
-  virtual bool get_requires_code_to_arm() const = 0;
-
-  /** arm the alarm in away mode
-   *
-   * @param code The code
-   */
-  void arm_away(optional<std::string> code = nullopt);
-
-  /** arm the alarm in home mode
-   *
-   * @param code The code
-   */
-  void arm_home(optional<std::string> code = nullopt);
-
-  /** arm the alarm in night mode
-   *
-   * @param code The code
-   */
-  void arm_night(optional<std::string> code = nullopt);
-
-  /** arm the alarm in vacation mode
-   *
-   * @param code The code
-   */
-  void arm_vacation(optional<std::string> code = nullopt);
-
-  /** arm the alarm in custom bypass mode
-   *
-   * @param code The code
-   */
-  void arm_custom_bypass(optional<std::string> code = nullopt);
-
-  /** disarm the alarm
-   *
-   * @param code The code
-   */
-  void disarm(optional<std::string> code = nullopt);
-
-  /** Get the state
-   *
-   */
-  AlarmControlPanelState get_state() const { return this->current_state_; }
-
-  // is the state one of the armed states
-  bool is_state_armed(AlarmControlPanelState state);
-
- protected:
-  friend AlarmControlPanelCall;
-  // in order to store last panel state in flash
-  ESPPreferenceObject pref_;
-  // current state
-  AlarmControlPanelState current_state_;
-  // the desired (or previous) state
-  AlarmControlPanelState desired_state_;
-  // last time the state was updated
-  uint32_t last_update_;
-  // the call control function
-  virtual void control(const AlarmControlPanelCall &call) = 0;
-  // state callback
-  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_{};
-  // chime callback
-  CallbackManager<void()> chime_callback_{};
-  // ready callback
-  CallbackManager<void()> ready_callback_{};
-};
-
-}  // namespace alarm_control_panel
-}  // namespace esphome

esphome/components/alarm_control_panel/alarm_control_panel_call.cpp

@@ -1,104 +0,0 @@
-#include "alarm_control_panel_call.h"
-
-#include "alarm_control_panel.h"
-
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace alarm_control_panel {
-
-static const char *const TAG = "alarm_control_panel";
-
-AlarmControlPanelCall::AlarmControlPanelCall(AlarmControlPanel *parent) : parent_(parent) {}
-
-AlarmControlPanelCall &AlarmControlPanelCall::set_code(const std::string &code) {
-  this->code_ = code;
-  return *this;
-}
-
-AlarmControlPanelCall &AlarmControlPanelCall::arm_away() {
-  this->state_ = ACP_STATE_ARMED_AWAY;
-  return *this;
-}
-
-AlarmControlPanelCall &AlarmControlPanelCall::arm_home() {
-  this->state_ = ACP_STATE_ARMED_HOME;
-  return *this;
-}
-
-AlarmControlPanelCall &AlarmControlPanelCall::arm_night() {
-  this->state_ = ACP_STATE_ARMED_NIGHT;
-  return *this;
-}
-
-AlarmControlPanelCall &AlarmControlPanelCall::arm_vacation() {
-  this->state_ = ACP_STATE_ARMED_VACATION;
-  return *this;
-}
-
-AlarmControlPanelCall &AlarmControlPanelCall::arm_custom_bypass() {
-  this->state_ = ACP_STATE_ARMED_CUSTOM_BYPASS;
-  return *this;
-}
-
-AlarmControlPanelCall &AlarmControlPanelCall::disarm() {
-  this->state_ = ACP_STATE_DISARMED;
-  return *this;
-}
-
-AlarmControlPanelCall &AlarmControlPanelCall::pending() {
-  this->state_ = ACP_STATE_PENDING;
-  return *this;
-}
-
-AlarmControlPanelCall &AlarmControlPanelCall::triggered() {
-  this->state_ = ACP_STATE_TRIGGERED;
-  return *this;
-}
-
-const optional<AlarmControlPanelState> &AlarmControlPanelCall::get_state() const { return this->state_; }
-const optional<std::string> &AlarmControlPanelCall::get_code() const { return this->code_; }
-
-void AlarmControlPanelCall::validate_() {
-  if (this->state_.has_value()) {
-    auto state = *this->state_;
-    if (this->parent_->is_state_armed(state) && this->parent_->get_state() != ACP_STATE_DISARMED) {
-      ESP_LOGW(TAG, "Cannot arm when not disarmed");
-      this->state_.reset();
-      return;
-    }
-    if (state == ACP_STATE_PENDING && this->parent_->get_state() == ACP_STATE_DISARMED) {
-      ESP_LOGW(TAG, "Cannot trip alarm when disarmed");
-      this->state_.reset();
-      return;
-    }
-    if (state == ACP_STATE_DISARMED &&
-        !(this->parent_->is_state_armed(this->parent_->get_state()) ||
-          this->parent_->get_state() == ACP_STATE_PENDING || this->parent_->get_state() == ACP_STATE_ARMING ||
-          this->parent_->get_state() == ACP_STATE_TRIGGERED)) {
-      ESP_LOGW(TAG, "Cannot disarm when not armed");
-      this->state_.reset();
-      return;
-    }
-    if (state == ACP_STATE_ARMED_HOME && (this->parent_->get_supported_features() & ACP_FEAT_ARM_HOME) == 0) {
-      ESP_LOGW(TAG, "Cannot arm home when not supported");
-      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;
-    }
-  }
-}
-
-void AlarmControlPanelCall::perform() {
-  this->validate_();
-  if (this->state_) {
-    this->parent_->control(*this);
-  }
-}
-
-}  // namespace alarm_control_panel
-}  // namespace esphome

esphome/components/alarm_control_panel/alarm_control_panel_call.h

@@ -1,40 +0,0 @@
-#pragma once
-
-#include <string>
-
-#include "alarm_control_panel_state.h"
-
-#include "esphome/core/helpers.h"
-
-namespace esphome {
-namespace alarm_control_panel {
-
-class AlarmControlPanel;
-
-class AlarmControlPanelCall {
- public:
-  AlarmControlPanelCall(AlarmControlPanel *parent);
-
-  AlarmControlPanelCall &set_code(const std::string &code);
-  AlarmControlPanelCall &arm_away();
-  AlarmControlPanelCall &arm_home();
-  AlarmControlPanelCall &arm_night();
-  AlarmControlPanelCall &arm_vacation();
-  AlarmControlPanelCall &arm_custom_bypass();
-  AlarmControlPanelCall &disarm();
-  AlarmControlPanelCall &pending();
-  AlarmControlPanelCall &triggered();
-
-  void perform();
-  const optional<AlarmControlPanelState> &get_state() const;
-  const optional<std::string> &get_code() const;
-
- protected:
-  AlarmControlPanel *parent_;
-  optional<std::string> code_{};
-  optional<AlarmControlPanelState> state_{};
-  void validate_();
-};
-
-}  // namespace alarm_control_panel
-}  // namespace esphome

esphome/components/alarm_control_panel/alarm_control_panel_state.cpp

@@ -1,34 +0,0 @@
-#include "alarm_control_panel_state.h"
-
-namespace esphome {
-namespace alarm_control_panel {
-
-const LogString *alarm_control_panel_state_to_string(AlarmControlPanelState state) {
-  switch (state) {
-    case ACP_STATE_DISARMED:
-      return LOG_STR("DISARMED");
-    case ACP_STATE_ARMED_HOME:
-      return LOG_STR("ARMED_HOME");
-    case ACP_STATE_ARMED_AWAY:
-      return LOG_STR("ARMED_AWAY");
-    case ACP_STATE_ARMED_NIGHT:
-      return LOG_STR("ARMED_NIGHT");
-    case ACP_STATE_ARMED_VACATION:
-      return LOG_STR("ARMED_VACATION");
-    case ACP_STATE_ARMED_CUSTOM_BYPASS:
-      return LOG_STR("ARMED_CUSTOM_BYPASS");
-    case ACP_STATE_PENDING:
-      return LOG_STR("PENDING");
-    case ACP_STATE_ARMING:
-      return LOG_STR("ARMING");
-    case ACP_STATE_DISARMING:
-      return LOG_STR("DISARMING");
-    case ACP_STATE_TRIGGERED:
-      return LOG_STR("TRIGGERED");
-    default:
-      return LOG_STR("UNKNOWN");
-  }
-}
-
-}  // namespace alarm_control_panel
-}  // namespace esphome

esphome/components/alarm_control_panel/alarm_control_panel_state.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace alarm_control_panel {
-
-enum AlarmControlPanelState : uint8_t {
-  ACP_STATE_DISARMED = 0,
-  ACP_STATE_ARMED_HOME = 1,
-  ACP_STATE_ARMED_AWAY = 2,
-  ACP_STATE_ARMED_NIGHT = 3,
-  ACP_STATE_ARMED_VACATION = 4,
-  ACP_STATE_ARMED_CUSTOM_BYPASS = 5,
-  ACP_STATE_PENDING = 6,
-  ACP_STATE_ARMING = 7,
-  ACP_STATE_DISARMING = 8,
-  ACP_STATE_TRIGGERED = 9
-};
-
-/** Returns a string representation of the state.
- *
- * @param state The AlarmControlPanelState.
- */
-const LogString *alarm_control_panel_state_to_string(AlarmControlPanelState state);
-
-}  // namespace alarm_control_panel
-}  // namespace esphome

esphome/components/alarm_control_panel/automation.h

@@ -1,191 +0,0 @@
-
-#pragma once
-#include "esphome/core/automation.h"
-#include "alarm_control_panel.h"
-
-namespace esphome {
-namespace alarm_control_panel {
-
-class StateTrigger : public Trigger<> {
- public:
-  explicit StateTrigger(AlarmControlPanel *alarm_control_panel) {
-    alarm_control_panel->add_on_state_callback([this]() { this->trigger(); });
-  }
-};
-
-class TriggeredTrigger : public Trigger<> {
- public:
-  explicit TriggeredTrigger(AlarmControlPanel *alarm_control_panel) {
-    alarm_control_panel->add_on_triggered_callback([this]() { this->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) {
-    alarm_control_panel->add_on_cleared_callback([this]() { this->trigger(); });
-  }
-};
-
-class ChimeTrigger : public Trigger<> {
- public:
-  explicit ChimeTrigger(AlarmControlPanel *alarm_control_panel) {
-    alarm_control_panel->add_on_chime_callback([this]() { this->trigger(); });
-  }
-};
-
-class ReadyTrigger : public Trigger<> {
- public:
-  explicit ReadyTrigger(AlarmControlPanel *alarm_control_panel) {
-    alarm_control_panel->add_on_ready_callback([this]() { this->trigger(); });
-  }
-};
-
-template<typename... Ts> class ArmAwayAction : public Action<Ts...> {
- public:
-  explicit ArmAwayAction(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_away();
-    call.perform();
-  }
-
- protected:
-  AlarmControlPanel *alarm_control_panel_;
-};
-
-template<typename... Ts> class ArmHomeAction : public Action<Ts...> {
- public:
-  explicit ArmHomeAction(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_home();
-    call.perform();
-  }
-
- protected:
-  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) {}
-
-  TEMPLATABLE_VALUE(std::string, code)
-
-  void play(Ts... x) override { this->alarm_control_panel_->disarm(this->code_.optional_value(x...)); }
-
- protected:
-  AlarmControlPanel *alarm_control_panel_;
-};
-
-template<typename... Ts> class PendingAction : public Action<Ts...> {
- public:
-  explicit PendingAction(AlarmControlPanel *alarm_control_panel) : alarm_control_panel_(alarm_control_panel) {}
-
-  void play(Ts... x) override { this->alarm_control_panel_->make_call().pending().perform(); }
-
- protected:
-  AlarmControlPanel *alarm_control_panel_;
-};
-
-template<typename... Ts> class TriggeredAction : public Action<Ts...> {
- public:
-  explicit TriggeredAction(AlarmControlPanel *alarm_control_panel) : alarm_control_panel_(alarm_control_panel) {}
-
-  void play(Ts... x) override { this->alarm_control_panel_->make_call().triggered().perform(); }
-
- protected:
-  AlarmControlPanel *alarm_control_panel_;
-};
-
-template<typename... Ts> class AlarmControlPanelCondition : public Condition<Ts...> {
- public:
-  AlarmControlPanelCondition(AlarmControlPanel *parent) : parent_(parent) {}
-  bool check(Ts... x) override {
-    return this->parent_->is_state_armed(this->parent_->get_state()) ||
-           this->parent_->get_state() == ACP_STATE_PENDING || this->parent_->get_state() == ACP_STATE_TRIGGERED;
-  }
-
- protected:
-  AlarmControlPanel *parent_;
-};
-
-}  // namespace alarm_control_panel
-}  // namespace esphome

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