Merge remote-tracking branch 'origin/dev' into nrf52

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

@@ -36,7 +36,7 @@ runs:
 
     - name: Build and push to ghcr by digest
       id: build-ghcr
-      uses: docker/build-push-action@v5.0.0
+      uses: docker/build-push-action@v5.3.0
       with:
         context: .
         file: ./docker/Dockerfile
@@ -67,7 +67,7 @@ runs:
 
     - name: Build and push to dockerhub by digest
       id: build-dockerhub
-      uses: docker/build-push-action@v5.0.0
+      uses: docker/build-push-action@v5.3.0
       with:
         context: .
         file: ./docker/Dockerfile

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

@@ -17,12 +17,12 @@ runs:
   steps:
     - name: Set up Python ${{ inputs.python-version }}
       id: python
-      uses: actions/setup-python@v5.0.0
+      uses: actions/setup-python@v5.1.0
       with:
         python-version: ${{ inputs.python-version }}
     - name: Restore Python virtual environment
       id: cache-venv
-      uses: actions/cache/restore@v3.3.2
+      uses: actions/cache/restore@v4.0.2
       with:
         path: venv
         # yamllint disable-line rule:line-length

.github/dependabot.yml

@@ -13,3 +13,13 @@ 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-api-proto.yml

@@ -0,0 +1,80 @@
+name: API Proto CI
+
+on:
+  pull_request:
+    paths:
+      - "esphome/components/api/api.proto"
+      - "esphome/components/api/api_pb2.cpp"
+      - "esphome/components/api/api_pb2.h"
+      - "esphome/components/api/api_pb2_service.cpp"
+      - "esphome/components/api/api_pb2_service.h"
+      - "script/api_protobuf/api_protobuf.py"
+      - ".github/workflows/ci-api-proto.yml"
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  check:
+    name: Check generated files
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4.1.1
+      - name: Set up Python
+        uses: actions/setup-python@v5.1.0
+        with:
+          python-version: "3.11"
+
+      - name: Install apt dependencies
+        run: |
+          sudo apt update
+          sudo apt-cache show protobuf-compiler
+          sudo apt install -y protobuf-compiler
+          protoc --version
+      - name: Install python dependencies
+        run: pip install aioesphomeapi -c requirements.txt -r requirements_dev.txt
+      - name: Generate files
+        run: script/api_protobuf/api_protobuf.py
+      - name: Check for changes
+        run: |
+          if ! git diff --quiet; then
+            echo "## Job Failed" | tee -a $GITHUB_STEP_SUMMARY
+            echo "You have altered the generated proto files but they do not match what is expected." | tee -a $GITHUB_STEP_SUMMARY
+            echo "Please run 'script/api_protobuf/api_protobuf.py' and commit the changes." | tee -a $GITHUB_STEP_SUMMARY
+            exit 1
+          fi
+      - if: failure()
+        name: Review PR
+        uses: actions/github-script@v7.0.1
+        with:
+          script: |
+            await github.rest.pulls.createReview({
+              pull_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              event: 'REQUEST_CHANGES',
+              body: 'You have altered the generated proto files but they do not match what is expected.\nPlease run "script/api_protobuf/api_protobuf.py" and commit the changes.'
+            })
+      - if: success()
+        name: Dismiss review
+        uses: actions/github-script@v7.0.1
+        with:
+          script: |
+            let reviews = await github.rest.pulls.listReviews({
+              pull_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo
+            });
+            for (let review of reviews.data) {
+              if (review.user.login === 'github-actions[bot]' && review.state === 'CHANGES_REQUESTED') {
+                await github.rest.pulls.dismissReview({
+                  pull_number: context.issue.number,
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  review_id: review.id,
+                  message: 'Files now match the expected proto files.'
+                });
+              }
+            }

.github/workflows/ci-docker.yml

@@ -2,7 +2,7 @@
 name: CI for docker images
 
 # Only run when docker paths change
-# yamllint disable-line rule:truthy
+
 on:
   push:
     branches: [dev, beta, release]
@@ -42,11 +42,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4.1.1
       - name: Set up Python
-        uses: actions/setup-python@v5.0.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: "3.9"
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
+        uses: docker/setup-buildx-action@v3.3.0
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3.0.0
 

.github/workflows/ci.yml

@@ -1,7 +1,6 @@
 ---
 name: CI
 
-# yamllint disable-line rule:truthy
 on:
   push:
     branches: [dev, beta, release]
@@ -12,6 +11,7 @@ on:
       - "!.github/workflows/*.yml"
       - ".github/workflows/ci.yml"
       - "!.yamllint"
+      - "!.github/dependabot.yml"
   merge_group:
 
 permissions:
@@ -41,12 +41,12 @@ jobs:
         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
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.0.0
+        uses: actions/cache@v4.0.2
         with:
           path: venv
           # yamllint disable-line rule:line-length
@@ -366,7 +366,7 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
           cache-key: ${{ needs.common.outputs.cache-key }}
       - name: Cache platformio
-        uses: actions/cache@v4.0.0
+        uses: actions/cache@v4.0.2
         with:
           path: ~/.platformio
           # yamllint disable-line rule:line-length
@@ -397,6 +397,7 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - common
+    if: github.event_name == 'pull_request'
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -405,10 +406,14 @@ jobs:
         with:
           # Fetch enough history so `git merge-base refs/remotes/origin/dev HEAD` works.
           fetch-depth: 500
-      - name: Fetch dev branch
+      - name: Get target branch
+        id: target-branch
         run: |
-          git -c protocol.version=2 fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +refs/heads/dev*:refs/remotes/origin/dev* +refs/tags/dev*:refs/tags/dev*
+          echo "branch=${{ github.event.pull_request.base.ref }}" >> $GITHUB_OUTPUT
-          git merge-base refs/remotes/origin/dev HEAD
+      - 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:
@@ -418,7 +423,7 @@ jobs:
         id: set-matrix
         run: |
           . venv/bin/activate
-          echo "matrix=$(script/list-components.py --changed | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
+          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 }}
@@ -426,13 +431,16 @@ jobs:
     needs:
       - common
       - list-components
-    if: ${{ needs.list-components.outputs.matrix != '[]' && needs.list-components.outputs.matrix != '' }}
+    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
@@ -464,6 +472,7 @@ jobs:
       - compile-tests
       - clang-tidy
       - test-build-components
+      - list-components
     if: always()
     steps:
       - name: Success
@@ -471,4 +480,8 @@ jobs:
         run: exit 0
       - name: Failure
         if: ${{ contains(needs.*.result, 'failure') }}
-        run: exit 1
+        env:
+          JSON_DOC: ${{ toJSON(needs) }}
+        run: |
+          echo $JSON_DOC | jq
+          exit 1

.github/workflows/lock.yml

@@ -1,7 +1,6 @@
 ---
 name: Lock
 
-# yamllint disable-line rule:truthy
 on:
   schedule:
     - cron: "30 0 * * *"

.github/workflows/needs-docs.yml

@@ -1,6 +1,5 @@
 name: Needs Docs
 
-# yamllint disable-line rule:truthy
 on:
   pull_request:
     types: [labeled, unlabeled]

.github/workflows/release.yml

@@ -1,7 +1,6 @@
 ---
 name: Publish Release
 
-# yamllint disable-line rule:truthy
 on:
   workflow_dispatch:
   release:
@@ -18,14 +17,16 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       tag: ${{ steps.tag.outputs.tag }}
+      branch_build: ${{ steps.tag.outputs.branch_build }}
     steps:
       - uses: actions/checkout@v4.1.1
       - name: Get tag
         id: tag
         # yamllint disable rule:line-length
         run: |
-          if [[ "$GITHUB_EVENT_NAME" = "release" ]]; then
+          if [[ "${{ github.event_name }}" = "release" ]]; then
-            TAG="${GITHUB_REF#refs/tags/}"
+            TAG="${{ github.event.release.tag_name}}"
+            BRANCH_BUILD="false"
           else
             TAG=$(cat esphome/const.py | sed -n -E "s/^__version__\s+=\s+\"(.+)\"$/\1/p")
             today="$(date --utc '+%Y%m%d')"
@@ -33,34 +34,36 @@ jobs:
             BRANCH=${GITHUB_REF#refs/heads/}
             if [[ "$BRANCH" != "dev" ]]; then
               TAG="${TAG}-${BRANCH}"
+              BRANCH_BUILD="true"
+            else
+              BRANCH_BUILD="false"
             fi
           fi
           echo "tag=${TAG}" >> $GITHUB_OUTPUT
+          echo "branch_build=${BRANCH_BUILD}" >> $GITHUB_OUTPUT
         # yamllint enable rule:line-length
 
   deploy-pypi:
     name: Build and publish to PyPi
     if: github.repository == 'esphome/esphome' && github.event_name == 'release'
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
     steps:
       - uses: actions/checkout@v4.1.1
       - name: Set up Python
-        uses: actions/setup-python@v5.0.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: "3.x"
       - name: Set up python environment
         env:
           ESPHOME_NO_VENV: 1
-        run: |
+        run: script/setup
-          script/setup
-          pip install twine
       - name: Build
         run: python setup.py sdist bdist_wheel
-      - name: Upload
+      - name: Publish
-        env:
+        uses: pypa/gh-action-pypi-publish@v1.8.14
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
-        run: twine upload dist/*
 
   deploy-docker:
     name: Build ESPHome ${{ matrix.platform }}
@@ -80,23 +83,23 @@ jobs:
     steps:
       - uses: actions/checkout@v4.1.1
       - name: Set up Python
-        uses: actions/setup-python@v5.0.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: "3.9"
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
+        uses: docker/setup-buildx-action@v3.3.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
+        uses: docker/login-action@v3.1.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
+        uses: docker/login-action@v3.1.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -163,17 +166,17 @@ jobs:
           name: digests-${{ matrix.image.target }}-${{ matrix.registry }}
           path: /tmp/digests
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
+        uses: docker/setup-buildx-action@v3.3.0
 
       - name: Log in to docker hub
         if: matrix.registry == 'dockerhub'
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v3.1.0
         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@v3.1.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -198,22 +201,28 @@ jobs:
             $(printf '${{ steps.tags.outputs.image }}@sha256:%s ' *)
 
   deploy-ha-addon-repo:
-    if: github.repository == 'esphome/esphome' && github.event_name == 'release'
+    if: github.repository == 'esphome/esphome' && needs.init.outputs.branch_build == 'false'
     runs-on: ubuntu-latest
-    needs: [deploy-manifest]
+    needs:
+      - init
+      - deploy-manifest
     steps:
       - name: Trigger Workflow
         uses: actions/github-script@v7.0.1
         with:
           github-token: ${{ secrets.DEPLOY_HA_ADDON_REPO_TOKEN }}
           script: |
+            let description = "ESPHome";
+            if (context.eventName == "release") {
+              description = ${{ toJSON(github.event.release.body) }};
+            }
             github.rest.actions.createWorkflowDispatch({
               owner: "esphome",
               repo: "home-assistant-addon",
               workflow_id: "bump-version.yml",
               ref: "main",
               inputs: {
-                version: "${{ github.event.release.tag_name }}",
+                version: "${{ needs.init.outputs.tag }}",
-                content: ${{ toJSON(github.event.release.body) }}
+                content: description
               }
             })

.github/workflows/stale.yml

@@ -1,7 +1,6 @@
 ---
 name: Stale
 
-# yamllint disable-line rule:truthy
 on:
   schedule:
     - cron: "30 0 * * *"

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

@@ -1,7 +1,6 @@
 ---
 name: Synchronise Device Classes from Home Assistant
 
-# yamllint disable-line rule:truthy
 on:
   workflow_dispatch:
   schedule:
@@ -23,9 +22,9 @@ jobs:
           path: lib/home-assistant
 
       - name: Setup Python
-        uses: actions/setup-python@v5.0.0
+        uses: actions/setup-python@v5.1.0
         with:
-          python-version: 3.11
+          python-version: 3.12
 
       - name: Install Home Assistant
         run: |
@@ -37,7 +36,7 @@ jobs:
           python ./script/sync-device_class.py
 
       - name: Commit changes
-        uses: peter-evans/create-pull-request@v6.0.1
+        uses: peter-evans/create-pull-request@v6.0.4
         with:
           commit-message: "Synchronise Device Classes from Home Assistant"
           committer: esphomebot <esphome@nabucasa.com>

.github/workflows/yaml-lint.yml

@@ -1,7 +1,6 @@
 ---
 name: YAML lint
 
-# yamllint disable-line rule:truthy
 on:
   push:
     branches: [dev, beta, release]

.pre-commit-config.yaml

@@ -27,7 +27,7 @@ repos:
           - --branch=release
           - --branch=beta
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.1
+    rev: v3.15.2
     hooks:
       - id: pyupgrade
         args: [--py39-plus]

.yamllint

@@ -16,3 +16,4 @@ rules:
     indent-sequences: true
     check-multi-line-strings: false
   line-length: disable
+  truthy: disable

CODEOWNERS

@@ -22,12 +22,15 @@ 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
@@ -39,6 +42,7 @@ esphome/components/as5600/* @ammmze
 esphome/components/as5600/sensor/* @ammmze
 esphome/components/as7341/* @mrgnr
 esphome/components/async_tcp/* @OttoWinter
+esphome/components/at581x/* @X-Ryl669
 esphome/components/atc_mithermometer/* @ahpohl
 esphome/components/atm90e26/* @danieltwagner
 esphome/components/b_parasite/* @rbaron
@@ -78,12 +82,16 @@ 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_arc/* @MagicBear
 esphome/components/daikin_brc/* @hagak
 esphome/components/daly_bms/* @s1lvi0
 esphome/components/dashboard_import/* @esphome/core
+esphome/components/datetime/* @jesserockz @rfdarter
 esphome/components/debug/* @OttoWinter
 esphome/components/delonghi/* @grob6000
 esphome/components/dfplayer/* @glmnet
@@ -97,6 +105,7 @@ 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/ens210/* @itn3rd77
 esphome/components/esp32/* @esphome/core
@@ -106,6 +115,7 @@ esphome/components/esp32_ble_server/* @Rapsssito @clydebarrow @jesserockz
 esphome/components/esp32_camera_web_server/* @ayufan
 esphome/components/esp32_can/* @Sympatron
 esphome/components/esp32_improv/* @jesserockz
+esphome/components/esp32_rmt/* @jesserockz
 esphome/components/esp32_rmt_led_strip/* @jesserockz
 esphome/components/esp8266/* @esphome/core
 esphome/components/ethernet_info/* @gtjadsonsantos
@@ -115,7 +125,8 @@ esphome/components/ezo_pmp/* @carlos-sarmiento
 esphome/components/factory_reset/* @anatoly-savchenkov
 esphome/components/fastled_base/* @OttoWinter
 esphome/components/feedback/* @ianchi
-esphome/components/fingerprint_grow/* @OnFreund @loongyh
+esphome/components/fingerprint_grow/* @OnFreund @alexborro @loongyh
+esphome/components/font/* @clydebarrow @esphome/core
 esphome/components/fs3000/* @kahrendt
 esphome/components/ft5x06/* @clydebarrow
 esphome/components/ft63x6/* @gpambrozio
@@ -145,6 +156,7 @@ 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
@@ -163,7 +175,9 @@ esphome/components/inkplate6/* @jesserockz
 esphome/components/integration/* @OttoWinter
 esphome/components/internal_temperature/* @Mat931
 esphome/components/interval/* @esphome/core
+esphome/components/jsn_sr04t/* @Mafus1
 esphome/components/json/* @OttoWinter
+esphome/components/kamstrup_kmp/* @cfeenstra1024
 esphome/components/key_collector/* @ssieb
 esphome/components/key_provider/* @ssieb
 esphome/components/kuntze/* @ssieb
@@ -262,6 +276,7 @@ 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
@@ -275,6 +290,7 @@ 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
@@ -282,6 +298,7 @@ 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
@@ -293,6 +310,7 @@ esphome/components/sfa30/* @ghsensdev
 esphome/components/sgp40/* @SenexCrenshaw
 esphome/components/sgp4x/* @SenexCrenshaw @martgras
 esphome/components/shelly_dimmer/* @edge90 @rnauber
+esphome/components/sht3xd/* @mrtoy-me
 esphome/components/sht4x/* @sjtrny
 esphome/components/shutdown/* @esphome/core @jsuanet
 esphome/components/sigma_delta_output/* @Cat-Ion
@@ -326,11 +344,13 @@ 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
 esphome/components/substitutions/* @esphome/core
 esphome/components/sun/* @OttoWinter
+esphome/components/sun_gtil2/* @Mat931
 esphome/components/switch/* @esphome/core
 esphome/components/t6615/* @tylermenezes
 esphome/components/tca9548a/* @andreashergert1984
@@ -338,10 +358,13 @@ 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/tlc5971/* @IJIJI
 esphome/components/tm1621/* @Philippe12
 esphome/components/tm1637/* @glmnet
 esphome/components/tm1638/* @skykingjwc
@@ -369,6 +392,7 @@ 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
@@ -382,6 +406,7 @@ esphome/components/wireguard/* @droscy @lhoracek @thomas0bernard
 esphome/components/wl_134/* @hobbypunk90
 esphome/components/x9c/* @EtienneMD
 esphome/components/xgzp68xx/* @gcormier
+esphome/components/xiaomi_hhccjcy10/* @fariouche
 esphome/components/xiaomi_lywsd03mmc/* @ahpohl
 esphome/components/xiaomi_mhoc303/* @drug123
 esphome/components/xiaomi_mhoc401/* @vevsvevs

docker/ha-addon-rootfs/etc/cont-init.d/30-esphome-fork.sh

@@ -0,0 +1,47 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# This file installs the user ESPHome fork if specified.
+# The fork must be up to date with the latest ESPHome dev branch
+# and have no conflicts.
+# This config option only exists in the ESPHome Dev add-on.
+# ==============================================================================
+
+declare esphome_fork
+
+if bashio::config.has_value 'esphome_fork'; then
+  esphome_fork=$(bashio::config 'esphome_fork')
+  # format: [username][/repository]:ref
+  if [[ "$esphome_fork" =~ ^(([^/]+)(/([^:]+))?:)?([^:/]+)$ ]]; then
+    username="${BASH_REMATCH[2]:-esphome}"
+    repository="${BASH_REMATCH[4]:-esphome}"
+    ref="${BASH_REMATCH[5]}"
+  else
+    bashio::exit.nok "Invalid esphome_fork format: $esphome_fork"
+  fi
+  full_url="https://github.com/${username}/${repository}/archive/${ref}.tar.gz"
+  bashio::log.info "Checking forked ESPHome"
+  dev_version=$(python3 -c "from esphome.const import __version__; print(__version__)")
+  bashio::log.info "Downloading ESPHome from fork '${esphome_fork}' (${full_url})..."
+  curl -L -o /tmp/esphome.tar.gz "${full_url}" -qq ||
+    bashio::exit.nok "Failed downloading ESPHome fork."
+  bashio::log.info "Installing ESPHome from fork '${esphome_fork}' (${full_url})..."
+  rm -rf /esphome || bashio::exit.nok "Failed to remove ESPHome."
+  mkdir /esphome
+  tar -zxf /tmp/esphome.tar.gz -C /esphome --strip-components=1 ||
+    bashio::exit.nok "Failed installing ESPHome from fork."
+  pip install -U -e /esphome || bashio::exit.nok "Failed installing ESPHome from fork."
+  rm -f /tmp/esphome.tar.gz
+  fork_version=$(python3 -c "from esphome.const import __version__; print(__version__)")
+
+  if [[ "$fork_version" != "$dev_version" ]]; then
+    bashio::log.error "############################"
+    bashio::log.error "Uninstalled fork as version does not match"
+    bashio::log.error "Update (or ask the author to update) the branch"
+    bashio::log.error "This is important as the dev addon and the dev ESPHome"
+    bashio::log.error "branch can have changes that are not compatible with old forks"
+    bashio::log.error "and get reported as bugs which we cannot solve easily."
+    bashio::log.error "############################"
+    bashio::exit.nok
+  fi
+  bashio::log.info "Installed ESPHome from fork '${esphome_fork}' (${full_url})..."
+fi

esphome/__main__.py

@@ -356,8 +356,27 @@ def upload_using_platformio(
     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)
@@ -414,6 +433,7 @@ 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:
@@ -838,6 +858,7 @@ def parse_args(argv):
     parser_logs = subparsers.add_parser(
         "logs",
         help="Validate the configuration and show all logs.",
+        aliases=["log"],
         parents=[mqtt_options],
     )
     parser_logs.add_argument(

esphome/codegen.py

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

esphome/components/ade7953_base/__init__.py

@@ -41,6 +41,7 @@ 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,
@@ -155,6 +156,7 @@ ADE7953_CONFIG_SCHEMA = cv.Schema(
         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"))
 
@@ -174,6 +176,9 @@ async def register_ade7953(var, config):
     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,

esphome/components/ade7953_base/ade7953_base.cpp

@@ -6,6 +6,9 @@ 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();
@@ -34,6 +37,7 @@ void ADE7953::setup() {
     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;
   });
 }
@@ -52,6 +56,7 @@ void ADE7953::dump_config() {
   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_);
@@ -85,6 +90,7 @@ void ADE7953::update() {
 
   uint32_t val;
   uint16_t val_16;
+  uint16_t reg;
 
   // Power factor
   err = this->ade_read_16(0x010A, &val_16);
@@ -92,23 +98,36 @@ void ADE7953::update() {
   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
-  err = this->ade_read_32(0x0310, &val);
+  reg = this->use_acc_energy_regs_ ? 0x0322 : 0x0310;
-  ADE_PUBLISH(apparent_power_a, (int32_t) val, 154.0f);
+  err = this->ade_read_32(reg, &val);
-  err = this->ade_read_32(0x0311, &val);
+  ADE_PUBLISH(apparent_power_a, (int32_t) val, pf);
-  ADE_PUBLISH(apparent_power_b, (int32_t) val, 154.0f);
+  err = this->ade_read_32(reg + 1, &val);
+  ADE_PUBLISH(apparent_power_b, (int32_t) val, pf);
 
   // Active power
-  err = this->ade_read_32(0x0312, &val);
+  reg = this->use_acc_energy_regs_ ? 0x031E : 0x0312;
-  ADE_PUBLISH(active_power_a, (int32_t) val, 154.0f);
+  err = this->ade_read_32(reg, &val);
-  err = this->ade_read_32(0x0313, &val);
+  ADE_PUBLISH(active_power_a, (int32_t) val, pf);
-  ADE_PUBLISH(active_power_b, (int32_t) val, 154.0f);
+  err = this->ade_read_32(reg + 1, &val);
+  ADE_PUBLISH(active_power_b, (int32_t) val, pf);
 
   // Reactive power
-  err = this->ade_read_32(0x0314, &val);
+  reg = this->use_acc_energy_regs_ ? 0x0320 : 0x0314;
-  ADE_PUBLISH(reactive_power_a, (int32_t) val, 154.0f);
+  err = this->ade_read_32(reg, &val);
-  err = this->ade_read_32(0x0315, &val);
+  ADE_PUBLISH(reactive_power_a, (int32_t) val, pf);
-  ADE_PUBLISH(reactive_power_b, (int32_t) val, 154.0f);
+  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);

esphome/components/ade7953_base/ade7953_base.h

@@ -52,6 +52,8 @@ class ADE7953 : public PollingComponent, public sensor::Sensor {
   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; }
 
@@ -103,6 +105,8 @@ class ADE7953 : public PollingComponent, public sensor::Sensor {
   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;
 

esphome/components/ade7953_i2c/ade7953_i2c.cpp

@@ -13,29 +13,29 @@ void AdE7953I2c::dump_config() {
   ade7953_base::ADE7953::dump_config();
 }
 bool AdE7953I2c::ade_write_8(uint16_t reg, uint8_t value) {
-  std::vector<uint8_t> data(3);
+  uint8_t data[3];
-  data.push_back(reg >> 8);
+  data[0] = reg >> 8;
-  data.push_back(reg >> 0);
+  data[1] = reg >> 0;
-  data.push_back(value);
+  data[2] = value;
-  return this->write(data.data(), data.size()) != i2c::ERROR_OK;
+  return this->write(data, 3) != i2c::ERROR_OK;
 }
 bool AdE7953I2c::ade_write_16(uint16_t reg, uint16_t value) {
-  std::vector<uint8_t> data(4);
+  uint8_t data[4];
-  data.push_back(reg >> 8);
+  data[0] = reg >> 8;
-  data.push_back(reg >> 0);
+  data[1] = reg >> 0;
-  data.push_back(value >> 8);
+  data[2] = value >> 8;
-  data.push_back(value >> 0);
+  data[3] = value >> 0;
-  return this->write(data.data(), data.size()) != i2c::ERROR_OK;
+  return this->write(data, 4) != i2c::ERROR_OK;
 }
 bool AdE7953I2c::ade_write_32(uint16_t reg, uint32_t value) {
-  std::vector<uint8_t> data(6);
+  uint8_t data[6];
-  data.push_back(reg >> 8);
+  data[0] = reg >> 8;
-  data.push_back(reg >> 0);
+  data[1] = reg >> 0;
-  data.push_back(value >> 24);
+  data[2] = value >> 24;
-  data.push_back(value >> 16);
+  data[3] = value >> 16;
-  data.push_back(value >> 8);
+  data[4] = value >> 8;
-  data.push_back(value >> 0);
+  data[5] = value >> 0;
-  return this->write(data.data(), data.size()) != i2c::ERROR_OK;
+  return this->write(data, 6) != i2c::ERROR_OK;
 }
 bool AdE7953I2c::ade_read_8(uint16_t reg, uint8_t *value) {
   uint8_t reg_data[2];

esphome/components/ads1115/__init__.py

@@ -4,13 +4,14 @@ from esphome.components import i2c
 from esphome.const import CONF_ID
 
 DEPENDENCIES = ["i2c"]
-AUTO_LOAD = ["sensor", "voltage_sampler"]
 MULTI_CONF = True
 
 ads1115_ns = cg.esphome_ns.namespace("ads1115")
 ADS1115Component = ads1115_ns.class_("ADS1115Component", cg.Component, i2c.I2CDevice)
 
 CONF_CONTINUOUS_MODE = "continuous_mode"
+CONF_ADS1115_ID = "ads1115_id"
+
 CONFIG_SCHEMA = (
     cv.Schema(
         {

esphome/components/ads1115/ads1115.cpp

@@ -1,6 +1,6 @@
 #include "ads1115.h"
-#include "esphome/core/log.h"
 #include "esphome/core/hal.h"
+#include "esphome/core/log.h"
 
 namespace esphome {
 namespace ads1115 {
@@ -75,25 +75,19 @@ void ADS1115Component::dump_config() {
   if (this->is_failed()) {
     ESP_LOGE(TAG, "Communication with ADS1115 failed!");
   }
-
-  for (auto *sensor : this->sensors_) {
-    LOG_SENSOR("  ", "Sensor", sensor);
-    ESP_LOGCONFIG(TAG, "    Multiplexer: %u", sensor->get_multiplexer());
-    ESP_LOGCONFIG(TAG, "    Gain: %u", sensor->get_gain());
-    ESP_LOGCONFIG(TAG, "    Resolution: %u", sensor->get_resolution());
-  }
 }
-float ADS1115Component::request_measurement(ADS1115Sensor *sensor) {
+float ADS1115Component::request_measurement(ADS1115Multiplexer multiplexer, ADS1115Gain gain,
+                                            ADS1115Resolution resolution) {
   uint16_t config = this->prev_config_;
   // Multiplexer
   //        0bxBBBxxxxxxxxxxxx
   config &= 0b1000111111111111;
-  config |= (sensor->get_multiplexer() & 0b111) << 12;
+  config |= (multiplexer & 0b111) << 12;
 
   // Gain
   //        0bxxxxBBBxxxxxxxxx
   config &= 0b1111000111111111;
-  config |= (sensor->get_gain() & 0b111) << 9;
+  config |= (gain & 0b111) << 9;
 
   if (!this->continuous_mode_) {
     // Start conversion
@@ -132,7 +126,7 @@ float ADS1115Component::request_measurement(ADS1115Sensor *sensor) {
     return NAN;
   }
 
-  if (sensor->get_resolution() == ADS1015_12_BITS) {
+  if (resolution == ADS1015_12_BITS) {
     bool negative = (raw_conversion >> 15) == 1;
 
     // shift raw_conversion as it's only 12-bits, left justified
@@ -151,8 +145,8 @@ float ADS1115Component::request_measurement(ADS1115Sensor *sensor) {
   auto signed_conversion = static_cast<int16_t>(raw_conversion);
 
   float millivolts;
-  float divider = (sensor->get_resolution() == ADS1115_16_BITS) ? 32768.0f : 2048.0f;
+  float divider = (resolution == ADS1115_16_BITS) ? 32768.0f : 2048.0f;
-  switch (sensor->get_gain()) {
+  switch (gain) {
     case ADS1115_GAIN_6P144:
       millivolts = (signed_conversion * 6144) / divider;
       break;
@@ -179,14 +173,5 @@ float ADS1115Component::request_measurement(ADS1115Sensor *sensor) {
   return millivolts / 1e3f;
 }
 
-float ADS1115Sensor::sample() { return this->parent_->request_measurement(this); }
-void ADS1115Sensor::update() {
-  float v = this->parent_->request_measurement(this);
-  if (!std::isnan(v)) {
-    ESP_LOGD(TAG, "'%s': Got Voltage=%fV", this->get_name().c_str(), v);
-    this->publish_state(v);
-  }
-}
-
 }  // namespace ads1115
 }  // namespace esphome

esphome/components/ads1115/ads1115.h

@@ -1,9 +1,7 @@
 #pragma once
 
-#include "esphome/core/component.h"
-#include "esphome/components/sensor/sensor.h"
 #include "esphome/components/i2c/i2c.h"
-#include "esphome/components/voltage_sampler/voltage_sampler.h"
+#include "esphome/core/component.h"
 
 #include <vector>
 
@@ -35,12 +33,8 @@ enum ADS1115Resolution {
   ADS1015_12_BITS = 12,
 };
 
-class ADS1115Sensor;
-
 class ADS1115Component : public Component, public i2c::I2CDevice {
  public:
-  void register_sensor(ADS1115Sensor *obj) { this->sensors_.push_back(obj); }
-  /// Set up the internal sensor array.
   void setup() override;
   void dump_config() override;
   /// HARDWARE_LATE setup priority
@@ -48,33 +42,12 @@ class ADS1115Component : public Component, public i2c::I2CDevice {
   void set_continuous_mode(bool continuous_mode) { continuous_mode_ = continuous_mode; }
 
   /// Helper method to request a measurement from a sensor.
-  float request_measurement(ADS1115Sensor *sensor);
+  float request_measurement(ADS1115Multiplexer multiplexer, ADS1115Gain gain, ADS1115Resolution resolution);
 
  protected:
-  std::vector<ADS1115Sensor *> sensors_;
   uint16_t prev_config_{0};
   bool continuous_mode_;
 };
 
-/// Internal holder class that is in instance of Sensor so that the hub can create individual sensors.
-class ADS1115Sensor : public sensor::Sensor, public PollingComponent, public voltage_sampler::VoltageSampler {
- public:
-  ADS1115Sensor(ADS1115Component *parent) : parent_(parent) {}
-  void update() override;
-  void set_multiplexer(ADS1115Multiplexer multiplexer) { multiplexer_ = multiplexer; }
-  void set_gain(ADS1115Gain gain) { gain_ = gain; }
-  void set_resolution(ADS1115Resolution resolution) { resolution_ = resolution; }
-  float sample() override;
-  uint8_t get_multiplexer() const { return multiplexer_; }
-  uint8_t get_gain() const { return gain_; }
-  uint8_t get_resolution() const { return resolution_; }
-
- protected:
-  ADS1115Component *parent_;
-  ADS1115Multiplexer multiplexer_;
-  ADS1115Gain gain_;
-  ADS1115Resolution resolution_;
-};
-
 }  // namespace ads1115
 }  // namespace esphome

esphome/components/ads1115/sensor/__init__.py

@@ -10,8 +10,9 @@ from esphome.const import (
     UNIT_VOLT,
     CONF_ID,
 )
-from . import ads1115_ns, ADS1115Component
+from .. import ads1115_ns, ADS1115Component, CONF_ADS1115_ID
 
+AUTO_LOAD = ["voltage_sampler"]
 DEPENDENCIES = ["ads1115"]
 
 ADS1115Multiplexer = ads1115_ns.enum("ADS1115Multiplexer")
@@ -43,20 +44,10 @@ RESOLUTION = {
 }
 
 
-def validate_gain(value):
-    if isinstance(value, float):
-        value = f"{value:0.03f}"
-    elif not isinstance(value, str):
-        raise cv.Invalid(f'invalid gain "{value}"')
-
-    return cv.enum(GAIN)(value)
-
-
 ADS1115Sensor = ads1115_ns.class_(
     "ADS1115Sensor", sensor.Sensor, cg.PollingComponent, voltage_sampler.VoltageSampler
 )
 
-CONF_ADS1115_ID = "ads1115_id"
 CONFIG_SCHEMA = (
     sensor.sensor_schema(
         ADS1115Sensor,
@@ -69,7 +60,7 @@ CONFIG_SCHEMA = (
         {
             cv.GenerateID(CONF_ADS1115_ID): cv.use_id(ADS1115Component),
             cv.Required(CONF_MULTIPLEXER): cv.enum(MUX, upper=True, space="_"),
-            cv.Required(CONF_GAIN): validate_gain,
+            cv.Required(CONF_GAIN): cv.enum(GAIN, string=True),
             cv.Optional(CONF_RESOLUTION, default="16_BITS"): cv.enum(
                 RESOLUTION, upper=True, space="_"
             ),
@@ -80,13 +71,11 @@ CONFIG_SCHEMA = (
 
 
 async def to_code(config):
-    paren = await cg.get_variable(config[CONF_ADS1115_ID])
+    var = cg.new_Pvariable(config[CONF_ID])
-    var = cg.new_Pvariable(config[CONF_ID], paren)
     await sensor.register_sensor(var, config)
     await cg.register_component(var, config)
+    await cg.register_parented(var, config[CONF_ADS1115_ID])
 
     cg.add(var.set_multiplexer(config[CONF_MULTIPLEXER]))
     cg.add(var.set_gain(config[CONF_GAIN]))
     cg.add(var.set_resolution(config[CONF_RESOLUTION]))
-
-    cg.add(paren.register_sensor(var))

esphome/components/ads1115/sensor/ads1115_sensor.cpp

@@ -0,0 +1,30 @@
+#include "ads1115_sensor.h"
+
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace ads1115 {
+
+static const char *const TAG = "ads1115.sensor";
+
+float ADS1115Sensor::sample() {
+  return this->parent_->request_measurement(this->multiplexer_, this->gain_, this->resolution_);
+}
+
+void ADS1115Sensor::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);
+  }
+}
+
+void ADS1115Sensor::dump_config() {
+  LOG_SENSOR("  ", "ADS1115 Sensor", this);
+  ESP_LOGCONFIG(TAG, "    Multiplexer: %u", this->multiplexer_);
+  ESP_LOGCONFIG(TAG, "    Gain: %u", this->gain_);
+  ESP_LOGCONFIG(TAG, "    Resolution: %u", this->resolution_);
+}
+
+}  // namespace ads1115
+}  // namespace esphome

esphome/components/ads1115/sensor/ads1115_sensor.h

@@ -0,0 +1,35 @@
+#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 "../ads1115.h"
+
+namespace esphome {
+namespace ads1115 {
+
+/// Internal holder class that is in instance of Sensor so that the hub can create individual sensors.
+class ADS1115Sensor : public sensor::Sensor,
+                      public PollingComponent,
+                      public voltage_sampler::VoltageSampler,
+                      public Parented<ADS1115Component> {
+ public:
+  void update() override;
+  void set_multiplexer(ADS1115Multiplexer multiplexer) { this->multiplexer_ = multiplexer; }
+  void set_gain(ADS1115Gain gain) { this->gain_ = gain; }
+  void set_resolution(ADS1115Resolution resolution) { this->resolution_ = resolution; }
+  float sample() override;
+
+  void dump_config() override;
+
+ protected:
+  ADS1115Multiplexer multiplexer_;
+  ADS1115Gain gain_;
+  ADS1115Resolution resolution_;
+};
+
+}  // namespace ads1115
+}  // namespace esphome

esphome/components/ads1118/__init__.py

@@ -0,0 +1,25 @@
+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

@@ -0,0 +1,126 @@
+#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

@@ -0,0 +1,46 @@
+#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

@@ -0,0 +1,97 @@
+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

@@ -0,0 +1,29 @@
+#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

@@ -0,0 +1,36 @@
+#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

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

esphome/components/ags10/ags10.cpp

@@ -0,0 +1,212 @@
+#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

@@ -0,0 +1,152 @@
+#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

@@ -0,0 +1,132 @@
+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,7 +15,6 @@
 #include "aht10.h"
 #include "esphome/core/log.h"
 #include "esphome/core/hal.h"
-#include <cinttypes>
 
 namespace esphome {
 namespace aht10 {
@@ -27,7 +26,7 @@ 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_READ_DELAY = 80;       // ms, time to wait for conversion result
 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
@@ -41,19 +40,18 @@ void AHT10Component::setup() {
   }
   delay(AHT10_SOFTRESET_DELAY);
 
-  const uint8_t *init_cmd;
+  i2c::ErrorCode error_code = i2c::ERROR_INVALID_ARGUMENT;
   switch (this->variant_) {
     case AHT10Variant::AHT20:
-      init_cmd = AHT20_INITIALIZE_CMD;
       ESP_LOGCONFIG(TAG, "Setting up AHT20");
+      error_code = this->write(AHT20_INITIALIZE_CMD, sizeof(AHT20_INITIALIZE_CMD));
       break;
     case AHT10Variant::AHT10:
-    default:
-      init_cmd = AHT10_INITIALIZE_CMD;
       ESP_LOGCONFIG(TAG, "Setting up AHT10");
+      error_code = this->write(AHT10_INITIALIZE_CMD, sizeof(AHT10_INITIALIZE_CMD));
+      break;
   }
-
+  if (error_code != i2c::ERROR_OK) {
-  if (this->write(init_cmd, sizeof(init_cmd)) != i2c::ERROR_OK) {
     ESP_LOGE(TAG, "Communication with AHT10 failed!");
     this->mark_failed();
     return;
@@ -83,74 +81,77 @@ void AHT10Component::setup() {
   ESP_LOGV(TAG, "AHT10 initialization");
 }
 
-void AHT10Component::update() {
+void AHT10Component::restart_read_() {
-  if (this->write(AHT10_MEASURE_CMD, sizeof(AHT10_MEASURE_CMD)) != i2c::ERROR_OK) {
+  if (this->read_count_ == AHT10_ATTEMPTS) {
-    ESP_LOGE(TAG, "Communication with AHT10 failed!");
+    this->read_count_ = 0;
-    this->status_set_warning();
+    this->status_set_error("Measurements reading timed-out!");
     return;
   }
+  this->read_count_++;
+  this->set_timeout(AHT10_READ_DELAY, [this]() { this->read_data_(); });
+}
+
+void AHT10Component::read_data_() {
   uint8_t data[6];
-  uint8_t delay_ms = AHT10_DEFAULT_DELAY;
+  if (this->read_count_ > 1)
-  if (this->humidity_sensor_ != nullptr)
+    ESP_LOGD(TAG, "Read attempt %d at %ums", this->read_count_, (unsigned) (millis() - this->start_time_));
-    delay_ms = AHT10_HUMIDITY_DELAY;
+  if (this->read(data, 6) != i2c::ERROR_OK) {
-  bool success = false;
+    this->status_set_warning("AHT10 read failed, retrying soon");
-  for (int i = 0; i < AHT10_ATTEMPTS; ++i) {
+    this->restart_read_();
-    ESP_LOGVV(TAG, "Attempt %d at %6" PRIu32, i, millis());
-    delay(delay_ms);
-    if (this->read(data, 6) != i2c::ERROR_OK) {
-      ESP_LOGD(TAG, "Communication with AHT10 failed, waiting...");
-      continue;
-    }
-
-    if ((data[0] & 0x80) == 0x80) {  // Bit[7] = 0b1, device is busy
-      ESP_LOGD(TAG, "AHT10 is busy, waiting...");
-    } else if (data[1] == 0x0 && data[2] == 0x0 && (data[3] >> 4) == 0x0) {
-      // Unrealistic humidity (0x0)
-      if (this->humidity_sensor_ == nullptr) {
-        ESP_LOGVV(TAG, "ATH10 Unrealistic humidity (0x0), but humidity is not required");
-        break;
-      } else {
-        ESP_LOGD(TAG, "ATH10 Unrealistic humidity (0x0), retrying...");
-        if (this->write(AHT10_MEASURE_CMD, sizeof(AHT10_MEASURE_CMD)) != i2c::ERROR_OK) {
-          ESP_LOGE(TAG, "Communication with AHT10 failed!");
-          this->status_set_warning();
-          return;
-        }
-      }
-    } else {
-      // data is valid, we can break the loop
-      ESP_LOGVV(TAG, "Answer at %6" PRIu32, millis());
-      success = true;
-      break;
-    }
-  }
-  if (!success || (data[0] & 0x80) == 0x80) {
-    ESP_LOGE(TAG, "Measurements reading timed-out!");
-    this->status_set_warning();
     return;
   }
 
+  if ((data[0] & 0x80) == 0x80) {  // Bit[7] = 0b1, device is busy
+    ESP_LOGD(TAG, "AHT10 is busy, waiting...");
+    this->restart_read_();
+    return;
+  }
+  if (data[1] == 0x0 && data[2] == 0x0 && (data[3] >> 4) == 0x0) {
+    // Unrealistic humidity (0x0)
+    if (this->humidity_sensor_ == nullptr) {
+      ESP_LOGV(TAG, "ATH10 Unrealistic humidity (0x0), but humidity is not required");
+    } else {
+      ESP_LOGD(TAG, "ATH10 Unrealistic humidity (0x0), retrying...");
+      if (this->write(AHT10_MEASURE_CMD, sizeof(AHT10_MEASURE_CMD)) != i2c::ERROR_OK) {
+        this->status_set_warning("Communication with AHT10 failed!");
+      }
+      this->restart_read_();
+      return;
+    }
+  }
+  if (this->read_count_ > 1)
+    ESP_LOGD(TAG, "Success at %ums", (unsigned) (millis() - this->start_time_));
   uint32_t raw_temperature = ((data[3] & 0x0F) << 16) | (data[4] << 8) | data[5];
   uint32_t raw_humidity = ((data[1] << 16) | (data[2] << 8) | data[3]) >> 4;
 
-  float temperature = ((200.0f * (float) raw_temperature) / 1048576.0f) - 50.0f;
-  float humidity;
-  if (raw_humidity == 0) {  // unrealistic value
-    humidity = NAN;
-  } else {
-    humidity = (float) raw_humidity * 100.0f / 1048576.0f;
-  }
-
   if (this->temperature_sensor_ != nullptr) {
+    float temperature = ((200.0f * (float) raw_temperature) / 1048576.0f) - 50.0f;
     this->temperature_sensor_->publish_state(temperature);
   }
   if (this->humidity_sensor_ != nullptr) {
+    float humidity;
+    if (raw_humidity == 0) {  // unrealistic value
+      humidity = NAN;
+    } else {
+      humidity = (float) raw_humidity * 100.0f / 1048576.0f;
+    }
     if (std::isnan(humidity)) {
       ESP_LOGW(TAG, "Invalid humidity! Sensor reported 0%% Hum");
     }
     this->humidity_sensor_->publish_state(humidity);
   }
   this->status_clear_warning();
+  this->read_count_ = 0;
+}
+void AHT10Component::update() {
+  if (this->read_count_ != 0)
+    return;
+  this->start_time_ = millis();
+  if (this->write(AHT10_MEASURE_CMD, sizeof(AHT10_MEASURE_CMD)) != i2c::ERROR_OK) {
+    this->status_set_warning("Communication with AHT10 failed!");
+    return;
+  }
+  this->restart_read_();
 }
 
 float AHT10Component::get_setup_priority() const { return setup_priority::DATA; }

esphome/components/aht10/aht10.h

@@ -26,6 +26,10 @@ class AHT10Component : public PollingComponent, public i2c::I2CDevice {
   sensor::Sensor *temperature_sensor_{nullptr};
   sensor::Sensor *humidity_sensor_{nullptr};
   AHT10Variant variant_{};
+  unsigned read_count_{};
+  void read_data_();
+  void restart_read_();
+  uint32_t start_time_{};
 };
 
 }  // namespace aht10

esphome/components/am2315c/__init__.py

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

esphome/components/am2315c/am2315c.cpp

@@ -0,0 +1,200 @@
+// MIT License
+//
+// Copyright (c) 2023-2024 Rob Tillaart
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+#include "am2315c.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace am2315c {
+
+static const char *const TAG = "am2315c";
+
+uint8_t AM2315C::crc8_(uint8_t *data, uint8_t len) {
+  uint8_t crc = 0xFF;
+  while (len--) {
+    crc ^= *data++;
+    for (uint8_t i = 0; i < 8; i++) {
+      if (crc & 0x80) {
+        crc <<= 1;
+        crc ^= 0x31;
+      } else {
+        crc <<= 1;
+      }
+    }
+  }
+  return crc;
+}
+
+bool AM2315C::reset_register_(uint8_t reg) {
+  //  code based on demo code sent by www.aosong.com
+  //  no further documentation.
+  //  0x1B returned 18, 0, 4
+  //  0x1C returned 18, 65, 0
+  //  0x1E returned 18, 8, 0
+  //    18 seems to be status register
+  //    other values unknown.
+  uint8_t data[3];
+  data[0] = reg;
+  data[1] = 0;
+  data[2] = 0;
+  ESP_LOGD(TAG, "Reset register: 0x%02x", reg);
+  if (this->write(data, 3) != i2c::ERROR_OK) {
+    ESP_LOGE(TAG, "Write failed!");
+    this->mark_failed();
+    return false;
+  }
+  delay(5);
+  if (this->read(data, 3) != i2c::ERROR_OK) {
+    ESP_LOGE(TAG, "Read failed!");
+    this->mark_failed();
+    return false;
+  }
+  delay(10);
+  data[0] = 0xB0 | reg;
+  if (this->write(data, 3) != i2c::ERROR_OK) {
+    ESP_LOGE(TAG, "Write failed!");
+    this->mark_failed();
+    return false;
+  }
+  delay(5);
+  return true;
+}
+
+bool AM2315C::convert_(uint8_t *data, float &humidity, float &temperature) {
+  uint32_t raw;
+  raw = (data[1] << 12) | (data[2] << 4) | (data[3] >> 4);
+  humidity = raw * 9.5367431640625e-5;
+  raw = ((data[3] & 0x0F) << 16) | (data[4] << 8) | data[5];
+  temperature = raw * 1.9073486328125e-4 - 50;
+  return this->crc8_(data, 6) == data[6];
+}
+
+void AM2315C::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up AM2315C...");
+
+  // get status
+  uint8_t status = 0;
+  if (this->read(&status, 1) != i2c::ERROR_OK) {
+    ESP_LOGE(TAG, "Read failed!");
+    this->mark_failed();
+    return;
+  }
+
+  // reset registers if required, according to the datasheet
+  // this can be required after power on, although this was
+  // never required during testing
+  if ((status & 0x18) != 0x18) {
+    ESP_LOGD(TAG, "Resetting AM2315C registers");
+    if (!this->reset_register_(0x1B)) {
+      this->mark_failed();
+      return;
+    }
+    if (!this->reset_register_(0x1C)) {
+      this->mark_failed();
+      return;
+    }
+    if (!this->reset_register_(0x1E)) {
+      this->mark_failed();
+      return;
+    }
+  }
+}
+
+void AM2315C::update() {
+  // request measurement
+  uint8_t data[3];
+  data[0] = 0xAC;
+  data[1] = 0x33;
+  data[2] = 0x00;
+  if (this->write(data, 3) != i2c::ERROR_OK) {
+    ESP_LOGE(TAG, "Write failed!");
+    this->mark_failed();
+    return;
+  }
+
+  // wait for hw to complete measurement
+  set_timeout(160, [this]() {
+    // check status
+    uint8_t status = 0;
+    if (this->read(&status, 1) != i2c::ERROR_OK) {
+      ESP_LOGE(TAG, "Read failed!");
+      this->mark_failed();
+      return;
+    }
+    if ((status & 0x80) == 0x80) {
+      ESP_LOGE(TAG, "HW still busy!");
+      this->mark_failed();
+      return;
+    }
+
+    // read
+    uint8_t data[7];
+    if (this->read(data, 7) != i2c::ERROR_OK) {
+      ESP_LOGE(TAG, "Read failed!");
+      this->mark_failed();
+      return;
+    }
+
+    // check for all zeros
+    bool zeros = true;
+    for (uint8_t i : data) {
+      zeros = zeros && (i == 0);
+    }
+    if (zeros) {
+      ESP_LOGW(TAG, "Data all zeros!");
+      this->status_set_warning();
+      return;
+    }
+
+    // convert
+    float temperature = 0.0;
+    float humidity = 0.0;
+    if (this->convert_(data, humidity, temperature)) {
+      if (this->temperature_sensor_ != nullptr) {
+        this->temperature_sensor_->publish_state(temperature);
+      }
+      if (this->humidity_sensor_ != nullptr) {
+        this->humidity_sensor_->publish_state(humidity);
+      }
+      this->status_clear_warning();
+    } else {
+      ESP_LOGW(TAG, "CRC failed!");
+      this->status_set_warning();
+    }
+  });
+}
+
+void AM2315C::dump_config() {
+  ESP_LOGCONFIG(TAG, "AM2315C:");
+  LOG_I2C_DEVICE(this);
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, "Communication with AM2315C failed!");
+  }
+  LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
+  LOG_SENSOR("  ", "Humidity", this->humidity_sensor_);
+}
+
+float AM2315C::get_setup_priority() const { return setup_priority::DATA; }
+
+}  // namespace am2315c
+}  // namespace esphome

esphome/components/am2315c/am2315c.h

@@ -0,0 +1,51 @@
+// MIT License
+//
+// Copyright (c) 2023-2024 Rob Tillaart
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace am2315c {
+
+class AM2315C : public PollingComponent, public i2c::I2CDevice {
+ public:
+  void dump_config() override;
+  void update() override;
+  void setup() override;
+  float get_setup_priority() const override;
+
+  void set_temperature_sensor(sensor::Sensor *temperature_sensor) { this->temperature_sensor_ = temperature_sensor; }
+  void set_humidity_sensor(sensor::Sensor *humidity_sensor) { this->humidity_sensor_ = humidity_sensor; }
+
+ protected:
+  uint8_t crc8_(uint8_t *data, uint8_t len);
+  bool convert_(uint8_t *data, float &humidity, float &temperature);
+  bool reset_register_(uint8_t reg);
+
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
+};
+
+}  // namespace am2315c
+}  // namespace esphome

esphome/components/am2315c/sensor.py

@@ -0,0 +1,54 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import (
+    CONF_HUMIDITY,
+    CONF_ID,
+    CONF_TEMPERATURE,
+    DEVICE_CLASS_HUMIDITY,
+    DEVICE_CLASS_TEMPERATURE,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_CELSIUS,
+    UNIT_PERCENT,
+)
+
+DEPENDENCIES = ["i2c"]
+
+am2315c_ns = cg.esphome_ns.namespace("am2315c")
+AM2315C = am2315c_ns.class_("AM2315C", cg.PollingComponent, i2c.I2CDevice)
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(AM2315C),
+            cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
+                unit_of_measurement=UNIT_CELSIUS,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_TEMPERATURE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(
+                unit_of_measurement=UNIT_PERCENT,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_HUMIDITY,
+                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 temperature_config := config.get(CONF_TEMPERATURE):
+        sens = await sensor.new_sensor(temperature_config)
+        cg.add(var.set_temperature_sensor(sens))
+
+    if humidity_config := config.get(CONF_HUMIDITY):
+        sens = await sensor.new_sensor(humidity_config)
+        cg.add(var.set_humidity_sensor(sens))

esphome/components/api/api.proto

@@ -44,6 +44,8 @@ service APIConnection {
   rpc button_command (ButtonCommandRequest) returns (void) {}
   rpc lock_command (LockCommandRequest) returns (void) {}
   rpc media_player_command (MediaPlayerCommandRequest) returns (void) {}
+  rpc date_command (DateCommandRequest) returns (void) {}
+  rpc time_command (TimeCommandRequest) returns (void) {}
 
   rpc subscribe_bluetooth_le_advertisements(SubscribeBluetoothLEAdvertisementsRequest) returns (void) {}
   rpc bluetooth_device_request(BluetoothDeviceRequest) returns (void) {}
@@ -216,7 +218,8 @@ message DeviceInfoResponse {
 
   string friendly_name = 13;
 
-  uint32 voice_assistant_version = 14;
+  uint32 legacy_voice_assistant_version = 14;
+  uint32 voice_assistant_feature_flags = 17;
 
   string suggested_area = 16;
 }
@@ -1421,12 +1424,18 @@ message BluetoothDeviceClearCacheResponse {
 }
 
 // ==================== PUSH TO TALK ====================
+enum VoiceAssistantSubscribeFlag {
+  VOICE_ASSISTANT_SUBSCRIBE_NONE = 0;
+  VOICE_ASSISTANT_SUBSCRIBE_API_AUDIO = 1;
+}
+
 message SubscribeVoiceAssistantRequest {
   option (id) = 89;
   option (source) = SOURCE_CLIENT;
   option (ifdef) = "USE_VOICE_ASSISTANT";
 
   bool subscribe = 1;
+  uint32 flags = 2;
 }
 
 enum VoiceAssistantRequestFlag {
@@ -1494,6 +1503,16 @@ message VoiceAssistantEventResponse {
   repeated VoiceAssistantEventData data = 2;
 }
 
+message VoiceAssistantAudio {
+  option (id) = 106;
+  option (source) = SOURCE_BOTH;
+  option (ifdef) = "USE_VOICE_ASSISTANT";
+
+  bytes data = 1;
+  bool end = 2;
+}
+
+
 // ==================== ALARM CONTROL PANEL ====================
 enum AlarmControlPanelState {
   ALARM_STATE_DISARMED = 0;
@@ -1598,3 +1617,86 @@ message TextCommandRequest {
   fixed32 key = 1;
   string state = 2;
 }
+
+
+// ==================== DATETIME DATE ====================
+message ListEntitiesDateResponse {
+  option (id) = 100;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_DATETIME_DATE";
+
+  string object_id = 1;
+  fixed32 key = 2;
+  string name = 3;
+  string unique_id = 4;
+
+  string icon = 5;
+  bool disabled_by_default = 6;
+  EntityCategory entity_category = 7;
+}
+message DateStateResponse {
+  option (id) = 101;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_DATETIME_DATE";
+  option (no_delay) = true;
+
+  fixed32 key = 1;
+  // If the date does not have a valid state yet.
+  // Equivalent to `!obj->has_state()` - inverse logic to make state packets smaller
+  bool missing_state = 2;
+  uint32 year = 3;
+  uint32 month = 4;
+  uint32 day = 5;
+}
+message DateCommandRequest {
+  option (id) = 102;
+  option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_DATETIME_DATE";
+  option (no_delay) = true;
+
+  fixed32 key = 1;
+  uint32 year = 2;
+  uint32 month = 3;
+  uint32 day = 4;
+}
+
+// ==================== DATETIME TIME ====================
+message ListEntitiesTimeResponse {
+  option (id) = 103;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_DATETIME_TIME";
+
+  string object_id = 1;
+  fixed32 key = 2;
+  string name = 3;
+  string unique_id = 4;
+
+  string icon = 5;
+  bool disabled_by_default = 6;
+  EntityCategory entity_category = 7;
+}
+message TimeStateResponse {
+  option (id) = 104;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_DATETIME_TIME";
+  option (no_delay) = true;
+
+  fixed32 key = 1;
+  // If the time does not have a valid state yet.
+  // Equivalent to `!obj->has_state()` - inverse logic to make state packets smaller
+  bool missing_state = 2;
+  uint32 hour = 3;
+  uint32 minute = 4;
+  uint32 second = 5;
+}
+message TimeCommandRequest {
+  option (id) = 105;
+  option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_DATETIME_TIME";
+  option (no_delay) = true;
+
+  fixed32 key = 1;
+  uint32 hour = 2;
+  uint32 minute = 3;
+  uint32 second = 4;
+}

esphome/components/api/api_connection.cpp

@@ -698,6 +698,80 @@ void APIConnection::number_command(const NumberCommandRequest &msg) {
 }
 #endif
 
+#ifdef USE_DATETIME_DATE
+bool APIConnection::send_date_state(datetime::DateEntity *date) {
+  if (!this->state_subscription_)
+    return false;
+
+  DateStateResponse resp{};
+  resp.key = date->get_object_id_hash();
+  resp.missing_state = !date->has_state();
+  resp.year = date->year;
+  resp.month = date->month;
+  resp.day = date->day;
+  return this->send_date_state_response(resp);
+}
+bool APIConnection::send_date_info(datetime::DateEntity *date) {
+  ListEntitiesDateResponse msg;
+  msg.key = date->get_object_id_hash();
+  msg.object_id = date->get_object_id();
+  if (date->has_own_name())
+    msg.name = date->get_name();
+  msg.unique_id = get_default_unique_id("date", date);
+  msg.icon = date->get_icon();
+  msg.disabled_by_default = date->is_disabled_by_default();
+  msg.entity_category = static_cast<enums::EntityCategory>(date->get_entity_category());
+
+  return this->send_list_entities_date_response(msg);
+}
+void APIConnection::date_command(const DateCommandRequest &msg) {
+  datetime::DateEntity *date = App.get_date_by_key(msg.key);
+  if (date == nullptr)
+    return;
+
+  auto call = date->make_call();
+  call.set_date(msg.year, msg.month, msg.day);
+  call.perform();
+}
+#endif
+
+#ifdef USE_DATETIME_TIME
+bool APIConnection::send_time_state(datetime::TimeEntity *time) {
+  if (!this->state_subscription_)
+    return false;
+
+  TimeStateResponse resp{};
+  resp.key = time->get_object_id_hash();
+  resp.missing_state = !time->has_state();
+  resp.hour = time->hour;
+  resp.minute = time->minute;
+  resp.second = time->second;
+  return this->send_time_state_response(resp);
+}
+bool APIConnection::send_time_info(datetime::TimeEntity *time) {
+  ListEntitiesTimeResponse msg;
+  msg.key = time->get_object_id_hash();
+  msg.object_id = time->get_object_id();
+  if (time->has_own_name())
+    msg.name = time->get_name();
+  msg.unique_id = get_default_unique_id("time", time);
+  msg.icon = time->get_icon();
+  msg.disabled_by_default = time->is_disabled_by_default();
+  msg.entity_category = static_cast<enums::EntityCategory>(time->get_entity_category());
+
+  return this->send_list_entities_time_response(msg);
+}
+void APIConnection::time_command(const TimeCommandRequest &msg) {
+  datetime::TimeEntity *time = App.get_time_by_key(msg.key);
+  if (time == nullptr)
+    return;
+
+  auto call = time->make_call();
+  call.set_time(msg.hour, msg.minute, msg.second);
+  call.perform();
+}
+#endif
+
 #ifdef USE_TEXT
 bool APIConnection::send_text_state(text::Text *text, std::string state) {
   if (!this->state_subscription_)
@@ -1003,10 +1077,15 @@ void APIConnection::on_voice_assistant_response(const VoiceAssistantResponse &ms
       voice_assistant::global_voice_assistant->failed_to_start();
       return;
     }
-    struct sockaddr_storage storage;
+    if (msg.port == 0) {
-    socklen_t len = sizeof(storage);
+      // Use API Audio
-    this->helper_->getpeername((struct sockaddr *) &storage, &len);
+      voice_assistant::global_voice_assistant->start_streaming();
-    voice_assistant::global_voice_assistant->start_streaming(&storage, msg.port);
+    } else {
+      struct sockaddr_storage storage;
+      socklen_t len = sizeof(storage);
+      this->helper_->getpeername((struct sockaddr *) &storage, &len);
+      voice_assistant::global_voice_assistant->start_streaming(&storage, msg.port);
+    }
   }
 };
 void APIConnection::on_voice_assistant_event_response(const VoiceAssistantEventResponse &msg) {
@@ -1018,6 +1097,15 @@ void APIConnection::on_voice_assistant_event_response(const VoiceAssistantEventR
     voice_assistant::global_voice_assistant->on_event(msg);
   }
 }
+void APIConnection::on_voice_assistant_audio(const VoiceAssistantAudio &msg) {
+  if (voice_assistant::global_voice_assistant != nullptr) {
+    if (voice_assistant::global_voice_assistant->get_api_connection() != this) {
+      return;
+    }
+
+    voice_assistant::global_voice_assistant->on_audio(msg);
+  }
+};
 
 #endif
 
@@ -1105,7 +1193,7 @@ HelloResponse APIConnection::hello(const HelloRequest &msg) {
 
   HelloResponse resp;
   resp.api_version_major = 1;
-  resp.api_version_minor = 9;
+  resp.api_version_minor = 10;
   resp.server_info = App.get_name() + " (esphome v" ESPHOME_VERSION ")";
   resp.name = App.get_name();
 
@@ -1166,7 +1254,8 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
   resp.bluetooth_proxy_feature_flags = bluetooth_proxy::global_bluetooth_proxy->get_feature_flags();
 #endif
 #ifdef USE_VOICE_ASSISTANT
-  resp.voice_assistant_version = voice_assistant::global_voice_assistant->get_version();
+  resp.legacy_voice_assistant_version = voice_assistant::global_voice_assistant->get_legacy_version();
+  resp.voice_assistant_feature_flags = voice_assistant::global_voice_assistant->get_feature_flags();
 #endif
   return resp;
 }

esphome/components/api/api_connection.h

@@ -72,6 +72,16 @@ class APIConnection : public APIServerConnection {
   bool send_number_info(number::Number *number);
   void number_command(const NumberCommandRequest &msg) override;
 #endif
+#ifdef USE_DATETIME_DATE
+  bool send_date_state(datetime::DateEntity *date);
+  bool send_date_info(datetime::DateEntity *date);
+  void date_command(const DateCommandRequest &msg) override;
+#endif
+#ifdef USE_DATETIME_TIME
+  bool send_time_state(datetime::TimeEntity *time);
+  bool send_time_info(datetime::TimeEntity *time);
+  void time_command(const TimeCommandRequest &msg) override;
+#endif
 #ifdef USE_TEXT
   bool send_text_state(text::Text *text, std::string state);
   bool send_text_info(text::Text *text);
@@ -129,6 +139,7 @@ class APIConnection : public APIServerConnection {
   void subscribe_voice_assistant(const SubscribeVoiceAssistantRequest &msg) override;
   void on_voice_assistant_response(const VoiceAssistantResponse &msg) override;
   void on_voice_assistant_event_response(const VoiceAssistantEventResponse &msg) override;
+  void on_voice_assistant_audio(const VoiceAssistantAudio &msg) override;
 #endif
 
 #ifdef USE_ALARM_CONTROL_PANEL

esphome/components/api/api_pb2.cpp

@@ -410,6 +410,19 @@ const char *proto_enum_to_string<enums::BluetoothDeviceRequestType>(enums::Bluet
 }
 #endif
 #ifdef HAS_PROTO_MESSAGE_DUMP
+template<>
+const char *proto_enum_to_string<enums::VoiceAssistantSubscribeFlag>(enums::VoiceAssistantSubscribeFlag value) {
+  switch (value) {
+    case enums::VOICE_ASSISTANT_SUBSCRIBE_NONE:
+      return "VOICE_ASSISTANT_SUBSCRIBE_NONE";
+    case enums::VOICE_ASSISTANT_SUBSCRIBE_API_AUDIO:
+      return "VOICE_ASSISTANT_SUBSCRIBE_API_AUDIO";
+    default:
+      return "UNKNOWN";
+  }
+}
+#endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::VoiceAssistantRequestFlag>(enums::VoiceAssistantRequestFlag value) {
   switch (value) {
     case enums::VOICE_ASSISTANT_REQUEST_NONE:
@@ -716,7 +729,11 @@ bool DeviceInfoResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
       return true;
     }
     case 14: {
-      this->voice_assistant_version = value.as_uint32();
+      this->legacy_voice_assistant_version = value.as_uint32();
+      return true;
+    }
+    case 17: {
+      this->voice_assistant_feature_flags = value.as_uint32();
       return true;
     }
     default:
@@ -784,7 +801,8 @@ void DeviceInfoResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(15, this->bluetooth_proxy_feature_flags);
   buffer.encode_string(12, this->manufacturer);
   buffer.encode_string(13, this->friendly_name);
-  buffer.encode_uint32(14, this->voice_assistant_version);
+  buffer.encode_uint32(14, this->legacy_voice_assistant_version);
+  buffer.encode_uint32(17, this->voice_assistant_feature_flags);
   buffer.encode_string(16, this->suggested_area);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
@@ -850,8 +868,13 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
   out.append("'").append(this->friendly_name).append("'");
   out.append("\n");
 
-  out.append("  voice_assistant_version: ");
+  out.append("  legacy_voice_assistant_version: ");
-  sprintf(buffer, "%" PRIu32, this->voice_assistant_version);
+  sprintf(buffer, "%" PRIu32, this->legacy_voice_assistant_version);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  voice_assistant_feature_flags: ");
+  sprintf(buffer, "%" PRIu32, this->voice_assistant_feature_flags);
   out.append(buffer);
   out.append("\n");
 
@@ -6514,11 +6537,18 @@ bool SubscribeVoiceAssistantRequest::decode_varint(uint32_t field_id, ProtoVarIn
       this->subscribe = value.as_bool();
       return true;
     }
+    case 2: {
+      this->flags = value.as_uint32();
+      return true;
+    }
     default:
       return false;
   }
 }
-void SubscribeVoiceAssistantRequest::encode(ProtoWriteBuffer buffer) const { buffer.encode_bool(1, this->subscribe); }
+void SubscribeVoiceAssistantRequest::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_bool(1, this->subscribe);
+  buffer.encode_uint32(2, this->flags);
+}
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SubscribeVoiceAssistantRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
@@ -6526,6 +6556,11 @@ void SubscribeVoiceAssistantRequest::dump_to(std::string &out) const {
   out.append("  subscribe: ");
   out.append(YESNO(this->subscribe));
   out.append("\n");
+
+  out.append("  flags: ");
+  sprintf(buffer, "%" PRIu32, this->flags);
+  out.append(buffer);
+  out.append("\n");
   out.append("}");
 }
 #endif
@@ -6752,6 +6787,44 @@ void VoiceAssistantEventResponse::dump_to(std::string &out) const {
   out.append("}");
 }
 #endif
+bool VoiceAssistantAudio::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 2: {
+      this->end = value.as_bool();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool VoiceAssistantAudio::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 1: {
+      this->data = value.as_string();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void VoiceAssistantAudio::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_string(1, this->data);
+  buffer.encode_bool(2, this->end);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void VoiceAssistantAudio::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("VoiceAssistantAudio {\n");
+  out.append("  data: ");
+  out.append("'").append(this->data).append("'");
+  out.append("\n");
+
+  out.append("  end: ");
+  out.append(YESNO(this->end));
+  out.append("\n");
+  out.append("}");
+}
+#endif
 bool ListEntitiesAlarmControlPanelResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
     case 6: {
@@ -7184,6 +7257,444 @@ void TextCommandRequest::dump_to(std::string &out) const {
   out.append("}");
 }
 #endif
+bool ListEntitiesDateResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 6: {
+      this->disabled_by_default = value.as_bool();
+      return true;
+    }
+    case 7: {
+      this->entity_category = value.as_enum<enums::EntityCategory>();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool ListEntitiesDateResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 1: {
+      this->object_id = value.as_string();
+      return true;
+    }
+    case 3: {
+      this->name = value.as_string();
+      return true;
+    }
+    case 4: {
+      this->unique_id = value.as_string();
+      return true;
+    }
+    case 5: {
+      this->icon = value.as_string();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool ListEntitiesDateResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
+  switch (field_id) {
+    case 2: {
+      this->key = value.as_fixed32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void ListEntitiesDateResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_string(1, this->object_id);
+  buffer.encode_fixed32(2, this->key);
+  buffer.encode_string(3, this->name);
+  buffer.encode_string(4, this->unique_id);
+  buffer.encode_string(5, this->icon);
+  buffer.encode_bool(6, this->disabled_by_default);
+  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void ListEntitiesDateResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("ListEntitiesDateResponse {\n");
+  out.append("  object_id: ");
+  out.append("'").append(this->object_id).append("'");
+  out.append("\n");
+
+  out.append("  key: ");
+  sprintf(buffer, "%" PRIu32, this->key);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  name: ");
+  out.append("'").append(this->name).append("'");
+  out.append("\n");
+
+  out.append("  unique_id: ");
+  out.append("'").append(this->unique_id).append("'");
+  out.append("\n");
+
+  out.append("  icon: ");
+  out.append("'").append(this->icon).append("'");
+  out.append("\n");
+
+  out.append("  disabled_by_default: ");
+  out.append(YESNO(this->disabled_by_default));
+  out.append("\n");
+
+  out.append("  entity_category: ");
+  out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool DateStateResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 2: {
+      this->missing_state = value.as_bool();
+      return true;
+    }
+    case 3: {
+      this->year = value.as_uint32();
+      return true;
+    }
+    case 4: {
+      this->month = value.as_uint32();
+      return true;
+    }
+    case 5: {
+      this->day = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool DateStateResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
+  switch (field_id) {
+    case 1: {
+      this->key = value.as_fixed32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void DateStateResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_fixed32(1, this->key);
+  buffer.encode_bool(2, this->missing_state);
+  buffer.encode_uint32(3, this->year);
+  buffer.encode_uint32(4, this->month);
+  buffer.encode_uint32(5, this->day);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void DateStateResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("DateStateResponse {\n");
+  out.append("  key: ");
+  sprintf(buffer, "%" PRIu32, this->key);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  missing_state: ");
+  out.append(YESNO(this->missing_state));
+  out.append("\n");
+
+  out.append("  year: ");
+  sprintf(buffer, "%" PRIu32, this->year);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  month: ");
+  sprintf(buffer, "%" PRIu32, this->month);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  day: ");
+  sprintf(buffer, "%" PRIu32, this->day);
+  out.append(buffer);
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool DateCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 2: {
+      this->year = value.as_uint32();
+      return true;
+    }
+    case 3: {
+      this->month = value.as_uint32();
+      return true;
+    }
+    case 4: {
+      this->day = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool DateCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
+  switch (field_id) {
+    case 1: {
+      this->key = value.as_fixed32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void DateCommandRequest::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_fixed32(1, this->key);
+  buffer.encode_uint32(2, this->year);
+  buffer.encode_uint32(3, this->month);
+  buffer.encode_uint32(4, this->day);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void DateCommandRequest::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("DateCommandRequest {\n");
+  out.append("  key: ");
+  sprintf(buffer, "%" PRIu32, this->key);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  year: ");
+  sprintf(buffer, "%" PRIu32, this->year);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  month: ");
+  sprintf(buffer, "%" PRIu32, this->month);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  day: ");
+  sprintf(buffer, "%" PRIu32, this->day);
+  out.append(buffer);
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool ListEntitiesTimeResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 6: {
+      this->disabled_by_default = value.as_bool();
+      return true;
+    }
+    case 7: {
+      this->entity_category = value.as_enum<enums::EntityCategory>();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool ListEntitiesTimeResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 1: {
+      this->object_id = value.as_string();
+      return true;
+    }
+    case 3: {
+      this->name = value.as_string();
+      return true;
+    }
+    case 4: {
+      this->unique_id = value.as_string();
+      return true;
+    }
+    case 5: {
+      this->icon = value.as_string();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool ListEntitiesTimeResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
+  switch (field_id) {
+    case 2: {
+      this->key = value.as_fixed32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void ListEntitiesTimeResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_string(1, this->object_id);
+  buffer.encode_fixed32(2, this->key);
+  buffer.encode_string(3, this->name);
+  buffer.encode_string(4, this->unique_id);
+  buffer.encode_string(5, this->icon);
+  buffer.encode_bool(6, this->disabled_by_default);
+  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void ListEntitiesTimeResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("ListEntitiesTimeResponse {\n");
+  out.append("  object_id: ");
+  out.append("'").append(this->object_id).append("'");
+  out.append("\n");
+
+  out.append("  key: ");
+  sprintf(buffer, "%" PRIu32, this->key);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  name: ");
+  out.append("'").append(this->name).append("'");
+  out.append("\n");
+
+  out.append("  unique_id: ");
+  out.append("'").append(this->unique_id).append("'");
+  out.append("\n");
+
+  out.append("  icon: ");
+  out.append("'").append(this->icon).append("'");
+  out.append("\n");
+
+  out.append("  disabled_by_default: ");
+  out.append(YESNO(this->disabled_by_default));
+  out.append("\n");
+
+  out.append("  entity_category: ");
+  out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool TimeStateResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 2: {
+      this->missing_state = value.as_bool();
+      return true;
+    }
+    case 3: {
+      this->hour = value.as_uint32();
+      return true;
+    }
+    case 4: {
+      this->minute = value.as_uint32();
+      return true;
+    }
+    case 5: {
+      this->second = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool TimeStateResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
+  switch (field_id) {
+    case 1: {
+      this->key = value.as_fixed32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void TimeStateResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_fixed32(1, this->key);
+  buffer.encode_bool(2, this->missing_state);
+  buffer.encode_uint32(3, this->hour);
+  buffer.encode_uint32(4, this->minute);
+  buffer.encode_uint32(5, this->second);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void TimeStateResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("TimeStateResponse {\n");
+  out.append("  key: ");
+  sprintf(buffer, "%" PRIu32, this->key);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  missing_state: ");
+  out.append(YESNO(this->missing_state));
+  out.append("\n");
+
+  out.append("  hour: ");
+  sprintf(buffer, "%" PRIu32, this->hour);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  minute: ");
+  sprintf(buffer, "%" PRIu32, this->minute);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  second: ");
+  sprintf(buffer, "%" PRIu32, this->second);
+  out.append(buffer);
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool TimeCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 2: {
+      this->hour = value.as_uint32();
+      return true;
+    }
+    case 3: {
+      this->minute = value.as_uint32();
+      return true;
+    }
+    case 4: {
+      this->second = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool TimeCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
+  switch (field_id) {
+    case 1: {
+      this->key = value.as_fixed32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void TimeCommandRequest::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_fixed32(1, this->key);
+  buffer.encode_uint32(2, this->hour);
+  buffer.encode_uint32(3, this->minute);
+  buffer.encode_uint32(4, this->second);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void TimeCommandRequest::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("TimeCommandRequest {\n");
+  out.append("  key: ");
+  sprintf(buffer, "%" PRIu32, this->key);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  hour: ");
+  sprintf(buffer, "%" PRIu32, this->hour);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  minute: ");
+  sprintf(buffer, "%" PRIu32, this->minute);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  second: ");
+  sprintf(buffer, "%" PRIu32, this->second);
+  out.append(buffer);
+  out.append("\n");
+  out.append("}");
+}
+#endif
 
 }  // namespace api
 }  // namespace esphome

esphome/components/api/api_pb2.h

@@ -165,6 +165,10 @@ enum BluetoothDeviceRequestType : uint32_t {
   BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE = 5,
   BLUETOOTH_DEVICE_REQUEST_TYPE_CLEAR_CACHE = 6,
 };
+enum VoiceAssistantSubscribeFlag : uint32_t {
+  VOICE_ASSISTANT_SUBSCRIBE_NONE = 0,
+  VOICE_ASSISTANT_SUBSCRIBE_API_AUDIO = 1,
+};
 enum VoiceAssistantRequestFlag : uint32_t {
   VOICE_ASSISTANT_REQUEST_NONE = 0,
   VOICE_ASSISTANT_REQUEST_USE_VAD = 1,
@@ -327,7 +331,8 @@ class DeviceInfoResponse : public ProtoMessage {
   uint32_t bluetooth_proxy_feature_flags{0};
   std::string manufacturer{};
   std::string friendly_name{};
-  uint32_t voice_assistant_version{0};
+  uint32_t legacy_voice_assistant_version{0};
+  uint32_t voice_assistant_feature_flags{0};
   std::string suggested_area{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
@@ -1674,6 +1679,7 @@ class BluetoothDeviceClearCacheResponse : public ProtoMessage {
 class SubscribeVoiceAssistantRequest : public ProtoMessage {
  public:
   bool subscribe{false};
+  uint32_t flags{0};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -1749,6 +1755,19 @@ class VoiceAssistantEventResponse : public ProtoMessage {
   bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
   bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
+class VoiceAssistantAudio : public ProtoMessage {
+ public:
+  std::string data{};
+  bool end{false};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
 class ListEntitiesAlarmControlPanelResponse : public ProtoMessage {
  public:
   std::string object_id{};
@@ -1850,6 +1869,106 @@ class TextCommandRequest : public ProtoMessage {
   bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
   bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
 };
+class ListEntitiesDateResponse : public ProtoMessage {
+ public:
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
+  std::string unique_id{};
+  std::string icon{};
+  bool disabled_by_default{false};
+  enums::EntityCategory entity_category{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class DateStateResponse : public ProtoMessage {
+ public:
+  uint32_t key{0};
+  bool missing_state{false};
+  uint32_t year{0};
+  uint32_t month{0};
+  uint32_t day{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class DateCommandRequest : public ProtoMessage {
+ public:
+  uint32_t key{0};
+  uint32_t year{0};
+  uint32_t month{0};
+  uint32_t day{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class ListEntitiesTimeResponse : public ProtoMessage {
+ public:
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
+  std::string unique_id{};
+  std::string icon{};
+  bool disabled_by_default{false};
+  enums::EntityCategory entity_category{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class TimeStateResponse : public ProtoMessage {
+ public:
+  uint32_t key{0};
+  bool missing_state{false};
+  uint32_t hour{0};
+  uint32_t minute{0};
+  uint32_t second{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class TimeCommandRequest : public ProtoMessage {
+ public:
+  uint32_t key{0};
+  uint32_t hour{0};
+  uint32_t minute{0};
+  uint32_t second{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
 
 }  // namespace api
 }  // namespace esphome

esphome/components/api/api_pb2_service.cpp

@@ -476,6 +476,14 @@ bool APIServerConnectionBase::send_voice_assistant_request(const VoiceAssistantR
 #endif
 #ifdef USE_VOICE_ASSISTANT
 #endif
+#ifdef USE_VOICE_ASSISTANT
+bool APIServerConnectionBase::send_voice_assistant_audio(const VoiceAssistantAudio &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_voice_assistant_audio: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<VoiceAssistantAudio>(msg, 106);
+}
+#endif
 #ifdef USE_ALARM_CONTROL_PANEL
 bool APIServerConnectionBase::send_list_entities_alarm_control_panel_response(
     const ListEntitiesAlarmControlPanelResponse &msg) {
@@ -513,6 +521,42 @@ bool APIServerConnectionBase::send_text_state_response(const TextStateResponse &
 #endif
 #ifdef USE_TEXT
 #endif
+#ifdef USE_DATETIME_DATE
+bool APIServerConnectionBase::send_list_entities_date_response(const ListEntitiesDateResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_list_entities_date_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<ListEntitiesDateResponse>(msg, 100);
+}
+#endif
+#ifdef USE_DATETIME_DATE
+bool APIServerConnectionBase::send_date_state_response(const DateStateResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_date_state_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<DateStateResponse>(msg, 101);
+}
+#endif
+#ifdef USE_DATETIME_DATE
+#endif
+#ifdef USE_DATETIME_TIME
+bool APIServerConnectionBase::send_list_entities_time_response(const ListEntitiesTimeResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_list_entities_time_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<ListEntitiesTimeResponse>(msg, 103);
+}
+#endif
+#ifdef USE_DATETIME_TIME
+bool APIServerConnectionBase::send_time_state_response(const TimeStateResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_time_state_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<TimeStateResponse>(msg, 104);
+}
+#endif
+#ifdef USE_DATETIME_TIME
+#endif
 bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) {
   switch (msg_type) {
     case 1: {
@@ -942,6 +986,39 @@ bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
       ESP_LOGVV(TAG, "on_text_command_request: %s", msg.dump().c_str());
 #endif
       this->on_text_command_request(msg);
+#endif
+      break;
+    }
+    case 102: {
+#ifdef USE_DATETIME_DATE
+      DateCommandRequest msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_date_command_request: %s", msg.dump().c_str());
+#endif
+      this->on_date_command_request(msg);
+#endif
+      break;
+    }
+    case 105: {
+#ifdef USE_DATETIME_TIME
+      TimeCommandRequest msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_time_command_request: %s", msg.dump().c_str());
+#endif
+      this->on_time_command_request(msg);
+#endif
+      break;
+    }
+    case 106: {
+#ifdef USE_VOICE_ASSISTANT
+      VoiceAssistantAudio msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_voice_assistant_audio: %s", msg.dump().c_str());
+#endif
+      this->on_voice_assistant_audio(msg);
 #endif
       break;
     }
@@ -1218,6 +1295,32 @@ void APIServerConnection::on_media_player_command_request(const MediaPlayerComma
   this->media_player_command(msg);
 }
 #endif
+#ifdef USE_DATETIME_DATE
+void APIServerConnection::on_date_command_request(const DateCommandRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  this->date_command(msg);
+}
+#endif
+#ifdef USE_DATETIME_TIME
+void APIServerConnection::on_time_command_request(const TimeCommandRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  this->time_command(msg);
+}
+#endif
 #ifdef USE_BLUETOOTH_PROXY
 void APIServerConnection::on_subscribe_bluetooth_le_advertisements_request(
     const SubscribeBluetoothLEAdvertisementsRequest &msg) {

esphome/components/api/api_pb2_service.h

@@ -240,6 +240,10 @@ class APIServerConnectionBase : public ProtoService {
 #ifdef USE_VOICE_ASSISTANT
   virtual void on_voice_assistant_event_response(const VoiceAssistantEventResponse &value){};
 #endif
+#ifdef USE_VOICE_ASSISTANT
+  bool send_voice_assistant_audio(const VoiceAssistantAudio &msg);
+  virtual void on_voice_assistant_audio(const VoiceAssistantAudio &value){};
+#endif
 #ifdef USE_ALARM_CONTROL_PANEL
   bool send_list_entities_alarm_control_panel_response(const ListEntitiesAlarmControlPanelResponse &msg);
 #endif
@@ -257,6 +261,24 @@ class APIServerConnectionBase : public ProtoService {
 #endif
 #ifdef USE_TEXT
   virtual void on_text_command_request(const TextCommandRequest &value){};
+#endif
+#ifdef USE_DATETIME_DATE
+  bool send_list_entities_date_response(const ListEntitiesDateResponse &msg);
+#endif
+#ifdef USE_DATETIME_DATE
+  bool send_date_state_response(const DateStateResponse &msg);
+#endif
+#ifdef USE_DATETIME_DATE
+  virtual void on_date_command_request(const DateCommandRequest &value){};
+#endif
+#ifdef USE_DATETIME_TIME
+  bool send_list_entities_time_response(const ListEntitiesTimeResponse &msg);
+#endif
+#ifdef USE_DATETIME_TIME
+  bool send_time_state_response(const TimeStateResponse &msg);
+#endif
+#ifdef USE_DATETIME_TIME
+  virtual void on_time_command_request(const TimeCommandRequest &value){};
 #endif
  protected:
   bool read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) override;
@@ -312,6 +334,12 @@ class APIServerConnection : public APIServerConnectionBase {
 #ifdef USE_MEDIA_PLAYER
   virtual void media_player_command(const MediaPlayerCommandRequest &msg) = 0;
 #endif
+#ifdef USE_DATETIME_DATE
+  virtual void date_command(const DateCommandRequest &msg) = 0;
+#endif
+#ifdef USE_DATETIME_TIME
+  virtual void time_command(const TimeCommandRequest &msg) = 0;
+#endif
 #ifdef USE_BLUETOOTH_PROXY
   virtual void subscribe_bluetooth_le_advertisements(const SubscribeBluetoothLEAdvertisementsRequest &msg) = 0;
 #endif
@@ -398,6 +426,12 @@ class APIServerConnection : public APIServerConnectionBase {
 #ifdef USE_MEDIA_PLAYER
   void on_media_player_command_request(const MediaPlayerCommandRequest &msg) override;
 #endif
+#ifdef USE_DATETIME_DATE
+  void on_date_command_request(const DateCommandRequest &msg) override;
+#endif
+#ifdef USE_DATETIME_TIME
+  void on_time_command_request(const TimeCommandRequest &msg) override;
+#endif
 #ifdef USE_BLUETOOTH_PROXY
   void on_subscribe_bluetooth_le_advertisements_request(const SubscribeBluetoothLEAdvertisementsRequest &msg) override;
 #endif

esphome/components/api/api_server.cpp

@@ -255,6 +255,24 @@ void APIServer::on_number_update(number::Number *obj, float state) {
 }
 #endif
 
+#ifdef USE_DATETIME_DATE
+void APIServer::on_date_update(datetime::DateEntity *obj) {
+  if (obj->is_internal())
+    return;
+  for (auto &c : this->clients_)
+    c->send_date_state(obj);
+}
+#endif
+
+#ifdef USE_DATETIME_TIME
+void APIServer::on_time_update(datetime::TimeEntity *obj) {
+  if (obj->is_internal())
+    return;
+  for (auto &c : this->clients_)
+    c->send_time_state(obj);
+}
+#endif
+
 #ifdef USE_TEXT
 void APIServer::on_text_update(text::Text *obj, const std::string &state) {
   if (obj->is_internal())

esphome/components/api/api_server.h

@@ -66,6 +66,12 @@ class APIServer : public Component, public Controller {
 #ifdef USE_NUMBER
   void on_number_update(number::Number *obj, float state) override;
 #endif
+#ifdef USE_DATETIME_DATE
+  void on_date_update(datetime::DateEntity *obj) override;
+#endif
+#ifdef USE_DATETIME_TIME
+  void on_time_update(datetime::TimeEntity *obj) override;
+#endif
 #ifdef USE_TEXT
   void on_text_update(text::Text *obj, const std::string &state) override;
 #endif

esphome/components/api/list_entities.cpp

@@ -1,8 +1,8 @@
 #include "list_entities.h"
-#include "esphome/core/util.h"
-#include "esphome/core/log.h"
-#include "esphome/core/application.h"
 #include "api_connection.h"
+#include "esphome/core/application.h"
+#include "esphome/core/log.h"
+#include "esphome/core/util.h"
 
 namespace esphome {
 namespace api {
@@ -60,6 +60,14 @@ bool ListEntitiesIterator::on_climate(climate::Climate *climate) { return this->
 bool ListEntitiesIterator::on_number(number::Number *number) { return this->client_->send_number_info(number); }
 #endif
 
+#ifdef USE_DATETIME_DATE
+bool ListEntitiesIterator::on_date(datetime::DateEntity *date) { return this->client_->send_date_info(date); }
+#endif
+
+#ifdef USE_DATETIME_TIME
+bool ListEntitiesIterator::on_time(datetime::TimeEntity *time) { return this->client_->send_time_info(time); }
+#endif
+
 #ifdef USE_TEXT
 bool ListEntitiesIterator::on_text(text::Text *text) { return this->client_->send_text_info(text); }
 #endif

esphome/components/api/list_entities.h

@@ -46,6 +46,12 @@ class ListEntitiesIterator : public ComponentIterator {
 #ifdef USE_NUMBER
   bool on_number(number::Number *number) override;
 #endif
+#ifdef USE_DATETIME_DATE
+  bool on_date(datetime::DateEntity *date) override;
+#endif
+#ifdef USE_DATETIME_TIME
+  bool on_time(datetime::TimeEntity *time) override;
+#endif
 #ifdef USE_TEXT
   bool on_text(text::Text *text) override;
 #endif

esphome/components/api/subscribe_state.cpp

@@ -42,6 +42,12 @@ bool InitialStateIterator::on_number(number::Number *number) {
   return this->client_->send_number_state(number, number->state);
 }
 #endif
+#ifdef USE_DATETIME_DATE
+bool InitialStateIterator::on_date(datetime::DateEntity *date) { return this->client_->send_date_state(date); }
+#endif
+#ifdef USE_DATETIME_TIME
+bool InitialStateIterator::on_time(datetime::TimeEntity *time) { return this->client_->send_time_state(time); }
+#endif
 #ifdef USE_TEXT
 bool InitialStateIterator::on_text(text::Text *text) { return this->client_->send_text_state(text, text->state); }
 #endif

esphome/components/api/subscribe_state.h

@@ -43,6 +43,12 @@ class InitialStateIterator : public ComponentIterator {
 #ifdef USE_NUMBER
   bool on_number(number::Number *number) override;
 #endif
+#ifdef USE_DATETIME_DATE
+  bool on_date(datetime::DateEntity *date) override;
+#endif
+#ifdef USE_DATETIME_TIME
+  bool on_time(datetime::TimeEntity *time) override;
+#endif
 #ifdef USE_TEXT
   bool on_text(text::Text *text) override;
 #endif

esphome/components/at581x/__init__.py

@@ -0,0 +1,224 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import automation, core
+from esphome.components import i2c
+from esphome.automation import maybe_simple_id
+from esphome.const import (
+    CONF_ID,
+    CONF_FREQUENCY,
+)
+
+
+CODEOWNERS = ["@X-Ryl669"]
+DEPENDENCIES = ["i2c"]
+MULTI_CONF = True
+
+
+at581x_ns = cg.esphome_ns.namespace("at581x")
+AT581XComponent = at581x_ns.class_("AT581XComponent", cg.Component, i2c.I2CDevice)
+
+
+CONF_AT581X_ID = "at581x_id"
+
+
+CONF_SENSING_DISTANCE = "sensing_distance"
+CONF_SENSITIVITY = "sensitivity"
+CONF_POWERON_SELFCHECK_TIME = "poweron_selfcheck_time"
+CONF_PROTECT_TIME = "protect_time"
+CONF_TRIGGER_BASE = "trigger_base"
+CONF_TRIGGER_KEEP = "trigger_keep"
+CONF_STAGE_GAIN = "stage_gain"
+CONF_POWER_CONSUMPTION = "power_consumption"
+CONF_HW_FRONTEND_RESET = "hw_frontend_reset"
+
+RADAR_ALLOWED_FREQ = [
+    5696e6,
+    5715e6,
+    5730e6,
+    5748e6,
+    5765e6,
+    5784e6,
+    5800e6,
+    5819e6,
+    5836e6,
+    5851e6,
+    5869e6,
+    5888e6,
+]
+RADAR_ALLOWED_CUR_CONSUMPTION = [
+    48e-6,
+    56e-6,
+    63e-6,
+    70e-6,
+    77e-6,
+    91e-6,
+    105e-6,
+    115e-6,
+    40e-6,
+    44e-6,
+    47e-6,
+    51e-6,
+    54e-6,
+    61e-6,
+    68e-6,
+    78e-6,
+]
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.declare_id(AT581XComponent),
+    }
+)
+
+CONFIG_SCHEMA = cv.All(
+    CONFIG_SCHEMA.extend(i2c.i2c_device_schema(0x28)).extend(cv.COMPONENT_SCHEMA)
+)
+
+
+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)
+
+
+# Actions
+AT581XResetAction = at581x_ns.class_("AT581XResetAction", automation.Action)
+AT581XSettingsAction = at581x_ns.class_("AT581XSettingsAction", automation.Action)
+
+
+@automation.register_action(
+    "at581x.reset",
+    AT581XResetAction,
+    maybe_simple_id(
+        {
+            cv.Required(CONF_ID): cv.use_id(AT581XComponent),
+        }
+    ),
+)
+async def at581x_reset_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    await cg.register_parented(var, config[CONF_ID])
+
+    return var
+
+
+RADAR_SETTINGS_SCHEMA = cv.Schema(
+    {
+        cv.Required(CONF_ID): cv.use_id(AT581XComponent),
+        cv.Optional(CONF_HW_FRONTEND_RESET): cv.templatable(cv.boolean),
+        cv.Optional(CONF_FREQUENCY, default="5800MHz"): cv.templatable(
+            cv.All(cv.frequency, cv.one_of(*RADAR_ALLOWED_FREQ))
+        ),
+        cv.Optional(CONF_SENSING_DISTANCE, default=823): cv.templatable(
+            cv.int_range(min=0, max=1023)
+        ),
+        cv.Optional(CONF_POWERON_SELFCHECK_TIME, default="2000ms"): cv.templatable(
+            cv.All(
+                cv.positive_time_period_milliseconds,
+                cv.Range(max=core.TimePeriod(milliseconds=65535)),
+            )
+        ),
+        cv.Optional(CONF_POWER_CONSUMPTION, default="70uA"): cv.templatable(
+            cv.All(cv.current, cv.one_of(*RADAR_ALLOWED_CUR_CONSUMPTION))
+        ),
+        cv.Optional(CONF_PROTECT_TIME, default="1000ms"): cv.templatable(
+            cv.All(
+                cv.positive_time_period_milliseconds,
+                cv.Range(
+                    min=core.TimePeriod(milliseconds=1),
+                    max=core.TimePeriod(milliseconds=65535),
+                ),
+            )
+        ),
+        cv.Optional(CONF_TRIGGER_BASE, default="500ms"): cv.templatable(
+            cv.All(
+                cv.positive_time_period_milliseconds,
+                cv.Range(
+                    min=core.TimePeriod(milliseconds=1),
+                    max=core.TimePeriod(milliseconds=65535),
+                ),
+            )
+        ),
+        cv.Optional(CONF_TRIGGER_KEEP, default="1500ms"): cv.templatable(
+            cv.All(
+                cv.positive_time_period_milliseconds,
+                cv.Range(
+                    min=core.TimePeriod(milliseconds=1),
+                    max=core.TimePeriod(milliseconds=65535),
+                ),
+            )
+        ),
+        cv.Optional(CONF_STAGE_GAIN, default=3): cv.templatable(
+            cv.int_range(min=0, max=12)
+        ),
+    }
+).add_extra(
+    cv.has_at_least_one_key(
+        CONF_HW_FRONTEND_RESET,
+        CONF_FREQUENCY,
+        CONF_SENSING_DISTANCE,
+    )
+)
+
+
+@automation.register_action(
+    "at581x.settings",
+    AT581XSettingsAction,
+    RADAR_SETTINGS_SCHEMA,
+)
+async def at581x_settings_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    await cg.register_parented(var, config[CONF_ID])
+
+    # Radar configuration
+    if frontend_reset := config.get(CONF_HW_FRONTEND_RESET):
+        template_ = await cg.templatable(frontend_reset, args, int)
+        cg.add(var.set_hw_frontend_reset(template_))
+
+    if freq := config.get(CONF_FREQUENCY):
+        template_ = await cg.templatable(freq, args, float)
+        template_ = int(template_ / 1000000)
+        cg.add(var.set_frequency(template_))
+
+    if sens_dist := config.get(CONF_SENSING_DISTANCE):
+        template_ = await cg.templatable(sens_dist, args, int)
+        cg.add(var.set_sensing_distance(template_))
+
+    if selfcheck := config.get(CONF_POWERON_SELFCHECK_TIME):
+        template_ = await cg.templatable(selfcheck, args, float)
+        if isinstance(template_, cv.TimePeriod):
+            template_ = template_.total_milliseconds
+        template_ = int(template_)
+        cg.add(var.set_poweron_selfcheck_time(template_))
+
+    if protect := config.get(CONF_PROTECT_TIME):
+        template_ = await cg.templatable(protect, args, float)
+        if isinstance(template_, cv.TimePeriod):
+            template_ = template_.total_milliseconds
+        template_ = int(template_)
+        cg.add(var.set_protect_time(template_))
+
+    if trig_base := config.get(CONF_TRIGGER_BASE):
+        template_ = await cg.templatable(trig_base, args, float)
+        if isinstance(template_, cv.TimePeriod):
+            template_ = template_.total_milliseconds
+        template_ = int(template_)
+        cg.add(var.set_trigger_base(template_))
+
+    if trig_keep := config.get(CONF_TRIGGER_KEEP):
+        template_ = await cg.templatable(trig_keep, args, float)
+        if isinstance(template_, cv.TimePeriod):
+            template_ = template_.total_milliseconds
+        template_ = int(template_)
+        cg.add(var.set_trigger_keep(template_))
+
+    if stage_gain := config.get(CONF_STAGE_GAIN):
+        template_ = await cg.templatable(stage_gain, args, int)
+        cg.add(var.set_stage_gain(template_))
+
+    if power := config.get(CONF_POWER_CONSUMPTION):
+        template_ = await cg.templatable(power, args, float)
+        template_ = int(template_ * 1000000)
+        cg.add(var.set_power_consumption(template_))
+
+    return var

esphome/components/at581x/at581x.cpp

@@ -0,0 +1,195 @@
+#include "at581x.h"
+#include "esphome/core/log.h"
+
+/* Select gain for AT581X (3dB per step for level1, 6dB per step for level 2), high value = small gain. (p12) */
+const uint8_t GAIN_ADDR_TABLE[] = {0x5c, 0x63};
+const uint8_t GAIN5C_TABLE[] = {0x08, 0x18, 0x28, 0x38, 0x48, 0x58, 0x68, 0x78, 0x88, 0x98, 0xa8, 0xb8, 0xc8};
+const uint8_t GAIN63_TABLE[] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06};
+const uint8_t GAIN61_VALUE = 0xCA;  // 0xC0 | 0x02 (freq present) | 0x08 (gain present)
+
+/*!< Power consumption configuration table (p12). */
+const uint8_t POWER_TABLE[] = {48, 56, 63, 70, 77, 91, 105, 115, 40, 44, 47, 51, 54, 61, 68, 78};
+const uint8_t POWER67_TABLE[] = {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7};
+const uint8_t POWER68_TABLE[] = {0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8,
+                                 24,  24,  24,  24,  24,  24,  24,  24};  // See Page 12, shift by 3 bits
+
+/*!< Frequency Configuration table (p14/15 of datasheet). */
+const uint8_t FREQ_ADDR = 0x61;
+const uint16_t FREQ_TABLE[] = {5696, 5715, 5730, 5748, 5765, 5784, 5800, 5819, 5836, 5851, 5869, 5888};
+const uint8_t FREQ5F_TABLE[] = {0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x40, 0x41, 0x42, 0x43};
+const uint8_t FREQ60_TABLE[] = {0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9e, 0x9e, 0x9e, 0x9e};
+
+/*!< Value for RF and analog modules switch (p10). */
+const uint8_t RF_OFF_TABLE[] = {0x46, 0xaa, 0x50};
+const uint8_t RF_ON_TABLE[] = {0x45, 0x55, 0xA0};
+const uint8_t RF_REG_ADDR[] = {0x5d, 0x62, 0x51};
+
+/*!< Registers of Lighting delay time. Unit: ms, min 2s (p8) */
+const uint8_t HIGH_LEVEL_DELAY_CONTROL_ADDR = 0x41; /*!< Time_flag_out_ctrl 0x01 */
+const uint8_t HIGH_LEVEL_DELAY_VALUE_ADDR = 0x42;   /*!< Time_flag_out_1 Bit<7:0> */
+
+const uint8_t RESET_ADDR = 0x00;
+
+/*!< Sensing distance address */
+const uint8_t SIGNAL_DETECTION_THRESHOLD_ADDR_LO = 0x10;
+const uint8_t SIGNAL_DETECTION_THRESHOLD_ADDR_HI = 0x11;
+
+/*!< Bit field value for power registers */
+const uint8_t POWER_THRESHOLD_ADDR_HI = 0x68;
+const uint8_t POWER_THRESHOLD_ADDR_LO = 0x67;
+const uint8_t PWR_WORK_TIME_EN = 8;     // Reg 0x67
+const uint8_t PWR_BURST_TIME_EN = 32;   // Reg 0x68
+const uint8_t PWR_THRESH_EN = 64;       // Reg 0x68
+const uint8_t PWR_THRESH_VAL_EN = 128;  // Reg 0x67
+
+/*!< Times */
+const uint8_t TRIGGER_BASE_TIME_ADDR = 0x3D;  // 4 bytes, so up to 0x40
+const uint8_t PROTECT_TIME_ADDR = 0x4E;       // 2 bytes, up to 0x4F
+const uint8_t TRIGGER_KEEP_TIME_ADDR = 0x42;  // 4 bytes, so up to 0x45
+const uint8_t TIME41_VALUE = 1;
+const uint8_t SELF_CHECK_TIME_ADDR = 0x38;  // 2 bytes, up to 0x39
+
+namespace esphome {
+namespace at581x {
+
+static const char *const TAG = "at581x";
+
+bool AT581XComponent::i2c_write_reg(uint8_t addr, uint8_t data) {
+  return this->write_register(addr, &data, 1) == esphome::i2c::NO_ERROR;
+}
+bool AT581XComponent::i2c_write_reg(uint8_t addr, uint32_t data) {
+  return this->i2c_write_reg(addr + 0, uint8_t(data & 0xFF)) &&
+         this->i2c_write_reg(addr + 1, uint8_t((data >> 8) & 0xFF)) &&
+         this->i2c_write_reg(addr + 2, uint8_t((data >> 16) & 0xFF)) &&
+         this->i2c_write_reg(addr + 3, uint8_t((data >> 24) & 0xFF));
+}
+bool AT581XComponent::i2c_write_reg(uint8_t addr, uint16_t data) {
+  return this->i2c_write_reg(addr, uint8_t(data & 0xFF)) && this->i2c_write_reg(addr + 1, uint8_t((data >> 8) & 0xFF));
+}
+
+bool AT581XComponent::i2c_read_reg(uint8_t addr, uint8_t &data) {
+  return this->read_register(addr, &data, 1) == esphome::i2c::NO_ERROR;
+}
+
+void AT581XComponent::setup() { ESP_LOGCONFIG(TAG, "Setting up AT581X..."); }
+void AT581XComponent::dump_config() { LOG_I2C_DEVICE(this); }
+#define ARRAY_SIZE(X) (sizeof(X) / sizeof((X)[0]))
+bool AT581XComponent::i2c_write_config() {
+  ESP_LOGCONFIG(TAG, "Writing new config for AT581X...");
+  ESP_LOGCONFIG(TAG, "Frequency: %dMHz", this->freq_);
+  ESP_LOGCONFIG(TAG, "Sensing distance: %d", this->delta_);
+  ESP_LOGCONFIG(TAG, "Power: %dµA", this->power_);
+  ESP_LOGCONFIG(TAG, "Gain: %d", this->gain_);
+  ESP_LOGCONFIG(TAG, "Trigger base time: %dms", this->trigger_base_time_ms_);
+  ESP_LOGCONFIG(TAG, "Trigger keep time: %dms", this->trigger_keep_time_ms_);
+  ESP_LOGCONFIG(TAG, "Protect time: %dms", this->protect_time_ms_);
+  ESP_LOGCONFIG(TAG, "Self check time: %dms", this->self_check_time_ms_);
+
+  // Set frequency point
+  if (!this->i2c_write_reg(FREQ_ADDR, GAIN61_VALUE)) {
+    ESP_LOGE(TAG, "Failed to write AT581X Freq mode");
+    return false;
+  }
+  // Find the current frequency from the table to know what value to write
+  for (size_t i = 0; i < ARRAY_SIZE(FREQ_TABLE) + 1; i++) {
+    if (i == ARRAY_SIZE(FREQ_TABLE)) {
+      ESP_LOGE(TAG, "Set frequency not found");
+      return false;
+    }
+    if (FREQ_TABLE[i] == this->freq_) {
+      if (!this->i2c_write_reg(0x5F, FREQ5F_TABLE[i]) || !this->i2c_write_reg(0x60, FREQ60_TABLE[i])) {
+        ESP_LOGE(TAG, "Failed to write AT581X Freq value");
+        return false;
+      }
+      break;
+    }
+  }
+
+  // Set distance
+  if (!this->i2c_write_reg(SIGNAL_DETECTION_THRESHOLD_ADDR_LO, (uint8_t) (this->delta_ & 0xFF)) ||
+      !this->i2c_write_reg(SIGNAL_DETECTION_THRESHOLD_ADDR_HI, (uint8_t) (this->delta_ >> 8))) {
+    ESP_LOGE(TAG, "Failed to write AT581X sensing distance low");
+    return false;
+  }
+
+  // Set power setting
+  uint8_t pwr67 = PWR_THRESH_VAL_EN | PWR_WORK_TIME_EN, pwr68 = PWR_BURST_TIME_EN | PWR_THRESH_EN;
+  for (size_t i = 0; i < ARRAY_SIZE(POWER_TABLE) + 1; i++) {
+    if (i == ARRAY_SIZE(POWER_TABLE)) {
+      ESP_LOGE(TAG, "Set power not found");
+      return false;
+    }
+    if (POWER_TABLE[i] == this->power_) {
+      pwr67 |= POWER67_TABLE[i];
+      pwr68 |= POWER68_TABLE[i];  // See Page 12
+      break;
+    }
+  }
+
+  if (!this->i2c_write_reg(POWER_THRESHOLD_ADDR_LO, pwr67) || !this->i2c_write_reg(POWER_THRESHOLD_ADDR_HI, pwr68)) {
+    ESP_LOGE(TAG, "Failed to write AT581X power registers");
+    return false;
+  }
+
+  // Set gain
+  if (!this->i2c_write_reg(GAIN_ADDR_TABLE[0], GAIN5C_TABLE[this->gain_]) ||
+      !this->i2c_write_reg(GAIN_ADDR_TABLE[1], GAIN63_TABLE[this->gain_ >> 1])) {
+    ESP_LOGE(TAG, "Failed to write AT581X gain registers");
+    return false;
+  }
+
+  // Set times
+  if (!this->i2c_write_reg(TRIGGER_BASE_TIME_ADDR, (uint32_t) this->trigger_base_time_ms_)) {
+    ESP_LOGE(TAG, "Failed to write AT581X trigger base time registers");
+    return false;
+  }
+  if (!this->i2c_write_reg(TRIGGER_KEEP_TIME_ADDR, (uint32_t) this->trigger_keep_time_ms_)) {
+    ESP_LOGE(TAG, "Failed to write AT581X trigger keep time registers");
+    return false;
+  }
+
+  if (!this->i2c_write_reg(PROTECT_TIME_ADDR, (uint16_t) this->protect_time_ms_)) {
+    ESP_LOGE(TAG, "Failed to write AT581X protect time registers");
+    return false;
+  }
+  if (!this->i2c_write_reg(SELF_CHECK_TIME_ADDR, (uint16_t) this->self_check_time_ms_)) {
+    ESP_LOGE(TAG, "Failed to write AT581X self check time registers");
+    return false;
+  }
+
+  if (!this->i2c_write_reg(0x41, TIME41_VALUE)) {
+    ESP_LOGE(TAG, "Failed to enable AT581X time registers");
+    return false;
+  }
+
+  // Don't know why it's required in other code, it's not in datasheet
+  if (!this->i2c_write_reg(0x55, (uint8_t) 0x04)) {
+    ESP_LOGE(TAG, "Failed to enable AT581X");
+    return false;
+  }
+
+  // Ok, config is written, let's reset the chip so it's using the new config
+  return this->reset_hardware_frontend();
+}
+
+// float AT581XComponent::get_setup_priority() const { return 0; }
+bool AT581XComponent::reset_hardware_frontend() {
+  if (!this->i2c_write_reg(RESET_ADDR, (uint8_t) 0) || !this->i2c_write_reg(RESET_ADDR, (uint8_t) 1)) {
+    ESP_LOGE(TAG, "Failed to reset AT581X hardware frontend");
+    return false;
+  }
+  return true;
+}
+
+void AT581XComponent::set_rf_mode(bool enable) {
+  const uint8_t *p = enable ? &RF_ON_TABLE[0] : &RF_OFF_TABLE[0];
+  for (size_t i = 0; i < ARRAY_SIZE(RF_REG_ADDR); i++) {
+    if (!this->i2c_write_reg(RF_REG_ADDR[i], p[i])) {
+      ESP_LOGE(TAG, "Failed to write AT581X RF mode");
+      return;
+    }
+  }
+}
+
+}  // namespace at581x
+}  // namespace esphome

esphome/components/at581x/at581x.h

@@ -0,0 +1,62 @@
+#pragma once
+
+#include <utility>
+
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/defines.h"
+#ifdef USE_SWITCH
+#include "esphome/components/switch/switch.h"
+#endif
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace at581x {
+
+class AT581XComponent : public Component, public i2c::I2CDevice {
+#ifdef USE_SWITCH
+ protected:
+  switch_::Switch *rf_power_switch_{nullptr};
+
+ public:
+  void set_rf_power_switch(switch_::Switch *s) {
+    this->rf_power_switch_ = s;
+    s->turn_on();
+  }
+#endif
+
+  void setup() override;
+  void dump_config() override;
+  //  float get_setup_priority() const override;
+
+  void set_sensing_distance(int distance) { this->delta_ = 1023 - distance; }
+
+  void set_rf_mode(bool enabled);
+  void set_frequency(int frequency) { this->freq_ = frequency; }
+  void set_poweron_selfcheck_time(int value) { this->self_check_time_ms_ = value; }
+  void set_protect_time(int value) { this->protect_time_ms_ = value; }
+  void set_trigger_base(int value) { this->trigger_base_time_ms_ = value; }
+  void set_trigger_keep(int value) { this->trigger_keep_time_ms_ = value; }
+  void set_stage_gain(int value) { this->gain_ = value; }
+  void set_power_consumption(int value) { this->power_ = value; }
+
+  bool i2c_write_config();
+  bool reset_hardware_frontend();
+  bool i2c_write_reg(uint8_t addr, uint8_t data);
+  bool i2c_write_reg(uint8_t addr, uint32_t data);
+  bool i2c_write_reg(uint8_t addr, uint16_t data);
+  bool i2c_read_reg(uint8_t addr, uint8_t &data);
+
+ protected:
+  int freq_;
+  int self_check_time_ms_;   /*!< Power-on self-test time, range: 0 ~ 65536 ms */
+  int protect_time_ms_;      /*!< Protection time, recommended 1000 ms */
+  int trigger_base_time_ms_; /*!< Default: 500 ms */
+  int trigger_keep_time_ms_; /*!< Total trig time = TRIGGER_BASE_TIME + DEF_TRIGGER_KEEP_TIME, minimum: 1 */
+  int delta_;                /*!< Delta value: 0 ~ 1023, the larger the value, the shorter the distance */
+  int gain_;                 /*!< Default: 9dB */
+  int power_;                /*!< In µA */
+};
+
+}  // namespace at581x
+}  // namespace esphome

esphome/components/at581x/automation.h

@@ -0,0 +1,71 @@
+#pragma once
+
+#include "esphome/core/automation.h"
+#include "esphome/core/helpers.h"
+
+#include "at581x.h"
+
+namespace esphome {
+namespace at581x {
+
+template<typename... Ts> class AT581XResetAction : public Action<Ts...>, public Parented<AT581XComponent> {
+ public:
+  void play(Ts... x) { this->parent_->reset_hardware_frontend(); }
+};
+
+template<typename... Ts> class AT581XSettingsAction : public Action<Ts...>, public Parented<AT581XComponent> {
+ public:
+  TEMPLATABLE_VALUE(int8_t, hw_frontend_reset)
+  TEMPLATABLE_VALUE(int, frequency)
+  TEMPLATABLE_VALUE(int, sensing_distance)
+  TEMPLATABLE_VALUE(int, poweron_selfcheck_time)
+  TEMPLATABLE_VALUE(int, power_consumption)
+  TEMPLATABLE_VALUE(int, protect_time)
+  TEMPLATABLE_VALUE(int, trigger_base)
+  TEMPLATABLE_VALUE(int, trigger_keep)
+  TEMPLATABLE_VALUE(int, stage_gain)
+
+  void play(Ts... x) {
+    if (this->frequency_.has_value()) {
+      int v = this->frequency_.value(x...);
+      this->parent_->set_frequency(v);
+    }
+    if (this->sensing_distance_.has_value()) {
+      int v = this->sensing_distance_.value(x...);
+      this->parent_->set_sensing_distance(v);
+    }
+    if (this->poweron_selfcheck_time_.has_value()) {
+      int v = this->poweron_selfcheck_time_.value(x...);
+      this->parent_->set_poweron_selfcheck_time(v);
+    }
+    if (this->power_consumption_.has_value()) {
+      int v = this->power_consumption_.value(x...);
+      this->parent_->set_power_consumption(v);
+    }
+    if (this->protect_time_.has_value()) {
+      int v = this->protect_time_.value(x...);
+      this->parent_->set_protect_time(v);
+    }
+    if (this->trigger_base_.has_value()) {
+      int v = this->trigger_base_.value(x...);
+      this->parent_->set_trigger_base(v);
+    }
+    if (this->trigger_keep_.has_value()) {
+      int v = this->trigger_keep_.value(x...);
+      this->parent_->set_trigger_keep(v);
+    }
+    if (this->stage_gain_.has_value()) {
+      int v = this->stage_gain_.value(x...);
+      this->parent_->set_stage_gain(v);
+    }
+
+    // This actually perform all the modification on the system
+    this->parent_->i2c_write_config();
+
+    if (this->hw_frontend_reset_.has_value() && this->hw_frontend_reset_.value(x...) == true) {
+      this->parent_->reset_hardware_frontend();
+    }
+  }
+};
+}  // namespace at581x
+}  // namespace esphome

esphome/components/at581x/switch/__init__.py

@@ -0,0 +1,31 @@
+import esphome.codegen as cg
+from esphome.components import switch
+import esphome.config_validation as cv
+from esphome.const import (
+    DEVICE_CLASS_SWITCH,
+    ICON_WIFI,
+)
+from .. import CONF_AT581X_ID, AT581XComponent, at581x_ns
+
+DEPENDENCIES = ["at581x"]
+
+RFSwitch = at581x_ns.class_("RFSwitch", switch.Switch)
+
+CONFIG_SCHEMA = switch.switch_schema(
+    RFSwitch,
+    device_class=DEVICE_CLASS_SWITCH,
+    icon=ICON_WIFI,
+).extend(
+    cv.Schema(
+        {
+            cv.GenerateID(CONF_AT581X_ID): cv.use_id(AT581XComponent),
+        }
+    )
+)
+
+
+async def to_code(config):
+    at581x_component = await cg.get_variable(config[CONF_AT581X_ID])
+    s = await switch.new_switch(config)
+    await cg.register_parented(s, config[CONF_AT581X_ID])
+    cg.add(at581x_component.set_rf_power_switch(s))

esphome/components/at581x/switch/rf_switch.cpp

@@ -0,0 +1,12 @@
+#include "rf_switch.h"
+
+namespace esphome {
+namespace at581x {
+
+void RFSwitch::write_state(bool state) {
+  this->publish_state(state);
+  this->parent_->set_rf_mode(state);
+}
+
+}  // namespace at581x
+}  // namespace esphome

esphome/components/at581x/switch/rf_switch.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include "esphome/components/switch/switch.h"
+#include "../at581x.h"
+
+namespace esphome {
+namespace at581x {
+
+class RFSwitch : public switch_::Switch, public Parented<AT581XComponent> {
+ protected:
+  void write_state(bool state) override;
+};
+
+}  // namespace at581x
+}  // namespace esphome

esphome/components/atm90e26/atm90e26.cpp

@@ -117,7 +117,7 @@ void ATM90E26Component::setup() {
   this->write16_(ATM90E26_REGISTER_ADJSTART,
                  0x8765);  // Checks correctness of 31-3A registers and starts normal measurement  if ok
 
-  uint16_t sys_status = this->read16_(ATM90E26_REGISTER_SYSSTATUS);
+  const uint16_t sys_status = this->read16_(ATM90E26_REGISTER_SYSSTATUS);
   if (sys_status & 0xC000) {  // Checksum 1 Error
 
     ESP_LOGW(TAG, "Could not initialize ATM90E26 IC: CS1 was incorrect, expected: 0x%04X",
@@ -177,27 +177,27 @@ void ATM90E26Component::write16_(uint8_t a_register, uint16_t val) {
 }
 
 float ATM90E26Component::get_line_current_() {
-  uint16_t current = this->read16_(ATM90E26_REGISTER_IRMS);
+  const uint16_t current = this->read16_(ATM90E26_REGISTER_IRMS);
   return current / 1000.0f;
 }
 
 float ATM90E26Component::get_line_voltage_() {
-  uint16_t voltage = this->read16_(ATM90E26_REGISTER_URMS);
+  const uint16_t voltage = this->read16_(ATM90E26_REGISTER_URMS);
   return voltage / 100.0f;
 }
 
 float ATM90E26Component::get_active_power_() {
-  int16_t val = this->read16_(ATM90E26_REGISTER_PMEAN);  // two's complement
+  const int16_t val = this->read16_(ATM90E26_REGISTER_PMEAN);  // two's complement
   return (float) val;
 }
 
 float ATM90E26Component::get_reactive_power_() {
-  int16_t val = this->read16_(ATM90E26_REGISTER_QMEAN);  // two's complement
+  const int16_t val = this->read16_(ATM90E26_REGISTER_QMEAN);  // two's complement
   return (float) val;
 }
 
 float ATM90E26Component::get_power_factor_() {
-  uint16_t val = this->read16_(ATM90E26_REGISTER_POWERF);  // signed
+  const uint16_t val = this->read16_(ATM90E26_REGISTER_POWERF);  // signed
   if (val & 0x8000) {
     return -(val & 0x7FF) / 1000.0f;
   } else {
@@ -206,7 +206,7 @@ float ATM90E26Component::get_power_factor_() {
 }
 
 float ATM90E26Component::get_forward_active_energy_() {
-  uint16_t val = this->read16_(ATM90E26_REGISTER_APENERGY);
+  const uint16_t val = this->read16_(ATM90E26_REGISTER_APENERGY);
   if ((UINT32_MAX - this->cumulative_forward_active_energy_) > val) {
     this->cumulative_forward_active_energy_ += val;
   } else {
@@ -217,7 +217,7 @@ float ATM90E26Component::get_forward_active_energy_() {
 }
 
 float ATM90E26Component::get_reverse_active_energy_() {
-  uint16_t val = this->read16_(ATM90E26_REGISTER_ANENERGY);
+  const uint16_t val = this->read16_(ATM90E26_REGISTER_ANENERGY);
   if (UINT32_MAX - this->cumulative_reverse_active_energy_ > val) {
     this->cumulative_reverse_active_energy_ += val;
   } else {
@@ -227,7 +227,7 @@ float ATM90E26Component::get_reverse_active_energy_() {
 }
 
 float ATM90E26Component::get_frequency_() {
-  uint16_t freq = this->read16_(ATM90E26_REGISTER_FREQ);
+  const uint16_t freq = this->read16_(ATM90E26_REGISTER_FREQ);
   return freq / 100.0f;
 }
 

esphome/components/atm90e32/atm90e32.cpp

@@ -7,82 +7,128 @@ namespace esphome {
 namespace atm90e32 {
 
 static const char *const TAG = "atm90e32";
+void ATM90E32Component::loop() {
+  if (this->get_publish_interval_flag_()) {
+    this->set_publish_interval_flag_(false);
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      if (this->phase_[phase].voltage_sensor_ != nullptr) {
+        this->phase_[phase].voltage_ = this->get_phase_voltage_(phase);
+      }
+    }
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      if (this->phase_[phase].current_sensor_ != nullptr) {
+        this->phase_[phase].current_ = this->get_phase_current_(phase);
+      }
+    }
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      if (this->phase_[phase].power_sensor_ != nullptr) {
+        this->phase_[phase].active_power_ = this->get_phase_active_power_(phase);
+      }
+    }
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      if (this->phase_[phase].power_factor_sensor_ != nullptr) {
+        this->phase_[phase].power_factor_ = this->get_phase_power_factor_(phase);
+      }
+    }
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      if (this->phase_[phase].reactive_power_sensor_ != nullptr) {
+        this->phase_[phase].reactive_power_ = this->get_phase_reactive_power_(phase);
+      }
+    }
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      if (this->phase_[phase].forward_active_energy_sensor_ != nullptr) {
+        this->phase_[phase].forward_active_energy_ = this->get_phase_forward_active_energy_(phase);
+      }
+    }
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      if (this->phase_[phase].reverse_active_energy_sensor_ != nullptr) {
+        this->phase_[phase].reverse_active_energy_ = this->get_phase_reverse_active_energy_(phase);
+      }
+    }
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      if (this->phase_[phase].phase_angle_sensor_ != nullptr) {
+        this->phase_[phase].phase_angle_ = this->get_phase_angle_(phase);
+      }
+    }
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      if (this->phase_[phase].harmonic_active_power_sensor_ != nullptr) {
+        this->phase_[phase].harmonic_active_power_ = this->get_phase_harmonic_active_power_(phase);
+      }
+    }
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      if (this->phase_[phase].peak_current_sensor_ != nullptr) {
+        this->phase_[phase].peak_current_ = this->get_phase_peak_current_(phase);
+      }
+    }
+    // After the local store in collected we can publish them trusting they are withing +-1 haardware sampling
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      if (this->phase_[phase].voltage_sensor_ != nullptr) {
+        this->phase_[phase].voltage_sensor_->publish_state(this->get_local_phase_voltage_(phase));
+      }
+    }
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      if (this->phase_[phase].current_sensor_ != nullptr) {
+        this->phase_[phase].current_sensor_->publish_state(this->get_local_phase_current_(phase));
+      }
+    }
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      if (this->phase_[phase].power_sensor_ != nullptr) {
+        this->phase_[phase].power_sensor_->publish_state(this->get_local_phase_active_power_(phase));
+      }
+    }
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      if (this->phase_[phase].power_factor_sensor_ != nullptr) {
+        this->phase_[phase].power_factor_sensor_->publish_state(this->get_local_phase_power_factor_(phase));
+      }
+    }
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      if (this->phase_[phase].reactive_power_sensor_ != nullptr) {
+        this->phase_[phase].reactive_power_sensor_->publish_state(this->get_local_phase_reactive_power_(phase));
+      }
+    }
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      if (this->phase_[phase].forward_active_energy_sensor_ != nullptr) {
+        this->phase_[phase].forward_active_energy_sensor_->publish_state(
+            this->get_local_phase_forward_active_energy_(phase));
+      }
+    }
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      if (this->phase_[phase].reverse_active_energy_sensor_ != nullptr) {
+        this->phase_[phase].reverse_active_energy_sensor_->publish_state(
+            this->get_local_phase_reverse_active_energy_(phase));
+      }
+    }
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      if (this->phase_[phase].phase_angle_sensor_ != nullptr) {
+        this->phase_[phase].phase_angle_sensor_->publish_state(this->get_local_phase_angle_(phase));
+      }
+    }
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      if (this->phase_[phase].harmonic_active_power_sensor_ != nullptr) {
+        this->phase_[phase].harmonic_active_power_sensor_->publish_state(
+            this->get_local_phase_harmonic_active_power_(phase));
+      }
+    }
+    for (uint8_t phase = 0; phase < 3; phase++) {
+      if (this->phase_[phase].peak_current_sensor_ != nullptr) {
+        this->phase_[phase].peak_current_sensor_->publish_state(this->get_local_phase_peak_current_(phase));
+      }
+    }
+    if (this->freq_sensor_ != nullptr) {
+      this->freq_sensor_->publish_state(this->get_frequency_());
+    }
+    if (this->chip_temperature_sensor_ != nullptr) {
+      this->chip_temperature_sensor_->publish_state(this->get_chip_temperature_());
+    }
+  }
+}
 
 void ATM90E32Component::update() {
   if (this->read16_(ATM90E32_REGISTER_METEREN) != 1) {
     this->status_set_warning();
     return;
   }
-
+  this->set_publish_interval_flag_(true);
-  if (this->phase_[0].voltage_sensor_ != nullptr) {
-    this->phase_[0].voltage_sensor_->publish_state(this->get_line_voltage_a_());
-  }
-  if (this->phase_[1].voltage_sensor_ != nullptr) {
-    this->phase_[1].voltage_sensor_->publish_state(this->get_line_voltage_b_());
-  }
-  if (this->phase_[2].voltage_sensor_ != nullptr) {
-    this->phase_[2].voltage_sensor_->publish_state(this->get_line_voltage_c_());
-  }
-  if (this->phase_[0].current_sensor_ != nullptr) {
-    this->phase_[0].current_sensor_->publish_state(this->get_line_current_a_());
-  }
-  if (this->phase_[1].current_sensor_ != nullptr) {
-    this->phase_[1].current_sensor_->publish_state(this->get_line_current_b_());
-  }
-  if (this->phase_[2].current_sensor_ != nullptr) {
-    this->phase_[2].current_sensor_->publish_state(this->get_line_current_c_());
-  }
-  if (this->phase_[0].power_sensor_ != nullptr) {
-    this->phase_[0].power_sensor_->publish_state(this->get_active_power_a_());
-  }
-  if (this->phase_[1].power_sensor_ != nullptr) {
-    this->phase_[1].power_sensor_->publish_state(this->get_active_power_b_());
-  }
-  if (this->phase_[2].power_sensor_ != nullptr) {
-    this->phase_[2].power_sensor_->publish_state(this->get_active_power_c_());
-  }
-  if (this->phase_[0].reactive_power_sensor_ != nullptr) {
-    this->phase_[0].reactive_power_sensor_->publish_state(this->get_reactive_power_a_());
-  }
-  if (this->phase_[1].reactive_power_sensor_ != nullptr) {
-    this->phase_[1].reactive_power_sensor_->publish_state(this->get_reactive_power_b_());
-  }
-  if (this->phase_[2].reactive_power_sensor_ != nullptr) {
-    this->phase_[2].reactive_power_sensor_->publish_state(this->get_reactive_power_c_());
-  }
-  if (this->phase_[0].power_factor_sensor_ != nullptr) {
-    this->phase_[0].power_factor_sensor_->publish_state(this->get_power_factor_a_());
-  }
-  if (this->phase_[1].power_factor_sensor_ != nullptr) {
-    this->phase_[1].power_factor_sensor_->publish_state(this->get_power_factor_b_());
-  }
-  if (this->phase_[2].power_factor_sensor_ != nullptr) {
-    this->phase_[2].power_factor_sensor_->publish_state(this->get_power_factor_c_());
-  }
-  if (this->phase_[0].forward_active_energy_sensor_ != nullptr) {
-    this->phase_[0].forward_active_energy_sensor_->publish_state(this->get_forward_active_energy_a_());
-  }
-  if (this->phase_[1].forward_active_energy_sensor_ != nullptr) {
-    this->phase_[1].forward_active_energy_sensor_->publish_state(this->get_forward_active_energy_b_());
-  }
-  if (this->phase_[2].forward_active_energy_sensor_ != nullptr) {
-    this->phase_[2].forward_active_energy_sensor_->publish_state(this->get_forward_active_energy_c_());
-  }
-  if (this->phase_[0].reverse_active_energy_sensor_ != nullptr) {
-    this->phase_[0].reverse_active_energy_sensor_->publish_state(this->get_reverse_active_energy_a_());
-  }
-  if (this->phase_[1].reverse_active_energy_sensor_ != nullptr) {
-    this->phase_[1].reverse_active_energy_sensor_->publish_state(this->get_reverse_active_energy_b_());
-  }
-  if (this->phase_[2].reverse_active_energy_sensor_ != nullptr) {
-    this->phase_[2].reverse_active_energy_sensor_->publish_state(this->get_reverse_active_energy_c_());
-  }
-  if (this->freq_sensor_ != nullptr) {
-    this->freq_sensor_->publish_state(this->get_frequency_());
-  }
-  if (this->chip_temperature_sensor_ != nullptr) {
-    this->chip_temperature_sensor_->publish_state(this->get_chip_temperature_());
-  }
   this->status_clear_warning();
 }
 
@@ -101,29 +147,51 @@ void ATM90E32Component::setup() {
   }
 
   this->write16_(ATM90E32_REGISTER_SOFTRESET, 0x789A);    // Perform soft reset
+  delay(6);                                               // Wait for the minimum 5ms + 1ms
   this->write16_(ATM90E32_REGISTER_CFGREGACCEN, 0x55AA);  // enable register config access
-  this->write16_(ATM90E32_REGISTER_METEREN, 0x0001);      // Enable Metering
+  if (this->read16_(ATM90E32_REGISTER_LASTSPIDATA) != 0x55AA) {
-  if (this->read16_(ATM90E32_REGISTER_LASTSPIDATA) != 0x0001) {
     ESP_LOGW(TAG, "Could not initialize ATM90E32 IC, check SPI settings");
     this->mark_failed();
     return;
   }
-  this->write16_(ATM90E32_REGISTER_PLCONSTH, 0x0861);   // PL Constant MSB (default) = 140625000
+
-  this->write16_(ATM90E32_REGISTER_PLCONSTL, 0xC468);   // PL Constant LSB (default)
+  this->write16_(ATM90E32_REGISTER_METEREN, 0x0001);        // Enable Metering
-  this->write16_(ATM90E32_REGISTER_ZXCONFIG, 0xD654);   // ZX2, ZX1, ZX0 pin config
+  this->write16_(ATM90E32_REGISTER_SAGPEAKDETCFG, 0xFF3F);  // Peak Detector time ms (15:8), Sag Period ms (7:0)
-  this->write16_(ATM90E32_REGISTER_MMODE0, mmode0);     // Mode Config (frequency set in main program)
+  this->write16_(ATM90E32_REGISTER_PLCONSTH, 0x0861);       // PL Constant MSB (default) = 140625000
-  this->write16_(ATM90E32_REGISTER_MMODE1, pga_gain_);  // PGA Gain Configuration for Current Channels
+  this->write16_(ATM90E32_REGISTER_PLCONSTL, 0xC468);       // PL Constant LSB (default)
-  this->write16_(ATM90E32_REGISTER_PSTARTTH, 0x1D4C);   // All Active Startup Power Threshold - 0.02A/0.00032 = 7500
+  this->write16_(ATM90E32_REGISTER_ZXCONFIG, 0xD654);       // ZX2, ZX1, ZX0 pin config
-  this->write16_(ATM90E32_REGISTER_QSTARTTH, 0x1D4C);   // All Reactive Startup Power Threshold - 50%
+  this->write16_(ATM90E32_REGISTER_MMODE0, mmode0);         // Mode Config (frequency set in main program)
-  this->write16_(ATM90E32_REGISTER_PPHASETH, 0x02EE);   // Each Phase Active Phase Threshold - 0.002A/0.00032 = 750
+  this->write16_(ATM90E32_REGISTER_MMODE1, pga_gain_);      // PGA Gain Configuration for Current Channels
-  this->write16_(ATM90E32_REGISTER_QPHASETH, 0x02EE);   // Each phase Reactive Phase Threshold - 10%
+  this->write16_(ATM90E32_REGISTER_PSTARTTH, 0x1D4C);       // All Active Startup Power Threshold - 0.02A/0.00032 = 7500
-  this->write16_(ATM90E32_REGISTER_UGAINA, this->phase_[0].volt_gain_);  // A Voltage rms gain
+  this->write16_(ATM90E32_REGISTER_QSTARTTH, 0x1D4C);       // All Reactive Startup Power Threshold - 50%
-  this->write16_(ATM90E32_REGISTER_IGAINA, this->phase_[0].ct_gain_);    // A line current gain
+  this->write16_(ATM90E32_REGISTER_SSTARTTH, 0x1D4C);       // All Reactive Startup Power Threshold - 50%
-  this->write16_(ATM90E32_REGISTER_UGAINB, this->phase_[1].volt_gain_);  // B Voltage rms gain
+  this->write16_(ATM90E32_REGISTER_PPHASETH, 0x02EE);       // Each Phase Active Phase Threshold - 0.002A/0.00032 = 750
-  this->write16_(ATM90E32_REGISTER_IGAINB, this->phase_[1].ct_gain_);    // B line current gain
+  this->write16_(ATM90E32_REGISTER_QPHASETH, 0x02EE);       // Each phase Reactive Phase Threshold - 10%
-  this->write16_(ATM90E32_REGISTER_UGAINC, this->phase_[2].volt_gain_);  // C Voltage rms gain
+  // Setup voltage and current calibration offsets for PHASE A
-  this->write16_(ATM90E32_REGISTER_IGAINC, this->phase_[2].ct_gain_);    // C line current gain
+  this->phase_[PHASEA].voltage_offset_ = calibrate_voltage_offset_phase(PHASEA);
-  this->write16_(ATM90E32_REGISTER_CFGREGACCEN, 0x0000);                 // end configuration
+  this->write16_(ATM90E32_REGISTER_UOFFSETA, this->phase_[PHASEA].voltage_offset_);  // A Voltage offset
+  this->phase_[PHASEA].current_offset_ = calibrate_current_offset_phase(PHASEA);
+  this->write16_(ATM90E32_REGISTER_IOFFSETA, this->phase_[PHASEA].current_offset_);  // A Current offset
+  // Setup voltage and current gain for PHASE A
+  this->write16_(ATM90E32_REGISTER_UGAINA, this->phase_[PHASEA].voltage_gain_);  // A Voltage rms gain
+  this->write16_(ATM90E32_REGISTER_IGAINA, this->phase_[PHASEA].ct_gain_);       // A line current gain
+  // Setup voltage and current calibration offsets for PHASE B
+  this->phase_[PHASEB].voltage_offset_ = calibrate_voltage_offset_phase(PHASEB);
+  this->write16_(ATM90E32_REGISTER_UOFFSETB, this->phase_[PHASEB].voltage_offset_);  // B Voltage offset
+  this->phase_[PHASEB].current_offset_ = calibrate_current_offset_phase(PHASEB);
+  this->write16_(ATM90E32_REGISTER_IOFFSETB, this->phase_[PHASEB].current_offset_);  // B Current offset
+  // Setup voltage and current gain for PHASE B
+  this->write16_(ATM90E32_REGISTER_UGAINB, this->phase_[PHASEB].voltage_gain_);  // B Voltage rms gain
+  this->write16_(ATM90E32_REGISTER_IGAINB, this->phase_[PHASEB].ct_gain_);       // B line current gain
+  // Setup voltage and current calibration offsets for PHASE C
+  this->phase_[PHASEC].voltage_offset_ = calibrate_voltage_offset_phase(PHASEC);
+  this->write16_(ATM90E32_REGISTER_UOFFSETC, this->phase_[PHASEC].voltage_offset_);  // C Voltage offset
+  this->phase_[PHASEC].current_offset_ = calibrate_current_offset_phase(PHASEC);
+  this->write16_(ATM90E32_REGISTER_IOFFSETC, this->phase_[PHASEC].current_offset_);  // C Current offset
+  // Setup voltage and current gain for PHASE C
+  this->write16_(ATM90E32_REGISTER_UGAINC, this->phase_[PHASEC].voltage_gain_);  // C Voltage rms gain
+  this->write16_(ATM90E32_REGISTER_IGAINC, this->phase_[PHASEC].ct_gain_);       // C line current gain
+  this->write16_(ATM90E32_REGISTER_CFGREGACCEN, 0x0000);                         // end configuration
 }
 
 void ATM90E32Component::dump_config() {
@@ -133,43 +201,54 @@ void ATM90E32Component::dump_config() {
     ESP_LOGE(TAG, "Communication with ATM90E32 failed!");
   }
   LOG_UPDATE_INTERVAL(this);
-  LOG_SENSOR("  ", "Voltage A", this->phase_[0].voltage_sensor_);
+  LOG_SENSOR("  ", "Voltage A", this->phase_[PHASEA].voltage_sensor_);
-  LOG_SENSOR("  ", "Current A", this->phase_[0].current_sensor_);
+  LOG_SENSOR("  ", "Current A", this->phase_[PHASEA].current_sensor_);
-  LOG_SENSOR("  ", "Power A", this->phase_[0].power_sensor_);
+  LOG_SENSOR("  ", "Power A", this->phase_[PHASEA].power_sensor_);
-  LOG_SENSOR("  ", "Reactive Power A", this->phase_[0].reactive_power_sensor_);
+  LOG_SENSOR("  ", "Reactive Power A", this->phase_[PHASEA].reactive_power_sensor_);
-  LOG_SENSOR("  ", "PF A", this->phase_[0].power_factor_sensor_);
+  LOG_SENSOR("  ", "PF A", this->phase_[PHASEA].power_factor_sensor_);
-  LOG_SENSOR("  ", "Active Forward Energy A", this->phase_[0].forward_active_energy_sensor_);
+  LOG_SENSOR("  ", "Active Forward Energy A", this->phase_[PHASEA].forward_active_energy_sensor_);
-  LOG_SENSOR("  ", "Active Reverse Energy A", this->phase_[0].reverse_active_energy_sensor_);
+  LOG_SENSOR("  ", "Active Reverse Energy A", this->phase_[PHASEA].reverse_active_energy_sensor_);
-  LOG_SENSOR("  ", "Voltage B", this->phase_[1].voltage_sensor_);
+  LOG_SENSOR("  ", "Harmonic Power A", this->phase_[PHASEA].harmonic_active_power_sensor_);
-  LOG_SENSOR("  ", "Current B", this->phase_[1].current_sensor_);
+  LOG_SENSOR("  ", "Phase Angle A", this->phase_[PHASEA].phase_angle_sensor_);
-  LOG_SENSOR("  ", "Power B", this->phase_[1].power_sensor_);
+  LOG_SENSOR("  ", "Peak Current A", this->phase_[PHASEA].peak_current_sensor_);
-  LOG_SENSOR("  ", "Reactive Power B", this->phase_[1].reactive_power_sensor_);
+  LOG_SENSOR("  ", "Voltage B", this->phase_[PHASEB].voltage_sensor_);
-  LOG_SENSOR("  ", "PF B", this->phase_[1].power_factor_sensor_);
+  LOG_SENSOR("  ", "Current B", this->phase_[PHASEB].current_sensor_);
-  LOG_SENSOR("  ", "Active Forward Energy B", this->phase_[1].forward_active_energy_sensor_);
+  LOG_SENSOR("  ", "Power B", this->phase_[PHASEB].power_sensor_);
-  LOG_SENSOR("  ", "Active Reverse Energy B", this->phase_[1].reverse_active_energy_sensor_);
+  LOG_SENSOR("  ", "Reactive Power B", this->phase_[PHASEB].reactive_power_sensor_);
-  LOG_SENSOR("  ", "Voltage C", this->phase_[2].voltage_sensor_);
+  LOG_SENSOR("  ", "PF B", this->phase_[PHASEB].power_factor_sensor_);
-  LOG_SENSOR("  ", "Current C", this->phase_[2].current_sensor_);
+  LOG_SENSOR("  ", "Active Forward Energy B", this->phase_[PHASEB].forward_active_energy_sensor_);
-  LOG_SENSOR("  ", "Power C", this->phase_[2].power_sensor_);
+  LOG_SENSOR("  ", "Active Reverse Energy B", this->phase_[PHASEB].reverse_active_energy_sensor_);
-  LOG_SENSOR("  ", "Reactive Power C", this->phase_[2].reactive_power_sensor_);
+  LOG_SENSOR("  ", "Harmonic Power A", this->phase_[PHASEB].harmonic_active_power_sensor_);
-  LOG_SENSOR("  ", "PF C", this->phase_[2].power_factor_sensor_);
+  LOG_SENSOR("  ", "Phase Angle A", this->phase_[PHASEB].phase_angle_sensor_);
-  LOG_SENSOR("  ", "Active Forward Energy C", this->phase_[2].forward_active_energy_sensor_);
+  LOG_SENSOR("  ", "Peak Current A", this->phase_[PHASEB].peak_current_sensor_);
-  LOG_SENSOR("  ", "Active Reverse Energy C", this->phase_[2].reverse_active_energy_sensor_);
+  LOG_SENSOR("  ", "Voltage C", this->phase_[PHASEC].voltage_sensor_);
+  LOG_SENSOR("  ", "Current C", this->phase_[PHASEC].current_sensor_);
+  LOG_SENSOR("  ", "Power C", this->phase_[PHASEC].power_sensor_);
+  LOG_SENSOR("  ", "Reactive Power C", this->phase_[PHASEC].reactive_power_sensor_);
+  LOG_SENSOR("  ", "PF C", this->phase_[PHASEC].power_factor_sensor_);
+  LOG_SENSOR("  ", "Active Forward Energy C", this->phase_[PHASEC].forward_active_energy_sensor_);
+  LOG_SENSOR("  ", "Active Reverse Energy C", this->phase_[PHASEC].reverse_active_energy_sensor_);
+  LOG_SENSOR("  ", "Harmonic Power A", this->phase_[PHASEC].harmonic_active_power_sensor_);
+  LOG_SENSOR("  ", "Phase Angle A", this->phase_[PHASEC].phase_angle_sensor_);
+  LOG_SENSOR("  ", "Peak Current A", this->phase_[PHASEC].peak_current_sensor_);
   LOG_SENSOR("  ", "Frequency", this->freq_sensor_);
   LOG_SENSOR("  ", "Chip Temp", this->chip_temperature_sensor_);
 }
-float ATM90E32Component::get_setup_priority() const { return setup_priority::DATA; }
 
+float ATM90E32Component::get_setup_priority() const { return setup_priority::IO; }
+
+// R/C registers can conly be cleared after the LastSPIData register is updated (register 78H)
+// Peakdetect period: 05H. Bit 15:8 are PeakDet_period in ms. 7:0 are Sag_period
+// Default is 143FH (20ms, 63ms)
 uint16_t ATM90E32Component::read16_(uint16_t a_register) {
   uint8_t addrh = (1 << 7) | ((a_register >> 8) & 0x03);
   uint8_t addrl = (a_register & 0xFF);
   uint8_t data[2];
   uint16_t output;
-
   this->enable();
-  delayMicroseconds(10);
+  delay_microseconds_safe(10);
   this->write_byte(addrh);
   this->write_byte(addrl);
-  delayMicroseconds(4);
   this->read_array(data, 2);
   this->disable();
 
@@ -179,9 +258,9 @@ uint16_t ATM90E32Component::read16_(uint16_t a_register) {
 }
 
 int ATM90E32Component::read32_(uint16_t addr_h, uint16_t addr_l) {
-  uint16_t val_h = this->read16_(addr_h);
+  const uint16_t val_h = this->read16_(addr_h);
-  uint16_t val_l = this->read16_(addr_l);
+  const uint16_t val_l = this->read16_(addr_l);
-  int32_t val = (val_h << 16) | val_l;
+  const int32_t val = (val_h << 16) | val_l;
 
   ESP_LOGVV(TAG,
             "read32_ addr_h 0x%04" PRIX16 " val_h 0x%04" PRIX16 " addr_l 0x%04" PRIX16 " val_l 0x%04" PRIX16
@@ -192,141 +271,174 @@ int ATM90E32Component::read32_(uint16_t addr_h, uint16_t addr_l) {
 }
 
 void ATM90E32Component::write16_(uint16_t a_register, uint16_t val) {
-  uint8_t addrh = (a_register >> 8) & 0x03;
-  uint8_t addrl = (a_register & 0xFF);
-
   ESP_LOGVV(TAG, "write16_ 0x%04" PRIX16 " val 0x%04" PRIX16, a_register, val);
   this->enable();
-  delayMicroseconds(10);
+  this->write_byte16(a_register);
-  this->write_byte(addrh);
+  this->write_byte16(val);
-  this->write_byte(addrl);
-  delayMicroseconds(4);
-  this->write_byte((val >> 8) & 0xff);
-  this->write_byte(val & 0xFF);
   this->disable();
+  if (this->read16_(ATM90E32_REGISTER_LASTSPIDATA) != val)
+    ESP_LOGW(TAG, "SPI write error 0x%04X val 0x%04X", a_register, val);
 }
 
-float ATM90E32Component::get_line_voltage_a_() {
+float ATM90E32Component::get_local_phase_voltage_(uint8_t phase) { return this->phase_[phase].voltage_; }
-  uint16_t voltage = this->read16_(ATM90E32_REGISTER_URMSA);
+
+float ATM90E32Component::get_local_phase_current_(uint8_t phase) { return this->phase_[phase].current_; }
+
+float ATM90E32Component::get_local_phase_active_power_(uint8_t phase) { return this->phase_[phase].active_power_; }
+
+float ATM90E32Component::get_local_phase_reactive_power_(uint8_t phase) { return this->phase_[phase].reactive_power_; }
+
+float ATM90E32Component::get_local_phase_power_factor_(uint8_t phase) { return this->phase_[phase].power_factor_; }
+
+float ATM90E32Component::get_local_phase_forward_active_energy_(uint8_t phase) {
+  return this->phase_[phase].forward_active_energy_;
+}
+
+float ATM90E32Component::get_local_phase_reverse_active_energy_(uint8_t phase) {
+  return this->phase_[phase].reverse_active_energy_;
+}
+
+float ATM90E32Component::get_local_phase_angle_(uint8_t phase) { return this->phase_[phase].phase_angle_; }
+
+float ATM90E32Component::get_local_phase_harmonic_active_power_(uint8_t phase) {
+  return this->phase_[phase].harmonic_active_power_;
+}
+
+float ATM90E32Component::get_local_phase_peak_current_(uint8_t phase) { return this->phase_[phase].peak_current_; }
+
+float ATM90E32Component::get_phase_voltage_(uint8_t phase) {
+  const uint16_t voltage = this->read16_(ATM90E32_REGISTER_URMS + phase);
+  if (this->read16_(ATM90E32_REGISTER_LASTSPIDATA) != voltage)
+    ESP_LOGW(TAG, "SPI URMS voltage register read error.");
   return (float) voltage / 100;
 }
-float ATM90E32Component::get_line_voltage_b_() {
+
-  uint16_t voltage = this->read16_(ATM90E32_REGISTER_URMSB);
+float ATM90E32Component::get_phase_voltage_avg_(uint8_t phase) {
-  return (float) voltage / 100;
+  const uint8_t reads = 10;
+  uint32_t accumulation = 0;
+  uint16_t voltage = 0;
+  for (uint8_t i = 0; i < reads; i++) {
+    voltage = this->read16_(ATM90E32_REGISTER_URMS + phase);
+    if (this->read16_(ATM90E32_REGISTER_LASTSPIDATA) != voltage)
+      ESP_LOGW(TAG, "SPI URMS voltage register read error.");
+    accumulation += voltage;
+  }
+  voltage = accumulation / reads;
+  this->phase_[phase].voltage_ = (float) voltage / 100;
+  return this->phase_[phase].voltage_;
 }
-float ATM90E32Component::get_line_voltage_c_() {
+
-  uint16_t voltage = this->read16_(ATM90E32_REGISTER_URMSC);
+float ATM90E32Component::get_phase_current_avg_(uint8_t phase) {
-  return (float) voltage / 100;
+  const uint8_t reads = 10;
+  uint32_t accumulation = 0;
+  uint16_t current = 0;
+  for (uint8_t i = 0; i < reads; i++) {
+    current = this->read16_(ATM90E32_REGISTER_IRMS + phase);
+    if (this->read16_(ATM90E32_REGISTER_LASTSPIDATA) != current)
+      ESP_LOGW(TAG, "SPI IRMS current register read error.");
+    accumulation += current;
+  }
+  current = accumulation / reads;
+  this->phase_[phase].current_ = (float) current / 1000;
+  return this->phase_[phase].current_;
 }
-float ATM90E32Component::get_line_current_a_() {
+
-  uint16_t current = this->read16_(ATM90E32_REGISTER_IRMSA);
+float ATM90E32Component::get_phase_current_(uint8_t phase) {
+  const uint16_t current = this->read16_(ATM90E32_REGISTER_IRMS + phase);
+  if (this->read16_(ATM90E32_REGISTER_LASTSPIDATA) != current)
+    ESP_LOGW(TAG, "SPI IRMS current register read error.");
   return (float) current / 1000;
 }
-float ATM90E32Component::get_line_current_b_() {
+
-  uint16_t current = this->read16_(ATM90E32_REGISTER_IRMSB);
+float ATM90E32Component::get_phase_active_power_(uint8_t phase) {
-  return (float) current / 1000;
+  const int val = this->read32_(ATM90E32_REGISTER_PMEAN + phase, ATM90E32_REGISTER_PMEANLSB + phase);
-}
-float ATM90E32Component::get_line_current_c_() {
-  uint16_t current = this->read16_(ATM90E32_REGISTER_IRMSC);
-  return (float) current / 1000;
-}
-float ATM90E32Component::get_active_power_a_() {
-  int val = this->read32_(ATM90E32_REGISTER_PMEANA, ATM90E32_REGISTER_PMEANALSB);
   return val * 0.00032f;
 }
-float ATM90E32Component::get_active_power_b_() {
+
-  int val = this->read32_(ATM90E32_REGISTER_PMEANB, ATM90E32_REGISTER_PMEANBLSB);
+float ATM90E32Component::get_phase_reactive_power_(uint8_t phase) {
+  const int val = this->read32_(ATM90E32_REGISTER_QMEAN + phase, ATM90E32_REGISTER_QMEANLSB + phase);
   return val * 0.00032f;
 }
-float ATM90E32Component::get_active_power_c_() {
+
-  int val = this->read32_(ATM90E32_REGISTER_PMEANC, ATM90E32_REGISTER_PMEANCLSB);
+float ATM90E32Component::get_phase_power_factor_(uint8_t phase) {
+  const int16_t powerfactor = this->read16_(ATM90E32_REGISTER_PFMEAN + phase);
+  if (this->read16_(ATM90E32_REGISTER_LASTSPIDATA) != powerfactor)
+    ESP_LOGW(TAG, "SPI power factor read error.");
+  return (float) powerfactor / 1000;
+}
+
+float ATM90E32Component::get_phase_forward_active_energy_(uint8_t phase) {
+  const uint16_t val = this->read16_(ATM90E32_REGISTER_APENERGY + phase);
+  if ((UINT32_MAX - this->phase_[phase].cumulative_forward_active_energy_) > val) {
+    this->phase_[phase].cumulative_forward_active_energy_ += val;
+  } else {
+    this->phase_[phase].cumulative_forward_active_energy_ = val;
+  }
+  return ((float) this->phase_[phase].cumulative_forward_active_energy_ * 10 / 3200);
+}
+
+float ATM90E32Component::get_phase_reverse_active_energy_(uint8_t phase) {
+  const uint16_t val = this->read16_(ATM90E32_REGISTER_ANENERGY);
+  if (UINT32_MAX - this->phase_[phase].cumulative_reverse_active_energy_ > val) {
+    this->phase_[phase].cumulative_reverse_active_energy_ += val;
+  } else {
+    this->phase_[phase].cumulative_reverse_active_energy_ = val;
+  }
+  return ((float) this->phase_[phase].cumulative_reverse_active_energy_ * 10 / 3200);
+}
+
+float ATM90E32Component::get_phase_harmonic_active_power_(uint8_t phase) {
+  int val = this->read32_(ATM90E32_REGISTER_PMEANH + phase, ATM90E32_REGISTER_PMEANHLSB + phase);
   return val * 0.00032f;
 }
-float ATM90E32Component::get_reactive_power_a_() {
+
-  int val = this->read32_(ATM90E32_REGISTER_QMEANA, ATM90E32_REGISTER_QMEANALSB);
+float ATM90E32Component::get_phase_angle_(uint8_t phase) {
-  return val * 0.00032f;
+  uint16_t val = this->read16_(ATM90E32_REGISTER_PANGLE + phase) / 10.0;
+  return (float) (val > 180) ? val - 360.0 : val;
 }
-float ATM90E32Component::get_reactive_power_b_() {
+
-  int val = this->read32_(ATM90E32_REGISTER_QMEANB, ATM90E32_REGISTER_QMEANBLSB);
+float ATM90E32Component::get_phase_peak_current_(uint8_t phase) {
-  return val * 0.00032f;
+  int16_t val = (float) this->read16_(ATM90E32_REGISTER_IPEAK + phase);
-}
+  if (!this->peak_current_signed_)
-float ATM90E32Component::get_reactive_power_c_() {
+    val = abs(val);
-  int val = this->read32_(ATM90E32_REGISTER_QMEANC, ATM90E32_REGISTER_QMEANCLSB);
+  // phase register * phase current gain value  / 1000 * 2^13
-  return val * 0.00032f;
+  return (float) (val * this->phase_[phase].ct_gain_ / 8192000.0);
-}
-float ATM90E32Component::get_power_factor_a_() {
-  int16_t pf = this->read16_(ATM90E32_REGISTER_PFMEANA);
-  return (float) pf / 1000;
-}
-float ATM90E32Component::get_power_factor_b_() {
-  int16_t pf = this->read16_(ATM90E32_REGISTER_PFMEANB);
-  return (float) pf / 1000;
-}
-float ATM90E32Component::get_power_factor_c_() {
-  int16_t pf = this->read16_(ATM90E32_REGISTER_PFMEANC);
-  return (float) pf / 1000;
-}
-float ATM90E32Component::get_forward_active_energy_a_() {
-  uint16_t val = this->read16_(ATM90E32_REGISTER_APENERGYA);
-  if ((UINT32_MAX - this->phase_[0].cumulative_forward_active_energy_) > val) {
-    this->phase_[0].cumulative_forward_active_energy_ += val;
-  } else {
-    this->phase_[0].cumulative_forward_active_energy_ = val;
-  }
-  return ((float) this->phase_[0].cumulative_forward_active_energy_ * 10 / 3200);
-}
-float ATM90E32Component::get_forward_active_energy_b_() {
-  uint16_t val = this->read16_(ATM90E32_REGISTER_APENERGYB);
-  if (UINT32_MAX - this->phase_[1].cumulative_forward_active_energy_ > val) {
-    this->phase_[1].cumulative_forward_active_energy_ += val;
-  } else {
-    this->phase_[1].cumulative_forward_active_energy_ = val;
-  }
-  return ((float) this->phase_[1].cumulative_forward_active_energy_ * 10 / 3200);
-}
-float ATM90E32Component::get_forward_active_energy_c_() {
-  uint16_t val = this->read16_(ATM90E32_REGISTER_APENERGYC);
-  if (UINT32_MAX - this->phase_[2].cumulative_forward_active_energy_ > val) {
-    this->phase_[2].cumulative_forward_active_energy_ += val;
-  } else {
-    this->phase_[2].cumulative_forward_active_energy_ = val;
-  }
-  return ((float) this->phase_[2].cumulative_forward_active_energy_ * 10 / 3200);
-}
-float ATM90E32Component::get_reverse_active_energy_a_() {
-  uint16_t val = this->read16_(ATM90E32_REGISTER_ANENERGYA);
-  if (UINT32_MAX - this->phase_[0].cumulative_reverse_active_energy_ > val) {
-    this->phase_[0].cumulative_reverse_active_energy_ += val;
-  } else {
-    this->phase_[0].cumulative_reverse_active_energy_ = val;
-  }
-  return ((float) this->phase_[0].cumulative_reverse_active_energy_ * 10 / 3200);
-}
-float ATM90E32Component::get_reverse_active_energy_b_() {
-  uint16_t val = this->read16_(ATM90E32_REGISTER_ANENERGYB);
-  if (UINT32_MAX - this->phase_[1].cumulative_reverse_active_energy_ > val) {
-    this->phase_[1].cumulative_reverse_active_energy_ += val;
-  } else {
-    this->phase_[1].cumulative_reverse_active_energy_ = val;
-  }
-  return ((float) this->phase_[1].cumulative_reverse_active_energy_ * 10 / 3200);
-}
-float ATM90E32Component::get_reverse_active_energy_c_() {
-  uint16_t val = this->read16_(ATM90E32_REGISTER_ANENERGYC);
-  if (UINT32_MAX - this->phase_[2].cumulative_reverse_active_energy_ > val) {
-    this->phase_[2].cumulative_reverse_active_energy_ += val;
-  } else {
-    this->phase_[2].cumulative_reverse_active_energy_ = val;
-  }
-  return ((float) this->phase_[2].cumulative_reverse_active_energy_ * 10 / 3200);
 }
+
 float ATM90E32Component::get_frequency_() {
-  uint16_t freq = this->read16_(ATM90E32_REGISTER_FREQ);
+  const uint16_t freq = this->read16_(ATM90E32_REGISTER_FREQ);
   return (float) freq / 100;
 }
+
 float ATM90E32Component::get_chip_temperature_() {
-  uint16_t ctemp = this->read16_(ATM90E32_REGISTER_TEMP);
+  const uint16_t ctemp = this->read16_(ATM90E32_REGISTER_TEMP);
   return (float) ctemp;
 }
+
+uint16_t ATM90E32Component::calibrate_voltage_offset_phase(uint8_t phase) {
+  const uint8_t num_reads = 5;
+  uint64_t total_value = 0;
+  for (int i = 0; i < num_reads; ++i) {
+    const uint32_t measurement_value = read32_(ATM90E32_REGISTER_URMS + phase, ATM90E32_REGISTER_URMSLSB + phase);
+    total_value += measurement_value;
+  }
+  const uint32_t average_value = total_value / num_reads;
+  const uint32_t shifted_value = average_value >> 7;
+  const uint32_t voltage_offset = ~shifted_value + 1;
+  return voltage_offset & 0xFFFF;  // Take the lower 16 bits
+}
+
+uint16_t ATM90E32Component::calibrate_current_offset_phase(uint8_t phase) {
+  const uint8_t num_reads = 5;
+  uint64_t total_value = 0;
+  for (int i = 0; i < num_reads; ++i) {
+    const uint32_t measurement_value = read32_(ATM90E32_REGISTER_IRMS + phase, ATM90E32_REGISTER_IRMSLSB + phase);
+    total_value += measurement_value;
+  }
+  const uint32_t average_value = total_value / num_reads;
+  const uint32_t current_offset = ~average_value + 1;
+  return current_offset & 0xFFFF;  // Take the lower 16 bits
+}
+
 }  // namespace atm90e32
 }  // namespace esphome

esphome/components/atm90e32/atm90e32.h

@@ -3,14 +3,19 @@
 #include "esphome/core/component.h"
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/spi/spi.h"
+#include "atm90e32_reg.h"
 
 namespace esphome {
 namespace atm90e32 {
 
 class ATM90E32Component : public PollingComponent,
                           public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_HIGH,
-                                                spi::CLOCK_PHASE_TRAILING, spi::DATA_RATE_200KHZ> {
+                                                spi::CLOCK_PHASE_TRAILING, spi::DATA_RATE_1MHZ> {
  public:
+  static const uint8_t PHASEA = 0;
+  static const uint8_t PHASEB = 1;
+  static const uint8_t PHASEC = 2;
+  void loop() override;
   void setup() override;
   void dump_config() override;
   float get_setup_priority() const override;
@@ -20,6 +25,7 @@ class ATM90E32Component : public PollingComponent,
   void set_current_sensor(int phase, sensor::Sensor *obj) { this->phase_[phase].current_sensor_ = obj; }
   void set_power_sensor(int phase, sensor::Sensor *obj) { this->phase_[phase].power_sensor_ = obj; }
   void set_reactive_power_sensor(int phase, sensor::Sensor *obj) { this->phase_[phase].reactive_power_sensor_ = obj; }
+  void set_apparent_power_sensor(int phase, sensor::Sensor *obj) { this->phase_[phase].apparent_power_sensor_ = obj; }
   void set_forward_active_energy_sensor(int phase, sensor::Sensor *obj) {
     this->phase_[phase].forward_active_energy_sensor_ = obj;
   }
@@ -27,64 +33,94 @@ class ATM90E32Component : public PollingComponent,
     this->phase_[phase].reverse_active_energy_sensor_ = obj;
   }
   void set_power_factor_sensor(int phase, sensor::Sensor *obj) { this->phase_[phase].power_factor_sensor_ = obj; }
-  void set_volt_gain(int phase, uint16_t gain) { this->phase_[phase].volt_gain_ = gain; }
+  void set_phase_angle_sensor(int phase, sensor::Sensor *obj) { this->phase_[phase].phase_angle_sensor_ = obj; }
+  void set_harmonic_active_power_sensor(int phase, sensor::Sensor *obj) {
+    this->phase_[phase].harmonic_active_power_sensor_ = obj;
+  }
+  void set_peak_current_sensor(int phase, sensor::Sensor *obj) { this->phase_[phase].peak_current_sensor_ = obj; }
+  void set_volt_gain(int phase, uint16_t gain) { this->phase_[phase].voltage_gain_ = gain; }
   void set_ct_gain(int phase, uint16_t gain) { this->phase_[phase].ct_gain_ = gain; }
-
   void set_freq_sensor(sensor::Sensor *freq_sensor) { freq_sensor_ = freq_sensor; }
+  void set_peak_current_signed(bool flag) { peak_current_signed_ = flag; }
   void set_chip_temperature_sensor(sensor::Sensor *chip_temperature_sensor) {
     chip_temperature_sensor_ = chip_temperature_sensor;
   }
   void set_line_freq(int freq) { line_freq_ = freq; }
   void set_current_phases(int phases) { current_phases_ = phases; }
   void set_pga_gain(uint16_t gain) { pga_gain_ = gain; }
+  uint16_t calibrate_voltage_offset_phase(uint8_t /*phase*/);
+  uint16_t calibrate_current_offset_phase(uint8_t /*phase*/);
+
+  int32_t last_periodic_millis = millis();
 
  protected:
   uint16_t read16_(uint16_t a_register);
   int read32_(uint16_t addr_h, uint16_t addr_l);
   void write16_(uint16_t a_register, uint16_t val);
-
+  float get_local_phase_voltage_(uint8_t /*phase*/);
-  float get_line_voltage_a_();
+  float get_local_phase_current_(uint8_t /*phase*/);
-  float get_line_voltage_b_();
+  float get_local_phase_active_power_(uint8_t /*phase*/);
-  float get_line_voltage_c_();
+  float get_local_phase_reactive_power_(uint8_t /*phase*/);
-  float get_line_current_a_();
+  float get_local_phase_power_factor_(uint8_t /*phase*/);
-  float get_line_current_b_();
+  float get_local_phase_forward_active_energy_(uint8_t /*phase*/);
-  float get_line_current_c_();
+  float get_local_phase_reverse_active_energy_(uint8_t /*phase*/);
-  float get_active_power_a_();
+  float get_local_phase_angle_(uint8_t /*phase*/);
-  float get_active_power_b_();
+  float get_local_phase_harmonic_active_power_(uint8_t /*phase*/);
-  float get_active_power_c_();
+  float get_local_phase_peak_current_(uint8_t /*phase*/);
-  float get_reactive_power_a_();
+  float get_phase_voltage_(uint8_t /*phase*/);
-  float get_reactive_power_b_();
+  float get_phase_voltage_avg_(uint8_t /*phase*/);
-  float get_reactive_power_c_();
+  float get_phase_current_(uint8_t /*phase*/);
-  float get_power_factor_a_();
+  float get_phase_current_avg_(uint8_t /*phase*/);
-  float get_power_factor_b_();
+  float get_phase_active_power_(uint8_t /*phase*/);
-  float get_power_factor_c_();
+  float get_phase_reactive_power_(uint8_t /*phase*/);
-  float get_forward_active_energy_a_();
+  float get_phase_power_factor_(uint8_t /*phase*/);
-  float get_forward_active_energy_b_();
+  float get_phase_forward_active_energy_(uint8_t /*phase*/);
-  float get_forward_active_energy_c_();
+  float get_phase_reverse_active_energy_(uint8_t /*phase*/);
-  float get_reverse_active_energy_a_();
+  float get_phase_angle_(uint8_t /*phase*/);
-  float get_reverse_active_energy_b_();
+  float get_phase_harmonic_active_power_(uint8_t /*phase*/);
-  float get_reverse_active_energy_c_();
+  float get_phase_peak_current_(uint8_t /*phase*/);
   float get_frequency_();
   float get_chip_temperature_();
+  bool get_publish_interval_flag_() { return publish_interval_flag_; };
+  void set_publish_interval_flag_(bool flag) { publish_interval_flag_ = flag; };
 
   struct ATM90E32Phase {
-    uint16_t volt_gain_{7305};
+    uint16_t voltage_gain_{7305};
     uint16_t ct_gain_{27961};
+    uint16_t voltage_offset_{0};
+    uint16_t current_offset_{0};
+    float voltage_{0};
+    float current_{0};
+    float active_power_{0};
+    float reactive_power_{0};
+    float power_factor_{0};
+    float forward_active_energy_{0};
+    float reverse_active_energy_{0};
+    float phase_angle_{0};
+    float harmonic_active_power_{0};
+    float peak_current_{0};
     sensor::Sensor *voltage_sensor_{nullptr};
     sensor::Sensor *current_sensor_{nullptr};
     sensor::Sensor *power_sensor_{nullptr};
     sensor::Sensor *reactive_power_sensor_{nullptr};
+    sensor::Sensor *apparent_power_sensor_{nullptr};
     sensor::Sensor *power_factor_sensor_{nullptr};
     sensor::Sensor *forward_active_energy_sensor_{nullptr};
     sensor::Sensor *reverse_active_energy_sensor_{nullptr};
+    sensor::Sensor *phase_angle_sensor_{nullptr};
+    sensor::Sensor *harmonic_active_power_sensor_{nullptr};
+    sensor::Sensor *peak_current_sensor_{nullptr};
     uint32_t cumulative_forward_active_energy_{0};
     uint32_t cumulative_reverse_active_energy_{0};
   } phase_[3];
+
   sensor::Sensor *freq_sensor_{nullptr};
   sensor::Sensor *chip_temperature_sensor_{nullptr};
   uint16_t pga_gain_{0x15};
   int line_freq_{60};
   int current_phases_{3};
+  bool publish_interval_flag_{true};
+  bool peak_current_signed_{false};
 };
 
 }  // namespace atm90e32

esphome/components/atm90e32/atm90e32_reg.h

@@ -131,10 +131,12 @@ static const uint16_t ATM90E32_REGISTER_IOFFSETN = 0x6E;  // N Current Offset
 
 /* ENERGY REGISTERS */
 static const uint16_t ATM90E32_REGISTER_APENERGYT = 0x80;  // Total Forward Active
+static const uint16_t ATM90E32_REGISTER_APENERGY = 0x81;   // Forward Active Reg Base
 static const uint16_t ATM90E32_REGISTER_APENERGYA = 0x81;  // A Forward Active
 static const uint16_t ATM90E32_REGISTER_APENERGYB = 0x82;  // B Forward Active
 static const uint16_t ATM90E32_REGISTER_APENERGYC = 0x83;  // C Forward Active
 static const uint16_t ATM90E32_REGISTER_ANENERGYT = 0x84;  // Total Reverse Active
+static const uint16_t ATM90E32_REGISTER_ANENERGY = 0x85;   // Reverse Active Reg Base
 static const uint16_t ATM90E32_REGISTER_ANENERGYA = 0x85;  // A Reverse Active
 static const uint16_t ATM90E32_REGISTER_ANENERGYB = 0x86;  // B Reverse Active
 static const uint16_t ATM90E32_REGISTER_ANENERGYC = 0x87;  // C Reverse Active
@@ -172,10 +174,12 @@ static const uint16_t ATM90E32_REGISTER_ANENERGYCH = 0xAF;  // C Reverse Harm. E
 
 /* POWER & P.F. REGISTERS */
 static const uint16_t ATM90E32_REGISTER_PMEANT = 0xB0;   // Total Mean Power (P)
+static const uint16_t ATM90E32_REGISTER_PMEAN = 0xB1;    // Mean Power Reg Base (P)
 static const uint16_t ATM90E32_REGISTER_PMEANA = 0xB1;   // A Mean Power (P)
 static const uint16_t ATM90E32_REGISTER_PMEANB = 0xB2;   // B Mean Power (P)
 static const uint16_t ATM90E32_REGISTER_PMEANC = 0xB3;   // C Mean Power (P)
 static const uint16_t ATM90E32_REGISTER_QMEANT = 0xB4;   // Total Mean Power (Q)
+static const uint16_t ATM90E32_REGISTER_QMEAN = 0xB5;    // Mean Power Reg Base (Q)
 static const uint16_t ATM90E32_REGISTER_QMEANA = 0xB5;   // A Mean Power (Q)
 static const uint16_t ATM90E32_REGISTER_QMEANB = 0xB6;   // B Mean Power (Q)
 static const uint16_t ATM90E32_REGISTER_QMEANC = 0xB7;   // C Mean Power (Q)
@@ -184,15 +188,18 @@ static const uint16_t ATM90E32_REGISTER_SMEANA = 0xB9;   // A Mean Power (S)
 static const uint16_t ATM90E32_REGISTER_SMEANB = 0xBA;   // B Mean Power (S)
 static const uint16_t ATM90E32_REGISTER_SMEANC = 0xBB;   // C Mean Power (S)
 static const uint16_t ATM90E32_REGISTER_PFMEANT = 0xBC;  // Mean Power Factor
+static const uint16_t ATM90E32_REGISTER_PFMEAN = 0xBD;   // Power Factor Reg Base
 static const uint16_t ATM90E32_REGISTER_PFMEANA = 0xBD;  // A Power Factor
 static const uint16_t ATM90E32_REGISTER_PFMEANB = 0xBE;  // B Power Factor
 static const uint16_t ATM90E32_REGISTER_PFMEANC = 0xBF;  // C Power Factor
 
 static const uint16_t ATM90E32_REGISTER_PMEANTLSB = 0xC0;   // Lower Word (Tot. Act. Power)
+static const uint16_t ATM90E32_REGISTER_PMEANLSB = 0xC1;    // Lower Word Reg Base (Active Power)
 static const uint16_t ATM90E32_REGISTER_PMEANALSB = 0xC1;   // Lower Word (A Act. Power)
 static const uint16_t ATM90E32_REGISTER_PMEANBLSB = 0xC2;   // Lower Word (B Act. Power)
 static const uint16_t ATM90E32_REGISTER_PMEANCLSB = 0xC3;   // Lower Word (C Act. Power)
 static const uint16_t ATM90E32_REGISTER_QMEANTLSB = 0xC4;   // Lower Word (Tot. React. Power)
+static const uint16_t ATM90E32_REGISTER_QMEANLSB = 0xC5;    // Lower Word Reg Base (Reactive Power)
 static const uint16_t ATM90E32_REGISTER_QMEANALSB = 0xC5;   // Lower Word (A React. Power)
 static const uint16_t ATM90E32_REGISTER_QMEANBLSB = 0xC6;   // Lower Word (B React. Power)
 static const uint16_t ATM90E32_REGISTER_QMEANCLSB = 0xC7;   // Lower Word (C React. Power)
@@ -207,12 +214,15 @@ static const uint16_t ATM90E32_REGISTER_PMEANAF = 0xD1;  // A Active Fund. Power
 static const uint16_t ATM90E32_REGISTER_PMEANBF = 0xD2;  // B Active Fund. Power
 static const uint16_t ATM90E32_REGISTER_PMEANCF = 0xD3;  // C Active Fund. Power
 static const uint16_t ATM90E32_REGISTER_PMEANTH = 0xD4;  // Total Active Harm. Power
+static const uint16_t ATM90E32_REGISTER_PMEANH = 0xD5;   // Active Harm. Power Reg Base
 static const uint16_t ATM90E32_REGISTER_PMEANAH = 0xD5;  // A Active Harm. Power
 static const uint16_t ATM90E32_REGISTER_PMEANBH = 0xD6;  // B Active Harm. Power
 static const uint16_t ATM90E32_REGISTER_PMEANCH = 0xD7;  // C Active Harm. Power
+static const uint16_t ATM90E32_REGISTER_URMS = 0xD9;     // RMS Voltage Reg Base
 static const uint16_t ATM90E32_REGISTER_URMSA = 0xD9;    // A RMS Voltage
 static const uint16_t ATM90E32_REGISTER_URMSB = 0xDA;    // B RMS Voltage
 static const uint16_t ATM90E32_REGISTER_URMSC = 0xDB;    // C RMS Voltage
+static const uint16_t ATM90E32_REGISTER_IRMS = 0xDD;     // RMS Current Reg Base
 static const uint16_t ATM90E32_REGISTER_IRMSA = 0xDD;    // A RMS Current
 static const uint16_t ATM90E32_REGISTER_IRMSB = 0xDE;    // B RMS Current
 static const uint16_t ATM90E32_REGISTER_IRMSC = 0xDF;    // C RMS Current
@@ -223,12 +233,15 @@ static const uint16_t ATM90E32_REGISTER_PMEANAFLSB = 0xE1;  // Lower Word (A Act
 static const uint16_t ATM90E32_REGISTER_PMEANBFLSB = 0xE2;  // Lower Word (B Act. Fund. Power)
 static const uint16_t ATM90E32_REGISTER_PMEANCFLSB = 0xE3;  // Lower Word (C Act. Fund. Power)
 static const uint16_t ATM90E32_REGISTER_PMEANTHLSB = 0xE4;  // Lower Word (Tot. Act. Harm. Power)
+static const uint16_t ATM90E32_REGISTER_PMEANHLSB = 0xE5;   // Lower Word (A Act. Harm. Power) Reg Base
 static const uint16_t ATM90E32_REGISTER_PMEANAHLSB = 0xE5;  // Lower Word (A Act. Harm. Power)
 static const uint16_t ATM90E32_REGISTER_PMEANBHLSB = 0xE6;  // Lower Word (B Act. Harm. Power)
 static const uint16_t ATM90E32_REGISTER_PMEANCHLSB = 0xE7;  // Lower Word (C Act. Harm. Power)
+static const uint16_t ATM90E32_REGISTER_URMSLSB = 0xE9;     // Lower Word RMS Voltage Reg Base
 static const uint16_t ATM90E32_REGISTER_URMSALSB = 0xE9;    // Lower Word (A RMS Voltage)
 static const uint16_t ATM90E32_REGISTER_URMSBLSB = 0xEA;    // Lower Word (B RMS Voltage)
 static const uint16_t ATM90E32_REGISTER_URMSCLSB = 0xEB;    // Lower Word (C RMS Voltage)
+static const uint16_t ATM90E32_REGISTER_IRMSLSB = 0xED;     // Lower Word RMS Current Reg Base
 static const uint16_t ATM90E32_REGISTER_IRMSALSB = 0xED;    // Lower Word (A RMS Current)
 static const uint16_t ATM90E32_REGISTER_IRMSBLSB = 0xEE;    // Lower Word (B RMS Current)
 static const uint16_t ATM90E32_REGISTER_IRMSCLSB = 0xEF;    // Lower Word (C RMS Current)
@@ -237,10 +250,12 @@ static const uint16_t ATM90E32_REGISTER_IRMSCLSB = 0xEF;    // Lower Word (C RMS
 static const uint16_t ATM90E32_REGISTER_UPEAKA = 0xF1;   // A Voltage Peak
 static const uint16_t ATM90E32_REGISTER_UPEAKB = 0xF2;   // B Voltage Peak
 static const uint16_t ATM90E32_REGISTER_UPEAKC = 0xF3;   // C Voltage Peak
+static const uint16_t ATM90E32_REGISTER_IPEAK = 0xF5;    // Peak Current Reg Base
 static const uint16_t ATM90E32_REGISTER_IPEAKA = 0xF5;   // A Current Peak
 static const uint16_t ATM90E32_REGISTER_IPEAKB = 0xF6;   // B Current Peak
 static const uint16_t ATM90E32_REGISTER_IPEAKC = 0xF7;   // C Current Peak
 static const uint16_t ATM90E32_REGISTER_FREQ = 0xF8;     // Frequency
+static const uint16_t ATM90E32_REGISTER_PANGLE = 0xF9;   // Mean Phase Angle Reg Base
 static const uint16_t ATM90E32_REGISTER_PANGLEA = 0xF9;  // A Mean Phase Angle
 static const uint16_t ATM90E32_REGISTER_PANGLEB = 0xFA;  // B Mean Phase Angle
 static const uint16_t ATM90E32_REGISTER_PANGLEC = 0xFB;  // C Mean Phase Angle

esphome/components/atm90e32/sensor.py

@@ -9,8 +9,10 @@ from esphome.const import (
     CONF_PHASE_A,
     CONF_PHASE_B,
     CONF_PHASE_C,
+    CONF_PHASE_ANGLE,
     CONF_POWER,
     CONF_POWER_FACTOR,
+    CONF_APPARENT_POWER,
     CONF_FREQUENCY,
     CONF_FORWARD_ACTIVE_ENERGY,
     CONF_REVERSE_ACTIVE_ENERGY,
@@ -25,12 +27,13 @@ from esphome.const import (
     ICON_CURRENT_AC,
     STATE_CLASS_MEASUREMENT,
     STATE_CLASS_TOTAL_INCREASING,
+    UNIT_AMPERE,
+    UNIT_DEGREES,
+    UNIT_CELSIUS,
     UNIT_HERTZ,
     UNIT_VOLT,
-    UNIT_AMPERE,
-    UNIT_WATT,
-    UNIT_CELSIUS,
     UNIT_VOLT_AMPS_REACTIVE,
+    UNIT_WATT,
     UNIT_WATT_HOURS,
 )
 
@@ -40,6 +43,10 @@ CONF_GAIN_PGA = "gain_pga"
 CONF_CURRENT_PHASES = "current_phases"
 CONF_GAIN_VOLTAGE = "gain_voltage"
 CONF_GAIN_CT = "gain_ct"
+CONF_HARMONIC_POWER = "harmonic_power"
+CONF_PEAK_CURRENT = "peak_current"
+CONF_PEAK_CURRENT_SIGNED = "peak_current_signed"
+UNIT_DEG = "degrees"
 LINE_FREQS = {
     "50HZ": 50,
     "60HZ": 60,
@@ -85,6 +92,12 @@ ATM90E32_PHASE_SCHEMA = cv.Schema(
             accuracy_decimals=2,
             state_class=STATE_CLASS_MEASUREMENT,
         ),
+        cv.Optional(CONF_APPARENT_POWER): sensor.sensor_schema(
+            unit_of_measurement=UNIT_WATT,
+            accuracy_decimals=2,
+            device_class=DEVICE_CLASS_POWER,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
         cv.Optional(CONF_POWER_FACTOR): sensor.sensor_schema(
             accuracy_decimals=2,
             device_class=DEVICE_CLASS_POWER_FACTOR,
@@ -102,6 +115,24 @@ ATM90E32_PHASE_SCHEMA = cv.Schema(
             device_class=DEVICE_CLASS_ENERGY,
             state_class=STATE_CLASS_TOTAL_INCREASING,
         ),
+        cv.Optional(CONF_PHASE_ANGLE): sensor.sensor_schema(
+            unit_of_measurement=UNIT_DEGREES,
+            accuracy_decimals=2,
+            device_class=DEVICE_CLASS_POWER,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_HARMONIC_POWER): sensor.sensor_schema(
+            unit_of_measurement=UNIT_WATT,
+            accuracy_decimals=2,
+            device_class=DEVICE_CLASS_POWER,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_PEAK_CURRENT): sensor.sensor_schema(
+            unit_of_measurement=UNIT_AMPERE,
+            accuracy_decimals=2,
+            device_class=DEVICE_CLASS_CURRENT,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
         cv.Optional(CONF_GAIN_VOLTAGE, default=7305): cv.uint16_t,
         cv.Optional(CONF_GAIN_CT, default=27961): cv.uint16_t,
     }
@@ -132,6 +163,7 @@ CONFIG_SCHEMA = (
                 CURRENT_PHASES, upper=True
             ),
             cv.Optional(CONF_GAIN_PGA, default="2X"): cv.enum(PGA_GAINS, upper=True),
+            cv.Optional(CONF_PEAK_CURRENT_SIGNED, default=False): cv.boolean,
         }
     )
     .extend(cv.polling_component_schema("60s"))
@@ -162,6 +194,9 @@ async def to_code(config):
         if reactive_power_config := conf.get(CONF_REACTIVE_POWER):
             sens = await sensor.new_sensor(reactive_power_config)
             cg.add(var.set_reactive_power_sensor(i, sens))
+        if apparent_power_config := conf.get(CONF_APPARENT_POWER):
+            sens = await sensor.new_sensor(apparent_power_config)
+            cg.add(var.set_apparent_power_sensor(i, sens))
         if power_factor_config := conf.get(CONF_POWER_FACTOR):
             sens = await sensor.new_sensor(power_factor_config)
             cg.add(var.set_power_factor_sensor(i, sens))
@@ -171,6 +206,15 @@ async def to_code(config):
         if reverse_active_energy_config := conf.get(CONF_REVERSE_ACTIVE_ENERGY):
             sens = await sensor.new_sensor(reverse_active_energy_config)
             cg.add(var.set_reverse_active_energy_sensor(i, sens))
+        if phase_angle_config := conf.get(CONF_PHASE_ANGLE):
+            sens = await sensor.new_sensor(phase_angle_config)
+            cg.add(var.set_phase_angle_sensor(i, sens))
+        if harmonic_active_power_config := conf.get(CONF_HARMONIC_POWER):
+            sens = await sensor.new_sensor(harmonic_active_power_config)
+            cg.add(var.set_harmonic_active_power_sensor(i, sens))
+        if peak_current_config := conf.get(CONF_PEAK_CURRENT):
+            sens = await sensor.new_sensor(peak_current_config)
+            cg.add(var.set_peak_current_sensor(i, sens))
 
     if frequency_config := config.get(CONF_FREQUENCY):
         sens = await sensor.new_sensor(frequency_config)
@@ -182,3 +226,4 @@ async def to_code(config):
     cg.add(var.set_line_freq(config[CONF_LINE_FREQUENCY]))
     cg.add(var.set_current_phases(config[CONF_CURRENT_PHASES]))
     cg.add(var.set_pga_gain(config[CONF_GAIN_PGA]))
+    cg.add(var.set_peak_current_signed(config[CONF_PEAK_CURRENT_SIGNED]))

esphome/components/bang_bang/bang_bang_climate.cpp

@@ -194,8 +194,8 @@ void BangBangClimate::dump_config() {
   ESP_LOGCONFIG(TAG, "  Supports HEAT: %s", YESNO(this->supports_heat_));
   ESP_LOGCONFIG(TAG, "  Supports COOL: %s", YESNO(this->supports_cool_));
   ESP_LOGCONFIG(TAG, "  Supports AWAY mode: %s", YESNO(this->supports_away_));
-  ESP_LOGCONFIG(TAG, "  Default Target Temperature Low: %.1f°C", this->normal_config_.default_temperature_low);
+  ESP_LOGCONFIG(TAG, "  Default Target Temperature Low: %.2f°C", this->normal_config_.default_temperature_low);
-  ESP_LOGCONFIG(TAG, "  Default Target Temperature High: %.1f°C", this->normal_config_.default_temperature_high);
+  ESP_LOGCONFIG(TAG, "  Default Target Temperature High: %.2f°C", this->normal_config_.default_temperature_high);
 }
 
 BangBangClimateTargetTempConfig::BangBangClimateTargetTempConfig() = default;

esphome/components/ble_presence/binary_sensor.py

@@ -8,8 +8,11 @@ from esphome.const import (
     CONF_IBEACON_MINOR,
     CONF_IBEACON_UUID,
     CONF_MIN_RSSI,
+    CONF_TIMEOUT,
 )
 
+CONF_IRK = "irk"
+
 DEPENDENCIES = ["esp32_ble_tracker"]
 
 ble_presence_ns = cg.esphome_ns.namespace("ble_presence")
@@ -34,10 +37,12 @@ CONFIG_SCHEMA = cv.All(
     .extend(
         {
             cv.Optional(CONF_MAC_ADDRESS): cv.mac_address,
+            cv.Optional(CONF_IRK): cv.uuid,
             cv.Optional(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
             cv.Optional(CONF_IBEACON_MAJOR): cv.uint16_t,
             cv.Optional(CONF_IBEACON_MINOR): cv.uint16_t,
             cv.Optional(CONF_IBEACON_UUID): cv.uuid,
+            cv.Optional(CONF_TIMEOUT, default="5min"): cv.positive_time_period,
             cv.Optional(CONF_MIN_RSSI): cv.All(
                 cv.decibel, cv.int_range(min=-100, max=-30)
             ),
@@ -45,7 +50,9 @@ CONFIG_SCHEMA = cv.All(
     )
     .extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
     .extend(cv.COMPONENT_SCHEMA),
-    cv.has_exactly_one_key(CONF_MAC_ADDRESS, CONF_SERVICE_UUID, CONF_IBEACON_UUID),
+    cv.has_exactly_one_key(
+        CONF_MAC_ADDRESS, CONF_IRK, CONF_SERVICE_UUID, CONF_IBEACON_UUID
+    ),
     _validate,
 )
 
@@ -55,12 +62,17 @@ async def to_code(config):
     await cg.register_component(var, config)
     await esp32_ble_tracker.register_ble_device(var, config)
 
+    cg.add(var.set_timeout(config[CONF_TIMEOUT].total_milliseconds))
     if min_rssi := config.get(CONF_MIN_RSSI):
         cg.add(var.set_minimum_rssi(min_rssi))
 
     if mac_address := config.get(CONF_MAC_ADDRESS):
         cg.add(var.set_address(mac_address.as_hex))
 
+    if irk := config.get(CONF_IRK):
+        irk = esp32_ble_tracker.as_hex_array(str(irk))
+        cg.add(var.set_irk(irk))
+
     if service_uuid := config.get(CONF_SERVICE_UUID):
         if len(service_uuid) == len(esp32_ble_tracker.bt_uuid16_format):
             cg.add(var.set_service_uuid16(esp32_ble_tracker.as_hex(service_uuid)))

esphome/components/ble_presence/ble_presence_device.h

@@ -6,6 +6,16 @@
 
 #ifdef USE_ESP32
 
+#ifdef USE_ARDUINO
+#include "mbedtls/aes.h"
+#include "mbedtls/base64.h"
+#endif
+
+#ifdef USE_ESP_IDF
+#define MBEDTLS_AES_ALT
+#include <aes_alt.h>
+#endif
+
 namespace esphome {
 namespace ble_presence {
 
@@ -17,6 +27,10 @@ class BLEPresenceDevice : public binary_sensor::BinarySensorInitiallyOff,
     this->match_by_ = MATCH_BY_MAC_ADDRESS;
     this->address_ = address;
   }
+  void set_irk(uint8_t *irk) {
+    this->match_by_ = MATCH_BY_IRK;
+    this->irk_ = irk;
+  }
   void set_service_uuid16(uint16_t uuid) {
     this->match_by_ = MATCH_BY_SERVICE_UUID;
     this->uuid_ = esp32_ble_tracker::ESPBTUUID::from_uint16(uuid);
@@ -45,11 +59,7 @@ class BLEPresenceDevice : public binary_sensor::BinarySensorInitiallyOff,
     this->check_minimum_rssi_ = true;
     this->minimum_rssi_ = rssi;
   }
-  void on_scan_end() override {
+  void set_timeout(uint32_t timeout) { this->timeout_ = timeout; }
-    if (!this->found_)
-      this->publish_state(false);
-    this->found_ = false;
-  }
   bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override {
     if (this->check_minimum_rssi_ && this->minimum_rssi_ > device.get_rssi()) {
       return false;
@@ -57,16 +67,20 @@ class BLEPresenceDevice : public binary_sensor::BinarySensorInitiallyOff,
     switch (this->match_by_) {
       case MATCH_BY_MAC_ADDRESS:
         if (device.address_uint64() == this->address_) {
-          this->publish_state(true);
+          this->set_found_(true);
-          this->found_ = true;
+          return true;
+        }
+        break;
+      case MATCH_BY_IRK:
+        if (resolve_irk_(device.address_uint64(), this->irk_)) {
+          this->set_found_(true);
           return true;
         }
         break;
       case MATCH_BY_SERVICE_UUID:
         for (auto uuid : device.get_service_uuids()) {
           if (this->uuid_ == uuid) {
-            this->publish_state(true);
+            this->set_found_(true);
-            this->found_ = true;
             return true;
           }
         }
@@ -90,20 +104,31 @@ class BLEPresenceDevice : public binary_sensor::BinarySensorInitiallyOff,
           return false;
         }
 
-        this->publish_state(true);
+        this->set_found_(true);
-        this->found_ = true;
         return true;
     }
     return false;
   }
+
+  void loop() override {
+    if (this->found_ && this->last_seen_ + this->timeout_ < millis())
+      this->set_found_(false);
+  }
   void dump_config() override;
   float get_setup_priority() const override { return setup_priority::DATA; }
 
  protected:
-  enum MatchType { MATCH_BY_MAC_ADDRESS, MATCH_BY_SERVICE_UUID, MATCH_BY_IBEACON_UUID };
+  void set_found_(bool state) {
+    this->found_ = state;
+    if (state)
+      this->last_seen_ = millis();
+    this->publish_state(state);
+  }
+  enum MatchType { MATCH_BY_MAC_ADDRESS, MATCH_BY_IRK, MATCH_BY_SERVICE_UUID, MATCH_BY_IBEACON_UUID };
   MatchType match_by_;
 
   uint64_t address_;
+  uint8_t *irk_;
 
   esp32_ble_tracker::ESPBTUUID uuid_;
 
@@ -117,7 +142,46 @@ class BLEPresenceDevice : public binary_sensor::BinarySensorInitiallyOff,
   bool check_ibeacon_minor_{false};
   bool check_minimum_rssi_{false};
 
+  bool resolve_irk_(uint64_t addr64, const uint8_t *irk) {
+    uint8_t ecb_key[16];
+    uint8_t ecb_plaintext[16];
+    uint8_t ecb_ciphertext[16];
+
+    memcpy(&ecb_key, irk, 16);
+    memset(&ecb_plaintext, 0, 16);
+
+    ecb_plaintext[13] = (addr64 >> 40) & 0xff;
+    ecb_plaintext[14] = (addr64 >> 32) & 0xff;
+    ecb_plaintext[15] = (addr64 >> 24) & 0xff;
+
+    mbedtls_aes_context ctx = {0, 0, {0}};
+    mbedtls_aes_init(&ctx);
+
+    if (mbedtls_aes_setkey_enc(&ctx, ecb_key, 128) != 0) {
+      mbedtls_aes_free(&ctx);
+      return false;
+    }
+
+    if (mbedtls_aes_crypt_ecb(&ctx,
+#ifdef USE_ARDUINO
+                              MBEDTLS_AES_ENCRYPT,
+#elif defined(USE_ESP_IDF)
+                              ESP_AES_ENCRYPT,
+#endif
+                              ecb_plaintext, ecb_ciphertext) != 0) {
+      mbedtls_aes_free(&ctx);
+      return false;
+    }
+
+    mbedtls_aes_free(&ctx);
+
+    return ecb_ciphertext[15] == (addr64 & 0xff) && ecb_ciphertext[14] == ((addr64 >> 8) & 0xff) &&
+           ecb_ciphertext[13] == ((addr64 >> 16) & 0xff);
+  }
+
   bool found_{false};
+  uint32_t last_seen_{};
+  uint32_t timeout_{};
 };
 
 }  // namespace ble_presence

esphome/components/captive_portal/captive_index.h

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

esphome/components/captive_portal/captive_portal.cpp

@@ -12,7 +12,7 @@ static const char *const TAG = "captive_portal";
 void CaptivePortal::handle_config(AsyncWebServerRequest *request) {
   AsyncResponseStream *stream = request->beginResponseStream("application/json");
   stream->addHeader("cache-control", "public, max-age=0, must-revalidate");
-  stream->printf(R"({"name":"%s","aps":[{})", App.get_name().c_str());
+  stream->printf(R"({"mac":"%s","name":"%s","aps":[{})", get_mac_address_pretty().c_str(), App.get_name().c_str());
 
   for (auto &scan : wifi::global_wifi_component->get_scan_result()) {
     if (scan.get_is_hidden())

esphome/components/climate/__init__.py

@@ -244,122 +244,150 @@ async def setup_climate_core_(var, config):
     await setup_entity(var, config)
 
     visual = config[CONF_VISUAL]
-    if CONF_MIN_TEMPERATURE in visual:
+    if (min_temp := visual.get(CONF_MIN_TEMPERATURE)) is not None:
-        cg.add(var.set_visual_min_temperature_override(visual[CONF_MIN_TEMPERATURE]))
+        cg.add(var.set_visual_min_temperature_override(min_temp))
-    if CONF_MAX_TEMPERATURE in visual:
+    if (max_temp := visual.get(CONF_MAX_TEMPERATURE)) is not None:
-        cg.add(var.set_visual_max_temperature_override(visual[CONF_MAX_TEMPERATURE]))
+        cg.add(var.set_visual_max_temperature_override(max_temp))
-    if CONF_TEMPERATURE_STEP in visual:
+    if (temp_step := visual.get(CONF_TEMPERATURE_STEP)) is not None:
         cg.add(
             var.set_visual_temperature_step_override(
-                visual[CONF_TEMPERATURE_STEP][CONF_TARGET_TEMPERATURE],
+                temp_step[CONF_TARGET_TEMPERATURE],
-                visual[CONF_TEMPERATURE_STEP][CONF_CURRENT_TEMPERATURE],
+                temp_step[CONF_CURRENT_TEMPERATURE],
             )
         )
-    if CONF_MIN_HUMIDITY in visual:
+    if (min_humidity := visual.get(CONF_MIN_HUMIDITY)) is not None:
-        cg.add(var.set_visual_min_humidity_override(visual[CONF_MIN_HUMIDITY]))
+        cg.add(var.set_visual_min_humidity_override(min_humidity))
-    if CONF_MAX_HUMIDITY in visual:
+    if (max_humidity := visual.get(CONF_MAX_HUMIDITY)) is not None:
-        cg.add(var.set_visual_max_humidity_override(visual[CONF_MAX_HUMIDITY]))
+        cg.add(var.set_visual_max_humidity_override(max_humidity))
 
-    if CONF_MQTT_ID in config:
+    if (mqtt_id := config.get(CONF_MQTT_ID)) is not None:
-        mqtt_ = cg.new_Pvariable(config[CONF_MQTT_ID], var)
+        mqtt_ = cg.new_Pvariable(mqtt_id, var)
         await mqtt.register_mqtt_component(mqtt_, config)
 
-        if CONF_ACTION_STATE_TOPIC in config:
+        if (action_state_topic := config.get(CONF_ACTION_STATE_TOPIC)) is not None:
-            cg.add(mqtt_.set_custom_action_state_topic(config[CONF_ACTION_STATE_TOPIC]))
+            cg.add(mqtt_.set_custom_action_state_topic(action_state_topic))
-        if CONF_AWAY_COMMAND_TOPIC in config:
+        if (away_command_topic := config.get(CONF_AWAY_COMMAND_TOPIC)) is not None:
-            cg.add(mqtt_.set_custom_away_command_topic(config[CONF_AWAY_COMMAND_TOPIC]))
+            cg.add(mqtt_.set_custom_away_command_topic(away_command_topic))
-        if CONF_AWAY_STATE_TOPIC in config:
+        if (away_state_topic := config.get(CONF_AWAY_STATE_TOPIC)) is not None:
-            cg.add(mqtt_.set_custom_away_state_topic(config[CONF_AWAY_STATE_TOPIC]))
+            cg.add(mqtt_.set_custom_away_state_topic(away_state_topic))
-        if CONF_CURRENT_TEMPERATURE_STATE_TOPIC in config:
+        if (
+            current_temperature_state_topic := config.get(
+                CONF_CURRENT_TEMPERATURE_STATE_TOPIC
+            )
+        ) is not None:
             cg.add(
                 mqtt_.set_custom_current_temperature_state_topic(
-                    config[CONF_CURRENT_TEMPERATURE_STATE_TOPIC]
+                    current_temperature_state_topic
                 )
             )
-        if CONF_CURRENT_HUMIDITY_STATE_TOPIC in config:
+        if (
+            current_humidity_state_topic := config.get(
+                CONF_CURRENT_HUMIDITY_STATE_TOPIC
+            )
+        ) is not None:
             cg.add(
                 mqtt_.set_custom_current_humidity_state_topic(
-                    config[CONF_CURRENT_HUMIDITY_STATE_TOPIC]
+                    current_humidity_state_topic
                 )
             )
-        if CONF_FAN_MODE_COMMAND_TOPIC in config:
+        if (
-            cg.add(
+            fan_mode_command_topic := config.get(CONF_FAN_MODE_COMMAND_TOPIC)
-                mqtt_.set_custom_fan_mode_command_topic(
+        ) is not None:
-                    config[CONF_FAN_MODE_COMMAND_TOPIC]
+            cg.add(mqtt_.set_custom_fan_mode_command_topic(fan_mode_command_topic))
-                )
+        if (fan_mode_state_topic := config.get(CONF_FAN_MODE_STATE_TOPIC)) is not None:
+            cg.add(mqtt_.set_custom_fan_mode_state_topic(fan_mode_state_topic))
+        if (mode_command_topic := config.get(CONF_MODE_COMMAND_TOPIC)) is not None:
+            cg.add(mqtt_.set_custom_mode_command_topic(mode_command_topic))
+        if (mode_state_topic := config.get(CONF_MODE_STATE_TOPIC)) is not None:
+            cg.add(mqtt_.set_custom_mode_state_topic(mode_state_topic))
+        if (preset_command_topic := config.get(CONF_PRESET_COMMAND_TOPIC)) is not None:
+            cg.add(mqtt_.set_custom_preset_command_topic(preset_command_topic))
+        if (preset_state_topic := config.get(CONF_PRESET_STATE_TOPIC)) is not None:
+            cg.add(mqtt_.set_custom_preset_state_topic(preset_state_topic))
+        if (
+            swing_mode_command_topic := config.get(CONF_SWING_MODE_COMMAND_TOPIC)
+        ) is not None:
+            cg.add(mqtt_.set_custom_swing_mode_command_topic(swing_mode_command_topic))
+        if (
+            swing_mode_state_topic := config.get(CONF_SWING_MODE_STATE_TOPIC)
+        ) is not None:
+            cg.add(mqtt_.set_custom_swing_mode_state_topic(swing_mode_state_topic))
+        if (
+            target_temperature_command_topic := config.get(
+                CONF_TARGET_TEMPERATURE_COMMAND_TOPIC
             )
-        if CONF_FAN_MODE_STATE_TOPIC in config:
+        ) is not None:
-            cg.add(
-                mqtt_.set_custom_fan_mode_state_topic(config[CONF_FAN_MODE_STATE_TOPIC])
-            )
-        if CONF_MODE_COMMAND_TOPIC in config:
-            cg.add(mqtt_.set_custom_mode_command_topic(config[CONF_MODE_COMMAND_TOPIC]))
-        if CONF_MODE_STATE_TOPIC in config:
-            cg.add(mqtt_.set_custom_mode_state_topic(config[CONF_MODE_STATE_TOPIC]))
-        if CONF_PRESET_COMMAND_TOPIC in config:
-            cg.add(
-                mqtt_.set_custom_preset_command_topic(config[CONF_PRESET_COMMAND_TOPIC])
-            )
-        if CONF_PRESET_STATE_TOPIC in config:
-            cg.add(mqtt_.set_custom_preset_state_topic(config[CONF_PRESET_STATE_TOPIC]))
-        if CONF_SWING_MODE_COMMAND_TOPIC in config:
-            cg.add(
-                mqtt_.set_custom_swing_mode_command_topic(
-                    config[CONF_SWING_MODE_COMMAND_TOPIC]
-                )
-            )
-        if CONF_SWING_MODE_STATE_TOPIC in config:
-            cg.add(
-                mqtt_.set_custom_swing_mode_state_topic(
-                    config[CONF_SWING_MODE_STATE_TOPIC]
-                )
-            )
-        if CONF_TARGET_TEMPERATURE_COMMAND_TOPIC in config:
             cg.add(
                 mqtt_.set_custom_target_temperature_command_topic(
-                    config[CONF_TARGET_TEMPERATURE_COMMAND_TOPIC]
+                    target_temperature_command_topic
                 )
             )
-        if CONF_TARGET_TEMPERATURE_STATE_TOPIC in config:
+        if (
+            target_temperature_state_topic := config.get(
+                CONF_TARGET_TEMPERATURE_STATE_TOPIC
+            )
+        ) is not None:
             cg.add(
                 mqtt_.set_custom_target_temperature_state_topic(
-                    config[CONF_TARGET_TEMPERATURE_STATE_TOPIC]
+                    target_temperature_state_topic
                 )
             )
-        if CONF_TARGET_TEMPERATURE_HIGH_COMMAND_TOPIC in config:
+        if (
+            target_temperature_high_command_topic := config.get(
+                CONF_TARGET_TEMPERATURE_HIGH_COMMAND_TOPIC
+            )
+        ) is not None:
             cg.add(
                 mqtt_.set_custom_target_temperature_high_command_topic(
-                    config[CONF_TARGET_TEMPERATURE_HIGH_COMMAND_TOPIC]
+                    target_temperature_high_command_topic
                 )
             )
-        if CONF_TARGET_TEMPERATURE_HIGH_STATE_TOPIC in config:
+        if (
+            target_temperature_high_state_topic := config.get(
+                CONF_TARGET_TEMPERATURE_HIGH_STATE_TOPIC
+            )
+        ) is not None:
             cg.add(
                 mqtt_.set_custom_target_temperature_high_state_topic(
-                    config[CONF_TARGET_TEMPERATURE_HIGH_STATE_TOPIC]
+                    target_temperature_high_state_topic
                 )
             )
-        if CONF_TARGET_TEMPERATURE_LOW_COMMAND_TOPIC in config:
+        if (
+            target_temperature_low_command_topic := config.get(
+                CONF_TARGET_TEMPERATURE_LOW_COMMAND_TOPIC
+            )
+        ) is not None:
             cg.add(
                 mqtt_.set_custom_target_temperature_low_command_topic(
-                    config[CONF_TARGET_TEMPERATURE_LOW_COMMAND_TOPIC]
+                    target_temperature_low_command_topic
                 )
             )
-        if CONF_TARGET_TEMPERATURE_LOW_STATE_TOPIC in config:
+        if (
+            target_temperature_low_state_topic := config.get(
+                CONF_TARGET_TEMPERATURE_LOW_STATE_TOPIC
+            )
+        ) is not None:
             cg.add(
                 mqtt_.set_custom_target_temperature_state_topic(
-                    config[CONF_TARGET_TEMPERATURE_LOW_STATE_TOPIC]
+                    target_temperature_low_state_topic
                 )
             )
-        if CONF_TARGET_HUMIDITY_COMMAND_TOPIC in config:
+        if (
+            target_humidity_command_topic := config.get(
+                CONF_TARGET_HUMIDITY_COMMAND_TOPIC
+            )
+        ) is not None:
             cg.add(
                 mqtt_.set_custom_target_humidity_command_topic(
-                    config[CONF_TARGET_HUMIDITY_COMMAND_TOPIC]
+                    target_humidity_command_topic
                 )
             )
-        if CONF_TARGET_HUMIDITY_STATE_TOPIC in config:
+        if (
+            target_humidity_state_topic := config.get(CONF_TARGET_HUMIDITY_STATE_TOPIC)
+        ) is not None:
             cg.add(
                 mqtt_.set_custom_target_humidity_state_topic(
-                    config[CONF_TARGET_HUMIDITY_STATE_TOPIC]
+                    target_humidity_state_topic
                 )
             )
 
@@ -411,45 +439,35 @@ CLIMATE_CONTROL_ACTION_SCHEMA = cv.Schema(
 async def climate_control_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_MODE in config:
+    if (mode := config.get(CONF_MODE)) is not None:
-        template_ = await cg.templatable(config[CONF_MODE], args, ClimateMode)
+        template_ = await cg.templatable(mode, args, ClimateMode)
         cg.add(var.set_mode(template_))
-    if CONF_TARGET_TEMPERATURE in config:
+    if (target_temp := config.get(CONF_TARGET_TEMPERATURE)) is not None:
-        template_ = await cg.templatable(config[CONF_TARGET_TEMPERATURE], args, float)
+        template_ = await cg.templatable(target_temp, args, float)
         cg.add(var.set_target_temperature(template_))
-    if CONF_TARGET_TEMPERATURE_LOW in config:
+    if (target_temp_low := config.get(CONF_TARGET_TEMPERATURE_LOW)) is not None:
-        template_ = await cg.templatable(
+        template_ = await cg.templatable(target_temp_low, args, float)
-            config[CONF_TARGET_TEMPERATURE_LOW], args, float
-        )
         cg.add(var.set_target_temperature_low(template_))
-    if CONF_TARGET_TEMPERATURE_HIGH in config:
+    if (target_temp_high := config.get(CONF_TARGET_TEMPERATURE_HIGH)) is not None:
-        template_ = await cg.templatable(
+        template_ = await cg.templatable(target_temp_high, args, float)
-            config[CONF_TARGET_TEMPERATURE_HIGH], args, float
-        )
         cg.add(var.set_target_temperature_high(template_))
-    if CONF_TARGET_HUMIDITY in config:
+    if (target_humidity := config.get(CONF_TARGET_HUMIDITY)) is not None:
-        template_ = await cg.templatable(config[CONF_TARGET_HUMIDITY], args, float)
+        template_ = await cg.templatable(target_humidity, args, float)
         cg.add(var.set_target_humidity(template_))
-    if CONF_FAN_MODE in config:
+    if (fan_mode := config.get(CONF_FAN_MODE)) is not None:
-        template_ = await cg.templatable(config[CONF_FAN_MODE], args, ClimateFanMode)
+        template_ = await cg.templatable(fan_mode, args, ClimateFanMode)
         cg.add(var.set_fan_mode(template_))
-    if CONF_CUSTOM_FAN_MODE in config:
+    if (custom_fan_mode := config.get(CONF_CUSTOM_FAN_MODE)) is not None:
-        template_ = await cg.templatable(
+        template_ = await cg.templatable(custom_fan_mode, args, cg.std_string)
-            config[CONF_CUSTOM_FAN_MODE], args, cg.std_string
-        )
         cg.add(var.set_custom_fan_mode(template_))
-    if CONF_PRESET in config:
+    if (preset := config.get(CONF_PRESET)) is not None:
-        template_ = await cg.templatable(config[CONF_PRESET], args, ClimatePreset)
+        template_ = await cg.templatable(preset, args, ClimatePreset)
         cg.add(var.set_preset(template_))
-    if CONF_CUSTOM_PRESET in config:
+    if (custom_preset := config.get(CONF_CUSTOM_PRESET)) is not None:
-        template_ = await cg.templatable(
+        template_ = await cg.templatable(custom_preset, args, cg.std_string)
-            config[CONF_CUSTOM_PRESET], args, cg.std_string
-        )
         cg.add(var.set_custom_preset(template_))
-    if CONF_SWING_MODE in config:
+    if (swing_mode := config.get(CONF_SWING_MODE)) is not None:
-        template_ = await cg.templatable(
+        template_ = await cg.templatable(swing_mode, args, ClimateSwingMode)
-            config[CONF_SWING_MODE], args, ClimateSwingMode
-        )
         cg.add(var.set_swing_mode(template_))
     return var
 

esphome/components/cover/__init__.py

@@ -122,8 +122,8 @@ COVER_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).ex
 async def setup_cover_core_(var, config):
     await setup_entity(var, config)
 
-    if CONF_DEVICE_CLASS in config:
+    if (device_class := config.get(CONF_DEVICE_CLASS)) is not None:
-        cg.add(var.set_device_class(config[CONF_DEVICE_CLASS]))
+        cg.add(var.set_device_class(device_class))
 
     for conf in config.get(CONF_ON_OPEN, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
@@ -132,24 +132,20 @@ async def setup_cover_core_(var, config):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
         await automation.build_automation(trigger, [], conf)
 
-    if CONF_MQTT_ID in config:
+    if (mqtt_id := config.get(CONF_MQTT_ID)) is not None:
-        mqtt_ = cg.new_Pvariable(config[CONF_MQTT_ID], var)
+        mqtt_ = cg.new_Pvariable(mqtt_id, var)
         await mqtt.register_mqtt_component(mqtt_, config)
 
-        if CONF_POSITION_STATE_TOPIC in config:
+        if (position_state_topic := config.get(CONF_POSITION_STATE_TOPIC)) is not None:
-            cg.add(
+            cg.add(mqtt_.set_custom_position_state_topic(position_state_topic))
-                mqtt_.set_custom_position_state_topic(config[CONF_POSITION_STATE_TOPIC])
+        if (
-            )
+            position_command_topic := config.get(CONF_POSITION_COMMAND_TOPIC)
-        if CONF_POSITION_COMMAND_TOPIC in config:
+        ) is not None:
-            cg.add(
+            cg.add(mqtt_.set_custom_position_command_topic(position_command_topic))
-                mqtt_.set_custom_position_command_topic(
+        if (tilt_state_topic := config.get(CONF_TILT_STATE_TOPIC)) is not None:
-                    config[CONF_POSITION_COMMAND_TOPIC]
+            cg.add(mqtt_.set_custom_tilt_state_topic(tilt_state_topic))
-                )
+        if (tilt_command_topic := config.get(CONF_TILT_COMMAND_TOPIC)) is not None:
-            )
+            cg.add(mqtt_.set_custom_tilt_command_topic(tilt_command_topic))
-        if CONF_TILT_STATE_TOPIC in config:
-            cg.add(mqtt_.set_custom_tilt_state_topic(config[CONF_TILT_STATE_TOPIC]))
-        if CONF_TILT_COMMAND_TOPIC in config:
-            cg.add(mqtt_.set_custom_tilt_command_topic(config[CONF_TILT_COMMAND_TOPIC]))
 
 
 async def register_cover(var, config):
@@ -205,17 +201,17 @@ COVER_CONTROL_ACTION_SCHEMA = cv.Schema(
 async def cover_control_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_STOP in config:
+    if (stop := config.get(CONF_STOP)) is not None:
-        template_ = await cg.templatable(config[CONF_STOP], args, bool)
+        template_ = await cg.templatable(stop, args, bool)
         cg.add(var.set_stop(template_))
-    if CONF_STATE in config:
+    if (state := config.get(CONF_STATE)) is not None:
-        template_ = await cg.templatable(config[CONF_STATE], args, float)
+        template_ = await cg.templatable(state, args, float)
         cg.add(var.set_position(template_))
-    if CONF_POSITION in config:
+    if (position := config.get(CONF_POSITION)) is not None:
-        template_ = await cg.templatable(config[CONF_POSITION], args, float)
+        template_ = await cg.templatable(position, args, float)
         cg.add(var.set_position(template_))
-    if CONF_TILT in config:
+    if (tilt := config.get(CONF_TILT)) is not None:
-        template_ = await cg.templatable(config[CONF_TILT], args, float)
+        template_ = await cg.templatable(tilt, args, float)
         cg.add(var.set_tilt(template_))
     return var
 

esphome/components/cst226/__init__.py

@@ -0,0 +1,6 @@
+import esphome.codegen as cg
+
+CODEOWNERS = ["@clydebarrow"]
+DEPENDENCIES = ["i2c"]
+
+cst226_ns = cg.esphome_ns.namespace("cst226")

esphome/components/cst226/touchscreen/__init__.py

@@ -0,0 +1,38 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+
+from esphome import pins
+from esphome.components import i2c, touchscreen
+from esphome.const import CONF_INTERRUPT_PIN, CONF_ID, CONF_RESET_PIN
+from .. import cst226_ns
+
+
+CST226Touchscreen = cst226_ns.class_(
+    "CST226Touchscreen",
+    touchscreen.Touchscreen,
+    i2c.I2CDevice,
+)
+
+CST226ButtonListener = cst226_ns.class_("CST226ButtonListener")
+CONFIG_SCHEMA = (
+    touchscreen.touchscreen_schema("100ms")
+    .extend(
+        {
+            cv.GenerateID(): cv.declare_id(CST226Touchscreen),
+            cv.Optional(CONF_INTERRUPT_PIN): pins.internal_gpio_input_pin_schema,
+            cv.Optional(CONF_RESET_PIN): pins.gpio_output_pin_schema,
+        }
+    )
+    .extend(i2c.i2c_device_schema(0x5A))
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await touchscreen.register_touchscreen(var, config)
+    await i2c.register_i2c_device(var, config)
+
+    if interrupt_pin := config.get(CONF_INTERRUPT_PIN):
+        cg.add(var.set_interrupt_pin(await cg.gpio_pin_expression(interrupt_pin)))
+    if reset_pin := config.get(CONF_RESET_PIN):
+        cg.add(var.set_reset_pin(await cg.gpio_pin_expression(reset_pin)))

esphome/components/cst226/touchscreen/cst226_touchscreen.cpp

@@ -0,0 +1,92 @@
+#include "cst226_touchscreen.h"
+
+namespace esphome {
+namespace cst226 {
+
+void CST226Touchscreen::setup() {
+  esph_log_config(TAG, "Setting up CST226 Touchscreen...");
+  if (this->reset_pin_ != nullptr) {
+    this->reset_pin_->setup();
+    this->reset_pin_->digital_write(true);
+    delay(5);
+    this->reset_pin_->digital_write(false);
+    delay(5);
+    this->reset_pin_->digital_write(true);
+    this->set_timeout(30, [this] { this->continue_setup_(); });
+  } else {
+    this->continue_setup_();
+  }
+}
+
+void CST226Touchscreen::update_touches() {
+  uint8_t data[28];
+  if (!this->read_bytes(CST226_REG_STATUS, data, sizeof data)) {
+    this->status_set_warning();
+    this->skip_update_ = true;
+    return;
+  }
+  this->status_clear_warning();
+  if (data[6] != 0xAB || data[0] == 0xAB || data[5] == 0x80) {
+    this->skip_update_ = true;
+    return;
+  }
+  uint8_t num_of_touches = data[5] & 0x7F;
+  if (num_of_touches == 0 || num_of_touches > 5) {
+    this->write_byte(0, 0xAB);
+    return;
+  }
+
+  size_t index = 0;
+  for (uint8_t i = 0; i != num_of_touches; i++) {
+    uint8_t id = data[index] >> 4;
+    int16_t x = (data[index + 1] << 4) | ((data[index + 3] >> 4) & 0x0F);
+    int16_t y = (data[index + 2] << 4) | (data[index + 3] & 0x0F);
+    int16_t z = data[index + 4];
+    this->add_raw_touch_position_(id, x, y, z);
+    esph_log_v(TAG, "Read touch %d: %d/%d", id, x, y);
+    index += 5;
+    if (i == 0)
+      index += 2;
+  }
+}
+
+void CST226Touchscreen::continue_setup_() {
+  uint8_t buffer[8];
+  if (this->interrupt_pin_ != nullptr) {
+    this->interrupt_pin_->setup();
+    this->attach_interrupt_(this->interrupt_pin_, gpio::INTERRUPT_FALLING_EDGE);
+  }
+  buffer[0] = 0xD1;
+  if (this->write_register16(0xD1, buffer, 1) != i2c::ERROR_OK) {
+    esph_log_e(TAG, "Write byte to 0xD1 failed");
+    this->mark_failed();
+    return;
+  }
+  delay(10);
+  if (this->read16_(0xD204, buffer, 4)) {
+    uint16_t chip_id = buffer[2] + (buffer[3] << 8);
+    uint16_t project_id = buffer[0] + (buffer[1] << 8);
+    esph_log_config(TAG, "Chip ID %X, project ID %x", chip_id, project_id);
+  }
+  if (this->x_raw_max_ == 0 || this->y_raw_max_ == 0) {
+    if (this->read16_(0xD1F8, buffer, 4)) {
+      this->x_raw_max_ = buffer[0] + (buffer[1] << 8);
+      this->y_raw_max_ = buffer[2] + (buffer[3] << 8);
+    } else {
+      this->x_raw_max_ = this->display_->get_native_width();
+      this->y_raw_max_ = this->display_->get_native_height();
+    }
+  }
+  this->setup_complete_ = true;
+  esph_log_config(TAG, "CST226 Touchscreen setup complete");
+}
+
+void CST226Touchscreen::dump_config() {
+  ESP_LOGCONFIG(TAG, "CST226 Touchscreen:");
+  LOG_I2C_DEVICE(this);
+  LOG_PIN("  Interrupt Pin: ", this->interrupt_pin_);
+  LOG_PIN("  Reset Pin: ", this->reset_pin_);
+}
+
+}  // namespace cst226
+}  // namespace esphome

esphome/components/cst226/touchscreen/cst226_touchscreen.h

@@ -0,0 +1,44 @@
+#pragma once
+
+#include "esphome/components/i2c/i2c.h"
+#include "esphome/components/touchscreen/touchscreen.h"
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace cst226 {
+
+static const char *const TAG = "cst226.touchscreen";
+
+static const uint8_t CST226_REG_STATUS = 0x00;
+
+class CST226Touchscreen : public touchscreen::Touchscreen, public i2c::I2CDevice {
+ public:
+  void setup() override;
+  void update_touches() override;
+  void dump_config() override;
+
+  void set_interrupt_pin(InternalGPIOPin *pin) { this->interrupt_pin_ = pin; }
+  void set_reset_pin(GPIOPin *pin) { this->reset_pin_ = pin; }
+  bool can_proceed() override { return this->setup_complete_ || this->is_failed(); }
+
+ protected:
+  bool read16_(uint16_t addr, uint8_t *data, size_t len) {
+    if (this->read_register16(addr, data, len) != i2c::ERROR_OK) {
+      esph_log_e(TAG, "Read data from 0x%04X failed", addr);
+      this->mark_failed();
+      return false;
+    }
+    return true;
+  }
+  void continue_setup_();
+
+  InternalGPIOPin *interrupt_pin_{};
+  GPIOPin *reset_pin_{};
+  uint8_t chip_id_{};
+  bool setup_complete_{};
+};
+
+}  // namespace cst226
+}  // namespace esphome

esphome/components/cst816/__init__.py

@@ -0,0 +1,6 @@
+import esphome.codegen as cg
+
+CODEOWNERS = ["@clydebarrow"]
+DEPENDENCIES = ["i2c"]
+
+cst816_ns = cg.esphome_ns.namespace("cst816")

esphome/components/cst816/binary_sensor/__init__.py

@@ -0,0 +1,28 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import binary_sensor
+
+from .. import cst816_ns
+from ..touchscreen import CST816Touchscreen, CST816ButtonListener
+
+CONF_CST816_ID = "cst816_id"
+
+CST816Button = cst816_ns.class_(
+    "CST816Button",
+    binary_sensor.BinarySensor,
+    cg.Component,
+    CST816ButtonListener,
+    cg.Parented.template(CST816Touchscreen),
+)
+
+CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(CST816Button).extend(
+    {
+        cv.GenerateID(CONF_CST816_ID): cv.use_id(CST816Touchscreen),
+    }
+)
+
+
+async def to_code(config):
+    var = await binary_sensor.new_binary_sensor(config)
+    await cg.register_component(var, config)
+    await cg.register_parented(var, config[CONF_CST816_ID])

esphome/components/cst816/binary_sensor/cst816_button.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include "esphome/components/binary_sensor/binary_sensor.h"
+#include "esphome/components/cst816/touchscreen/cst816_touchscreen.h"
+#include "esphome/core/component.h"
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace cst816 {
+
+class CST816Button : public binary_sensor::BinarySensor,
+                     public Component,
+                     public CST816ButtonListener,
+                     public Parented<CST816Touchscreen> {
+ public:
+  void setup() override {
+    this->parent_->register_button_listener(this);
+    this->publish_initial_state(false);
+  }
+
+  void dump_config() override { LOG_BINARY_SENSOR("", "CST816 Button", this); }
+
+  void update_button(bool state) override { this->publish_state(state); }
+};
+
+}  // namespace cst816
+}  // namespace esphome

esphome/components/cst816/touchscreen/__init__.py

@@ -0,0 +1,34 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+
+from esphome import pins
+from esphome.components import i2c, touchscreen
+from esphome.const import CONF_INTERRUPT_PIN, CONF_ID, CONF_RESET_PIN
+from .. import cst816_ns
+
+
+CST816Touchscreen = cst816_ns.class_(
+    "CST816Touchscreen",
+    touchscreen.Touchscreen,
+    i2c.I2CDevice,
+)
+
+CST816ButtonListener = cst816_ns.class_("CST816ButtonListener")
+CONFIG_SCHEMA = touchscreen.TOUCHSCREEN_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(CST816Touchscreen),
+        cv.Optional(CONF_INTERRUPT_PIN): pins.internal_gpio_input_pin_schema,
+        cv.Optional(CONF_RESET_PIN): pins.gpio_output_pin_schema,
+    }
+).extend(i2c.i2c_device_schema(0x15))
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await touchscreen.register_touchscreen(var, config)
+    await i2c.register_i2c_device(var, config)
+
+    if interrupt_pin := config.get(CONF_INTERRUPT_PIN):
+        cg.add(var.set_interrupt_pin(await cg.gpio_pin_expression(interrupt_pin)))
+    if reset_pin := config.get(CONF_RESET_PIN):
+        cg.add(var.set_reset_pin(await cg.gpio_pin_expression(reset_pin)))

esphome/components/cst816/touchscreen/cst816_touchscreen.cpp

@@ -0,0 +1,113 @@
+#include "cst816_touchscreen.h"
+
+namespace esphome {
+namespace cst816 {
+
+void CST816Touchscreen::continue_setup_() {
+  if (this->interrupt_pin_ != nullptr) {
+    this->interrupt_pin_->setup();
+    this->attach_interrupt_(this->interrupt_pin_, gpio::INTERRUPT_FALLING_EDGE);
+  }
+  if (!this->read_byte(REG_CHIP_ID, &this->chip_id_)) {
+    this->mark_failed();
+    esph_log_e(TAG, "Failed to read chip id");
+    return;
+  }
+  switch (this->chip_id_) {
+    case CST820_CHIP_ID:
+    case CST716_CHIP_ID:
+    case CST816S_CHIP_ID:
+    case CST816D_CHIP_ID:
+    case CST816T_CHIP_ID:
+      break;
+    default:
+      this->mark_failed();
+      esph_log_e(TAG, "Unknown chip ID 0x%02X", this->chip_id_);
+      return;
+  }
+  this->write_byte(REG_IRQ_CTL, IRQ_EN_MOTION);
+  if (this->x_raw_max_ == this->x_raw_min_) {
+    this->x_raw_max_ = this->display_->get_native_width();
+  }
+  if (this->y_raw_max_ == this->y_raw_min_) {
+    this->y_raw_max_ = this->display_->get_native_height();
+  }
+  esph_log_config(TAG, "CST816 Touchscreen setup complete");
+}
+
+void CST816Touchscreen::update_button_state_(bool state) {
+  if (this->button_touched_ == state)
+    return;
+  this->button_touched_ = state;
+  for (auto *listener : this->button_listeners_)
+    listener->update_button(state);
+}
+
+void CST816Touchscreen::setup() {
+  esph_log_config(TAG, "Setting up CST816 Touchscreen...");
+  if (this->reset_pin_ != nullptr) {
+    this->reset_pin_->setup();
+    this->reset_pin_->digital_write(true);
+    delay(5);
+    this->reset_pin_->digital_write(false);
+    delay(5);
+    this->reset_pin_->digital_write(true);
+    this->set_timeout(30, [this] { this->continue_setup_(); });
+  } else {
+    this->continue_setup_();
+  }
+}
+
+void CST816Touchscreen::update_touches() {
+  uint8_t data[13];
+  if (!this->read_bytes(REG_STATUS, data, sizeof data)) {
+    this->status_set_warning();
+    return;
+  }
+  uint8_t num_of_touches = data[REG_TOUCH_NUM] & 3;
+  if (num_of_touches == 0) {
+    this->update_button_state_(false);
+    return;
+  }
+
+  uint16_t x = encode_uint16(data[REG_XPOS_HIGH] & 0xF, data[REG_XPOS_LOW]);
+  uint16_t y = encode_uint16(data[REG_YPOS_HIGH] & 0xF, data[REG_YPOS_LOW]);
+  esph_log_v(TAG, "Read touch %d/%d", x, y);
+  if (x >= this->x_raw_max_) {
+    this->update_button_state_(true);
+  } else {
+    this->add_raw_touch_position_(0, x, y);
+  }
+}
+
+void CST816Touchscreen::dump_config() {
+  ESP_LOGCONFIG(TAG, "CST816 Touchscreen:");
+  LOG_I2C_DEVICE(this);
+  LOG_PIN("  Interrupt Pin: ", this->interrupt_pin_);
+  LOG_PIN("  Reset Pin: ", this->reset_pin_);
+  const char *name;
+  switch (this->chip_id_) {
+    case CST820_CHIP_ID:
+      name = "CST820";
+      break;
+    case CST816S_CHIP_ID:
+      name = "CST816S";
+      break;
+    case CST816D_CHIP_ID:
+      name = "CST816D";
+      break;
+    case CST716_CHIP_ID:
+      name = "CST716";
+      break;
+    case CST816T_CHIP_ID:
+      name = "CST816T";
+      break;
+    default:
+      name = "Unknown";
+      break;
+  }
+  ESP_LOGCONFIG(TAG, "  Chip type: %s", name);
+}
+
+}  // namespace cst816
+}  // namespace esphome

esphome/components/cst816/touchscreen/cst816_touchscreen.h

@@ -0,0 +1,60 @@
+#pragma once
+
+#include "esphome/components/i2c/i2c.h"
+#include "esphome/components/touchscreen/touchscreen.h"
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace cst816 {
+
+static const char *const TAG = "cst816.touchscreen";
+
+static const uint8_t REG_STATUS = 0x00;
+static const uint8_t REG_TOUCH_NUM = 0x02;
+static const uint8_t REG_XPOS_HIGH = 0x03;
+static const uint8_t REG_XPOS_LOW = 0x04;
+static const uint8_t REG_YPOS_HIGH = 0x05;
+static const uint8_t REG_YPOS_LOW = 0x06;
+static const uint8_t REG_DIS_AUTOSLEEP = 0xFE;
+static const uint8_t REG_CHIP_ID = 0xA7;
+static const uint8_t REG_FW_VERSION = 0xA9;
+static const uint8_t REG_SLEEP = 0xE5;
+static const uint8_t REG_IRQ_CTL = 0xFA;
+static const uint8_t IRQ_EN_MOTION = 0x70;
+
+static const uint8_t CST820_CHIP_ID = 0xB7;
+static const uint8_t CST816S_CHIP_ID = 0xB4;
+static const uint8_t CST816D_CHIP_ID = 0xB6;
+static const uint8_t CST816T_CHIP_ID = 0xB5;
+static const uint8_t CST716_CHIP_ID = 0x20;
+
+class CST816ButtonListener {
+ public:
+  virtual void update_button(bool state) = 0;
+};
+
+class CST816Touchscreen : public touchscreen::Touchscreen, public i2c::I2CDevice {
+ public:
+  void setup() override;
+  void update_touches() override;
+  void register_button_listener(CST816ButtonListener *listener) { this->button_listeners_.push_back(listener); }
+  void dump_config() override;
+
+  void set_interrupt_pin(InternalGPIOPin *pin) { this->interrupt_pin_ = pin; }
+  void set_reset_pin(GPIOPin *pin) { this->reset_pin_ = pin; }
+
+ protected:
+  void continue_setup_();
+  void update_button_state_(bool state);
+
+  InternalGPIOPin *interrupt_pin_{};
+  GPIOPin *reset_pin_{};
+  uint8_t chip_id_{};
+  std::vector<CST816ButtonListener *> button_listeners_;
+  bool button_touched_{};
+};
+
+}  // namespace cst816
+}  // namespace esphome

esphome/components/daikin_arc/__init__.py

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

esphome/components/daikin_arc/climate.py

@@ -0,0 +1,18 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import climate_ir
+from esphome.const import CONF_ID
+
+AUTO_LOAD = ["climate_ir"]
+
+daikin_arc_ns = cg.esphome_ns.namespace("daikin_arc")
+DaikinArcClimate = daikin_arc_ns.class_("DaikinArcClimate", climate_ir.ClimateIR)
+
+CONFIG_SCHEMA = climate_ir.CLIMATE_IR_WITH_RECEIVER_SCHEMA.extend(
+    {cv.GenerateID(): cv.declare_id(DaikinArcClimate)}
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await climate_ir.register_climate_ir(var, config)

esphome/components/daikin_arc/daikin_arc.cpp

@@ -0,0 +1,487 @@
+#include "daikin_arc.h"
+
+#include <cmath>
+
+#include "esphome/components/remote_base/remote_base.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace daikin_arc {
+
+static const char *const TAG = "daikin.climate";
+
+void DaikinArcClimate::setup() {
+  climate_ir::ClimateIR::setup();
+
+  // Never send nan to HA
+  if (std::isnan(this->target_humidity))
+    this->target_humidity = 0;
+  if (std::isnan(this->current_temperature))
+    this->current_temperature = 0;
+  if (std::isnan(this->current_humidity))
+    this->current_humidity = 0;
+}
+
+void DaikinArcClimate::transmit_query_() {
+  uint8_t remote_header[8] = {0x11, 0xDA, 0x27, 0x00, 0x84, 0x87, 0x20, 0x00};
+
+  // Calculate checksum
+  for (int i = 0; i < sizeof(remote_header) - 1; i++) {
+    remote_header[sizeof(remote_header) - 1] += remote_header[i];
+  }
+
+  auto transmit = this->transmitter_->transmit();
+  auto *data = transmit.get_data();
+  data->set_carrier_frequency(DAIKIN_IR_FREQUENCY);
+
+  data->mark(DAIKIN_ARC_PRE_MARK);
+  data->space(DAIKIN_ARC_PRE_SPACE);
+
+  data->mark(DAIKIN_HEADER_MARK);
+  data->space(DAIKIN_HEADER_SPACE);
+
+  for (uint8_t i : remote_header) {
+    for (uint8_t mask = 1; mask > 0; mask <<= 1) {  // iterate through bit mask
+      data->mark(DAIKIN_BIT_MARK);
+      bool bit = i & mask;
+      data->space(bit ? DAIKIN_ONE_SPACE : DAIKIN_ZERO_SPACE);
+    }
+  }
+  data->mark(DAIKIN_BIT_MARK);
+  data->space(0);
+
+  transmit.perform();
+}
+
+void DaikinArcClimate::transmit_state() {
+  // 0x11, 0xDA, 0x27, 0x00, 0xC5, 0x00, 0x00, 0xD7, 0x11, 0xDA, 0x27, 0x00,
+  // 0x42, 0x49, 0x05, 0xA2,
+  uint8_t remote_header[20] = {0x11, 0xDA, 0x27, 0x00, 0x02, 0xd0, 0x02, 0x03, 0x80, 0x03, 0x82, 0x30, 0x41, 0x1f, 0x82,
+                               0xf4,
+                               /*                                                      とつど */
+                               /*                                                       0x13 */
+                               0x00, 0x24, 0x00, 0x00};
+
+  // 05    0 [1:3]MODE   1 [OFF TMR] [ON TMR] Power
+  // 06-07 TEMP
+  // 08    [0:3] SPEED  [4:7] Swing
+  // 09    00
+  // 10    00
+  // 11, 12: timer
+  // 13    [0:6] 0000000 [7] POWERMODE
+  // 14    0a
+  // 15    c4
+  // 16    [0:3] 8  00 [6:7] SENSOR WIND = 11 / NORMAL = 00
+  // 17    24
+
+  uint8_t remote_state[19] = {
+      0x11, 0xDA, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x60, 0x00, 0x0a, 0xC4,
+      /*                               MODE  TEMP  HUMD  FANH  FANL
+         パワフル音声応答     */
+      /*                                                                           ON
+         0x01入 0x0a     */
+      /*                                                                           OF
+         0x00切 0x02     */
+      0x80, 0x24, 0x00
+      /* センサー風         */
+      /* ON 0x83           */
+      /* OF 0x80           */
+  };
+
+  remote_state[5] = this->operation_mode_() | 0x08;
+  remote_state[6] = this->temperature_();
+  remote_state[7] = this->humidity_();
+  static uint8_t last_humidity = 0x66;
+  if (remote_state[7] != last_humidity && this->mode != climate::CLIMATE_MODE_OFF) {
+    ESP_LOGD(TAG, "Set Humditiy: %d, %d\n", (int) this->target_humidity, (int) remote_state[7]);
+    remote_header[9] |= 0x10;
+    last_humidity = remote_state[7];
+  }
+  uint16_t fan_speed = this->fan_speed_();
+  remote_state[8] = fan_speed >> 8;
+  remote_state[9] = fan_speed & 0xff;
+
+  // Calculate checksum
+  for (int i = 0; i < sizeof(remote_header) - 1; i++) {
+    remote_header[sizeof(remote_header) - 1] += remote_header[i];
+  }
+
+  // Calculate checksum
+  for (int i = 0; i < DAIKIN_STATE_FRAME_SIZE - 1; i++) {
+    remote_state[DAIKIN_STATE_FRAME_SIZE - 1] += remote_state[i];
+  }
+
+  auto transmit = this->transmitter_->transmit();
+  auto *data = transmit.get_data();
+  data->set_carrier_frequency(DAIKIN_IR_FREQUENCY);
+
+  data->mark(DAIKIN_ARC_PRE_MARK);
+  data->space(DAIKIN_ARC_PRE_SPACE);
+
+  data->mark(DAIKIN_HEADER_MARK);
+  data->space(DAIKIN_HEADER_SPACE);
+
+  for (uint8_t i : remote_header) {
+    for (uint8_t mask = 1; mask > 0; mask <<= 1) {  // iterate through bit mask
+      data->mark(DAIKIN_BIT_MARK);
+      bool bit = i & mask;
+      data->space(bit ? DAIKIN_ONE_SPACE : DAIKIN_ZERO_SPACE);
+    }
+  }
+  data->mark(DAIKIN_BIT_MARK);
+  data->space(DAIKIN_MESSAGE_SPACE);
+
+  data->mark(DAIKIN_HEADER_MARK);
+  data->space(DAIKIN_HEADER_SPACE);
+
+  for (uint8_t i : remote_state) {
+    for (uint8_t mask = 1; mask > 0; mask <<= 1) {  // iterate through bit mask
+      data->mark(DAIKIN_BIT_MARK);
+      bool bit = i & mask;
+      data->space(bit ? DAIKIN_ONE_SPACE : DAIKIN_ZERO_SPACE);
+    }
+  }
+  data->mark(DAIKIN_BIT_MARK);
+  data->space(0);
+
+  transmit.perform();
+}
+
+uint8_t DaikinArcClimate::operation_mode_() {
+  uint8_t operating_mode = DAIKIN_MODE_ON;
+  switch (this->mode) {
+    case climate::CLIMATE_MODE_COOL:
+      operating_mode |= DAIKIN_MODE_COOL;
+      break;
+    case climate::CLIMATE_MODE_DRY:
+      operating_mode |= DAIKIN_MODE_DRY;
+      break;
+    case climate::CLIMATE_MODE_HEAT:
+      operating_mode |= DAIKIN_MODE_HEAT;
+      break;
+    case climate::CLIMATE_MODE_HEAT_COOL:
+      operating_mode |= DAIKIN_MODE_AUTO;
+      break;
+    case climate::CLIMATE_MODE_FAN_ONLY:
+      operating_mode |= DAIKIN_MODE_FAN;
+      break;
+    case climate::CLIMATE_MODE_OFF:
+    default:
+      operating_mode = DAIKIN_MODE_OFF;
+      break;
+  }
+
+  return operating_mode;
+}
+
+uint16_t DaikinArcClimate::fan_speed_() {
+  uint16_t fan_speed;
+  switch (this->fan_mode.value()) {
+    case climate::CLIMATE_FAN_LOW:
+      fan_speed = DAIKIN_FAN_1 << 8;
+      break;
+    case climate::CLIMATE_FAN_MEDIUM:
+      fan_speed = DAIKIN_FAN_3 << 8;
+      break;
+    case climate::CLIMATE_FAN_HIGH:
+      fan_speed = DAIKIN_FAN_5 << 8;
+      break;
+    case climate::CLIMATE_FAN_AUTO:
+    default:
+      fan_speed = DAIKIN_FAN_AUTO << 8;
+  }
+
+  // If swing is enabled switch first 4 bits to 1111
+  switch (this->swing_mode) {
+    case climate::CLIMATE_SWING_VERTICAL:
+      fan_speed |= 0x0F00;
+      break;
+    case climate::CLIMATE_SWING_HORIZONTAL:
+      fan_speed |= 0x000F;
+      break;
+    case climate::CLIMATE_SWING_BOTH:
+      fan_speed |= 0x0F0F;
+      break;
+    default:
+      break;
+  }
+  return fan_speed;
+}
+
+uint8_t DaikinArcClimate::temperature_() {
+  // Force special temperatures depending on the mode
+  switch (this->mode) {
+    case climate::CLIMATE_MODE_FAN_ONLY:
+      return 0x32;
+    case climate::CLIMATE_MODE_HEAT_COOL:
+    case climate::CLIMATE_MODE_DRY:
+      return 0xc0;
+    default:
+      float new_temp = clamp<float>(this->target_temperature, DAIKIN_TEMP_MIN, DAIKIN_TEMP_MAX);
+      uint8_t temperature = (uint8_t) floor(new_temp);
+      return temperature << 1 | (new_temp - temperature > 0 ? 0x01 : 0);
+  }
+}
+
+uint8_t DaikinArcClimate::humidity_() {
+  if (this->target_humidity == 39) {
+    return 0;
+  } else if (this->target_humidity <= 40 || this->target_humidity == 44) {
+    return 40;
+  } else if (this->target_humidity <= 45 || this->target_humidity == 49)  // 41 - 45
+  {
+    return 45;
+  } else if (this->target_humidity <= 50 || this->target_humidity == 52)  // 45 - 50
+  {
+    return 50;
+  } else {
+    return 0xff;
+  }
+}
+
+climate::ClimateTraits DaikinArcClimate::traits() {
+  climate::ClimateTraits traits = climate_ir::ClimateIR::traits();
+  traits.set_supports_current_temperature(true);
+  traits.set_supports_current_humidity(false);
+  traits.set_supports_target_humidity(true);
+  traits.set_visual_min_humidity(38);
+  traits.set_visual_max_humidity(52);
+  return traits;
+}
+
+bool DaikinArcClimate::parse_state_frame_(const uint8_t frame[]) {
+  uint8_t checksum = 0;
+  for (int i = 0; i < (DAIKIN_STATE_FRAME_SIZE - 1); i++) {
+    checksum += frame[i];
+  }
+  if (frame[DAIKIN_STATE_FRAME_SIZE - 1] != checksum) {
+    ESP_LOGI(TAG, "checksum error");
+    return false;
+  }
+
+  char buf[DAIKIN_STATE_FRAME_SIZE * 3 + 1] = {0};
+  for (size_t i = 0; i < DAIKIN_STATE_FRAME_SIZE; i++) {
+    sprintf(buf, "%s%02x ", buf, frame[i]);
+  }
+  ESP_LOGD(TAG, "FRAME %s", buf);
+
+  uint8_t mode = frame[5];
+  if (mode & DAIKIN_MODE_ON) {
+    switch (mode & 0xF0) {
+      case DAIKIN_MODE_COOL:
+        this->mode = climate::CLIMATE_MODE_COOL;
+        break;
+      case DAIKIN_MODE_DRY:
+        this->mode = climate::CLIMATE_MODE_DRY;
+        break;
+      case DAIKIN_MODE_HEAT:
+        this->mode = climate::CLIMATE_MODE_HEAT;
+        break;
+      case DAIKIN_MODE_AUTO:
+        this->mode = climate::CLIMATE_MODE_HEAT_COOL;
+        break;
+      case DAIKIN_MODE_FAN:
+        this->mode = climate::CLIMATE_MODE_FAN_ONLY;
+        break;
+    }
+  } else {
+    this->mode = climate::CLIMATE_MODE_OFF;
+  }
+  uint8_t temperature = frame[6];
+  if (!(temperature & 0xC0)) {
+    this->target_temperature = temperature >> 1;
+    this->target_temperature += (temperature & 0x1) ? 0.5 : 0;
+  }
+  this->target_humidity = frame[7];  // 0, 40, 45, 50, 0xff
+  uint8_t fan_mode = frame[8];
+  uint8_t swing_mode = frame[9];
+  if (fan_mode & 0xF && swing_mode & 0xF) {
+    this->swing_mode = climate::CLIMATE_SWING_BOTH;
+  } else if (fan_mode & 0xF) {
+    this->swing_mode = climate::CLIMATE_SWING_VERTICAL;
+  } else if (swing_mode & 0xF) {
+    this->swing_mode = climate::CLIMATE_SWING_HORIZONTAL;
+  } else {
+    this->swing_mode = climate::CLIMATE_SWING_OFF;
+  }
+  switch (fan_mode & 0xF0) {
+    case DAIKIN_FAN_1:
+    case DAIKIN_FAN_2:
+    case DAIKIN_FAN_SILENT:
+      this->fan_mode = climate::CLIMATE_FAN_LOW;
+      break;
+    case DAIKIN_FAN_3:
+      this->fan_mode = climate::CLIMATE_FAN_MEDIUM;
+      break;
+    case DAIKIN_FAN_4:
+    case DAIKIN_FAN_5:
+      this->fan_mode = climate::CLIMATE_FAN_HIGH;
+      break;
+    case DAIKIN_FAN_AUTO:
+      this->fan_mode = climate::CLIMATE_FAN_AUTO;
+      break;
+  }
+  /*
+  05    0 [1:3]MODE   1 [OFF TMR] [ON TMR] Power
+  06-07 TEMP
+  08    [0:3] SPEED  [4:7] Swing
+  09    00
+  10    00
+  11, 12: timer
+  13    [0:6] 0000000 [7] POWERMODE
+  14    0a
+  15    c4
+  16    [0:3] 8  00 [6:7] SENSOR WIND = 11 / NORMAL = 00
+  17    24
+                             05 06 07 08 09 10 11 12 13 14 15 16 17 18
+  None  FRAME 11 da 27 00 00 49 2e 00 b0 00 00 06 60 00 0a c4 80 24 11
+  1H    FRAME 11 da 27 00 00 4d 2e 00 b0 00 00 c6 30 00 2a c4 80 24 c5
+  1H30  FRAME 11 da 27 00 00 4d 2e 00 b0 00 00 a6 32 00 2a c4 80 24 a7
+  2H    FRAME 11 da 27 00 00 4d 2e 00 b0 00 00 86 34 00 2a c4 80 24 89
+
+  */
+  this->publish_state();
+  return true;
+}
+
+bool DaikinArcClimate::on_receive(remote_base::RemoteReceiveData data) {
+  uint8_t state_frame[DAIKIN_STATE_FRAME_SIZE] = {};
+
+  bool valid_daikin_frame = false;
+  if (data.expect_item(DAIKIN_HEADER_MARK, DAIKIN_HEADER_SPACE)) {
+    valid_daikin_frame = true;
+    int bytes_count = data.size() / 2 / 8;
+    std::unique_ptr<char[]> buf(new char[bytes_count * 3 + 1]);
+    buf[0] = '\0';
+    for (size_t i = 0; i < bytes_count; i++) {
+      uint8_t byte = 0;
+      for (int8_t bit = 0; bit < 8; bit++) {
+        if (data.expect_item(DAIKIN_BIT_MARK, DAIKIN_ONE_SPACE)) {
+          byte |= 1 << bit;
+        } else if (!data.expect_item(DAIKIN_BIT_MARK, DAIKIN_ZERO_SPACE)) {
+          valid_daikin_frame = false;
+          break;
+        }
+      }
+      sprintf(buf.get(), "%s%02x ", buf.get(), byte);
+    }
+    ESP_LOGD(TAG, "WHOLE FRAME %s  size: %d", buf.get(), data.size());
+  }
+  if (!valid_daikin_frame) {
+    char sbuf[16 * 10 + 1];
+    sbuf[0] = '\0';
+    for (size_t j = 0; j < data.size(); j++) {
+      if ((j - 2) % 16 == 0) {
+        if (j > 0) {
+          ESP_LOGD(TAG, "DATA %04x: %s", (j - 16 > 0xffff ? 0 : j - 16), sbuf);
+        }
+        sbuf[0] = '\0';
+      }
+      char type_ch = ' ';
+      // debug_tolerance = 25%
+
+      if (DAIKIN_DBG_LOWER(DAIKIN_ARC_PRE_MARK) <= data[j] && data[j] <= DAIKIN_DBG_UPPER(DAIKIN_ARC_PRE_MARK))
+        type_ch = 'P';
+      if (DAIKIN_DBG_LOWER(DAIKIN_ARC_PRE_SPACE) <= -data[j] && -data[j] <= DAIKIN_DBG_UPPER(DAIKIN_ARC_PRE_SPACE))
+        type_ch = 'a';
+      if (DAIKIN_DBG_LOWER(DAIKIN_HEADER_MARK) <= data[j] && data[j] <= DAIKIN_DBG_UPPER(DAIKIN_HEADER_MARK))
+        type_ch = 'H';
+      if (DAIKIN_DBG_LOWER(DAIKIN_HEADER_SPACE) <= -data[j] && -data[j] <= DAIKIN_DBG_UPPER(DAIKIN_HEADER_SPACE))
+        type_ch = 'h';
+      if (DAIKIN_DBG_LOWER(DAIKIN_BIT_MARK) <= data[j] && data[j] <= DAIKIN_DBG_UPPER(DAIKIN_BIT_MARK))
+        type_ch = 'B';
+      if (DAIKIN_DBG_LOWER(DAIKIN_ONE_SPACE) <= -data[j] && -data[j] <= DAIKIN_DBG_UPPER(DAIKIN_ONE_SPACE))
+        type_ch = '1';
+      if (DAIKIN_DBG_LOWER(DAIKIN_ZERO_SPACE) <= -data[j] && -data[j] <= DAIKIN_DBG_UPPER(DAIKIN_ZERO_SPACE))
+        type_ch = '0';
+
+      if (abs(data[j]) > 100000) {
+        sprintf(sbuf, "%s%-5d[%c] ", sbuf, data[j] > 0 ? 99999 : -99999, type_ch);
+      } else {
+        sprintf(sbuf, "%s%-5d[%c] ", sbuf, (int) (round(data[j] / 10.) * 10), type_ch);
+      }
+      if (j == data.size() - 1) {
+        ESP_LOGD(TAG, "DATA %04x: %s", (j - 8 > 0xffff ? 0 : j - 8), sbuf);
+      }
+    }
+  }
+
+  data.reset();
+
+  if (!data.expect_item(DAIKIN_HEADER_MARK, DAIKIN_HEADER_SPACE)) {
+    ESP_LOGI(TAG, "non daikin_arc expect item");
+    return false;
+  }
+
+  for (uint8_t pos = 0; pos < DAIKIN_STATE_FRAME_SIZE; pos++) {
+    uint8_t byte = 0;
+    for (int8_t bit = 0; bit < 8; bit++) {
+      if (data.expect_item(DAIKIN_BIT_MARK, DAIKIN_ONE_SPACE)) {
+        byte |= 1 << bit;
+      } else if (!data.expect_item(DAIKIN_BIT_MARK, DAIKIN_ZERO_SPACE)) {
+        ESP_LOGI(TAG, "non daikin_arc expect item pos: %d", pos);
+        return false;
+      }
+    }
+    state_frame[pos] = byte;
+    if (pos == 0) {
+      // frame header
+      if (byte != 0x11) {
+        ESP_LOGI(TAG, "non daikin_arc expect pos: %d header: %02x", pos, byte);
+        return false;
+      }
+    } else if (pos == 1) {
+      // frame header
+      if (byte != 0xDA) {
+        ESP_LOGI(TAG, "non daikin_arc expect pos: %d header: %02x", pos, byte);
+        return false;
+      }
+    } else if (pos == 2) {
+      // frame header
+      if (byte != 0x27) {
+        ESP_LOGI(TAG, "non daikin_arc expect pos: %d header: %02x", pos, byte);
+        return false;
+      }
+    } else if (pos == 3) {  // NOLINT(bugprone-branch-clone)
+      // frame header
+      if (byte != 0x00) {
+        ESP_LOGI(TAG, "non daikin_arc expect pos: %d header: %02x", pos, byte);
+        return false;
+      }
+    } else if (pos == 4) {
+      // frame type
+      if (byte != 0x00) {
+        ESP_LOGI(TAG, "non daikin_arc expect pos: %d header: %02x", pos, byte);
+        return false;
+      }
+    } else if (pos == 5) {
+      if (data.size() == 385) {
+        /*
+        11 da 27 00 00 1a 0c 04 2c 21 61 07 00 07 0c 00 18 00 0e 3c 00 6c 1b 61
+                       Inside Temp
+                          Outside Temp
+                              Humdidity
+
+        */
+        this->current_temperature = state_frame[5];  // Inside temperature
+        // this->current_temperature = state_frame[6]; // Outside temperature
+        this->publish_state();
+        return true;
+      } else if ((byte & 0x40) != 0x40) {
+        ESP_LOGI(TAG, "non daikin_arc expect pos: %d header: %02x", pos, byte);
+        return false;
+      }
+    }
+  }
+  return this->parse_state_frame_(state_frame);
+}
+
+void DaikinArcClimate::control(const climate::ClimateCall &call) {
+  if (call.get_target_humidity().has_value()) {
+    this->target_humidity = *call.get_target_humidity();
+  }
+  climate_ir::ClimateIR::control(call);
+}
+
+}  // namespace daikin_arc
+}  // namespace esphome

esphome/components/daikin_arc/daikin_arc.h

@@ -0,0 +1,76 @@
+#pragma once
+
+#include "esphome/components/climate_ir/climate_ir.h"
+
+namespace esphome {
+namespace daikin_arc {
+
+// Values for Daikin ARC43XXX IR Controllers
+// Temperature
+const uint8_t DAIKIN_TEMP_MIN = 10;  // Celsius
+const uint8_t DAIKIN_TEMP_MAX = 30;  // Celsius
+
+// Modes
+const uint8_t DAIKIN_MODE_AUTO = 0x00;
+const uint8_t DAIKIN_MODE_COOL = 0x30;
+const uint8_t DAIKIN_MODE_HEAT = 0x40;
+const uint8_t DAIKIN_MODE_DRY = 0x20;
+const uint8_t DAIKIN_MODE_FAN = 0x60;
+const uint8_t DAIKIN_MODE_OFF = 0x00;
+const uint8_t DAIKIN_MODE_ON = 0x01;
+
+// Fan Speed
+const uint8_t DAIKIN_FAN_AUTO = 0xA0;
+const uint8_t DAIKIN_FAN_SILENT = 0xB0;
+const uint8_t DAIKIN_FAN_1 = 0x30;
+const uint8_t DAIKIN_FAN_2 = 0x40;
+const uint8_t DAIKIN_FAN_3 = 0x50;
+const uint8_t DAIKIN_FAN_4 = 0x60;
+const uint8_t DAIKIN_FAN_5 = 0x70;
+
+// IR Transmission
+const uint32_t DAIKIN_IR_FREQUENCY = 38000;
+const uint32_t DAIKIN_ARC_PRE_MARK = 9950;
+const uint32_t DAIKIN_ARC_PRE_SPACE = 25100;
+const uint32_t DAIKIN_HEADER_MARK = 3450;
+const uint32_t DAIKIN_HEADER_SPACE = 1760;
+const uint32_t DAIKIN_BIT_MARK = 400;
+const uint32_t DAIKIN_ONE_SPACE = 1300;
+const uint32_t DAIKIN_ZERO_SPACE = 480;
+const uint32_t DAIKIN_MESSAGE_SPACE = 35000;
+
+const uint8_t DAIKIN_DBG_TOLERANCE = 25;
+#define DAIKIN_DBG_LOWER(x) ((100 - DAIKIN_DBG_TOLERANCE) * (x) / 100U)
+#define DAIKIN_DBG_UPPER(x) ((100 + DAIKIN_DBG_TOLERANCE) * (x) / 100U)
+
+// State Frame size
+const uint8_t DAIKIN_STATE_FRAME_SIZE = 19;
+
+class DaikinArcClimate : public climate_ir::ClimateIR {
+ public:
+  DaikinArcClimate()
+      : climate_ir::ClimateIR(DAIKIN_TEMP_MIN, DAIKIN_TEMP_MAX, 0.5f, true, true,
+                              {climate::CLIMATE_FAN_AUTO, climate::CLIMATE_FAN_LOW, climate::CLIMATE_FAN_MEDIUM,
+                               climate::CLIMATE_FAN_HIGH},
+                              {climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_VERTICAL,
+                               climate::CLIMATE_SWING_HORIZONTAL, climate::CLIMATE_SWING_BOTH}) {}
+
+  void setup() override;
+
+ protected:
+  void control(const climate::ClimateCall &call) override;
+  // Transmit via IR the state of this climate controller.
+  void transmit_query_();
+  void transmit_state() override;
+  climate::ClimateTraits traits() override;
+  uint8_t operation_mode_();
+  uint16_t fan_speed_();
+  uint8_t temperature_();
+  uint8_t humidity_();
+  // Handle received IR Buffer
+  bool on_receive(remote_base::RemoteReceiveData data) override;
+  bool parse_state_frame_(const uint8_t frame[]);
+};
+
+}  // namespace daikin_arc
+}  // namespace esphome

esphome/components/dallas/dallas_component.cpp

@@ -60,7 +60,7 @@ void DallasComponent::setup() {
   for (auto *sensor : this->sensors_) {
     if (sensor->get_index().has_value()) {
       if (*sensor->get_index() >= this->found_sensors_.size()) {
-        this->status_set_error();
+        this->status_set_error("Sensor configured by index but not found");
         continue;
       }
       sensor->set_address(this->found_sensors_[*sensor->get_index()]);
@@ -109,8 +109,12 @@ void DallasComponent::update() {
     result = this->one_wire_->reset();
   }
   if (!result) {
-    ESP_LOGE(TAG, "Requesting conversion failed");
+    if (!this->found_sensors_.empty()) {
-    this->status_set_warning();
+      // Only log error if at the start sensors were found (and thus are disconnected during uptime)
+      ESP_LOGE(TAG, "Requesting conversion failed");
+      this->status_set_warning();
+    }
+
     for (auto *sensor : this->sensors_) {
       sensor->publish_state(NAN);
     }
@@ -124,6 +128,12 @@ void DallasComponent::update() {
   }
 
   for (auto *sensor : this->sensors_) {
+    if (sensor->get_address() == 0) {
+      ESP_LOGV(TAG, "'%s' - Indexed sensor not found at startup, skipping update", sensor->get_name().c_str());
+      sensor->publish_state(NAN);
+      continue;
+    }
+
     this->set_timeout(sensor->get_address_name(), sensor->millis_to_wait_for_conversion(), [this, sensor] {
       bool res = sensor->read_scratch_pad();
 
@@ -152,6 +162,8 @@ void DallasTemperatureSensor::set_resolution(uint8_t resolution) { this->resolut
 optional<uint8_t> DallasTemperatureSensor::get_index() const { return this->index_; }
 void DallasTemperatureSensor::set_index(uint8_t index) { this->index_ = index; }
 uint8_t *DallasTemperatureSensor::get_address8() { return reinterpret_cast<uint8_t *>(&this->address_); }
+uint64_t DallasTemperatureSensor::get_address() { return this->address_; }
+
 const std::string &DallasTemperatureSensor::get_address_name() {
   if (this->address_name_.empty()) {
     this->address_name_ = std::string("0x") + format_hex(this->address_);

esphome/components/dallas/dallas_component.h

@@ -37,6 +37,7 @@ class DallasTemperatureSensor : public sensor::Sensor {
   void set_parent(DallasComponent *parent) { parent_ = parent; }
   /// Helper to get a pointer to the address as uint8_t.
   uint8_t *get_address8();
+  uint64_t get_address();
   /// Helper to create (and cache) the name for this sensor. For example "0xfe0000031f1eaf29".
   const std::string &get_address_name();
 

esphome/components/dashboard_import/__init__.py

@@ -2,8 +2,10 @@ import base64
 import secrets
 from pathlib import Path
 from typing import Optional
+import re
 
 import requests
+from ruamel.yaml import YAML
 
 import esphome.codegen as cg
 import esphome.config_validation as cv
@@ -11,7 +13,6 @@ import esphome.final_validate as fv
 from esphome import git
 from esphome.components.packages import validate_source_shorthand
 from esphome.const import CONF_REF, CONF_WIFI, CONF_ESPHOME, CONF_PROJECT
-from esphome.wizard import wizard_file
 from esphome.yaml_util import dump
 
 dashboard_import_ns = cg.esphome_ns.namespace("dashboard_import")
@@ -94,75 +95,74 @@ def import_config(
     if p.exists():
         raise FileExistsError
 
-    if project_name == "esphome.web":
+    git_file = git.GitFile.from_shorthand(import_url)
-        if "esp32c3" in import_url:
-            board = "esp32-c3-devkitm-1"
-            platform = "ESP32"
-        elif "esp32s2" in import_url:
-            board = "esp32-s2-saola-1"
-            platform = "ESP32"
-        elif "esp32s3" in import_url:
-            board = "esp32-s3-devkitc-1"
-            platform = "ESP32"
-        elif "esp32" in import_url:
-            board = "esp32dev"
-            platform = "ESP32"
-        elif "esp8266" in import_url:
-            board = "esp01_1m"
-            platform = "ESP8266"
-        elif "pico-w" in import_url:
-            board = "pico-w"
-            platform = "RP2040"
 
-        kwargs = {
+    if git_file.query and "full_config" in git_file.query:
-            "name": name,
+        url = git_file.raw_url
-            "friendly_name": friendly_name,
+        try:
-            "platform": platform,
+            req = requests.get(url, timeout=30)
-            "board": board,
+            req.raise_for_status()
-            "ssid": "!secret wifi_ssid",
+        except requests.exceptions.RequestException as e:
-            "psk": "!secret wifi_password",
+            raise ValueError(f"Error while fetching {url}: {e}") from e
+
+        contents = req.text
+        yaml = YAML()
+        loaded_yaml = yaml.load(contents)
+        if (
+            "name_add_mac_suffix" in loaded_yaml["esphome"]
+            and loaded_yaml["esphome"]["name_add_mac_suffix"]
+        ):
+            loaded_yaml["esphome"]["name_add_mac_suffix"] = False
+            name_val = loaded_yaml["esphome"]["name"]
+            sub_pattern = re.compile(r"\$\{?([a-zA-Z-_]+)\}?")
+            if match := sub_pattern.match(name_val):
+                name_sub = match.group(1)
+                if name_sub in loaded_yaml["substitutions"]:
+                    loaded_yaml["substitutions"][name_sub] = name
+                else:
+                    raise ValueError(
+                        f"Name substitution {name_sub} not found in substitutions"
+                    )
+            else:
+                loaded_yaml["esphome"]["name"] = name
+            if friendly_name is not None:
+                friendly_name_val = loaded_yaml["esphome"]["friendly_name"]
+                if match := sub_pattern.match(friendly_name_val):
+                    friendly_name_sub = match.group(1)
+                    if friendly_name_sub in loaded_yaml["substitutions"]:
+                        loaded_yaml["substitutions"][friendly_name_sub] = friendly_name
+                    else:
+                        raise ValueError(
+                            f"Friendly name substitution {friendly_name_sub} not found in substitutions"
+                        )
+                else:
+                    loaded_yaml["esphome"]["friendly_name"] = friendly_name
+
+            with p.open("w", encoding="utf8") as f:
+                yaml.dump(loaded_yaml, f)
+        else:
+            with p.open("w", encoding="utf8") as f:
+                f.write(contents)
+
+    else:
+        substitutions = {"name": name}
+        esphome_core = {"name": "${name}", "name_add_mac_suffix": False}
+        if friendly_name:
+            substitutions["friendly_name"] = friendly_name
+            esphome_core["friendly_name"] = "${friendly_name}"
+        config = {
+            "substitutions": substitutions,
+            "packages": {project_name: import_url},
+            "esphome": esphome_core,
         }
         if encryption:
             noise_psk = secrets.token_bytes(32)
             key = base64.b64encode(noise_psk).decode()
-            kwargs["api_encryption_key"] = key
+            config["api"] = {"encryption": {"key": key}}
 
-        p.write_text(
+        output = dump(config)
-            wizard_file(**kwargs),
-            encoding="utf8",
-        )
-    else:
-        git_file = git.GitFile.from_shorthand(import_url)
 
-        if git_file.query and "full_config" in git_file.query:
+        if network == CONF_WIFI:
-            url = git_file.raw_url
+            output += WIFI_CONFIG
-            try:
-                req = requests.get(url, timeout=30)
-                req.raise_for_status()
-            except requests.exceptions.RequestException as e:
-                raise ValueError(f"Error while fetching {url}: {e}") from e
 
-            p.write_text(req.text, encoding="utf8")
+        p.write_text(output, encoding="utf8")
-
-        else:
-            substitutions = {"name": name}
-            esphome_core = {"name": "${name}", "name_add_mac_suffix": False}
-            if friendly_name:
-                substitutions["friendly_name"] = friendly_name
-                esphome_core["friendly_name"] = "${friendly_name}"
-            config = {
-                "substitutions": substitutions,
-                "packages": {project_name: import_url},
-                "esphome": esphome_core,
-            }
-            if encryption:
-                noise_psk = secrets.token_bytes(32)
-                key = base64.b64encode(noise_psk).decode()
-                config["api"] = {"encryption": {"key": key}}
-
-            output = dump(config)
-
-            if network == CONF_WIFI:
-                output += WIFI_CONFIG
-
-            p.write_text(output, encoding="utf8")

esphome/components/datetime/__init__.py

@@ -0,0 +1,207 @@
+import esphome.codegen as cg
+
+# import cpp_generator as cpp
+import esphome.config_validation as cv
+from esphome import automation
+from esphome.components import mqtt, time
+from esphome.const import (
+    CONF_ID,
+    CONF_ON_TIME,
+    CONF_ON_VALUE,
+    CONF_TIME_ID,
+    CONF_TRIGGER_ID,
+    CONF_TYPE,
+    CONF_MQTT_ID,
+    CONF_DATE,
+    CONF_TIME,
+    CONF_YEAR,
+    CONF_MONTH,
+    CONF_DAY,
+    CONF_SECOND,
+    CONF_HOUR,
+    CONF_MINUTE,
+)
+from esphome.core import CORE, coroutine_with_priority
+from esphome.cpp_generator import MockObjClass
+from esphome.cpp_helpers import setup_entity
+
+
+CODEOWNERS = ["@rfdarter", "@jesserockz"]
+
+IS_PLATFORM_COMPONENT = True
+
+datetime_ns = cg.esphome_ns.namespace("datetime")
+DateTimeBase = datetime_ns.class_("DateTimeBase", cg.EntityBase)
+DateEntity = datetime_ns.class_("DateEntity", DateTimeBase)
+TimeEntity = datetime_ns.class_("TimeEntity", DateTimeBase)
+
+# Actions
+DateSetAction = datetime_ns.class_("DateSetAction", automation.Action)
+TimeSetAction = datetime_ns.class_("TimeSetAction", automation.Action)
+
+DateTimeStateTrigger = datetime_ns.class_(
+    "DateTimeStateTrigger", automation.Trigger.template(cg.ESPTime)
+)
+
+OnTimeTrigger = datetime_ns.class_(
+    "OnTimeTrigger", automation.Trigger, cg.Component, cg.Parented.template(TimeEntity)
+)
+
+DATETIME_MODES = [
+    "DATE",
+    "TIME",
+    "DATETIME",
+]
+
+
+_DATETIME_SCHEMA = cv.Schema(
+    {
+        cv.Optional(CONF_ON_VALUE): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(DateTimeStateTrigger),
+            }
+        ),
+    }
+).extend(cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA))
+
+
+def date_schema(class_: MockObjClass) -> cv.Schema:
+    schema = {
+        cv.GenerateID(): cv.declare_id(class_),
+        cv.OnlyWith(CONF_MQTT_ID, "mqtt"): cv.declare_id(mqtt.MQTTDateComponent),
+        cv.Optional(CONF_TYPE, default="DATE"): cv.one_of("DATE", upper=True),
+    }
+    return _DATETIME_SCHEMA.extend(schema)
+
+
+def time_schema(class_: MockObjClass) -> cv.Schema:
+    schema = {
+        cv.GenerateID(): cv.declare_id(class_),
+        cv.OnlyWith(CONF_MQTT_ID, "mqtt"): cv.declare_id(mqtt.MQTTTimeComponent),
+        cv.Optional(CONF_TYPE, default="TIME"): cv.one_of("TIME", upper=True),
+        cv.Inclusive(
+            CONF_ON_TIME,
+            group_of_inclusion=CONF_ON_TIME,
+            msg="`on_time` and `time_id` must both be specified",
+        ): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(OnTimeTrigger),
+            }
+        ),
+        cv.Inclusive(CONF_TIME_ID, group_of_inclusion=CONF_ON_TIME): cv.use_id(
+            time.RealTimeClock
+        ),
+    }
+    return _DATETIME_SCHEMA.extend(schema)
+
+
+def datetime_schema(class_: MockObjClass) -> cv.Schema:
+    schema = {
+        cv.GenerateID(): cv.declare_id(class_),
+        cv.Optional(CONF_TYPE, default="DATETIME"): cv.one_of("DATETIME", upper=True),
+    }
+    return _DATETIME_SCHEMA.extend(schema)
+
+
+async def setup_datetime_core_(var, config):
+    await setup_entity(var, config)
+
+    if (mqtt_id := config.get(CONF_MQTT_ID)) is not None:
+        mqtt_ = cg.new_Pvariable(mqtt_id, var)
+        await mqtt.register_mqtt_component(mqtt_, config)
+    for conf in config.get(CONF_ON_VALUE, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [(cg.ESPTime, "x")], conf)
+
+    rtc_id = config.get(CONF_TIME_ID)
+    rtc = None
+    if rtc_id is not None:
+        rtc = await cg.get_variable(rtc_id)
+    for conf in config.get(CONF_ON_TIME, []):
+        assert rtc is not None
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], rtc)
+        await automation.build_automation(trigger, [], conf)
+        await cg.register_component(trigger, conf)
+        await cg.register_parented(trigger, var)
+
+
+async def register_datetime(var, config):
+    if not CORE.has_id(config[CONF_ID]):
+        var = cg.Pvariable(config[CONF_ID], var)
+    cg.add(getattr(cg.App, f"register_{config[CONF_TYPE].lower()}")(var))
+    await setup_datetime_core_(var, config)
+    cg.add_define(f"USE_DATETIME_{config[CONF_TYPE]}")
+
+
+async def new_datetime(config, *args):
+    var = cg.new_Pvariable(config[CONF_ID], *args)
+    await register_datetime(var, config)
+    return var
+
+
+@coroutine_with_priority(40.0)
+async def to_code(config):
+    cg.add_define("USE_DATETIME")
+    cg.add_global(datetime_ns.using)
+
+
+@automation.register_action(
+    "datetime.date.set",
+    DateSetAction,
+    cv.Schema(
+        {
+            cv.Required(CONF_ID): cv.use_id(DateEntity),
+            cv.Required(CONF_DATE): cv.Any(
+                cv.returning_lambda, cv.date_time(allowed_time=False)
+            ),
+        }
+    ),
+)
+async def datetime_date_set_to_code(config, action_id, template_arg, args):
+    action_var = cg.new_Pvariable(action_id, template_arg)
+    await cg.register_parented(action_var, config[CONF_ID])
+
+    date = config[CONF_DATE]
+    if cg.is_template(date):
+        template_ = await cg.templatable(config[CONF_DATE], [], cg.ESPTime)
+        cg.add(action_var.set_date(template_))
+    else:
+        date_struct = cg.StructInitializer(
+            cg.ESPTime,
+            ("day_of_month", date[CONF_DAY]),
+            ("month", date[CONF_MONTH]),
+            ("year", date[CONF_YEAR]),
+        )
+        cg.add(action_var.set_date(date_struct))
+    return action_var
+
+
+@automation.register_action(
+    "datetime.time.set",
+    TimeSetAction,
+    cv.Schema(
+        {
+            cv.Required(CONF_ID): cv.use_id(TimeEntity),
+            cv.Required(CONF_TIME): cv.Any(
+                cv.returning_lambda, cv.date_time(allowed_date=False)
+            ),
+        }
+    ),
+)
+async def datetime_time_set_to_code(config, action_id, template_arg, args):
+    action_var = cg.new_Pvariable(action_id, template_arg)
+    await cg.register_parented(action_var, config[CONF_ID])
+
+    time_config = config[CONF_TIME]
+    if cg.is_template(time_config):
+        template_ = await cg.templatable(config[CONF_TIME], [], cg.ESPTime)
+        cg.add(action_var.set_time(template_))
+    else:
+        time_struct = cg.StructInitializer(
+            cg.ESPTime,
+            ("second", time_config[CONF_SECOND]),
+            ("minute", time_config[CONF_MINUTE]),
+            ("hour", time_config[CONF_HOUR]),
+        )
+        cg.add(action_var.set_time(time_struct))
+    return action_var

esphome/components/datetime/date_entity.cpp

@@ -0,0 +1,117 @@
+#include "date_entity.h"
+
+#ifdef USE_DATETIME_DATE
+
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace datetime {
+
+static const char *const TAG = "datetime.date_entity";
+
+void DateEntity::publish_state() {
+  if (this->year_ == 0 || this->month_ == 0 || this->day_ == 0) {
+    this->has_state_ = false;
+    return;
+  }
+  if (this->year_ < 1970 || this->year_ > 3000) {
+    this->has_state_ = false;
+    ESP_LOGE(TAG, "Year must be between 1970 and 3000");
+    return;
+  }
+  if (this->month_ < 1 || this->month_ > 12) {
+    this->has_state_ = false;
+    ESP_LOGE(TAG, "Month must be between 1 and 12");
+    return;
+  }
+  if (this->day_ > days_in_month(this->month_, this->year_)) {
+    this->has_state_ = false;
+    ESP_LOGE(TAG, "Day must be between 1 and %d for month %d", days_in_month(this->month_, this->year_), this->month_);
+    return;
+  }
+  this->has_state_ = true;
+  ESP_LOGD(TAG, "'%s': Sending date %d-%d-%d", this->get_name().c_str(), this->year_, this->month_, this->day_);
+  this->state_callback_.call();
+}
+
+DateCall DateEntity::make_call() { return DateCall(this); }
+
+void DateCall::validate_() {
+  if (this->year_.has_value() && (this->year_ < 1970 || this->year_ > 3000)) {
+    ESP_LOGE(TAG, "Year must be between 1970 and 3000");
+    this->year_.reset();
+  }
+  if (this->month_.has_value() && (this->month_ < 1 || this->month_ > 12)) {
+    ESP_LOGE(TAG, "Month must be between 1 and 12");
+    this->month_.reset();
+  }
+  if (this->day_.has_value()) {
+    uint16_t year = 0;
+    uint8_t month = 0;
+    if (this->month_.has_value()) {
+      month = *this->month_;
+    } else {
+      if (this->parent_->month != 0) {
+        month = this->parent_->month;
+      } else {
+        ESP_LOGE(TAG, "Month must be set to validate day");
+        this->day_.reset();
+      }
+    }
+    if (this->year_.has_value()) {
+      year = *this->year_;
+    } else {
+      if (this->parent_->year != 0) {
+        year = this->parent_->year;
+      } else {
+        ESP_LOGE(TAG, "Year must be set to validate day");
+        this->day_.reset();
+      }
+    }
+    if (this->day_.has_value() && *this->day_ > days_in_month(month, year)) {
+      ESP_LOGE(TAG, "Day must be between 1 and %d for month %d", days_in_month(month, year), month);
+      this->day_.reset();
+    }
+  }
+}
+
+void DateCall::perform() {
+  this->validate_();
+  this->parent_->control(*this);
+}
+
+DateCall &DateCall::set_date(uint16_t year, uint8_t month, uint8_t day) {
+  this->year_ = year;
+  this->month_ = month;
+  this->day_ = day;
+  return *this;
+};
+
+DateCall &DateCall::set_date(ESPTime time) { return this->set_date(time.year, time.month, time.day_of_month); };
+
+DateCall &DateCall::set_date(const std::string &date) {
+  ESPTime val{};
+  if (!ESPTime::strptime(date, val)) {
+    ESP_LOGE(TAG, "Could not convert the date string to an ESPTime object");
+    return *this;
+  }
+  return this->set_date(val);
+}
+
+DateCall DateEntityRestoreState::to_call(DateEntity *date) {
+  DateCall call = date->make_call();
+  call.set_date(this->year, this->month, this->day);
+  return call;
+}
+
+void DateEntityRestoreState::apply(DateEntity *date) {
+  date->year_ = this->year;
+  date->month_ = this->month;
+  date->day_ = this->day;
+  date->publish_state();
+}
+
+}  // namespace datetime
+}  // namespace esphome
+
+#endif  // USE_DATETIME_DATE

esphome/components/datetime/date_entity.h

@@ -0,0 +1,117 @@
+#pragma once
+
+#include "esphome/core/defines.h"
+
+#ifdef USE_DATETIME_DATE
+
+#include "esphome/core/automation.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/time.h"
+
+#include "datetime_base.h"
+
+namespace esphome {
+namespace datetime {
+
+#define LOG_DATETIME_DATE(prefix, type, obj) \
+  if ((obj) != nullptr) { \
+    ESP_LOGCONFIG(TAG, "%s%s '%s'", prefix, LOG_STR_LITERAL(type), (obj)->get_name().c_str()); \
+    if (!(obj)->get_icon().empty()) { \
+      ESP_LOGCONFIG(TAG, "%s  Icon: '%s'", prefix, (obj)->get_icon().c_str()); \
+    } \
+  }
+
+class DateCall;
+class DateEntity;
+
+struct DateEntityRestoreState {
+  uint16_t year;
+  uint8_t month;
+  uint8_t day;
+
+  DateCall to_call(DateEntity *date);
+  void apply(DateEntity *date);
+} __attribute__((packed));
+
+class DateEntity : public DateTimeBase {
+ protected:
+  uint16_t year_;
+  uint8_t month_;
+  uint8_t day_;
+
+ public:
+  void publish_state();
+  DateCall make_call();
+
+  ESPTime state_as_esptime() const override {
+    ESPTime obj;
+    obj.year = this->year_;
+    obj.month = this->month_;
+    obj.day_of_month = this->day_;
+    return obj;
+  }
+
+  const uint16_t &year = year_;
+  const uint8_t &month = month_;
+  const uint8_t &day = day_;
+
+ protected:
+  friend class DateCall;
+  friend struct DateEntityRestoreState;
+
+  virtual void control(const DateCall &call) = 0;
+};
+
+class DateCall {
+ public:
+  explicit DateCall(DateEntity *parent) : parent_(parent) {}
+  void perform();
+  DateCall &set_date(uint16_t year, uint8_t month, uint8_t day);
+  DateCall &set_date(ESPTime time);
+  DateCall &set_date(const std::string &date);
+
+  DateCall &set_year(uint16_t year) {
+    this->year_ = year;
+    return *this;
+  }
+  DateCall &set_month(uint8_t month) {
+    this->month_ = month;
+    return *this;
+  }
+  DateCall &set_day(uint8_t day) {
+    this->day_ = day;
+    return *this;
+  }
+
+  optional<uint16_t> get_year() const { return this->year_; }
+  optional<uint8_t> get_month() const { return this->month_; }
+  optional<uint8_t> get_day() const { return this->day_; }
+
+ protected:
+  void validate_();
+
+  DateEntity *parent_;
+
+  optional<int16_t> year_;
+  optional<uint8_t> month_;
+  optional<uint8_t> day_;
+};
+
+template<typename... Ts> class DateSetAction : public Action<Ts...>, public Parented<DateEntity> {
+ public:
+  TEMPLATABLE_VALUE(ESPTime, date)
+
+  void play(Ts... x) override {
+    auto call = this->parent_->make_call();
+
+    if (this->date_.has_value()) {
+      call.set_date(this->date_.value(x...));
+    }
+    call.perform();
+  }
+};
+
+}  // namespace datetime
+}  // namespace esphome
+
+#endif  // USE_DATETIME_DATE

esphome/components/datetime/datetime_base.h

@@ -0,0 +1,34 @@
+#pragma once
+
+#include "esphome/core/automation.h"
+#include "esphome/core/component.h"
+#include "esphome/core/entity_base.h"
+#include "esphome/core/time.h"
+
+namespace esphome {
+namespace datetime {
+
+class DateTimeBase : public EntityBase {
+ public:
+  /// Return whether this Datetime has gotten a full state yet.
+  bool has_state() const { return this->has_state_; }
+
+  virtual ESPTime state_as_esptime() const = 0;
+
+  void add_on_state_callback(std::function<void()> &&callback) { this->state_callback_.add(std::move(callback)); }
+
+ protected:
+  CallbackManager<void()> state_callback_;
+
+  bool has_state_{false};
+};
+
+class DateTimeStateTrigger : public Trigger<ESPTime> {
+ public:
+  explicit DateTimeStateTrigger(DateTimeBase *parent) {
+    parent->add_on_state_callback([this, parent]() { this->trigger(parent->state_as_esptime()); });
+  }
+};
+
+}  // namespace datetime
+}  // namespace esphome

esphome/components/datetime/time_entity.cpp

@@ -0,0 +1,156 @@
+#include "time_entity.h"
+
+#ifdef USE_DATETIME_TIME
+
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace datetime {
+
+static const char *const TAG = "datetime.time_entity";
+
+void TimeEntity::publish_state() {
+  if (this->hour_ > 23) {
+    this->has_state_ = false;
+    ESP_LOGE(TAG, "Hour must be between 0 and 23");
+    return;
+  }
+  if (this->minute_ > 59) {
+    this->has_state_ = false;
+    ESP_LOGE(TAG, "Minute must be between 0 and 59");
+    return;
+  }
+  if (this->second_ > 59) {
+    this->has_state_ = false;
+    ESP_LOGE(TAG, "Second must be between 0 and 59");
+    return;
+  }
+  this->has_state_ = true;
+  ESP_LOGD(TAG, "'%s': Sending time %02d:%02d:%02d", this->get_name().c_str(), this->hour_, this->minute_,
+           this->second_);
+  this->state_callback_.call();
+}
+
+TimeCall TimeEntity::make_call() { return TimeCall(this); }
+
+void TimeCall::validate_() {
+  if (this->hour_.has_value() && this->hour_ > 23) {
+    ESP_LOGE(TAG, "Hour must be between 0 and 23");
+    this->hour_.reset();
+  }
+  if (this->minute_.has_value() && this->minute_ > 59) {
+    ESP_LOGE(TAG, "Minute must be between 0 and 59");
+    this->minute_.reset();
+  }
+  if (this->second_.has_value() && this->second_ > 59) {
+    ESP_LOGE(TAG, "Second must be between 0 and 59");
+    this->second_.reset();
+  }
+}
+
+void TimeCall::perform() {
+  this->validate_();
+  ESP_LOGD(TAG, "'%s' - Setting", this->parent_->get_name().c_str());
+  if (this->hour_.has_value()) {
+    ESP_LOGD(TAG, " Hour: %d", *this->hour_);
+  }
+  if (this->minute_.has_value()) {
+    ESP_LOGD(TAG, " Minute: %d", *this->minute_);
+  }
+  if (this->second_.has_value()) {
+    ESP_LOGD(TAG, " Second: %d", *this->second_);
+  }
+  this->parent_->control(*this);
+}
+
+TimeCall &TimeCall::set_time(uint8_t hour, uint8_t minute, uint8_t second) {
+  this->hour_ = hour;
+  this->minute_ = minute;
+  this->second_ = second;
+  return *this;
+};
+
+TimeCall &TimeCall::set_time(ESPTime time) { return this->set_time(time.hour, time.minute, time.second); };
+
+TimeCall &TimeCall::set_time(const std::string &time) {
+  ESPTime val{};
+  if (!ESPTime::strptime(time, val)) {
+    ESP_LOGE(TAG, "Could not convert the time string to an ESPTime object");
+    return *this;
+  }
+  return this->set_time(val);
+}
+
+TimeCall TimeEntityRestoreState::to_call(TimeEntity *time) {
+  TimeCall call = time->make_call();
+  call.set_time(this->hour, this->minute, this->second);
+  return call;
+}
+
+void TimeEntityRestoreState::apply(TimeEntity *time) {
+  time->hour_ = this->hour;
+  time->minute_ = this->minute;
+  time->second_ = this->second;
+  time->publish_state();
+}
+
+#ifdef USE_TIME
+
+static const int MAX_TIMESTAMP_DRIFT = 900;  // how far can the clock drift before we consider
+                                             // there has been a drastic time synchronization
+
+void OnTimeTrigger::loop() {
+  if (!this->parent_->has_state()) {
+    return;
+  }
+  ESPTime time = this->rtc_->now();
+  if (!time.is_valid()) {
+    return;
+  }
+  if (this->last_check_.has_value()) {
+    if (*this->last_check_ > time && this->last_check_->timestamp - time.timestamp > MAX_TIMESTAMP_DRIFT) {
+      // We went back in time (a lot), probably caused by time synchronization
+      ESP_LOGW(TAG, "Time has jumped back!");
+    } else if (*this->last_check_ >= time) {
+      // already handled this one
+      return;
+    } else if (time > *this->last_check_ && time.timestamp - this->last_check_->timestamp > MAX_TIMESTAMP_DRIFT) {
+      // We went ahead in time (a lot), probably caused by time synchronization
+      ESP_LOGW(TAG, "Time has jumped ahead!");
+      this->last_check_ = time;
+      return;
+    }
+
+    while (true) {
+      this->last_check_->increment_second();
+      if (*this->last_check_ >= time)
+        break;
+
+      if (this->matches_(*this->last_check_)) {
+        this->trigger();
+        break;
+      }
+    }
+  }
+
+  this->last_check_ = time;
+  if (!time.fields_in_range()) {
+    ESP_LOGW(TAG, "Time is out of range!");
+    ESP_LOGD(TAG, "Second=%02u Minute=%02u Hour=%02u", time.second, time.minute, time.hour);
+  }
+
+  if (this->matches_(time))
+    this->trigger();
+}
+
+bool OnTimeTrigger::matches_(const ESPTime &time) const {
+  return time.is_valid() && time.hour == this->parent_->hour && time.minute == this->parent_->minute &&
+         time.second == this->parent_->second;
+}
+
+#endif
+
+}  // namespace datetime
+}  // namespace esphome
+
+#endif  // USE_DATETIME_TIME

esphome/components/datetime/time_entity.h

@@ -0,0 +1,137 @@
+#pragma once
+
+#include "esphome/core/defines.h"
+
+#ifdef USE_DATETIME_TIME
+
+#include "esphome/core/automation.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/time.h"
+
+#include "datetime_base.h"
+
+#ifdef USE_TIME
+#include "esphome/components/time/real_time_clock.h"
+#endif
+
+namespace esphome {
+namespace datetime {
+
+#define LOG_DATETIME_TIME(prefix, type, obj) \
+  if ((obj) != nullptr) { \
+    ESP_LOGCONFIG(TAG, "%s%s '%s'", prefix, LOG_STR_LITERAL(type), (obj)->get_name().c_str()); \
+    if (!(obj)->get_icon().empty()) { \
+      ESP_LOGCONFIG(TAG, "%s  Icon: '%s'", prefix, (obj)->get_icon().c_str()); \
+    } \
+  }
+
+class TimeCall;
+class TimeEntity;
+
+struct TimeEntityRestoreState {
+  uint8_t hour;
+  uint8_t minute;
+  uint8_t second;
+
+  TimeCall to_call(TimeEntity *time);
+  void apply(TimeEntity *time);
+} __attribute__((packed));
+
+class TimeEntity : public DateTimeBase {
+ protected:
+  uint8_t hour_;
+  uint8_t minute_;
+  uint8_t second_;
+
+ public:
+  void publish_state();
+  TimeCall make_call();
+
+  ESPTime state_as_esptime() const override {
+    ESPTime obj;
+    obj.hour = this->hour_;
+    obj.minute = this->minute_;
+    obj.second = this->second_;
+    return obj;
+  }
+
+  const uint8_t &hour = hour_;
+  const uint8_t &minute = minute_;
+  const uint8_t &second = second_;
+
+ protected:
+  friend class TimeCall;
+  friend struct TimeEntityRestoreState;
+
+  virtual void control(const TimeCall &call) = 0;
+};
+
+class TimeCall {
+ public:
+  explicit TimeCall(TimeEntity *parent) : parent_(parent) {}
+  void perform();
+  TimeCall &set_time(uint8_t hour, uint8_t minute, uint8_t second);
+  TimeCall &set_time(ESPTime time);
+  TimeCall &set_time(const std::string &time);
+
+  TimeCall &set_hour(uint8_t hour) {
+    this->hour_ = hour;
+    return *this;
+  }
+  TimeCall &set_minute(uint8_t minute) {
+    this->minute_ = minute;
+    return *this;
+  }
+  TimeCall &set_second(uint8_t second) {
+    this->second_ = second;
+    return *this;
+  }
+
+  optional<uint8_t> get_hour() const { return this->hour_; }
+  optional<uint8_t> get_minute() const { return this->minute_; }
+  optional<uint8_t> get_second() const { return this->second_; }
+
+ protected:
+  void validate_();
+
+  TimeEntity *parent_;
+
+  optional<uint8_t> hour_;
+  optional<uint8_t> minute_;
+  optional<uint8_t> second_;
+};
+
+template<typename... Ts> class TimeSetAction : public Action<Ts...>, public Parented<TimeEntity> {
+ public:
+  TEMPLATABLE_VALUE(ESPTime, time)
+
+  void play(Ts... x) override {
+    auto call = this->parent_->make_call();
+
+    if (this->time_.has_value()) {
+      call.set_time(this->time_.value(x...));
+    }
+    call.perform();
+  }
+};
+
+#ifdef USE_TIME
+
+class OnTimeTrigger : public Trigger<>, public Component, public Parented<TimeEntity> {
+ public:
+  explicit OnTimeTrigger(time::RealTimeClock *rtc) : rtc_(rtc) {}
+  void loop() override;
+
+ protected:
+  bool matches_(const ESPTime &time) const;
+
+  time::RealTimeClock *rtc_;
+  optional<ESPTime> last_check_;
+};
+
+#endif
+
+}  // namespace datetime
+}  // namespace esphome
+
+#endif  // USE_DATETIME_TIME

esphome/components/debug/debug_component.cpp

@@ -6,6 +6,7 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/version.h"
 #include <cinttypes>
+#include <climits>
 
 #ifdef USE_ESP32
 
@@ -49,6 +50,8 @@ static uint32_t get_free_heap() {
   return rp2040.getFreeHeap();
 #elif defined(USE_LIBRETINY)
   return lt_heap_get_free();
+#elif defined(USE_HOST)
+  return INT_MAX;
 #endif
 }