Merge branch 'dev' into jesserockz-2023-284

.devcontainer/devcontainer.json

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

.github/PULL_REQUEST_TEMPLATE.md

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

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

@@ -17,12 +17,12 @@ runs:
   steps:
     - name: Set up Python ${{ inputs.python-version }}
       id: python
-      uses: actions/setup-python@v4.7.0
+      uses: actions/setup-python@v4.6.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@v3.3.1
       with:
         path: venv
         # yamllint disable-line rule:line-length

.github/workflows/ci-docker.yml

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

.github/workflows/ci.yml

@@ -7,10 +7,6 @@ on:
     branches: [dev, beta, release]
 
   pull_request:
-    paths:
-      - "**"
-      - "!.github/workflows/*.yml"
-      - ".github/workflows/ci.yml"
   merge_group:
 
 permissions:
@@ -34,18 +30,18 @@ jobs:
       cache-key: ${{ steps.cache-key.outputs.key }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v3.5.2
       - name: Generate cache-key
         id: cache-key
         run: echo key="${{ hashFiles('requirements.txt', 'requirements_optional.txt', 'requirements_test.txt') }}" >> $GITHUB_OUTPUT
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v4.7.1
+        uses: actions/setup-python@v4.6.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.3.2
+        uses: actions/cache@v3.3.1
         with:
           path: venv
           # yamllint disable-line rule:line-length
@@ -59,6 +55,15 @@ jobs:
           pip install -r requirements.txt -r requirements_optional.txt -r requirements_test.txt
           pip install -e .
 
+  yamllint:
+    name: yamllint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v3.5.2
+      - name: Run yamllint
+        uses: frenck/action-yamllint@v1.4.1
+
   black:
     name: Check black
     runs-on: ubuntu-latest
@@ -66,7 +71,7 @@ jobs:
       - common
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v3.5.2
       - name: Restore Python
         uses: ./.github/actions/restore-python
         with:
@@ -87,7 +92,7 @@ jobs:
       - common
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v3.5.2
       - name: Restore Python
         uses: ./.github/actions/restore-python
         with:
@@ -108,7 +113,7 @@ jobs:
       - common
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v3.5.2
       - name: Restore Python
         uses: ./.github/actions/restore-python
         with:
@@ -129,7 +134,7 @@ jobs:
       - common
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v3.5.2
       - name: Restore Python
         uses: ./.github/actions/restore-python
         with:
@@ -150,7 +155,7 @@ jobs:
       - common
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v3.5.2
       - name: Restore Python
         uses: ./.github/actions/restore-python
         with:
@@ -171,7 +176,7 @@ jobs:
       - common
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v3.5.2
       - name: Restore Python
         uses: ./.github/actions/restore-python
         with:
@@ -191,7 +196,7 @@ jobs:
       - common
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v3.5.2
       - name: Restore Python
         uses: ./.github/actions/restore-python
         with:
@@ -210,40 +215,6 @@ jobs:
         run: script/ci-suggest-changes
         if: always()
 
-  compile-tests-list:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
-      - name: Find all YAML test files
-        id: set-matrix
-        run: echo "matrix=$(ls tests/test*.yaml | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
-
-  validate-tests:
-    name: Validate YAML test ${{ matrix.file }}
-    runs-on: ubuntu-latest
-    needs:
-      - common
-      - compile-tests-list
-    strategy:
-      fail-fast: false
-      matrix:
-        file: ${{ fromJson(needs.compile-tests-list.outputs.matrix) }}
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-      - name: Run esphome config ${{ matrix.file }}
-        run: |
-          . venv/bin/activate
-          esphome config ${{ matrix.file }}
-
   compile-tests:
     name: Run YAML test ${{ matrix.file }}
     runs-on: ubuntu-latest
@@ -256,25 +227,24 @@ jobs:
       - pylint
       - pytest
       - pyupgrade
-      - compile-tests-list
+      - yamllint
-      - validate-tests
     strategy:
       fail-fast: false
       max-parallel: 2
       matrix:
-        file: ${{ fromJson(needs.compile-tests-list.outputs.matrix) }}
+        file: [1, 2, 3, 3.1, 4, 5, 6, 7, 8]
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v3.5.2
       - name: Restore Python
         uses: ./.github/actions/restore-python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           cache-key: ${{ needs.common.outputs.cache-key }}
-      - name: Run esphome compile ${{ matrix.file }}
+      - name: Run esphome compile tests/test${{ matrix.file }}.yaml
         run: |
           . venv/bin/activate
-          esphome compile ${{ matrix.file }}
+          esphome compile tests/test${{ matrix.file }}.yaml
 
   clang-tidy:
     name: ${{ matrix.name }}
@@ -288,6 +258,7 @@ jobs:
       - pylint
       - pytest
       - pyupgrade
+      - yamllint
     strategy:
       fail-fast: false
       max-parallel: 2
@@ -320,14 +291,14 @@ jobs:
 
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v3.5.2
       - name: Restore Python
         uses: ./.github/actions/restore-python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           cache-key: ${{ needs.common.outputs.cache-key }}
       - name: Cache platformio
-        uses: actions/cache@v3.3.2
+        uses: actions/cache@v3.3.1
         with:
           path: ~/.platformio
           # yamllint disable-line rule:line-length
@@ -366,6 +337,7 @@ jobs:
       - pylint
       - pytest
       - pyupgrade
+      - yamllint
       - compile-tests
       - clang-tidy
     if: always()

.github/workflows/lock.yml

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

.github/workflows/needs-docs.yml

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

.github/workflows/release.yml

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

.github/workflows/stale.yml

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

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

@@ -4,7 +4,8 @@ name: Synchronise Device Classes from Home Assistant
 on:
   workflow_dispatch:
   schedule:
-    - cron: "45 6 * * *"
+    - cron: '45 6 * * *'
+
 
 jobs:
   sync:
@@ -13,16 +14,16 @@ jobs:
     if: github.repository == 'esphome/esphome'
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v3
 
       - name: Checkout Home Assistant
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v3
         with:
           repository: home-assistant/core
           path: lib/home-assistant
 
       - name: Setup Python
-        uses: actions/setup-python@v4.7.1
+        uses: actions/setup-python@v4
         with:
           python-version: 3.11
 
@@ -36,7 +37,7 @@ jobs:
           python ./script/sync-device_class.py
 
       - name: Commit changes
-        uses: peter-evans/create-pull-request@v5.0.2
+        uses: peter-evans/create-pull-request@v5
         with:
           commit-message: "Synchronise Device Classes from Home Assistant"
           committer: esphomebot <esphome@nabucasa.com>

.github/workflows/yaml-lint.yml

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

.gitignore

@@ -13,12 +13,6 @@ __pycache__/
 # Intellij Idea
 .idea
 
-# Eclipse
-.project
-.cproject
-.pydevproject
-.settings/
-
 # Vim
 *.swp
 

.pre-commit-config.yaml

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

CODEOWNERS

@@ -17,9 +17,6 @@ esphome/components/ac_dimmer/* @glmnet
 esphome/components/adc/* @esphome/core
 esphome/components/adc128s102/* @DeerMaximum
 esphome/components/addressable_light/* @justfalter
-esphome/components/ade7953/* @angelnu
-esphome/components/ade7953_i2c/* @angelnu
-esphome/components/ade7953_spi/* @angelnu
 esphome/components/airthings_ble/* @jeromelaban
 esphome/components/airthings_wave_base/* @jeromelaban @kpfleming @ncareau
 esphome/components/airthings_wave_mini/* @ncareau
@@ -45,14 +42,12 @@ esphome/components/bedjet/climate/* @jhansche
 esphome/components/bedjet/fan/* @jhansche
 esphome/components/bh1750/* @OttoWinter
 esphome/components/binary_sensor/* @esphome/core
-esphome/components/bk72xx/* @kuba2k2
 esphome/components/bl0939/* @ziceva
 esphome/components/bl0940/* @tobias-
 esphome/components/bl0942/* @dbuezas
 esphome/components/ble_client/* @buxtronix
 esphome/components/bluetooth_proxy/* @jesserockz
 esphome/components/bme680_bsec/* @trvrnrth
-esphome/components/bmi160/* @flaviut
 esphome/components/bmp3xx/* @martgras
 esphome/components/bmp581/* @kahrendt
 esphome/components/bp1658cj/* @Cossid
@@ -80,7 +75,6 @@ esphome/components/dashboard_import/* @esphome/core
 esphome/components/debug/* @OttoWinter
 esphome/components/delonghi/* @grob6000
 esphome/components/dfplayer/* @glmnet
-esphome/components/dfrobot_sen0395/* @niklasweber
 esphome/components/dht/* @OttoWinter
 esphome/components/display_menu_base/* @numo68
 esphome/components/dps310/* @kbx81
@@ -89,17 +83,17 @@ esphome/components/dsmr/* @glmnet @zuidwijk
 esphome/components/duty_time/* @dudanov
 esphome/components/ee895/* @Stock-M
 esphome/components/ektf2232/* @jesserockz
-esphome/components/emc2101/* @ellull
 esphome/components/ens210/* @itn3rd77
 esphome/components/esp32/* @esphome/core
-esphome/components/esp32_ble/* @Rapsssito @jesserockz
+esphome/components/esp32_ble/* @jesserockz
 esphome/components/esp32_ble_client/* @jesserockz
-esphome/components/esp32_ble_server/* @Rapsssito @clydebarrow @jesserockz
+esphome/components/esp32_ble_server/* @clydebarrow @jesserockz
 esphome/components/esp32_camera_web_server/* @ayufan
 esphome/components/esp32_can/* @Sympatron
 esphome/components/esp32_improv/* @jesserockz
 esphome/components/esp32_rmt_led_strip/* @jesserockz
 esphome/components/esp8266/* @esphome/core
+esphome/components/esp_adf/* @jesserockz
 esphome/components/ethernet_info/* @gtjadsonsantos
 esphome/components/exposure_notifications/* @OttoWinter
 esphome/components/ezo/* @ssieb
@@ -115,7 +109,6 @@ esphome/components/gp8403/* @jesserockz
 esphome/components/gpio/* @esphome/core
 esphome/components/gps/* @coogle
 esphome/components/graph/* @synco
-esphome/components/gree/* @orestismers
 esphome/components/grove_tb6612fng/* @max246
 esphome/components/growatt_solar/* @leeuwte
 esphome/components/haier/* @paveldn
@@ -127,7 +120,6 @@ esphome/components/hitachi_ac424/* @sourabhjaiswal
 esphome/components/hm3301/* @freekode
 esphome/components/homeassistant/* @OttoWinter
 esphome/components/honeywellabp/* @RubyBailey
-esphome/components/honeywellabp2_i2c/* @jpfaff
 esphome/components/host/* @esphome/core
 esphome/components/hrxl_maxsonar_wr/* @netmikey
 esphome/components/hte501/* @Stock-M
@@ -138,8 +130,7 @@ esphome/components/i2s_audio/* @jesserockz
 esphome/components/i2s_audio/media_player/* @jesserockz
 esphome/components/i2s_audio/microphone/* @jesserockz
 esphome/components/i2s_audio/speaker/* @jesserockz
-esphome/components/iaqcore/* @yozik04
+esphome/components/ili9xxx/* @nielsnl68
-esphome/components/ili9xxx/* @clydebarrow @nielsnl68
 esphome/components/improv_base/* @esphome/core
 esphome/components/improv_serial/* @esphome/core
 esphome/components/ina260/* @mreditor97
@@ -155,12 +146,8 @@ esphome/components/key_provider/* @ssieb
 esphome/components/kuntze/* @ssieb
 esphome/components/lcd_menu/* @numo68
 esphome/components/ld2410/* @regevbr @sebcaps
-esphome/components/ld2420/* @descipher
 esphome/components/ledc/* @OttoWinter
-esphome/components/libretiny/* @kuba2k2
-esphome/components/libretiny_pwm/* @kuba2k2
 esphome/components/light/* @esphome/core
-esphome/components/lightwaverf/* @max246
 esphome/components/lilygo_t5_47/touchscreen/* @jesserockz
 esphome/components/lock/* @esphome/core
 esphome/components/logger/* @esphome/core
@@ -187,7 +174,6 @@ esphome/components/mcp9808/* @k7hpn
 esphome/components/md5/* @esphome/core
 esphome/components/mdns/* @esphome/core
 esphome/components/media_player/* @jesserockz
-esphome/components/micronova/* @jorre05
 esphome/components/microphone/* @jesserockz
 esphome/components/mics_4514/* @jesserockz
 esphome/components/midea/* @dudanov
@@ -196,7 +182,6 @@ esphome/components/mitsubishi/* @RubyBailey
 esphome/components/mlx90393/* @functionpointer
 esphome/components/mlx90614/* @jesserockz
 esphome/components/mmc5603/* @benhoff
-esphome/components/mmc5983/* @agoode
 esphome/components/modbus_controller/* @martgras
 esphome/components/modbus_controller/binary_sensor/* @martgras
 esphome/components/modbus_controller/number/* @martgras
@@ -217,12 +202,11 @@ esphome/components/nextion/sensor/* @senexcrenshaw
 esphome/components/nextion/switch/* @senexcrenshaw
 esphome/components/nextion/text_sensor/* @senexcrenshaw
 esphome/components/nfc/* @jesserockz
-esphome/components/noblex/* @AGalfra
 esphome/components/number/* @esphome/core
 esphome/components/ota/* @esphome/core
 esphome/components/output/* @esphome/core
 esphome/components/pca6416a/* @Mat931
-esphome/components/pca9554/* @clydebarrow @hwstar
+esphome/components/pca9554/* @hwstar
 esphome/components/pcf85063/* @brogon
 esphome/components/pcf8563/* @KoenBreeman
 esphome/components/pid/* @OttoWinter
@@ -236,24 +220,21 @@ esphome/components/pn532_spi/* @OttoWinter @jesserockz
 esphome/components/power_supply/* @esphome/core
 esphome/components/preferences/* @esphome/core
 esphome/components/psram/* @esphome/core
-esphome/components/pulse_meter/* @TrentHouliston @cstaahl @stevebaxter
+esphome/components/pulse_meter/* @cstaahl @stevebaxter
 esphome/components/pvvx_mithermometer/* @pasiz
 esphome/components/qmp6988/* @andrewpc
 esphome/components/qr_code/* @wjtje
-esphome/components/qwiic_pir/* @kahrendt
 esphome/components/radon_eye_ble/* @jeffeb3
 esphome/components/radon_eye_rd200/* @jeffeb3
 esphome/components/rc522/* @glmnet
 esphome/components/rc522_i2c/* @glmnet
 esphome/components/rc522_spi/* @glmnet
-esphome/components/resistance_sampler/* @jesserockz
 esphome/components/restart/* @esphome/core
 esphome/components/rf_bridge/* @jesserockz
 esphome/components/rgbct/* @jesserockz
 esphome/components/rp2040/* @jesserockz
 esphome/components/rp2040_pio_led_strip/* @Papa-DMan
 esphome/components/rp2040_pwm/* @jesserockz
-esphome/components/rtl87xx/* @kuba2k2
 esphome/components/rtttl/* @glmnet
 esphome/components/safe_mode/* @jsuanet @paulmonigatti
 esphome/components/scd4x/* @martgras @sjtrny
@@ -262,12 +243,10 @@ esphome/components/sdm_meter/* @jesserockz @polyfaces
 esphome/components/sdp3x/* @Azimath
 esphome/components/selec_meter/* @sourabhjaiswal
 esphome/components/select/* @esphome/core
-esphome/components/sen0321/* @notjj
 esphome/components/sen21231/* @shreyaskarnik
 esphome/components/sen5x/* @martgras
 esphome/components/sensirion_common/* @martgras
 esphome/components/sensor/* @esphome/core
-esphome/components/sfa30/* @ghsensdev
 esphome/components/sgp40/* @SenexCrenshaw
 esphome/components/sgp4x/* @SenexCrenshaw @martgras
 esphome/components/shelly_dimmer/* @edge90 @rnauber
@@ -285,9 +264,7 @@ esphome/components/sn74hc165/* @jesserockz
 esphome/components/socket/* @esphome/core
 esphome/components/sonoff_d1/* @anatoly-savchenkov
 esphome/components/speaker/* @jesserockz
-esphome/components/spi/* @clydebarrow @esphome/core
+esphome/components/spi/* @esphome/core
-esphome/components/spi_device/* @clydebarrow
-esphome/components/spi_led_strip/* @clydebarrow
 esphome/components/sprinkler/* @kbx81
 esphome/components/sps30/* @martgras
 esphome/components/ssd1322_base/* @kbx81
@@ -313,7 +290,6 @@ esphome/components/tcl112/* @glmnet
 esphome/components/tee501/* @Stock-M
 esphome/components/teleinfo/* @0hax
 esphome/components/template/alarm_control_panel/* @grahambrown11
-esphome/components/text/* @mauritskorse
 esphome/components/thermostat/* @kbx81
 esphome/components/time/* @OttoWinter
 esphome/components/tlc5947/* @rnauber
@@ -337,7 +313,6 @@ esphome/components/tuya/sensor/* @jesserockz
 esphome/components/tuya/switch/* @jesserockz
 esphome/components/tuya/text_sensor/* @dentra
 esphome/components/uart/* @esphome/core
-esphome/components/uart/button/* @ssieb
 esphome/components/ufire_ec/* @pvizeli
 esphome/components/ufire_ise/* @pvizeli
 esphome/components/ultrasonic/* @OttoWinter
@@ -350,15 +325,12 @@ esphome/components/web_server_idf/* @dentra
 esphome/components/whirlpool/* @glmnet
 esphome/components/whynter/* @aeonsablaze
 esphome/components/wiegand/* @ssieb
-esphome/components/wireguard/* @droscy @lhoracek @thomas0bernard
 esphome/components/wl_134/* @hobbypunk90
 esphome/components/x9c/* @EtienneMD
-esphome/components/xgzp68xx/* @gcormier
 esphome/components/xiaomi_lywsd03mmc/* @ahpohl
 esphome/components/xiaomi_mhoc303/* @drug123
 esphome/components/xiaomi_mhoc401/* @vevsvevs
 esphome/components/xiaomi_rtcgq02lm/* @jesserockz
 esphome/components/xl9535/* @mreditor97
 esphome/components/xpt2046/* @nielsnl68 @numo68
-esphome/components/zhlt01/* @cfeenstra1024
 esphome/components/zio_ultrasonic/* @kahrendt

docker/Dockerfile

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

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

@@ -35,23 +35,11 @@ if bashio::config.has_value 'default_compile_process_limit'; then
     export ESPHOME_DEFAULT_COMPILE_PROCESS_LIMIT=$(bashio::config 'default_compile_process_limit')
 else
     if grep -q 'Raspberry Pi 3' /proc/cpuinfo; then
-        export ESPHOME_DEFAULT_COMPILE_PROCESS_LIMIT=1
+        export ESPHOME_DEFAULT_COMPILE_PROCESS_LIMIT=1;
     fi
 fi
 
 mkdir -p "${pio_cache_base}"
 
-mkdir -p /config/esphome
-
-if bashio::fs.directory_exists '/config/esphome/.esphome'; then
-    bashio::log.info "Migrating old .esphome directory..."
-    if bashio::fs.file_exists '/config/esphome/.esphome/esphome.json'; then
-        mv /config/esphome/.esphome/esphome.json /data/esphome.json
-    fi
-    mkdir -p "/data/storage"
-    mv /config/esphome/.esphome/*.json /data/storage/ || true
-    rm -rf /config/esphome/.esphome
-fi
-
 bashio::log.info "Starting ESPHome dashboard..."
 exec esphome dashboard /config/esphome --socket /var/run/esphome.sock --ha-addon

esphome/__main__.py

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

esphome/automation.py

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

esphome/components/adc/__init__.py

@@ -1,11 +1,10 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import pins
-from esphome.const import CONF_ANALOG, CONF_INPUT
+from esphome.const import CONF_INPUT
 
 from esphome.core import CORE
 from esphome.components.esp32 import get_esp32_variant
-from esphome.const import PLATFORM_ESP8266
 from esphome.components.esp32.const import (
     VARIANT_ESP32,
     VARIANT_ESP32C2,
@@ -144,9 +143,7 @@ ESP32_VARIANT_ADC2_PIN_TO_CHANNEL = {
 
 def validate_adc_pin(value):
     if str(value).upper() == "VCC":
-        if CORE.is_rp2040:
+        return cv.only_on_esp8266("VCC")
-            return pins.internal_gpio_input_pin_schema(29)
-        return cv.only_on([PLATFORM_ESP8266])("VCC")
 
     if str(value).upper() == "TEMPERATURE":
         return cv.only_on_rp2040("TEMPERATURE")
@@ -169,6 +166,8 @@ def validate_adc_pin(value):
         return pins.internal_gpio_input_pin_schema(value)
 
     if CORE.is_esp8266:
+        from esphome.components.esp8266.gpio import CONF_ANALOG
+
         value = pins.internal_gpio_pin_number({CONF_ANALOG: True, CONF_INPUT: True})(
             value
         )
@@ -185,9 +184,4 @@ def validate_adc_pin(value):
             raise cv.Invalid("RP2040: Only pins 26, 27, 28 and 29 support ADC")
         return pins.internal_gpio_input_pin_schema(value)
 
-    if CORE.is_libretiny:
-        return pins.gpio_pin_schema(
-            {CONF_ANALOG: True, CONF_INPUT: True}, internal=True
-        )(value)
-
     raise NotImplementedError

esphome/components/adc/adc_sensor.cpp

@@ -1,6 +1,6 @@
 #include "adc_sensor.h"
-#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
 
 #ifdef USE_ESP8266
 #ifdef USE_ADC_SENSOR_VCC
@@ -12,9 +12,6 @@ ADC_MODE(ADC_VCC)
 #endif
 
 #ifdef USE_RP2040
-#ifdef CYW43_USES_VSYS_PIN
-#include "pico/cyw43_arch.h"
-#endif
 #include <hardware/adc.h>
 #endif
 
@@ -95,13 +92,13 @@ extern "C"
 
 void ADCSensor::dump_config() {
   LOG_SENSOR("", "ADC Sensor", this);
-#if defined(USE_ESP8266) || defined(USE_LIBRETINY)
+#ifdef USE_ESP8266
 #ifdef USE_ADC_SENSOR_VCC
   ESP_LOGCONFIG(TAG, "  Pin: VCC");
 #else
   LOG_PIN("  Pin: ", pin_);
 #endif
-#endif  // USE_ESP8266 || USE_LIBRETINY
+#endif  // USE_ESP8266
 
 #ifdef USE_ESP32
   LOG_PIN("  Pin: ", pin_);
@@ -126,19 +123,13 @@ void ADCSensor::dump_config() {
     }
   }
 #endif  // USE_ESP32
-
 #ifdef USE_RP2040
   if (this->is_temperature_) {
     ESP_LOGCONFIG(TAG, "  Pin: Temperature");
   } else {
-#ifdef USE_ADC_SENSOR_VCC
-    ESP_LOGCONFIG(TAG, "  Pin: VCC");
-#else
     LOG_PIN("  Pin: ", pin_);
-#endif  // USE_ADC_SENSOR_VCC
   }
-#endif  // USE_RP2040
+#endif
-
   LOG_UPDATE_INTERVAL(this);
 }
 
@@ -246,54 +237,23 @@ float ADCSensor::sample() {
     adc_set_temp_sensor_enabled(true);
     delay(1);
     adc_select_input(4);
-
-    int32_t raw = adc_read();
-    adc_set_temp_sensor_enabled(false);
-    if (this->output_raw_) {
-      return raw;
-    }
-    return raw * 3.3f / 4096.0f;
   } else {
     uint8_t pin = this->pin_->get_pin();
-#ifdef CYW43_USES_VSYS_PIN
-    if (pin == PICO_VSYS_PIN) {
-      // Measuring VSYS on Raspberry Pico W needs to be wrapped with
-      // `cyw43_thread_enter()`/`cyw43_thread_exit()` as discussed in
-      // https://github.com/raspberrypi/pico-sdk/issues/1222, since Wifi chip and
-      // VSYS ADC both share GPIO29
-      cyw43_thread_enter();
-    }
-#endif  // CYW43_USES_VSYS_PIN
-
     adc_gpio_init(pin);
     adc_select_input(pin - 26);
-
-    int32_t raw = adc_read();
-
-#ifdef CYW43_USES_VSYS_PIN
-    if (pin == PICO_VSYS_PIN) {
-      cyw43_thread_exit();
-    }
-#endif  // CYW43_USES_VSYS_PIN
-
-    if (output_raw_) {
-      return raw;
-    }
-    float coeff = pin == PICO_VSYS_PIN ? 3.0 : 1.0;
-    return raw * 3.3f / 4096.0f * coeff;
   }
+
+  int32_t raw = adc_read();
+  if (this->is_temperature_) {
+    adc_set_temp_sensor_enabled(false);
+  }
+  if (output_raw_) {
+    return raw;
+  }
+  return raw * 3.3f / 4096.0f;
 }
 #endif
 
-#ifdef USE_LIBRETINY
-float ADCSensor::sample() {
-  if (output_raw_) {
-    return analogRead(this->pin_->get_pin());  // NOLINT
-  }
-  return analogReadVoltage(this->pin_->get_pin()) / 1000.0f;  // NOLINT
-}
-#endif  // USE_LIBRETINY
-
 #ifdef USE_ESP8266
 std::string ADCSensor::unique_id() { return get_mac_address() + "-adc"; }
 #endif

esphome/components/adc/adc_sensor.h

@@ -62,12 +62,8 @@ class ADCSensor : public sensor::Sensor, public PollingComponent, public voltage
   adc1_channel_t channel1_{ADC1_CHANNEL_MAX};
   adc2_channel_t channel2_{ADC2_CHANNEL_MAX};
   bool autorange_{false};
-#if ESP_IDF_VERSION_MAJOR >= 5
-  esp_adc_cal_characteristics_t cal_characteristics_[SOC_ADC_ATTEN_NUM] = {};
-#else
   esp_adc_cal_characteristics_t cal_characteristics_[ADC_ATTEN_MAX] = {};
 #endif
-#endif
 };
 
 }  // namespace adc

esphome/components/ade7953/__init__.py

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

esphome/components/ade7953/ade7953.cpp

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

esphome/components/ade7953/ade7953.h

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

esphome/components/ade7953/sensor.py

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

esphome/components/ade7953_base/__init__.py

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

esphome/components/ade7953_base/ade7953_base.cpp

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

esphome/components/ade7953_base/ade7953_base.h

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

esphome/components/ade7953_i2c/__init__.py

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

esphome/components/ade7953_i2c/ade7953_i2c.cpp

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

esphome/components/ade7953_i2c/ade7953_i2c.h

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

esphome/components/ade7953_i2c/sensor.py

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

esphome/components/ade7953_spi/__init__.py

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

esphome/components/ade7953_spi/ade7953_spi.cpp

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

esphome/components/ade7953_spi/ade7953_spi.h

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

esphome/components/ade7953_spi/sensor.py

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

esphome/components/aht10/aht10.cpp

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

esphome/components/animation/__init__.py

@@ -151,7 +151,7 @@ async def to_code(config):
         pos = 0
         for frameIndex in range(frames):
             image.seek(frameIndex)
-            frame = image.convert("LA", dither=Image.Dither.NONE)
+            frame = image.convert("LA", dither=Image.NONE)
             if CONF_RESIZE in config:
                 frame = frame.resize([width, height])
             pixels = list(frame.getdata())
@@ -259,7 +259,7 @@ async def to_code(config):
             if transparent:
                 alpha = image.split()[-1]
                 has_alpha = alpha.getextrema()[0] < 0xFF
-            frame = image.convert("1", dither=Image.Dither.NONE)
+            frame = image.convert("1", dither=Image.NONE)
             if CONF_RESIZE in config:
                 frame = frame.resize([width, height])
                 if transparent:

esphome/components/api/__init__.py

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

esphome/components/api/api.proto

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

esphome/components/api/api_connection.cpp

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

esphome/components/api/api_connection.h

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

esphome/components/api/api_pb2.h

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

esphome/components/api/api_pb2_service.cpp

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

esphome/components/api/api_pb2_service.h

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

esphome/components/api/api_server.cpp

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

esphome/components/api/api_server.h

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

esphome/components/api/list_entities.cpp

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

esphome/components/api/list_entities.h

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

esphome/components/api/subscribe_state.cpp

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

esphome/components/api/subscribe_state.h

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

esphome/components/api/user_services.cpp

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

esphome/components/as3935/__init__.py

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

esphome/components/as3935/as3935.cpp

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

esphome/components/as3935/as3935.h

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

esphome/components/async_tcp/__init__.py

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

esphome/components/atm90e32/atm90e32.cpp

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

esphome/components/atm90e32/sensor.py

@@ -6,9 +6,6 @@ from esphome.const import (
     CONF_REACTIVE_POWER,
     CONF_VOLTAGE,
     CONF_CURRENT,
-    CONF_PHASE_A,
-    CONF_PHASE_B,
-    CONF_PHASE_C,
     CONF_POWER,
     CONF_POWER_FACTOR,
     CONF_FREQUENCY,
@@ -34,6 +31,10 @@ from esphome.const import (
     UNIT_WATT_HOURS,
 )
 
+CONF_PHASE_A = "phase_a"
+CONF_PHASE_B = "phase_b"
+CONF_PHASE_C = "phase_c"
+
 CONF_LINE_FREQUENCY = "line_frequency"
 CONF_CHIP_TEMPERATURE = "chip_temperature"
 CONF_GAIN_PGA = "gain_pga"

esphome/components/binary_sensor/automation.cpp

@@ -22,7 +22,7 @@ void binary_sensor::MultiClickTrigger::on_state_(bool state) {
     // Start matching
     MultiClickTriggerEvent evt = this->timing_[0];
     if (evt.state == state) {
-      ESP_LOGV(TAG, "START min=%" PRIu32 " max=%" PRIu32, evt.min_length, evt.max_length);
+      ESP_LOGV(TAG, "START min=%u max=%u", evt.min_length, evt.max_length);
       ESP_LOGV(TAG, "Multi Click: Starting multi click action!");
       this->at_index_ = 1;
       if (this->timing_.size() == 1 && evt.max_length == 4294967294UL) {
@@ -51,15 +51,15 @@ void binary_sensor::MultiClickTrigger::on_state_(bool state) {
   MultiClickTriggerEvent evt = this->timing_[*this->at_index_];
 
   if (evt.max_length != 4294967294UL) {
-    ESP_LOGV(TAG, "A i=%u min=%" PRIu32 " max=%" PRIu32, *this->at_index_, evt.min_length, evt.max_length);  // NOLINT
+    ESP_LOGV(TAG, "A i=%u min=%u max=%u", *this->at_index_, evt.min_length, evt.max_length);  // NOLINT
     this->schedule_is_valid_(evt.min_length);
     this->schedule_is_not_valid_(evt.max_length);
   } else if (*this->at_index_ + 1 != this->timing_.size()) {
-    ESP_LOGV(TAG, "B i=%u min=%" PRIu32, *this->at_index_, evt.min_length);  // NOLINT
+    ESP_LOGV(TAG, "B i=%u min=%u", *this->at_index_, evt.min_length);  // NOLINT
     this->cancel_timeout("is_not_valid");
     this->schedule_is_valid_(evt.min_length);
   } else {
-    ESP_LOGV(TAG, "C i=%u min=%" PRIu32, *this->at_index_, evt.min_length);  // NOLINT
+    ESP_LOGV(TAG, "C i=%u min=%u", *this->at_index_, evt.min_length);  // NOLINT
     this->is_valid_ = false;
     this->cancel_timeout("is_not_valid");
     this->set_timeout("trigger", evt.min_length, [this]() { this->trigger_(); });
@@ -68,8 +68,7 @@ void binary_sensor::MultiClickTrigger::on_state_(bool state) {
   *this->at_index_ = *this->at_index_ + 1;
 }
 void binary_sensor::MultiClickTrigger::schedule_cooldown_() {
-  ESP_LOGV(TAG, "Multi Click: Invalid length of press, starting cooldown of %" PRIu32 " ms...",
+  ESP_LOGV(TAG, "Multi Click: Invalid length of press, starting cooldown of %u ms...", this->invalid_cooldown_);
-           this->invalid_cooldown_);
   this->is_in_cooldown_ = true;
   this->set_timeout("cooldown", this->invalid_cooldown_, [this]() {
     ESP_LOGV(TAG, "Multi Click: Cooldown ended, matching is now enabled again.");

esphome/components/binary_sensor/automation.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <cinttypes>
 #include <utility>
 #include <vector>
 

esphome/components/bk72xx/__init__.py

@@ -1,51 +0,0 @@
-# This file was auto-generated by libretiny/generate_components.py
-# Do not modify its contents.
-# For custom pin validators, put validate_pin() or validate_usage()
-# in gpio.py file in this directory.
-# For changing schema/pin schema, put COMPONENT_SCHEMA or COMPONENT_PIN_SCHEMA
-# in schema.py file in this directory.
-
-from esphome import pins
-from esphome.components import libretiny
-from esphome.components.libretiny.const import (
-    COMPONENT_BK72XX,
-    KEY_COMPONENT_DATA,
-    KEY_LIBRETINY,
-    LibreTinyComponent,
-)
-from esphome.core import CORE
-
-from .boards import BK72XX_BOARDS, BK72XX_BOARD_PINS
-
-CODEOWNERS = ["@kuba2k2"]
-AUTO_LOAD = ["libretiny"]
-
-COMPONENT_DATA = LibreTinyComponent(
-    name=COMPONENT_BK72XX,
-    boards=BK72XX_BOARDS,
-    board_pins=BK72XX_BOARD_PINS,
-    pin_validation=None,
-    usage_validation=None,
-)
-
-
-def _set_core_data(config):
-    CORE.data[KEY_LIBRETINY] = {}
-    CORE.data[KEY_LIBRETINY][KEY_COMPONENT_DATA] = COMPONENT_DATA
-    return config
-
-
-CONFIG_SCHEMA = libretiny.BASE_SCHEMA
-
-PIN_SCHEMA = libretiny.gpio.BASE_PIN_SCHEMA
-
-CONFIG_SCHEMA.prepend_extra(_set_core_data)
-
-
-async def to_code(config):
-    return await libretiny.component_to_code(config)
-
-
-@pins.PIN_SCHEMA_REGISTRY.register("bk72xx", PIN_SCHEMA)
-async def pin_to_code(config):
-    return await libretiny.gpio.component_pin_to_code(config)

esphome/components/bl0939/bl0939.cpp

@@ -1,6 +1,5 @@
 #include "bl0939.h"
 #include "esphome/core/log.h"
-#include <cinttypes>
 
 namespace esphome {
 namespace bl0939 {
@@ -81,7 +80,7 @@ void BL0939::setup() {
 void BL0939::received_package_(const DataPacket *data) const {
   // Bad header
   if (data->frame_header != BL0939_PACKET_HEADER) {
-    ESP_LOGI(TAG, "Invalid data. Header mismatch: %d", data->frame_header);
+    ESP_LOGI("bl0939", "Invalid data. Header mismatch: %d", data->frame_header);
     return;
   }
 
@@ -121,9 +120,8 @@ void BL0939::received_package_(const DataPacket *data) const {
     energy_sensor_sum_->publish_state(total_energy_consumption);
   }
 
-  ESP_LOGV(TAG,
+  ESP_LOGV("bl0939", "BL0939: U %fV, I1 %fA, I2 %fA, P1 %fW, P2 %fW, CntA %d, CntB %d, ∫P1 %fkWh, ∫P2 %fkWh", v_rms,
-           "BL0939: U %fV, I1 %fA, I2 %fA, P1 %fW, P2 %fW, CntA %" PRId32 ", CntB %" PRId32 ", ∫P1 %fkWh, ∫P2 %fkWh",
+           ia_rms, ib_rms, a_watt, b_watt, cfa_cnt, cfb_cnt, a_energy_consumption, b_energy_consumption);
-           v_rms, ia_rms, ib_rms, a_watt, b_watt, cfa_cnt, cfb_cnt, a_energy_consumption, b_energy_consumption);
 }
 
 void BL0939::dump_config() {  // NOLINT(readability-function-cognitive-complexity)

esphome/components/bl0940/bl0940.cpp

@@ -1,6 +1,5 @@
 #include "bl0940.h"
 #include "esphome/core/log.h"
-#include <cinttypes>
 
 namespace esphome {
 namespace bl0940 {
@@ -78,7 +77,7 @@ float BL0940::update_temp_(sensor::Sensor *sensor, ube16_t temperature) const {
   float converted_temp = ((float) 170 / 448) * (tb / 2 - 32) - 45;
   if (sensor != nullptr) {
     if (sensor->has_state() && std::abs(converted_temp - sensor->get_state()) > max_temperature_diff_) {
-      ESP_LOGD(TAG, "Invalid temperature change. Sensor: '%s', Old temperature: %f, New temperature: %f",
+      ESP_LOGD("bl0940", "Invalid temperature change. Sensor: '%s', Old temperature: %f, New temperature: %f",
                sensor->get_name().c_str(), sensor->get_state(), converted_temp);
       return 0.0f;
     }
@@ -90,7 +89,7 @@ float BL0940::update_temp_(sensor::Sensor *sensor, ube16_t temperature) const {
 void BL0940::received_package_(const DataPacket *data) const {
   // Bad header
   if (data->frame_header != BL0940_PACKET_HEADER) {
-    ESP_LOGI(TAG, "Invalid data. Header mismatch: %d", data->frame_header);
+    ESP_LOGI("bl0940", "Invalid data. Header mismatch: %d", data->frame_header);
     return;
   }
 
@@ -116,7 +115,7 @@ void BL0940::received_package_(const DataPacket *data) const {
     energy_sensor_->publish_state(total_energy_consumption);
   }
 
-  ESP_LOGV(TAG, "BL0940: U %fV, I %fA, P %fW, Cnt %" PRId32 ", ∫P %fkWh, T1 %f°C, T2 %f°C", v_rms, i_rms, watt, cf_cnt,
+  ESP_LOGV("bl0940", "BL0940: U %fV, I %fA, P %fW, Cnt %d, ∫P %fkWh, T1 %f°C, T2 %f°C", v_rms, i_rms, watt, cf_cnt,
            total_energy_consumption, tps1, tps2);
 }
 

esphome/components/bl0942/bl0942.cpp

@@ -1,6 +1,5 @@
 #include "bl0942.h"
 #include "esphome/core/log.h"
-#include <cinttypes>
 
 namespace esphome {
 namespace bl0942 {
@@ -105,8 +104,8 @@ void BL0942::received_package_(DataPacket *data) {
     frequency_sensor_->publish_state(frequency);
   }
 
-  ESP_LOGV(TAG, "BL0942: U %fV, I %fA, P %fW, Cnt %" PRId32 ", ∫P %fkWh, frequency %fHz, status 0x%08X", v_rms, i_rms,
+  ESP_LOGV(TAG, "BL0942: U %fV, I %fA, P %fW, Cnt %d, ∫P %fkWh, frequency %f°Hz, status 0x%08X", v_rms, i_rms, watt,
-           watt, cf_cnt, total_energy_consumption, frequency, data->status);
+           cf_cnt, total_energy_consumption, frequency, data->status);
 }
 
 void BL0942::dump_config() {  // NOLINT(readability-function-cognitive-complexity)

esphome/components/ble_client/sensor/ble_rssi_sensor.cpp

@@ -1,8 +1,8 @@
 #include "ble_rssi_sensor.h"
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+#include "esphome/core/log.h"
 #include "esphome/core/application.h"
 #include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
 
 #ifdef USE_ESP32
 
@@ -37,10 +37,6 @@ void BLEClientRSSISensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
     }
     case ESP_GATTC_SEARCH_CMPL_EVT:
       this->node_state = espbt::ClientState::ESTABLISHED;
-      if (this->should_update_) {
-        this->should_update_ = false;
-        this->get_rssi_();
-      }
       break;
     default:
       break;
@@ -54,7 +50,6 @@ void BLEClientRSSISensor::gap_event_handler(esp_gap_ble_cb_event_t event, esp_bl
       if (param->read_rssi_cmpl.status == ESP_BT_STATUS_SUCCESS) {
         int8_t rssi = param->read_rssi_cmpl.rssi;
         ESP_LOGI(TAG, "ESP_GAP_BLE_READ_RSSI_COMPLETE_EVT RSSI: %d", rssi);
-        this->status_clear_warning();
         this->publish_state(rssi);
       }
       break;
@@ -66,12 +61,9 @@ void BLEClientRSSISensor::gap_event_handler(esp_gap_ble_cb_event_t event, esp_bl
 void BLEClientRSSISensor::update() {
   if (this->node_state != espbt::ClientState::ESTABLISHED) {
     ESP_LOGW(TAG, "[%s] Cannot poll, not connected", this->get_name().c_str());
-    this->should_update_ = true;
     return;
   }
-  this->get_rssi_();
+
-}
-void BLEClientRSSISensor::get_rssi_() {
   ESP_LOGV(TAG, "requesting rssi from %s", this->parent()->address_str().c_str());
   auto status = esp_ble_gap_read_rssi(this->parent()->get_remote_bda());
   if (status != ESP_OK) {

esphome/components/ble_client/sensor/ble_rssi_sensor.h

@@ -1,9 +1,9 @@
 #pragma once
 
+#include "esphome/core/component.h"
 #include "esphome/components/ble_client/ble_client.h"
 #include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
 #include "esphome/components/sensor/sensor.h"
-#include "esphome/core/component.h"
 
 #ifdef USE_ESP32
 #include <esp_gattc_api.h>
@@ -24,10 +24,6 @@ class BLEClientRSSISensor : public sensor::Sensor, public PollingComponent, publ
 
   void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                            esp_ble_gattc_cb_param_t *param) override;
-
- protected:
-  void get_rssi_();
-  bool should_update_{false};
 };
 
 }  // namespace ble_client

esphome/components/bmi160/__init__.py

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

esphome/components/bmi160/bmi160.cpp

@@ -1,270 +0,0 @@
-#include "bmi160.h"
-#include "esphome/core/hal.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace bmi160 {
-
-static const char *const TAG = "bmi160";
-
-const uint8_t BMI160_REGISTER_CHIPID = 0x00;
-
-const uint8_t BMI160_REGISTER_CMD = 0x7E;
-enum class Cmd : uint8_t {
-  START_FOC = 0x03,
-  ACCL_SET_PMU_MODE = 0b00010000,  // last 2 bits are mode
-  GYRO_SET_PMU_MODE = 0b00010100,  // last 2 bits are mode
-  MAG_SET_PMU_MODE = 0b00011000,   // last 2 bits are mode
-  PROG_NVM = 0xA0,
-  FIFO_FLUSH = 0xB0,
-  INT_RESET = 0xB1,
-  SOFT_RESET = 0xB6,
-  STEP_CNT_CLR = 0xB2,
-};
-enum class GyroPmuMode : uint8_t {
-  SUSPEND = 0b00,
-  NORMAL = 0b01,
-  LOW_POWER = 0b10,
-};
-enum class AcclPmuMode : uint8_t {
-  SUSPEND = 0b00,
-  NORMAL = 0b01,
-  FAST_STARTUP = 0b11,
-};
-enum class MagPmuMode : uint8_t {
-  SUSPEND = 0b00,
-  NORMAL = 0b01,
-  LOW_POWER = 0b10,
-};
-
-const uint8_t BMI160_REGISTER_ACCEL_CONFIG = 0x40;
-enum class AcclFilterMode : uint8_t {
-  POWER_SAVING = 0b00000000,
-  PERF = 0b10000000,
-};
-enum class AcclBandwidth : uint8_t {
-  OSR4_AVG1 = 0b00000000,
-  OSR2_AVG2 = 0b00010000,
-  NORMAL_AVG4 = 0b00100000,
-  RES_AVG8 = 0b00110000,
-  RES_AVG16 = 0b01000000,
-  RES_AVG32 = 0b01010000,
-  RES_AVG64 = 0b01100000,
-  RES_AVG128 = 0b01110000,
-};
-enum class AccelOutputDataRate : uint8_t {
-  HZ_25_32 = 0b0001,  // 25/32 Hz
-  HZ_25_16 = 0b0010,  // 25/16 Hz
-  HZ_25_8 = 0b0011,   // 25/8 Hz
-  HZ_25_4 = 0b0100,   // 25/4 Hz
-  HZ_25_2 = 0b0101,   // 25/2 Hz
-  HZ_25 = 0b0110,     // 25 Hz
-  HZ_50 = 0b0111,     // 50 Hz
-  HZ_100 = 0b1000,    // 100 Hz
-  HZ_200 = 0b1001,    // 200 Hz
-  HZ_400 = 0b1010,    // 400 Hz
-  HZ_800 = 0b1011,    // 800 Hz
-  HZ_1600 = 0b1100,   // 1600 Hz
-};
-const uint8_t BMI160_REGISTER_ACCEL_RANGE = 0x41;
-enum class AccelRange : uint8_t {
-  RANGE_2G = 0b0011,
-  RANGE_4G = 0b0101,
-  RANGE_8G = 0b1000,
-  RANGE_16G = 0b1100,
-};
-
-const uint8_t BMI160_REGISTER_GYRO_CONFIG = 0x42;
-enum class GyroBandwidth : uint8_t {
-  OSR4 = 0x00,
-  OSR2 = 0x10,
-  NORMAL = 0x20,
-};
-enum class GyroOuputDataRate : uint8_t {
-  HZ_25 = 0x06,
-  HZ_50 = 0x07,
-  HZ_100 = 0x08,
-  HZ_200 = 0x09,
-  HZ_400 = 0x0A,
-  HZ_800 = 0x0B,
-  HZ_1600 = 0x0C,
-  HZ_3200 = 0x0D,
-};
-const uint8_t BMI160_REGISTER_GYRO_RANGE = 0x43;
-enum class GyroRange : uint8_t {
-  RANGE_2000_DPS = 0x0,  // ±2000 °/s
-  RANGE_1000_DPS = 0x1,
-  RANGE_500_DPS = 0x2,
-  RANGE_250_DPS = 0x3,
-  RANGE_125_DPS = 0x4,
-};
-
-const uint8_t BMI160_REGISTER_DATA_GYRO_X_LSB = 0x0C;
-const uint8_t BMI160_REGISTER_DATA_GYRO_X_MSB = 0x0D;
-const uint8_t BMI160_REGISTER_DATA_GYRO_Y_LSB = 0x0E;
-const uint8_t BMI160_REGISTER_DATA_GYRO_Y_MSB = 0x0F;
-const uint8_t BMI160_REGISTER_DATA_GYRO_Z_LSB = 0x10;
-const uint8_t BMI160_REGISTER_DATA_GYRO_Z_MSB = 0x11;
-const uint8_t BMI160_REGISTER_DATA_ACCEL_X_LSB = 0x12;
-const uint8_t BMI160_REGISTER_DATA_ACCEL_X_MSB = 0x13;
-const uint8_t BMI160_REGISTER_DATA_ACCEL_Y_LSB = 0x14;
-const uint8_t BMI160_REGISTER_DATA_ACCEL_Y_MSB = 0x15;
-const uint8_t BMI160_REGISTER_DATA_ACCEL_Z_LSB = 0x16;
-const uint8_t BMI160_REGISTER_DATA_ACCEL_Z_MSB = 0x17;
-const uint8_t BMI160_REGISTER_DATA_TEMP_LSB = 0x20;
-const uint8_t BMI160_REGISTER_DATA_TEMP_MSB = 0x21;
-
-const float GRAVITY_EARTH = 9.80665f;
-
-void BMI160Component::internal_setup_(int stage) {
-  switch (stage) {
-    case 0:
-      ESP_LOGCONFIG(TAG, "Setting up BMI160...");
-      uint8_t chipid;
-      if (!this->read_byte(BMI160_REGISTER_CHIPID, &chipid) || (chipid != 0b11010001)) {
-        this->mark_failed();
-        return;
-      }
-
-      ESP_LOGV(TAG, "  Bringing accelerometer out of sleep...");
-      if (!this->write_byte(BMI160_REGISTER_CMD, (uint8_t) Cmd::ACCL_SET_PMU_MODE | (uint8_t) AcclPmuMode::NORMAL)) {
-        this->mark_failed();
-        return;
-      }
-      ESP_LOGV(TAG, "  Waiting for accelerometer to wake up...");
-      // need to wait (max delay in datasheet) because we can't send commands while another is in progress
-      // min 5ms, 10ms
-      this->set_timeout(10, [this]() { this->internal_setup_(1); });
-      break;
-
-    case 1:
-      ESP_LOGV(TAG, "  Bringing gyroscope out of sleep...");
-      if (!this->write_byte(BMI160_REGISTER_CMD, (uint8_t) Cmd::GYRO_SET_PMU_MODE | (uint8_t) GyroPmuMode::NORMAL)) {
-        this->mark_failed();
-        return;
-      }
-      ESP_LOGV(TAG, "  Waiting for gyroscope to wake up...");
-      // wait between 51 & 81ms, doing 100 to be safe
-      this->set_timeout(10, [this]() { this->internal_setup_(2); });
-      break;
-
-    case 2:
-      ESP_LOGV(TAG, "  Setting up Gyro Config...");
-      uint8_t gyro_config = (uint8_t) GyroBandwidth::OSR4 | (uint8_t) GyroOuputDataRate::HZ_25;
-      ESP_LOGV(TAG, "  Output gyro_config: 0b" BYTE_TO_BINARY_PATTERN, BYTE_TO_BINARY(gyro_config));
-      if (!this->write_byte(BMI160_REGISTER_GYRO_CONFIG, gyro_config)) {
-        this->mark_failed();
-        return;
-      }
-      ESP_LOGV(TAG, "  Setting up Gyro Range...");
-      uint8_t gyro_range = (uint8_t) GyroRange::RANGE_2000_DPS;
-      ESP_LOGV(TAG, "  Output gyro_range: 0b" BYTE_TO_BINARY_PATTERN, BYTE_TO_BINARY(gyro_range));
-      if (!this->write_byte(BMI160_REGISTER_GYRO_RANGE, gyro_range)) {
-        this->mark_failed();
-        return;
-      }
-
-      ESP_LOGV(TAG, "  Setting up Accel Config...");
-      uint8_t accel_config =
-          (uint8_t) AcclFilterMode::PERF | (uint8_t) AcclBandwidth::RES_AVG16 | (uint8_t) AccelOutputDataRate::HZ_25;
-      ESP_LOGV(TAG, "  Output accel_config: 0b" BYTE_TO_BINARY_PATTERN, BYTE_TO_BINARY(accel_config));
-      if (!this->write_byte(BMI160_REGISTER_ACCEL_CONFIG, accel_config)) {
-        this->mark_failed();
-        return;
-      }
-      ESP_LOGV(TAG, "  Setting up Accel Range...");
-      uint8_t accel_range = (uint8_t) AccelRange::RANGE_16G;
-      ESP_LOGV(TAG, "  Output accel_range: 0b" BYTE_TO_BINARY_PATTERN, BYTE_TO_BINARY(accel_range));
-      if (!this->write_byte(BMI160_REGISTER_ACCEL_RANGE, accel_range)) {
-        this->mark_failed();
-        return;
-      }
-
-      this->setup_complete_ = true;
-  }
-}
-
-void BMI160Component::setup() { this->internal_setup_(0); }
-void BMI160Component::dump_config() {
-  ESP_LOGCONFIG(TAG, "BMI160:");
-  LOG_I2C_DEVICE(this);
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with BMI160 failed!");
-  }
-  LOG_UPDATE_INTERVAL(this);
-  LOG_SENSOR("  ", "Acceleration X", this->accel_x_sensor_);
-  LOG_SENSOR("  ", "Acceleration Y", this->accel_y_sensor_);
-  LOG_SENSOR("  ", "Acceleration Z", this->accel_z_sensor_);
-  LOG_SENSOR("  ", "Gyro X", this->gyro_x_sensor_);
-  LOG_SENSOR("  ", "Gyro Y", this->gyro_y_sensor_);
-  LOG_SENSOR("  ", "Gyro Z", this->gyro_z_sensor_);
-  LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
-}
-
-i2c::ErrorCode BMI160Component::read_le_int16_(uint8_t reg, int16_t *value, uint8_t len) {
-  uint8_t raw_data[len * 2];
-  // read using read_register because we have little-endian data, and read_bytes_16 will swap it
-  i2c::ErrorCode err = this->read_register(reg, raw_data, len * 2, true);
-  if (err != i2c::ERROR_OK) {
-    return err;
-  }
-  for (int i = 0; i < len; i++) {
-    value[i] = (int16_t) ((uint16_t) raw_data[i * 2] | ((uint16_t) raw_data[i * 2 + 1] << 8));
-  }
-  return err;
-}
-
-void BMI160Component::update() {
-  if (!this->setup_complete_) {
-    return;
-  }
-
-  ESP_LOGV(TAG, "    Updating BMI160...");
-  int16_t data[6];
-  if (this->read_le_int16_(BMI160_REGISTER_DATA_GYRO_X_LSB, data, 6) != i2c::ERROR_OK) {
-    this->status_set_warning();
-    return;
-  }
-
-  float gyro_x = (float) data[0] / (float) INT16_MAX * 2000.f;
-  float gyro_y = (float) data[1] / (float) INT16_MAX * 2000.f;
-  float gyro_z = (float) data[2] / (float) INT16_MAX * 2000.f;
-  float accel_x = (float) data[3] / (float) INT16_MAX * 16 * GRAVITY_EARTH;
-  float accel_y = (float) data[4] / (float) INT16_MAX * 16 * GRAVITY_EARTH;
-  float accel_z = (float) data[5] / (float) INT16_MAX * 16 * GRAVITY_EARTH;
-
-  int16_t raw_temperature;
-  if (this->read_le_int16_(BMI160_REGISTER_DATA_TEMP_LSB, &raw_temperature, 1) != i2c::ERROR_OK) {
-    this->status_set_warning();
-    return;
-  }
-  float temperature = (float) raw_temperature / (float) INT16_MAX * 64.5f + 23.f;
-
-  ESP_LOGD(TAG,
-           "Got accel={x=%.3f m/s², y=%.3f m/s², z=%.3f m/s²}, "
-           "gyro={x=%.3f °/s, y=%.3f °/s, z=%.3f °/s}, temp=%.3f°C",
-           accel_x, accel_y, accel_z, gyro_x, gyro_y, gyro_z, temperature);
-
-  if (this->accel_x_sensor_ != nullptr)
-    this->accel_x_sensor_->publish_state(accel_x);
-  if (this->accel_y_sensor_ != nullptr)
-    this->accel_y_sensor_->publish_state(accel_y);
-  if (this->accel_z_sensor_ != nullptr)
-    this->accel_z_sensor_->publish_state(accel_z);
-
-  if (this->temperature_sensor_ != nullptr)
-    this->temperature_sensor_->publish_state(temperature);
-
-  if (this->gyro_x_sensor_ != nullptr)
-    this->gyro_x_sensor_->publish_state(gyro_x);
-  if (this->gyro_y_sensor_ != nullptr)
-    this->gyro_y_sensor_->publish_state(gyro_y);
-  if (this->gyro_z_sensor_ != nullptr)
-    this->gyro_z_sensor_->publish_state(gyro_z);
-
-  this->status_clear_warning();
-}
-float BMI160Component::get_setup_priority() const { return setup_priority::DATA; }
-
-}  // namespace bmi160
-}  // namespace esphome

esphome/components/bmi160/bmi160.h

@@ -1,44 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/i2c/i2c.h"
-
-namespace esphome {
-namespace bmi160 {
-
-class BMI160Component : public PollingComponent, public i2c::I2CDevice {
- public:
-  void setup() override;
-  void dump_config() override;
-
-  void update() override;
-
-  float get_setup_priority() const override;
-
-  void set_accel_x_sensor(sensor::Sensor *accel_x_sensor) { accel_x_sensor_ = accel_x_sensor; }
-  void set_accel_y_sensor(sensor::Sensor *accel_y_sensor) { accel_y_sensor_ = accel_y_sensor; }
-  void set_accel_z_sensor(sensor::Sensor *accel_z_sensor) { accel_z_sensor_ = accel_z_sensor; }
-  void set_temperature_sensor(sensor::Sensor *temperature_sensor) { temperature_sensor_ = temperature_sensor; }
-  void set_gyro_x_sensor(sensor::Sensor *gyro_x_sensor) { gyro_x_sensor_ = gyro_x_sensor; }
-  void set_gyro_y_sensor(sensor::Sensor *gyro_y_sensor) { gyro_y_sensor_ = gyro_y_sensor; }
-  void set_gyro_z_sensor(sensor::Sensor *gyro_z_sensor) { gyro_z_sensor_ = gyro_z_sensor; }
-
- protected:
-  sensor::Sensor *accel_x_sensor_{nullptr};
-  sensor::Sensor *accel_y_sensor_{nullptr};
-  sensor::Sensor *accel_z_sensor_{nullptr};
-  sensor::Sensor *temperature_sensor_{nullptr};
-  sensor::Sensor *gyro_x_sensor_{nullptr};
-  sensor::Sensor *gyro_y_sensor_{nullptr};
-  sensor::Sensor *gyro_z_sensor_{nullptr};
-
-  void internal_setup_(int stage);
-  bool setup_complete_{false};
-
-  /** reads `len` 16-bit little-endian integers from the given i2c register */
-  i2c::ErrorCode read_le_int16_(uint8_t reg, int16_t *value, uint8_t len);
-};
-
-}  // namespace bmi160
-}  // namespace esphome

esphome/components/bmi160/sensor.py

@@ -1,102 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import i2c, sensor
-from esphome.const import (
-    CONF_ID,
-    CONF_TEMPERATURE,
-    CONF_ACCELERATION_X,
-    CONF_ACCELERATION_Y,
-    CONF_ACCELERATION_Z,
-    CONF_GYROSCOPE_X,
-    CONF_GYROSCOPE_Y,
-    CONF_GYROSCOPE_Z,
-    DEVICE_CLASS_TEMPERATURE,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_METER_PER_SECOND_SQUARED,
-    ICON_ACCELERATION_X,
-    ICON_ACCELERATION_Y,
-    ICON_ACCELERATION_Z,
-    ICON_GYROSCOPE_X,
-    ICON_GYROSCOPE_Y,
-    ICON_GYROSCOPE_Z,
-    UNIT_DEGREE_PER_SECOND,
-    UNIT_CELSIUS,
-)
-
-DEPENDENCIES = ["i2c"]
-
-bmi160_ns = cg.esphome_ns.namespace("bmi160")
-BMI160Component = bmi160_ns.class_(
-    "BMI160Component", cg.PollingComponent, i2c.I2CDevice
-)
-
-accel_schema = {
-    "unit_of_measurement": UNIT_METER_PER_SECOND_SQUARED,
-    "accuracy_decimals": 2,
-    "state_class": STATE_CLASS_MEASUREMENT,
-}
-gyro_schema = {
-    "unit_of_measurement": UNIT_DEGREE_PER_SECOND,
-    "accuracy_decimals": 2,
-    "state_class": STATE_CLASS_MEASUREMENT,
-}
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(BMI160Component),
-            cv.Optional(CONF_ACCELERATION_X): sensor.sensor_schema(
-                icon=ICON_ACCELERATION_X,
-                **accel_schema,
-            ),
-            cv.Optional(CONF_ACCELERATION_Y): sensor.sensor_schema(
-                icon=ICON_ACCELERATION_Y,
-                **accel_schema,
-            ),
-            cv.Optional(CONF_ACCELERATION_Z): sensor.sensor_schema(
-                icon=ICON_ACCELERATION_Z,
-                **accel_schema,
-            ),
-            cv.Optional(CONF_GYROSCOPE_X): sensor.sensor_schema(
-                icon=ICON_GYROSCOPE_X,
-                **gyro_schema,
-            ),
-            cv.Optional(CONF_GYROSCOPE_Y): sensor.sensor_schema(
-                icon=ICON_GYROSCOPE_Y,
-                **gyro_schema,
-            ),
-            cv.Optional(CONF_GYROSCOPE_Z): sensor.sensor_schema(
-                icon=ICON_GYROSCOPE_Z,
-                **gyro_schema,
-            ),
-            cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_CELSIUS,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_TEMPERATURE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(i2c.i2c_device_schema(0x68))
-)
-
-
-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)
-
-    for d in ["x", "y", "z"]:
-        accel_key = f"acceleration_{d}"
-        if accel_key in config:
-            sens = await sensor.new_sensor(config[accel_key])
-            cg.add(getattr(var, f"set_accel_{d}_sensor")(sens))
-        accel_key = f"gyroscope_{d}"
-        if accel_key in config:
-            sens = await sensor.new_sensor(config[accel_key])
-            cg.add(getattr(var, f"set_gyro_{d}_sensor")(sens))
-
-    if CONF_TEMPERATURE in config:
-        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
-        cg.add(var.set_temperature_sensor(sens))

esphome/components/bmp3xx/bmp3xx.cpp

@@ -8,7 +8,6 @@
 #include "bmp3xx.h"
 #include "esphome/core/log.h"
 #include "esphome/core/hal.h"
-#include <cinttypes>
 
 namespace esphome {
 namespace bmp3xx {
@@ -199,9 +198,8 @@ void BMP3XXComponent::update() {
     return;
   }
 
-  const uint32_t meas_timeout = uint32_t(ceilf(meas_time));
+  ESP_LOGVV(TAG, "measurement time %d", uint32_t(ceilf(meas_time)));
-  ESP_LOGVV(TAG, "measurement time %" PRIu32, meas_timeout);
+  this->set_timeout("data", uint32_t(ceilf(meas_time)), [this]() {
-  this->set_timeout("data", meas_timeout, [this]() {
     float temperature = 0.0f;
     float pressure = 0.0f;
     if (this->pressure_sensor_ != nullptr) {

esphome/components/bp1658cj/bp1658cj.cpp

@@ -12,8 +12,6 @@ static const uint8_t BP1658CJ_ADDR_START_3CH = 0x10;
 static const uint8_t BP1658CJ_ADDR_START_2CH = 0x20;
 static const uint8_t BP1658CJ_ADDR_START_5CH = 0x30;
 
-static const uint8_t BP1658CJ_DELAY = 2;
-
 void BP1658CJ::setup() {
   ESP_LOGCONFIG(TAG, "Setting up BP1658CJ Output Component...");
   this->data_pin_->setup();
@@ -37,14 +35,10 @@ void BP1658CJ::loop() {
   uint8_t data[12];
   if (this->pwm_amounts_[0] == 0 && this->pwm_amounts_[1] == 0 && this->pwm_amounts_[2] == 0 &&
       this->pwm_amounts_[3] == 0 && this->pwm_amounts_[4] == 0) {
+    // Off / Sleep
+    data[0] = BP1658CJ_MODEL_ID + BP1658CJ_ADDR_STANDBY;
     for (int i = 1; i < 12; i++)
       data[i] = 0;
-
-    // First turn all channels off
-    data[0] = BP1658CJ_MODEL_ID + BP1658CJ_ADDR_START_5CH;
-    this->write_buffer_(data, 12);
-    // Then sleep
-    data[0] = BP1658CJ_MODEL_ID + BP1658CJ_ADDR_STANDBY;
     this->write_buffer_(data, 12);
   } else if (this->pwm_amounts_[0] == 0 && this->pwm_amounts_[1] == 0 && this->pwm_amounts_[2] == 0 &&
              (this->pwm_amounts_[3] > 0 || this->pwm_amounts_[4] > 0)) {
@@ -87,41 +81,27 @@ void BP1658CJ::set_channel_value_(uint8_t channel, uint16_t value) {
   }
   this->pwm_amounts_[channel] = value;
 }
-
 void BP1658CJ::write_bit_(bool value) {
+  this->clock_pin_->digital_write(false);
   this->data_pin_->digital_write(value);
   this->clock_pin_->digital_write(true);
-
-  delayMicroseconds(BP1658CJ_DELAY);
-
-  this->clock_pin_->digital_write(false);
 }
 
 void BP1658CJ::write_byte_(uint8_t data) {
   for (uint8_t mask = 0x80; mask; mask >>= 1) {
     this->write_bit_(data & mask);
-    delayMicroseconds(BP1658CJ_DELAY);
   }
-
-  // ack bit
-  this->data_pin_->pin_mode(gpio::FLAG_INPUT);
-  this->clock_pin_->digital_write(true);
-
-  delayMicroseconds(BP1658CJ_DELAY);
-
   this->clock_pin_->digital_write(false);
-  this->data_pin_->pin_mode(gpio::FLAG_OUTPUT);
+  this->data_pin_->digital_write(true);
+  this->clock_pin_->digital_write(true);
 }
 
 void BP1658CJ::write_buffer_(uint8_t *buffer, uint8_t size) {
   this->data_pin_->digital_write(false);
-  this->clock_pin_->digital_write(false);
-
   for (uint32_t i = 0; i < size; i++) {
     this->write_byte_(buffer[i]);
-    delayMicroseconds(BP1658CJ_DELAY);
   }
-
+  this->clock_pin_->digital_write(false);
   this->clock_pin_->digital_write(true);
   this->data_pin_->digital_write(true);
 }

esphome/components/bp5758d/bp5758d.cpp

@@ -17,16 +17,12 @@ static const uint8_t BP5758D_ADDR_START_2CH = 0b00100000;
 static const uint8_t BP5758D_ADDR_START_5CH = 0b00110000;
 static const uint8_t BP5758D_ALL_DATA_CHANNEL_ENABLEMENT = 0b00011111;
 
-static const uint8_t BP5758D_DELAY = 2;
-
 void BP5758D::setup() {
   ESP_LOGCONFIG(TAG, "Setting up BP5758D Output Component...");
   this->data_pin_->setup();
   this->data_pin_->digital_write(false);
-  delayMicroseconds(BP5758D_DELAY);
   this->clock_pin_->setup();
   this->clock_pin_->digital_write(false);
-  delayMicroseconds(BP5758D_DELAY);
   this->channel_current_.resize(5, 0);
   this->pwm_amounts_.resize(5, 0);
 }
@@ -43,14 +39,10 @@ void BP5758D::loop() {
   uint8_t data[17];
   if (this->pwm_amounts_[0] == 0 && this->pwm_amounts_[1] == 0 && this->pwm_amounts_[2] == 0 &&
       this->pwm_amounts_[3] == 0 && this->pwm_amounts_[4] == 0) {
-    for (int i = 1; i < 17; i++)
+    // Off / Sleep
-      data[i] = 0;
-
-    // First turn all channels off
-    data[0] = BP5758D_MODEL_ID + BP5758D_ADDR_START_5CH;
-    this->write_buffer_(data, 17);
-    // Then sleep
     data[0] = BP5758D_MODEL_ID + BP5758D_ADDR_STANDBY;
+    for (int i = 1; i < 16; i++)
+      data[i] = 0;
     this->write_buffer_(data, 17);
   } else if (this->pwm_amounts_[0] == 0 && this->pwm_amounts_[1] == 0 && this->pwm_amounts_[2] == 0 &&
              (this->pwm_amounts_[3] > 0 || this->pwm_amounts_[4] > 0)) {
@@ -127,42 +119,28 @@ void BP5758D::set_channel_value_(uint8_t channel, uint16_t value) {
 void BP5758D::set_channel_current_(uint8_t channel, uint8_t current) { this->channel_current_[channel] = current; }
 
 void BP5758D::write_bit_(bool value) {
-  this->data_pin_->digital_write(value);
-  delayMicroseconds(BP5758D_DELAY);
-  this->clock_pin_->digital_write(true);
-  delayMicroseconds(BP5758D_DELAY);
   this->clock_pin_->digital_write(false);
-  delayMicroseconds(BP5758D_DELAY);
+  this->data_pin_->digital_write(value);
+  this->clock_pin_->digital_write(true);
 }
 
 void BP5758D::write_byte_(uint8_t data) {
   for (uint8_t mask = 0x80; mask; mask >>= 1) {
     this->write_bit_(data & mask);
   }
-
-  // ack bit
-  this->data_pin_->pin_mode(gpio::FLAG_INPUT);
-  this->clock_pin_->digital_write(true);
-  delayMicroseconds(BP5758D_DELAY);
   this->clock_pin_->digital_write(false);
-  delayMicroseconds(BP5758D_DELAY);
+  this->data_pin_->digital_write(true);
-  this->data_pin_->pin_mode(gpio::FLAG_OUTPUT);
+  this->clock_pin_->digital_write(true);
 }
 
 void BP5758D::write_buffer_(uint8_t *buffer, uint8_t size) {
   this->data_pin_->digital_write(false);
-  delayMicroseconds(BP5758D_DELAY);
-  this->clock_pin_->digital_write(false);
-  delayMicroseconds(BP5758D_DELAY);
-
   for (uint32_t i = 0; i < size; i++) {
     this->write_byte_(buffer[i]);
   }
-
+  this->clock_pin_->digital_write(false);
   this->clock_pin_->digital_write(true);
-  delayMicroseconds(BP5758D_DELAY);
   this->data_pin_->digital_write(true);
-  delayMicroseconds(BP5758D_DELAY);
 }
 
 }  // namespace bp5758d

esphome/components/canbus/__init__.py

@@ -17,12 +17,11 @@ CONF_ON_FRAME = "on_frame"
 
 
 def validate_id(config):
-    if CONF_CAN_ID in config:
+    can_id = config[CONF_CAN_ID]
-        can_id = config[CONF_CAN_ID]
+    id_ext = config[CONF_USE_EXTENDED_ID]
-        id_ext = config[CONF_USE_EXTENDED_ID]
+    if not id_ext:
-        if not id_ext:
+        if can_id > 0x7FF:
-            if can_id > 0x7FF:
+            raise cv.Invalid("Standard IDs must be 11 Bit (0x000-0x7ff / 0-2047)")
-                raise cv.Invalid("Standard IDs must be 11 Bit (0x000-0x7ff / 0-2047)")
     return config
 
 
@@ -46,13 +45,9 @@ CanbusTrigger = canbus_ns.class_(
 CanSpeed = canbus_ns.enum("CAN_SPEED")
 
 CAN_SPEEDS = {
-    "1KBPS": CanSpeed.CAN_1KBPS,
     "5KBPS": CanSpeed.CAN_5KBPS,
     "10KBPS": CanSpeed.CAN_10KBPS,
-    "12K5BPS": CanSpeed.CAN_12K5BPS,
-    "16KBPS": CanSpeed.CAN_16KBPS,
     "20KBPS": CanSpeed.CAN_20KBPS,
-    "25KBPS": CanSpeed.CAN_25KBPS,
     "31K25BPS": CanSpeed.CAN_31K25BPS,
     "33KBPS": CanSpeed.CAN_33KBPS,
     "40KBPS": CanSpeed.CAN_40KBPS,
@@ -65,9 +60,9 @@ CAN_SPEEDS = {
     "200KBPS": CanSpeed.CAN_200KBPS,
     "250KBPS": CanSpeed.CAN_250KBPS,
     "500KBPS": CanSpeed.CAN_500KBPS,
-    "800KBPS": CanSpeed.CAN_800KBPS,
     "1000KBPS": CanSpeed.CAN_1000KBPS,
 }
+
 CANBUS_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(CanbusComponent),
@@ -152,18 +147,22 @@ async def canbus_action_to_code(config, action_id, template_arg, args):
     if can_id := config.get(CONF_CAN_ID):
         can_id = await cg.templatable(can_id, args, cg.uint32)
         cg.add(var.set_can_id(can_id))
-        cg.add(var.set_use_extended_id(config[CONF_USE_EXTENDED_ID]))
+    use_extended_id = await cg.templatable(
-
+        config[CONF_USE_EXTENDED_ID], args, cg.uint32
-    cg.add(
-        var.set_remote_transmission_request(config[CONF_REMOTE_TRANSMISSION_REQUEST])
     )
+    cg.add(var.set_use_extended_id(use_extended_id))
+
+    remote_transmission_request = await cg.templatable(
+        config[CONF_REMOTE_TRANSMISSION_REQUEST], args, bool
+    )
+    cg.add(var.set_remote_transmission_request(remote_transmission_request))
 
     data = config[CONF_DATA]
+    if isinstance(data, bytes):
+        data = [int(x) for x in data]
     if cg.is_template(data):
         templ = await cg.templatable(data, args, cg.std_vector.template(cg.uint8))
         cg.add(var.set_data_template(templ))
     else:
-        if isinstance(data, bytes):
-            data = [int(x) for x in data]
         cg.add(var.set_data_static(data))
     return var

esphome/components/canbus/canbus.cpp

@@ -16,9 +16,9 @@ void Canbus::setup() {
 
 void Canbus::dump_config() {
   if (this->use_extended_id_) {
-    ESP_LOGCONFIG(TAG, "config extended id=0x%08" PRIx32, this->can_id_);
+    ESP_LOGCONFIG(TAG, "config extended id=0x%08x", this->can_id_);
   } else {
-    ESP_LOGCONFIG(TAG, "config standard id=0x%03" PRIx32, this->can_id_);
+    ESP_LOGCONFIG(TAG, "config standard id=0x%03x", this->can_id_);
   }
 }
 
@@ -28,11 +28,9 @@ void Canbus::send_data(uint32_t can_id, bool use_extended_id, bool remote_transm
 
   uint8_t size = static_cast<uint8_t>(data.size());
   if (use_extended_id) {
-    ESP_LOGD(TAG, "send extended id=0x%08" PRIx32 " rtr=%s size=%d", can_id, TRUEFALSE(remote_transmission_request),
+    ESP_LOGD(TAG, "send extended id=0x%08x rtr=%s size=%d", can_id, TRUEFALSE(remote_transmission_request), size);
-             size);
   } else {
-    ESP_LOGD(TAG, "send standard id=0x%03" PRIx32 " rtr=%s size=%d", can_id, TRUEFALSE(remote_transmission_request),
+    ESP_LOGD(TAG, "send standard id=0x%03x rtr=%s size=%d", can_id, TRUEFALSE(remote_transmission_request), size);
-             size);
   }
   if (size > CAN_MAX_DATA_LENGTH)
     size = CAN_MAX_DATA_LENGTH;
@@ -51,9 +49,9 @@ void Canbus::send_data(uint32_t can_id, bool use_extended_id, bool remote_transm
 
 void Canbus::add_trigger(CanbusTrigger *trigger) {
   if (trigger->use_extended_id_) {
-    ESP_LOGVV(TAG, "add trigger for extended canid=0x%08" PRIx32, trigger->can_id_);
+    ESP_LOGVV(TAG, "add trigger for extended canid=0x%08x", trigger->can_id_);
   } else {
-    ESP_LOGVV(TAG, "add trigger for std canid=0x%03" PRIx32, trigger->can_id_);
+    ESP_LOGVV(TAG, "add trigger for std canid=0x%03x", trigger->can_id_);
   }
   this->triggers_.push_back(trigger);
 };
@@ -65,10 +63,10 @@ void Canbus::loop() {
   while (this->read_message(&can_message) == canbus::ERROR_OK) {
     message_counter++;
     if (can_message.use_extended_id) {
-      ESP_LOGD(TAG, "received can message (#%d) extended can_id=0x%" PRIx32 " size=%d", message_counter,
+      ESP_LOGD(TAG, "received can message (#%d) extended can_id=0x%x size=%d", message_counter, can_message.can_id,
-               can_message.can_id, can_message.can_data_length_code);
+               can_message.can_data_length_code);
     } else {
-      ESP_LOGD(TAG, "received can message (#%d) std can_id=0x%" PRIx32 " size=%d", message_counter, can_message.can_id,
+      ESP_LOGD(TAG, "received can message (#%d) std can_id=0x%x size=%d", message_counter, can_message.can_id,
                can_message.can_data_length_code);
     }
 

esphome/components/canbus/canbus.h

@@ -4,7 +4,6 @@
 #include "esphome/core/component.h"
 #include "esphome/core/optional.h"
 
-#include <cinttypes>
 #include <vector>
 
 namespace esphome {
@@ -20,13 +19,9 @@ enum Error : uint8_t {
 };
 
 enum CanSpeed : uint8_t {
-  CAN_1KBPS,
   CAN_5KBPS,
   CAN_10KBPS,
-  CAN_12K5BPS,
-  CAN_16KBPS,
   CAN_20KBPS,
-  CAN_25KBPS,
   CAN_31K25BPS,
   CAN_33KBPS,
   CAN_40KBPS,
@@ -39,7 +34,6 @@ enum CanSpeed : uint8_t {
   CAN_200KBPS,
   CAN_250KBPS,
   CAN_500KBPS,
-  CAN_800KBPS,
   CAN_1000KBPS
 };
 

esphome/components/captive_portal/__init__.py

@@ -2,13 +2,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import web_server_base
 from esphome.components.web_server_base import CONF_WEB_SERVER_BASE_ID
-from esphome.const import (
+from esphome.const import CONF_ID
-    CONF_ID,
-    PLATFORM_ESP32,
-    PLATFORM_ESP8266,
-    PLATFORM_BK72XX,
-    PLATFORM_RTL87XX,
-)
 from esphome.core import coroutine_with_priority, CORE
 
 AUTO_LOAD = ["web_server_base"]
@@ -27,7 +21,7 @@ CONFIG_SCHEMA = cv.All(
             ),
         }
     ).extend(cv.COMPONENT_SCHEMA),
-    cv.only_on([PLATFORM_ESP32, PLATFORM_ESP8266, PLATFORM_BK72XX, PLATFORM_RTL87XX]),
+    cv.only_on(["esp32", "esp8266"]),
 )
 
 
@@ -45,5 +39,3 @@ async def to_code(config):
             cg.add_library("WiFi", None)
         if CORE.is_esp8266:
             cg.add_library("DNSServer", None)
-        if CORE.is_libretiny:
-            cg.add_library("DNSServer", None)

esphome/components/captive_portal/captive_portal.cpp

@@ -48,7 +48,7 @@ void CaptivePortal::start() {
   this->dns_server_ = make_unique<DNSServer>();
   this->dns_server_->setErrorReplyCode(DNSReplyCode::NoError);
   network::IPAddress ip = wifi::global_wifi_component->wifi_soft_ap_ip();
-  this->dns_server_->start(53, "*", ip);
+  this->dns_server_->start(53, "*", (uint32_t) ip);
 #endif
 
   this->base_->get_server()->onNotFound([this](AsyncWebServerRequest *req) {

esphome/components/cd74hc4067/cd74hc4067.cpp

@@ -1,6 +1,5 @@
 #include "cd74hc4067.h"
 #include "esphome/core/log.h"
-#include <cinttypes>
 
 namespace esphome {
 namespace cd74hc4067 {
@@ -28,7 +27,7 @@ void CD74HC4067Component::dump_config() {
   LOG_PIN("  S1 Pin: ", this->pin_s1_);
   LOG_PIN("  S2 Pin: ", this->pin_s2_);
   LOG_PIN("  S3 Pin: ", this->pin_s3_);
-  ESP_LOGCONFIG(TAG, "switch delay: %" PRIu32, this->switch_delay_);
+  ESP_LOGCONFIG(TAG, "switch delay: %d", this->switch_delay_);
 }
 
 void CD74HC4067Component::activate_pin(uint8_t pin) {

esphome/components/climate/climate.cpp

@@ -213,8 +213,6 @@ ClimateCall &ClimateCall::set_preset(const std::string &preset) {
     this->set_preset(CLIMATE_PRESET_SLEEP);
   } else if (str_equals_case_insensitive(preset, "ACTIVITY")) {
     this->set_preset(CLIMATE_PRESET_ACTIVITY);
-  } else if (str_equals_case_insensitive(preset, "NONE")) {
-    this->set_preset(CLIMATE_PRESET_NONE);
   } else {
     if (this->parent_->get_traits().supports_custom_preset(preset)) {
       this->custom_preset_ = preset;

esphome/components/climate_ir_lg/climate_ir_lg.cpp

@@ -121,7 +121,7 @@ bool LgIrClimate::on_receive(remote_base::RemoteReceiveData data) {
     }
   }
 
-  ESP_LOGD(TAG, "Decoded 0x%02" PRIX32, remote_state);
+  ESP_LOGD(TAG, "Decoded 0x%02X", remote_state);
   if ((remote_state & 0xFF00000) != 0x8800000)
     return false;
 
@@ -173,7 +173,7 @@ bool LgIrClimate::on_receive(remote_base::RemoteReceiveData data) {
 }
 void LgIrClimate::transmit_(uint32_t value) {
   calc_checksum_(value);
-  ESP_LOGD(TAG, "Sending climate_lg_ir code: 0x%02" PRIX32, value);
+  ESP_LOGD(TAG, "Sending climate_lg_ir code: 0x%02X", value);
 
   auto transmit = this->transmitter_->transmit();
   auto *data = transmit.get_data();

esphome/components/climate_ir_lg/climate_ir_lg.h

@@ -2,8 +2,6 @@
 
 #include "esphome/components/climate_ir/climate_ir.h"
 
-#include <cinttypes>
-
 namespace esphome {
 namespace climate_ir_lg {
 

esphome/components/coolix/coolix.cpp

@@ -101,7 +101,7 @@ void CoolixClimate::transmit_state() {
       }
     }
   }
-  ESP_LOGV(TAG, "Sending coolix code: 0x%06" PRIX32, remote_state);
+  ESP_LOGV(TAG, "Sending coolix code: 0x%06X", remote_state);
 
   auto transmit = this->transmitter_->transmit();
   auto *data = transmit.get_data();
@@ -115,7 +115,7 @@ bool CoolixClimate::on_coolix(climate::Climate *parent, remote_base::RemoteRecei
     return false;
   // Decoded remote state y 3 bytes long code.
   uint32_t remote_state = (*decoded).second;
-  ESP_LOGV(TAG, "Decoded 0x%06" PRIX32, remote_state);
+  ESP_LOGV(TAG, "Decoded 0x%06X", remote_state);
   if ((remote_state & 0xFF0000) != 0xB20000)
     return false;
 

esphome/components/coolix/coolix.h

@@ -2,8 +2,6 @@
 
 #include "esphome/components/climate_ir/climate_ir.h"
 
-#include <cinttypes>
-
 namespace esphome {
 namespace coolix {
 

esphome/components/copy/text/__init__.py

@@ -1,36 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import text
-from esphome.const import (
-    CONF_ENTITY_CATEGORY,
-    CONF_ICON,
-    CONF_MODE,
-    CONF_SOURCE_ID,
-)
-from esphome.core.entity_helpers import inherit_property_from
-
-from .. import copy_ns
-
-CopyText = copy_ns.class_("CopyText", text.Text, cg.Component)
-
-
-CONFIG_SCHEMA = text.TEXT_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(CopyText),
-        cv.Required(CONF_SOURCE_ID): cv.use_id(text.Text),
-    }
-).extend(cv.COMPONENT_SCHEMA)
-
-FINAL_VALIDATE_SCHEMA = cv.All(
-    inherit_property_from(CONF_ICON, CONF_SOURCE_ID),
-    inherit_property_from(CONF_ENTITY_CATEGORY, CONF_SOURCE_ID),
-    inherit_property_from(CONF_MODE, CONF_SOURCE_ID),
-)
-
-
-async def to_code(config):
-    var = await text.new_text(config)
-    await cg.register_component(var, config)
-
-    source = await cg.get_variable(config[CONF_SOURCE_ID])
-    cg.add(var.set_source(source))

esphome/components/copy/text/copy_text.cpp

@@ -1,25 +0,0 @@
-#include "copy_text.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace copy {
-
-static const char *const TAG = "copy.text";
-
-void CopyText::setup() {
-  source_->add_on_state_callback([this](const std::string &value) { this->publish_state(value); });
-
-  if (source_->has_state())
-    this->publish_state(source_->state);
-}
-
-void CopyText::dump_config() { LOG_TEXT("", "Copy Text", this); }
-
-void CopyText::control(const std::string &value) {
-  auto call2 = source_->make_call();
-  call2.set_value(value);
-  call2.perform();
-}
-
-}  // namespace copy
-}  // namespace esphome

esphome/components/copy/text/copy_text.h

@@ -1,23 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/text/text.h"
-
-namespace esphome {
-namespace copy {
-
-class CopyText : public text::Text, public Component {
- public:
-  void set_source(text::Text *source) { source_ = source; }
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::DATA; }
-
- protected:
-  void control(const std::string &value) override;
-
-  text::Text *source_;
-};
-
-}  // namespace copy
-}  // namespace esphome

esphome/components/cs5460a/cs5460a.cpp

@@ -86,7 +86,7 @@ void CS5460AComponent::hw_init_() {
   }
 
   uint32_t status = this->read_register_(REG_STATUS);
-  ESP_LOGCONFIG(TAG, "  Version: %" PRIx32, (status >> 6) & 7);
+  ESP_LOGCONFIG(TAG, "  Version: %x", (status >> 6) & 7);
 
   this->write_register_(REG_CYCLE_COUNT, samples_);
   this->write_register_(REG_PULSE_RATE, lroundf(pulse_freq_ * 32.0f));
@@ -323,7 +323,7 @@ void CS5460AComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "  Init status: %s",
                 state == COMPONENT_STATE_LOOP ? "OK" : (state == COMPONENT_STATE_FAILED ? "failed" : "other"));
   LOG_PIN("  CS Pin: ", cs_);
-  ESP_LOGCONFIG(TAG, "  Samples / cycle: %" PRIu32, samples_);
+  ESP_LOGCONFIG(TAG, "  Samples / cycle: %u", samples_);
   ESP_LOGCONFIG(TAG, "  Phase offset: %i", phase_offset_);
   ESP_LOGCONFIG(TAG, "  PGA Gain: %s", pga_gain_ == CS5460A_PGA_GAIN_50X ? "50x" : "10x");
   ESP_LOGCONFIG(TAG, "  Current gain: %.5f", current_gain_);

esphome/components/cs5460a/cs5460a.h

@@ -5,8 +5,6 @@
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/spi/spi.h"
 
-#include <cinttypes>
-
 namespace esphome {
 namespace cs5460a {
 

esphome/components/cse7761/cse7761.cpp

@@ -217,7 +217,7 @@ void CSE7761Component::get_data_() {
     this->voltage_sensor_->publish_state(voltage);
   }
 
-  for (uint8_t channel = 0; channel < 2; channel++) {
+  for (uint32_t channel = 0; channel < 2; channel++) {
     // Active power = PowerPA * PowerPAC * 1000 / 0x80000000
     float active_power = (float) this->data_.active_power[channel] / this->coefficient_by_unit_(POWER_PAC);  // W
     float amps = (float) this->data_.current_rms[channel] / this->coefficient_by_unit_(RMS_IAC);             // A

esphome/components/cse7766/cse7766.cpp

@@ -1,6 +1,5 @@
 #include "cse7766.h"
 #include "esphome/core/log.h"
-#include <cinttypes>
 
 namespace esphome {
 namespace cse7766 {
@@ -163,7 +162,7 @@ void CSE7766Component::update() {
     if (counts != 0) {
       const auto avg = acc / counts;
 
-      ESP_LOGV(TAG, "Got %s_acc=%.2f %s_counts=%" PRIu32 " %s=%.1f", name, acc, name, counts, name, avg);
+      ESP_LOGV(TAG, "Got %s_acc=%.2f %s_counts=%d %s=%.1f", name, acc, name, counts, name, avg);
 
       if (sensor != nullptr) {
         sensor->publish_state(avg);
@@ -179,8 +178,7 @@ void CSE7766Component::update() {
   publish_state("power", this->power_sensor_, this->power_acc_, this->power_counts_);
 
   if (this->energy_total_counts_ != 0) {
-    ESP_LOGV(TAG, "Got energy_total=%.2f energy_total_counts=%" PRIu32, this->energy_total_,
+    ESP_LOGV(TAG, "Got energy_total=%.2f energy_total_counts=%d", this->energy_total_, this->energy_total_counts_);
-             this->energy_total_counts_);
 
     if (this->energy_sensor_ != nullptr) {
       this->energy_sensor_->publish_state(this->energy_total_);

esphome/components/current_based/current_based_cover.cpp

@@ -104,8 +104,7 @@ void CurrentBasedCover::loop() {
       ESP_LOGD(TAG, "'%s' - Close position reached. Took %.1fs.", this->name_.c_str(), dur);
       this->direction_idle_(COVER_CLOSED);
     }
-  }
+  } else if (now - this->start_dir_time_ > this->max_duration_) {
-  if (now - this->start_dir_time_ > this->max_duration_) {
     ESP_LOGD(TAG, "'%s' - Max duration reached. Stopping cover.", this->name_.c_str());
     this->direction_idle_();
   }

esphome/components/dallas/sensor.py

@@ -24,7 +24,7 @@ CONFIG_SCHEMA = cv.All(
     ).extend(
         {
             cv.GenerateID(CONF_DALLAS_ID): cv.use_id(DallasComponent),
-            cv.Optional(CONF_ADDRESS): cv.hex_uint64_t,
+            cv.Optional(CONF_ADDRESS): cv.hex_int,
             cv.Optional(CONF_INDEX): cv.positive_int,
             cv.Optional(CONF_RESOLUTION, default=12): cv.int_range(min=9, max=12),
         }

esphome/components/debug/debug_component.cpp

@@ -17,8 +17,6 @@
 #include <esp32/rom/rtc.h>
 #elif defined(USE_ESP32_VARIANT_ESP32C3)
 #include <esp32c3/rom/rtc.h>
-#elif defined(USE_ESP32_VARIANT_ESP32C6)
-#include <esp32c6/rom/rtc.h>
 #elif defined(USE_ESP32_VARIANT_ESP32S2)
 #include <esp32s2/rom/rtc.h>
 #elif defined(USE_ESP32_VARIANT_ESP32S3)
@@ -30,7 +28,7 @@
 #ifdef USE_ARDUINO
 #ifdef USE_RP2040
 #include <Arduino.h>
-#elif defined(USE_ESP32) || defined(USE_ESP8266)
+#else
 #include <Esp.h>
 #endif
 #endif
@@ -47,8 +45,6 @@ static uint32_t get_free_heap() {
   return heap_caps_get_free_size(MALLOC_CAP_INTERNAL);
 #elif defined(USE_RP2040)
   return rp2040.getFreeHeap();
-#elif defined(USE_LIBRETINY)
-  return lt_heap_get_free();
 #endif
 }
 
@@ -79,7 +75,7 @@ void DebugComponent::dump_config() {
   this->free_heap_ = get_free_heap();
   ESP_LOGD(TAG, "Free Heap Size: %" PRIu32 " bytes", this->free_heap_);
 
-#if defined(USE_ARDUINO) && (defined(USE_ESP32) || defined(USE_ESP8266))
+#if defined(USE_ARDUINO) && !defined(USE_RP2040)
   const char *flash_mode;
   switch (ESP.getFlashChipMode()) {  // NOLINT(readability-static-accessed-through-instance)
     case FM_QIO:
@@ -111,7 +107,7 @@ void DebugComponent::dump_config() {
   device_info += "|Flash: " + to_string(ESP.getFlashChipSize() / 1024) +                    // NOLINT
                  "kB Speed:" + to_string(ESP.getFlashChipSpeed() / 1000000) + "MHz Mode:";  // NOLINT
   device_info += flash_mode;
-#endif  // USE_ARDUINO && (USE_ESP32 || USE_ESP8266)
+#endif  // USE_ARDUINO
 
 #ifdef USE_ESP32
   esp_chip_info_t info;
@@ -121,8 +117,6 @@ void DebugComponent::dump_config() {
   model = "ESP32";
 #elif defined(USE_ESP32_VARIANT_ESP32C3)
   model = "ESP32-C3";
-#elif defined(USE_ESP32_VARIANT_ESP32C6)
-  model = "ESP32-C6";
 #elif defined(USE_ESP32_VARIANT_ESP32S2)
   model = "ESP32-S2";
 #elif defined(USE_ESP32_VARIANT_ESP32S3)
@@ -149,10 +143,6 @@ void DebugComponent::dump_config() {
     features += "BT,";
     info.features &= ~CHIP_FEATURE_BT;
   }
-  if (info.features & CHIP_FEATURE_EMB_PSRAM) {
-    features += "EMB_PSRAM,";
-    info.features &= ~CHIP_FEATURE_EMB_PSRAM;
-  }
   if (info.features)
     features += "Other:" + format_hex(info.features);
   ESP_LOGD(TAG, "Chip: Model=%s, Features=%s Cores=%u, Revision=%u", model, features.c_str(), info.cores,
@@ -206,11 +196,9 @@ void DebugComponent::dump_config() {
     case RTCWDT_SYS_RESET:
       reset_reason = "RTC Watch Dog Reset Digital Core";
       break;
-#if !defined(USE_ESP32_VARIANT_ESP32C6)
     case INTRUSION_RESET:
       reset_reason = "Intrusion Reset CPU";
       break;
-#endif
 #if defined(USE_ESP32_VARIANT_ESP32)
     case TGWDT_CPU_RESET:
       reset_reason = "Timer Group Reset CPU";
@@ -352,27 +340,6 @@ void DebugComponent::dump_config() {
   device_info += "CPU Frequency: " + to_string(rp2040.f_cpu());
 #endif  // USE_RP2040
 
-#ifdef USE_LIBRETINY
-  ESP_LOGD(TAG, "LibreTiny Version: %s", lt_get_version());
-  ESP_LOGD(TAG, "Chip: %s (%04x) @ %u MHz", lt_cpu_get_model_name(), lt_cpu_get_model(), lt_cpu_get_freq_mhz());
-  ESP_LOGD(TAG, "Chip ID: 0x%06X", lt_cpu_get_mac_id());
-  ESP_LOGD(TAG, "Board: %s", lt_get_board_code());
-  ESP_LOGD(TAG, "Flash: %u KiB / RAM: %u KiB", lt_flash_get_size() / 1024, lt_ram_get_size() / 1024);
-  ESP_LOGD(TAG, "Reset Reason: %s", lt_get_reboot_reason_name(lt_get_reboot_reason()));
-
-  device_info += "|Version: ";
-  device_info += LT_BANNER_STR + 10;
-  device_info += "|Reset Reason: ";
-  device_info += lt_get_reboot_reason_name(lt_get_reboot_reason());
-  device_info += "|Chip Name: ";
-  device_info += lt_cpu_get_model_name();
-  device_info += "|Chip ID: 0x" + format_hex(lt_cpu_get_mac_id());
-  device_info += "|Flash: " + to_string(lt_flash_get_size() / 1024) + " KiB";
-  device_info += "|RAM: " + to_string(lt_ram_get_size() / 1024) + " KiB";
-
-  reset_reason = lt_get_reboot_reason_name(lt_get_reboot_reason());
-#endif  // USE_LIBRETINY
-
 #ifdef USE_TEXT_SENSOR
   if (this->device_info_ != nullptr) {
     if (device_info.length() > 255)
@@ -417,8 +384,6 @@ void DebugComponent::update() {
     this->block_sensor_->publish_state(ESP.getMaxFreeBlockSize());
 #elif defined(USE_ESP32)
     this->block_sensor_->publish_state(heap_caps_get_largest_free_block(MALLOC_CAP_INTERNAL));
-#elif defined(USE_LIBRETINY)
-    this->block_sensor_->publish_state(lt_heap_get_max_alloc());
 #endif
   }
 
@@ -433,12 +398,6 @@ void DebugComponent::update() {
     this->loop_time_sensor_->publish_state(this->max_loop_time_);
     this->max_loop_time_ = 0;
   }
-
-#ifdef USE_ESP32
-  if (this->psram_sensor_ != nullptr) {
-    this->psram_sensor_->publish_state(heap_caps_get_free_size(MALLOC_CAP_SPIRAM));
-  }
-#endif  // USE_ESP32
 #endif  // USE_SENSOR
 }
 

esphome/components/debug/debug_component.h

@@ -33,9 +33,6 @@ class DebugComponent : public PollingComponent {
   void set_fragmentation_sensor(sensor::Sensor *fragmentation_sensor) { fragmentation_sensor_ = fragmentation_sensor; }
 #endif
   void set_loop_time_sensor(sensor::Sensor *loop_time_sensor) { loop_time_sensor_ = loop_time_sensor; }
-#ifdef USE_ESP32
-  void set_psram_sensor(sensor::Sensor *psram_sensor) { this->psram_sensor_ = psram_sensor; }
-#endif  // USE_ESP32
 #endif  // USE_SENSOR
  protected:
   uint32_t free_heap_{};
@@ -50,9 +47,6 @@ class DebugComponent : public PollingComponent {
   sensor::Sensor *fragmentation_sensor_{nullptr};
 #endif
   sensor::Sensor *loop_time_sensor_{nullptr};
-#ifdef USE_ESP32
-  sensor::Sensor *psram_sensor_{nullptr};
-#endif  // USE_ESP32
 #endif  // USE_SENSOR
 
 #ifdef USE_TEXT_SENSOR

esphome/components/debug/sensor.py

@@ -17,8 +17,6 @@ from . import CONF_DEBUG_ID, DebugComponent
 
 DEPENDENCIES = ["debug"]
 
-CONF_PSRAM = "psram"
-
 CONFIG_SCHEMA = {
     cv.GenerateID(CONF_DEBUG_ID): cv.use_id(DebugComponent),
     cv.Optional(CONF_FREE): sensor.sensor_schema(
@@ -49,38 +47,24 @@ CONFIG_SCHEMA = {
         accuracy_decimals=0,
         entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
     ),
-    cv.Optional(CONF_PSRAM): cv.All(
-        cv.only_on_esp32,
-        cv.requires_component("psram"),
-        sensor.sensor_schema(
-            unit_of_measurement=UNIT_BYTES,
-            icon=ICON_COUNTER,
-            accuracy_decimals=0,
-            entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
-        ),
-    ),
 }
 
 
 async def to_code(config):
     debug_component = await cg.get_variable(config[CONF_DEBUG_ID])
 
-    if free_conf := config.get(CONF_FREE):
+    if CONF_FREE in config:
-        sens = await sensor.new_sensor(free_conf)
+        sens = await sensor.new_sensor(config[CONF_FREE])
         cg.add(debug_component.set_free_sensor(sens))
 
-    if block_conf := config.get(CONF_BLOCK):
+    if CONF_BLOCK in config:
-        sens = await sensor.new_sensor(block_conf)
+        sens = await sensor.new_sensor(config[CONF_BLOCK])
         cg.add(debug_component.set_block_sensor(sens))
 
-    if fragmentation_conf := config.get(CONF_FRAGMENTATION):
+    if CONF_FRAGMENTATION in config:
-        sens = await sensor.new_sensor(fragmentation_conf)
+        sens = await sensor.new_sensor(config[CONF_FRAGMENTATION])
         cg.add(debug_component.set_fragmentation_sensor(sens))
 
-    if loop_time_conf := config.get(CONF_LOOP_TIME):
+    if CONF_LOOP_TIME in config:
-        sens = await sensor.new_sensor(loop_time_conf)
+        sens = await sensor.new_sensor(config[CONF_LOOP_TIME])
         cg.add(debug_component.set_loop_time_sensor(sens))
-
-    if psram_conf := config.get(CONF_PSRAM):
-        sens = await sensor.new_sensor(psram_conf)
-        cg.add(debug_component.set_psram_sensor(sens))

esphome/components/deep_sleep/__init__.py

@@ -14,8 +14,6 @@ from esphome.const import (
     CONF_SLEEP_DURATION,
     CONF_TIME_ID,
     CONF_WAKEUP_PIN,
-    PLATFORM_ESP32,
-    PLATFORM_ESP8266,
 )
 
 from esphome.components.esp32 import get_esp32_variant
@@ -26,7 +24,6 @@ from esphome.components.esp32.const import (
     VARIANT_ESP32S3,
     VARIANT_ESP32C2,
     VARIANT_ESP32C6,
-    VARIANT_ESP32H2,
 )
 
 WAKEUP_PINS = {
@@ -101,7 +98,6 @@ WAKEUP_PINS = {
     ],
     VARIANT_ESP32C2: [0, 1, 2, 3, 4, 5],
     VARIANT_ESP32C6: [0, 1, 2, 3, 4, 5, 6, 7],
-    VARIANT_ESP32H2: [7, 8, 9, 10, 11, 12, 13, 14],
 }
 
 
@@ -167,39 +163,34 @@ WAKEUP_CAUSES_SCHEMA = cv.Schema(
     }
 )
 
-CONFIG_SCHEMA = cv.All(
+CONFIG_SCHEMA = cv.Schema(
-    cv.Schema(
+    {
-        {
+        cv.GenerateID(): cv.declare_id(DeepSleepComponent),
-            cv.GenerateID(): cv.declare_id(DeepSleepComponent),
+        cv.Optional(CONF_RUN_DURATION): cv.Any(
-            cv.Optional(CONF_RUN_DURATION): cv.Any(
+            cv.All(cv.only_on_esp32, WAKEUP_CAUSES_SCHEMA),
-                cv.All(cv.only_on_esp32, WAKEUP_CAUSES_SCHEMA),
+            cv.positive_time_period_milliseconds,
-                cv.positive_time_period_milliseconds,
+        ),
+        cv.Optional(CONF_SLEEP_DURATION): cv.positive_time_period_milliseconds,
+        cv.Optional(CONF_WAKEUP_PIN): cv.All(
+            cv.only_on_esp32, pins.internal_gpio_input_pin_schema, validate_pin_number
+        ),
+        cv.Optional(CONF_WAKEUP_PIN_MODE): cv.All(
+            cv.only_on_esp32, cv.enum(WAKEUP_PIN_MODES), upper=True
+        ),
+        cv.Optional(CONF_ESP32_EXT1_WAKEUP): cv.All(
+            cv.only_on_esp32,
+            cv.Schema(
+                {
+                    cv.Required(CONF_PINS): cv.ensure_list(
+                        pins.internal_gpio_input_pin_schema, validate_pin_number
+                    ),
+                    cv.Required(CONF_MODE): cv.enum(EXT1_WAKEUP_MODES, upper=True),
+                }
             ),
-            cv.Optional(CONF_SLEEP_DURATION): cv.positive_time_period_milliseconds,
+        ),
-            cv.Optional(CONF_WAKEUP_PIN): cv.All(
+        cv.Optional(CONF_TOUCH_WAKEUP): cv.All(cv.only_on_esp32, cv.boolean),
-                cv.only_on_esp32,
+    }
-                pins.internal_gpio_input_pin_schema,
+).extend(cv.COMPONENT_SCHEMA)
-                validate_pin_number,
-            ),
-            cv.Optional(CONF_WAKEUP_PIN_MODE): cv.All(
-                cv.only_on_esp32, cv.enum(WAKEUP_PIN_MODES), upper=True
-            ),
-            cv.Optional(CONF_ESP32_EXT1_WAKEUP): cv.All(
-                cv.only_on_esp32,
-                cv.Schema(
-                    {
-                        cv.Required(CONF_PINS): cv.ensure_list(
-                            pins.internal_gpio_input_pin_schema, validate_pin_number
-                        ),
-                        cv.Required(CONF_MODE): cv.enum(EXT1_WAKEUP_MODES, upper=True),
-                    }
-                ),
-            ),
-            cv.Optional(CONF_TOUCH_WAKEUP): cv.All(cv.only_on_esp32, cv.boolean),
-        }
-    ).extend(cv.COMPONENT_SCHEMA),
-    cv.only_on([PLATFORM_ESP32, PLATFORM_ESP8266]),
-)
 
 
 async def to_code(config):

esphome/components/deep_sleep/deep_sleep_component.cpp

@@ -39,7 +39,7 @@ void DeepSleepComponent::setup() {
 
   const optional<uint32_t> run_duration = get_run_duration_();
   if (run_duration.has_value()) {
-    ESP_LOGI(TAG, "Scheduling Deep Sleep to start in %" PRIu32 " ms", *run_duration);
+    ESP_LOGI(TAG, "Scheduling Deep Sleep to start in %u ms", *run_duration);
     this->set_timeout(*run_duration, [this]() { this->begin_sleep(); });
   } else {
     ESP_LOGD(TAG, "Not scheduling Deep Sleep, as no run duration is configured.");
@@ -49,20 +49,19 @@ void DeepSleepComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "Setting up Deep Sleep...");
   if (this->sleep_duration_.has_value()) {
     uint32_t duration = *this->sleep_duration_ / 1000;
-    ESP_LOGCONFIG(TAG, "  Sleep Duration: %" PRIu32 " ms", duration);
+    ESP_LOGCONFIG(TAG, "  Sleep Duration: %u ms", duration);
   }
   if (this->run_duration_.has_value()) {
-    ESP_LOGCONFIG(TAG, "  Run Duration: %" PRIu32 " ms", *this->run_duration_);
+    ESP_LOGCONFIG(TAG, "  Run Duration: %u ms", *this->run_duration_);
   }
 #ifdef USE_ESP32
   if (wakeup_pin_ != nullptr) {
     LOG_PIN("  Wakeup Pin: ", this->wakeup_pin_);
   }
   if (this->wakeup_cause_to_run_duration_.has_value()) {
-    ESP_LOGCONFIG(TAG, "  Default Wakeup Run Duration: %" PRIu32 " ms",
+    ESP_LOGCONFIG(TAG, "  Default Wakeup Run Duration: %u ms", this->wakeup_cause_to_run_duration_->default_cause);
-                  this->wakeup_cause_to_run_duration_->default_cause);
+    ESP_LOGCONFIG(TAG, "  Touch Wakeup Run Duration: %u ms", this->wakeup_cause_to_run_duration_->touch_cause);
-    ESP_LOGCONFIG(TAG, "  Touch Wakeup Run Duration: %" PRIu32 " ms", this->wakeup_cause_to_run_duration_->touch_cause);
+    ESP_LOGCONFIG(TAG, "  GPIO Wakeup Run Duration: %u ms", this->wakeup_cause_to_run_duration_->gpio_cause);
-    ESP_LOGCONFIG(TAG, "  GPIO Wakeup Run Duration: %" PRIu32 " ms", this->wakeup_cause_to_run_duration_->gpio_cause);
   }
 #endif
 }