Merge pull request #2544 from esphome/bump-2021.10.0b5

2021.10.0b5

.clang-tidy

@@ -5,8 +5,11 @@ Checks: >-
   -altera-*,
   -android-*,
   -boost-*,
+  -bugprone-branch-clone,
+  -bugprone-easily-swappable-parameters,
   -bugprone-narrowing-conversions,
   -bugprone-signed-char-misuse,
+  -bugprone-too-small-loop-variable,
   -cert-dcl50-cpp,
   -cert-err58-cpp,
   -cert-oop57-cpp,
@@ -16,10 +19,12 @@ Checks: >-
   -clang-diagnostic-delete-abstract-non-virtual-dtor,
   -clang-diagnostic-delete-non-abstract-non-virtual-dtor,
   -clang-diagnostic-shadow-field,
+  -clang-diagnostic-sign-compare,
+  -clang-diagnostic-unused-variable,
   -clang-diagnostic-unused-const-variable,
-  -clang-diagnostic-unused-parameter,
   -concurrency-*,
   -cppcoreguidelines-avoid-c-arrays,
+  -cppcoreguidelines-avoid-goto,
   -cppcoreguidelines-avoid-magic-numbers,
   -cppcoreguidelines-init-variables,
   -cppcoreguidelines-macro-usage,
@@ -36,6 +41,7 @@ Checks: >-
   -cppcoreguidelines-pro-type-union-access,
   -cppcoreguidelines-pro-type-vararg,
   -cppcoreguidelines-special-member-functions,
+  -fuchsia-default-arguments,
   -fuchsia-multiple-inheritance,
   -fuchsia-overloaded-operator,
   -fuchsia-statically-constructed-objects,
@@ -45,7 +51,6 @@ Checks: >-
   -google-explicit-constructor,
   -google-readability-braces-around-statements,
   -google-readability-casting,
-  -google-readability-namespace-comments,
   -google-readability-todo,
   -google-runtime-references,
   -hicpp-*,
@@ -68,6 +73,8 @@ Checks: >-
   -modernize-use-nodiscard,
   -mpi-*,
   -objc-*,
+  -readability-braces-around-statements,
+  -readability-const-return-type,
   -readability-convert-member-functions-to-static,
   -readability-else-after-return,
   -readability-function-cognitive-complexity,
@@ -75,6 +82,10 @@ Checks: >-
   -readability-isolate-declaration,
   -readability-magic-numbers,
   -readability-make-member-function-const,
+  -readability-named-parameter,
+  -readability-qualified-auto,
+  -readability-redundant-access-specifiers,
+  -readability-redundant-member-init,
   -readability-redundant-string-init,
   -readability-uppercase-literal-suffix,
   -readability-use-anyofallof,
@@ -86,11 +97,9 @@ CheckOptions:
     value:           '1'
   - key:             google-readability-function-size.StatementThreshold
     value:           '800'
-  - key:             google-runtime-int.TypeSuffix
-    value:           '_t'
-  - key:             llvm-namespace-comment.ShortNamespaceLines
+  - key:             google-readability-namespace-comments.ShortNamespaceLines
     value:           '10'
-  - key:             llvm-namespace-comment.SpacesBeforeComments
+  - key:             google-readability-namespace-comments.SpacesBeforeComments
     value:           '2'
   - key:             modernize-loop-convert.MaxCopySize
     value:           '16'
@@ -108,8 +117,6 @@ CheckOptions:
     value:           'make_unique'
   - key:             modernize-make-unique.MakeSmartPtrFunctionHeader
     value:           'esphome/core/helpers.h'
-  - key:             readability-braces-around-statements.ShortStatementLines
-    value:           2
   - key:             readability-identifier-naming.LocalVariableCase
     value:           'lower_case'
   - key:             readability-identifier-naming.ClassCase
@@ -156,5 +163,3 @@ CheckOptions:
     value:           'lower_case'
   - key:             readability-identifier-naming.VirtualMethodSuffix
     value:           ''
-  - key:             readability-qualified-auto.AddConstToQualified
-    value:           0

.github/PULL_REQUEST_TEMPLATE.md

@@ -16,7 +16,6 @@ Quick description and explanation of changes
 ## Test Environment
 
 - [ ] ESP32
-- [ ] ESP32 IDF
 - [ ] ESP8266
 
 ## Example entry for `config.yaml`:

.github/issue-close-app.yml

@@ -0,0 +1,7 @@
+comment: >-
+  https://github.com/esphome/esphome/issues/430
+issueConfigs:
+- content:
+  - "OTHERWISE THE ISSUE WILL BE CLOSED AUTOMATICALLY"
+
+caseInsensitive: false

.github/lock.yml

@@ -0,0 +1,36 @@
+# Configuration for Lock Threads - https://github.com/dessant/lock-threads
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 7
+
+# Skip issues and pull requests created before a given timestamp. Timestamp must
+# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
+skipCreatedBefore: false
+
+# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
+exemptLabels:
+  - keep-open
+
+# Label to add before locking, such as `outdated`. Set to `false` to disable
+lockLabel: false
+
+# Comment to post before locking. Set to `false` to disable
+lockComment: false
+
+# Assign `resolved` as the reason for locking. Set to `false` to disable
+setLockReason: false
+
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings just for `issues` or `pulls`
+# issues:
+#   exemptLabels:
+#     - help-wanted
+#   lockLabel: outdated
+
+# pulls:
+#   daysUntilLock: 30
+
+# Repository to extend settings from
+# _extends: repo

.github/workflows/ci-docker.yml

@@ -17,10 +17,6 @@ on:
       - 'requirements*.txt'
       - 'platformio.ini'
 
-permissions:
-  contents: read
-  packages: read
-
 jobs:
   check-docker:
     name: Build docker containers

.github/workflows/ci.yml

@@ -1,3 +1,5 @@
+# THESE JOBS ARE COPIED IN release.yml and release-dev.yml
+# PLEASE ALSO UPDATE THOSE FILES WHEN CHANGING LINES HERE
 name: CI
 
 on:
@@ -6,13 +8,6 @@ on:
 
   pull_request:
 
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
   ci:
     name: ${{ matrix.name }}
@@ -36,7 +31,7 @@ jobs:
           - id: test
             file: tests/test3.yaml
             name: Test tests/test3.yaml
-            pio_cache_key: test3
+            pio_cache_key: test1
           - id: test
             file: tests/test4.yaml
             name: Test tests/test4.yaml
@@ -51,26 +46,26 @@ jobs:
             name: Run script/clang-format
           - id: clang-tidy
             name: Run script/clang-tidy for ESP8266
-            options: --environment esp8266-arduino-tidy --grep USE_ESP8266
+            options: --environment esp8266-tidy --grep USE_ESP8266
             pio_cache_key: tidyesp8266
           - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 Arduino 1/4
-            options: --environment esp32-arduino-tidy --split-num 4 --split-at 1
+            name: Run script/clang-tidy for ESP32 1/4
+            options: --environment esp32-tidy --split-num 4 --split-at 1
             pio_cache_key: tidyesp32
           - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 Arduino 2/4
-            options: --environment esp32-arduino-tidy --split-num 4 --split-at 2
+            name: Run script/clang-tidy for ESP32 2/4
+            options: --environment esp32-tidy --split-num 4 --split-at 2
             pio_cache_key: tidyesp32
           - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 Arduino 3/4
-            options: --environment esp32-arduino-tidy --split-num 4 --split-at 3
+            name: Run script/clang-tidy for ESP32 3/4
+            options: --environment esp32-tidy --split-num 4 --split-at 3
             pio_cache_key: tidyesp32
           - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 Arduino 4/4
-            options: --environment esp32-arduino-tidy --split-num 4 --split-at 4
+            name: Run script/clang-tidy for ESP32 4/4
+            options: --environment esp32-tidy --split-num 4 --split-at 4
             pio_cache_key: tidyesp32
           - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 IDF
+            name: Run script/clang-tidy for ESP32 esp-idf
             options: --environment esp32-idf-tidy --grep USE_ESP_IDF
             pio_cache_key: tidyesp32-idf
 
@@ -82,23 +77,18 @@ jobs:
         with:
           python-version: '3.7'
 
-      - name: Cache virtualenv
+      - name: Cache pip modules
         uses: actions/cache@v2
         with:
-          path: .venv
-          key: venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements*.txt') }}
+          path: ~/.cache/pip
+          key: pip-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements*.txt') }}
           restore-keys: |
-            venv-${{ steps.python.outputs.python-version }}-
+            pip-${{ steps.python.outputs.python-version }}-
 
-      - name: Set up virtualenv
+      - name: Set up python environment
         run: |
-          python -m venv .venv
-          source .venv/bin/activate
-          pip install -U pip
-          pip install -r requirements.txt -r requirements_optional.txt -r requirements_test.txt
-          pip install -e .
-          echo "$GITHUB_WORKSPACE/.venv/bin" >> $GITHUB_PATH
-          echo "VIRTUAL_ENV=$GITHUB_WORKSPACE/.venv" >> $GITHUB_ENV
+          pip3 install -r requirements.txt -r requirements_optional.txt -r requirements_test.txt
+          pip3 install -e .
 
       # Use per check platformio cache because checks use different parts
       - name: Cache platformio

.github/workflows/lock.yml

@@ -9,19 +9,13 @@ permissions:
   issues: write
   pull-requests: write
 
-concurrency:
-  group: lock
-
 jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v3
+      - uses: dessant/lock-threads@v2
         with:
-          pr-inactive-days: "1"
+          github-token: ${{ github.token }}
+          pr-lock-inactive-days: "1"
           pr-lock-reason: ""
-          exclude-any-pr-labels: keep-open
-
-          issue-inactive-days: "7"
-          issue-lock-reason: ""
-          exclude-any-issue-labels: keep-open
+          process-only: prs

.github/workflows/matchers/ci-custom.json

@@ -4,7 +4,7 @@
             "owner": "ci-custom",
             "pattern": [
                 {
-                    "regexp": "^(.*):(\\d+):(\\d+):\\s+lint:\\s+(.*)$",
+                    "regexp": "^ERROR (.*):(\\d+):(\\d+) - (.*)$",
                     "file": 1,
                     "line": 2,
                     "column": 3,

.github/workflows/matchers/gcc.json

@@ -5,7 +5,7 @@
       "severity": "error",
       "pattern": [
         {
-          "regexp": "^src/(.*):(\\d+):(\\d+):\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
+          "regexp": "^(.*):(\\d+):(\\d+):\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
           "file": 1,
           "line": 2,
           "column": 3,

.github/workflows/matchers/lint-python.json

@@ -1,22 +1,11 @@
 {
   "problemMatcher": [
-    {
-      "owner": "black",
-      "severity": "error",
-      "pattern": [
-        {
-          "regexp": "^(.*): (Please format this file with the black formatter)",
-          "file": 1,
-          "message": 2
-        }
-      ]
-    },
     {
       "owner": "flake8",
       "severity": "error",
       "pattern": [
           {
-          "regexp": "^(.*):(\\d+): ([EFCDNW]\\d{3}.*)$",
+          "regexp": "^(.*):(\\d+) - ([EFCDNW]\\d{3}.*)$",
           "file": 1,
           "line": 2,
           "message": 3
@@ -28,7 +17,7 @@
       "severity": "error",
       "pattern": [
         {
-          "regexp": "^(.*):(\\d+): (\\[[EFCRW]\\d{4}\\(.*\\),.*\\].*)$",
+          "regexp": "^(.*):(\\d+) - (\\[[EFCRW]\\d{4}\\(.*\\),.*\\].*)$",
           "file": 1,
           "line": 2,
           "message": 3

.github/workflows/release.yml

@@ -7,9 +7,6 @@ on:
   schedule:
     - cron: "0 2 * * *"
 
-permissions:
-  contents: read
-
 jobs:
   init:
     name: Initialize build
@@ -55,9 +52,6 @@ jobs:
   deploy-docker:
     name: Build and publish docker containers
     if: github.repository == 'esphome/esphome'
-    permissions:
-      contents: read
-      packages: write
     runs-on: ubuntu-latest
     needs: [init]
     strategy:
@@ -99,9 +93,6 @@ jobs:
 
   deploy-docker-manifest:
     if: github.repository == 'esphome/esphome'
-    permissions:
-      contents: read
-      packages: write
     runs-on: ubuntu-latest
     needs: [init, deploy-docker]
     strategy:

.github/workflows/stale.yml

@@ -9,15 +9,13 @@ permissions:
   issues: write
   pull-requests: write
 
-concurrency:
-  group: lock
-
 jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/stale@v4
         with:
+          repo-token: ${{ github.token }}
           days-before-pr-stale: 90
           days-before-pr-close: 7
           days-before-issue-stale: -1
@@ -30,19 +28,3 @@ jobs:
             pull request has been automatically marked as stale because of that
             and will be closed if no further activity occurs within 7 days.
             Thank you for your contributions.
-
-  # Use stale to automatically close issues with a reference to the issue tracker
-  close-issues:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v4
-        with:
-          days-before-pr-stale: -1
-          days-before-pr-close: -1
-          days-before-issue-stale: 1
-          days-before-issue-close: 1
-          remove-stale-when-updated: true
-          stale-issue-label: "stale"
-          exempt-issue-labels: "not-stale"
-          stale-issue-message: >
-            https://github.com/esphome/esphome/issues/430

.gitpod.yml

@@ -3,4 +3,4 @@ ports:
   onOpen: open-preview
 tasks:
 - before: pyenv local $(pyenv version | grep '^3\.' | cut -d ' ' -f 1) && script/setup
-  command: python -m esphome dashboard config
+  command: python -m esphome config dashboard

.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/ambv/black
-    rev: 22.1.0
+    rev: 20.8b1
     hooks:
     - id: black
       args:
@@ -10,7 +10,7 @@ repos:
         - --quiet
       files: ^((esphome|script|tests)/.+)?[^/]+\.py$
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 4.0.1
+    rev: 3.8.4
     hooks:
       - id: flake8
         additional_dependencies:

CODEOWNERS

@@ -28,23 +28,17 @@ esphome/components/b_parasite/* @rbaron
 esphome/components/ballu/* @bazuchan
 esphome/components/bang_bang/* @OttoWinter
 esphome/components/binary_sensor/* @esphome/core
-esphome/components/bl0940/* @tobias-
 esphome/components/ble_client/* @buxtronix
 esphome/components/bme680_bsec/* @trvrnrth
-esphome/components/bmp3xx/* @martgras
-esphome/components/button/* @esphome/core
 esphome/components/canbus/* @danielschramm @mvturnho
-esphome/components/cap1188/* @MrEditor97
 esphome/components/captive_portal/* @OttoWinter
 esphome/components/ccs811/* @habbie
-esphome/components/cd74hc4067/* @asoehlke
 esphome/components/climate/* @esphome/core
 esphome/components/climate_ir/* @glmnet
 esphome/components/color_temperature/* @jesserockz
 esphome/components/coolix/* @glmnet
 esphome/components/cover/* @esphome/core
 esphome/components/cs5460a/* @balrog-kun
-esphome/components/cse7761/* @berfenger
 esphome/components/ct_clamp/* @jesserockz
 esphome/components/current_based/* @djwmarcx
 esphome/components/daly_bms/* @s1lvi0
@@ -54,12 +48,9 @@ esphome/components/dfplayer/* @glmnet
 esphome/components/dht/* @OttoWinter
 esphome/components/ds1307/* @badbadc0ffee
 esphome/components/dsmr/* @glmnet @zuidwijk
-esphome/components/ektf2232/* @jesserockz
 esphome/components/esp32/* @esphome/core
 esphome/components/esp32_ble/* @jesserockz
 esphome/components/esp32_ble_server/* @jesserockz
-esphome/components/esp32_camera_web_server/* @ayufan
-esphome/components/esp32_can/* @Sympatron
 esphome/components/esp32_improv/* @jesserockz
 esphome/components/esp8266/* @esphome/core
 esphome/components/exposure_notifications/* @OttoWinter
@@ -70,7 +61,6 @@ esphome/components/globals/* @esphome/core
 esphome/components/gpio/* @esphome/core
 esphome/components/gps/* @coogle
 esphome/components/graph/* @synco
-esphome/components/growatt_solar/* @leeuwte
 esphome/components/havells_solar/* @sourabhjaiswal
 esphome/components/hbridge/fan/* @WeekendWarrior
 esphome/components/hbridge/light/* @DotNetDann
@@ -79,14 +69,12 @@ esphome/components/hitachi_ac424/* @sourabhjaiswal
 esphome/components/homeassistant/* @OttoWinter
 esphome/components/hrxl_maxsonar_wr/* @netmikey
 esphome/components/i2c/* @esphome/core
-esphome/components/improv_serial/* @esphome/core
-esphome/components/ina260/* @MrEditor97
+esphome/components/improv/* @jesserockz
 esphome/components/inkbird_ibsth1_mini/* @fkirill
 esphome/components/inkplate6/* @jesserockz
 esphome/components/integration/* @OttoWinter
 esphome/components/interval/* @esphome/core
 esphome/components/json/* @OttoWinter
-esphome/components/kalman_combinator/* @Cat-Ion
 esphome/components/ledc/* @OttoWinter
 esphome/components/light/* @esphome/core
 esphome/components/logger/* @esphome/core
@@ -100,13 +88,9 @@ esphome/components/mcp23x08_base/* @jesserockz
 esphome/components/mcp23x17_base/* @jesserockz
 esphome/components/mcp23xxx_base/* @jesserockz
 esphome/components/mcp2515/* @danielschramm @mvturnho
-esphome/components/mcp3204/* @rsumner
-esphome/components/mcp47a1/* @jesserockz
 esphome/components/mcp9808/* @k7hpn
-esphome/components/md5/* @esphome/core
 esphome/components/mdns/* @esphome/core
 esphome/components/midea/* @dudanov
-esphome/components/midea_ir/* @dudanov
 esphome/components/mitsubishi/* @RubyBailey
 esphome/components/modbus_controller/* @martgras
 esphome/components/modbus_controller/binary_sensor/* @martgras
@@ -134,10 +118,8 @@ esphome/components/pn532_i2c/* @OttoWinter @jesserockz
 esphome/components/pn532_spi/* @OttoWinter @jesserockz
 esphome/components/power_supply/* @esphome/core
 esphome/components/preferences/* @esphome/core
-esphome/components/psram/* @esphome/core
 esphome/components/pulse_meter/* @stevebaxter
 esphome/components/pvvx_mithermometer/* @pasiz
-esphome/components/qr_code/* @wjtje
 esphome/components/rc522/* @glmnet
 esphome/components/rc522_i2c/* @glmnet
 esphome/components/rc522_spi/* @glmnet
@@ -145,7 +127,7 @@ esphome/components/restart/* @esphome/core
 esphome/components/rf_bridge/* @jesserockz
 esphome/components/rgbct/* @jesserockz
 esphome/components/rtttl/* @glmnet
-esphome/components/safe_mode/* @jsuanet @paulmonigatti
+esphome/components/safe_mode/* @paulmonigatti
 esphome/components/scd4x/* @sjtrny
 esphome/components/script/* @esphome/core
 esphome/components/sdm_meter/* @jesserockz @polyfaces
@@ -155,7 +137,7 @@ esphome/components/select/* @esphome/core
 esphome/components/sensor/* @esphome/core
 esphome/components/sgp40/* @SenexCrenshaw
 esphome/components/sht4x/* @sjtrny
-esphome/components/shutdown/* @esphome/core @jsuanet
+esphome/components/shutdown/* @esphome/core
 esphome/components/sim800l/* @glmnet
 esphome/components/sm2135/* @BoukeHaarsma23
 esphome/components/socket/* @esphome/core
@@ -189,21 +171,16 @@ esphome/components/tmp102/* @timsavage
 esphome/components/tmp117/* @Azimath
 esphome/components/tof10120/* @wstrzalka
 esphome/components/toshiba/* @kbx81
-esphome/components/touchscreen/* @jesserockz
 esphome/components/tsl2591/* @wjcarpenter
 esphome/components/tuya/binary_sensor/* @jesserockz
 esphome/components/tuya/climate/* @jesserockz
-esphome/components/tuya/number/* @frankiboy1
 esphome/components/tuya/sensor/* @jesserockz
 esphome/components/tuya/switch/* @jesserockz
-esphome/components/tuya/text_sensor/* @dentra
 esphome/components/uart/* @esphome/core
 esphome/components/ultrasonic/* @OttoWinter
 esphome/components/version/* @esphome/core
-esphome/components/wake_on_lan/* @willwill2will54
 esphome/components/web_server_base/* @OttoWinter
 esphome/components/whirlpool/* @glmnet
 esphome/components/xiaomi_lywsd03mmc/* @ahpohl
-esphome/components/xiaomi_mhoc303/* @drug123
 esphome/components/xiaomi_mhoc401/* @vevsvevs
 esphome/components/xpt2046/* @numo68

MANIFEST.in

@@ -4,5 +4,4 @@ include requirements.txt
 include esphome/dashboard/templates/*.html
 recursive-include esphome/dashboard/static *.ico *.js *.css *.woff* LICENSE
 recursive-include esphome *.cpp *.h *.tcc
-recursive-include esphome *.py.script
 recursive-include esphome LICENSE.txt

docker/Dockerfile

@@ -5,12 +5,12 @@
 # One of "docker", "hassio"
 ARG BASEIMGTYPE=docker
 
-FROM ghcr.io/hassio-addons/debian-base/amd64:5.2.3 AS base-hassio-amd64
-FROM ghcr.io/hassio-addons/debian-base/aarch64:5.2.3 AS base-hassio-arm64
-FROM ghcr.io/hassio-addons/debian-base/armv7:5.2.3 AS base-hassio-armv7
-FROM debian:bullseye-20220125-slim AS base-docker-amd64
-FROM debian:bullseye-20220125-slim AS base-docker-arm64
-FROM debian:bullseye-20220125-slim AS base-docker-armv7
+FROM ghcr.io/hassio-addons/debian-base/amd64:5.1.0 AS base-hassio-amd64
+FROM ghcr.io/hassio-addons/debian-base/aarch64:5.1.0 AS base-hassio-arm64
+FROM ghcr.io/hassio-addons/debian-base/armv7:5.1.0 AS base-hassio-armv7
+FROM debian:bullseye-20210902-slim AS base-docker-amd64
+FROM debian:bullseye-20210902-slim AS base-docker-arm64
+FROM debian:bullseye-20210902-slim AS base-docker-armv7
 
 # Use TARGETARCH/TARGETVARIANT defined by docker
 # https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
@@ -23,11 +23,11 @@ RUN \
         python3=3.9.2-3 \
         python3-pip=20.3.4-4 \
         python3-setuptools=52.0.0-4 \
-        python3-pil=8.1.2+dfsg-0.3+deb11u1 \
+        python3-pil=8.1.2+dfsg-0.3 \
         python3-cryptography=3.3.2-1 \
         iputils-ping=3:20210202-1 \
         git=1:2.30.2-1 \
-        curl=7.74.0-1.3+deb11u1 \
+        curl=7.74.0-1.3+b1 \
     && rm -rf \
         /tmp/* \
         /var/{cache,log}/* \
@@ -42,8 +42,8 @@ ENV \
 RUN \
     # Ubuntu python3-pip is missing wheel
     pip3 install --no-cache-dir \
-        wheel==0.37.1 \
-        platformio==5.2.4 \
+        wheel==0.36.2 \
+        platformio==5.2.0 \
     # Change some platformio settings
     && platformio settings set enable_telemetry No \
     && platformio settings set check_libraries_interval 1000000 \
@@ -64,7 +64,7 @@ RUN \
 
 # Copy esphome and install
 COPY . /esphome
-RUN pip3 install --no-cache-dir --no-use-pep517 -e /esphome
+RUN pip3 install --no-cache-dir -e /esphome
 
 # Settings for dashboard
 ENV USERNAME="" PASSWORD=""
@@ -112,7 +112,7 @@ RUN \
 
 # Copy esphome and install
 COPY . /esphome
-RUN pip3 install --no-cache-dir --no-use-pep517 -e /esphome
+RUN pip3 install --no-cache-dir -e /esphome
 
 # Labels
 LABEL \
@@ -147,9 +147,9 @@ RUN \
         /var/{cache,log}/* \
         /var/lib/apt/lists/*
 
-COPY requirements.txt requirements_optional.txt requirements_test.txt docker/platformio_install_deps.py platformio.ini /
+COPY requirements.txt requirements_optional.txt docker/platformio_install_deps.py platformio.ini /
 RUN \
-    pip3 install --no-cache-dir -r /requirements.txt -r /requirements_optional.txt -r /requirements_test.txt \
+    pip3 install --no-cache-dir -r /requirements.txt -r /requirements_optional.txt \
     && /platformio_install_deps.py /platformio.ini
 
 VOLUME ["/esphome"]

docker/build.py

@@ -32,7 +32,6 @@ parser.add_argument("--dry-run", action="store_true", help="Don't run any comman
 subparsers = parser.add_subparsers(help="Action to perform", dest="command", required=True)
 build_parser = subparsers.add_parser("build", help="Build the image")
 build_parser.add_argument("--push", help="Also push the images", action="store_true")
-build_parser.add_argument("--load", help="Load the docker image locally", action="store_true")
 manifest_parser = subparsers.add_parser("manifest", help="Create a manifest from already pushed images")
 
 
@@ -133,8 +132,6 @@ def main():
             cmd += ["--tag", img]
         if args.push:
             cmd += ["--push", "--cache-to", f"type=registry,ref={cache_img},mode=max"]
-        if args.load:
-            cmd += ["--load"]
 
         run_command(*cmd, ".")
     elif args.command == "manifest":

docker/platformio_install_deps.py

@@ -8,23 +8,6 @@ import sys
 
 config = configparser.ConfigParser(inline_comment_prefixes=(';', ))
 config.read(sys.argv[1])
-
-libs = []
-# Extract from every lib_deps key in all sections
-for section in config.sections():
-    conf = config[section]
-    if "lib_deps" not in conf:
-        continue
-    for lib_dep in conf["lib_deps"].splitlines():
-        if not lib_dep:
-            # Empty line or comment
-            continue
-        if lib_dep.startswith("${"):
-            # Extending from another section
-            continue
-        if "@" not in lib_dep:
-            # No version pinned, this is an internal lib
-            continue
-        libs.append(lib_dep)
+libs = [x for x in config['common']['lib_deps'].splitlines() if len(x) != 0]
 
 subprocess.check_call(['platformio', 'lib', '-g', 'install', *libs])

esphome/__main__.py

@@ -18,7 +18,6 @@ from esphome.const import (
     CONF_PORT,
     CONF_ESPHOME,
     CONF_PLATFORMIO_OPTIONS,
-    SECRETS_FILES,
 )
 from esphome.core import CORE, EsphomeError, coroutine
 from esphome.helpers import indent
@@ -145,8 +144,6 @@ def wrap_to_code(name, comp):
         if comp.config_schema is not None:
             conf_str = yaml_util.dump(conf)
             conf_str = conf_str.replace("//", "")
-            # remove tailing \ to avoid multi-line comment warning
-            conf_str = conf_str.replace("\\\n", "\n")
             cg.add(cg.LineComment(indent(conf_str)))
         await coro(conf)
 
@@ -203,7 +200,8 @@ def upload_using_esptool(config, port):
         firmware_offset = "0x10000" if CORE.is_esp32 else "0x0"
         flash_images = [
             platformio_api.FlashImage(
-                path=idedata.firmware_bin_path, offset=firmware_offset
+                path=idedata.firmware_bin_path,
+                offset=firmware_offset,
             ),
             *idedata.extra_flash_images,
         ]
@@ -228,8 +226,6 @@ def upload_using_esptool(config, port):
             mcu,
             "write_flash",
             "-z",
-            "--flash_size",
-            "detect",
         ]
         for img in flash_images:
             cmd += [img.offset, img.path]
@@ -609,7 +605,10 @@ def parse_args(argv):
         "wizard",
         help="A helpful setup wizard that will guide you through setting up ESPHome.",
     )
-    parser_wizard.add_argument("configuration", help="Your YAML configuration file.")
+    parser_wizard.add_argument(
+        "configuration",
+        help="Your YAML configuration file.",
+    )
 
     parser_fingerprint = subparsers.add_parser(
         "mqtt-fingerprint", help="Get the SSL fingerprint from a MQTT broker."
@@ -631,7 +630,8 @@ def parse_args(argv):
         "dashboard", help="Create a simple web server for a dashboard."
     )
     parser_dashboard.add_argument(
-        "configuration", help="Your YAML configuration file directory."
+        "configuration",
+        help="Your YAML configuration file directory.",
     )
     parser_dashboard.add_argument(
         "--port",
@@ -639,12 +639,6 @@ def parse_args(argv):
         type=int,
         default=6052,
     )
-    parser_dashboard.add_argument(
-        "--address",
-        help="The address to bind to.",
-        type=str,
-        default="0.0.0.0",
-    )
     parser_dashboard.add_argument(
         "--username",
         help="The optional username to require for authentication.",
@@ -793,10 +787,6 @@ def run_esphome(argv):
             return 1
 
     for conf_path in args.configuration:
-        if any(os.path.basename(conf_path) == x for x in SECRETS_FILES):
-            _LOGGER.warning("Skipping secrets file %s", conf_path)
-            continue
-
         CORE.config_path = conf_path
         CORE.dashboard = args.dashboard
 

esphome/automation.py

@@ -3,7 +3,6 @@ import esphome.config_validation as cv
 from esphome.const import (
     CONF_AUTOMATION_ID,
     CONF_CONDITION,
-    CONF_COUNT,
     CONF_ELSE,
     CONF_ID,
     CONF_THEN,
@@ -67,7 +66,6 @@ DelayAction = cg.esphome_ns.class_("DelayAction", Action, cg.Component)
 LambdaAction = cg.esphome_ns.class_("LambdaAction", Action)
 IfAction = cg.esphome_ns.class_("IfAction", Action)
 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)
 Automation = cg.esphome_ns.class_("Automation")
@@ -243,25 +241,6 @@ async def while_action_to_code(config, action_id, template_arg, args):
     return var
 
 
-@register_action(
-    "repeat",
-    RepeatAction,
-    cv.Schema(
-        {
-            cv.Required(CONF_COUNT): cv.templatable(cv.positive_not_null_int),
-            cv.Required(CONF_THEN): validate_action_list,
-        }
-    ),
-)
-async def repeat_action_to_code(config, action_id, template_arg, args):
-    var = cg.new_Pvariable(action_id, template_arg)
-    count_template = await cg.templatable(config[CONF_COUNT], args, cg.uint32)
-    cg.add(var.set_count(count_template))
-    actions = await build_action_list(config[CONF_THEN], template_arg, args)
-    cg.add(var.add_then(actions))
-    return var
-
-
 def validate_wait_until(value):
     schema = cv.Schema(
         {

esphome/codegen.py

@@ -75,10 +75,10 @@ from esphome.cpp_types import (  # noqa
     optional,
     arduino_json_ns,
     JsonObject,
-    JsonObjectConst,
+    JsonObjectRef,
+    JsonObjectConstRef,
     Controller,
     GPIOPin,
     InternalGPIOPin,
     gpio_Flags,
-    EntityCategory,
 )

esphome/components/ac_dimmer/ac_dimmer.cpp

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

esphome/components/adalight/adalight_light_effect.cpp

@@ -25,7 +25,7 @@ void AdalightLightEffect::stop() {
   AddressableLightEffect::stop();
 }
 
-unsigned int AdalightLightEffect::get_frame_size_(int led_count) const {
+int AdalightLightEffect::get_frame_size_(int led_count) const {
   // 3 bytes: Ada
   // 2 bytes: LED count
   // 1 byte: checksum

esphome/components/adalight/adalight_light_effect.h

@@ -13,6 +13,7 @@ class AdalightLightEffect : public light::AddressableLightEffect, public uart::U
  public:
   AdalightLightEffect(const std::string &name);
 
+ public:
   void start() override;
   void stop() override;
   void apply(light::AddressableLight &it, const Color &current_color) override;
@@ -24,11 +25,12 @@ class AdalightLightEffect : public light::AddressableLightEffect, public uart::U
     CONSUMED,
   };
 
-  unsigned int get_frame_size_(int led_count) const;
+  int get_frame_size_(int led_count) const;
   void reset_frame_(light::AddressableLight &it);
   void blank_all_leds_(light::AddressableLight &it);
   Frame parse_frame_(light::AddressableLight &it);
 
+ protected:
   uint32_t last_ack_{0};
   uint32_t last_byte_{0};
   uint32_t last_reset_{0};

esphome/components/adc/adc_sensor.cpp

@@ -1,6 +1,5 @@
 #include "adc_sensor.h"
 #include "esphome/core/log.h"
-#include "esphome/core/helpers.h"
 
 #ifdef USE_ESP8266
 #ifdef USE_ADC_SENSOR_VCC
@@ -15,10 +14,49 @@ namespace esphome {
 namespace adc {
 
 static const char *const TAG = "adc";
-// 13 bits for S3 / 12 bit for all other esp32 variants
-// create a const to avoid the repated cast to enum
+
 #ifdef USE_ESP32
-static const adc_bits_width_t ADC_WIDTH_MAX_SOC_BITS = static_cast<adc_bits_width_t>(ADC_WIDTH_MAX - 1);
+void ADCSensor::set_attenuation(adc_atten_t attenuation) { this->attenuation_ = attenuation; }
+
+inline adc1_channel_t gpio_to_adc1(uint8_t pin) {
+#if CONFIG_IDF_TARGET_ESP32
+  switch (pin) {
+    case 36:
+      return ADC1_CHANNEL_0;
+    case 37:
+      return ADC1_CHANNEL_1;
+    case 38:
+      return ADC1_CHANNEL_2;
+    case 39:
+      return ADC1_CHANNEL_3;
+    case 32:
+      return ADC1_CHANNEL_4;
+    case 33:
+      return ADC1_CHANNEL_5;
+    case 34:
+      return ADC1_CHANNEL_6;
+    case 35:
+      return ADC1_CHANNEL_7;
+    default:
+      return ADC1_CHANNEL_MAX;
+  }
+#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2
+  switch (pin) {
+    case 0:
+      return ADC1_CHANNEL_0;
+    case 1:
+      return ADC1_CHANNEL_1;
+    case 2:
+      return ADC1_CHANNEL_2;
+    case 3:
+      return ADC1_CHANNEL_3;
+    case 4:
+      return ADC1_CHANNEL_4;
+    default:
+      return ADC1_CHANNEL_MAX;
+  }
+#endif
+}
 #endif
 
 void ADCSensor::setup() {
@@ -28,36 +66,13 @@ void ADCSensor::setup() {
 #endif
 
 #ifdef USE_ESP32
-  adc1_config_width(ADC_WIDTH_MAX_SOC_BITS);
-  if (!autorange_) {
-    adc1_config_channel_atten(channel_, attenuation_);
-  }
-
-  // load characteristics for each attenuation
-  for (int i = 0; i < (int) ADC_ATTEN_MAX; i++) {
-    auto cal_value = esp_adc_cal_characterize(ADC_UNIT_1, (adc_atten_t) i, ADC_WIDTH_MAX_SOC_BITS,
-                                              1100,  // default vref
-                                              &cal_characteristics_[i]);
-    switch (cal_value) {
-      case ESP_ADC_CAL_VAL_EFUSE_VREF:
-        ESP_LOGV(TAG, "Using eFuse Vref for calibration");
-        break;
-      case ESP_ADC_CAL_VAL_EFUSE_TP:
-        ESP_LOGV(TAG, "Using two-point eFuse Vref for calibration");
-        break;
-      case ESP_ADC_CAL_VAL_DEFAULT_VREF:
-      default:
-        break;
-    }
-  }
-
-  // adc_gpio_init doesn't exist on ESP32-C3 or ESP32-H2
-#if !defined(USE_ESP32_VARIANT_ESP32C3) && !defined(USE_ESP32_VARIANT_ESP32H2)
-  adc_gpio_init(ADC_UNIT_1, (adc_channel_t) channel_);
+  adc1_config_channel_atten(gpio_to_adc1(pin_->get_pin()), attenuation_);
+  adc1_config_width(ADC_WIDTH_BIT_12);
+#if !CONFIG_IDF_TARGET_ESP32C3 && !CONFIG_IDF_TARGET_ESP32H2
+  adc_gpio_init(ADC_UNIT_1, (adc_channel_t) gpio_to_adc1(pin_->get_pin()));
+#endif
 #endif
-#endif  // USE_ESP32
 }
-
 void ADCSensor::dump_config() {
   LOG_SENSOR("", "ADC Sensor", this);
 #ifdef USE_ESP8266
@@ -66,108 +81,84 @@ void ADCSensor::dump_config() {
 #else
   LOG_PIN("  Pin: ", pin_);
 #endif
-#endif  // USE_ESP8266
-
+#endif
 #ifdef USE_ESP32
   LOG_PIN("  Pin: ", pin_);
-  if (autorange_) {
-    ESP_LOGCONFIG(TAG, " Attenuation: auto");
-  } else {
-    switch (this->attenuation_) {
-      case ADC_ATTEN_DB_0:
-        ESP_LOGCONFIG(TAG, " Attenuation: 0db (max 1.1V)");
-        break;
-      case ADC_ATTEN_DB_2_5:
-        ESP_LOGCONFIG(TAG, " Attenuation: 2.5db (max 1.5V)");
-        break;
-      case ADC_ATTEN_DB_6:
-        ESP_LOGCONFIG(TAG, " Attenuation: 6db (max 2.2V)");
-        break;
-      case ADC_ATTEN_DB_11:
-        ESP_LOGCONFIG(TAG, " Attenuation: 11db (max 3.9V)");
-        break;
-      default:  // This is to satisfy the unused ADC_ATTEN_MAX
-        break;
-    }
+  switch (this->attenuation_) {
+    case ADC_ATTEN_DB_0:
+      ESP_LOGCONFIG(TAG, " Attenuation: 0db (max 1.1V)");
+      break;
+    case ADC_ATTEN_DB_2_5:
+      ESP_LOGCONFIG(TAG, " Attenuation: 2.5db (max 1.5V)");
+      break;
+    case ADC_ATTEN_DB_6:
+      ESP_LOGCONFIG(TAG, " Attenuation: 6db (max 2.2V)");
+      break;
+    case ADC_ATTEN_DB_11:
+      ESP_LOGCONFIG(TAG, " Attenuation: 11db (max 3.9V)");
+      break;
+    default:  // This is to satisfy the unused ADC_ATTEN_MAX
+      break;
   }
-#endif  // USE_ESP32
+#endif
   LOG_UPDATE_INTERVAL(this);
 }
-
 float ADCSensor::get_setup_priority() const { return setup_priority::DATA; }
 void ADCSensor::update() {
   float value_v = this->sample();
-  ESP_LOGV(TAG, "'%s': Got voltage=%.4fV", this->get_name().c_str(), value_v);
+  ESP_LOGD(TAG, "'%s': Got voltage=%.2fV", this->get_name().c_str(), value_v);
   this->publish_state(value_v);
 }
+float ADCSensor::sample() {
+#ifdef USE_ESP32
+  int raw = adc1_get_raw(gpio_to_adc1(pin_->get_pin()));
+  float value_v = raw / 4095.0f;
+#if CONFIG_IDF_TARGET_ESP32
+  switch (this->attenuation_) {
+    case ADC_ATTEN_DB_0:
+      value_v *= 1.1;
+      break;
+    case ADC_ATTEN_DB_2_5:
+      value_v *= 1.5;
+      break;
+    case ADC_ATTEN_DB_6:
+      value_v *= 2.2;
+      break;
+    case ADC_ATTEN_DB_11:
+      value_v *= 3.9;
+      break;
+    default:  // This is to satisfy the unused ADC_ATTEN_MAX
+      break;
+  }
+#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2
+  switch (this->attenuation_) {
+    case ADC_ATTEN_DB_0:
+      value_v *= 0.84;
+      break;
+    case ADC_ATTEN_DB_2_5:
+      value_v *= 1.13;
+      break;
+    case ADC_ATTEN_DB_6:
+      value_v *= 1.56;
+      break;
+    case ADC_ATTEN_DB_11:
+      value_v *= 3.0;
+      break;
+    default:  // This is to satisfy the unused ADC_ATTEN_MAX
+      break;
+  }
+#endif
+  return value_v;
+#endif
 
 #ifdef USE_ESP8266
-float ADCSensor::sample() {
 #ifdef USE_ADC_SENSOR_VCC
-  int raw = ESP.getVcc();  // NOLINT(readability-static-accessed-through-instance)
+  return ESP.getVcc() / 1024.0f;  // NOLINT(readability-static-accessed-through-instance)
 #else
-  int raw = analogRead(this->pin_->get_pin());  // NOLINT
+  return analogRead(this->pin_->get_pin()) / 1024.0f;  // NOLINT
 #endif
-  if (output_raw_) {
-    return raw;
-  }
-  return raw / 1024.0f;
-}
 #endif
-
-#ifdef USE_ESP32
-float ADCSensor::sample() {
-  if (!autorange_) {
-    int raw = adc1_get_raw(channel_);
-    if (raw == -1) {
-      return NAN;
-    }
-    if (output_raw_) {
-      return raw;
-    }
-    uint32_t mv = esp_adc_cal_raw_to_voltage(raw, &cal_characteristics_[(int) attenuation_]);
-    return mv / 1000.0f;
-  }
-
-  int raw11, raw6 = 4095, raw2 = 4095, raw0 = 4095;
-  adc1_config_channel_atten(channel_, ADC_ATTEN_DB_11);
-  raw11 = adc1_get_raw(channel_);
-  if (raw11 < 4095) {
-    adc1_config_channel_atten(channel_, ADC_ATTEN_DB_6);
-    raw6 = adc1_get_raw(channel_);
-    if (raw6 < 4095) {
-      adc1_config_channel_atten(channel_, ADC_ATTEN_DB_2_5);
-      raw2 = adc1_get_raw(channel_);
-      if (raw2 < 4095) {
-        adc1_config_channel_atten(channel_, ADC_ATTEN_DB_0);
-        raw0 = adc1_get_raw(channel_);
-      }
-    }
-  }
-
-  if (raw0 == -1 || raw2 == -1 || raw6 == -1 || raw11 == -1) {
-    return NAN;
-  }
-
-  uint32_t mv11 = esp_adc_cal_raw_to_voltage(raw11, &cal_characteristics_[(int) ADC_ATTEN_DB_11]);
-  uint32_t mv6 = esp_adc_cal_raw_to_voltage(raw6, &cal_characteristics_[(int) ADC_ATTEN_DB_6]);
-  uint32_t mv2 = esp_adc_cal_raw_to_voltage(raw2, &cal_characteristics_[(int) ADC_ATTEN_DB_2_5]);
-  uint32_t mv0 = esp_adc_cal_raw_to_voltage(raw0, &cal_characteristics_[(int) ADC_ATTEN_DB_0]);
-
-  // Contribution of each value, in range 0-2048
-  uint32_t c11 = std::min(raw11, 2048);
-  uint32_t c6 = 2048 - std::abs(raw6 - 2048);
-  uint32_t c2 = 2048 - std::abs(raw2 - 2048);
-  uint32_t c0 = std::min(4095 - raw0, 2048);
-  // max theoretical csum value is 2048*4 = 8192
-  uint32_t csum = c11 + c6 + c2 + c0;
-
-  // each mv is max 3900; so max value is 3900*2048*4, fits in unsigned
-  uint32_t mv_scaled = (mv11 * c11) + (mv6 * c6) + (mv2 * c2) + (mv0 * c0);
-  return mv_scaled / (float) (csum * 1000U);
 }
-#endif  // USE_ESP32
-
 #ifdef USE_ESP8266
 std::string ADCSensor::unique_id() { return get_mac_address() + "-adc"; }
 #endif

esphome/components/adc/adc_sensor.h

@@ -8,7 +8,6 @@
 
 #ifdef USE_ESP32
 #include "driver/adc.h"
-#include <esp_adc_cal.h>
 #endif
 
 namespace esphome {
@@ -18,9 +17,7 @@ class ADCSensor : public sensor::Sensor, public PollingComponent, public voltage
  public:
 #ifdef USE_ESP32
   /// Set the attenuation for this pin. Only available on the ESP32.
-  void set_attenuation(adc_atten_t attenuation) { attenuation_ = attenuation; }
-  void set_channel(adc1_channel_t channel) { channel_ = channel; }
-  void set_autorange(bool autorange) { autorange_ = autorange; }
+  void set_attenuation(adc_atten_t attenuation);
 #endif
 
   /// Update adc values.
@@ -31,7 +28,6 @@ class ADCSensor : public sensor::Sensor, public PollingComponent, public voltage
   /// `HARDWARE_LATE` setup priority.
   float get_setup_priority() const override;
   void set_pin(InternalGPIOPin *pin) { this->pin_ = pin; }
-  void set_output_raw(bool output_raw) { output_raw_ = output_raw; }
   float sample() override;
 
 #ifdef USE_ESP8266
@@ -40,13 +36,9 @@ class ADCSensor : public sensor::Sensor, public PollingComponent, public voltage
 
  protected:
   InternalGPIOPin *pin_;
-  bool output_raw_{false};
 
 #ifdef USE_ESP32
   adc_atten_t attenuation_{ADC_ATTEN_DB_0};
-  adc1_channel_t channel_{};
-  bool autorange_{false};
-  esp_adc_cal_characteristics_t cal_characteristics_[(int) ADC_ATTEN_MAX] = {};
 #endif
 };
 

esphome/components/adc/sensor.py

@@ -4,24 +4,14 @@ from esphome import pins
 from esphome.components import sensor, voltage_sampler
 from esphome.const import (
     CONF_ATTENUATION,
-    CONF_RAW,
     CONF_ID,
     CONF_INPUT,
-    CONF_NUMBER,
     CONF_PIN,
     DEVICE_CLASS_VOLTAGE,
     STATE_CLASS_MEASUREMENT,
     UNIT_VOLT,
 )
 from esphome.core import CORE
-from esphome.components.esp32 import get_esp32_variant
-from esphome.components.esp32.const import (
-    VARIANT_ESP32,
-    VARIANT_ESP32C3,
-    VARIANT_ESP32H2,
-    VARIANT_ESP32S2,
-    VARIANT_ESP32S3,
-)
 
 
 AUTO_LOAD = ["voltage_sampler"]
@@ -31,62 +21,6 @@ ATTENUATION_MODES = {
     "2.5db": cg.global_ns.ADC_ATTEN_DB_2_5,
     "6db": cg.global_ns.ADC_ATTEN_DB_6,
     "11db": cg.global_ns.ADC_ATTEN_DB_11,
-    "auto": "auto",
-}
-
-adc1_channel_t = cg.global_ns.enum("adc1_channel_t")
-
-# From https://github.com/espressif/esp-idf/blob/master/components/driver/include/driver/adc_common.h
-# pin to adc1 channel mapping
-ESP32_VARIANT_ADC1_PIN_TO_CHANNEL = {
-    VARIANT_ESP32: {
-        36: adc1_channel_t.ADC1_CHANNEL_0,
-        37: adc1_channel_t.ADC1_CHANNEL_1,
-        38: adc1_channel_t.ADC1_CHANNEL_2,
-        39: adc1_channel_t.ADC1_CHANNEL_3,
-        32: adc1_channel_t.ADC1_CHANNEL_4,
-        33: adc1_channel_t.ADC1_CHANNEL_5,
-        34: adc1_channel_t.ADC1_CHANNEL_6,
-        35: adc1_channel_t.ADC1_CHANNEL_7,
-    },
-    VARIANT_ESP32S2: {
-        1: adc1_channel_t.ADC1_CHANNEL_0,
-        2: adc1_channel_t.ADC1_CHANNEL_1,
-        3: adc1_channel_t.ADC1_CHANNEL_2,
-        4: adc1_channel_t.ADC1_CHANNEL_3,
-        5: adc1_channel_t.ADC1_CHANNEL_4,
-        6: adc1_channel_t.ADC1_CHANNEL_5,
-        7: adc1_channel_t.ADC1_CHANNEL_6,
-        8: adc1_channel_t.ADC1_CHANNEL_7,
-        9: adc1_channel_t.ADC1_CHANNEL_8,
-        10: adc1_channel_t.ADC1_CHANNEL_9,
-    },
-    VARIANT_ESP32S3: {
-        1: adc1_channel_t.ADC1_CHANNEL_0,
-        2: adc1_channel_t.ADC1_CHANNEL_1,
-        3: adc1_channel_t.ADC1_CHANNEL_2,
-        4: adc1_channel_t.ADC1_CHANNEL_3,
-        5: adc1_channel_t.ADC1_CHANNEL_4,
-        6: adc1_channel_t.ADC1_CHANNEL_5,
-        7: adc1_channel_t.ADC1_CHANNEL_6,
-        8: adc1_channel_t.ADC1_CHANNEL_7,
-        9: adc1_channel_t.ADC1_CHANNEL_8,
-        10: adc1_channel_t.ADC1_CHANNEL_9,
-    },
-    VARIANT_ESP32C3: {
-        0: adc1_channel_t.ADC1_CHANNEL_0,
-        1: adc1_channel_t.ADC1_CHANNEL_1,
-        2: adc1_channel_t.ADC1_CHANNEL_2,
-        3: adc1_channel_t.ADC1_CHANNEL_3,
-        4: adc1_channel_t.ADC1_CHANNEL_4,
-    },
-    VARIANT_ESP32H2: {
-        0: adc1_channel_t.ADC1_CHANNEL_0,
-        1: adc1_channel_t.ADC1_CHANNEL_1,
-        2: adc1_channel_t.ADC1_CHANNEL_2,
-        3: adc1_channel_t.ADC1_CHANNEL_3,
-        4: adc1_channel_t.ADC1_CHANNEL_4,
-    },
 }
 
 
@@ -95,16 +29,15 @@ def validate_adc_pin(value):
         return cv.only_on_esp8266("VCC")
 
     if CORE.is_esp32:
+        from esphome.components.esp32 import is_esp32c3
+
         value = pins.internal_gpio_input_pin_number(value)
-        variant = get_esp32_variant()
-        if variant not in ESP32_VARIANT_ADC1_PIN_TO_CHANNEL:
-            raise cv.Invalid(f"This ESP32 variant ({variant}) is not supported")
-
-        if value not in ESP32_VARIANT_ADC1_PIN_TO_CHANNEL[variant]:
-            raise cv.Invalid(f"{variant} doesn't support ADC on this pin")
-        return pins.internal_gpio_input_pin_schema(value)
-
-    if CORE.is_esp8266:
+        if is_esp32c3():
+            if not (0 <= value <= 4):  # ADC1
+                raise cv.Invalid("ESP32-C3: Only pins 0 though 4 support ADC.")
+        if not (32 <= value <= 39):  # ADC1
+            raise cv.Invalid("ESP32: Only pins 32 though 39 support ADC.")
+    elif CORE.is_esp8266:
         from esphome.components.esp8266.gpio import CONF_ANALOG
 
         value = pins.internal_gpio_pin_number({CONF_ANALOG: True, CONF_INPUT: True})(
@@ -116,14 +49,10 @@ def validate_adc_pin(value):
         return pins.gpio_pin_schema(
             {CONF_ANALOG: True, CONF_INPUT: True}, internal=True
         )(value)
+    else:
+        raise NotImplementedError
 
-    raise NotImplementedError
-
-
-def validate_config(config):
-    if config[CONF_RAW] and config.get(CONF_ATTENUATION, None) == "auto":
-        raise cv.Invalid("Automatic attenuation cannot be used when raw output is set.")
-    return config
+    return pins.internal_gpio_input_pin_schema(value)
 
 
 adc_ns = cg.esphome_ns.namespace("adc")
@@ -131,7 +60,7 @@ ADCSensor = adc_ns.class_(
     "ADCSensor", sensor.Sensor, cg.PollingComponent, voltage_sampler.VoltageSampler
 )
 
-CONFIG_SCHEMA = cv.All(
+CONFIG_SCHEMA = (
     sensor.sensor_schema(
         unit_of_measurement=UNIT_VOLT,
         accuracy_decimals=2,
@@ -142,14 +71,12 @@ CONFIG_SCHEMA = cv.All(
         {
             cv.GenerateID(): cv.declare_id(ADCSensor),
             cv.Required(CONF_PIN): validate_adc_pin,
-            cv.Optional(CONF_RAW, default=False): cv.boolean,
             cv.SplitDefault(CONF_ATTENUATION, esp32="0db"): cv.All(
                 cv.only_on_esp32, cv.enum(ATTENUATION_MODES, lower=True)
             ),
         }
     )
-    .extend(cv.polling_component_schema("60s")),
-    validate_config,
+    .extend(cv.polling_component_schema("60s"))
 )
 
 
@@ -164,17 +91,5 @@ async def to_code(config):
         pin = await cg.gpio_pin_expression(config[CONF_PIN])
         cg.add(var.set_pin(pin))
 
-    if CONF_RAW in config:
-        cg.add(var.set_output_raw(config[CONF_RAW]))
-
     if CONF_ATTENUATION in config:
-        if config[CONF_ATTENUATION] == "auto":
-            cg.add(var.set_autorange(cg.global_ns.true))
-        else:
-            cg.add(var.set_attenuation(config[CONF_ATTENUATION]))
-
-    if CORE.is_esp32:
-        variant = get_esp32_variant()
-        pin_num = config[CONF_PIN][CONF_NUMBER]
-        chan = ESP32_VARIANT_ADC1_PIN_TO_CHANNEL[variant][pin_num]
-        cg.add(var.set_channel(chan))
+        cg.add(var.set_attenuation(config[CONF_ATTENUATION]))

esphome/components/aht10/aht10.cpp

@@ -73,6 +73,13 @@ void AHT10Component::update() {
   bool success = false;
   for (int i = 0; i < AHT10_ATTEMPTS; ++i) {
     ESP_LOGVV(TAG, "Attempt %d at %6u", i, millis());
+    delay_microseconds_accurate(4);
+
+    uint8_t reg = 0;
+    if (this->write(&reg, 1) != i2c::ERROR_OK) {
+      ESP_LOGD(TAG, "Communication with AHT10 failed, waiting...");
+      continue;
+    }
     delay(delay_ms);
     if (this->read(data, 6) != i2c::ERROR_OK) {
       ESP_LOGD(TAG, "Communication with AHT10 failed, waiting...");
@@ -110,12 +117,12 @@ void AHT10Component::update() {
   uint32_t raw_temperature = ((data[3] & 0x0F) << 16) | (data[4] << 8) | data[5];
   uint32_t raw_humidity = ((data[1] << 16) | (data[2] << 8) | data[3]) >> 4;
 
-  float temperature = ((200.0f * (float) raw_temperature) / 1048576.0f) - 50.0f;
+  float temperature = ((200.0 * (float) raw_temperature) / 1048576.0) - 50.0;
   float humidity;
   if (raw_humidity == 0) {  // unrealistic value
     humidity = NAN;
   } else {
-    humidity = (float) raw_humidity * 100.0f / 1048576.0f;
+    humidity = (float) raw_humidity * 100.0 / 1048576.0;
   }
 
   if (this->temperature_sensor_ != nullptr) {

esphome/components/airthings_wave_mini/airthings_wave_mini.cpp

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

esphome/components/airthings_wave_plus/airthings_wave_plus.cpp

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

esphome/components/am2320/am2320.cpp

@@ -19,14 +19,12 @@ uint16_t crc_16(uint8_t *ptr, uint8_t length) {
   //------------------------------
   while (length--) {
     crc ^= *ptr++;
-    for (i = 0; i < 8; i++) {
+    for (i = 0; i < 8; i++)
       if ((crc & 0x01) != 0) {
         crc >>= 1;
         crc ^= 0xA001;
-      } else {
+      } else
         crc >>= 1;
-      }
-    }
   }
   return crc;
 }
@@ -40,9 +38,9 @@ void AM2320Component::update() {
     return;
   }
 
-  float temperature = (((data[4] & 0x7F) << 8) + data[5]) / 10.0f;
+  float temperature = (((data[4] & 0x7F) << 8) + data[5]) / 10.0;
   temperature = (data[4] & 0x80) ? -temperature : temperature;
-  float humidity = ((data[2] << 8) + data[3]) / 10.0f;
+  float humidity = ((data[2] << 8) + data[3]) / 10.0;
 
   ESP_LOGD(TAG, "Got temperature=%.1f°C humidity=%.1f%%", temperature, humidity);
   if (this->temperature_sensor_ != nullptr)

esphome/components/am43/am43.cpp

@@ -39,7 +39,7 @@ void Am43::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_i
       break;
     }
     case ESP_GATTC_SEARCH_CMPL_EVT: {
-      auto *chr = this->parent_->get_characteristic(AM43_SERVICE_UUID, AM43_CHARACTERISTIC_UUID);
+      auto chr = this->parent_->get_characteristic(AM43_SERVICE_UUID, AM43_CHARACTERISTIC_UUID);
       if (chr == nullptr) {
         if (this->parent_->get_characteristic(AM43_TUYA_SERVICE_UUID, AM43_TUYA_CHARACTERISTIC_UUID) != nullptr) {
           ESP_LOGE(TAG, "[%s] Detected a Tuya AM43 which is not supported, sorry.",
@@ -75,14 +75,13 @@ void Am43::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_i
 
       if (this->current_sensor_ > 0) {
         if (this->illuminance_ != nullptr) {
-          auto *packet = this->encoder_->get_light_level_request();
+          auto packet = this->encoder_->get_light_level_request();
           auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_,
                                                  packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP,
                                                  ESP_GATT_AUTH_REQ_NONE);
-          if (status) {
+          if (status)
             ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(),
                      status);
-          }
         }
         this->current_sensor_ = 0;
       }
@@ -100,7 +99,7 @@ void Am43::update() {
   }
   if (this->current_sensor_ == 0) {
     if (this->battery_ != nullptr) {
-      auto *packet = this->encoder_->get_battery_level_request();
+      auto packet = this->encoder_->get_battery_level_request();
       auto status =
           esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_, packet->length,
                                    packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);

esphome/components/am43/cover/__init__.py

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

esphome/components/am43/cover/am43_cover.cpp

@@ -25,16 +25,15 @@ void Am43Component::setup() {
 
 void Am43Component::loop() {
   if (this->node_state == espbt::ClientState::ESTABLISHED && !this->logged_in_) {
-    auto *packet = this->encoder_->get_send_pin_request(this->pin_);
+    auto packet = this->encoder_->get_send_pin_request(this->pin_);
     auto status =
         esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_, packet->length,
                                  packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
     ESP_LOGI(TAG, "[%s] Logging into AM43", this->get_name().c_str());
-    if (status) {
+    if (status)
       ESP_LOGW(TAG, "[%s] Error writing set_pin to device, error = %d", this->get_name().c_str(), status);
-    } else {
+    else
       this->logged_in_ = true;
-    }
   }
 }
 
@@ -52,7 +51,7 @@ void Am43Component::control(const CoverCall &call) {
     return;
   }
   if (call.get_stop()) {
-    auto *packet = this->encoder_->get_stop_request();
+    auto packet = this->encoder_->get_stop_request();
     auto status =
         esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_, packet->length,
                                  packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
@@ -64,7 +63,7 @@ void Am43Component::control(const CoverCall &call) {
 
     if (this->invert_position_)
       pos = 1 - pos;
-    auto *packet = this->encoder_->get_set_position_request(100 - (uint8_t)(pos * 100));
+    auto packet = this->encoder_->get_set_position_request(100 - (uint8_t)(pos * 100));
     auto status =
         esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_, packet->length,
                                  packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
@@ -81,7 +80,7 @@ void Am43Component::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
       break;
     }
     case ESP_GATTC_SEARCH_CMPL_EVT: {
-      auto *chr = this->parent_->get_characteristic(AM43_SERVICE_UUID, AM43_CHARACTERISTIC_UUID);
+      auto chr = this->parent_->get_characteristic(AM43_SERVICE_UUID, AM43_CHARACTERISTIC_UUID);
       if (chr == nullptr) {
         if (this->parent_->get_characteristic(AM43_TUYA_SERVICE_UUID, AM43_TUYA_CHARACTERISTIC_UUID) != nullptr) {
           ESP_LOGE(TAG, "[%s] Detected a Tuya AM43 which is not supported, sorry.", this->get_name().c_str());
@@ -121,7 +120,7 @@ void Am43Component::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
       if (this->decoder_->has_pin_response()) {
         if (this->decoder_->pin_ok_) {
           ESP_LOGI(TAG, "[%s] AM43 pin accepted.", this->get_name().c_str());
-          auto *packet = this->encoder_->get_position_request();
+          auto packet = this->encoder_->get_position_request();
           auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_,
                                                  packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP,
                                                  ESP_GATT_AUTH_REQ_NONE);

esphome/components/am43/sensor.py

@@ -4,8 +4,7 @@ from esphome.components import sensor, ble_client
 from esphome.const import (
     CONF_ID,
     CONF_BATTERY_LEVEL,
-    DEVICE_CLASS_BATTERY,
-    ENTITY_CATEGORY_DIAGNOSTIC,
+    ICON_BATTERY,
     CONF_ILLUMINANCE,
     ICON_BRIGHTNESS_5,
     UNIT_PERCENT,
@@ -21,15 +20,10 @@ CONFIG_SCHEMA = (
         {
             cv.GenerateID(): cv.declare_id(Am43),
             cv.Optional(CONF_BATTERY_LEVEL): sensor.sensor_schema(
-                unit_of_measurement=UNIT_PERCENT,
-                device_class=DEVICE_CLASS_BATTERY,
-                accuracy_decimals=0,
-                entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                UNIT_PERCENT, ICON_BATTERY, 0
             ),
             cv.Optional(CONF_ILLUMINANCE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_PERCENT,
-                icon=ICON_BRIGHTNESS_5,
-                accuracy_decimals=0,
+                UNIT_PERCENT, ICON_BRIGHTNESS_5, 0
             ),
         }
     )

esphome/components/animation/__init__.py

@@ -44,9 +44,8 @@ async def to_code(config):
     width, height = image.size
     frames = image.n_frames
     if CONF_RESIZE in config:
-        new_width_max, new_height_max = config[CONF_RESIZE]
-        ratio = min(new_width_max / width, new_height_max / height)
-        width, height = int(width * ratio), int(height * ratio)
+        image.thumbnail(config[CONF_RESIZE])
+        width, height = image.size
     else:
         if width > 500 or height > 500:
             _LOGGER.warning(
@@ -60,13 +59,7 @@ async def to_code(config):
         for frameIndex in range(frames):
             image.seek(frameIndex)
             frame = image.convert("L", dither=Image.NONE)
-            if CONF_RESIZE in config:
-                frame = frame.resize([width, height])
             pixels = list(frame.getdata())
-            if len(pixels) != height * width:
-                raise core.EsphomeError(
-                    f"Unexpected number of pixels in {path} frame {frameIndex}: ({len(pixels)} != {height*width})"
-                )
             for pix in pixels:
                 data[pos] = pix
                 pos += 1
@@ -77,13 +70,7 @@ async def to_code(config):
         for frameIndex in range(frames):
             image.seek(frameIndex)
             frame = image.convert("RGB")
-            if CONF_RESIZE in config:
-                frame = frame.resize([width, height])
             pixels = list(frame.getdata())
-            if len(pixels) != height * width:
-                raise core.EsphomeError(
-                    f"Unexpected number of pixels in {path} frame {frameIndex}: ({len(pixels)} != {height*width})"
-                )
             for pix in pixels:
                 data[pos] = pix[0]
                 pos += 1
@@ -98,8 +85,6 @@ async def to_code(config):
         for frameIndex in range(frames):
             image.seek(frameIndex)
             frame = image.convert("1", dither=Image.NONE)
-            if CONF_RESIZE in config:
-                frame = frame.resize([width, height])
             for y in range(height):
                 for x in range(width):
                     if frame.getpixel((x, y)):

esphome/components/anova/anova.cpp

@@ -40,7 +40,7 @@ void Anova::control(const ClimateCall &call) {
       ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(), status);
   }
   if (call.get_target_temperature().has_value()) {
-    auto *pkt = this->codec_->get_set_target_temp_request(*call.get_target_temperature());
+    auto pkt = this->codec_->get_set_target_temp_request(*call.get_target_temperature());
     auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_,
                                            pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
     if (status)
@@ -57,7 +57,7 @@ void Anova::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_
       break;
     }
     case ESP_GATTC_SEARCH_CMPL_EVT: {
-      auto *chr = this->parent_->get_characteristic(ANOVA_SERVICE_UUID, ANOVA_CHARACTERISTIC_UUID);
+      auto chr = this->parent_->get_characteristic(ANOVA_SERVICE_UUID, ANOVA_CHARACTERISTIC_UUID);
       if (chr == nullptr) {
         ESP_LOGW(TAG, "[%s] No control service found at device, not an Anova..?", this->get_name().c_str());
         ESP_LOGW(TAG, "[%s] Note, this component does not currently support Anova Nano.", this->get_name().c_str());
@@ -114,10 +114,9 @@ void Anova::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_
           auto status =
               esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_, pkt->length,
                                        pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
-          if (status) {
+          if (status)
             ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(),
                      status);
-          }
         }
       }
       break;
@@ -134,7 +133,7 @@ void Anova::update() {
     return;
 
   if (this->current_request_ < 2) {
-    auto *pkt = this->codec_->get_read_device_status_request();
+    auto pkt = this->codec_->get_read_device_status_request();
     if (this->current_request_ == 0)
       this->codec_->get_set_unit_request(this->fahrenheit_ ? 'f' : 'c');
     auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_,

esphome/components/anova/anova.h

@@ -30,13 +30,13 @@ class Anova : public climate::Climate, public esphome::ble_client::BLEClientNode
   climate::ClimateTraits traits() override {
     auto traits = climate::ClimateTraits();
     traits.set_supports_current_temperature(true);
-    traits.set_supported_modes({climate::CLIMATE_MODE_OFF, climate::ClimateMode::CLIMATE_MODE_HEAT});
+    traits.set_supports_heat_mode(true);
     traits.set_visual_min_temperature(25.0);
     traits.set_visual_max_temperature(100.0);
     traits.set_visual_temperature_step(0.1);
     return traits;
   }
-  void set_unit_of_measurement(const char *unit);
+  void set_unit_of_measurement(const char *);
 
  protected:
   std::unique_ptr<AnovaCodec> codec_;

esphome/components/anova/anova_base.cpp

@@ -73,46 +73,51 @@ AnovaPacket *AnovaCodec::get_stop_request() {
 }
 
 void AnovaCodec::decode(const uint8_t *data, uint16_t length) {
-  char buf[32];
-  memset(buf, 0, sizeof(buf));
-  strncpy(buf, (char *) data, std::min<uint16_t>(length, sizeof(buf) - 1));
+  memset(this->buf_, 0, 32);
+  strncpy(this->buf_, (char *) data, length);
   this->has_target_temp_ = this->has_current_temp_ = this->has_unit_ = this->has_running_ = false;
   switch (this->current_query_) {
     case READ_DEVICE_STATUS: {
-      if (!strncmp(buf, "stopped", 7)) {
+      if (!strncmp(this->buf_, "stopped", 7)) {
         this->has_running_ = true;
         this->running_ = false;
       }
-      if (!strncmp(buf, "running", 7)) {
+      if (!strncmp(this->buf_, "running", 7)) {
         this->has_running_ = true;
         this->running_ = true;
       }
       break;
     }
     case START: {
-      if (!strncmp(buf, "start", 5)) {
+      if (!strncmp(this->buf_, "start", 5)) {
         this->has_running_ = true;
         this->running_ = true;
       }
       break;
     }
     case STOP: {
-      if (!strncmp(buf, "stop", 4)) {
+      if (!strncmp(this->buf_, "stop", 4)) {
         this->has_running_ = true;
         this->running_ = false;
       }
       break;
     }
-    case READ_TARGET_TEMPERATURE:
+    case READ_TARGET_TEMPERATURE: {
+      this->target_temp_ = strtof(this->buf_, nullptr);
+      if (this->fahrenheit_)
+        this->target_temp_ = ftoc(this->target_temp_);
+      this->has_target_temp_ = true;
+      break;
+    }
     case SET_TARGET_TEMPERATURE: {
-      this->target_temp_ = parse_number<float>(str_until(buf, '\r')).value_or(0.0f);
+      this->target_temp_ = strtof(this->buf_, nullptr);
       if (this->fahrenheit_)
         this->target_temp_ = ftoc(this->target_temp_);
       this->has_target_temp_ = true;
       break;
     }
     case READ_CURRENT_TEMPERATURE: {
-      this->current_temp_ = parse_number<float>(str_until(buf, '\r')).value_or(0.0f);
+      this->current_temp_ = strtof(this->buf_, nullptr);
       if (this->fahrenheit_)
         this->current_temp_ = ftoc(this->current_temp_);
       this->has_current_temp_ = true;
@@ -120,8 +125,8 @@ void AnovaCodec::decode(const uint8_t *data, uint16_t length) {
     }
     case SET_UNIT:
     case READ_UNIT: {
-      this->unit_ = buf[0];
-      this->fahrenheit_ = buf[0] == 'f';
+      this->unit_ = this->buf_[0];
+      this->fahrenheit_ = this->buf_[0] == 'f';
       this->has_unit_ = true;
       break;
     }

esphome/components/anova/anova_base.h

@@ -70,6 +70,7 @@ class AnovaCodec {
   bool has_current_temp_;
   bool has_unit_;
   bool has_running_;
+  char buf_[32];
   bool fahrenheit_;
 
   CurrentQuery current_query_;

esphome/components/apds9960/apds9960.cpp

@@ -225,10 +225,9 @@ void APDS9960::read_gesture_data_() {
 
   uint8_t fifo_level;
   APDS9960_WARNING_CHECK(this->read_byte(0xAE, &fifo_level), "Reading FIFO level failed.");
-  if (fifo_level == 0) {
+  if (fifo_level == 0)
     // no data to process
     return;
-  }
 
   APDS9960_WARNING_CHECK(fifo_level <= 32, "FIFO level has invalid value.")
 

esphome/components/api/__init__.py

@@ -121,7 +121,7 @@ async def to_code(config):
         decoded = base64.b64decode(conf[CONF_KEY])
         cg.add(var.set_noise_psk(list(decoded)))
         cg.add_define("USE_API_NOISE")
-        cg.add_library("esphome/noise-c", "0.1.4")
+        cg.add_library("esphome/noise-c", "0.1.3")
     else:
         cg.add_define("USE_API_PLAINTEXT")
 

esphome/components/api/api.proto

@@ -40,7 +40,6 @@ service APIConnection {
   rpc climate_command (ClimateCommandRequest) returns (void) {}
   rpc number_command (NumberCommandRequest) returns (void) {}
   rpc select_command (SelectCommandRequest) returns (void) {}
-  rpc button_command (ButtonCommandRequest) returns (void) {}
 }
 
 
@@ -95,9 +94,6 @@ message HelloResponse {
   // and only exists for debugging/logging purposes.
   // For example "ESPHome v1.10.0 on ESP8266"
   string server_info = 3;
-
-  // The name of the server (App.get_name())
-  string name = 4;
 }
 
 // Message sent at the beginning of each connection to authenticate the client
@@ -186,8 +182,6 @@ message DeviceInfoResponse {
   // The esphome project details if set
   string project_name = 8;
   string project_version = 9;
-
-  uint32 webserver_port = 10;
 }
 
 message ListEntitiesRequest {
@@ -207,14 +201,6 @@ message SubscribeStatesRequest {
   // Empty
 }
 
-// ==================== COMMON =====================
-
-enum EntityCategory {
-  ENTITY_CATEGORY_NONE = 0;
-  ENTITY_CATEGORY_CONFIG = 1;
-  ENTITY_CATEGORY_DIAGNOSTIC = 2;
-}
-
 // ==================== BINARY SENSOR ====================
 message ListEntitiesBinarySensorResponse {
   option (id) = 12;
@@ -230,7 +216,6 @@ message ListEntitiesBinarySensorResponse {
   bool is_status_binary_sensor = 6;
   bool disabled_by_default = 7;
   string icon = 8;
-  EntityCategory entity_category = 9;
 }
 message BinarySensorStateResponse {
   option (id) = 21;
@@ -262,7 +247,6 @@ message ListEntitiesCoverResponse {
   string device_class = 8;
   bool disabled_by_default = 9;
   string icon = 10;
-  EntityCategory entity_category = 11;
 }
 
 enum LegacyCoverState {
@@ -332,7 +316,6 @@ message ListEntitiesFanResponse {
   int32 supported_speed_count = 8;
   bool disabled_by_default = 9;
   string icon = 10;
-  EntityCategory entity_category = 11;
 }
 enum FanSpeed {
   FAN_SPEED_LOW = 0;
@@ -409,7 +392,6 @@ message ListEntitiesLightResponse {
   repeated string effects = 11;
   bool disabled_by_default = 13;
   string icon = 14;
-  EntityCategory entity_category = 15;
 }
 message LightStateResponse {
   option (id) = 24;
@@ -498,7 +480,6 @@ message ListEntitiesSensorResponse {
   // Last reset type removed in 2021.9.0
   SensorLastResetType legacy_last_reset_type = 11;
   bool disabled_by_default = 12;
-  EntityCategory entity_category = 13;
 }
 message SensorStateResponse {
   option (id) = 25;
@@ -527,7 +508,6 @@ message ListEntitiesSwitchResponse {
   string icon = 5;
   bool assumed_state = 6;
   bool disabled_by_default = 7;
-  EntityCategory entity_category = 8;
 }
 message SwitchStateResponse {
   option (id) = 26;
@@ -561,7 +541,6 @@ message ListEntitiesTextSensorResponse {
 
   string icon = 5;
   bool disabled_by_default = 6;
-  EntityCategory entity_category = 7;
 }
 message TextSensorStateResponse {
   option (id) = 27;
@@ -722,8 +701,6 @@ message ListEntitiesCameraResponse {
   string name = 3;
   string unique_id = 4;
   bool disabled_by_default = 5;
-  string icon = 6;
-  EntityCategory entity_category = 7;
 }
 
 message CameraImageResponse {
@@ -818,7 +795,6 @@ message ListEntitiesClimateResponse {
   repeated string supported_custom_presets = 17;
   bool disabled_by_default = 18;
   string icon = 19;
-  EntityCategory entity_category = 20;
 }
 message ClimateStateResponse {
   option (id) = 47;
@@ -872,11 +848,6 @@ message ClimateCommandRequest {
 }
 
 // ==================== NUMBER ====================
-enum NumberMode {
-  NUMBER_MODE_AUTO = 0;
-  NUMBER_MODE_BOX = 1;
-  NUMBER_MODE_SLIDER = 2;
-}
 message ListEntitiesNumberResponse {
   option (id) = 49;
   option (source) = SOURCE_SERVER;
@@ -892,9 +863,6 @@ message ListEntitiesNumberResponse {
   float max_value = 7;
   float step = 8;
   bool disabled_by_default = 9;
-  EntityCategory entity_category = 10;
-  string unit_of_measurement = 11;
-  NumberMode mode = 12;
 }
 message NumberStateResponse {
   option (id) = 50;
@@ -932,7 +900,6 @@ message ListEntitiesSelectResponse {
   string icon = 5;
   repeated string options = 6;
   bool disabled_by_default = 7;
-  EntityCategory entity_category = 8;
 }
 message SelectStateResponse {
   option (id) = 53;
@@ -955,28 +922,3 @@ message SelectCommandRequest {
   fixed32 key = 1;
   string state = 2;
 }
-
-// ==================== BUTTON ====================
-message ListEntitiesButtonResponse {
-  option (id) = 61;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BUTTON";
-
-  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;
-  string device_class = 8;
-}
-message ButtonCommandRequest {
-  option (id) = 62;
-  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_BUTTON";
-  option (no_delay) = true;
-
-  fixed32 key = 1;
-}

esphome/components/api/api_connection.cpp

@@ -20,7 +20,6 @@ namespace esphome {
 namespace api {
 
 static const char *const TAG = "api.connection";
-static const int ESP32_CAMERA_STOP_STREAM = 5000;
 
 APIConnection::APIConnection(std::unique_ptr<socket::Socket> sock, APIServer *parent)
     : parent_(parent), initial_state_iterator_(parent, this), list_entities_iterator_(parent, this) {
@@ -79,8 +78,6 @@ void APIConnection::loop() {
     on_fatal_error();
     if (err == APIError::SOCKET_READ_FAILED && errno == ECONNRESET) {
       ESP_LOGW(TAG, "%s: Connection reset", client_info_.c_str());
-    } else if (err == APIError::CONNECTION_CLOSED) {
-      ESP_LOGW(TAG, "%s: Connection closed", client_info_.c_str());
     } else {
       ESP_LOGW(TAG, "%s: Reading failed: %s errno=%d", client_info_.c_str(), api_error_to_str(err), errno);
     }
@@ -133,7 +130,7 @@ void APIConnection::loop() {
 
   if (state_subs_at_ != -1) {
     const auto &subs = this->parent_->get_state_subs();
-    if (state_subs_at_ >= (int) subs.size()) {
+    if (state_subs_at_ >= subs.size()) {
       state_subs_at_ = -1;
     } else {
       auto &it = subs[state_subs_at_];
@@ -185,7 +182,6 @@ bool APIConnection::send_binary_sensor_info(binary_sensor::BinarySensor *binary_
   msg.is_status_binary_sensor = binary_sensor->is_status_binary_sensor();
   msg.disabled_by_default = binary_sensor->is_disabled_by_default();
   msg.icon = binary_sensor->get_icon();
-  msg.entity_category = static_cast<enums::EntityCategory>(binary_sensor->get_entity_category());
   return this->send_list_entities_binary_sensor_response(msg);
 }
 #endif
@@ -219,7 +215,6 @@ bool APIConnection::send_cover_info(cover::Cover *cover) {
   msg.device_class = cover->get_device_class();
   msg.disabled_by_default = cover->is_disabled_by_default();
   msg.icon = cover->get_icon();
-  msg.entity_category = static_cast<enums::EntityCategory>(cover->get_entity_category());
   return this->send_list_entities_cover_response(msg);
 }
 void APIConnection::cover_command(const CoverCommandRequest &msg) {
@@ -255,7 +250,7 @@ void APIConnection::cover_command(const CoverCommandRequest &msg) {
 // Shut-up about usage of deprecated speed_level_to_enum/speed_enum_to_level functions for a bit.
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-bool APIConnection::send_fan_state(fan::Fan *fan) {
+bool APIConnection::send_fan_state(fan::FanState *fan) {
   if (!this->state_subscription_)
     return false;
 
@@ -273,7 +268,7 @@ bool APIConnection::send_fan_state(fan::Fan *fan) {
     resp.direction = static_cast<enums::FanDirection>(fan->direction);
   return this->send_fan_state_response(resp);
 }
-bool APIConnection::send_fan_info(fan::Fan *fan) {
+bool APIConnection::send_fan_info(fan::FanState *fan) {
   auto traits = fan->get_traits();
   ListEntitiesFanResponse msg;
   msg.key = fan->get_object_id_hash();
@@ -286,11 +281,10 @@ bool APIConnection::send_fan_info(fan::Fan *fan) {
   msg.supported_speed_count = traits.supported_speed_count();
   msg.disabled_by_default = fan->is_disabled_by_default();
   msg.icon = fan->get_icon();
-  msg.entity_category = static_cast<enums::EntityCategory>(fan->get_entity_category());
   return this->send_list_entities_fan_response(msg);
 }
 void APIConnection::fan_command(const FanCommandRequest &msg) {
-  fan::Fan *fan = App.get_fan_by_key(msg.key);
+  fan::FanState *fan = App.get_fan_by_key(msg.key);
   if (fan == nullptr)
     return;
 
@@ -350,7 +344,6 @@ bool APIConnection::send_light_info(light::LightState *light) {
 
   msg.disabled_by_default = light->is_disabled_by_default();
   msg.icon = light->get_icon();
-  msg.entity_category = static_cast<enums::EntityCategory>(light->get_entity_category());
 
   for (auto mode : traits.get_supported_color_modes())
     msg.supported_color_modes.push_back(static_cast<enums::ColorMode>(mode));
@@ -437,7 +430,7 @@ bool APIConnection::send_sensor_info(sensor::Sensor *sensor) {
   msg.device_class = sensor->get_device_class();
   msg.state_class = static_cast<enums::SensorStateClass>(sensor->get_state_class());
   msg.disabled_by_default = sensor->is_disabled_by_default();
-  msg.entity_category = static_cast<enums::EntityCategory>(sensor->get_entity_category());
+
   return this->send_list_entities_sensor_response(msg);
 }
 #endif
@@ -461,7 +454,6 @@ bool APIConnection::send_switch_info(switch_::Switch *a_switch) {
   msg.icon = a_switch->get_icon();
   msg.assumed_state = a_switch->assumed_state();
   msg.disabled_by_default = a_switch->is_disabled_by_default();
-  msg.entity_category = static_cast<enums::EntityCategory>(a_switch->get_entity_category());
   return this->send_list_entities_switch_response(msg);
 }
 void APIConnection::switch_command(const SwitchCommandRequest &msg) {
@@ -469,11 +461,10 @@ void APIConnection::switch_command(const SwitchCommandRequest &msg) {
   if (a_switch == nullptr)
     return;
 
-  if (msg.state) {
+  if (msg.state)
     a_switch->turn_on();
-  } else {
+  else
     a_switch->turn_off();
-  }
 }
 #endif
 
@@ -498,7 +489,6 @@ bool APIConnection::send_text_sensor_info(text_sensor::TextSensor *text_sensor)
     msg.unique_id = get_default_unique_id("text_sensor", text_sensor);
   msg.icon = text_sensor->get_icon();
   msg.disabled_by_default = text_sensor->is_disabled_by_default();
-  msg.entity_category = static_cast<enums::EntityCategory>(text_sensor->get_entity_category());
   return this->send_list_entities_text_sensor_response(msg);
 }
 #endif
@@ -545,7 +535,6 @@ bool APIConnection::send_climate_info(climate::Climate *climate) {
 
   msg.disabled_by_default = climate->is_disabled_by_default();
   msg.icon = climate->get_icon();
-  msg.entity_category = static_cast<enums::EntityCategory>(climate->get_entity_category());
 
   msg.supports_current_temperature = traits.get_supports_current_temperature();
   msg.supports_two_point_target_temperature = traits.get_supports_two_point_target_temperature();
@@ -620,9 +609,6 @@ bool APIConnection::send_number_info(number::Number *number) {
   msg.unique_id = get_default_unique_id("number", number);
   msg.icon = number->get_icon();
   msg.disabled_by_default = number->is_disabled_by_default();
-  msg.entity_category = static_cast<enums::EntityCategory>(number->get_entity_category());
-  msg.unit_of_measurement = number->traits.get_unit_of_measurement();
-  msg.mode = static_cast<enums::NumberMode>(number->traits.get_mode());
 
   msg.min_value = number->traits.get_min_value();
   msg.max_value = number->traits.get_max_value();
@@ -660,7 +646,6 @@ bool APIConnection::send_select_info(select::Select *select) {
   msg.unique_id = get_default_unique_id("select", select);
   msg.icon = select->get_icon();
   msg.disabled_by_default = select->is_disabled_by_default();
-  msg.entity_category = static_cast<enums::EntityCategory>(select->get_entity_category());
 
   for (const auto &option : select->traits.get_options())
     msg.options.push_back(option);
@@ -678,37 +663,13 @@ void APIConnection::select_command(const SelectCommandRequest &msg) {
 }
 #endif
 
-#ifdef USE_BUTTON
-bool APIConnection::send_button_info(button::Button *button) {
-  ListEntitiesButtonResponse msg;
-  msg.key = button->get_object_id_hash();
-  msg.object_id = button->get_object_id();
-  msg.name = button->get_name();
-  msg.unique_id = get_default_unique_id("button", button);
-  msg.icon = button->get_icon();
-  msg.disabled_by_default = button->is_disabled_by_default();
-  msg.entity_category = static_cast<enums::EntityCategory>(button->get_entity_category());
-  msg.device_class = button->get_device_class();
-  return this->send_list_entities_button_response(msg);
-}
-void APIConnection::button_command(const ButtonCommandRequest &msg) {
-  button::Button *button = App.get_button_by_key(msg.key);
-  if (button == nullptr)
-    return;
-
-  button->press();
-}
-#endif
-
 #ifdef USE_ESP32_CAMERA
 void APIConnection::send_camera_state(std::shared_ptr<esp32_camera::CameraImage> image) {
   if (!this->state_subscription_)
     return;
   if (this->image_reader_.available())
     return;
-  if (image->was_requested_by(esphome::esp32_camera::API_REQUESTER) ||
-      image->was_requested_by(esphome::esp32_camera::IDLE))
-    this->image_reader_.set_image(std::move(image));
+  this->image_reader_.set_image(std::move(image));
 }
 bool APIConnection::send_camera_info(esp32_camera::ESP32Camera *camera) {
   ListEntitiesCameraResponse msg;
@@ -717,8 +678,6 @@ bool APIConnection::send_camera_info(esp32_camera::ESP32Camera *camera) {
   msg.name = camera->get_name();
   msg.unique_id = get_default_unique_id("camera", camera);
   msg.disabled_by_default = camera->is_disabled_by_default();
-  msg.icon = camera->get_icon();
-  msg.entity_category = static_cast<enums::EntityCategory>(camera->get_entity_category());
   return this->send_list_entities_camera_response(msg);
 }
 void APIConnection::camera_image(const CameraImageRequest &msg) {
@@ -726,14 +685,9 @@ void APIConnection::camera_image(const CameraImageRequest &msg) {
     return;
 
   if (msg.single)
-    esp32_camera::global_esp32_camera->request_image(esphome::esp32_camera::API_REQUESTER);
-  if (msg.stream) {
-    esp32_camera::global_esp32_camera->start_stream(esphome::esp32_camera::API_REQUESTER);
-
-    App.scheduler.set_timeout(this->parent_, "api_esp32_camera_stop_stream", ESP32_CAMERA_STOP_STREAM, []() {
-      esp32_camera::global_esp32_camera->stop_stream(esphome::esp32_camera::API_REQUESTER);
-    });
-  }
+    esp32_camera::global_esp32_camera->request_image();
+  if (msg.stream)
+    esp32_camera::global_esp32_camera->request_stream();
 }
 #endif
 
@@ -767,8 +721,6 @@ HelloResponse APIConnection::hello(const HelloRequest &msg) {
   resp.api_version_major = 1;
   resp.api_version_minor = 6;
   resp.server_info = App.get_name() + " (esphome v" ESPHOME_VERSION ")";
-  resp.name = App.get_name();
-
   this->connection_state_ = ConnectionState::CONNECTED;
   return resp;
 }
@@ -804,18 +756,14 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
 #ifdef ESPHOME_PROJECT_NAME
   resp.project_name = ESPHOME_PROJECT_NAME;
   resp.project_version = ESPHOME_PROJECT_VERSION;
-#endif
-#ifdef USE_WEBSERVER
-  resp.webserver_port = USE_WEBSERVER_PORT;
 #endif
   return resp;
 }
 void APIConnection::on_home_assistant_state_response(const HomeAssistantStateResponse &msg) {
-  for (auto &it : this->parent_->get_state_subs()) {
+  for (auto &it : this->parent_->get_state_subs())
     if (it.entity_id == msg.entity_id && it.attribute.value() == msg.attribute) {
       it.callback(msg.state);
     }
-  }
 }
 void APIConnection::execute_service(const ExecuteServiceRequest &msg) {
   bool found = false;

esphome/components/api/api_connection.h

@@ -32,8 +32,8 @@ class APIConnection : public APIServerConnection {
   void cover_command(const CoverCommandRequest &msg) override;
 #endif
 #ifdef USE_FAN
-  bool send_fan_state(fan::Fan *fan);
-  bool send_fan_info(fan::Fan *fan);
+  bool send_fan_state(fan::FanState *fan);
+  bool send_fan_info(fan::FanState *fan);
   void fan_command(const FanCommandRequest &msg) override;
 #endif
 #ifdef USE_LIGHT
@@ -73,10 +73,6 @@ class APIConnection : public APIServerConnection {
   bool send_select_state(select::Select *select, std::string state);
   bool send_select_info(select::Select *select);
   void select_command(const SelectCommandRequest &msg) override;
-#endif
-#ifdef USE_BUTTON
-  bool send_button_info(button::Button *button);
-  void button_command(const ButtonCommandRequest &msg) override;
 #endif
   bool send_log_message(int level, const char *tag, const char *line);
   void send_homeassistant_service_call(const HomeassistantServiceResponse &call) {

esphome/components/api/api_frame_helper.cpp

@@ -1,9 +1,7 @@
 #include "api_frame_helper.h"
 
 #include "esphome/core/log.h"
-#include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
-#include "esphome/core/application.h"
 #include "proto.h"
 #include <cstring>
 
@@ -12,7 +10,7 @@ namespace api {
 
 static const char *const TAG = "api.socket";
 
-/// Is the given return value (from write syscalls) a wouldblock error?
+/// Is the given return value (from read/write syscalls) a wouldblock error?
 bool is_would_block(ssize_t ret) {
   if (ret == -1) {
     return errno == EWOULDBLOCK || errno == EAGAIN;
@@ -66,8 +64,6 @@ const char *api_error_to_str(APIError err) {
     return "HANDSHAKESTATE_SPLIT_FAILED";
   } else if (err == APIError::BAD_HANDSHAKE_ERROR_BYTE) {
     return "BAD_HANDSHAKE_ERROR_BYTE";
-  } else if (err == APIError::CONNECTION_CLOSED) {
-    return "CONNECTION_CLOSED";
   }
   return "UNKNOWN";
 }
@@ -176,6 +172,9 @@ APIError APINoiseFrameHelper::loop() {
  * errno API_ERROR_HANDSHAKE_PACKET_LEN: Packet too big for this phase.
  */
 APIError APINoiseFrameHelper::try_read_frame_(ParsedFrame *frame) {
+  int err;
+  APIError aerr;
+
   if (frame == nullptr) {
     HELPER_LOG("Bad argument for try_read_frame_");
     return APIError::BAD_ARG;
@@ -186,20 +185,15 @@ APIError APINoiseFrameHelper::try_read_frame_(ParsedFrame *frame) {
     // no header information yet
     size_t to_read = 3 - rx_header_buf_len_;
     ssize_t received = socket_->read(&rx_header_buf_[rx_header_buf_len_], to_read);
-    if (received == -1) {
-      if (errno == EWOULDBLOCK || errno == EAGAIN) {
-        return APIError::WOULD_BLOCK;
-      }
+    if (is_would_block(received)) {
+      return APIError::WOULD_BLOCK;
+    } else if (received == -1) {
       state_ = State::FAILED;
       HELPER_LOG("Socket read failed with errno %d", errno);
       return APIError::SOCKET_READ_FAILED;
-    } else if (received == 0) {
-      state_ = State::FAILED;
-      HELPER_LOG("Connection closed");
-      return APIError::CONNECTION_CLOSED;
     }
     rx_header_buf_len_ += received;
-    if ((size_t) received != to_read) {
+    if (received != to_read) {
       // not a full read
       return APIError::WOULD_BLOCK;
     }
@@ -233,20 +227,15 @@ APIError APINoiseFrameHelper::try_read_frame_(ParsedFrame *frame) {
     // more data to read
     size_t to_read = msg_size - rx_buf_len_;
     ssize_t received = socket_->read(&rx_buf_[rx_buf_len_], to_read);
-    if (received == -1) {
-      if (errno == EWOULDBLOCK || errno == EAGAIN) {
-        return APIError::WOULD_BLOCK;
-      }
+    if (is_would_block(received)) {
+      return APIError::WOULD_BLOCK;
+    } else if (received == -1) {
       state_ = State::FAILED;
       HELPER_LOG("Socket read failed with errno %d", errno);
       return APIError::SOCKET_READ_FAILED;
-    } else if (received == 0) {
-      state_ = State::FAILED;
-      HELPER_LOG("Connection closed");
-      return APIError::CONNECTION_CLOSED;
     }
     rx_buf_len_ += received;
-    if ((size_t) received != to_read) {
+    if (received != to_read) {
       // not all read
       return APIError::WOULD_BLOCK;
     }
@@ -254,7 +243,7 @@ APIError APINoiseFrameHelper::try_read_frame_(ParsedFrame *frame) {
 
   // uncomment for even more debugging
 #ifdef HELPER_LOG_PACKETS
-  ESP_LOGVV(TAG, "Received frame: %s", format_hex_pretty(rx_buf_).c_str());
+  ESP_LOGVV(TAG, "Received frame: %s", hexencode(rx_buf_).c_str());
 #endif
   frame->msg = std::move(rx_buf_);
   // consume msg
@@ -303,16 +292,9 @@ APIError APINoiseFrameHelper::state_action_() {
   }
   if (state_ == State::SERVER_HELLO) {
     // send server hello
-    std::vector<uint8_t> msg;
-    // chosen proto
-    msg.push_back(0x01);
-
-    // node name, terminated by null byte
-    const std::string &name = App.get_name();
-    const uint8_t *name_ptr = reinterpret_cast<const uint8_t *>(name.c_str());
-    msg.insert(msg.end(), name_ptr, name_ptr + name.size() + 1);
-
-    aerr = write_frame_(msg.data(), msg.size());
+    uint8_t msg[1];
+    msg[0] = 0x01;  // chosen proto
+    aerr = write_frame_(msg, 1);
     if (aerr != APIError::OK)
       return aerr;
 
@@ -550,13 +532,13 @@ APIError APINoiseFrameHelper::try_send_tx_buf_() {
 APIError APINoiseFrameHelper::write_raw_(const struct iovec *iov, int iovcnt) {
   if (iovcnt == 0)
     return APIError::OK;
+  int err;
   APIError aerr;
 
   size_t total_write_len = 0;
   for (int i = 0; i < iovcnt; i++) {
 #ifdef HELPER_LOG_PACKETS
-    ESP_LOGVV(TAG, "Sending raw: %s",
-              format_hex_pretty(reinterpret_cast<uint8_t *>(iov[i].iov_base), iov[i].iov_len).c_str());
+    ESP_LOGVV(TAG, "Sending raw: %s", hexencode(reinterpret_cast<uint8_t *>(iov[i].iov_base), iov[i].iov_len).c_str());
 #endif
     total_write_len += iov[i].iov_len;
   }
@@ -590,7 +572,7 @@ APIError APINoiseFrameHelper::write_raw_(const struct iovec *iov, int iovcnt) {
     state_ = State::FAILED;
     HELPER_LOG("Socket write failed with errno %d", errno);
     return APIError::SOCKET_WRITE_FAILED;
-  } else if ((size_t) sent != total_write_len) {
+  } else if (sent != total_write_len) {
     // partially sent, add end to tx_buf
     size_t to_consume = sent;
     for (int i = 0; i < iovcnt; i++) {
@@ -730,12 +712,7 @@ APIError APINoiseFrameHelper::shutdown(int how) {
 }
 extern "C" {
 // declare how noise generates random bytes (here with a good HWRNG based on the RF system)
-void noise_rand_bytes(void *output, size_t len) {
-  if (!esphome::random_bytes(reinterpret_cast<uint8_t *>(output), len)) {
-    ESP_LOGE(TAG, "Failed to acquire random bytes, rebooting!");
-    arch_restart();
-  }
-}
+void noise_rand_bytes(void *output, size_t len) { esphome::fill_random(reinterpret_cast<uint8_t *>(output), len); }
 }
 #endif  // USE_API_NOISE
 
@@ -789,6 +766,9 @@ APIError APIPlaintextFrameHelper::loop() {
  * error API_ERROR_BAD_INDICATOR: Bad indicator byte at start of frame.
  */
 APIError APIPlaintextFrameHelper::try_read_frame_(ParsedFrame *frame) {
+  int err;
+  APIError aerr;
+
   if (frame == nullptr) {
     HELPER_LOG("Bad argument for try_read_frame_");
     return APIError::BAD_ARG;
@@ -798,17 +778,12 @@ APIError APIPlaintextFrameHelper::try_read_frame_(ParsedFrame *frame) {
   while (!rx_header_parsed_) {
     uint8_t data;
     ssize_t received = socket_->read(&data, 1);
-    if (received == -1) {
-      if (errno == EWOULDBLOCK || errno == EAGAIN) {
-        return APIError::WOULD_BLOCK;
-      }
+    if (is_would_block(received)) {
+      return APIError::WOULD_BLOCK;
+    } else if (received == -1) {
       state_ = State::FAILED;
       HELPER_LOG("Socket read failed with errno %d", errno);
       return APIError::SOCKET_READ_FAILED;
-    } else if (received == 0) {
-      state_ = State::FAILED;
-      HELPER_LOG("Connection closed");
-      return APIError::CONNECTION_CLOSED;
     }
     rx_header_buf_.push_back(data);
 
@@ -849,20 +824,15 @@ APIError APIPlaintextFrameHelper::try_read_frame_(ParsedFrame *frame) {
     // more data to read
     size_t to_read = rx_header_parsed_len_ - rx_buf_len_;
     ssize_t received = socket_->read(&rx_buf_[rx_buf_len_], to_read);
-    if (received == -1) {
-      if (errno == EWOULDBLOCK || errno == EAGAIN) {
-        return APIError::WOULD_BLOCK;
-      }
+    if (is_would_block(received)) {
+      return APIError::WOULD_BLOCK;
+    } else if (received == -1) {
       state_ = State::FAILED;
       HELPER_LOG("Socket read failed with errno %d", errno);
       return APIError::SOCKET_READ_FAILED;
-    } else if (received == 0) {
-      state_ = State::FAILED;
-      HELPER_LOG("Connection closed");
-      return APIError::CONNECTION_CLOSED;
     }
     rx_buf_len_ += received;
-    if ((size_t) received != to_read) {
+    if (received != to_read) {
       // not all read
       return APIError::WOULD_BLOCK;
     }
@@ -870,7 +840,7 @@ APIError APIPlaintextFrameHelper::try_read_frame_(ParsedFrame *frame) {
 
   // uncomment for even more debugging
 #ifdef HELPER_LOG_PACKETS
-  ESP_LOGVV(TAG, "Received frame: %s", format_hex_pretty(rx_buf_).c_str());
+  ESP_LOGVV(TAG, "Received frame: %s", hexencode(rx_buf_).c_str());
 #endif
   frame->msg = std::move(rx_buf_);
   // consume msg
@@ -882,6 +852,7 @@ APIError APIPlaintextFrameHelper::try_read_frame_(ParsedFrame *frame) {
 }
 
 APIError APIPlaintextFrameHelper::read_packet(ReadPacketBuffer *buffer) {
+  int err;
   APIError aerr;
 
   if (state_ != State::DATA) {
@@ -901,6 +872,9 @@ APIError APIPlaintextFrameHelper::read_packet(ReadPacketBuffer *buffer) {
 }
 bool APIPlaintextFrameHelper::can_write_without_blocking() { return state_ == State::DATA && tx_buf_.empty(); }
 APIError APIPlaintextFrameHelper::write_packet(uint16_t type, const uint8_t *payload, size_t payload_len) {
+  int err;
+  APIError aerr;
+
   if (state_ != State::DATA) {
     return APIError::BAD_STATE;
   }
@@ -944,13 +918,13 @@ APIError APIPlaintextFrameHelper::try_send_tx_buf_() {
 APIError APIPlaintextFrameHelper::write_raw_(const struct iovec *iov, int iovcnt) {
   if (iovcnt == 0)
     return APIError::OK;
+  int err;
   APIError aerr;
 
   size_t total_write_len = 0;
   for (int i = 0; i < iovcnt; i++) {
 #ifdef HELPER_LOG_PACKETS
-    ESP_LOGVV(TAG, "Sending raw: %s",
-              format_hex_pretty(reinterpret_cast<uint8_t *>(iov[i].iov_base), iov[i].iov_len).c_str());
+    ESP_LOGVV(TAG, "Sending raw: %s", hexencode(reinterpret_cast<uint8_t *>(iov[i].iov_base), iov[i].iov_len).c_str());
 #endif
     total_write_len += iov[i].iov_len;
   }
@@ -984,7 +958,7 @@ APIError APIPlaintextFrameHelper::write_raw_(const struct iovec *iov, int iovcnt
     state_ = State::FAILED;
     HELPER_LOG("Socket write failed with errno %d", errno);
     return APIError::SOCKET_WRITE_FAILED;
-  } else if ((size_t) sent != total_write_len) {
+  } else if (sent != total_write_len) {
     // partially sent, add end to tx_buf
     size_t to_consume = sent;
     for (int i = 0; i < iovcnt; i++) {

esphome/components/api/api_frame_helper.h

@@ -53,7 +53,6 @@ enum class APIError : int {
   HANDSHAKESTATE_SETUP_FAILED = 1019,
   HANDSHAKESTATE_SPLIT_FAILED = 1020,
   BAD_HANDSHAKE_ERROR_BYTE = 1021,
-  CONNECTION_CLOSED = 1022,
 };
 
 const char *api_error_to_str(APIError err);

esphome/components/api/api_pb2.cpp

@@ -6,18 +6,6 @@
 namespace esphome {
 namespace api {
 
-template<> const char *proto_enum_to_string<enums::EntityCategory>(enums::EntityCategory value) {
-  switch (value) {
-    case enums::ENTITY_CATEGORY_NONE:
-      return "ENTITY_CATEGORY_NONE";
-    case enums::ENTITY_CATEGORY_CONFIG:
-      return "ENTITY_CATEGORY_CONFIG";
-    case enums::ENTITY_CATEGORY_DIAGNOSTIC:
-      return "ENTITY_CATEGORY_DIAGNOSTIC";
-    default:
-      return "UNKNOWN";
-  }
-}
 template<> const char *proto_enum_to_string<enums::LegacyCoverState>(enums::LegacyCoverState value) {
   switch (value) {
     case enums::LEGACY_COVER_STATE_OPEN:
@@ -266,18 +254,6 @@ template<> const char *proto_enum_to_string<enums::ClimatePreset>(enums::Climate
       return "UNKNOWN";
   }
 }
-template<> const char *proto_enum_to_string<enums::NumberMode>(enums::NumberMode value) {
-  switch (value) {
-    case enums::NUMBER_MODE_AUTO:
-      return "NUMBER_MODE_AUTO";
-    case enums::NUMBER_MODE_BOX:
-      return "NUMBER_MODE_BOX";
-    case enums::NUMBER_MODE_SLIDER:
-      return "NUMBER_MODE_SLIDER";
-    default:
-      return "UNKNOWN";
-  }
-}
 bool HelloRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
     case 1: {
@@ -291,7 +267,7 @@ bool HelloRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value)
 void HelloRequest::encode(ProtoWriteBuffer buffer) const { buffer.encode_string(1, this->client_info); }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void HelloRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("HelloRequest {\n");
   out.append("  client_info: ");
   out.append("'").append(this->client_info).append("'");
@@ -319,10 +295,6 @@ bool HelloResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value)
       this->server_info = value.as_string();
       return true;
     }
-    case 4: {
-      this->name = value.as_string();
-      return true;
-    }
     default:
       return false;
   }
@@ -331,11 +303,10 @@ void HelloResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(1, this->api_version_major);
   buffer.encode_uint32(2, this->api_version_minor);
   buffer.encode_string(3, this->server_info);
-  buffer.encode_string(4, this->name);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void HelloResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("HelloResponse {\n");
   out.append("  api_version_major: ");
   sprintf(buffer, "%u", this->api_version_major);
@@ -350,10 +321,6 @@ void HelloResponse::dump_to(std::string &out) const {
   out.append("  server_info: ");
   out.append("'").append(this->server_info).append("'");
   out.append("\n");
-
-  out.append("  name: ");
-  out.append("'").append(this->name).append("'");
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -370,7 +337,7 @@ bool ConnectRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value
 void ConnectRequest::encode(ProtoWriteBuffer buffer) const { buffer.encode_string(1, this->password); }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ConnectRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ConnectRequest {\n");
   out.append("  password: ");
   out.append("'").append(this->password).append("'");
@@ -391,7 +358,7 @@ bool ConnectResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
 void ConnectResponse::encode(ProtoWriteBuffer buffer) const { buffer.encode_bool(1, this->invalid_password); }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ConnectResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ConnectResponse {\n");
   out.append("  invalid_password: ");
   out.append(YESNO(this->invalid_password));
@@ -429,10 +396,6 @@ bool DeviceInfoResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
       this->has_deep_sleep = value.as_bool();
       return true;
     }
-    case 10: {
-      this->webserver_port = value.as_uint32();
-      return true;
-    }
     default:
       return false;
   }
@@ -481,11 +444,10 @@ void DeviceInfoResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(7, this->has_deep_sleep);
   buffer.encode_string(8, this->project_name);
   buffer.encode_string(9, this->project_version);
-  buffer.encode_uint32(10, this->webserver_port);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void DeviceInfoResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("DeviceInfoResponse {\n");
   out.append("  uses_password: ");
   out.append(YESNO(this->uses_password));
@@ -522,11 +484,6 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
   out.append("  project_version: ");
   out.append("'").append(this->project_version).append("'");
   out.append("\n");
-
-  out.append("  webserver_port: ");
-  sprintf(buffer, "%u", this->webserver_port);
-  out.append(buffer);
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -552,10 +509,6 @@ bool ListEntitiesBinarySensorResponse::decode_varint(uint32_t field_id, ProtoVar
       this->disabled_by_default = value.as_bool();
       return true;
     }
-    case 9: {
-      this->entity_category = value.as_enum<enums::EntityCategory>();
-      return true;
-    }
     default:
       return false;
   }
@@ -605,11 +558,10 @@ void ListEntitiesBinarySensorResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(6, this->is_status_binary_sensor);
   buffer.encode_bool(7, this->disabled_by_default);
   buffer.encode_string(8, this->icon);
-  buffer.encode_enum<enums::EntityCategory>(9, this->entity_category);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesBinarySensorResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesBinarySensorResponse {\n");
   out.append("  object_id: ");
   out.append("'").append(this->object_id).append("'");
@@ -643,10 +595,6 @@ void ListEntitiesBinarySensorResponse::dump_to(std::string &out) const {
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
-
-  out.append("  entity_category: ");
-  out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -681,7 +629,7 @@ void BinarySensorStateResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BinarySensorStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("BinarySensorStateResponse {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -716,10 +664,6 @@ bool ListEntitiesCoverResponse::decode_varint(uint32_t field_id, ProtoVarInt val
       this->disabled_by_default = value.as_bool();
       return true;
     }
-    case 11: {
-      this->entity_category = value.as_enum<enums::EntityCategory>();
-      return true;
-    }
     default:
       return false;
   }
@@ -771,11 +715,10 @@ void ListEntitiesCoverResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(8, this->device_class);
   buffer.encode_bool(9, this->disabled_by_default);
   buffer.encode_string(10, this->icon);
-  buffer.encode_enum<enums::EntityCategory>(11, this->entity_category);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesCoverResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesCoverResponse {\n");
   out.append("  object_id: ");
   out.append("'").append(this->object_id).append("'");
@@ -817,10 +760,6 @@ void ListEntitiesCoverResponse::dump_to(std::string &out) const {
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
-
-  out.append("  entity_category: ");
-  out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -865,7 +804,7 @@ void CoverStateResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void CoverStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("CoverStateResponse {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -948,7 +887,7 @@ void CoverCommandRequest::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void CoverCommandRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("CoverCommandRequest {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -1009,10 +948,6 @@ bool ListEntitiesFanResponse::decode_varint(uint32_t field_id, ProtoVarInt value
       this->disabled_by_default = value.as_bool();
       return true;
     }
-    case 11: {
-      this->entity_category = value.as_enum<enums::EntityCategory>();
-      return true;
-    }
     default:
       return false;
   }
@@ -1060,11 +995,10 @@ void ListEntitiesFanResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_int32(8, this->supported_speed_count);
   buffer.encode_bool(9, this->disabled_by_default);
   buffer.encode_string(10, this->icon);
-  buffer.encode_enum<enums::EntityCategory>(11, this->entity_category);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesFanResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesFanResponse {\n");
   out.append("  object_id: ");
   out.append("'").append(this->object_id).append("'");
@@ -1107,10 +1041,6 @@ void ListEntitiesFanResponse::dump_to(std::string &out) const {
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
-
-  out.append("  entity_category: ");
-  out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -1160,7 +1090,7 @@ void FanStateResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void FanStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("FanStateResponse {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -1261,7 +1191,7 @@ void FanCommandRequest::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void FanCommandRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("FanCommandRequest {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -1337,10 +1267,6 @@ bool ListEntitiesLightResponse::decode_varint(uint32_t field_id, ProtoVarInt val
       this->disabled_by_default = value.as_bool();
       return true;
     }
-    case 15: {
-      this->entity_category = value.as_enum<enums::EntityCategory>();
-      return true;
-    }
     default:
       return false;
   }
@@ -1408,11 +1334,10 @@ void ListEntitiesLightResponse::encode(ProtoWriteBuffer buffer) const {
   }
   buffer.encode_bool(13, this->disabled_by_default);
   buffer.encode_string(14, this->icon);
-  buffer.encode_enum<enums::EntityCategory>(15, this->entity_category);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesLightResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesLightResponse {\n");
   out.append("  object_id: ");
   out.append("'").append(this->object_id).append("'");
@@ -1476,10 +1401,6 @@ void ListEntitiesLightResponse::dump_to(std::string &out) const {
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
-
-  out.append("  entity_category: ");
-  out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -1570,7 +1491,7 @@ void LightStateResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void LightStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("LightStateResponse {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -1793,7 +1714,7 @@ void LightCommandRequest::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void LightCommandRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("LightCommandRequest {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -1939,10 +1860,6 @@ bool ListEntitiesSensorResponse::decode_varint(uint32_t field_id, ProtoVarInt va
       this->disabled_by_default = value.as_bool();
       return true;
     }
-    case 13: {
-      this->entity_category = value.as_enum<enums::EntityCategory>();
-      return true;
-    }
     default:
       return false;
   }
@@ -2000,11 +1917,10 @@ void ListEntitiesSensorResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_enum<enums::SensorStateClass>(10, this->state_class);
   buffer.encode_enum<enums::SensorLastResetType>(11, this->legacy_last_reset_type);
   buffer.encode_bool(12, this->disabled_by_default);
-  buffer.encode_enum<enums::EntityCategory>(13, this->entity_category);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesSensorResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesSensorResponse {\n");
   out.append("  object_id: ");
   out.append("'").append(this->object_id).append("'");
@@ -2055,10 +1971,6 @@ void ListEntitiesSensorResponse::dump_to(std::string &out) const {
   out.append("  disabled_by_default: ");
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
-
-  out.append("  entity_category: ");
-  out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -2093,7 +2005,7 @@ void SensorStateResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SensorStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("SensorStateResponse {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -2121,10 +2033,6 @@ bool ListEntitiesSwitchResponse::decode_varint(uint32_t field_id, ProtoVarInt va
       this->disabled_by_default = value.as_bool();
       return true;
     }
-    case 8: {
-      this->entity_category = value.as_enum<enums::EntityCategory>();
-      return true;
-    }
     default:
       return false;
   }
@@ -2169,11 +2077,10 @@ void ListEntitiesSwitchResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(5, this->icon);
   buffer.encode_bool(6, this->assumed_state);
   buffer.encode_bool(7, this->disabled_by_default);
-  buffer.encode_enum<enums::EntityCategory>(8, this->entity_category);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesSwitchResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesSwitchResponse {\n");
   out.append("  object_id: ");
   out.append("'").append(this->object_id).append("'");
@@ -2203,10 +2110,6 @@ void ListEntitiesSwitchResponse::dump_to(std::string &out) const {
   out.append("  disabled_by_default: ");
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
-
-  out.append("  entity_category: ");
-  out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -2236,7 +2139,7 @@ void SwitchStateResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SwitchStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("SwitchStateResponse {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -2275,7 +2178,7 @@ void SwitchCommandRequest::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SwitchCommandRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("SwitchCommandRequest {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -2294,10 +2197,6 @@ bool ListEntitiesTextSensorResponse::decode_varint(uint32_t field_id, ProtoVarIn
       this->disabled_by_default = value.as_bool();
       return true;
     }
-    case 7: {
-      this->entity_category = value.as_enum<enums::EntityCategory>();
-      return true;
-    }
     default:
       return false;
   }
@@ -2341,11 +2240,10 @@ void ListEntitiesTextSensorResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(4, this->unique_id);
   buffer.encode_string(5, this->icon);
   buffer.encode_bool(6, this->disabled_by_default);
-  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesTextSensorResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesTextSensorResponse {\n");
   out.append("  object_id: ");
   out.append("'").append(this->object_id).append("'");
@@ -2371,10 +2269,6 @@ void ListEntitiesTextSensorResponse::dump_to(std::string &out) const {
   out.append("  disabled_by_default: ");
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
-
-  out.append("  entity_category: ");
-  out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -2415,7 +2309,7 @@ void TextSensorStateResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void TextSensorStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("TextSensorStateResponse {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -2452,7 +2346,7 @@ void SubscribeLogsRequest::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SubscribeLogsRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("SubscribeLogsRequest {\n");
   out.append("  level: ");
   out.append(proto_enum_to_string<enums::LogLevel>(this->level));
@@ -2495,7 +2389,7 @@ void SubscribeLogsResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SubscribeLogsResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("SubscribeLogsResponse {\n");
   out.append("  level: ");
   out.append(proto_enum_to_string<enums::LogLevel>(this->level));
@@ -2537,7 +2431,7 @@ void HomeassistantServiceMap::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void HomeassistantServiceMap::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("HomeassistantServiceMap {\n");
   out.append("  key: ");
   out.append("'").append(this->key).append("'");
@@ -2596,7 +2490,7 @@ void HomeassistantServiceResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void HomeassistantServiceResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("HomeassistantServiceResponse {\n");
   out.append("  service: ");
   out.append("'").append(this->service).append("'");
@@ -2652,7 +2546,7 @@ void SubscribeHomeAssistantStateResponse::encode(ProtoWriteBuffer buffer) const
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SubscribeHomeAssistantStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("SubscribeHomeAssistantStateResponse {\n");
   out.append("  entity_id: ");
   out.append("'").append(this->entity_id).append("'");
@@ -2689,7 +2583,7 @@ void HomeAssistantStateResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void HomeAssistantStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("HomeAssistantStateResponse {\n");
   out.append("  entity_id: ");
   out.append("'").append(this->entity_id).append("'");
@@ -2722,7 +2616,7 @@ bool GetTimeResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
 void GetTimeResponse::encode(ProtoWriteBuffer buffer) const { buffer.encode_fixed32(1, this->epoch_seconds); }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void GetTimeResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("GetTimeResponse {\n");
   out.append("  epoch_seconds: ");
   sprintf(buffer, "%u", this->epoch_seconds);
@@ -2757,7 +2651,7 @@ void ListEntitiesServicesArgument::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesServicesArgument::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesServicesArgument {\n");
   out.append("  name: ");
   out.append("'").append(this->name).append("'");
@@ -2802,7 +2696,7 @@ void ListEntitiesServicesResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesServicesResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesServicesResponse {\n");
   out.append("  name: ");
   out.append("'").append(this->name).append("'");
@@ -2896,7 +2790,7 @@ void ExecuteServiceArgument::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ExecuteServiceArgument::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ExecuteServiceArgument {\n");
   out.append("  bool_: ");
   out.append(YESNO(this->bool_));
@@ -2977,7 +2871,7 @@ void ExecuteServiceRequest::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ExecuteServiceRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ExecuteServiceRequest {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -2998,10 +2892,6 @@ bool ListEntitiesCameraResponse::decode_varint(uint32_t field_id, ProtoVarInt va
       this->disabled_by_default = value.as_bool();
       return true;
     }
-    case 7: {
-      this->entity_category = value.as_enum<enums::EntityCategory>();
-      return true;
-    }
     default:
       return false;
   }
@@ -3020,10 +2910,6 @@ bool ListEntitiesCameraResponse::decode_length(uint32_t field_id, ProtoLengthDel
       this->unique_id = value.as_string();
       return true;
     }
-    case 6: {
-      this->icon = value.as_string();
-      return true;
-    }
     default:
       return false;
   }
@@ -3044,12 +2930,10 @@ void ListEntitiesCameraResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(3, this->name);
   buffer.encode_string(4, this->unique_id);
   buffer.encode_bool(5, this->disabled_by_default);
-  buffer.encode_string(6, this->icon);
-  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesCameraResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesCameraResponse {\n");
   out.append("  object_id: ");
   out.append("'").append(this->object_id).append("'");
@@ -3071,14 +2955,6 @@ void ListEntitiesCameraResponse::dump_to(std::string &out) const {
   out.append("  disabled_by_default: ");
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
-
-  out.append("  icon: ");
-  out.append("'").append(this->icon).append("'");
-  out.append("\n");
-
-  out.append("  entity_category: ");
-  out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -3119,7 +2995,7 @@ void CameraImageResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void CameraImageResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("CameraImageResponse {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -3156,7 +3032,7 @@ void CameraImageRequest::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void CameraImageRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("CameraImageRequest {\n");
   out.append("  single: ");
   out.append(YESNO(this->single));
@@ -3206,10 +3082,6 @@ bool ListEntitiesClimateResponse::decode_varint(uint32_t field_id, ProtoVarInt v
       this->disabled_by_default = value.as_bool();
       return true;
     }
-    case 20: {
-      this->entity_category = value.as_enum<enums::EntityCategory>();
-      return true;
-    }
     default:
       return false;
   }
@@ -3298,11 +3170,10 @@ void ListEntitiesClimateResponse::encode(ProtoWriteBuffer buffer) const {
   }
   buffer.encode_bool(18, this->disabled_by_default);
   buffer.encode_string(19, this->icon);
-  buffer.encode_enum<enums::EntityCategory>(20, this->entity_category);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesClimateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesClimateResponse {\n");
   out.append("  object_id: ");
   out.append("'").append(this->object_id).append("'");
@@ -3395,10 +3266,6 @@ void ListEntitiesClimateResponse::dump_to(std::string &out) const {
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
-
-  out.append("  entity_category: ");
-  out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -3489,7 +3356,7 @@ void ClimateStateResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ClimateStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ClimateStateResponse {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -3677,7 +3544,7 @@ void ClimateCommandRequest::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ClimateCommandRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ClimateCommandRequest {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -3775,14 +3642,6 @@ bool ListEntitiesNumberResponse::decode_varint(uint32_t field_id, ProtoVarInt va
       this->disabled_by_default = value.as_bool();
       return true;
     }
-    case 10: {
-      this->entity_category = value.as_enum<enums::EntityCategory>();
-      return true;
-    }
-    case 12: {
-      this->mode = value.as_enum<enums::NumberMode>();
-      return true;
-    }
     default:
       return false;
   }
@@ -3805,10 +3664,6 @@ bool ListEntitiesNumberResponse::decode_length(uint32_t field_id, ProtoLengthDel
       this->icon = value.as_string();
       return true;
     }
-    case 11: {
-      this->unit_of_measurement = value.as_string();
-      return true;
-    }
     default:
       return false;
   }
@@ -3845,13 +3700,10 @@ void ListEntitiesNumberResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_float(7, this->max_value);
   buffer.encode_float(8, this->step);
   buffer.encode_bool(9, this->disabled_by_default);
-  buffer.encode_enum<enums::EntityCategory>(10, this->entity_category);
-  buffer.encode_string(11, this->unit_of_measurement);
-  buffer.encode_enum<enums::NumberMode>(12, this->mode);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesNumberResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesNumberResponse {\n");
   out.append("  object_id: ");
   out.append("'").append(this->object_id).append("'");
@@ -3892,18 +3744,6 @@ void ListEntitiesNumberResponse::dump_to(std::string &out) const {
   out.append("  disabled_by_default: ");
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
-
-  out.append("  entity_category: ");
-  out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
-  out.append("\n");
-
-  out.append("  unit_of_measurement: ");
-  out.append("'").append(this->unit_of_measurement).append("'");
-  out.append("\n");
-
-  out.append("  mode: ");
-  out.append(proto_enum_to_string<enums::NumberMode>(this->mode));
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -3938,7 +3778,7 @@ void NumberStateResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void NumberStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("NumberStateResponse {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -3976,7 +3816,7 @@ void NumberCommandRequest::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void NumberCommandRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("NumberCommandRequest {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -3996,10 +3836,6 @@ bool ListEntitiesSelectResponse::decode_varint(uint32_t field_id, ProtoVarInt va
       this->disabled_by_default = value.as_bool();
       return true;
     }
-    case 8: {
-      this->entity_category = value.as_enum<enums::EntityCategory>();
-      return true;
-    }
     default:
       return false;
   }
@@ -4050,11 +3886,10 @@ void ListEntitiesSelectResponse::encode(ProtoWriteBuffer buffer) const {
     buffer.encode_string(6, it, true);
   }
   buffer.encode_bool(7, this->disabled_by_default);
-  buffer.encode_enum<enums::EntityCategory>(8, this->entity_category);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesSelectResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesSelectResponse {\n");
   out.append("  object_id: ");
   out.append("'").append(this->object_id).append("'");
@@ -4086,10 +3921,6 @@ void ListEntitiesSelectResponse::dump_to(std::string &out) const {
   out.append("  disabled_by_default: ");
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
-
-  out.append("  entity_category: ");
-  out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -4130,7 +3961,7 @@ void SelectStateResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SelectStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("SelectStateResponse {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -4173,7 +4004,7 @@ void SelectCommandRequest::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SelectCommandRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("SelectCommandRequest {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -4186,127 +4017,6 @@ void SelectCommandRequest::dump_to(std::string &out) const {
   out.append("}");
 }
 #endif
-bool ListEntitiesButtonResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 6: {
-      this->disabled_by_default = value.as_bool();
-      return true;
-    }
-    case 7: {
-      this->entity_category = value.as_enum<enums::EntityCategory>();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool ListEntitiesButtonResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 1: {
-      this->object_id = value.as_string();
-      return true;
-    }
-    case 3: {
-      this->name = value.as_string();
-      return true;
-    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
-    case 5: {
-      this->icon = value.as_string();
-      return true;
-    }
-    case 8: {
-      this->device_class = value.as_string();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool ListEntitiesButtonResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
-  switch (field_id) {
-    case 2: {
-      this->key = value.as_fixed32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void ListEntitiesButtonResponse::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_string(1, this->object_id);
-  buffer.encode_fixed32(2, this->key);
-  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
-  buffer.encode_string(5, this->icon);
-  buffer.encode_bool(6, this->disabled_by_default);
-  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
-  buffer.encode_string(8, this->device_class);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void ListEntitiesButtonResponse::dump_to(std::string &out) const {
-  char buffer[64];
-  out.append("ListEntitiesButtonResponse {\n");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id).append("'");
-  out.append("\n");
-
-  out.append("  key: ");
-  sprintf(buffer, "%u", this->key);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  name: ");
-  out.append("'").append(this->name).append("'");
-  out.append("\n");
-
-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
-  out.append("  icon: ");
-  out.append("'").append(this->icon).append("'");
-  out.append("\n");
-
-  out.append("  disabled_by_default: ");
-  out.append(YESNO(this->disabled_by_default));
-  out.append("\n");
-
-  out.append("  entity_category: ");
-  out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
-  out.append("\n");
-
-  out.append("  device_class: ");
-  out.append("'").append(this->device_class).append("'");
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool ButtonCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
-  switch (field_id) {
-    case 1: {
-      this->key = value.as_fixed32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void ButtonCommandRequest::encode(ProtoWriteBuffer buffer) const { buffer.encode_fixed32(1, this->key); }
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void ButtonCommandRequest::dump_to(std::string &out) const {
-  char buffer[64];
-  out.append("ButtonCommandRequest {\n");
-  out.append("  key: ");
-  sprintf(buffer, "%u", this->key);
-  out.append(buffer);
-  out.append("\n");
-  out.append("}");
-}
-#endif
 
 }  // namespace api
 }  // namespace esphome

esphome/components/api/api_pb2.h

@@ -9,11 +9,6 @@ namespace api {
 
 namespace enums {
 
-enum EntityCategory : uint32_t {
-  ENTITY_CATEGORY_NONE = 0,
-  ENTITY_CATEGORY_CONFIG = 1,
-  ENTITY_CATEGORY_DIAGNOSTIC = 2,
-};
 enum LegacyCoverState : uint32_t {
   LEGACY_COVER_STATE_OPEN = 0,
   LEGACY_COVER_STATE_CLOSED = 1,
@@ -123,11 +118,6 @@ enum ClimatePreset : uint32_t {
   CLIMATE_PRESET_SLEEP = 6,
   CLIMATE_PRESET_ACTIVITY = 7,
 };
-enum NumberMode : uint32_t {
-  NUMBER_MODE_AUTO = 0,
-  NUMBER_MODE_BOX = 1,
-  NUMBER_MODE_SLIDER = 2,
-};
 
 }  // namespace enums
 
@@ -147,7 +137,6 @@ class HelloResponse : public ProtoMessage {
   uint32_t api_version_major{0};
   uint32_t api_version_minor{0};
   std::string server_info{};
-  std::string name{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -235,7 +224,6 @@ class DeviceInfoResponse : public ProtoMessage {
   bool has_deep_sleep{false};
   std::string project_name{};
   std::string project_version{};
-  uint32_t webserver_port{0};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -282,7 +270,6 @@ class ListEntitiesBinarySensorResponse : public ProtoMessage {
   bool is_status_binary_sensor{false};
   bool disabled_by_default{false};
   std::string icon{};
-  enums::EntityCategory entity_category{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -319,7 +306,6 @@ class ListEntitiesCoverResponse : public ProtoMessage {
   std::string device_class{};
   bool disabled_by_default{false};
   std::string icon{};
-  enums::EntityCategory entity_category{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -377,7 +363,6 @@ class ListEntitiesFanResponse : public ProtoMessage {
   int32_t supported_speed_count{0};
   bool disabled_by_default{false};
   std::string icon{};
-  enums::EntityCategory entity_category{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -443,7 +428,6 @@ class ListEntitiesLightResponse : public ProtoMessage {
   std::vector<std::string> effects{};
   bool disabled_by_default{false};
   std::string icon{};
-  enums::EntityCategory entity_category{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -532,7 +516,6 @@ class ListEntitiesSensorResponse : public ProtoMessage {
   enums::SensorStateClass state_class{};
   enums::SensorLastResetType legacy_last_reset_type{};
   bool disabled_by_default{false};
-  enums::EntityCategory entity_category{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -566,7 +549,6 @@ class ListEntitiesSwitchResponse : public ProtoMessage {
   std::string icon{};
   bool assumed_state{false};
   bool disabled_by_default{false};
-  enums::EntityCategory entity_category{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -611,7 +593,6 @@ class ListEntitiesTextSensorResponse : public ProtoMessage {
   std::string unique_id{};
   std::string icon{};
   bool disabled_by_default{false};
-  enums::EntityCategory entity_category{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -822,8 +803,6 @@ class ListEntitiesCameraResponse : public ProtoMessage {
   std::string name{};
   std::string unique_id{};
   bool disabled_by_default{false};
-  std::string icon{};
-  enums::EntityCategory entity_category{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -882,7 +861,6 @@ class ListEntitiesClimateResponse : public ProtoMessage {
   std::vector<std::string> supported_custom_presets{};
   bool disabled_by_default{false};
   std::string icon{};
-  enums::EntityCategory entity_category{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -962,9 +940,6 @@ class ListEntitiesNumberResponse : public ProtoMessage {
   float max_value{0.0f};
   float step{0.0f};
   bool disabled_by_default{false};
-  enums::EntityCategory entity_category{};
-  std::string unit_of_measurement{};
-  enums::NumberMode mode{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -1010,7 +985,6 @@ class ListEntitiesSelectResponse : public ProtoMessage {
   std::string icon{};
   std::vector<std::string> options{};
   bool disabled_by_default{false};
-  enums::EntityCategory entity_category{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -1049,37 +1023,6 @@ class SelectCommandRequest : public ProtoMessage {
   bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
   bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
 };
-class ListEntitiesButtonResponse : 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{};
-  std::string device_class{};
-  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 ButtonCommandRequest : public ProtoMessage {
- public:
-  uint32_t key{0};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
-};
 
 }  // namespace api
 }  // namespace esphome

esphome/components/api/api_pb2_service.cpp

@@ -282,16 +282,6 @@ bool APIServerConnectionBase::send_select_state_response(const SelectStateRespon
 #endif
 #ifdef USE_SELECT
 #endif
-#ifdef USE_BUTTON
-bool APIServerConnectionBase::send_list_entities_button_response(const ListEntitiesButtonResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_button_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesButtonResponse>(msg, 61);
-}
-#endif
-#ifdef USE_BUTTON
-#endif
 bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) {
   switch (msg_type) {
     case 1: {
@@ -523,17 +513,6 @@ bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
       ESP_LOGVV(TAG, "on_select_command_request: %s", msg.dump().c_str());
 #endif
       this->on_select_command_request(msg);
-#endif
-      break;
-    }
-    case 62: {
-#ifdef USE_BUTTON
-      ButtonCommandRequest msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_button_command_request: %s", msg.dump().c_str());
-#endif
-      this->on_button_command_request(msg);
 #endif
       break;
     }
@@ -758,19 +737,6 @@ void APIServerConnection::on_select_command_request(const SelectCommandRequest &
   this->select_command(msg);
 }
 #endif
-#ifdef USE_BUTTON
-void APIServerConnection::on_button_command_request(const ButtonCommandRequest &msg) {
-  if (!this->is_connection_setup()) {
-    this->on_no_setup_connection();
-    return;
-  }
-  if (!this->is_authenticated()) {
-    this->on_unauthenticated_access();
-    return;
-  }
-  this->button_command(msg);
-}
-#endif
 
 }  // namespace api
 }  // namespace esphome

esphome/components/api/api_pb2_service.h

@@ -129,12 +129,6 @@ class APIServerConnectionBase : public ProtoService {
 #endif
 #ifdef USE_SELECT
   virtual void on_select_command_request(const SelectCommandRequest &value){};
-#endif
-#ifdef USE_BUTTON
-  bool send_list_entities_button_response(const ListEntitiesButtonResponse &msg);
-#endif
-#ifdef USE_BUTTON
-  virtual void on_button_command_request(const ButtonCommandRequest &value){};
 #endif
  protected:
   bool read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) override;
@@ -177,9 +171,6 @@ class APIServerConnection : public APIServerConnectionBase {
 #endif
 #ifdef USE_SELECT
   virtual void select_command(const SelectCommandRequest &msg) = 0;
-#endif
-#ifdef USE_BUTTON
-  virtual void button_command(const ButtonCommandRequest &msg) = 0;
 #endif
  protected:
   void on_hello_request(const HelloRequest &msg) override;
@@ -218,9 +209,6 @@ class APIServerConnection : public APIServerConnectionBase {
 #ifdef USE_SELECT
   void on_select_command_request(const SelectCommandRequest &msg) override;
 #endif
-#ifdef USE_BUTTON
-  void on_button_command_request(const ButtonCommandRequest &msg) override;
-#endif
 };
 
 }  // namespace api

esphome/components/api/api_server.cpp

@@ -24,7 +24,7 @@ static const char *const TAG = "api";
 void APIServer::setup() {
   ESP_LOGCONFIG(TAG, "Setting up Home Assistant API server...");
   this->setup_controller();
-  socket_ = socket::socket_ip(SOCK_STREAM, 0);
+  socket_ = socket::socket(AF_INET, SOCK_STREAM, 0);
   if (socket_ == nullptr) {
     ESP_LOGW(TAG, "Could not create socket.");
     this->mark_failed();
@@ -43,16 +43,13 @@ void APIServer::setup() {
     return;
   }
 
-  struct sockaddr_storage server;
+  struct sockaddr_in server;
+  memset(&server, 0, sizeof(server));
+  server.sin_family = AF_INET;
+  server.sin_addr.s_addr = ESPHOME_INADDR_ANY;
+  server.sin_port = htons(this->port_);
 
-  socklen_t sl = socket::set_sockaddr_any((struct sockaddr *) &server, sizeof(server), htons(this->port_));
-  if (sl == 0) {
-    ESP_LOGW(TAG, "Socket unable to set sockaddr: errno %d", errno);
-    this->mark_failed();
-    return;
-  }
-
-  err = socket_->bind((struct sockaddr *) &server, sl);
+  err = socket_->bind((struct sockaddr *) &server, sizeof(server));
   if (err != 0) {
     ESP_LOGW(TAG, "Socket unable to bind: errno %d", errno);
     this->mark_failed();
@@ -80,13 +77,12 @@ void APIServer::setup() {
   this->last_connected_ = millis();
 
 #ifdef USE_ESP32_CAMERA
-  if (esp32_camera::global_esp32_camera != nullptr && !esp32_camera::global_esp32_camera->is_internal()) {
+  if (esp32_camera::global_esp32_camera != nullptr) {
     esp32_camera::global_esp32_camera->add_image_callback(
         [this](const std::shared_ptr<esp32_camera::CameraImage> &image) {
-          for (auto &c : this->clients_) {
+          for (auto &c : this->clients_)
             if (!c->remove_)
               c->send_camera_state(image);
-          }
         });
   }
 #endif
@@ -192,7 +188,7 @@ void APIServer::on_cover_update(cover::Cover *obj) {
 #endif
 
 #ifdef USE_FAN
-void APIServer::on_fan_update(fan::Fan *obj) {
+void APIServer::on_fan_update(fan::FanState *obj) {
   if (obj->is_internal())
     return;
   for (auto &c : this->clients_)

esphome/components/api/api_server.h

@@ -44,7 +44,7 @@ class APIServer : public Component, public Controller {
   void on_cover_update(cover::Cover *obj) override;
 #endif
 #ifdef USE_FAN
-  void on_fan_update(fan::Fan *obj) override;
+  void on_fan_update(fan::FanState *obj) override;
 #endif
 #ifdef USE_LIGHT
   void on_light_update(light::LightState *obj) override;

esphome/components/api/client.py

@@ -23,6 +23,7 @@ async def async_run_logs(config, address):
     _LOGGER.info("Starting log output from %s using esphome API", address)
     zc = zeroconf.Zeroconf()
     cli = APIClient(
+        asyncio.get_event_loop(),
         address,
         port,
         password,

esphome/components/api/homeassistant_service.h

@@ -8,18 +8,6 @@
 namespace esphome {
 namespace api {
 
-template<typename... X> class TemplatableStringValue : public TemplatableValue<std::string, X...> {
- public:
-  TemplatableStringValue() : TemplatableValue<std::string, X...>() {}
-
-  template<typename F, enable_if_t<!is_invocable<F, X...>::value, int> = 0>
-  TemplatableStringValue(F value) : TemplatableValue<std::string, X...>(value) {}
-
-  template<typename F, enable_if_t<is_invocable<F, X...>::value, int> = 0>
-  TemplatableStringValue(F f)
-      : TemplatableValue<std::string, X...>([f](X... x) -> std::string { return to_string(f(x...)); }) {}
-};
-
 template<typename... Ts> class TemplatableKeyValuePair {
  public:
   template<typename T> TemplatableKeyValuePair(std::string key, T value) : key(std::move(key)), value(value) {}
@@ -31,8 +19,7 @@ template<typename... Ts> class HomeAssistantServiceCallAction : public Action<Ts
  public:
   explicit HomeAssistantServiceCallAction(APIServer *parent, bool is_event) : parent_(parent), is_event_(is_event) {}
 
-  template<typename T> void set_service(T service) { this->service_ = service; }
-
+  TEMPLATABLE_STRING_VALUE(service);
   template<typename T> void add_data(std::string key, T value) {
     this->data_.push_back(TemplatableKeyValuePair<Ts...>(key, value));
   }
@@ -71,7 +58,6 @@ template<typename... Ts> class HomeAssistantServiceCallAction : public Action<Ts
  protected:
   APIServer *parent_;
   bool is_event_;
-  TemplatableStringValue<Ts...> service_{};
   std::vector<TemplatableKeyValuePair<Ts...>> data_;
   std::vector<TemplatableKeyValuePair<Ts...>> data_template_;
   std::vector<TemplatableKeyValuePair<Ts...>> variables_;

esphome/components/api/list_entities.cpp

@@ -16,7 +16,7 @@ bool ListEntitiesIterator::on_binary_sensor(binary_sensor::BinarySensor *binary_
 bool ListEntitiesIterator::on_cover(cover::Cover *cover) { return this->client_->send_cover_info(cover); }
 #endif
 #ifdef USE_FAN
-bool ListEntitiesIterator::on_fan(fan::Fan *fan) { return this->client_->send_fan_info(fan); }
+bool ListEntitiesIterator::on_fan(fan::FanState *fan) { return this->client_->send_fan_info(fan); }
 #endif
 #ifdef USE_LIGHT
 bool ListEntitiesIterator::on_light(light::LightState *light) { return this->client_->send_light_info(light); }
@@ -27,9 +27,6 @@ bool ListEntitiesIterator::on_sensor(sensor::Sensor *sensor) { return this->clie
 #ifdef USE_SWITCH
 bool ListEntitiesIterator::on_switch(switch_::Switch *a_switch) { return this->client_->send_switch_info(a_switch); }
 #endif
-#ifdef USE_BUTTON
-bool ListEntitiesIterator::on_button(button::Button *button) { return this->client_->send_button_info(button); }
-#endif
 #ifdef USE_TEXT_SENSOR
 bool ListEntitiesIterator::on_text_sensor(text_sensor::TextSensor *text_sensor) {
   return this->client_->send_text_sensor_info(text_sensor);

esphome/components/api/list_entities.h

@@ -19,7 +19,7 @@ class ListEntitiesIterator : public ComponentIterator {
   bool on_cover(cover::Cover *cover) override;
 #endif
 #ifdef USE_FAN
-  bool on_fan(fan::Fan *fan) override;
+  bool on_fan(fan::FanState *fan) override;
 #endif
 #ifdef USE_LIGHT
   bool on_light(light::LightState *light) override;
@@ -30,9 +30,6 @@ class ListEntitiesIterator : public ComponentIterator {
 #ifdef USE_SWITCH
   bool on_switch(switch_::Switch *a_switch) override;
 #endif
-#ifdef USE_BUTTON
-  bool on_button(button::Button *button) override;
-#endif
 #ifdef USE_TEXT_SENSOR
   bool on_text_sensor(text_sensor::TextSensor *text_sensor) override;
 #endif

esphome/components/api/proto.h

@@ -55,19 +55,17 @@ class ProtoVarInt {
   }
   int32_t as_sint32() const {
     // with ZigZag encoding
-    if (this->value_ & 1) {
+    if (this->value_ & 1)
       return static_cast<int32_t>(~(this->value_ >> 1));
-    } else {
+    else
       return static_cast<int32_t>(this->value_ >> 1);
-    }
   }
   int64_t as_sint64() const {
     // with ZigZag encoding
-    if (this->value_ & 1) {
+    if (this->value_ & 1)
       return static_cast<int64_t>(~(this->value_ >> 1));
-    } else {
+    else
       return static_cast<int64_t>(this->value_ >> 1);
-    }
   }
   void encode(std::vector<uint8_t> &out) {
     uint32_t val = this->value_;
@@ -222,11 +220,10 @@ class ProtoWriteBuffer {
   }
   void encode_sint32(uint32_t field_id, int32_t value, bool force = false) {
     uint32_t uvalue;
-    if (value < 0) {
+    if (value < 0)
       uvalue = ~(value << 1);
-    } else {
+    else
       uvalue = value << 1;
-    }
     this->encode_uint32(field_id, uvalue, force);
   }
   template<class C> void encode_message(uint32_t field_id, const C &value, bool force = false) {

esphome/components/api/subscribe_state.cpp

@@ -14,7 +14,7 @@ bool InitialStateIterator::on_binary_sensor(binary_sensor::BinarySensor *binary_
 bool InitialStateIterator::on_cover(cover::Cover *cover) { return this->client_->send_cover_state(cover); }
 #endif
 #ifdef USE_FAN
-bool InitialStateIterator::on_fan(fan::Fan *fan) { return this->client_->send_fan_state(fan); }
+bool InitialStateIterator::on_fan(fan::FanState *fan) { return this->client_->send_fan_state(fan); }
 #endif
 #ifdef USE_LIGHT
 bool InitialStateIterator::on_light(light::LightState *light) { return this->client_->send_light_state(light); }

esphome/components/api/subscribe_state.h

@@ -20,7 +20,7 @@ class InitialStateIterator : public ComponentIterator {
   bool on_cover(cover::Cover *cover) override;
 #endif
 #ifdef USE_FAN
-  bool on_fan(fan::Fan *fan) override;
+  bool on_fan(fan::FanState *fan) override;
 #endif
 #ifdef USE_LIGHT
   bool on_light(light::LightState *light) override;
@@ -31,9 +31,6 @@ class InitialStateIterator : public ComponentIterator {
 #ifdef USE_SWITCH
   bool on_switch(switch_::Switch *a_switch) override;
 #endif
-#ifdef USE_BUTTON
-  bool on_button(button::Button *button) override { return true; };
-#endif
 #ifdef USE_TEXT_SENSOR
   bool on_text_sensor(text_sensor::TextSensor *text_sensor) override;
 #endif

esphome/components/api/user_services.h

@@ -52,7 +52,7 @@ template<typename... Ts> class UserServiceBase : public UserServiceDescriptor {
 
  protected:
   virtual void execute(Ts... x) = 0;
-  template<int... S> void execute_(std::vector<ExecuteServiceArgument> args, seq<S...> type) {
+  template<int... S> void execute_(std::vector<ExecuteServiceArgument> args, seq<S...>) {
     this->execute((get_execute_arg_value<Ts>(args[S]))...);
   }
 

esphome/components/api/util.cpp

@@ -116,21 +116,6 @@ void ComponentIterator::advance() {
       }
       break;
 #endif
-#ifdef USE_BUTTON
-    case IteratorState::BUTTON:
-      if (this->at_ >= App.get_buttons().size()) {
-        advance_platform = true;
-      } else {
-        auto *button = App.get_buttons()[this->at_];
-        if (button->is_internal()) {
-          success = true;
-          break;
-        } else {
-          success = this->on_button(button);
-        }
-      }
-      break;
-#endif
 #ifdef USE_TEXT_SENSOR
     case IteratorState::TEXT_SENSOR:
       if (this->at_ >= App.get_text_sensors().size()) {

esphome/components/api/util.h

@@ -27,7 +27,7 @@ class ComponentIterator {
   virtual bool on_cover(cover::Cover *cover) = 0;
 #endif
 #ifdef USE_FAN
-  virtual bool on_fan(fan::Fan *fan) = 0;
+  virtual bool on_fan(fan::FanState *fan) = 0;
 #endif
 #ifdef USE_LIGHT
   virtual bool on_light(light::LightState *light) = 0;
@@ -38,9 +38,6 @@ class ComponentIterator {
 #ifdef USE_SWITCH
   virtual bool on_switch(switch_::Switch *a_switch) = 0;
 #endif
-#ifdef USE_BUTTON
-  virtual bool on_button(button::Button *button) = 0;
-#endif
 #ifdef USE_TEXT_SENSOR
   virtual bool on_text_sensor(text_sensor::TextSensor *text_sensor) = 0;
 #endif
@@ -81,9 +78,6 @@ class ComponentIterator {
 #ifdef USE_SWITCH
     SWITCH,
 #endif
-#ifdef USE_BUTTON
-    BUTTON,
-#endif
 #ifdef USE_TEXT_SENSOR
     TEXT_SENSOR,
 #endif

esphome/components/as3935/as3935.cpp

@@ -58,11 +58,10 @@ void AS3935Component::loop() {
 
 void AS3935Component::write_indoor(bool indoor) {
   ESP_LOGV(TAG, "Setting indoor to %d", indoor);
-  if (indoor) {
+  if (indoor)
     this->write_register(AFE_GAIN, GAIN_MASK, INDOOR, 1);
-  } else {
+  else
     this->write_register(AFE_GAIN, GAIN_MASK, OUTDOOR, 1);
-  }
 }
 // REG0x01, bits[3:0], manufacturer default: 0010 (2).
 // This setting determines the threshold for events that trigger the

esphome/components/atc_mithermometer/atc_mithermometer.cpp

@@ -45,8 +45,6 @@ bool ATCMiThermometer::parse_device(const esp32_ble_tracker::ESPBTDevice &device
       this->battery_voltage_->publish_state(*res->battery_voltage);
     success = true;
   }
-  if (this->signal_strength_ != nullptr)
-    this->signal_strength_->publish_state(device.get_rssi());
 
   return success;
 }

esphome/components/atc_mithermometer/atc_mithermometer.h

@@ -28,7 +28,6 @@ class ATCMiThermometer : public Component, public esp32_ble_tracker::ESPBTDevice
   void set_humidity(sensor::Sensor *humidity) { humidity_ = humidity; }
   void set_battery_level(sensor::Sensor *battery_level) { battery_level_ = battery_level; }
   void set_battery_voltage(sensor::Sensor *battery_voltage) { battery_voltage_ = battery_voltage; }
-  void set_signal_strength(sensor::Sensor *signal_strength) { signal_strength_ = signal_strength; }
 
  protected:
   uint64_t address_;
@@ -36,7 +35,6 @@ class ATCMiThermometer : public Component, public esp32_ble_tracker::ESPBTDevice
   sensor::Sensor *humidity_{nullptr};
   sensor::Sensor *battery_level_{nullptr};
   sensor::Sensor *battery_voltage_{nullptr};
-  sensor::Sensor *signal_strength_{nullptr};
 
   optional<ParseResult> parse_header_(const esp32_ble_tracker::ServiceData &service_data);
   bool parse_message_(const std::vector<uint8_t> &message, ParseResult &result);

esphome/components/atc_mithermometer/sensor.py

@@ -6,18 +6,14 @@ from esphome.const import (
     CONF_BATTERY_VOLTAGE,
     CONF_MAC_ADDRESS,
     CONF_HUMIDITY,
-    CONF_SIGNAL_STRENGTH,
     CONF_TEMPERATURE,
     CONF_ID,
     DEVICE_CLASS_BATTERY,
     DEVICE_CLASS_HUMIDITY,
-    DEVICE_CLASS_SIGNAL_STRENGTH,
     DEVICE_CLASS_TEMPERATURE,
     DEVICE_CLASS_VOLTAGE,
-    ENTITY_CATEGORY_DIAGNOSTIC,
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
-    UNIT_DECIBEL_MILLIWATT,
     UNIT_PERCENT,
     UNIT_VOLT,
 )
@@ -53,21 +49,12 @@ CONFIG_SCHEMA = (
                 accuracy_decimals=0,
                 device_class=DEVICE_CLASS_BATTERY,
                 state_class=STATE_CLASS_MEASUREMENT,
-                entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
             ),
             cv.Optional(CONF_BATTERY_VOLTAGE): sensor.sensor_schema(
                 unit_of_measurement=UNIT_VOLT,
                 accuracy_decimals=3,
                 device_class=DEVICE_CLASS_VOLTAGE,
                 state_class=STATE_CLASS_MEASUREMENT,
-                entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
-            ),
-            cv.Optional(CONF_SIGNAL_STRENGTH): sensor.sensor_schema(
-                unit_of_measurement=UNIT_DECIBEL_MILLIWATT,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_SIGNAL_STRENGTH,
-                state_class=STATE_CLASS_MEASUREMENT,
-                entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
             ),
         }
     )
@@ -95,6 +82,3 @@ async def to_code(config):
     if CONF_BATTERY_VOLTAGE in config:
         sens = await sensor.new_sensor(config[CONF_BATTERY_VOLTAGE])
         cg.add(var.set_battery_voltage(sens))
-    if CONF_SIGNAL_STRENGTH in config:
-        sens = await sensor.new_sensor(config[CONF_SIGNAL_STRENGTH])
-        cg.add(var.set_signal_strength(sens))

esphome/components/atm90e32/sensor.py

@@ -17,7 +17,6 @@ from esphome.const import (
     DEVICE_CLASS_POWER_FACTOR,
     DEVICE_CLASS_TEMPERATURE,
     DEVICE_CLASS_VOLTAGE,
-    ENTITY_CATEGORY_DIAGNOSTIC,
     ICON_LIGHTBULB,
     ICON_CURRENT_AC,
     STATE_CLASS_MEASUREMENT,
@@ -126,7 +125,6 @@ CONFIG_SCHEMA = (
                 accuracy_decimals=1,
                 device_class=DEVICE_CLASS_TEMPERATURE,
                 state_class=STATE_CLASS_MEASUREMENT,
-                entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
             ),
             cv.Required(CONF_LINE_FREQUENCY): cv.enum(LINE_FREQS, upper=True),
             cv.Optional(CONF_CURRENT_PHASES, default="3"): cv.enum(

esphome/components/b_parasite/sensor.py

@@ -13,7 +13,6 @@ from esphome.const import (
     DEVICE_CLASS_ILLUMINANCE,
     DEVICE_CLASS_TEMPERATURE,
     DEVICE_CLASS_VOLTAGE,
-    ENTITY_CATEGORY_DIAGNOSTIC,
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
     UNIT_LUX,
@@ -52,7 +51,6 @@ CONFIG_SCHEMA = (
                 accuracy_decimals=3,
                 device_class=DEVICE_CLASS_VOLTAGE,
                 state_class=STATE_CLASS_MEASUREMENT,
-                entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
             ),
             cv.Optional(CONF_MOISTURE): sensor.sensor_schema(
                 unit_of_measurement=UNIT_PERCENT,

esphome/components/ballu/ballu.cpp

@@ -97,7 +97,7 @@ void BalluClimate::transmit_state() {
 
   // Send code
   auto transmit = this->transmitter_->transmit();
-  auto *data = transmit.get_data();
+  auto data = transmit.get_data();
 
   data->set_carrier_frequency(38000);
 
@@ -130,10 +130,10 @@ bool BalluClimate::on_receive(remote_base::RemoteReceiveData data) {
   for (int i = 0; i < BALLU_STATE_LENGTH; i++) {
     // Read bit
     for (int j = 0; j < 8; j++) {
-      if (data.expect_item(BALLU_BIT_MARK, BALLU_ONE_SPACE)) {
+      if (data.expect_item(BALLU_BIT_MARK, BALLU_ONE_SPACE))
         remote_state[i] |= 1 << j;
 
-      } else if (!data.expect_item(BALLU_BIT_MARK, BALLU_ZERO_SPACE)) {
+      else if (!data.expect_item(BALLU_BIT_MARK, BALLU_ZERO_SPACE)) {
         ESP_LOGV(TAG, "Byte %d bit %d fail", i, j);
         return false;
       }

esphome/components/bang_bang/bang_bang_climate.cpp

@@ -21,13 +21,12 @@ void BangBangClimate::setup() {
     restore->to_call(this).perform();
   } else {
     // restore from defaults, change_away handles those for us
-    if (supports_cool_ && supports_heat_) {
+    if (supports_cool_ && supports_heat_)
       this->mode = climate::CLIMATE_MODE_HEAT_COOL;
-    } else if (supports_cool_) {
+    else if (supports_cool_)
       this->mode = climate::CLIMATE_MODE_COOL;
-    } else if (supports_heat_) {
+    else if (supports_heat_)
       this->mode = climate::CLIMATE_MODE_HEAT;
-    }
     this->change_away_(false);
   }
 }
@@ -57,12 +56,11 @@ climate::ClimateTraits BangBangClimate::traits() {
   if (supports_cool_ && supports_heat_)
     traits.add_supported_mode(climate::CLIMATE_MODE_HEAT_COOL);
   traits.set_supports_two_point_target_temperature(true);
-  if (supports_away_) {
+  if (supports_away_)
     traits.set_supported_presets({
         climate::CLIMATE_PRESET_HOME,
         climate::CLIMATE_PRESET_AWAY,
     });
-  }
   traits.set_supports_action(true);
   return traits;
 }
@@ -82,25 +80,21 @@ void BangBangClimate::compute_state_() {
 
   climate::ClimateAction target_action;
   if (too_cold) {
-    // too cold -> enable heating if possible and enabled, else idle
-    if (this->supports_heat_ &&
-        (this->mode == climate::CLIMATE_MODE_HEAT_COOL || this->mode == climate::CLIMATE_MODE_HEAT)) {
+    // too cold -> enable heating if possible, else idle
+    if (this->supports_heat_)
       target_action = climate::CLIMATE_ACTION_HEATING;
-    } else {
+    else
       target_action = climate::CLIMATE_ACTION_IDLE;
-    }
   } else if (too_hot) {
-    // too hot -> enable cooling if possible and enabled, else idle
-    if (this->supports_cool_ &&
-        (this->mode == climate::CLIMATE_MODE_HEAT_COOL || this->mode == climate::CLIMATE_MODE_COOL)) {
+    // too hot -> enable cooling if possible, else idle
+    if (this->supports_cool_)
       target_action = climate::CLIMATE_ACTION_COOLING;
-    } else {
+    else
       target_action = climate::CLIMATE_ACTION_IDLE;
-    }
   } else {
     // neither too hot nor too cold -> in range
-    if (this->supports_cool_ && this->supports_heat_ && this->mode == climate::CLIMATE_MODE_HEAT_COOL) {
-      // if supports both ends and both cooling and heating enabled, go to idle action
+    if (this->supports_cool_ && this->supports_heat_) {
+      // if supports both ends, go to idle action
       target_action = climate::CLIMATE_ACTION_IDLE;
     } else {
       // else use current mode and don't change (hysteresis)
@@ -111,10 +105,9 @@ void BangBangClimate::compute_state_() {
   this->switch_to_action_(target_action);
 }
 void BangBangClimate::switch_to_action_(climate::ClimateAction action) {
-  if (action == this->action) {
+  if (action == this->action)
     // already in target mode
     return;
-  }
 
   if ((action == climate::CLIMATE_ACTION_OFF && this->action == climate::CLIMATE_ACTION_IDLE) ||
       (action == climate::CLIMATE_ACTION_IDLE && this->action == climate::CLIMATE_ACTION_OFF)) {

esphome/components/bh1750/bh1750.cpp

@@ -79,9 +79,6 @@ void BH1750Sensor::read_data_() {
 
   float lx = float(raw_value) / 1.2f;
   lx *= 69.0f / this->measurement_duration_;
-  if (this->resolution_ == BH1750_RESOLUTION_0P5_LX) {
-    lx /= 2.0f;
-  }
   ESP_LOGD(TAG, "'%s': Got illuminance=%.1flx", this->get_name().c_str(), lx);
   this->publish_state(lx);
   this->status_clear_warning();

esphome/components/binary/fan/__init__.py

@@ -9,7 +9,7 @@ from esphome.const import (
 )
 from .. import binary_ns
 
-BinaryFan = binary_ns.class_("BinaryFan", fan.Fan, cg.Component)
+BinaryFan = binary_ns.class_("BinaryFan", cg.Component)
 
 CONFIG_SCHEMA = fan.FAN_SCHEMA.extend(
     {
@@ -24,8 +24,9 @@ CONFIG_SCHEMA = fan.FAN_SCHEMA.extend(
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_OUTPUT_ID])
     await cg.register_component(var, config)
-    await fan.register_fan(var, config)
 
+    fan_ = await fan.create_fan_state(config)
+    cg.add(var.set_fan(fan_))
     output_ = await cg.get_variable(config[CONF_OUTPUT])
     cg.add(var.set_output(output_))
 

esphome/components/binary/fan/binary_fan.cpp

@@ -6,35 +6,59 @@ namespace binary {
 
 static const char *const TAG = "binary.fan";
 
-void BinaryFan::setup() {
-  auto restore = this->restore_state_();
-  if (restore.has_value()) {
-    restore->apply(*this);
-    this->write_state_();
+void binary::BinaryFan::dump_config() {
+  ESP_LOGCONFIG(TAG, "Fan '%s':", this->fan_->get_name().c_str());
+  if (this->fan_->get_traits().supports_oscillation()) {
+    ESP_LOGCONFIG(TAG, "  Oscillation: YES");
+  }
+  if (this->fan_->get_traits().supports_direction()) {
+    ESP_LOGCONFIG(TAG, "  Direction: YES");
   }
 }
-void BinaryFan::dump_config() { LOG_FAN("", "Binary Fan", this); }
-fan::FanTraits BinaryFan::get_traits() {
-  return fan::FanTraits(this->oscillating_ != nullptr, false, this->direction_ != nullptr, 0);
+void BinaryFan::setup() {
+  auto traits = fan::FanTraits(this->oscillating_ != nullptr, false, this->direction_ != nullptr, 0);
+  this->fan_->set_traits(traits);
+  this->fan_->add_on_state_callback([this]() { this->next_update_ = true; });
 }
-void BinaryFan::control(const fan::FanCall &call) {
-  if (call.get_state().has_value())
-    this->state = *call.get_state();
-  if (call.get_oscillating().has_value())
-    this->oscillating = *call.get_oscillating();
-  if (call.get_direction().has_value())
-    this->direction = *call.get_direction();
+void BinaryFan::loop() {
+  if (!this->next_update_) {
+    return;
+  }
+  this->next_update_ = false;
 
-  this->write_state_();
-  this->publish_state();
-}
-void BinaryFan::write_state_() {
-  this->output_->set_state(this->state);
-  if (this->oscillating_ != nullptr)
-    this->oscillating_->set_state(this->oscillating);
-  if (this->direction_ != nullptr)
-    this->direction_->set_state(this->direction == fan::FanDirection::REVERSE);
+  {
+    bool enable = this->fan_->state;
+    if (enable)
+      this->output_->turn_on();
+    else
+      this->output_->turn_off();
+    ESP_LOGD(TAG, "Setting binary state: %s", ONOFF(enable));
+  }
+
+  if (this->oscillating_ != nullptr) {
+    bool enable = this->fan_->oscillating;
+    if (enable) {
+      this->oscillating_->turn_on();
+    } else {
+      this->oscillating_->turn_off();
+    }
+    ESP_LOGD(TAG, "Setting oscillation: %s", ONOFF(enable));
+  }
+
+  if (this->direction_ != nullptr) {
+    bool enable = this->fan_->direction == fan::FAN_DIRECTION_REVERSE;
+    if (enable) {
+      this->direction_->turn_on();
+    } else {
+      this->direction_->turn_off();
+    }
+    ESP_LOGD(TAG, "Setting reverse direction: %s", ONOFF(enable));
+  }
 }
 
+// We need a higher priority than the FanState component to make sure that the traits are set
+// when that component sets itself up.
+float BinaryFan::get_setup_priority() const { return fan_->get_setup_priority() + 1.0f; }
+
 }  // namespace binary
 }  // namespace esphome

esphome/components/binary/fan/binary_fan.h

@@ -2,29 +2,28 @@
 
 #include "esphome/core/component.h"
 #include "esphome/components/output/binary_output.h"
-#include "esphome/components/fan/fan.h"
+#include "esphome/components/fan/fan_state.h"
 
 namespace esphome {
 namespace binary {
 
-class BinaryFan : public Component, public fan::Fan {
+class BinaryFan : public Component {
  public:
+  void set_fan(fan::FanState *fan) { fan_ = fan; }
+  void set_output(output::BinaryOutput *output) { output_ = output; }
   void setup() override;
+  void loop() override;
   void dump_config() override;
-
-  void set_output(output::BinaryOutput *output) { this->output_ = output; }
+  float get_setup_priority() const override;
   void set_oscillating(output::BinaryOutput *oscillating) { this->oscillating_ = oscillating; }
   void set_direction(output::BinaryOutput *direction) { this->direction_ = direction; }
 
-  fan::FanTraits get_traits() override;
-
  protected:
-  void control(const fan::FanCall &call) override;
-  void write_state_();
-
+  fan::FanState *fan_;
   output::BinaryOutput *output_;
   output::BinaryOutput *oscillating_{nullptr};
   output::BinaryOutput *direction_{nullptr};
+  bool next_update_{true};
 };
 
 }  // namespace binary

esphome/components/binary_sensor/__init__.py

@@ -44,11 +44,9 @@ from esphome.const import (
     DEVICE_CLASS_POWER,
     DEVICE_CLASS_PRESENCE,
     DEVICE_CLASS_PROBLEM,
-    DEVICE_CLASS_RUNNING,
     DEVICE_CLASS_SAFETY,
     DEVICE_CLASS_SMOKE,
     DEVICE_CLASS_SOUND,
-    DEVICE_CLASS_TAMPER,
     DEVICE_CLASS_UPDATE,
     DEVICE_CLASS_VIBRATION,
     DEVICE_CLASS_WINDOW,
@@ -78,11 +76,9 @@ DEVICE_CLASSES = [
     DEVICE_CLASS_POWER,
     DEVICE_CLASS_PRESENCE,
     DEVICE_CLASS_PROBLEM,
-    DEVICE_CLASS_RUNNING,
     DEVICE_CLASS_SAFETY,
     DEVICE_CLASS_SMOKE,
     DEVICE_CLASS_SOUND,
-    DEVICE_CLASS_TAMPER,
     DEVICE_CLASS_UPDATE,
     DEVICE_CLASS_VIBRATION,
     DEVICE_CLASS_WINDOW,
@@ -317,7 +313,6 @@ def validate_multi_click_timing(value):
 
 device_class = cv.one_of(*DEVICE_CLASSES, lower=True, space="_")
 
-
 BINARY_SENSOR_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMPONENT_SCHEMA).extend(
     {
         cv.GenerateID(): cv.declare_id(BinarySensor),

esphome/components/binary_sensor/binary_sensor.cpp

@@ -48,10 +48,7 @@ void BinarySensor::set_device_class(const std::string &device_class) { this->dev
 std::string BinarySensor::get_device_class() {
   if (this->device_class_.has_value())
     return *this->device_class_;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
   return this->device_class();
-#pragma GCC diagnostic pop
 }
 void BinarySensor::add_filter(Filter *filter) {
   filter->parent_ = this;

esphome/components/binary_sensor/binary_sensor.h

@@ -74,10 +74,7 @@ class BinarySensor : public EntityBase {
 
   // ========== OVERRIDE METHODS ==========
   // (You'll only need this when creating your own custom binary sensor)
-  /** Override this to set the default device class.
-   *
-   * @deprecated This method is deprecated, set the property during config validation instead. (2022.1)
-   */
+  /// Get the default device class for this sensor, or empty string for no default.
   virtual std::string device_class();
 
  protected:

esphome/components/bl0940/__init__.py

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

esphome/components/bl0940/bl0940.cpp

@@ -1,137 +0,0 @@
-#include "bl0940.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace bl0940 {
-
-static const char *const TAG = "bl0940";
-
-static const uint8_t BL0940_READ_COMMAND = 0x50;  // 0x58 according to documentation
-static const uint8_t BL0940_FULL_PACKET = 0xAA;
-static const uint8_t BL0940_PACKET_HEADER = 0x55;  // 0x58 according to documentation
-
-static const uint8_t BL0940_WRITE_COMMAND = 0xA0;  // 0xA8 according to documentation
-static const uint8_t BL0940_REG_I_FAST_RMS_CTRL = 0x10;
-static const uint8_t BL0940_REG_MODE = 0x18;
-static const uint8_t BL0940_REG_SOFT_RESET = 0x19;
-static const uint8_t BL0940_REG_USR_WRPROT = 0x1A;
-static const uint8_t BL0940_REG_TPS_CTRL = 0x1B;
-
-const uint8_t BL0940_INIT[5][6] = {
-    // Reset to default
-    {BL0940_WRITE_COMMAND, BL0940_REG_SOFT_RESET, 0x5A, 0x5A, 0x5A, 0x38},
-    // Enable User Operation Write
-    {BL0940_WRITE_COMMAND, BL0940_REG_USR_WRPROT, 0x55, 0x00, 0x00, 0xF0},
-    // 0x0100 = CF_UNABLE energy pulse, AC_FREQ_SEL 50Hz, RMS_UPDATE_SEL 800mS
-    {BL0940_WRITE_COMMAND, BL0940_REG_MODE, 0x00, 0x10, 0x00, 0x37},
-    // 0x47FF = Over-current and leakage alarm on, Automatic temperature measurement, Interval 100mS
-    {BL0940_WRITE_COMMAND, BL0940_REG_TPS_CTRL, 0xFF, 0x47, 0x00, 0xFE},
-    // 0x181C = Half cycle, Fast RMS threshold 6172
-    {BL0940_WRITE_COMMAND, BL0940_REG_I_FAST_RMS_CTRL, 0x1C, 0x18, 0x00, 0x1B}};
-
-void BL0940::loop() {
-  DataPacket buffer;
-  if (!this->available()) {
-    return;
-  }
-  if (read_array((uint8_t *) &buffer, sizeof(buffer))) {
-    if (validate_checksum(&buffer)) {
-      received_package_(&buffer);
-    }
-  } else {
-    ESP_LOGW(TAG, "Junk on wire. Throwing away partial message");
-    while (read() >= 0)
-      ;
-  }
-}
-
-bool BL0940::validate_checksum(const DataPacket *data) {
-  uint8_t checksum = BL0940_READ_COMMAND;
-  // Whole package but checksum
-  for (uint32_t i = 0; i < sizeof(data->raw) - 1; i++) {
-    checksum += data->raw[i];
-  }
-  checksum ^= 0xFF;
-  if (checksum != data->checksum) {
-    ESP_LOGW(TAG, "BL0940 invalid checksum! 0x%02X != 0x%02X", checksum, data->checksum);
-  }
-  return checksum == data->checksum;
-}
-
-void BL0940::update() {
-  this->flush();
-  this->write_byte(BL0940_READ_COMMAND);
-  this->write_byte(BL0940_FULL_PACKET);
-}
-
-void BL0940::setup() {
-  for (auto *i : BL0940_INIT) {
-    this->write_array(i, 6);
-    delay(1);
-  }
-  this->flush();
-}
-
-float BL0940::update_temp_(sensor::Sensor *sensor, ube16_t temperature) const {
-  auto tb = (float) (temperature.h << 8 | temperature.l);
-  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("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;
-    }
-    sensor->publish_state(converted_temp);
-  }
-  return converted_temp;
-}
-
-void BL0940::received_package_(const DataPacket *data) const {
-  // Bad header
-  if (data->frame_header != BL0940_PACKET_HEADER) {
-    ESP_LOGI("bl0940", "Invalid data. Header mismatch: %d", data->frame_header);
-    return;
-  }
-
-  float v_rms = (float) to_uint32_t(data->v_rms) / voltage_reference_;
-  float i_rms = (float) to_uint32_t(data->i_rms) / current_reference_;
-  float watt = (float) to_int32_t(data->watt) / power_reference_;
-  uint32_t cf_cnt = to_uint32_t(data->cf_cnt);
-  float total_energy_consumption = (float) cf_cnt / energy_reference_;
-
-  float tps1 = update_temp_(internal_temperature_sensor_, data->tps1);
-  float tps2 = update_temp_(external_temperature_sensor_, data->tps2);
-
-  if (voltage_sensor_ != nullptr) {
-    voltage_sensor_->publish_state(v_rms);
-  }
-  if (current_sensor_ != nullptr) {
-    current_sensor_->publish_state(i_rms);
-  }
-  if (power_sensor_ != nullptr) {
-    power_sensor_->publish_state(watt);
-  }
-  if (energy_sensor_ != nullptr) {
-    energy_sensor_->publish_state(total_energy_consumption);
-  }
-
-  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);
-}
-
-void BL0940::dump_config() {  // NOLINT(readability-function-cognitive-complexity)
-  ESP_LOGCONFIG(TAG, "BL0940:");
-  LOG_SENSOR("", "Voltage", this->voltage_sensor_);
-  LOG_SENSOR("", "Current", this->current_sensor_);
-  LOG_SENSOR("", "Power", this->power_sensor_);
-  LOG_SENSOR("", "Energy", this->energy_sensor_);
-  LOG_SENSOR("", "Internal temperature", this->internal_temperature_sensor_);
-  LOG_SENSOR("", "External temperature", this->external_temperature_sensor_);
-}
-
-uint32_t BL0940::to_uint32_t(ube24_t input) { return input.h << 16 | input.m << 8 | input.l; }
-
-int32_t BL0940::to_int32_t(sbe24_t input) { return input.h << 16 | input.m << 8 | input.l; }
-
-}  // namespace bl0940
-}  // namespace esphome

esphome/components/bl0940/bl0940.h

@@ -1,109 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/uart/uart.h"
-#include "esphome/components/sensor/sensor.h"
-
-namespace esphome {
-namespace bl0940 {
-
-static const float BL0940_PREF = 1430;
-static const float BL0940_UREF = 33000;
-static const float BL0940_IREF = 275000;  // 2750 from tasmota. Seems to generate values 100 times too high
-
-// Measured to 297J  per click according to power consumption of 5 minutes
-// Converted to kWh (3.6MJ per kwH). Used to be 256 * 1638.4
-static const float BL0940_EREF = 3.6e6 / 297;
-
-struct ube24_t {  // NOLINT(readability-identifier-naming,altera-struct-pack-align)
-  uint8_t l;
-  uint8_t m;
-  uint8_t h;
-} __attribute__((packed));
-
-struct ube16_t {  // NOLINT(readability-identifier-naming,altera-struct-pack-align)
-  uint8_t l;
-  uint8_t h;
-} __attribute__((packed));
-
-struct sbe24_t {  // NOLINT(readability-identifier-naming,altera-struct-pack-align)
-  uint8_t l;
-  uint8_t m;
-  int8_t h;
-} __attribute__((packed));
-
-// Caveat: All these values are big endian (low - middle - high)
-
-union DataPacket {  // NOLINT(altera-struct-pack-align)
-  uint8_t raw[35];
-  struct {
-    uint8_t frame_header;  // value of 0x58 according to docs. 0x55 according to Tasmota real world tests. Reality wins.
-    ube24_t i_fast_rms;    // 0x00
-    ube24_t i_rms;         // 0x04
-    ube24_t RESERVED0;     // reserved
-    ube24_t v_rms;         // 0x06
-    ube24_t RESERVED1;     // reserved
-    sbe24_t watt;          // 0x08
-    ube24_t RESERVED2;     // reserved
-    ube24_t cf_cnt;        // 0x0A
-    ube24_t RESERVED3;     // reserved
-    ube16_t tps1;          // 0x0c
-    uint8_t RESERVED4;     // value of 0x00
-    ube16_t tps2;          // 0x0c
-    uint8_t RESERVED5;     // value of 0x00
-    uint8_t checksum;      // checksum
-  };
-} __attribute__((packed));
-
-class BL0940 : public PollingComponent, public uart::UARTDevice {
- public:
-  void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
-  void set_current_sensor(sensor::Sensor *current_sensor) { current_sensor_ = current_sensor; }
-  void set_power_sensor(sensor::Sensor *power_sensor) { power_sensor_ = power_sensor; }
-  void set_energy_sensor(sensor::Sensor *energy_sensor) { energy_sensor_ = energy_sensor; }
-  void set_internal_temperature_sensor(sensor::Sensor *internal_temperature_sensor) {
-    internal_temperature_sensor_ = internal_temperature_sensor;
-  }
-  void set_external_temperature_sensor(sensor::Sensor *external_temperature_sensor) {
-    external_temperature_sensor_ = external_temperature_sensor;
-  }
-
-  void loop() override;
-
-  void update() override;
-  void setup() override;
-  void dump_config() override;
-
- protected:
-  sensor::Sensor *voltage_sensor_;
-  sensor::Sensor *current_sensor_;
-  // NB This may be negative as the circuits is seemingly able to measure
-  // power in both directions
-  sensor::Sensor *power_sensor_;
-  sensor::Sensor *energy_sensor_;
-  sensor::Sensor *internal_temperature_sensor_;
-  sensor::Sensor *external_temperature_sensor_;
-
-  // Max difference between two measurements of the temperature. Used to avoid noise.
-  float max_temperature_diff_{0};
-  // Divide by this to turn into Watt
-  float power_reference_ = BL0940_PREF;
-  // Divide by this to turn into Volt
-  float voltage_reference_ = BL0940_UREF;
-  // Divide by this to turn into Ampere
-  float current_reference_ = BL0940_IREF;
-  // Divide by this to turn into kWh
-  float energy_reference_ = BL0940_EREF;
-
-  float update_temp_(sensor::Sensor *sensor, ube16_t packed_temperature) const;
-
-  static uint32_t to_uint32_t(ube24_t input);
-
-  static int32_t to_int32_t(sbe24_t input);
-
-  static bool validate_checksum(const DataPacket *data);
-
-  void received_package_(const DataPacket *data) const;
-};
-}  // namespace bl0940
-}  // namespace esphome

esphome/components/bl0940/sensor.py

@@ -1,106 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor, uart
-from esphome.const import (
-    CONF_CURRENT,
-    CONF_ENERGY,
-    CONF_ID,
-    CONF_POWER,
-    CONF_VOLTAGE,
-    DEVICE_CLASS_CURRENT,
-    DEVICE_CLASS_ENERGY,
-    DEVICE_CLASS_POWER,
-    DEVICE_CLASS_VOLTAGE,
-    DEVICE_CLASS_TEMPERATURE,
-    ICON_EMPTY,
-    STATE_CLASS_MEASUREMENT,
-    STATE_CLASS_NONE,
-    UNIT_AMPERE,
-    UNIT_CELSIUS,
-    UNIT_KILOWATT_HOURS,
-    UNIT_VOLT,
-    UNIT_WATT,
-)
-
-DEPENDENCIES = ["uart"]
-
-CONF_INTERNAL_TEMPERATURE = "internal_temperature"
-CONF_EXTERNAL_TEMPERATURE = "external_temperature"
-
-bl0940_ns = cg.esphome_ns.namespace("bl0940")
-BL0940 = bl0940_ns.class_("BL0940", cg.PollingComponent, uart.UARTDevice)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(BL0940),
-            cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(
-                UNIT_VOLT, ICON_EMPTY, 1, DEVICE_CLASS_VOLTAGE, STATE_CLASS_MEASUREMENT
-            ),
-            cv.Optional(CONF_CURRENT): sensor.sensor_schema(
-                UNIT_AMPERE,
-                ICON_EMPTY,
-                2,
-                DEVICE_CLASS_CURRENT,
-                STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_POWER): sensor.sensor_schema(
-                UNIT_WATT, ICON_EMPTY, 0, DEVICE_CLASS_POWER, STATE_CLASS_MEASUREMENT
-            ),
-            cv.Optional(CONF_ENERGY): sensor.sensor_schema(
-                UNIT_KILOWATT_HOURS,
-                ICON_EMPTY,
-                0,
-                DEVICE_CLASS_ENERGY,
-                STATE_CLASS_NONE,
-            ),
-            cv.Optional(CONF_INTERNAL_TEMPERATURE): sensor.sensor_schema(
-                UNIT_CELSIUS,
-                ICON_EMPTY,
-                0,
-                DEVICE_CLASS_TEMPERATURE,
-                STATE_CLASS_NONE,
-            ),
-            cv.Optional(CONF_EXTERNAL_TEMPERATURE): sensor.sensor_schema(
-                UNIT_CELSIUS,
-                ICON_EMPTY,
-                0,
-                DEVICE_CLASS_TEMPERATURE,
-                STATE_CLASS_NONE,
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(uart.UART_DEVICE_SCHEMA)
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await uart.register_uart_device(var, config)
-
-    if CONF_VOLTAGE in config:
-        conf = config[CONF_VOLTAGE]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_voltage_sensor(sens))
-    if CONF_CURRENT in config:
-        conf = config[CONF_CURRENT]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_current_sensor(sens))
-    if CONF_POWER in config:
-        conf = config[CONF_POWER]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_power_sensor(sens))
-    if CONF_ENERGY in config:
-        conf = config[CONF_ENERGY]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_energy_sensor(sens))
-    if CONF_INTERNAL_TEMPERATURE in config:
-        conf = config[CONF_INTERNAL_TEMPERATURE]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_internal_temperature_sensor(sens))
-    if CONF_EXTERNAL_TEMPERATURE in config:
-        conf = config[CONF_EXTERNAL_TEMPERATURE]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_external_temperature_sensor(sens))

esphome/components/ble_client/ble_client.cpp

@@ -167,7 +167,7 @@ void BLEClient::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t es
       break;
     }
     case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
-      auto *descr = this->get_config_descriptor(param->reg_for_notify.handle);
+      auto descr = this->get_config_descriptor(param->reg_for_notify.handle);
       if (descr == nullptr) {
         ESP_LOGW(TAG, "No descriptor found for notify of handle 0x%x", param->reg_for_notify.handle);
         break;
@@ -252,17 +252,16 @@ float BLEClient::parse_char_value(uint8_t *value, uint16_t length) {
 }
 
 BLEService *BLEClient::get_service(espbt::ESPBTUUID uuid) {
-  for (auto *svc : this->services_) {
+  for (auto svc : this->services_)
     if (svc->uuid == uuid)
       return svc;
-  }
   return nullptr;
 }
 
 BLEService *BLEClient::get_service(uint16_t uuid) { return this->get_service(espbt::ESPBTUUID::from_uint16(uuid)); }
 
 BLECharacteristic *BLEClient::get_characteristic(espbt::ESPBTUUID service, espbt::ESPBTUUID chr) {
-  auto *svc = this->get_service(service);
+  auto svc = this->get_service(service);
   if (svc == nullptr)
     return nullptr;
   return svc->get_characteristic(chr);
@@ -273,24 +272,19 @@ BLECharacteristic *BLEClient::get_characteristic(uint16_t service, uint16_t chr)
 }
 
 BLEDescriptor *BLEClient::get_config_descriptor(uint16_t handle) {
-  for (auto &svc : this->services_) {
-    for (auto &chr : svc->characteristics) {
-      if (chr->handle == handle) {
-        for (auto &desc : chr->descriptors) {
+  for (auto &svc : this->services_)
+    for (auto &chr : svc->characteristics)
+      if (chr->handle == handle)
+        for (auto &desc : chr->descriptors)
           if (desc->uuid == espbt::ESPBTUUID::from_uint16(0x2902))
             return desc;
-        }
-      }
-    }
-  }
   return nullptr;
 }
 
 BLECharacteristic *BLEService::get_characteristic(espbt::ESPBTUUID uuid) {
-  for (auto &chr : this->characteristics) {
+  for (auto &chr : this->characteristics)
     if (chr->uuid == uuid)
       return chr;
-  }
   return nullptr;
 }
 
@@ -299,10 +293,10 @@ BLECharacteristic *BLEService::get_characteristic(uint16_t uuid) {
 }
 
 BLEDescriptor *BLEClient::get_descriptor(espbt::ESPBTUUID service, espbt::ESPBTUUID chr, espbt::ESPBTUUID descr) {
-  auto *svc = this->get_service(service);
+  auto svc = this->get_service(service);
   if (svc == nullptr)
     return nullptr;
-  auto *ch = svc->get_characteristic(chr);
+  auto ch = svc->get_characteristic(chr);
   if (ch == nullptr)
     return nullptr;
   return ch->get_descriptor(descr);
@@ -385,25 +379,15 @@ void BLECharacteristic::parse_descriptors() {
 }
 
 BLEDescriptor *BLECharacteristic::get_descriptor(espbt::ESPBTUUID uuid) {
-  for (auto &desc : this->descriptors) {
+  for (auto &desc : this->descriptors)
     if (desc->uuid == uuid)
       return desc;
-  }
   return nullptr;
 }
 BLEDescriptor *BLECharacteristic::get_descriptor(uint16_t uuid) {
   return this->get_descriptor(espbt::ESPBTUUID::from_uint16(uuid));
 }
 
-void BLECharacteristic::write_value(uint8_t *new_val, int16_t new_val_size) {
-  auto *client = this->service->client;
-  auto status = esp_ble_gattc_write_char(client->gattc_if, client->conn_id, this->handle, new_val_size, new_val,
-                                         ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
-  if (status) {
-    ESP_LOGW(TAG, "Error sending write value to BLE gattc server, status=%d", status);
-  }
-}
-
 }  // namespace ble_client
 }  // namespace esphome
 

esphome/components/ble_client/ble_client.h

@@ -59,7 +59,7 @@ class BLECharacteristic {
   void parse_descriptors();
   BLEDescriptor *get_descriptor(espbt::ESPBTUUID uuid);
   BLEDescriptor *get_descriptor(uint16_t uuid);
-  void write_value(uint8_t *new_val, int16_t new_val_size);
+
   BLEService *service;
 };
 
@@ -126,10 +126,9 @@ class BLEClient : public espbt::ESPBTClient, public Component {
   bool all_nodes_established_() {
     if (this->state() != espbt::ClientState::ESTABLISHED)
       return false;
-    for (auto &node : nodes_) {
+    for (auto &node : nodes_)
       if (node->node_state != espbt::ClientState::ESTABLISHED)
         return false;
-    }
     return true;
   }
 

esphome/components/ble_client/output/__init__.py

@@ -1,67 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import output, ble_client, esp32_ble_tracker
-from esphome.const import CONF_ID, CONF_SERVICE_UUID
-from .. import ble_client_ns
-
-
-DEPENDENCIES = ["ble_client"]
-
-CONF_CHARACTERISTIC_UUID = "characteristic_uuid"
-
-BLEBinaryOutput = ble_client_ns.class_(
-    "BLEBinaryOutput", output.BinaryOutput, ble_client.BLEClientNode, cg.Component
-)
-
-CONFIG_SCHEMA = cv.All(
-    output.BINARY_OUTPUT_SCHEMA.extend(
-        {
-            cv.Required(CONF_ID): cv.declare_id(BLEBinaryOutput),
-            cv.Required(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
-            cv.Required(CONF_CHARACTERISTIC_UUID): esp32_ble_tracker.bt_uuid,
-        }
-    )
-    .extend(cv.COMPONENT_SCHEMA)
-    .extend(ble_client.BLE_CLIENT_SCHEMA)
-)
-
-
-def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    if len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid16_format):
-        cg.add(
-            var.set_service_uuid16(esp32_ble_tracker.as_hex(config[CONF_SERVICE_UUID]))
-        )
-    elif len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid32_format):
-        cg.add(
-            var.set_service_uuid32(esp32_ble_tracker.as_hex(config[CONF_SERVICE_UUID]))
-        )
-    elif len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid128_format):
-        uuid128 = esp32_ble_tracker.as_reversed_hex_array(config[CONF_SERVICE_UUID])
-        cg.add(var.set_service_uuid128(uuid128))
-
-    if len(config[CONF_CHARACTERISTIC_UUID]) == len(esp32_ble_tracker.bt_uuid16_format):
-        cg.add(
-            var.set_char_uuid16(
-                esp32_ble_tracker.as_hex(config[CONF_CHARACTERISTIC_UUID])
-            )
-        )
-    elif len(config[CONF_CHARACTERISTIC_UUID]) == len(
-        esp32_ble_tracker.bt_uuid32_format
-    ):
-        cg.add(
-            var.set_char_uuid32(
-                esp32_ble_tracker.as_hex(config[CONF_CHARACTERISTIC_UUID])
-            )
-        )
-    elif len(config[CONF_CHARACTERISTIC_UUID]) == len(
-        esp32_ble_tracker.bt_uuid128_format
-    ):
-        uuid128 = esp32_ble_tracker.as_reversed_hex_array(
-            config[CONF_CHARACTERISTIC_UUID]
-        )
-        cg.add(var.set_char_uuid128(uuid128))
-
-    yield output.register_output(var, config)
-    yield ble_client.register_ble_node(var, config)
-    yield cg.register_component(var, config)

esphome/components/ble_client/output/ble_binary_output.cpp

@@ -1,71 +0,0 @@
-#include "ble_binary_output.h"
-#include "esphome/core/log.h"
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
-
-#ifdef USE_ESP32
-namespace esphome {
-namespace ble_client {
-
-static const char *const TAG = "ble_binary_output";
-
-void BLEBinaryOutput::dump_config() {
-  ESP_LOGCONFIG(TAG, "BLE Binary Output:");
-  ESP_LOGCONFIG(TAG, "  MAC address        : %s", this->parent_->address_str().c_str());
-  ESP_LOGCONFIG(TAG, "  Service UUID       : %s", this->service_uuid_.to_string().c_str());
-  ESP_LOGCONFIG(TAG, "  Characteristic UUID: %s", this->char_uuid_.to_string().c_str());
-  LOG_BINARY_OUTPUT(this);
-}
-
-void BLEBinaryOutput::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                                          esp_ble_gattc_cb_param_t *param) {
-  switch (event) {
-    case ESP_GATTC_OPEN_EVT:
-      this->client_state_ = espbt::ClientState::ESTABLISHED;
-      ESP_LOGW(TAG, "[%s] Connected successfully!", this->char_uuid_.to_string().c_str());
-      break;
-    case ESP_GATTC_DISCONNECT_EVT:
-      ESP_LOGW(TAG, "[%s] Disconnected", this->char_uuid_.to_string().c_str());
-      this->client_state_ = espbt::ClientState::IDLE;
-      break;
-    case ESP_GATTC_WRITE_CHAR_EVT: {
-      if (param->write.status == 0) {
-        break;
-      }
-
-      auto *chr = this->parent()->get_characteristic(this->service_uuid_, this->char_uuid_);
-      if (chr == nullptr) {
-        ESP_LOGW(TAG, "[%s] Characteristic not found.", this->char_uuid_.to_string().c_str());
-        break;
-      }
-      if (param->write.handle == chr->handle) {
-        ESP_LOGW(TAG, "[%s] Write error, status=%d", this->char_uuid_.to_string().c_str(), param->write.status);
-      }
-      break;
-    }
-    default:
-      break;
-  }
-}
-
-void BLEBinaryOutput::write_state(bool state) {
-  if (this->client_state_ != espbt::ClientState::ESTABLISHED) {
-    ESP_LOGW(TAG, "[%s] Not connected to BLE client.  State update can not be written.",
-             this->char_uuid_.to_string().c_str());
-    return;
-  }
-
-  auto *chr = this->parent()->get_characteristic(this->service_uuid_, this->char_uuid_);
-  if (chr == nullptr) {
-    ESP_LOGW(TAG, "[%s] Characteristic not found.  State update can not be written.",
-             this->char_uuid_.to_string().c_str());
-    return;
-  }
-
-  uint8_t state_as_uint = (uint8_t) state;
-  ESP_LOGV(TAG, "[%s] Write State: %d", this->char_uuid_.to_string().c_str(), state_as_uint);
-  chr->write_value(&state_as_uint, sizeof(state_as_uint));
-}
-
-}  // namespace ble_client
-}  // namespace esphome
-#endif

esphome/components/ble_client/output/ble_binary_output.h

@@ -1,39 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/ble_client/ble_client.h"
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
-#include "esphome/components/output/binary_output.h"
-
-#ifdef USE_ESP32
-#include <esp_gattc_api.h>
-namespace esphome {
-namespace ble_client {
-
-namespace espbt = esphome::esp32_ble_tracker;
-
-class BLEBinaryOutput : public output::BinaryOutput, public BLEClientNode, public Component {
- public:
-  void dump_config() override;
-  void loop() override {}
-  float get_setup_priority() const override { return setup_priority::DATA; }
-  void set_service_uuid16(uint16_t uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_uint16(uuid); }
-  void set_service_uuid32(uint32_t uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_uint32(uuid); }
-  void set_service_uuid128(uint8_t *uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }
-  void set_char_uuid16(uint16_t uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_uint16(uuid); }
-  void set_char_uuid32(uint32_t uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_uint32(uuid); }
-  void set_char_uuid128(uint8_t *uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }
-  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 write_state(bool state) override;
-  espbt::ESPBTUUID service_uuid_;
-  espbt::ESPBTUUID char_uuid_;
-  espbt::ClientState client_state_;
-};
-
-}  // namespace ble_client
-}  // namespace esphome
-
-#endif

esphome/components/ble_client/sensor/__init__.py

@@ -67,7 +67,7 @@ async def to_code(config):
             var.set_service_uuid32(esp32_ble_tracker.as_hex(config[CONF_SERVICE_UUID]))
         )
     elif len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid128_format):
-        uuid128 = esp32_ble_tracker.as_reversed_hex_array(config[CONF_SERVICE_UUID])
+        uuid128 = esp32_ble_tracker.as_hex_array(config[CONF_SERVICE_UUID])
         cg.add(var.set_service_uuid128(uuid128))
 
     if len(config[CONF_CHARACTERISTIC_UUID]) == len(esp32_ble_tracker.bt_uuid16_format):
@@ -87,9 +87,7 @@ async def to_code(config):
     elif len(config[CONF_CHARACTERISTIC_UUID]) == len(
         esp32_ble_tracker.bt_uuid128_format
     ):
-        uuid128 = esp32_ble_tracker.as_reversed_hex_array(
-            config[CONF_CHARACTERISTIC_UUID]
-        )
+        uuid128 = esp32_ble_tracker.as_hex_array(config[CONF_CHARACTERISTIC_UUID])
         cg.add(var.set_char_uuid128(uuid128))
 
     if CONF_DESCRIPTOR_UUID in config:
@@ -110,9 +108,7 @@ async def to_code(config):
         elif len(config[CONF_DESCRIPTOR_UUID]) == len(
             esp32_ble_tracker.bt_uuid128_format
         ):
-            uuid128 = esp32_ble_tracker.as_reversed_hex_array(
-                config[CONF_DESCRIPTOR_UUID]
-            )
+            uuid128 = esp32_ble_tracker.as_hex_array(config[CONF_DESCRIPTOR_UUID])
             cg.add(var.set_descr_uuid128(uuid128))
 
     if CONF_LAMBDA in config:

esphome/components/ble_client/sensor/ble_sensor.cpp

@@ -43,7 +43,7 @@ void BLESensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
     }
     case ESP_GATTC_SEARCH_CMPL_EVT: {
       this->handle = 0;
-      auto *chr = this->parent()->get_characteristic(this->service_uuid_, this->char_uuid_);
+      auto chr = this->parent()->get_characteristic(this->service_uuid_, this->char_uuid_);
       if (chr == nullptr) {
         this->status_set_warning();
         this->publish_state(NAN);
@@ -53,7 +53,7 @@ void BLESensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
       }
       this->handle = chr->handle;
       if (this->descr_uuid_.get_uuid().len > 0) {
-        auto *descr = chr->get_descriptor(this->descr_uuid_);
+        auto descr = chr->get_descriptor(this->descr_uuid_);
         if (descr == nullptr) {
           this->status_set_warning();
           this->publish_state(NAN);

esphome/components/bme280/bme280.cpp

@@ -33,7 +33,6 @@ static const uint8_t BME280_REGISTER_CONTROLHUMID = 0xF2;
 static const uint8_t BME280_REGISTER_STATUS = 0xF3;
 static const uint8_t BME280_REGISTER_CONTROL = 0xF4;
 static const uint8_t BME280_REGISTER_CONFIG = 0xF5;
-static const uint8_t BME280_REGISTER_MEASUREMENTS = 0xF7;
 static const uint8_t BME280_REGISTER_PRESSUREDATA = 0xF7;
 static const uint8_t BME280_REGISTER_TEMPDATA = 0xFA;
 static const uint8_t BME280_REGISTER_HUMIDDATA = 0xFD;
@@ -179,29 +178,23 @@ void BME280Component::update() {
     return;
   }
 
-  float meas_time = 1.5f;
+  float meas_time = 1.5;
   meas_time += 2.3f * oversampling_to_time(this->temperature_oversampling_);
   meas_time += 2.3f * oversampling_to_time(this->pressure_oversampling_) + 0.575f;
   meas_time += 2.3f * oversampling_to_time(this->humidity_oversampling_) + 0.575f;
 
   this->set_timeout("data", uint32_t(ceilf(meas_time)), [this]() {
-    uint8_t data[8];
-    if (!this->read_bytes(BME280_REGISTER_MEASUREMENTS, data, 8)) {
-      ESP_LOGW(TAG, "Error reading registers.");
-      this->status_set_warning();
-      return;
-    }
     int32_t t_fine = 0;
-    float temperature = this->read_temperature_(data, &t_fine);
+    float temperature = this->read_temperature_(&t_fine);
     if (std::isnan(temperature)) {
       ESP_LOGW(TAG, "Invalid temperature, cannot read pressure & humidity values.");
       this->status_set_warning();
       return;
     }
-    float pressure = this->read_pressure_(data, t_fine);
-    float humidity = this->read_humidity_(data, t_fine);
+    float pressure = this->read_pressure_(t_fine);
+    float humidity = this->read_humidity_(t_fine);
 
-    ESP_LOGV(TAG, "Got temperature=%.1f°C pressure=%.1fhPa humidity=%.1f%%", temperature, pressure, humidity);
+    ESP_LOGD(TAG, "Got temperature=%.1f°C pressure=%.1fhPa humidity=%.1f%%", temperature, pressure, humidity);
     if (this->temperature_sensor_ != nullptr)
       this->temperature_sensor_->publish_state(temperature);
     if (this->pressure_sensor_ != nullptr)
@@ -211,13 +204,15 @@ void BME280Component::update() {
     this->status_clear_warning();
   });
 }
-float BME280Component::read_temperature_(const uint8_t *data, int32_t *t_fine) {
-  int32_t adc = ((data[3] & 0xFF) << 16) | ((data[4] & 0xFF) << 8) | (data[5] & 0xFF);
+float BME280Component::read_temperature_(int32_t *t_fine) {
+  uint8_t data[3];
+  if (!this->read_bytes(BME280_REGISTER_TEMPDATA, data, 3))
+    return NAN;
+  int32_t adc = ((data[0] & 0xFF) << 16) | ((data[1] & 0xFF) << 8) | (data[2] & 0xFF);
   adc >>= 4;
-  if (adc == 0x80000) {
+  if (adc == 0x80000)
     // temperature was disabled
     return NAN;
-  }
 
   const int32_t t1 = this->calibration_.t1;
   const int32_t t2 = this->calibration_.t2;
@@ -231,13 +226,15 @@ float BME280Component::read_temperature_(const uint8_t *data, int32_t *t_fine) {
   return temperature / 100.0f;
 }
 
-float BME280Component::read_pressure_(const uint8_t *data, int32_t t_fine) {
+float BME280Component::read_pressure_(int32_t t_fine) {
+  uint8_t data[3];
+  if (!this->read_bytes(BME280_REGISTER_PRESSUREDATA, data, 3))
+    return NAN;
   int32_t adc = ((data[0] & 0xFF) << 16) | ((data[1] & 0xFF) << 8) | (data[2] & 0xFF);
   adc >>= 4;
-  if (adc == 0x80000) {
+  if (adc == 0x80000)
     // pressure was disabled
     return NAN;
-  }
   const int64_t p1 = this->calibration_.p1;
   const int64_t p2 = this->calibration_.p2;
   const int64_t p3 = this->calibration_.p3;
@@ -268,9 +265,9 @@ float BME280Component::read_pressure_(const uint8_t *data, int32_t t_fine) {
   return (p / 256.0f) / 100.0f;
 }
 
-float BME280Component::read_humidity_(const uint8_t *data, int32_t t_fine) {
-  uint16_t raw_adc = ((data[6] & 0xFF) << 8) | (data[7] & 0xFF);
-  if (raw_adc == 0x8000)
+float BME280Component::read_humidity_(int32_t t_fine) {
+  uint16_t raw_adc;
+  if (!this->read_byte_16(BME280_REGISTER_HUMIDDATA, &raw_adc) || raw_adc == 0x8000)
     return NAN;
 
   int32_t adc = raw_adc;

esphome/components/bme280/bme280.h

@@ -82,11 +82,11 @@ class BME280Component : public PollingComponent, public i2c::I2CDevice {
 
  protected:
   /// Read the temperature value and store the calculated ambient temperature in t_fine.
-  float read_temperature_(const uint8_t *data, int32_t *t_fine);
+  float read_temperature_(int32_t *t_fine);
   /// Read the pressure value in hPa using the provided t_fine value.
-  float read_pressure_(const uint8_t *data, int32_t t_fine);
+  float read_pressure_(int32_t t_fine);
   /// Read the humidity value in % using the provided t_fine value.
-  float read_humidity_(const uint8_t *data, int32_t t_fine);
+  float read_humidity_(int32_t t_fine);
   uint8_t read_u8_(uint8_t a_register);
   uint16_t read_u16_le_(uint8_t a_register);
   int16_t read_s16_le_(uint8_t a_register);

esphome/components/bme680/bme680.cpp

@@ -95,7 +95,7 @@ void BME680Component::setup() {
   this->calibration_.t3 = cal1[3];
 
   this->calibration_.h1 = cal2[2] << 4 | (cal2[1] & 0x0F);
-  this->calibration_.h2 = cal2[0] << 4 | cal2[1] >> 4;
+  this->calibration_.h2 = cal2[0] << 4 | cal2[1];
   this->calibration_.h3 = cal2[3];
   this->calibration_.h4 = cal2[4];
   this->calibration_.h5 = cal2[5];
@@ -420,11 +420,10 @@ float BME680Component::calc_humidity_(uint16_t raw_humidity) {
 
   calc_hum = var2 + (var3 + var4 * temp_comp) * var2 * var2;
 
-  if (calc_hum > 100.0f) {
+  if (calc_hum > 100.0f)
     calc_hum = 100.0f;
-  } else if (calc_hum < 0.0f) {
+  else if (calc_hum < 0.0f)
     calc_hum = 0.0f;
-  }
 
   return calc_hum;
 }

esphome/components/bme680_bsec/__init__.py

@@ -2,6 +2,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import i2c
 from esphome.const import CONF_ID
+from esphome.core import CORE
 
 CODEOWNERS = ["@trvrnrth"]
 DEPENDENCIES = ["i2c"]
@@ -61,8 +62,9 @@ async def to_code(config):
         var.set_state_save_interval(config[CONF_STATE_SAVE_INTERVAL].total_milliseconds)
     )
 
-    # Although this component does not use SPI, the BSEC library requires the SPI library
-    cg.add_library("SPI", None)
+    if CORE.is_esp32:
+        # Although this component does not use SPI, the BSEC library requires the SPI library
+        cg.add_library("SPI", None)
 
     cg.add_define("USE_BSEC")
-    cg.add_library("boschsensortec/BSEC Software Library", "1.6.1480")
+    cg.add_library("BSEC Software Library", "1.6.1480")

esphome/components/bmp280/bmp280.cpp

@@ -161,10 +161,9 @@ float BMP280Component::read_temperature_(int32_t *t_fine) {
     return NAN;
   int32_t adc = ((data[0] & 0xFF) << 16) | ((data[1] & 0xFF) << 8) | (data[2] & 0xFF);
   adc >>= 4;
-  if (adc == 0x80000) {
+  if (adc == 0x80000)
     // temperature was disabled
     return NAN;
-  }
 
   const int32_t t1 = this->calibration_.t1;
   const int32_t t2 = this->calibration_.t2;
@@ -184,10 +183,9 @@ float BMP280Component::read_pressure_(int32_t t_fine) {
     return NAN;
   int32_t adc = ((data[0] & 0xFF) << 16) | ((data[1] & 0xFF) << 8) | (data[2] & 0xFF);
   adc >>= 4;
-  if (adc == 0x80000) {
+  if (adc == 0x80000)
     // pressure was disabled
     return NAN;
-  }
   const int64_t p1 = this->calibration_.p1;
   const int64_t p2 = this->calibration_.p2;
   const int64_t p3 = this->calibration_.p3;

esphome/components/bmp3xx/bmp3xx.cpp

@@ -1,388 +0,0 @@
-/*
-  based on BMP388_DEV by Martin Lindupp
-  under MIT License (MIT)
-  Copyright (C) Martin Lindupp 2020
-  http://github.com/MartinL1/BMP388_DEV
-*/
-
-#include "bmp3xx.h"
-#include "esphome/core/log.h"
-#include "esphome/core/hal.h"
-
-namespace esphome {
-namespace bmp3xx {
-
-static const char *const TAG = "bmp3xx.sensor";
-
-static const LogString *chip_type_to_str(uint8_t chip_type) {
-  switch (chip_type) {
-    case BMP388_ID:
-      return LOG_STR("BMP 388");
-    case BMP390_ID:
-      return LOG_STR("BMP 390");
-    default:
-      return LOG_STR("Unknown Chip Type");
-  }
-}
-
-static const LogString *oversampling_to_str(Oversampling oversampling) {
-  switch (oversampling) {
-    case Oversampling::OVERSAMPLING_NONE:
-      return LOG_STR("None");
-    case Oversampling::OVERSAMPLING_X2:
-      return LOG_STR("2x");
-    case Oversampling::OVERSAMPLING_X4:
-      return LOG_STR("4x");
-    case Oversampling::OVERSAMPLING_X8:
-      return LOG_STR("8x");
-    case Oversampling::OVERSAMPLING_X16:
-      return LOG_STR("16x");
-    case Oversampling::OVERSAMPLING_X32:
-      return LOG_STR("32x");
-    default:
-      return LOG_STR("");
-  }
-}
-
-static const LogString *iir_filter_to_str(IIRFilter filter) {
-  switch (filter) {
-    case IIRFilter::IIR_FILTER_OFF:
-      return LOG_STR("OFF");
-    case IIRFilter::IIR_FILTER_2:
-      return LOG_STR("2x");
-    case IIRFilter::IIR_FILTER_4:
-      return LOG_STR("4x");
-    case IIRFilter::IIR_FILTER_8:
-      return LOG_STR("8x");
-    case IIRFilter::IIR_FILTER_16:
-      return LOG_STR("16x");
-    case IIRFilter::IIR_FILTER_32:
-      return LOG_STR("32x");
-    case IIRFilter::IIR_FILTER_64:
-      return LOG_STR("64x");
-    case IIRFilter::IIR_FILTER_128:
-      return LOG_STR("128x");
-    default:
-      return LOG_STR("");
-  }
-}
-
-void BMP3XXComponent::setup() {
-  this->error_code_ = NONE;
-  ESP_LOGCONFIG(TAG, "Setting up BMP3XX...");
-  // Call the Device base class "initialise" function
-  if (!reset()) {
-    ESP_LOGE(TAG, "Failed to reset BMP3XX...");
-    this->error_code_ = ERROR_SENSOR_RESET;
-    this->mark_failed();
-  }
-
-  if (!read_byte(BMP388_CHIP_ID, &this->chip_id_.reg)) {
-    ESP_LOGE(TAG, "Can't read chip id");
-    this->error_code_ = ERROR_COMMUNICATION_FAILED;
-    this->mark_failed();
-    return;
-  }
-  ESP_LOGCONFIG(TAG, "Chip %s Id 0x%X", LOG_STR_ARG(chip_type_to_str(this->chip_id_.reg)), this->chip_id_.reg);
-
-  if (chip_id_.reg != BMP388_ID && chip_id_.reg != BMP390_ID) {
-    ESP_LOGE(TAG, "Unknown chip id - is this really a BMP388 or BMP390?");
-    this->error_code_ = ERROR_WRONG_CHIP_ID;
-    this->mark_failed();
-    return;
-  }
-  // set sensor in sleep mode
-  stop_conversion();
-  // Read the calibration parameters into the params structure
-  if (!read_bytes(BMP388_TRIM_PARAMS, (uint8_t *) &compensation_params_, sizeof(compensation_params_))) {
-    ESP_LOGE(TAG, "Can't read calibration data");
-    this->error_code_ = ERROR_COMMUNICATION_FAILED;
-    this->mark_failed();
-    return;
-  }
-  compensation_float_params_.param_T1 =
-      (float) compensation_params_.param_T1 / powf(2.0f, -8.0f);  // Calculate the floating point trim parameters
-  compensation_float_params_.param_T2 = (float) compensation_params_.param_T2 / powf(2.0f, 30.0f);
-  compensation_float_params_.param_T3 = (float) compensation_params_.param_T3 / powf(2.0f, 48.0f);
-  compensation_float_params_.param_P1 = ((float) compensation_params_.param_P1 - powf(2.0f, 14.0f)) / powf(2.0f, 20.0f);
-  compensation_float_params_.param_P2 = ((float) compensation_params_.param_P2 - powf(2.0f, 14.0f)) / powf(2.0f, 29.0f);
-  compensation_float_params_.param_P3 = (float) compensation_params_.param_P3 / powf(2.0f, 32.0f);
-  compensation_float_params_.param_P4 = (float) compensation_params_.param_P4 / powf(2.0f, 37.0f);
-  compensation_float_params_.param_P5 = (float) compensation_params_.param_P5 / powf(2.0f, -3.0f);
-  compensation_float_params_.param_P6 = (float) compensation_params_.param_P6 / powf(2.0f, 6.0f);
-  compensation_float_params_.param_P7 = (float) compensation_params_.param_P7 / powf(2.0f, 8.0f);
-  compensation_float_params_.param_P8 = (float) compensation_params_.param_P8 / powf(2.0f, 15.0f);
-  compensation_float_params_.param_P9 = (float) compensation_params_.param_P9 / powf(2.0f, 48.0f);
-  compensation_float_params_.param_P10 = (float) compensation_params_.param_P10 / powf(2.0f, 48.0f);
-  compensation_float_params_.param_P11 = (float) compensation_params_.param_P11 / powf(2.0f, 65.0f);
-
-  // Initialise the BMP388 IIR filter register
-  if (!set_iir_filter(this->iir_filter_)) {
-    ESP_LOGE(TAG, "Failed to set IIR filter");
-    this->error_code_ = ERROR_COMMUNICATION_FAILED;
-    this->mark_failed();
-    return;
-  }
-
-  // Set power control registers
-  pwr_ctrl_.bit.press_en = 1;
-  pwr_ctrl_.bit.temp_en = 1;
-  // Disable pressure if no sensor defined
-  // keep temperature enabled since it's needed for compensation
-  if (this->pressure_sensor_ == nullptr) {
-    pwr_ctrl_.bit.press_en = 0;
-    this->pressure_oversampling_ = OVERSAMPLING_NONE;
-  }
-  // just disable oeversampling for temp if not used
-  if (this->temperature_sensor_ == nullptr) {
-    this->temperature_oversampling_ = OVERSAMPLING_NONE;
-  }
-  // Initialise the BMP388 oversampling register
-  if (!set_oversampling_register(this->pressure_oversampling_, this->temperature_oversampling_)) {
-    ESP_LOGE(TAG, "Failed to set oversampling register");
-    this->error_code_ = ERROR_COMMUNICATION_FAILED;
-    this->mark_failed();
-    return;
-  }
-}
-
-void BMP3XXComponent::dump_config() {
-  ESP_LOGCONFIG(TAG, "BMP3XX:");
-  ESP_LOGCONFIG(TAG, "  Type: %s (0x%X)", LOG_STR_ARG(chip_type_to_str(this->chip_id_.reg)), this->chip_id_.reg);
-  LOG_I2C_DEVICE(this);
-  switch (this->error_code_) {
-    case NONE:
-      break;
-    case ERROR_COMMUNICATION_FAILED:
-      ESP_LOGE(TAG, "Communication with BMP3XX failed!");
-      break;
-    case ERROR_WRONG_CHIP_ID:
-      ESP_LOGE(
-          TAG,
-          "BMP3XX has wrong chip ID (reported id: 0x%X) - please check if you are really using a BMP 388 or BMP 390",
-          this->chip_id_.reg);
-      break;
-    case ERROR_SENSOR_RESET:
-      ESP_LOGE(TAG, "BMP3XX failed to reset");
-      break;
-    default:
-      ESP_LOGE(TAG, "BMP3XX error code %d", (int) this->error_code_);
-      break;
-  }
-  ESP_LOGCONFIG(TAG, "  IIR Filter: %s", LOG_STR_ARG(iir_filter_to_str(this->iir_filter_)));
-  LOG_UPDATE_INTERVAL(this);
-  if (this->temperature_sensor_) {
-    LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
-    ESP_LOGCONFIG(TAG, "    Oversampling: %s", LOG_STR_ARG(oversampling_to_str(this->temperature_oversampling_)));
-  }
-  if (this->pressure_sensor_) {
-    LOG_SENSOR("  ", "Pressure", this->pressure_sensor_);
-    ESP_LOGCONFIG(TAG, "    Oversampling: %s", LOG_STR_ARG(oversampling_to_str(this->pressure_oversampling_)));
-  }
-}
-float BMP3XXComponent::get_setup_priority() const { return setup_priority::DATA; }
-
-inline uint8_t oversampling_to_time(Oversampling over_sampling) { return (1 << uint8_t(over_sampling)); }
-
-void BMP3XXComponent::update() {
-  // Enable sensor
-  ESP_LOGV(TAG, "Sending conversion request...");
-  float meas_time = 1.0f;
-  // Ref: https://www.bosch-sensortec.com/media/boschsensortec/downloads/datasheets/bst-bmp390-ds002.pdf 3.9.2
-  meas_time += 2.02f * oversampling_to_time(this->temperature_oversampling_) + 0.163f;
-  meas_time += 2.02f * oversampling_to_time(this->pressure_oversampling_) + 0.392f;
-  meas_time += 0.234f;
-  if (!set_mode(FORCED_MODE)) {
-    ESP_LOGE(TAG, "Failed start forced mode");
-    this->mark_failed();
-    return;
-  }
-
-  ESP_LOGVV(TAG, "measurement time %d", uint32_t(ceilf(meas_time)));
-  this->set_timeout("data", uint32_t(ceilf(meas_time)), [this]() {
-    float temperature = 0.0f;
-    float pressure = 0.0f;
-    if (this->pressure_sensor_ != nullptr) {
-      if (!get_measurements(temperature, pressure)) {
-        ESP_LOGW(TAG, "Failed to read pressure and temperature - skipping update");
-        this->status_set_warning();
-        return;
-      }
-      ESP_LOGD(TAG, "Got temperature=%.1f°C pressure=%.1fhPa", temperature, pressure);
-    } else {
-      if (!get_temperature(temperature)) {
-        ESP_LOGW(TAG, "Failed to read temperature - skipping update");
-        this->status_set_warning();
-        return;
-      }
-      ESP_LOGD(TAG, "Got temperature=%.1f°C", temperature);
-    }
-
-    if (this->temperature_sensor_ != nullptr)
-      this->temperature_sensor_->publish_state(temperature);
-    if (this->pressure_sensor_ != nullptr)
-      this->pressure_sensor_->publish_state(pressure);
-    this->status_clear_warning();
-    set_mode(SLEEP_MODE);
-  });
-}
-
-// Reset the BMP3XX
-uint8_t BMP3XXComponent::reset() {
-  write_byte(BMP388_CMD, RESET_CODE);  // Write the reset code to the command register
-  // Wait for 10ms
-  delay(10);
-  this->read_byte(BMP388_EVENT, &event_.reg);  // Read the BMP388's event register
-  return event_.bit.por_detected;              // Return if device reset is complete
-}
-
-// Start a one shot measurement in FORCED_MODE
-bool BMP3XXComponent::start_forced_conversion() {
-  // Only set FORCED_MODE if we're already in SLEEP_MODE
-  if (pwr_ctrl_.bit.mode == SLEEP_MODE) {
-    return set_mode(FORCED_MODE);
-  }
-  return true;
-}
-
-// Stop the conversion and return to SLEEP_MODE
-bool BMP3XXComponent::stop_conversion() { return set_mode(SLEEP_MODE); }
-
-// Set the pressure oversampling rate
-bool BMP3XXComponent::set_pressure_oversampling(Oversampling oversampling) {
-  osr_.bit.osr_p = oversampling;
-  return this->write_byte(BMP388_OSR, osr_.reg);
-}
-
-// Set the temperature oversampling rate
-bool BMP3XXComponent::set_temperature_oversampling(Oversampling oversampling) {
-  osr_.bit.osr_t = oversampling;
-  return this->write_byte(BMP388_OSR, osr_.reg);
-}
-
-// Set the IIR filter setting
-bool BMP3XXComponent::set_iir_filter(IIRFilter iir_filter) {
-  config_.bit.iir_filter = iir_filter;
-  return this->write_byte(BMP388_CONFIG, config_.reg);
-}
-
-// Get temperature
-bool BMP3XXComponent::get_temperature(float &temperature) {
-  // Check if a measurement is ready
-  if (!data_ready()) {
-    return false;
-  }
-  uint8_t data[3];
-  // Read the temperature
-  if (!this->read_bytes(BMP388_DATA_3, &data[0], 3)) {
-    ESP_LOGE(TAG, "Failed to read temperature");
-    return false;
-  }
-  // Copy the temperature data into the adc variables
-  int32_t adc_temp = (int32_t) data[2] << 16 | (int32_t) data[1] << 8 | (int32_t) data[0];
-  // Temperature compensation (function from BMP388 datasheet)
-  temperature = bmp388_compensate_temperature_((float) adc_temp);
-  return true;
-}
-
-// Get the pressure
-bool BMP3XXComponent::get_pressure(float &pressure) {
-  float temperature;
-  return get_measurements(temperature, pressure);
-}
-
-// Get temperature and pressure
-bool BMP3XXComponent::get_measurements(float &temperature, float &pressure) {
-  // Check if a measurement is ready
-  if (!data_ready()) {
-    ESP_LOGD(TAG, "BMP3XX Get measurement - data not ready skipping update");
-    return false;
-  }
-
-  uint8_t data[6];
-  // Read the temperature and pressure data
-  if (!this->read_bytes(BMP388_DATA_0, &data[0], 6)) {
-    ESP_LOGE(TAG, "Failed to read measurements");
-    return false;
-  }
-  // Copy the temperature and pressure data into the adc variables
-  int32_t adc_pres = (int32_t) data[2] << 16 | (int32_t) data[1] << 8 | (int32_t) data[0];
-  int32_t adc_temp = (int32_t) data[5] << 16 | (int32_t) data[4] << 8 | (int32_t) data[3];
-
-  // Temperature compensation (function from BMP388 datasheet)
-  temperature = bmp388_compensate_temperature_((float) adc_temp);
-  // Pressure compensation (function from BMP388 datasheet)
-  pressure = bmp388_compensate_pressure_((float) adc_pres, temperature);
-  // Calculate the pressure in millibar/hPa
-  pressure /= 100.0f;
-  return true;
-}
-
-// Set the BMP388's mode in the power control register
-bool BMP3XXComponent::set_mode(OperationMode mode) {
-  pwr_ctrl_.bit.mode = mode;
-  return this->write_byte(BMP388_PWR_CTRL, pwr_ctrl_.reg);
-}
-
-// Set the BMP388 oversampling register
-bool BMP3XXComponent::set_oversampling_register(Oversampling pressure_oversampling,
-                                                Oversampling temperature_oversampling) {
-  osr_.reg = temperature_oversampling << 3 | pressure_oversampling;
-  return this->write_byte(BMP388_OSR, osr_.reg);
-}
-
-// Check if measurement data is ready
-bool BMP3XXComponent::data_ready() {
-  // If we're in SLEEP_MODE return immediately
-  if (pwr_ctrl_.bit.mode == SLEEP_MODE) {
-    ESP_LOGD(TAG, "Not ready - sensor is in sleep mode");
-    return false;
-  }
-  // Read the interrupt status register
-  uint8_t status;
-  if (!this->read_byte(BMP388_INT_STATUS, &status)) {
-    ESP_LOGE(TAG, "Failed to read status register");
-    return false;
-  }
-  int_status_.reg = status;
-  ESP_LOGVV(TAG, "data ready status %d", status);
-  // If we're in FORCED_MODE switch back to SLEEP_MODE
-  if (int_status_.bit.drdy) {
-    if (pwr_ctrl_.bit.mode == FORCED_MODE) {
-      pwr_ctrl_.bit.mode = SLEEP_MODE;
-    }
-    return true;  // The measurement is ready
-  }
-  return false;  // The measurement is still pending
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Bosch BMP3XXComponent (Private) Member Functions
-////////////////////////////////////////////////////////////////////////////////
-
-float BMP3XXComponent::bmp388_compensate_temperature_(float uncomp_temp) {
-  float partial_data1 = uncomp_temp - compensation_float_params_.param_T1;
-  float partial_data2 = partial_data1 * compensation_float_params_.param_T2;
-  return partial_data2 + partial_data1 * partial_data1 * compensation_float_params_.param_T3;
-}
-
-float BMP3XXComponent::bmp388_compensate_pressure_(float uncomp_press, float t_lin) {
-  float partial_data1 = compensation_float_params_.param_P6 * t_lin;
-  float partial_data2 = compensation_float_params_.param_P7 * t_lin * t_lin;
-  float partial_data3 = compensation_float_params_.param_P8 * t_lin * t_lin * t_lin;
-  float partial_out1 = compensation_float_params_.param_P5 + partial_data1 + partial_data2 + partial_data3;
-  partial_data1 = compensation_float_params_.param_P2 * t_lin;
-  partial_data2 = compensation_float_params_.param_P3 * t_lin * t_lin;
-  partial_data3 = compensation_float_params_.param_P4 * t_lin * t_lin * t_lin;
-  float partial_out2 =
-      uncomp_press * (compensation_float_params_.param_P1 + partial_data1 + partial_data2 + partial_data3);
-  partial_data1 = uncomp_press * uncomp_press;
-  partial_data2 = compensation_float_params_.param_P9 + compensation_float_params_.param_P10 * t_lin;
-  partial_data3 = partial_data1 * partial_data2;
-  float partial_data4 =
-      partial_data3 + uncomp_press * uncomp_press * uncomp_press * compensation_float_params_.param_P11;
-  return partial_out1 + partial_out2 + partial_data4;
-}
-
-}  // namespace bmp3xx
-}  // namespace esphome

esphome/components/bmp3xx/bmp3xx.h

@@ -1,237 +0,0 @@
-/*
-  based on BMP388_DEV by Martin Lindupp
-  under MIT License (MIT)
-  Copyright (C) Martin Lindupp 2020
-  http://github.com/MartinL1/BMP388_DEV
-*/
-
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/i2c/i2c.h"
-
-namespace esphome {
-namespace bmp3xx {
-
-static const uint8_t BMP388_ID = 0x50;   // The BMP388 device ID
-static const uint8_t BMP390_ID = 0x60;   // The BMP390 device ID
-static const uint8_t RESET_CODE = 0xB6;  // The BMP388 reset code
-
-/// BMP388_DEV Registers
-enum {
-  BMP388_CHIP_ID = 0x00,       // Chip ID register sub-address
-  BMP388_ERR_REG = 0x02,       // Error register sub-address
-  BMP388_STATUS = 0x03,        // Status register sub-address
-  BMP388_DATA_0 = 0x04,        // Pressure eXtended Least Significant Byte (XLSB) register sub-address
-  BMP388_DATA_1 = 0x05,        // Pressure Least Significant Byte (LSB) register sub-address
-  BMP388_DATA_2 = 0x06,        // Pressure Most Significant Byte (MSB) register sub-address
-  BMP388_DATA_3 = 0x07,        // Temperature eXtended Least Significant Byte (XLSB) register sub-address
-  BMP388_DATA_4 = 0x08,        // Temperature Least Significant Byte (LSB) register sub-address
-  BMP388_DATA_5 = 0x09,        // Temperature Most Significant Byte (MSB) register sub-address
-  BMP388_SENSORTIME_0 = 0x0C,  // Sensor time register 0 sub-address
-  BMP388_SENSORTIME_1 = 0x0D,  // Sensor time register 1 sub-address
-  BMP388_SENSORTIME_2 = 0x0E,  // Sensor time register 2 sub-address
-  BMP388_EVENT = 0x10,         // Event register sub-address
-  BMP388_INT_STATUS = 0x11,    // Interrupt Status register sub-address
-  BMP388_INT_CTRL = 0x19,      // Interrupt Control register sub-address
-  BMP388_IF_CONFIG = 0x1A,     // Interface Configuration register sub-address
-  BMP388_PWR_CTRL = 0x1B,      // Power Control register sub-address
-  BMP388_OSR = 0x1C,           // Oversampling register sub-address
-  BMP388_ODR = 0x1D,           // Output Data Rate register sub-address
-  BMP388_CONFIG = 0x1F,        // Configuration register sub-address
-  BMP388_TRIM_PARAMS = 0x31,   // Trim parameter registers' base sub-address
-  BMP388_CMD = 0x7E            // Command register sub-address
-};
-
-/// Device mode bitfield in the control and measurement register
-enum OperationMode { SLEEP_MODE = 0x00, FORCED_MODE = 0x01, NORMAL_MODE = 0x03 };
-
-/// Oversampling bit fields in the control and measurement register
-enum Oversampling {
-  OVERSAMPLING_NONE = 0x00,
-  OVERSAMPLING_X2 = 0x01,
-  OVERSAMPLING_X4 = 0x02,
-  OVERSAMPLING_X8 = 0x03,
-  OVERSAMPLING_X16 = 0x04,
-  OVERSAMPLING_X32 = 0x05
-};
-
-/// Infinite Impulse Response (IIR) filter bit field in the configuration register
-enum IIRFilter {
-  IIR_FILTER_OFF = 0x00,
-  IIR_FILTER_2 = 0x01,
-  IIR_FILTER_4 = 0x02,
-  IIR_FILTER_8 = 0x03,
-  IIR_FILTER_16 = 0x04,
-  IIR_FILTER_32 = 0x05,
-  IIR_FILTER_64 = 0x06,
-  IIR_FILTER_128 = 0x07
-};
-
-/// This class implements support for the BMP3XX Temperature+Pressure i2c sensor.
-class BMP3XXComponent : public PollingComponent, public i2c::I2CDevice {
- public:
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override;
-  void update() override;
-
-  void set_temperature_sensor(sensor::Sensor *temperature_sensor) { temperature_sensor_ = temperature_sensor; }
-  void set_pressure_sensor(sensor::Sensor *pressure_sensor) { pressure_sensor_ = pressure_sensor; }
-
-  /// Set the oversampling value for the temperature sensor. Default is 16x.
-  void set_temperature_oversampling_config(Oversampling temperature_oversampling) {
-    this->temperature_oversampling_ = temperature_oversampling;
-  }
-  /// Set the oversampling value for the pressure sensor. Default is 16x.
-  void set_pressure_oversampling_config(Oversampling pressure_oversampling) {
-    this->pressure_oversampling_ = pressure_oversampling;
-  }
-  /// Set the IIR Filter used to increase accuracy, defaults to no IIR Filter.
-  void set_iir_filter_config(IIRFilter iir_filter) { this->iir_filter_ = iir_filter; }
-
-  /// Soft reset the sensor
-  uint8_t reset();
-  /// Start continuous measurement in NORMAL_MODE
-  bool start_normal_conversion();
-  /// Start a one shot measurement in FORCED_MODE
-  bool start_forced_conversion();
-  /// Stop the conversion and return to SLEEP_MODE
-  bool stop_conversion();
-  /// Set the pressure oversampling: OFF, X1, X2, X4, X8, X16, X32
-  bool set_pressure_oversampling(Oversampling pressure_oversampling);
-  /// Set the temperature oversampling: OFF, X1, X2, X4, X8, X16, X32
-  bool set_temperature_oversampling(Oversampling temperature_oversampling);
-  /// Set the IIR filter setting: OFF, 2, 3, 8, 16, 32
-  bool set_iir_filter(IIRFilter iir_filter);
-  /// Get a temperature measurement
-  bool get_temperature(float &temperature);
-  /// Get a pressure measurement
-  bool get_pressure(float &pressure);
-  /// Get a temperature and pressure measurement
-  bool get_measurements(float &temperature, float &pressure);
-  /// Get a temperature and pressure measurement
-  bool get_measurement();
-  /// Set the barometer mode
-  bool set_mode(OperationMode mode);
-  /// Set the BMP388 oversampling register
-  bool set_oversampling_register(Oversampling pressure_oversampling, Oversampling temperature_oversampling);
-  /// Checks if a measurement is ready
-  bool data_ready();
-
- protected:
-  Oversampling temperature_oversampling_{OVERSAMPLING_X16};
-  Oversampling pressure_oversampling_{OVERSAMPLING_X16};
-  IIRFilter iir_filter_{IIR_FILTER_OFF};
-  OperationMode operation_mode_{FORCED_MODE};
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *pressure_sensor_;
-  enum ErrorCode {
-    NONE = 0,
-    ERROR_COMMUNICATION_FAILED,
-    ERROR_WRONG_CHIP_ID,
-    ERROR_SENSOR_STATUS,
-    ERROR_SENSOR_RESET,
-  } error_code_{NONE};
-
-  struct {  // The BMP388 compensation trim parameters (coefficients)
-    uint16_t param_T1;
-    uint16_t param_T2;
-    int8_t param_T3;
-    int16_t param_P1;
-    int16_t param_P2;
-    int8_t param_P3;
-    int8_t param_P4;
-    uint16_t param_P5;
-    uint16_t param_P6;
-    int8_t param_P7;
-    int8_t param_P8;
-    int16_t param_P9;
-    int8_t param_P10;
-    int8_t param_P11;
-  } __attribute__((packed)) compensation_params_;
-
-  struct FloatParams {  // The BMP388 float point compensation trim parameters
-    float param_T1;
-    float param_T2;
-    float param_T3;
-    float param_P1;
-    float param_P2;
-    float param_P3;
-    float param_P4;
-    float param_P5;
-    float param_P6;
-    float param_P7;
-    float param_P8;
-    float param_P9;
-    float param_P10;
-    float param_P11;
-  } compensation_float_params_;
-
-  union {  // Copy of the BMP388's chip id register
-    struct {
-      uint8_t chip_id_nvm : 4;
-      uint8_t chip_id_fixed : 4;
-    } bit;
-    uint8_t reg;
-  } chip_id_ = {.reg = 0};
-
-  union {  // Copy of the BMP388's event register
-    struct {
-      uint8_t por_detected : 1;
-    } bit;
-    uint8_t reg;
-  } event_ = {.reg = 0};
-
-  union {  // Copy of the BMP388's interrupt status register
-    struct {
-      uint8_t fwm_int : 1;
-      uint8_t ffull_int : 1;
-      uint8_t : 1;
-      uint8_t drdy : 1;
-    } bit;
-    uint8_t reg;
-  } int_status_ = {.reg = 0};
-
-  union {  // Copy of the BMP388's power control register
-    struct {
-      uint8_t press_en : 1;
-      uint8_t temp_en : 1;
-      uint8_t : 2;
-      uint8_t mode : 2;
-    } bit;
-    uint8_t reg;
-  } pwr_ctrl_ = {.reg = 0};
-
-  union {  // Copy of the BMP388's oversampling register
-    struct {
-      uint8_t osr_p : 3;
-      uint8_t osr_t : 3;
-    } bit;
-    uint8_t reg;
-  } osr_ = {.reg = 0};
-
-  union {  // Copy of the BMP388's output data rate register
-    struct {
-      uint8_t odr_sel : 5;
-    } bit;
-    uint8_t reg;
-  } odr_ = {.reg = 0};
-
-  union {  // Copy of the BMP388's configuration register
-    struct {
-      uint8_t : 1;
-      uint8_t iir_filter : 3;
-    } bit;
-    uint8_t reg;
-  } config_ = {.reg = 0};
-
-  // Bosch temperature compensation function
-  float bmp388_compensate_temperature_(float uncomp_temp);
-  // Bosch pressure compensation function
-  float bmp388_compensate_pressure_(float uncomp_press, float t_lin);
-};
-
-}  // namespace bmp3xx
-}  // namespace esphome

esphome/components/bmp3xx/sensor.py

@@ -1,100 +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_IIR_FILTER,
-    CONF_OVERSAMPLING,
-    CONF_PRESSURE,
-    CONF_TEMPERATURE,
-    DEVICE_CLASS_PRESSURE,
-    DEVICE_CLASS_TEMPERATURE,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_CELSIUS,
-    UNIT_HECTOPASCAL,
-)
-
-CODEOWNERS = ["@martgras"]
-DEPENDENCIES = ["i2c"]
-
-bmp3xx_ns = cg.esphome_ns.namespace("bmp3xx")
-Oversampling = bmp3xx_ns.enum("Oversampling")
-OVERSAMPLING_OPTIONS = {
-    "NONE": Oversampling.OVERSAMPLING_NONE,
-    "2X": Oversampling.OVERSAMPLING_X2,
-    "4X": Oversampling.OVERSAMPLING_X4,
-    "8X": Oversampling.OVERSAMPLING_X8,
-    "16X": Oversampling.OVERSAMPLING_X16,
-    "32x": Oversampling.OVERSAMPLING_X32,
-}
-
-IIRFilter = bmp3xx_ns.enum("IIRFilter")
-IIR_FILTER_OPTIONS = {
-    "OFF": IIRFilter.IIR_FILTER_OFF,
-    "2X": IIRFilter.IIR_FILTER_2,
-    "4X": IIRFilter.IIR_FILTER_4,
-    "8X": IIRFilter.IIR_FILTER_8,
-    "16X": IIRFilter.IIR_FILTER_16,
-    "32X": IIRFilter.IIR_FILTER_32,
-    "64X": IIRFilter.IIR_FILTER_64,
-    "128X": IIRFilter.IIR_FILTER_128,
-}
-
-BMP3XXComponent = bmp3xx_ns.class_(
-    "BMP3XXComponent", cg.PollingComponent, i2c.I2CDevice
-)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(BMP3XXComponent),
-            cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_CELSIUS,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_TEMPERATURE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ).extend(
-                {
-                    cv.Optional(CONF_OVERSAMPLING, default="2X"): cv.enum(
-                        OVERSAMPLING_OPTIONS, upper=True
-                    ),
-                }
-            ),
-            cv.Optional(CONF_PRESSURE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_HECTOPASCAL,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_PRESSURE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ).extend(
-                {
-                    cv.Optional(CONF_OVERSAMPLING, default="16X"): cv.enum(
-                        OVERSAMPLING_OPTIONS, upper=True
-                    ),
-                }
-            ),
-            cv.Optional(CONF_IIR_FILTER, default="OFF"): cv.enum(
-                IIR_FILTER_OPTIONS, upper=True
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(i2c.i2c_device_schema(0x77))
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await i2c.register_i2c_device(var, config)
-    cg.add(var.set_iir_filter_config(config[CONF_IIR_FILTER]))
-    if CONF_TEMPERATURE in config:
-        conf = config[CONF_TEMPERATURE]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_temperature_sensor(sens))
-        cg.add(var.set_temperature_oversampling_config(conf[CONF_OVERSAMPLING]))
-
-    if CONF_PRESSURE in config:
-        conf = config[CONF_PRESSURE]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_pressure_sensor(sens))
-        cg.add(var.set_pressure_oversampling_config(conf[CONF_OVERSAMPLING]))

esphome/components/button/__init__.py

@@ -1,127 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome import automation
-from esphome.automation import maybe_simple_id
-from esphome.components import mqtt
-from esphome.const import (
-    CONF_DEVICE_CLASS,
-    CONF_ENTITY_CATEGORY,
-    CONF_ICON,
-    CONF_ID,
-    CONF_ON_PRESS,
-    CONF_TRIGGER_ID,
-    CONF_MQTT_ID,
-    DEVICE_CLASS_RESTART,
-    DEVICE_CLASS_UPDATE,
-)
-from esphome.core import CORE, coroutine_with_priority
-from esphome.cpp_helpers import setup_entity
-
-CODEOWNERS = ["@esphome/core"]
-IS_PLATFORM_COMPONENT = True
-
-DEVICE_CLASSES = [
-    DEVICE_CLASS_RESTART,
-    DEVICE_CLASS_UPDATE,
-]
-
-button_ns = cg.esphome_ns.namespace("button")
-Button = button_ns.class_("Button", cg.EntityBase)
-ButtonPtr = Button.operator("ptr")
-
-PressAction = button_ns.class_("PressAction", automation.Action)
-
-ButtonPressTrigger = button_ns.class_(
-    "ButtonPressTrigger", automation.Trigger.template()
-)
-
-validate_device_class = cv.one_of(*DEVICE_CLASSES, lower=True, space="_")
-
-
-BUTTON_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).extend(
-    {
-        cv.OnlyWith(CONF_MQTT_ID, "mqtt"): cv.declare_id(mqtt.MQTTButtonComponent),
-        cv.Optional(CONF_DEVICE_CLASS): validate_device_class,
-        cv.Optional(CONF_ON_PRESS): automation.validate_automation(
-            {
-                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ButtonPressTrigger),
-            }
-        ),
-    }
-)
-
-_UNDEF = object()
-
-
-def button_schema(
-    icon: str = _UNDEF,
-    entity_category: str = _UNDEF,
-    device_class: str = _UNDEF,
-) -> cv.Schema:
-    schema = BUTTON_SCHEMA
-    if icon is not _UNDEF:
-        schema = schema.extend({cv.Optional(CONF_ICON, default=icon): cv.icon})
-    if entity_category is not _UNDEF:
-        schema = schema.extend(
-            {
-                cv.Optional(
-                    CONF_ENTITY_CATEGORY, default=entity_category
-                ): cv.entity_category
-            }
-        )
-    if device_class is not _UNDEF:
-        schema = schema.extend(
-            {
-                cv.Optional(
-                    CONF_DEVICE_CLASS, default=device_class
-                ): validate_device_class
-            }
-        )
-    return schema
-
-
-async def setup_button_core_(var, config):
-    await setup_entity(var, config)
-
-    for conf in config.get(CONF_ON_PRESS, []):
-        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-        await automation.build_automation(trigger, [], conf)
-
-    if CONF_DEVICE_CLASS in config:
-        cg.add(var.set_device_class(config[CONF_DEVICE_CLASS]))
-
-    if CONF_MQTT_ID in config:
-        mqtt_ = cg.new_Pvariable(config[CONF_MQTT_ID], var)
-        await mqtt.register_mqtt_component(mqtt_, config)
-
-
-async def register_button(var, config):
-    if not CORE.has_id(config[CONF_ID]):
-        var = cg.Pvariable(config[CONF_ID], var)
-    cg.add(cg.App.register_button(var))
-    await setup_button_core_(var, config)
-
-
-async def new_button(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await register_button(var, config)
-    return var
-
-
-BUTTON_PRESS_SCHEMA = maybe_simple_id(
-    {
-        cv.Required(CONF_ID): cv.use_id(Button),
-    }
-)
-
-
-@automation.register_action("button.press", PressAction, BUTTON_PRESS_SCHEMA)
-async def button_press_to_code(config, action_id, template_arg, args):
-    paren = await cg.get_variable(config[CONF_ID])
-    return cg.new_Pvariable(action_id, template_arg, paren)
-
-
-@coroutine_with_priority(100.0)
-async def to_code(config):
-    cg.add_global(button_ns.using)
-    cg.add_define("USE_BUTTON")

esphome/components/button/automation.h

@@ -1,28 +0,0 @@
-#pragma once
-
-#include "esphome/components/button/button.h"
-#include "esphome/core/automation.h"
-#include "esphome/core/component.h"
-
-namespace esphome {
-namespace button {
-
-template<typename... Ts> class PressAction : public Action<Ts...> {
- public:
-  explicit PressAction(Button *button) : button_(button) {}
-
-  void play(Ts... x) override { this->button_->press(); }
-
- protected:
-  Button *button_;
-};
-
-class ButtonPressTrigger : public Trigger<> {
- public:
-  ButtonPressTrigger(Button *button) {
-    button->add_on_press_callback([this]() { this->trigger(); });
-  }
-};
-
-}  // namespace button
-}  // namespace esphome

esphome/components/button/button.cpp

@@ -1,28 +0,0 @@
-#include "button.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace button {
-
-static const char *const TAG = "button";
-
-Button::Button(const std::string &name) : EntityBase(name) {}
-Button::Button() : Button("") {}
-
-void Button::press() {
-  ESP_LOGD(TAG, "'%s' Pressed.", this->get_name().c_str());
-  this->press_action();
-  this->press_callback_.call();
-}
-void Button::add_on_press_callback(std::function<void()> &&callback) { this->press_callback_.add(std::move(callback)); }
-uint32_t Button::hash_base() { return 1495763804UL; }
-
-void Button::set_device_class(const std::string &device_class) { this->device_class_ = device_class; }
-std::string Button::get_device_class() {
-  if (this->device_class_.has_value())
-    return *this->device_class_;
-  return "";
-}
-
-}  // namespace button
-}  // namespace esphome

esphome/components/button/button.h

@@ -1,57 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/entity_base.h"
-#include "esphome/core/helpers.h"
-
-namespace esphome {
-namespace button {
-
-#define LOG_BUTTON(prefix, type, obj) \
-  if ((obj) != nullptr) { \
-    ESP_LOGCONFIG(TAG, "%s%s '%s'", prefix, LOG_STR_LITERAL(type), (obj)->get_name().c_str()); \
-    if (!(obj)->get_icon().empty()) { \
-      ESP_LOGCONFIG(TAG, "%s  Icon: '%s'", prefix, (obj)->get_icon().c_str()); \
-    } \
-  }
-
-/** Base class for all buttons.
- *
- * A button is just a momentary switch that does not have a state, only a trigger.
- */
-class Button : public EntityBase {
- public:
-  explicit Button();
-  explicit Button(const std::string &name);
-
-  /** Press this button. This is called by the front-end.
-   *
-   * For implementing buttons, please override press_action.
-   */
-  void press();
-
-  /** Set callback for state changes.
-   *
-   * @param callback The void() callback.
-   */
-  void add_on_press_callback(std::function<void()> &&callback);
-
-  /// Set the Home Assistant device class (see button::device_class).
-  void set_device_class(const std::string &device_class);
-
-  /// Get the device class for this button.
-  std::string get_device_class();
-
- protected:
-  /** You should implement this virtual method if you want to create your own button.
-   */
-  virtual void press_action(){};
-
-  uint32_t hash_base() override;
-
-  CallbackManager<void()> press_callback_{};
-  optional<std::string> device_class_{};
-};
-
-}  // namespace button
-}  // namespace esphome

esphome/components/canbus/canbus.cpp

@@ -75,7 +75,7 @@ void Canbus::loop() {
     }
 
     // fire all triggers
-    for (auto *trigger : this->triggers_) {
+    for (auto trigger : this->triggers_) {
       if ((trigger->can_id_ == can_message.can_id) && (trigger->use_extended_id_ == can_message.use_extended_id)) {
         trigger->trigger(data);
       }

esphome/components/cap1188/__init__.py

@@ -1,45 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import i2c
-from esphome.const import CONF_ID, CONF_RESET_PIN
-from esphome import pins
-
-CONF_TOUCH_THRESHOLD = "touch_threshold"
-CONF_ALLOW_MULTIPLE_TOUCHES = "allow_multiple_touches"
-
-DEPENDENCIES = ["i2c"]
-AUTO_LOAD = ["binary_sensor", "output"]
-CODEOWNERS = ["@MrEditor97"]
-
-cap1188_ns = cg.esphome_ns.namespace("cap1188")
-CONF_CAP1188_ID = "cap1188_id"
-CAP1188Component = cap1188_ns.class_("CAP1188Component", cg.Component, i2c.I2CDevice)
-
-MULTI_CONF = True
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(CAP1188Component),
-            cv.Optional(CONF_RESET_PIN): pins.gpio_output_pin_schema,
-            cv.Optional(CONF_TOUCH_THRESHOLD, default=0x20): cv.int_range(
-                min=0x01, max=0x80
-            ),
-            cv.Optional(CONF_ALLOW_MULTIPLE_TOUCHES, default=False): cv.boolean,
-        }
-    )
-    .extend(cv.COMPONENT_SCHEMA)
-    .extend(i2c.i2c_device_schema(0x29))
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    cg.add(var.set_touch_threshold(config[CONF_TOUCH_THRESHOLD]))
-    cg.add(var.set_allow_multiple_touches(config[CONF_ALLOW_MULTIPLE_TOUCHES]))
-
-    if CONF_RESET_PIN in config:
-        pin = await cg.gpio_pin_expression(config[CONF_RESET_PIN])
-        cg.add(var.set_reset_pin(pin))
-
-    await cg.register_component(var, config)
-    await i2c.register_i2c_device(var, config)

esphome/components/cap1188/binary_sensor.py

@@ -1,25 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import binary_sensor
-from esphome.const import CONF_CHANNEL, CONF_ID
-from . import cap1188_ns, CAP1188Component, CONF_CAP1188_ID
-
-DEPENDENCIES = ["cap1188"]
-CAP1188Channel = cap1188_ns.class_("CAP1188Channel", binary_sensor.BinarySensor)
-
-CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(CAP1188Channel),
-        cv.GenerateID(CONF_CAP1188_ID): cv.use_id(CAP1188Component),
-        cv.Required(CONF_CHANNEL): cv.int_range(min=0, max=7),
-    }
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await binary_sensor.register_binary_sensor(var, config)
-    hub = await cg.get_variable(config[CONF_CAP1188_ID])
-    cg.add(var.set_channel(config[CONF_CHANNEL]))
-
-    cg.add(hub.register_channel(var))

esphome/components/cap1188/cap1188.cpp

@@ -1,88 +0,0 @@
-#include "cap1188.h"
-#include "esphome/core/log.h"
-#include "esphome/core/hal.h"
-
-namespace esphome {
-namespace cap1188 {
-
-static const char *const TAG = "cap1188";
-
-void CAP1188Component::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up CAP1188...");
-
-  // Reset device using the reset pin
-  if (this->reset_pin_ != nullptr) {
-    this->reset_pin_->setup();
-    this->reset_pin_->digital_write(false);
-    delay(100);  // NOLINT
-    this->reset_pin_->digital_write(true);
-    delay(100);  // NOLINT
-    this->reset_pin_->digital_write(false);
-    delay(100);  // NOLINT
-  }
-
-  // Check if CAP1188 is actually connected
-  this->read_byte(CAP1188_PRODUCT_ID, &this->cap1188_product_id_);
-  this->read_byte(CAP1188_MANUFACTURE_ID, &this->cap1188_manufacture_id_);
-  this->read_byte(CAP1188_REVISION, &this->cap1188_revision_);
-
-  if ((this->cap1188_product_id_ != 0x50) || (this->cap1188_manufacture_id_ != 0x5D)) {
-    this->error_code_ = COMMUNICATION_FAILED;
-    this->mark_failed();
-    return;
-  }
-
-  // Set sensitivity
-  uint8_t sensitivity = 0;
-  this->read_byte(CAP1188_SENSITVITY, &sensitivity);
-  sensitivity = sensitivity & 0x0f;
-  this->write_byte(CAP1188_SENSITVITY, sensitivity | this->touch_threshold_);
-
-  // Allow multiple touches
-  this->write_byte(CAP1188_MULTI_TOUCH, this->allow_multiple_touches_);
-
-  // Have LEDs follow touches
-  this->write_byte(CAP1188_LED_LINK, 0xFF);
-
-  // Speed up a bit
-  this->write_byte(CAP1188_STAND_BY_CONFIGURATION, 0x30);
-}
-
-void CAP1188Component::dump_config() {
-  ESP_LOGCONFIG(TAG, "CAP1188:");
-  LOG_I2C_DEVICE(this);
-  LOG_PIN("  Reset Pin: ", this->reset_pin_);
-  ESP_LOGCONFIG(TAG, "  Product ID: 0x%x", this->cap1188_product_id_);
-  ESP_LOGCONFIG(TAG, "  Manufacture ID: 0x%x", this->cap1188_manufacture_id_);
-  ESP_LOGCONFIG(TAG, "  Revision ID: 0x%x", this->cap1188_revision_);
-
-  switch (this->error_code_) {
-    case COMMUNICATION_FAILED:
-      ESP_LOGE(TAG, "Product ID or Manufacture ID of the connected device does not match a known CAP1188.");
-      break;
-    case NONE:
-    default:
-      break;
-  }
-}
-
-void CAP1188Component::loop() {
-  uint8_t touched = 0;
-
-  this->read_register(CAP1188_SENSOR_INPUT_STATUS, &touched, 1);
-
-  if (touched) {
-    uint8_t data = 0;
-    this->read_register(CAP1188_MAIN, &data, 1);
-    data = data & ~CAP1188_MAIN_INT;
-
-    this->write_register(CAP1188_MAIN, &data, 2);
-  }
-
-  for (auto *channel : this->channels_) {
-    channel->process(touched);
-  }
-}
-
-}  // namespace cap1188
-}  // namespace esphome

esphome/components/cap1188/cap1188.h

@@ -1,68 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/hal.h"
-#include "esphome/components/i2c/i2c.h"
-#include "esphome/components/output/binary_output.h"
-#include "esphome/components/binary_sensor/binary_sensor.h"
-
-namespace esphome {
-namespace cap1188 {
-
-enum {
-  CAP1188_I2CADDR = 0x29,
-  CAP1188_SENSOR_INPUT_STATUS = 0x3,
-  CAP1188_MULTI_TOUCH = 0x2A,
-  CAP1188_LED_LINK = 0x72,
-  CAP1188_PRODUCT_ID = 0xFD,
-  CAP1188_MANUFACTURE_ID = 0xFE,
-  CAP1188_STAND_BY_CONFIGURATION = 0x41,
-  CAP1188_REVISION = 0xFF,
-  CAP1188_MAIN = 0x00,
-  CAP1188_MAIN_INT = 0x01,
-  CAP1188_LEDPOL = 0x73,
-  CAP1188_INTERUPT_REPEAT = 0x28,
-  CAP1188_SENSITVITY = 0x1f,
-};
-
-class CAP1188Channel : public binary_sensor::BinarySensor {
- public:
-  void set_channel(uint8_t channel) { channel_ = channel; }
-  void process(uint8_t data) { this->publish_state(static_cast<bool>(data & (1 << this->channel_))); }
-
- protected:
-  uint8_t channel_{0};
-};
-
-class CAP1188Component : public Component, public i2c::I2CDevice {
- public:
-  void register_channel(CAP1188Channel *channel) { this->channels_.push_back(channel); }
-  void set_touch_threshold(uint8_t touch_threshold) { this->touch_threshold_ = touch_threshold; };
-  void set_allow_multiple_touches(bool allow_multiple_touches) {
-    this->allow_multiple_touches_ = allow_multiple_touches ? 0x41 : 0x80;
-  };
-  void set_reset_pin(GPIOPin *reset_pin) { this->reset_pin_ = reset_pin; }
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::DATA; }
-  void loop() override;
-
- protected:
-  std::vector<CAP1188Channel *> channels_{};
-  uint8_t touch_threshold_{0x20};
-  uint8_t allow_multiple_touches_{0x80};
-
-  GPIOPin *reset_pin_{nullptr};
-
-  uint8_t cap1188_product_id_{0};
-  uint8_t cap1188_manufacture_id_{0};
-  uint8_t cap1188_revision_{0};
-
-  enum ErrorCode {
-    NONE = 0,
-    COMMUNICATION_FAILED,
-  } error_code_{NONE};
-};
-
-}  // namespace cap1188
-}  // namespace esphome

esphome/components/captive_portal/__init__.py

@@ -36,5 +36,3 @@ async def to_code(config):
     if CORE.is_esp32:
         cg.add_library("DNSServer", None)
         cg.add_library("WiFi", None)
-    if CORE.is_esp8266:
-        cg.add_library("DNSServer", None)

esphome/components/captive_portal/captive_portal.cpp

@@ -67,7 +67,6 @@ void CaptivePortal::handle_wifisave(AsyncWebServerRequest *request) {
   ESP_LOGI(TAG, "  SSID='%s'", ssid.c_str());
   ESP_LOGI(TAG, "  Password=" LOG_SECRET("'%s'"), psk.c_str());
   wifi::global_wifi_component->save_wifi_sta(ssid, psk);
-  wifi::global_wifi_component->start_scanning();
   request->redirect("/?save=true");
 }
 
@@ -85,7 +84,14 @@ void CaptivePortal::start() {
   this->dns_server_->start(53, "*", (uint32_t) ip);
 
   this->base_->get_server()->onNotFound([this](AsyncWebServerRequest *req) {
-    if (!this->active_ || req->host().c_str() == wifi::global_wifi_component->wifi_soft_ap_ip().str()) {
+    bool not_found = false;
+    if (!this->active_) {
+      not_found = true;
+    } else if (req->host().c_str() == wifi::global_wifi_component->wifi_soft_ap_ip().str()) {
+      not_found = true;
+    }
+
+    if (not_found) {
       req->send(404, "text/html", "File not found");
       return;
     }

esphome/components/ccs811/ccs811.cpp

@@ -39,21 +39,20 @@ void CCS811Component::setup() {
   // set MEAS_MODE (page 5)
   uint8_t meas_mode = 0;
   uint32_t interval = this->get_update_interval();
-  if (interval >= 60 * 1000) {
+  if (interval >= 60 * 1000)
     meas_mode = 3 << 4;  // sensor takes a reading every 60 seconds
-  } else if (interval >= 10 * 1000) {
+  else if (interval >= 10 * 1000)
     meas_mode = 2 << 4;  // sensor takes a reading every 10 seconds
-  } else if (interval >= 1 * 1000) {
+  else if (interval >= 1 * 1000)
     meas_mode = 1 << 4;  // sensor takes a reading every second
-  } else {
+  else
     meas_mode = 4 << 4;  // sensor takes a reading every 250ms
-  }
 
   CHECKED_IO(this->write_byte(0x01, meas_mode))
 
   if (this->baseline_.has_value()) {
     // baseline available, write to sensor
-    this->write_bytes(0x11, decode_value(*this->baseline_));
+    this->write_bytes(0x11, decode_uint16(*this->baseline_));
   }
 
   auto hardware_version_data = this->read_bytes<1>(0x21);

esphome/components/cd74hc4067/__init__.py

@@ -1,54 +0,0 @@
-import esphome.codegen as cg
-from esphome import pins
-import esphome.config_validation as cv
-from esphome.const import (
-    CONF_DELAY,
-    CONF_ID,
-)
-
-AUTO_LOAD = ["sensor", "voltage_sampler"]
-CODEOWNERS = ["@asoehlke"]
-MULTI_CONF = True
-
-cd74hc4067_ns = cg.esphome_ns.namespace("cd74hc4067")
-
-CD74HC4067Component = cd74hc4067_ns.class_(
-    "CD74HC4067Component", cg.Component, cg.PollingComponent
-)
-
-CONF_PIN_S0 = "pin_s0"
-CONF_PIN_S1 = "pin_s1"
-CONF_PIN_S2 = "pin_s2"
-CONF_PIN_S3 = "pin_s3"
-
-DEFAULT_DELAY = "2ms"
-
-
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(CD74HC4067Component),
-        cv.Required(CONF_PIN_S0): pins.internal_gpio_output_pin_schema,
-        cv.Required(CONF_PIN_S1): pins.internal_gpio_output_pin_schema,
-        cv.Required(CONF_PIN_S2): pins.internal_gpio_output_pin_schema,
-        cv.Required(CONF_PIN_S3): pins.internal_gpio_output_pin_schema,
-        cv.Optional(
-            CONF_DELAY, default=DEFAULT_DELAY
-        ): cv.positive_time_period_milliseconds,
-    }
-).extend(cv.COMPONENT_SCHEMA)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-
-    pin_s0 = await cg.gpio_pin_expression(config[CONF_PIN_S0])
-    cg.add(var.set_pin_s0(pin_s0))
-    pin_s1 = await cg.gpio_pin_expression(config[CONF_PIN_S1])
-    cg.add(var.set_pin_s1(pin_s1))
-    pin_s2 = await cg.gpio_pin_expression(config[CONF_PIN_S2])
-    cg.add(var.set_pin_s2(pin_s2))
-    pin_s3 = await cg.gpio_pin_expression(config[CONF_PIN_S3])
-    cg.add(var.set_pin_s3(pin_s3))
-
-    cg.add(var.set_switch_delay(config[CONF_DELAY]))

esphome/components/cd74hc4067/cd74hc4067.cpp

@@ -1,86 +0,0 @@
-#include "cd74hc4067.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace cd74hc4067 {
-
-static const char *const TAG = "cd74hc4067";
-
-float CD74HC4067Component::get_setup_priority() const { return setup_priority::DATA; }
-
-void CD74HC4067Component::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up CD74HC4067...");
-
-  this->pin_s0_->setup();
-  this->pin_s1_->setup();
-  this->pin_s2_->setup();
-  this->pin_s3_->setup();
-
-  // set other pin, so that activate_pin will really switch
-  this->active_pin_ = 1;
-  this->activate_pin(0);
-}
-
-void CD74HC4067Component::dump_config() {
-  ESP_LOGCONFIG(TAG, "CD74HC4067 Multiplexer:");
-  LOG_PIN("  S0 Pin: ", this->pin_s0_);
-  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: %d", this->switch_delay_);
-}
-
-void CD74HC4067Component::activate_pin(uint8_t pin) {
-  if (this->active_pin_ != pin) {
-    ESP_LOGD(TAG, "switch to input %d", pin);
-
-    static int mux_channel[16][4] = {
-        {0, 0, 0, 0},  // channel 0
-        {1, 0, 0, 0},  // channel 1
-        {0, 1, 0, 0},  // channel 2
-        {1, 1, 0, 0},  // channel 3
-        {0, 0, 1, 0},  // channel 4
-        {1, 0, 1, 0},  // channel 5
-        {0, 1, 1, 0},  // channel 6
-        {1, 1, 1, 0},  // channel 7
-        {0, 0, 0, 1},  // channel 8
-        {1, 0, 0, 1},  // channel 9
-        {0, 1, 0, 1},  // channel 10
-        {1, 1, 0, 1},  // channel 11
-        {0, 0, 1, 1},  // channel 12
-        {1, 0, 1, 1},  // channel 13
-        {0, 1, 1, 1},  // channel 14
-        {1, 1, 1, 1}   // channel 15
-    };
-    this->pin_s0_->digital_write(mux_channel[pin][0]);
-    this->pin_s1_->digital_write(mux_channel[pin][1]);
-    this->pin_s2_->digital_write(mux_channel[pin][2]);
-    this->pin_s3_->digital_write(mux_channel[pin][3]);
-    // small delay is needed to let the multiplexer switch
-    delay(this->switch_delay_);
-    this->active_pin_ = pin;
-  }
-}
-
-CD74HC4067Sensor::CD74HC4067Sensor(CD74HC4067Component *parent) : parent_(parent) {}
-
-void CD74HC4067Sensor::update() {
-  float value_v = this->sample();
-  this->publish_state(value_v);
-}
-
-float CD74HC4067Sensor::get_setup_priority() const { return this->parent_->get_setup_priority() - 1.0f; }
-
-float CD74HC4067Sensor::sample() {
-  this->parent_->activate_pin(this->pin_);
-  return this->source_->sample();
-}
-
-void CD74HC4067Sensor::dump_config() {
-  LOG_SENSOR(TAG, "CD74HC4067 Sensor", this);
-  ESP_LOGCONFIG(TAG, "  Pin: %u", this->pin_);
-  LOG_UPDATE_INTERVAL(this);
-}
-
-}  // namespace cd74hc4067
-}  // namespace esphome

esphome/components/cd74hc4067/cd74hc4067.h

@@ -1,65 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/hal.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/voltage_sampler/voltage_sampler.h"
-
-namespace esphome {
-namespace cd74hc4067 {
-
-class CD74HC4067Component : public Component {
- public:
-  /// Set up the internal sensor array.
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override;
-
-  /// setting pin active by setting the right combination of the four multiplexer input pins
-  void activate_pin(uint8_t pin);
-
-  /// set the pin connected to multiplexer control pin 0
-  void set_pin_s0(InternalGPIOPin *pin) { this->pin_s0_ = pin; }
-  /// set the pin connected to multiplexer control pin 1
-  void set_pin_s1(InternalGPIOPin *pin) { this->pin_s1_ = pin; }
-  /// set the pin connected to multiplexer control pin 2
-  void set_pin_s2(InternalGPIOPin *pin) { this->pin_s2_ = pin; }
-  /// set the pin connected to multiplexer control pin 3
-  void set_pin_s3(InternalGPIOPin *pin) { this->pin_s3_ = pin; }
-
-  /// set the delay needed after an input switch
-  void set_switch_delay(uint32_t switch_delay) { this->switch_delay_ = switch_delay; }
-
- private:
-  InternalGPIOPin *pin_s0_;
-  InternalGPIOPin *pin_s1_;
-  InternalGPIOPin *pin_s2_;
-  InternalGPIOPin *pin_s3_;
-  /// the currently active pin
-  uint8_t active_pin_;
-  uint32_t switch_delay_;
-};
-
-class CD74HC4067Sensor : public sensor::Sensor, public PollingComponent, public voltage_sampler::VoltageSampler {
- public:
-  CD74HC4067Sensor(CD74HC4067Component *parent);
-
-  void update() override;
-
-  void dump_config() override;
-  /// `HARDWARE_LATE` setup priority.
-  float get_setup_priority() const override;
-  void set_pin(uint8_t pin) { this->pin_ = pin; }
-  void set_source(voltage_sampler::VoltageSampler *source) { this->source_ = source; }
-
-  float sample() override;
-
- protected:
-  CD74HC4067Component *parent_;
-  /// The sampling source to read values from.
-  voltage_sampler::VoltageSampler *source_;
-
-  uint8_t pin_;
-};
-}  // namespace cd74hc4067
-}  // namespace esphome

esphome/components/cd74hc4067/sensor.py

@@ -1,55 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor, voltage_sampler
-from esphome.const import (
-    CONF_ID,
-    CONF_SENSOR,
-    CONF_NUMBER,
-    ICON_FLASH,
-    UNIT_VOLT,
-    STATE_CLASS_MEASUREMENT,
-    DEVICE_CLASS_VOLTAGE,
-)
-from . import cd74hc4067_ns, CD74HC4067Component
-
-DEPENDENCIES = ["cd74hc4067"]
-
-CD74HC4067Sensor = cd74hc4067_ns.class_(
-    "CD74HC4067Sensor",
-    sensor.Sensor,
-    cg.PollingComponent,
-    voltage_sampler.VoltageSampler,
-)
-
-CONF_CD74HC4067_ID = "cd74hc4067_id"
-
-CONFIG_SCHEMA = (
-    sensor.sensor_schema(
-        unit_of_measurement=UNIT_VOLT,
-        accuracy_decimals=3,
-        device_class=DEVICE_CLASS_VOLTAGE,
-        state_class=STATE_CLASS_MEASUREMENT,
-        icon=ICON_FLASH,
-    )
-    .extend(
-        {
-            cv.GenerateID(): cv.declare_id(CD74HC4067Sensor),
-            cv.GenerateID(CONF_CD74HC4067_ID): cv.use_id(CD74HC4067Component),
-            cv.Required(CONF_NUMBER): cv.int_range(0, 15),
-            cv.Required(CONF_SENSOR): cv.use_id(voltage_sampler.VoltageSampler),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-)
-
-
-async def to_code(config):
-    parent = await cg.get_variable(config[CONF_CD74HC4067_ID])
-
-    var = cg.new_Pvariable(config[CONF_ID], parent)
-    await cg.register_component(var, config)
-    await sensor.register_sensor(var, config)
-    cg.add(var.set_pin(config[CONF_NUMBER]))
-
-    sens = await cg.get_variable(config[CONF_SENSOR])
-    cg.add(var.set_source(sens))

esphome/components/climate/__init__.py

@@ -20,7 +20,6 @@ from esphome.const import (
     CONF_MODE,
     CONF_MODE_COMMAND_TOPIC,
     CONF_MODE_STATE_TOPIC,
-    CONF_ON_STATE,
     CONF_PRESET,
     CONF_SWING_MODE,
     CONF_SWING_MODE_COMMAND_TOPIC,
@@ -35,7 +34,6 @@ from esphome.const import (
     CONF_TARGET_TEMPERATURE_LOW_COMMAND_TOPIC,
     CONF_TARGET_TEMPERATURE_LOW_STATE_TOPIC,
     CONF_TEMPERATURE_STEP,
-    CONF_TRIGGER_ID,
     CONF_VISUAL,
     CONF_MQTT_ID,
 )
@@ -103,7 +101,6 @@ validate_climate_swing_mode = cv.enum(CLIMATE_SWING_MODES, upper=True)
 
 # Actions
 ControlAction = climate_ns.class_("ControlAction", automation.Action)
-StateTrigger = climate_ns.class_("StateTrigger", automation.Trigger.template())
 
 CLIMATE_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).extend(
     {
@@ -164,11 +161,6 @@ CLIMATE_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).
         cv.Optional(CONF_TARGET_TEMPERATURE_LOW_STATE_TOPIC): cv.All(
             cv.requires_component("mqtt"), cv.publish_topic
         ),
-        cv.Optional(CONF_ON_STATE): automation.validate_automation(
-            {
-                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(StateTrigger),
-            }
-        ),
     }
 )
 
@@ -213,7 +205,7 @@ async def setup_climate_core_(var, config):
         if CONF_MODE_COMMAND_TOPIC in config:
             cg.add(mqtt_.set_custom_mode_command_topic(config[CONF_MODE_COMMAND_TOPIC]))
         if CONF_MODE_STATE_TOPIC in config:
-            cg.add(mqtt_.set_custom_mode_state_topic(config[CONF_MODE_STATE_TOPIC]))
+            cg.add(mqtt_.set_custom_state_topic(config[CONF_MODE_STATE_TOPIC]))
 
         if CONF_SWING_MODE_COMMAND_TOPIC in config:
             cg.add(
@@ -264,10 +256,6 @@ async def setup_climate_core_(var, config):
                 )
             )
 
-    for conf in config.get(CONF_ON_STATE, []):
-        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-        await automation.build_automation(trigger, [], conf)
-
 
 async def register_climate(var, config):
     if not CORE.has_id(config[CONF_ID]):

esphome/components/climate/automation.h

@@ -42,12 +42,5 @@ template<typename... Ts> class ControlAction : public Action<Ts...> {
   Climate *climate_;
 };
 
-class StateTrigger : public Trigger<> {
- public:
-  StateTrigger(Climate *climate) {
-    climate->add_on_state_callback([this]() { this->trigger(); });
-  }
-};
-
 }  // namespace climate
 }  // namespace esphome

esphome/components/climate/climate.cpp

@@ -440,11 +440,7 @@ void Climate::set_visual_max_temperature_override(float visual_max_temperature_o
 void Climate::set_visual_temperature_step_override(float visual_temperature_step_override) {
   this->visual_temperature_step_override_ = visual_temperature_step_override;
 }
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 Climate::Climate(const std::string &name) : EntityBase(name) {}
-#pragma GCC diagnostic pop
-
 Climate::Climate() : Climate("") {}
 ClimateCall Climate::make_call() { return ClimateCall(this); }
 

esphome/components/climate/climate_traits.h

@@ -65,7 +65,7 @@ class ClimateTraits {
   ESPDEPRECATED("This method is deprecated, use set_supported_modes() instead", "v1.20")
   void set_supports_dry_mode(bool supports_dry_mode) { set_mode_support_(CLIMATE_MODE_DRY, supports_dry_mode); }
   bool supports_mode(ClimateMode mode) const { return supported_modes_.count(mode); }
-  std::set<ClimateMode> get_supported_modes() const { return supported_modes_; }
+  const std::set<ClimateMode> get_supported_modes() const { return supported_modes_; }
 
   void set_supports_action(bool supports_action) { supports_action_ = supports_action; }
   bool get_supports_action() const { return supports_action_; }
@@ -93,7 +93,7 @@ class ClimateTraits {
   void set_supports_fan_mode_diffuse(bool supported) { set_fan_mode_support_(CLIMATE_FAN_DIFFUSE, supported); }
   bool supports_fan_mode(ClimateFanMode fan_mode) const { return supported_fan_modes_.count(fan_mode); }
   bool get_supports_fan_modes() const { return !supported_fan_modes_.empty() || !supported_custom_fan_modes_.empty(); }
-  std::set<ClimateFanMode> get_supported_fan_modes() const { return supported_fan_modes_; }
+  const std::set<ClimateFanMode> get_supported_fan_modes() const { return supported_fan_modes_; }
 
   void set_supported_custom_fan_modes(std::set<std::string> supported_custom_fan_modes) {
     supported_custom_fan_modes_ = std::move(supported_custom_fan_modes);
@@ -141,7 +141,7 @@ class ClimateTraits {
   }
   bool supports_swing_mode(ClimateSwingMode swing_mode) const { return supported_swing_modes_.count(swing_mode); }
   bool get_supports_swing_modes() const { return !supported_swing_modes_.empty(); }
-  std::set<ClimateSwingMode> get_supported_swing_modes() { return supported_swing_modes_; }
+  const std::set<ClimateSwingMode> get_supported_swing_modes() { return supported_swing_modes_; }
 
   float get_visual_min_temperature() const { return visual_min_temperature_; }
   void set_visual_min_temperature(float visual_min_temperature) { visual_min_temperature_ = visual_min_temperature; }

esphome/components/climate_ir/climate_ir.cpp

@@ -10,22 +10,21 @@ climate::ClimateTraits ClimateIR::traits() {
   auto traits = climate::ClimateTraits();
   traits.set_supports_current_temperature(this->sensor_ != nullptr);
   traits.set_supported_modes({climate::CLIMATE_MODE_OFF, climate::CLIMATE_MODE_HEAT_COOL});
-  if (this->supports_cool_)
+  if (supports_cool_)
     traits.add_supported_mode(climate::CLIMATE_MODE_COOL);
-  if (this->supports_heat_)
+  if (supports_heat_)
     traits.add_supported_mode(climate::CLIMATE_MODE_HEAT);
-  if (this->supports_dry_)
+  if (supports_dry_)
     traits.add_supported_mode(climate::CLIMATE_MODE_DRY);
-  if (this->supports_fan_only_)
+  if (supports_fan_only_)
     traits.add_supported_mode(climate::CLIMATE_MODE_FAN_ONLY);
 
   traits.set_supports_two_point_target_temperature(false);
   traits.set_visual_min_temperature(this->minimum_temperature_);
   traits.set_visual_max_temperature(this->maximum_temperature_);
   traits.set_visual_temperature_step(this->temperature_step_);
-  traits.set_supported_fan_modes(this->fan_modes_);
-  traits.set_supported_swing_modes(this->swing_modes_);
-  traits.set_supported_presets(this->presets_);
+  traits.set_supported_fan_modes(fan_modes_);
+  traits.set_supported_swing_modes(swing_modes_);
   return traits;
 }
 
@@ -51,7 +50,6 @@ void ClimateIR::setup() {
         roundf(clamp(this->current_temperature, this->minimum_temperature_, this->maximum_temperature_));
     this->fan_mode = climate::CLIMATE_FAN_AUTO;
     this->swing_mode = climate::CLIMATE_SWING_OFF;
-    this->preset = climate::CLIMATE_PRESET_NONE;
   }
   // Never send nan to HA
   if (std::isnan(this->target_temperature))
@@ -67,8 +65,6 @@ void ClimateIR::control(const climate::ClimateCall &call) {
     this->fan_mode = *call.get_fan_mode();
   if (call.get_swing_mode().has_value())
     this->swing_mode = *call.get_swing_mode();
-  if (call.get_preset().has_value())
-    this->preset = *call.get_preset();
   this->transmit_state();
   this->publish_state();
 }

esphome/components/climate_ir/climate_ir.h

@@ -22,7 +22,7 @@ class ClimateIR : public climate::Climate, public Component, public remote_base:
  public:
   ClimateIR(float minimum_temperature, float maximum_temperature, float temperature_step = 1.0f,
             bool supports_dry = false, bool supports_fan_only = false, std::set<climate::ClimateFanMode> fan_modes = {},
-            std::set<climate::ClimateSwingMode> swing_modes = {}, std::set<climate::ClimatePreset> presets = {}) {
+            std::set<climate::ClimateSwingMode> swing_modes = {}) {
     this->minimum_temperature_ = minimum_temperature;
     this->maximum_temperature_ = maximum_temperature;
     this->temperature_step_ = temperature_step;
@@ -30,7 +30,6 @@ class ClimateIR : public climate::Climate, public Component, public remote_base:
     this->supports_fan_only_ = supports_fan_only;
     this->fan_modes_ = std::move(fan_modes);
     this->swing_modes_ = std::move(swing_modes);
-    this->presets_ = std::move(presets);
   }
 
   void setup() override;
@@ -62,7 +61,6 @@ class ClimateIR : public climate::Climate, public Component, public remote_base:
   bool supports_fan_only_{false};
   std::set<climate::ClimateFanMode> fan_modes_ = {};
   std::set<climate::ClimateSwingMode> swing_modes_ = {};
-  std::set<climate::ClimatePreset> presets_ = {};
 
   remote_transmitter::RemoteTransmitterComponent *transmitter_;
   sensor::Sensor *sensor_{nullptr};

esphome/components/climate_ir_lg/climate_ir_lg.cpp

@@ -137,11 +137,11 @@ bool LgIrClimate::on_receive(remote_base::RemoteReceiveData data) {
     this->swing_mode =
         this->swing_mode == climate::CLIMATE_SWING_OFF ? climate::CLIMATE_SWING_VERTICAL : climate::CLIMATE_SWING_OFF;
   } else {
-    if ((remote_state & COMMAND_MASK) == COMMAND_AUTO) {
+    if ((remote_state & COMMAND_MASK) == COMMAND_AUTO)
       this->mode = climate::CLIMATE_MODE_HEAT_COOL;
-    } else if ((remote_state & COMMAND_MASK) == COMMAND_DRY_FAN) {
+    else if ((remote_state & COMMAND_MASK) == COMMAND_DRY_FAN)
       this->mode = climate::CLIMATE_MODE_DRY;
-    } else if ((remote_state & COMMAND_MASK) == COMMAND_HEAT) {
+    else if ((remote_state & COMMAND_MASK) == COMMAND_HEAT) {
       this->mode = climate::CLIMATE_MODE_HEAT;
     } else {
       this->mode = climate::CLIMATE_MODE_COOL;
@@ -156,15 +156,14 @@ bool LgIrClimate::on_receive(remote_base::RemoteReceiveData data) {
       this->fan_mode = climate::CLIMATE_FAN_AUTO;
     } else if (this->mode == climate::CLIMATE_MODE_COOL || this->mode == climate::CLIMATE_MODE_HEAT ||
                this->mode == climate::CLIMATE_MODE_DRY) {
-      if ((remote_state & FAN_MASK) == FAN_AUTO) {
+      if ((remote_state & FAN_MASK) == FAN_AUTO)
         this->fan_mode = climate::CLIMATE_FAN_AUTO;
-      } else if ((remote_state & FAN_MASK) == FAN_MIN) {
+      else if ((remote_state & FAN_MASK) == FAN_MIN)
         this->fan_mode = climate::CLIMATE_FAN_LOW;
-      } else if ((remote_state & FAN_MASK) == FAN_MED) {
+      else if ((remote_state & FAN_MASK) == FAN_MED)
         this->fan_mode = climate::CLIMATE_FAN_MEDIUM;
-      } else if ((remote_state & FAN_MASK) == FAN_MAX) {
+      else if ((remote_state & FAN_MASK) == FAN_MAX)
         this->fan_mode = climate::CLIMATE_FAN_HIGH;
-      }
     }
   }
   this->publish_state();
@@ -176,7 +175,7 @@ void LgIrClimate::transmit_(uint32_t value) {
   ESP_LOGD(TAG, "Sending climate_lg_ir code: 0x%02X", value);
 
   auto transmit = this->transmitter_->transmit();
-  auto *data = transmit.get_data();
+  auto data = transmit.get_data();
 
   data->set_carrier_frequency(38000);
   data->reserve(2 + BITS * 2u);

esphome/components/coolix/coolix.cpp

@@ -1,5 +1,4 @@
 #include "coolix.h"
-#include "esphome/components/remote_base/coolix_protocol.h"
 #include "esphome/core/log.h"
 
 namespace esphome {
@@ -7,29 +6,29 @@ namespace coolix {
 
 static const char *const TAG = "coolix.climate";
 
-static const uint32_t COOLIX_OFF = 0xB27BE0;
-static const uint32_t COOLIX_SWING = 0xB26BE0;
-static const uint32_t COOLIX_LED = 0xB5F5A5;
-static const uint32_t COOLIX_SILENCE_FP = 0xB5F5B6;
+const uint32_t COOLIX_OFF = 0xB27BE0;
+const uint32_t COOLIX_SWING = 0xB26BE0;
+const uint32_t COOLIX_LED = 0xB5F5A5;
+const uint32_t COOLIX_SILENCE_FP = 0xB5F5B6;
 
 // On, 25C, Mode: Auto, Fan: Auto, Zone Follow: Off, Sensor Temp: Ignore.
-static const uint8_t COOLIX_COOL = 0b0000;
-static const uint8_t COOLIX_DRY_FAN = 0b0100;
-static const uint8_t COOLIX_AUTO = 0b1000;
-static const uint8_t COOLIX_HEAT = 0b1100;
-static const uint32_t COOLIX_MODE_MASK = 0b1100;
-static const uint32_t COOLIX_FAN_MASK = 0xF000;
-static const uint32_t COOLIX_FAN_MODE_AUTO_DRY = 0x1000;
-static const uint32_t COOLIX_FAN_AUTO = 0xB000;
-static const uint32_t COOLIX_FAN_MIN = 0x9000;
-static const uint32_t COOLIX_FAN_MED = 0x5000;
-static const uint32_t COOLIX_FAN_MAX = 0x3000;
+const uint8_t COOLIX_COOL = 0b0000;
+const uint8_t COOLIX_DRY_FAN = 0b0100;
+const uint8_t COOLIX_AUTO = 0b1000;
+const uint8_t COOLIX_HEAT = 0b1100;
+const uint32_t COOLIX_MODE_MASK = 0b1100;
+const uint32_t COOLIX_FAN_MASK = 0xF000;
+const uint32_t COOLIX_FAN_MODE_AUTO_DRY = 0x1000;
+const uint32_t COOLIX_FAN_AUTO = 0xB000;
+const uint32_t COOLIX_FAN_MIN = 0x9000;
+const uint32_t COOLIX_FAN_MED = 0x5000;
+const uint32_t COOLIX_FAN_MAX = 0x3000;
 
 // Temperature
-static const uint8_t COOLIX_TEMP_RANGE = COOLIX_TEMP_MAX - COOLIX_TEMP_MIN + 1;
-static const uint8_t COOLIX_FAN_TEMP_CODE = 0b11100000;  // Part of Fan Mode.
-static const uint32_t COOLIX_TEMP_MASK = 0b11110000;
-static const uint8_t COOLIX_TEMP_MAP[COOLIX_TEMP_RANGE] = {
+const uint8_t COOLIX_TEMP_RANGE = COOLIX_TEMP_MAX - COOLIX_TEMP_MIN + 1;
+const uint8_t COOLIX_FAN_TEMP_CODE = 0b11100000;  // Part of Fan Mode.
+const uint32_t COOLIX_TEMP_MASK = 0b11110000;
+const uint8_t COOLIX_TEMP_MAP[COOLIX_TEMP_RANGE] = {
     0b00000000,  // 17C
     0b00010000,  // 18c
     0b00110000,  // 19C
@@ -46,6 +45,17 @@ static const uint8_t COOLIX_TEMP_MAP[COOLIX_TEMP_RANGE] = {
     0b10110000   // 30C
 };
 
+// Constants
+static const uint32_t BIT_MARK_US = 660;
+static const uint32_t HEADER_MARK_US = 560 * 8;
+static const uint32_t HEADER_SPACE_US = 560 * 8;
+static const uint32_t BIT_ONE_SPACE_US = 1500;
+static const uint32_t BIT_ZERO_SPACE_US = 450;
+static const uint32_t FOOTER_MARK_US = BIT_MARK_US;
+static const uint32_t FOOTER_SPACE_US = HEADER_SPACE_US;
+
+const uint16_t COOLIX_BITS = 24;
+
 void CoolixClimate::transmit_state() {
   uint32_t remote_state = 0xB20F00;
 
@@ -101,63 +111,119 @@ void CoolixClimate::transmit_state() {
       }
     }
   }
-  ESP_LOGV(TAG, "Sending coolix code: 0x%06X", remote_state);
+  ESP_LOGV(TAG, "Sending coolix code: 0x%02X", remote_state);
 
   auto transmit = this->transmitter_->transmit();
-  auto *data = transmit.get_data();
-  remote_base::CoolixProtocol().encode(data, remote_state);
+  auto data = transmit.get_data();
+
+  data->set_carrier_frequency(38000);
+  uint16_t repeat = 1;
+  for (uint16_t r = 0; r <= repeat; r++) {
+    // Header
+    data->mark(HEADER_MARK_US);
+    data->space(HEADER_SPACE_US);
+    // Data
+    //   Break data into bytes, starting at the Most Significant
+    //   Byte. Each byte then being sent normal, then followed inverted.
+    for (uint16_t i = 8; i <= COOLIX_BITS; i += 8) {
+      // Grab a bytes worth of data.
+      uint8_t byte = (remote_state >> (COOLIX_BITS - i)) & 0xFF;
+      // Normal
+      for (uint64_t mask = 1ULL << 7; mask; mask >>= 1) {
+        data->mark(BIT_MARK_US);
+        data->space((byte & mask) ? BIT_ONE_SPACE_US : BIT_ZERO_SPACE_US);
+      }
+      // Inverted
+      for (uint64_t mask = 1ULL << 7; mask; mask >>= 1) {
+        data->mark(BIT_MARK_US);
+        data->space(!(byte & mask) ? BIT_ONE_SPACE_US : BIT_ZERO_SPACE_US);
+      }
+    }
+    // Footer
+    data->mark(BIT_MARK_US);
+    data->space(FOOTER_SPACE_US);  // Pause before repeating
+  }
+
   transmit.perform();
 }
 
-bool CoolixClimate::on_coolix(climate::Climate *parent, remote_base::RemoteReceiveData data) {
-  auto decoded = remote_base::CoolixProtocol().decode(data);
-  if (!decoded.has_value())
-    return false;
+bool CoolixClimate::on_receive(remote_base::RemoteReceiveData data) {
   // Decoded remote state y 3 bytes long code.
-  uint32_t remote_state = *decoded;
-  ESP_LOGV(TAG, "Decoded 0x%06X", remote_state);
-  if ((remote_state & 0xFF0000) != 0xB20000)
+  uint32_t remote_state = 0;
+  // The protocol sends the data twice, read here
+  uint32_t loop_read;
+  for (uint16_t loop = 1; loop <= 2; loop++) {
+    if (!data.expect_item(HEADER_MARK_US, HEADER_SPACE_US))
+      return false;
+    loop_read = 0;
+    for (uint8_t a_byte = 0; a_byte < 3; a_byte++) {
+      uint8_t byte = 0;
+      for (int8_t a_bit = 7; a_bit >= 0; a_bit--) {
+        if (data.expect_item(BIT_MARK_US, BIT_ONE_SPACE_US))
+          byte |= 1 << a_bit;
+        else if (!data.expect_item(BIT_MARK_US, BIT_ZERO_SPACE_US))
+          return false;
+      }
+      // Need to see this segment inverted
+      for (int8_t a_bit = 7; a_bit >= 0; a_bit--) {
+        bool bit = byte & (1 << a_bit);
+        if (!data.expect_item(BIT_MARK_US, bit ? BIT_ZERO_SPACE_US : BIT_ONE_SPACE_US))
+          return false;
+      }
+      // Receiving MSB first: reorder bytes
+      loop_read |= byte << ((2 - a_byte) * 8);
+    }
+    // Footer Mark
+    if (!data.expect_mark(BIT_MARK_US))
+      return false;
+    if (loop == 1) {
+      // Back up state on first loop
+      remote_state = loop_read;
+      if (!data.expect_space(FOOTER_SPACE_US))
+        return false;
+    }
+  }
+
+  ESP_LOGV(TAG, "Decoded 0x%02X", remote_state);
+  if (remote_state != loop_read || (remote_state & 0xFF0000) != 0xB20000)
     return false;
 
   if (remote_state == COOLIX_OFF) {
-    parent->mode = climate::CLIMATE_MODE_OFF;
+    this->mode = climate::CLIMATE_MODE_OFF;
   } else if (remote_state == COOLIX_SWING) {
-    parent->swing_mode =
-        parent->swing_mode == climate::CLIMATE_SWING_OFF ? climate::CLIMATE_SWING_VERTICAL : climate::CLIMATE_SWING_OFF;
+    this->swing_mode =
+        this->swing_mode == climate::CLIMATE_SWING_OFF ? climate::CLIMATE_SWING_VERTICAL : climate::CLIMATE_SWING_OFF;
   } else {
-    if ((remote_state & COOLIX_MODE_MASK) == COOLIX_HEAT) {
-      parent->mode = climate::CLIMATE_MODE_HEAT;
-    } else if ((remote_state & COOLIX_MODE_MASK) == COOLIX_AUTO) {
-      parent->mode = climate::CLIMATE_MODE_HEAT_COOL;
-    } else if ((remote_state & COOLIX_MODE_MASK) == COOLIX_DRY_FAN) {
-      if ((remote_state & COOLIX_FAN_MASK) == COOLIX_FAN_MODE_AUTO_DRY) {
-        parent->mode = climate::CLIMATE_MODE_DRY;
-      } else {
-        parent->mode = climate::CLIMATE_MODE_FAN_ONLY;
-      }
+    if ((remote_state & COOLIX_MODE_MASK) == COOLIX_HEAT)
+      this->mode = climate::CLIMATE_MODE_HEAT;
+    else if ((remote_state & COOLIX_MODE_MASK) == COOLIX_AUTO)
+      this->mode = climate::CLIMATE_MODE_HEAT_COOL;
+    else if ((remote_state & COOLIX_MODE_MASK) == COOLIX_DRY_FAN) {
+      if ((remote_state & COOLIX_FAN_MASK) == COOLIX_FAN_MODE_AUTO_DRY)
+        this->mode = climate::CLIMATE_MODE_DRY;
+      else
+        this->mode = climate::CLIMATE_MODE_FAN_ONLY;
     } else
-      parent->mode = climate::CLIMATE_MODE_COOL;
+      this->mode = climate::CLIMATE_MODE_COOL;
 
     // Fan Speed
-    if ((remote_state & COOLIX_FAN_AUTO) == COOLIX_FAN_AUTO || parent->mode == climate::CLIMATE_MODE_HEAT_COOL ||
-        parent->mode == climate::CLIMATE_MODE_DRY) {
-      parent->fan_mode = climate::CLIMATE_FAN_AUTO;
-    } else if ((remote_state & COOLIX_FAN_MIN) == COOLIX_FAN_MIN) {
-      parent->fan_mode = climate::CLIMATE_FAN_LOW;
-    } else if ((remote_state & COOLIX_FAN_MED) == COOLIX_FAN_MED) {
-      parent->fan_mode = climate::CLIMATE_FAN_MEDIUM;
-    } else if ((remote_state & COOLIX_FAN_MAX) == COOLIX_FAN_MAX) {
-      parent->fan_mode = climate::CLIMATE_FAN_HIGH;
-    }
+    if ((remote_state & COOLIX_FAN_AUTO) == COOLIX_FAN_AUTO || this->mode == climate::CLIMATE_MODE_HEAT_COOL ||
+        this->mode == climate::CLIMATE_MODE_DRY)
+      this->fan_mode = climate::CLIMATE_FAN_AUTO;
+    else if ((remote_state & COOLIX_FAN_MIN) == COOLIX_FAN_MIN)
+      this->fan_mode = climate::CLIMATE_FAN_LOW;
+    else if ((remote_state & COOLIX_FAN_MED) == COOLIX_FAN_MED)
+      this->fan_mode = climate::CLIMATE_FAN_MEDIUM;
+    else if ((remote_state & COOLIX_FAN_MAX) == COOLIX_FAN_MAX)
+      this->fan_mode = climate::CLIMATE_FAN_HIGH;
 
     // Temperature
     uint8_t temperature_code = remote_state & COOLIX_TEMP_MASK;
-    for (uint8_t i = 0; i < COOLIX_TEMP_RANGE; i++) {
+    for (uint8_t i = 0; i < COOLIX_TEMP_RANGE; i++)
       if (COOLIX_TEMP_MAP[i] == temperature_code)
-        parent->target_temperature = i + COOLIX_TEMP_MIN;
-    }
+        this->target_temperature = i + COOLIX_TEMP_MIN;
   }
-  parent->publish_state();
+  this->publish_state();
 
   return true;
 }

esphome/components/coolix/coolix.h

@@ -26,15 +26,11 @@ class CoolixClimate : public climate_ir::ClimateIR {
     climate_ir::ClimateIR::control(call);
   }
 
-  /// This static method can be used in other climate components that accept the Coolix protocol. See midea_ir for
-  /// example.
-  static bool on_coolix(climate::Climate *parent, remote_base::RemoteReceiveData data);
-
  protected:
   /// Transmit via IR the state of this climate controller.
   void transmit_state() override;
   /// Handle received IR Buffer
-  bool on_receive(remote_base::RemoteReceiveData data) override { return CoolixClimate::on_coolix(this, data); }
+  bool on_receive(remote_base::RemoteReceiveData data) override;
 
   bool send_swing_cmd_{false};
 };

esphome/components/cover/cover.cpp

@@ -210,10 +210,7 @@ Cover::Cover() : Cover("") {}
 std::string Cover::get_device_class() {
   if (this->device_class_override_.has_value())
     return *this->device_class_override_;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
   return this->device_class();
-#pragma GCC diagnostic pop
 }
 bool Cover::is_fully_open() const { return this->position == COVER_OPEN; }
 bool Cover::is_fully_closed() const { return this->position == COVER_CLOSED; }

esphome/components/cover/cover.h

@@ -169,11 +169,6 @@ class Cover : public EntityBase {
   friend CoverCall;
 
   virtual void control(const CoverCall &call) = 0;
-
-  /** Override this to set the default device class.
-   *
-   * @deprecated This method is deprecated, set the property during config validation instead. (2022.1)
-   */
   virtual std::string device_class();
 
   optional<CoverRestoreState> restore_state_();

esphome/components/cs5460a/cs5460a.cpp

@@ -102,6 +102,8 @@ void CS5460AComponent::hw_init_() {
 
 /* Doesn't reset the register values etc., just restarts the "computation cycle" */
 void CS5460AComponent::restart_() {
+  int cnt;
+
   this->enable();
   /* Stop running conversion, wake up if needed */
   this->write_byte(CMD_POWER_UP);

esphome/components/cs5460a/sensor.py

@@ -49,8 +49,8 @@ def validate_config(config):
     if current_gain == 0.0 or voltage_gain == 0.0:
         raise cv.Invalid("The gains can't be zero")
 
-    max_energy = (0.25 * 0.25 / 3600 / (2**-4)) / (voltage_gain * current_gain)
-    min_energy = (0.25 * 0.25 / 3600 / (2**18)) / (voltage_gain * current_gain)
+    max_energy = (0.25 * 0.25 / 3600 / (2 ** -4)) / (voltage_gain * current_gain)
+    min_energy = (0.25 * 0.25 / 3600 / (2 ** 18)) / (voltage_gain * current_gain)
     mech_min_energy = (0.25 * 0.25 / 3600 / 7.8) / (voltage_gain * current_gain)
     if pulse_energy < min_energy or pulse_energy > max_energy:
         raise cv.Invalid(

esphome/components/cse7761/cse7761.cpp

@@ -1,244 +0,0 @@
-#include "cse7761.h"
-
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace cse7761 {
-
-static const char *const TAG = "cse7761";
-
-/*********************************************************************************************\
- * CSE7761 - Energy  (Sonoff Dual R3 Pow v1.x)
- *
- * Based on Tasmota source code
- * See https://github.com/arendst/Tasmota/discussions/10793
- * https://github.com/arendst/Tasmota/blob/development/tasmota/xnrg_19_cse7761.ino
-\*********************************************************************************************/
-
-static const int CSE7761_UREF = 42563;  // RmsUc
-static const int CSE7761_IREF = 52241;  // RmsIAC
-static const int CSE7761_PREF = 44513;  // PowerPAC
-
-static const uint8_t CSE7761_REG_SYSCON = 0x00;     // (2) System Control Register (0x0A04)
-static const uint8_t CSE7761_REG_EMUCON = 0x01;     // (2) Metering control register (0x0000)
-static const uint8_t CSE7761_REG_EMUCON2 = 0x13;    // (2) Metering control register 2 (0x0001)
-static const uint8_t CSE7761_REG_PULSE1SEL = 0x1D;  // (2) Pin function output select register (0x3210)
-
-static const uint8_t CSE7761_REG_RMSIA = 0x24;      // (3) The effective value of channel A current (0x000000)
-static const uint8_t CSE7761_REG_RMSIB = 0x25;      // (3) The effective value of channel B current (0x000000)
-static const uint8_t CSE7761_REG_RMSU = 0x26;       // (3) Voltage RMS (0x000000)
-static const uint8_t CSE7761_REG_POWERPA = 0x2C;    // (4) Channel A active power, update rate 27.2Hz (0x00000000)
-static const uint8_t CSE7761_REG_POWERPB = 0x2D;    // (4) Channel B active power, update rate 27.2Hz (0x00000000)
-static const uint8_t CSE7761_REG_SYSSTATUS = 0x43;  // (1) System status register
-
-static const uint8_t CSE7761_REG_COEFFCHKSUM = 0x6F;  // (2) Coefficient checksum
-static const uint8_t CSE7761_REG_RMSIAC = 0x70;       // (2) Channel A effective current conversion coefficient
-
-static const uint8_t CSE7761_SPECIAL_COMMAND = 0xEA;   // Start special command
-static const uint8_t CSE7761_CMD_RESET = 0x96;         // Reset command, after receiving the command, the chip resets
-static const uint8_t CSE7761_CMD_CLOSE_WRITE = 0xDC;   // Close write operation
-static const uint8_t CSE7761_CMD_ENABLE_WRITE = 0xE5;  // Enable write operation
-
-enum CSE7761 { RMS_IAC, RMS_IBC, RMS_UC, POWER_PAC, POWER_PBC, POWER_SC, ENERGY_AC, ENERGY_BC };
-
-void CSE7761Component::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up CSE7761...");
-  this->write_(CSE7761_SPECIAL_COMMAND, CSE7761_CMD_RESET);
-  uint16_t syscon = this->read_(0x00, 2);  // Default 0x0A04
-  if ((0x0A04 == syscon) && this->chip_init_()) {
-    this->write_(CSE7761_SPECIAL_COMMAND, CSE7761_CMD_CLOSE_WRITE);
-    ESP_LOGD(TAG, "CSE7761 found");
-    this->data_.ready = true;
-  } else {
-    this->mark_failed();
-  }
-}
-
-void CSE7761Component::dump_config() {
-  ESP_LOGCONFIG(TAG, "CSE7761:");
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with CSE7761 failed!");
-  }
-  LOG_UPDATE_INTERVAL(this);
-  this->check_uart_settings(38400, 1, uart::UART_CONFIG_PARITY_EVEN, 8);
-}
-
-float CSE7761Component::get_setup_priority() const { return setup_priority::DATA; }
-
-void CSE7761Component::update() {
-  if (this->data_.ready) {
-    this->get_data_();
-  }
-}
-
-void CSE7761Component::write_(uint8_t reg, uint16_t data) {
-  uint8_t buffer[5];
-
-  buffer[0] = 0xA5;
-  buffer[1] = reg;
-  uint32_t len = 2;
-  if (data) {
-    if (data < 0xFF) {
-      buffer[2] = data & 0xFF;
-      len = 3;
-    } else {
-      buffer[2] = (data >> 8) & 0xFF;
-      buffer[3] = data & 0xFF;
-      len = 4;
-    }
-    uint8_t crc = 0;
-    for (uint32_t i = 0; i < len; i++) {
-      crc += buffer[i];
-    }
-    buffer[len] = ~crc;
-    len++;
-  }
-
-  this->write_array(buffer, len);
-}
-
-bool CSE7761Component::read_once_(uint8_t reg, uint8_t size, uint32_t *value) {
-  while (this->available()) {
-    this->read();
-  }
-
-  this->write_(reg, 0);
-
-  uint8_t buffer[8] = {0};
-  uint32_t rcvd = 0;
-
-  for (uint32_t i = 0; i <= size; i++) {
-    int value = this->read();
-    if (value > -1 && rcvd < sizeof(buffer) - 1) {
-      buffer[rcvd++] = value;
-    }
-  }
-
-  if (!rcvd) {
-    ESP_LOGD(TAG, "Received 0 bytes for register %hhu", reg);
-    return false;
-  }
-
-  rcvd--;
-  uint32_t result = 0;
-  // CRC check
-  uint8_t crc = 0xA5 + reg;
-  for (uint32_t i = 0; i < rcvd; i++) {
-    result = (result << 8) | buffer[i];
-    crc += buffer[i];
-  }
-  crc = ~crc;
-  if (crc != buffer[rcvd]) {
-    return false;
-  }
-
-  *value = result;
-  return true;
-}
-
-uint32_t CSE7761Component::read_(uint8_t reg, uint8_t size) {
-  bool result = false;  // Start loop
-  uint8_t retry = 3;    // Retry up to three times
-  uint32_t value = 0;   // Default no value
-  while (!result && retry > 0) {
-    retry--;
-    if (this->read_once_(reg, size, &value))
-      return value;
-  }
-  ESP_LOGE(TAG, "Reading register %hhu failed!", reg);
-  return value;
-}
-
-uint32_t CSE7761Component::coefficient_by_unit_(uint32_t unit) {
-  switch (unit) {
-    case RMS_UC:
-      return 0x400000 * 100 / this->data_.coefficient[RMS_UC];
-    case RMS_IAC:
-      return (0x800000 * 100 / this->data_.coefficient[RMS_IAC]) * 10;  // Stay within 32 bits
-    case POWER_PAC:
-      return 0x80000000 / this->data_.coefficient[POWER_PAC];
-  }
-  return 0;
-}
-
-bool CSE7761Component::chip_init_() {
-  uint16_t calc_chksum = 0xFFFF;
-  for (uint32_t i = 0; i < 8; i++) {
-    this->data_.coefficient[i] = this->read_(CSE7761_REG_RMSIAC + i, 2);
-    calc_chksum += this->data_.coefficient[i];
-  }
-  calc_chksum = ~calc_chksum;
-  uint16_t coeff_chksum = this->read_(CSE7761_REG_COEFFCHKSUM, 2);
-  if ((calc_chksum != coeff_chksum) || (!calc_chksum)) {
-    ESP_LOGD(TAG, "Default calibration");
-    this->data_.coefficient[RMS_IAC] = CSE7761_IREF;
-    this->data_.coefficient[RMS_UC] = CSE7761_UREF;
-    this->data_.coefficient[POWER_PAC] = CSE7761_PREF;
-  }
-
-  this->write_(CSE7761_SPECIAL_COMMAND, CSE7761_CMD_ENABLE_WRITE);
-
-  uint8_t sys_status = this->read_(CSE7761_REG_SYSSTATUS, 1);
-  if (sys_status & 0x10) {  // Write enable to protected registers (WREN)
-    this->write_(CSE7761_REG_SYSCON | 0x80, 0xFF04);
-    this->write_(CSE7761_REG_EMUCON | 0x80, 0x1183);
-    this->write_(CSE7761_REG_EMUCON2 | 0x80, 0x0FC1);
-    this->write_(CSE7761_REG_PULSE1SEL | 0x80, 0x3290);
-  } else {
-    ESP_LOGD(TAG, "Write failed at chip_init");
-    return false;
-  }
-  return true;
-}
-
-void CSE7761Component::get_data_() {
-  // The effective value of current and voltage Rms is a 24-bit signed number,
-  // the highest bit is 0 for valid data,
-  //   and when the highest bit is 1, the reading will be processed as zero
-  // The active power parameter PowerA/B is in two’s complement format, 32-bit
-  // data, the highest bit is Sign bit.
-  uint32_t value = this->read_(CSE7761_REG_RMSU, 3);
-  this->data_.voltage_rms = (value >= 0x800000) ? 0 : value;
-
-  value = this->read_(CSE7761_REG_RMSIA, 3);
-  this->data_.current_rms[0] = ((value >= 0x800000) || (value < 1600)) ? 0 : value;  // No load threshold of 10mA
-  value = this->read_(CSE7761_REG_POWERPA, 4);
-  this->data_.active_power[0] = (0 == this->data_.current_rms[0]) ? 0 : ((uint32_t) abs((int) value));
-
-  value = this->read_(CSE7761_REG_RMSIB, 3);
-  this->data_.current_rms[1] = ((value >= 0x800000) || (value < 1600)) ? 0 : value;  // No load threshold of 10mA
-  value = this->read_(CSE7761_REG_POWERPB, 4);
-  this->data_.active_power[1] = (0 == this->data_.current_rms[1]) ? 0 : ((uint32_t) abs((int) value));
-
-  // convert values and publish to sensors
-
-  float voltage = (float) this->data_.voltage_rms / this->coefficient_by_unit_(RMS_UC);
-  if (this->voltage_sensor_ != nullptr) {
-    this->voltage_sensor_->publish_state(voltage);
-  }
-
-  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
-    ESP_LOGD(TAG, "Channel %d power %f W, current %f A", channel + 1, active_power, amps);
-    if (channel == 0) {
-      if (this->power_sensor_1_ != nullptr) {
-        this->power_sensor_1_->publish_state(active_power);
-      }
-      if (this->current_sensor_1_ != nullptr) {
-        this->current_sensor_1_->publish_state(amps);
-      }
-    } else if (channel == 1) {
-      if (this->power_sensor_2_ != nullptr) {
-        this->power_sensor_2_->publish_state(active_power);
-      }
-      if (this->current_sensor_2_ != nullptr) {
-        this->current_sensor_2_->publish_state(amps);
-      }
-    }
-  }
-}
-
-}  // namespace cse7761
-}  // namespace esphome

esphome/components/cse7761/cse7761.h

@@ -1,52 +0,0 @@
-#pragma once
-
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/uart/uart.h"
-#include "esphome/core/component.h"
-
-namespace esphome {
-namespace cse7761 {
-
-struct CSE7761DataStruct {
-  uint32_t frequency = 0;
-  uint32_t voltage_rms = 0;
-  uint32_t current_rms[2] = {0};
-  uint32_t energy[2] = {0};
-  uint32_t active_power[2] = {0};
-  uint16_t coefficient[8] = {0};
-  uint8_t energy_update = 0;
-  bool ready = false;
-};
-
-/// This class implements support for the CSE7761 UART power sensor.
-class CSE7761Component : public PollingComponent, public uart::UARTDevice {
- public:
-  void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
-  void set_active_power_1_sensor(sensor::Sensor *power_sensor_1) { power_sensor_1_ = power_sensor_1; }
-  void set_current_1_sensor(sensor::Sensor *current_sensor_1) { current_sensor_1_ = current_sensor_1; }
-  void set_active_power_2_sensor(sensor::Sensor *power_sensor_2) { power_sensor_2_ = power_sensor_2; }
-  void set_current_2_sensor(sensor::Sensor *current_sensor_2) { current_sensor_2_ = current_sensor_2; }
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override;
-  void update() override;
-
- protected:
-  // Sensors
-  sensor::Sensor *voltage_sensor_{nullptr};
-  sensor::Sensor *power_sensor_1_{nullptr};
-  sensor::Sensor *current_sensor_1_{nullptr};
-  sensor::Sensor *power_sensor_2_{nullptr};
-  sensor::Sensor *current_sensor_2_{nullptr};
-  CSE7761DataStruct data_;
-
-  void write_(uint8_t reg, uint16_t data);
-  bool read_once_(uint8_t reg, uint8_t size, uint32_t *value);
-  uint32_t read_(uint8_t reg, uint8_t size);
-  uint32_t coefficient_by_unit_(uint32_t unit);
-  bool chip_init_();
-  void get_data_();
-};
-
-}  // namespace cse7761
-}  // namespace esphome

esphome/components/cse7761/sensor.py

@@ -1,90 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor, uart
-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,
-)
-
-CODEOWNERS = ["@berfenger"]
-DEPENDENCIES = ["uart"]
-
-cse7761_ns = cg.esphome_ns.namespace("cse7761")
-CSE7761Component = cse7761_ns.class_(
-    "CSE7761Component", cg.PollingComponent, uart.UARTDevice
-)
-
-CONF_CURRENT_1 = "current_1"
-CONF_CURRENT_2 = "current_2"
-CONF_ACTIVE_POWER_1 = "active_power_1"
-CONF_ACTIVE_POWER_2 = "active_power_2"
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(CSE7761Component),
-            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_1): 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_2): 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_1): 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_2): 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(uart.UART_DEVICE_SCHEMA)
-)
-
-FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
-    "cse7761", baud_rate=38400, require_rx=True, require_tx=True
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await uart.register_uart_device(var, config)
-
-    for key in [
-        CONF_VOLTAGE,
-        CONF_CURRENT_1,
-        CONF_CURRENT_2,
-        CONF_ACTIVE_POWER_1,
-        CONF_ACTIVE_POWER_2,
-    ]:
-        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/cse7766/cse7766.cpp

@@ -90,7 +90,6 @@ void CSE7766Component::parse_data_() {
   uint32_t power_cycle = this->get_24_bit_uint_(17);
 
   uint8_t adj = this->raw_data_[20];
-  uint32_t cf_pulses = (this->raw_data_[21] << 8) + this->raw_data_[22];
 
   bool power_ok = true;
   bool voltage_ok = true;
@@ -128,18 +127,6 @@ void CSE7766Component::parse_data_() {
     power = power_calib / float(power_cycle);
     this->power_acc_ += power;
     this->power_counts_ += 1;
-
-    uint32_t difference;
-    if (this->cf_pulses_last_ == 0)
-      this->cf_pulses_last_ = cf_pulses;
-
-    if (cf_pulses < this->cf_pulses_last_) {
-      difference = cf_pulses + (0x10000 - this->cf_pulses_last_);
-    } else {
-      difference = cf_pulses - this->cf_pulses_last_;
-    }
-    this->cf_pulses_last_ = cf_pulses;
-    this->energy_total_ += difference * float(power_calib) / 1000000.0 / 3600.0;
   }
 
   if ((adj & 0x20) == 0x20 && current_ok && voltage_ok && power != 0.0) {
@@ -149,9 +136,9 @@ void CSE7766Component::parse_data_() {
   }
 }
 void CSE7766Component::update() {
-  float voltage = this->voltage_counts_ > 0 ? this->voltage_acc_ / this->voltage_counts_ : 0.0f;
-  float current = this->current_counts_ > 0 ? this->current_acc_ / this->current_counts_ : 0.0f;
-  float power = this->power_counts_ > 0 ? this->power_acc_ / this->power_counts_ : 0.0f;
+  float voltage = this->voltage_counts_ > 0 ? this->voltage_acc_ / this->voltage_counts_ : 0.0;
+  float current = this->current_counts_ > 0 ? this->current_acc_ / this->current_counts_ : 0.0;
+  float power = this->power_counts_ > 0 ? this->power_acc_ / this->power_counts_ : 0.0;
 
   ESP_LOGV(TAG, "Got voltage_acc=%.2f current_acc=%.2f power_acc=%.2f", this->voltage_acc_, this->current_acc_,
            this->power_acc_);
@@ -165,8 +152,6 @@ void CSE7766Component::update() {
     this->current_sensor_->publish_state(current);
   if (this->power_sensor_ != nullptr)
     this->power_sensor_->publish_state(power);
-  if (this->energy_sensor_ != nullptr)
-    this->energy_sensor_->publish_state(this->energy_total_);
 
   this->voltage_acc_ = 0.0f;
   this->current_acc_ = 0.0f;
@@ -187,7 +172,6 @@ void CSE7766Component::dump_config() {
   LOG_SENSOR("  ", "Voltage", this->voltage_sensor_);
   LOG_SENSOR("  ", "Current", this->current_sensor_);
   LOG_SENSOR("  ", "Power", this->power_sensor_);
-  LOG_SENSOR("  ", "Energy", this->energy_sensor_);
   this->check_uart_settings(4800);
 }
 

esphome/components/cse7766/cse7766.h

@@ -12,7 +12,6 @@ class CSE7766Component : public PollingComponent, public uart::UARTDevice {
   void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
   void set_current_sensor(sensor::Sensor *current_sensor) { current_sensor_ = current_sensor; }
   void set_power_sensor(sensor::Sensor *power_sensor) { power_sensor_ = power_sensor; }
-  void set_energy_sensor(sensor::Sensor *energy_sensor) { energy_sensor_ = energy_sensor; }
 
   void loop() override;
   float get_setup_priority() const override;
@@ -30,12 +29,9 @@ class CSE7766Component : public PollingComponent, public uart::UARTDevice {
   sensor::Sensor *voltage_sensor_{nullptr};
   sensor::Sensor *current_sensor_{nullptr};
   sensor::Sensor *power_sensor_{nullptr};
-  sensor::Sensor *energy_sensor_{nullptr};
   float voltage_acc_{0.0f};
   float current_acc_{0.0f};
   float power_acc_{0.0f};
-  float energy_total_{0.0f};
-  uint32_t cf_pulses_last_{0};
   uint32_t voltage_counts_{0};
   uint32_t current_counts_{0};
   uint32_t power_counts_{0};

esphome/components/cse7766/sensor.py

@@ -3,20 +3,16 @@ import esphome.config_validation as cv
 from esphome.components import sensor, uart
 from esphome.const import (
     CONF_CURRENT,
-    CONF_ENERGY,
     CONF_ID,
     CONF_POWER,
     CONF_VOLTAGE,
     DEVICE_CLASS_CURRENT,
-    DEVICE_CLASS_ENERGY,
     DEVICE_CLASS_POWER,
     DEVICE_CLASS_VOLTAGE,
     STATE_CLASS_MEASUREMENT,
-    STATE_CLASS_TOTAL_INCREASING,
     UNIT_VOLT,
     UNIT_AMPERE,
     UNIT_WATT,
-    UNIT_WATT_HOURS,
 )
 
 DEPENDENCIES = ["uart"]
@@ -48,12 +44,6 @@ CONFIG_SCHEMA = (
                 device_class=DEVICE_CLASS_POWER,
                 state_class=STATE_CLASS_MEASUREMENT,
             ),
-            cv.Optional(CONF_ENERGY): sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT_HOURS,
-                accuracy_decimals=3,
-                device_class=DEVICE_CLASS_ENERGY,
-                state_class=STATE_CLASS_TOTAL_INCREASING,
-            ),
         }
     )
     .extend(cv.polling_component_schema("60s"))
@@ -81,7 +71,3 @@ async def to_code(config):
         conf = config[CONF_POWER]
         sens = await sensor.new_sensor(conf)
         cg.add(var.set_power_sensor(sens))
-    if CONF_ENERGY in config:
-        conf = config[CONF_ENERGY]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_energy_sensor(sens))

esphome/components/daikin/daikin.cpp

@@ -23,7 +23,7 @@ void DaikinClimate::transmit_state() {
   }
 
   auto transmit = this->transmitter_->transmit();
-  auto *data = transmit.get_data();
+  auto data = transmit.get_data();
   data->set_carrier_frequency(DAIKIN_IR_FREQUENCY);
 
   data->mark(DAIKIN_HEADER_MARK);
@@ -175,15 +175,14 @@ bool DaikinClimate::parse_state_frame_(const uint8_t frame[]) {
   }
   uint8_t fan_mode = frame[8];
   uint8_t swing_mode = frame[9];
-  if (fan_mode & 0xF && swing_mode & 0xF) {
+  if (fan_mode & 0xF && swing_mode & 0xF)
     this->swing_mode = climate::CLIMATE_SWING_BOTH;
-  } else if (fan_mode & 0xF) {
+  else if (fan_mode & 0xF)
     this->swing_mode = climate::CLIMATE_SWING_VERTICAL;
-  } else if (swing_mode & 0xF) {
+  else if (swing_mode & 0xF)
     this->swing_mode = climate::CLIMATE_SWING_HORIZONTAL;
-  } else {
+  else
     this->swing_mode = climate::CLIMATE_SWING_OFF;
-  }
   switch (fan_mode & 0xF0) {
     case DAIKIN_FAN_1:
     case DAIKIN_FAN_2:
@@ -213,9 +212,9 @@ bool DaikinClimate::on_receive(remote_base::RemoteReceiveData data) {
   for (uint8_t pos = 0; pos < DAIKIN_STATE_FRAME_SIZE; pos++) {
     uint8_t byte = 0;
     for (int8_t bit = 0; bit < 8; bit++) {
-      if (data.expect_item(DAIKIN_BIT_MARK, DAIKIN_ONE_SPACE)) {
+      if (data.expect_item(DAIKIN_BIT_MARK, DAIKIN_ONE_SPACE))
         byte |= 1 << bit;
-      } else if (!data.expect_item(DAIKIN_BIT_MARK, DAIKIN_ZERO_SPACE)) {
+      else if (!data.expect_item(DAIKIN_BIT_MARK, DAIKIN_ZERO_SPACE)) {
         return false;
       }
     }
@@ -232,7 +231,7 @@ bool DaikinClimate::on_receive(remote_base::RemoteReceiveData data) {
       // frame header
       if (byte != 0x27)
         return false;
-    } else if (pos == 3) {  // NOLINT(bugprone-branch-clone)
+    } else if (pos == 3) {
       // frame header
       if (byte != 0x00)
         return false;

esphome/components/dallas/__init__.py

@@ -6,20 +6,26 @@ from esphome.const import CONF_ID, CONF_PIN
 MULTI_CONF = True
 AUTO_LOAD = ["sensor"]
 
+CONF_ONE_WIRE_ID = "one_wire_id"
 dallas_ns = cg.esphome_ns.namespace("dallas")
 DallasComponent = dallas_ns.class_("DallasComponent", cg.PollingComponent)
+ESPOneWire = dallas_ns.class_("ESPOneWire")
 
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(DallasComponent),
-        cv.Required(CONF_PIN): pins.internal_gpio_output_pin_schema,
-    }
-).extend(cv.polling_component_schema("60s"))
+CONFIG_SCHEMA = cv.All(
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(DallasComponent),
+            cv.GenerateID(CONF_ONE_WIRE_ID): cv.declare_id(ESPOneWire),
+            cv.Required(CONF_PIN): pins.internal_gpio_output_pin_schema,
+        }
+    ).extend(cv.polling_component_schema("60s")),
+    # pin_mode call logs in esp-idf, but InterruptLock is active -> crash
+    cv.only_with_arduino,
+)
 
 
 async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-
     pin = await cg.gpio_pin_expression(config[CONF_PIN])
-    cg.add(var.set_pin(pin))
+    one_wire = cg.new_Pvariable(config[CONF_ONE_WIRE_ID], pin)
+    var = cg.new_Pvariable(config[CONF_ID], one_wire)
+    await cg.register_component(var, config)

esphome/components/dallas/dallas_component.cpp

@@ -31,16 +31,18 @@ uint16_t DallasTemperatureSensor::millis_to_wait_for_conversion() const {
 void DallasComponent::setup() {
   ESP_LOGCONFIG(TAG, "Setting up DallasComponent...");
 
-  pin_->setup();
-  one_wire_ = new ESPOneWire(pin_);  // NOLINT(cppcoreguidelines-owning-memory)
-
+  yield();
   std::vector<uint64_t> raw_sensors;
-  raw_sensors = this->one_wire_->search_vec();
+  {
+    InterruptLock lock;
+    raw_sensors = this->one_wire_->search_vec();
+  }
 
   for (auto &address : raw_sensors) {
+    std::string s = uint64_to_string(address);
     auto *address8 = reinterpret_cast<uint8_t *>(&address);
     if (crc8(address8, 7) != address8[7]) {
-      ESP_LOGW(TAG, "Dallas device 0x%s has invalid CRC.", format_hex(address).c_str());
+      ESP_LOGW(TAG, "Dallas device 0x%s has invalid CRC.", s.c_str());
       continue;
     }
     if (address8[0] != DALLAS_MODEL_DS18S20 && address8[0] != DALLAS_MODEL_DS1822 &&
@@ -52,7 +54,7 @@ void DallasComponent::setup() {
     this->found_sensors_.push_back(address);
   }
 
-  for (auto *sensor : this->sensors_) {
+  for (auto sensor : this->sensors_) {
     if (sensor->get_index().has_value()) {
       if (*sensor->get_index() >= this->found_sensors_.size()) {
         this->status_set_error();
@@ -68,7 +70,7 @@ void DallasComponent::setup() {
 }
 void DallasComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "DallasComponent:");
-  LOG_PIN("  Pin: ", this->pin_);
+  LOG_PIN("  Pin: ", this->one_wire_->get_pin());
   LOG_UPDATE_INTERVAL(this);
 
   if (this->found_sensors_.empty()) {
@@ -76,7 +78,8 @@ void DallasComponent::dump_config() {
   } else {
     ESP_LOGD(TAG, "  Found sensors:");
     for (auto &address : this->found_sensors_) {
-      ESP_LOGD(TAG, "    0x%s", format_hex(address).c_str());
+      std::string s = uint64_to_string(address);
+      ESP_LOGD(TAG, "    0x%s", s.c_str());
     }
   }
 
@@ -99,12 +102,15 @@ void DallasComponent::update() {
   this->status_clear_warning();
 
   bool result;
-  if (!this->one_wire_->reset()) {
-    result = false;
-  } else {
-    result = true;
-    this->one_wire_->skip();
-    this->one_wire_->write8(DALLAS_COMMAND_START_CONVERSION);
+  {
+    InterruptLock lock;
+    if (!this->one_wire_->reset()) {
+      result = false;
+    } else {
+      result = true;
+      this->one_wire_->skip();
+      this->one_wire_->write8(DALLAS_COMMAND_START_CONVERSION);
+    }
   }
 
   if (!result) {
@@ -115,7 +121,11 @@ void DallasComponent::update() {
 
   for (auto *sensor : this->sensors_) {
     this->set_timeout(sensor->get_address_name(), sensor->millis_to_wait_for_conversion(), [this, sensor] {
-      bool res = sensor->read_scratch_pad();
+      bool res;
+      {
+        InterruptLock lock;
+        res = sensor->read_scratch_pad();
+      }
 
       if (!res) {
         ESP_LOGW(TAG, "'%s' - Resetting bus for read failed!", sensor->get_name().c_str());
@@ -136,6 +146,7 @@ void DallasComponent::update() {
     });
   }
 }
+DallasComponent::DallasComponent(ESPOneWire *one_wire) : one_wire_(one_wire) {}
 
 void DallasTemperatureSensor::set_address(uint64_t address) { this->address_ = address; }
 uint8_t DallasTemperatureSensor::get_resolution() const { return this->resolution_; }
@@ -145,13 +156,13 @@ void DallasTemperatureSensor::set_index(uint8_t index) { this->index_ = index; }
 uint8_t *DallasTemperatureSensor::get_address8() { return reinterpret_cast<uint8_t *>(&this->address_); }
 const std::string &DallasTemperatureSensor::get_address_name() {
   if (this->address_name_.empty()) {
-    this->address_name_ = std::string("0x") + format_hex(this->address_);
+    this->address_name_ = std::string("0x") + uint64_to_string(this->address_);
   }
 
   return this->address_name_;
 }
 bool IRAM_ATTR DallasTemperatureSensor::read_scratch_pad() {
-  auto *wire = this->parent_->one_wire_;
+  ESPOneWire *wire = this->parent_->one_wire_;
   if (!wire->reset()) {
     return false;
   }
@@ -165,7 +176,11 @@ bool IRAM_ATTR DallasTemperatureSensor::read_scratch_pad() {
   return true;
 }
 bool DallasTemperatureSensor::setup_sensor() {
-  bool r = this->read_scratch_pad();
+  bool r;
+  {
+    InterruptLock lock;
+    r = this->read_scratch_pad();
+  }
 
   if (!r) {
     ESP_LOGE(TAG, "Reading scratchpad failed: reset");
@@ -199,18 +214,21 @@ bool DallasTemperatureSensor::setup_sensor() {
       break;
   }
 
-  auto *wire = this->parent_->one_wire_;
-  if (wire->reset()) {
-    wire->select(this->address_);
-    wire->write8(DALLAS_COMMAND_WRITE_SCRATCH_PAD);
-    wire->write8(this->scratch_pad_[2]);  // high alarm temp
-    wire->write8(this->scratch_pad_[3]);  // low alarm temp
-    wire->write8(this->scratch_pad_[4]);  // resolution
-    wire->reset();
+  ESPOneWire *wire = this->parent_->one_wire_;
+  {
+    InterruptLock lock;
+    if (wire->reset()) {
+      wire->select(this->address_);
+      wire->write8(DALLAS_COMMAND_WRITE_SCRATCH_PAD);
+      wire->write8(this->scratch_pad_[2]);  // high alarm temp
+      wire->write8(this->scratch_pad_[3]);  // low alarm temp
+      wire->write8(this->scratch_pad_[4]);  // resolution
+      wire->reset();
 
-    // write value to EEPROM
-    wire->select(this->address_);
-    wire->write8(0x48);
+      // write value to EEPROM
+      wire->select(this->address_);
+      wire->write8(0x48);
+    }
   }
 
   delay(20);  // allow it to finish operation
@@ -235,7 +253,7 @@ float DallasTemperatureSensor::get_temp_c() {
 
   return temp / 128.0f;
 }
-std::string DallasTemperatureSensor::unique_id() { return "dallas-" + str_lower_case(format_hex(this->address_)); }
+std::string DallasTemperatureSensor::unique_id() { return "dallas-" + uint64_to_string(this->address_); }
 
 }  // namespace dallas
 }  // namespace esphome

esphome/components/dallas/dallas_component.h

@@ -11,7 +11,8 @@ class DallasTemperatureSensor;
 
 class DallasComponent : public PollingComponent {
  public:
-  void set_pin(InternalGPIOPin *pin) { pin_ = pin; }
+  explicit DallasComponent(ESPOneWire *one_wire);
+
   void register_sensor(DallasTemperatureSensor *sensor);
 
   void setup() override;
@@ -23,7 +24,6 @@ class DallasComponent : public PollingComponent {
  protected:
   friend DallasTemperatureSensor;
 
-  InternalGPIOPin *pin_;
   ESPOneWire *one_wire_;
   std::vector<DallasTemperatureSensor *> sensors_;
   std::vector<uint64_t> found_sensors_;

esphome/components/dallas/esp_one_wire.cpp

@@ -10,123 +10,115 @@ static const char *const TAG = "dallas.one_wire";
 const uint8_t ONE_WIRE_ROM_SELECT = 0x55;
 const int ONE_WIRE_ROM_SEARCH = 0xF0;
 
-ESPOneWire::ESPOneWire(InternalGPIOPin *pin) { pin_ = pin->to_isr(); }
+ESPOneWire::ESPOneWire(GPIOPin *pin) : pin_(pin) {}
 
 bool HOT IRAM_ATTR ESPOneWire::reset() {
-  // See reset here:
-  // https://www.maximintegrated.com/en/design/technical-documents/app-notes/1/126.html
-  InterruptLock lock;
-
-  // Wait for communication to clear (delay G)
-  pin_.pin_mode(gpio::FLAG_INPUT | gpio::FLAG_PULLUP);
   uint8_t retries = 125;
+
+  // Wait for communication to clear
+  this->pin_->pin_mode(gpio::FLAG_INPUT | gpio::FLAG_PULLUP);
   do {
     if (--retries == 0)
       return false;
     delayMicroseconds(2);
-  } while (!pin_.digital_read());
+  } while (!this->pin_->digital_read());
 
-  // Send 480µs LOW TX reset pulse (drive bus low, delay H)
-  pin_.pin_mode(gpio::FLAG_OUTPUT);
-  pin_.digital_write(false);
+  // Send 480µs LOW TX reset pulse
+  this->pin_->pin_mode(gpio::FLAG_OUTPUT);
+  this->pin_->digital_write(false);
   delayMicroseconds(480);
 
-  // Release the bus, delay I
-  pin_.pin_mode(gpio::FLAG_INPUT | gpio::FLAG_PULLUP);
+  // Switch into RX mode, letting the pin float
+  this->pin_->pin_mode(gpio::FLAG_INPUT | gpio::FLAG_PULLUP);
+  // after 15µs-60µs wait time, responder pulls low for 60µs-240µs
+  // let's have 70µs just in case
   delayMicroseconds(70);
 
-  // sample bus, 0=device(s) present, 1=no device present
-  bool r = !pin_.digital_read();
-  // delay J
+  bool r = !this->pin_->digital_read();
   delayMicroseconds(410);
   return r;
 }
 
 void HOT IRAM_ATTR ESPOneWire::write_bit(bool bit) {
-  // See write 1/0 bit here:
-  // https://www.maximintegrated.com/en/design/technical-documents/app-notes/1/126.html
-  InterruptLock lock;
+  // Initiate write/read by pulling low.
+  this->pin_->pin_mode(gpio::FLAG_OUTPUT);
+  this->pin_->digital_write(false);
 
-  // drive bus low
-  pin_.pin_mode(gpio::FLAG_OUTPUT);
-  pin_.digital_write(false);
-
-  uint32_t delay0 = bit ? 10 : 65;
-  uint32_t delay1 = bit ? 55 : 5;
-
-  // delay A/C
-  delayMicroseconds(delay0);
-  // release bus
-  pin_.digital_write(true);
-  // delay B/D
-  delayMicroseconds(delay1);
+  // bus sampled within 15µs and 60µs after pulling LOW.
+  if (bit) {
+    // pull high/release within 15µs
+    delayMicroseconds(10);
+    this->pin_->digital_write(true);
+    // in total minimum of 60µs long
+    delayMicroseconds(55);
+  } else {
+    // continue pulling LOW for at least 60µs
+    delayMicroseconds(65);
+    this->pin_->digital_write(true);
+    // grace period, 1µs recovery time
+    delayMicroseconds(5);
+  }
 }
 
 bool HOT IRAM_ATTR ESPOneWire::read_bit() {
-  // See read bit here:
-  // https://www.maximintegrated.com/en/design/technical-documents/app-notes/1/126.html
-  InterruptLock lock;
-
-  // drive bus low, delay A
-  pin_.pin_mode(gpio::FLAG_OUTPUT);
-  pin_.digital_write(false);
+  // Initiate read slot by pulling LOW for at least 1µs
+  this->pin_->pin_mode(gpio::FLAG_OUTPUT);
+  this->pin_->digital_write(false);
   delayMicroseconds(3);
 
-  // release bus, delay E
-  pin_.pin_mode(gpio::FLAG_INPUT | gpio::FLAG_PULLUP);
+  // release bus, we have to sample within 15µs of pulling low
+  this->pin_->pin_mode(gpio::FLAG_INPUT | gpio::FLAG_PULLUP);
   delayMicroseconds(10);
 
-  // sample bus to read bit from peer
-  bool r = pin_.digital_read();
-
-  // delay F
+  bool r = this->pin_->digital_read();
+  // read time slot at least 60µs long + 1µs recovery time between slots
   delayMicroseconds(53);
   return r;
 }
 
-void ESPOneWire::write8(uint8_t val) {
+void IRAM_ATTR ESPOneWire::write8(uint8_t val) {
   for (uint8_t i = 0; i < 8; i++) {
     this->write_bit(bool((1u << i) & val));
   }
 }
 
-void ESPOneWire::write64(uint64_t val) {
+void IRAM_ATTR ESPOneWire::write64(uint64_t val) {
   for (uint8_t i = 0; i < 64; i++) {
     this->write_bit(bool((1ULL << i) & val));
   }
 }
 
-uint8_t ESPOneWire::read8() {
+uint8_t IRAM_ATTR ESPOneWire::read8() {
   uint8_t ret = 0;
   for (uint8_t i = 0; i < 8; i++) {
     ret |= (uint8_t(this->read_bit()) << i);
   }
   return ret;
 }
-uint64_t ESPOneWire::read64() {
+uint64_t IRAM_ATTR ESPOneWire::read64() {
   uint64_t ret = 0;
   for (uint8_t i = 0; i < 8; i++) {
     ret |= (uint64_t(this->read_bit()) << i);
   }
   return ret;
 }
-void ESPOneWire::select(uint64_t address) {
+void IRAM_ATTR ESPOneWire::select(uint64_t address) {
   this->write8(ONE_WIRE_ROM_SELECT);
   this->write64(address);
 }
-void ESPOneWire::reset_search() {
+void IRAM_ATTR ESPOneWire::reset_search() {
   this->last_discrepancy_ = 0;
   this->last_device_flag_ = false;
   this->last_family_discrepancy_ = 0;
   this->rom_number_ = 0;
 }
-uint64_t ESPOneWire::search() {
+uint64_t HOT IRAM_ATTR ESPOneWire::search() {
   if (this->last_device_flag_) {
     return 0u;
   }
 
   if (!this->reset()) {
-    // Reset failed or no devices present
+    // Reset failed
     this->reset_search();
     return 0u;
   }
@@ -145,10 +137,9 @@ uint64_t ESPOneWire::search() {
     // read its complement
     bool cmp_id_bit = this->read_bit();
 
-    if (id_bit && cmp_id_bit) {
+    if (id_bit && cmp_id_bit)
       // No devices participating in search
       break;
-    }
 
     bool branch;
 
@@ -171,13 +162,12 @@ uint64_t ESPOneWire::search() {
       }
     }
 
-    if (branch) {
+    if (branch)
       // set bit
       this->rom_number8_()[rom_byte_number] |= rom_byte_mask;
-    } else {
+    else
       // clear bit
       this->rom_number8_()[rom_byte_number] &= ~rom_byte_mask;
-    }
 
     // choose/announce branch
     this->write_bit(branch);
@@ -192,10 +182,9 @@ uint64_t ESPOneWire::search() {
 
   if (id_bit_number >= 65) {
     this->last_discrepancy_ = last_zero;
-    if (this->last_discrepancy_ == 0) {
+    if (this->last_discrepancy_ == 0)
       // we're at root and have no choices left, so this was the last one.
       this->last_device_flag_ = true;
-    }
     search_result = true;
   }
 
@@ -207,7 +196,7 @@ uint64_t ESPOneWire::search() {
 
   return this->rom_number_;
 }
-std::vector<uint64_t> ESPOneWire::search_vec() {
+std::vector<uint64_t> IRAM_ATTR ESPOneWire::search_vec() {
   std::vector<uint64_t> res;
 
   this->reset_search();
@@ -217,9 +206,10 @@ std::vector<uint64_t> ESPOneWire::search_vec() {
 
   return res;
 }
-void ESPOneWire::skip() {
+void IRAM_ATTR ESPOneWire::skip() {
   this->write8(0xCC);  // skip ROM
 }
+GPIOPin *ESPOneWire::get_pin() { return this->pin_; }
 
 uint8_t IRAM_ATTR *ESPOneWire::rom_number8_() { return reinterpret_cast<uint8_t *>(&this->rom_number_); }
 

esphome/components/dallas/esp_one_wire.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "esphome/core/component.h"
 #include "esphome/core/hal.h"
 #include <vector>
 
@@ -11,7 +12,7 @@ extern const int ONE_WIRE_ROM_SEARCH;
 
 class ESPOneWire {
  public:
-  explicit ESPOneWire(InternalGPIOPin *pin);
+  explicit ESPOneWire(GPIOPin *pin);
 
   /** Reset the bus, should be done before all write operations.
    *
@@ -54,11 +55,13 @@ class ESPOneWire {
   /// Helper that wraps search in a std::vector.
   std::vector<uint64_t> search_vec();
 
+  GPIOPin *get_pin();
+
  protected:
   /// Helper to get the internal 64-bit unsigned rom number as a 8-bit integer pointer.
   inline uint8_t *rom_number8_();
 
-  ISRInternalGPIOPin pin_;
+  GPIOPin *pin_;
   uint8_t last_discrepancy_{0};
   uint8_t last_family_discrepancy_{0};
   bool last_device_flag_{false};

esphome/components/dashboard_import/__init__.py

@@ -3,7 +3,6 @@ from pathlib import Path
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components.packages import validate_source_shorthand
-from esphome.wizard import wizard_file
 from esphome.yaml_util import dump
 
 
@@ -30,13 +29,6 @@ CONFIG_SCHEMA = cv.Schema(
     }
 )
 
-WIFI_CONFIG = """
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-"""
-
 
 async def to_code(config):
     cg.add_define("USE_DASHBOARD_IMPORT")
@@ -49,24 +41,5 @@ def import_config(path: str, name: str, project_name: str, import_url: str) -> N
     if p.exists():
         raise FileExistsError
 
-    if project_name == "esphome.web":
-        p.write_text(
-            wizard_file(
-                name=name,
-                platform="ESP32" if "esp32" in import_url else "ESP8266",
-                board="esp32dev" if "esp32" in import_url else "esp01_1m",
-                ssid="!secret wifi_ssid",
-                psk="!secret wifi_password",
-            ),
-            encoding="utf8",
-        )
-    else:
-        config = {
-            "substitutions": {"name": name},
-            "packages": {project_name: import_url},
-            "esphome": {"name_add_mac_suffix": False},
-        }
-        p.write_text(
-            dump(config) + WIFI_CONFIG,
-            encoding="utf8",
-        )
+    config = {"substitutions": {"name": name}, "packages": {project_name: import_url}}
+    p.write_text(dump(config), encoding="utf8")

esphome/components/debug/__init__.py

@@ -1,68 +1,19 @@
 import esphome.config_validation as cv
 import esphome.codegen as cg
-from esphome.components import sensor, text_sensor
-from esphome.const import (
-    CONF_ID,
-    CONF_DEVICE,
-    CONF_FREE,
-    CONF_FRAGMENTATION,
-    CONF_BLOCK,
-    CONF_LOOP_TIME,
-    UNIT_MILLISECOND,
-    UNIT_PERCENT,
-    UNIT_BYTES,
-    ICON_COUNTER,
-    ICON_TIMER,
-)
+from esphome.const import CONF_ID
 
 CODEOWNERS = ["@OttoWinter"]
 DEPENDENCIES = ["logger"]
 
 debug_ns = cg.esphome_ns.namespace("debug")
-DebugComponent = debug_ns.class_("DebugComponent", cg.PollingComponent)
-
-
+DebugComponent = debug_ns.class_("DebugComponent", cg.Component)
 CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(DebugComponent),
-        cv.Optional(CONF_DEVICE): text_sensor.TEXT_SENSOR_SCHEMA.extend(
-            {cv.GenerateID(): cv.declare_id(text_sensor.TextSensor)}
-        ),
-        cv.Optional(CONF_FREE): sensor.sensor_schema(UNIT_BYTES, ICON_COUNTER, 0),
-        cv.Optional(CONF_BLOCK): sensor.sensor_schema(UNIT_BYTES, ICON_COUNTER, 0),
-        cv.Optional(CONF_FRAGMENTATION): cv.All(
-            cv.only_on_esp8266,
-            cv.require_framework_version(esp8266_arduino=cv.Version(2, 5, 2)),
-            sensor.sensor_schema(UNIT_PERCENT, ICON_COUNTER, 1),
-        ),
-        cv.Optional(CONF_LOOP_TIME): sensor.sensor_schema(
-            UNIT_MILLISECOND, ICON_TIMER, 1
-        ),
     }
-).extend(cv.polling_component_schema("60s"))
+).extend(cv.COMPONENT_SCHEMA)
 
 
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
-
-    if CONF_DEVICE in config:
-        sens = cg.new_Pvariable(config[CONF_DEVICE][CONF_ID])
-        await text_sensor.register_text_sensor(sens, config[CONF_DEVICE])
-        cg.add(var.set_device_info_sensor(sens))
-
-    if CONF_FREE in config:
-        sens = await sensor.new_sensor(config[CONF_FREE])
-        cg.add(var.set_free_sensor(sens))
-
-    if CONF_BLOCK in config:
-        sens = await sensor.new_sensor(config[CONF_BLOCK])
-        cg.add(var.set_block_sensor(sens))
-
-    if CONF_FRAGMENTATION in config:
-        sens = await sensor.new_sensor(config[CONF_FRAGMENTATION])
-        cg.add(var.set_fragmentation_sensor(sens))
-
-    if CONF_LOOP_TIME in config:
-        sens = await sensor.new_sensor(config[CONF_LOOP_TIME])
-        cg.add(var.set_loop_time_sensor(sens))

esphome/components/debug/debug_component.cpp

@@ -1,63 +1,41 @@
 #include "debug_component.h"
-
-#include <algorithm>
 #include "esphome/core/log.h"
-#include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
+#include "esphome/core/defines.h"
 #include "esphome/core/version.h"
 
 #ifdef USE_ESP32
-
-#include <esp_heap_caps.h>
-#include <esp_system.h>
-
-#if ESP_IDF_VERSION_MAJOR >= 4
-#include <esp32/rom/rtc.h>
-#else
 #include <rom/rtc.h>
+#include <esp_idf_version.h>
 #endif
 
-#endif  // USE_ESP32
-
 #ifdef USE_ARDUINO
 #include <Esp.h>
 #endif
 
+#ifdef USE_ESP_IDF
+#include <esp_heap_caps.h>
+#include <esp_system.h>
+#endif
+
 namespace esphome {
 namespace debug {
 
 static const char *const TAG = "debug";
 
-static uint32_t get_free_heap() {
-#if defined(USE_ESP8266)
-  return ESP.getFreeHeap();  // NOLINT(readability-static-accessed-through-instance)
-#elif defined(USE_ESP32)
-  return heap_caps_get_free_size(MALLOC_CAP_INTERNAL);
-#endif
-}
-
 void DebugComponent::dump_config() {
-  std::string device_info;
-  device_info.reserve(256);
-
 #ifndef ESPHOME_LOG_HAS_DEBUG
   ESP_LOGE(TAG, "Debug Component requires debug log level!");
   this->status_set_error();
   return;
 #endif
 
-  ESP_LOGCONFIG(TAG, "Debug component:");
-  LOG_TEXT_SENSOR("  ", "Device info", this->device_info_);
-  LOG_SENSOR("  ", "Free space on heap", this->free_sensor_);
-  LOG_SENSOR("  ", "Largest free heap block", this->block_sensor_);
-#if defined(USE_ESP8266) && ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
-  LOG_SENSOR("  ", "Heap fragmentation", this->fragmentation_sensor_);
-#endif
-
   ESP_LOGD(TAG, "ESPHome version %s", ESPHOME_VERSION);
-  device_info += ESPHOME_VERSION;
-
-  this->free_heap_ = get_free_heap();
+#ifdef USE_ARDUINO
+  this->free_heap_ = ESP.getFreeHeap();  // NOLINT(readability-static-accessed-through-instance)
+#elif defined(USE_ESP_IDF)
+  this->free_heap_ = heap_caps_get_free_size(MALLOC_CAP_INTERNAL);
+#endif
   ESP_LOGD(TAG, "Free Heap Size: %u bytes", this->free_heap_);
 
 #ifdef USE_ARDUINO
@@ -86,12 +64,9 @@ void DebugComponent::dump_config() {
     default:
       flash_mode = "UNKNOWN";
   }
-  ESP_LOGD(TAG, "Flash Chip: Size=%ukB Speed=%uMHz Mode=%s",
-           ESP.getFlashChipSize() / 1024,                                                   // NOLINT
-           ESP.getFlashChipSpeed() / 1000000, flash_mode);                                  // NOLINT
-  device_info += "|Flash: " + to_string(ESP.getFlashChipSize() / 1024) +                    // NOLINT
-                 "kB Speed:" + to_string(ESP.getFlashChipSpeed() / 1000000) + "MHz Mode:";  // NOLINT
-  device_info += flash_mode;
+  // NOLINTNEXTLINE(readability-static-accessed-through-instance)
+  ESP_LOGD(TAG, "Flash Chip: Size=%ukB Speed=%uMHz Mode=%s", ESP.getFlashChipSize() / 1024,
+           ESP.getFlashChipSpeed() / 1000000, flash_mode);
 #endif  // USE_ARDUINO
 
 #ifdef USE_ESP32
@@ -123,24 +98,13 @@ void DebugComponent::dump_config() {
     info.features &= ~CHIP_FEATURE_BT;
   }
   if (info.features)
-    features += "Other:" + format_hex(info.features);
+    features += "Other:" + uint64_to_string(info.features);
   ESP_LOGD(TAG, "Chip: Model=%s, Features=%s Cores=%u, Revision=%u", model, features.c_str(), info.cores,
            info.revision);
-  device_info += "|Chip: ";
-  device_info += model;
-  device_info += " Features:";
-  device_info += features;
-  device_info += " Cores:" + to_string(info.cores);
-  device_info += " Revision:" + to_string(info.revision);
 
   ESP_LOGD(TAG, "ESP-IDF Version: %s", esp_get_idf_version());
-  device_info += "|ESP-IDF: ";
-  device_info += esp_get_idf_version();
 
-  std::string mac = get_mac_address_pretty();
-  ESP_LOGD(TAG, "EFuse MAC: %s", mac.c_str());
-  device_info += "|EFuse MAC: ";
-  device_info += mac;
+  ESP_LOGD(TAG, "EFuse MAC: %s", get_mac_address_pretty().c_str());
 
   const char *reset_reason;
   switch (rtc_get_reset_reason(0)) {
@@ -193,8 +157,6 @@ void DebugComponent::dump_config() {
       reset_reason = "Unknown Reset Reason";
   }
   ESP_LOGD(TAG, "Reset Reason: %s", reset_reason);
-  device_info += "|Reset: ";
-  device_info += reset_reason;
 
   const char *wakeup_reason;
   switch (rtc_get_wakeup_cause()) {
@@ -238,8 +200,6 @@ void DebugComponent::dump_config() {
       wakeup_reason = "Unknown";
   }
   ESP_LOGD(TAG, "Wakeup Reason: %s", wakeup_reason);
-  device_info += "|Wakeup: ";
-  device_info += wakeup_reason;
 #endif
 
 #if defined(USE_ESP8266) && !defined(CLANG_TIDY)
@@ -251,75 +211,20 @@ void DebugComponent::dump_config() {
   ESP_LOGD(TAG, "Flash Chip ID=0x%08X", ESP.getFlashChipId());
   ESP_LOGD(TAG, "Reset Reason: %s", ESP.getResetReason().c_str());
   ESP_LOGD(TAG, "Reset Info: %s", ESP.getResetInfo().c_str());
-
-  device_info += "|Chip: 0x" + format_hex(ESP.getChipId());
-  device_info += "|SDK: ";
-  device_info += ESP.getSdkVersion();
-  device_info += "|Core: ";
-  device_info += ESP.getCoreVersion().c_str();
-  device_info += "|Boot: ";
-  device_info += to_string(ESP.getBootVersion());
-  device_info += "|Mode: " + to_string(ESP.getBootMode());
-  device_info += "|CPU: " + to_string(ESP.getCpuFreqMHz());
-  device_info += "|Flash: 0x" + format_hex(ESP.getFlashChipId());
-  device_info += "|Reset: ";
-  device_info += ESP.getResetReason().c_str();
-  device_info += "|";
-  device_info += ESP.getResetInfo().c_str();
 #endif
-
-  if (this->device_info_ != nullptr) {
-    if (device_info.length() > 255)
-      device_info.resize(255);
-    this->device_info_->publish_state(device_info);
-  }
 }
-
 void DebugComponent::loop() {
-  // log when free heap space has halved
-  uint32_t new_free_heap = get_free_heap();
+#ifdef USE_ARDUINO
+  uint32_t new_free_heap = ESP.getFreeHeap();  // NOLINT(readability-static-accessed-through-instance)
+#elif defined(USE_ESP_IDF)
+  uint32_t new_free_heap = heap_caps_get_free_size(MALLOC_CAP_INTERNAL);
+#endif
   if (new_free_heap < this->free_heap_ / 2) {
     this->free_heap_ = new_free_heap;
     ESP_LOGD(TAG, "Free Heap Size: %u bytes", this->free_heap_);
     this->status_momentary_warning("heap", 1000);
   }
-
-  // calculate loop time - from last call to this one
-  if (this->loop_time_sensor_ != nullptr) {
-    uint32_t now = millis();
-    uint32_t loop_time = now - this->last_loop_timetag_;
-    this->max_loop_time_ = std::max(this->max_loop_time_, loop_time);
-    this->last_loop_timetag_ = now;
-  }
 }
-
-void DebugComponent::update() {
-  if (this->free_sensor_ != nullptr) {
-    this->free_sensor_->publish_state(get_free_heap());
-  }
-
-  if (this->block_sensor_ != nullptr) {
-#if defined(USE_ESP8266)
-    // NOLINTNEXTLINE(readability-static-accessed-through-instance)
-    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));
-#endif
-  }
-
-#if defined(USE_ESP8266) && ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
-  if (this->fragmentation_sensor_ != nullptr) {
-    // NOLINTNEXTLINE(readability-static-accessed-through-instance)
-    this->fragmentation_sensor_->publish_state(ESP.getHeapFragmentation());
-  }
-#endif
-
-  if (this->loop_time_sensor_ != nullptr) {
-    this->loop_time_sensor_->publish_state(this->max_loop_time_);
-    this->max_loop_time_ = 0;
-  }
-}
-
 float DebugComponent::get_setup_priority() const { return setup_priority::LATE; }
 
 }  // namespace debug

esphome/components/debug/debug_component.h

@@ -1,42 +1,18 @@
 #pragma once
 
 #include "esphome/core/component.h"
-#include "esphome/core/macros.h"
-#include "esphome/core/helpers.h"
-#include "esphome/components/text_sensor/text_sensor.h"
-#include "esphome/components/sensor/sensor.h"
 
 namespace esphome {
 namespace debug {
 
-class DebugComponent : public PollingComponent {
+class DebugComponent : public Component {
  public:
   void loop() override;
-  void update() override;
   float get_setup_priority() const override;
   void dump_config() override;
 
-  void set_device_info_sensor(text_sensor::TextSensor *device_info) { device_info_ = device_info; }
-  void set_free_sensor(sensor::Sensor *free_sensor) { free_sensor_ = free_sensor; }
-  void set_block_sensor(sensor::Sensor *block_sensor) { block_sensor_ = block_sensor; }
-#if defined(USE_ESP8266) && ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
-  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; }
-
  protected:
   uint32_t free_heap_{};
-
-  uint32_t last_loop_timetag_{0};
-  uint32_t max_loop_time_{0};
-
-  text_sensor::TextSensor *device_info_{nullptr};
-  sensor::Sensor *free_sensor_{nullptr};
-  sensor::Sensor *block_sensor_{nullptr};
-#if defined(USE_ESP8266) && ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
-  sensor::Sensor *fragmentation_sensor_{nullptr};
-#endif
-  sensor::Sensor *loop_time_sensor_{nullptr};
 };
 
 }  // namespace debug

esphome/components/deep_sleep/__init__.py

@@ -41,30 +41,15 @@ EXT1_WAKEUP_MODES = {
     "ALL_LOW": esp_sleep_ext1_wakeup_mode_t.ESP_EXT1_WAKEUP_ALL_LOW,
     "ANY_HIGH": esp_sleep_ext1_wakeup_mode_t.ESP_EXT1_WAKEUP_ANY_HIGH,
 }
-WakeupCauseToRunDuration = deep_sleep_ns.struct("WakeupCauseToRunDuration")
 
 CONF_WAKEUP_PIN_MODE = "wakeup_pin_mode"
 CONF_ESP32_EXT1_WAKEUP = "esp32_ext1_wakeup"
 CONF_TOUCH_WAKEUP = "touch_wakeup"
-CONF_DEFAULT = "default"
-CONF_GPIO_WAKEUP_REASON = "gpio_wakeup_reason"
-CONF_TOUCH_WAKEUP_REASON = "touch_wakeup_reason"
-
-WAKEUP_CAUSES_SCHEMA = cv.Schema(
-    {
-        cv.Required(CONF_DEFAULT): cv.positive_time_period_milliseconds,
-        cv.Optional(CONF_TOUCH_WAKEUP_REASON): cv.positive_time_period_milliseconds,
-        cv.Optional(CONF_GPIO_WAKEUP_REASON): cv.positive_time_period_milliseconds,
-    }
-)
 
 CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(DeepSleepComponent),
-        cv.Optional(CONF_RUN_DURATION): cv.Any(
-            cv.All(cv.only_on_esp32, WAKEUP_CAUSES_SCHEMA),
-            cv.positive_time_period_milliseconds,
-        ),
+        cv.Optional(CONF_RUN_DURATION): 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
@@ -100,28 +85,7 @@ async def to_code(config):
     if CONF_WAKEUP_PIN_MODE in config:
         cg.add(var.set_wakeup_pin_mode(config[CONF_WAKEUP_PIN_MODE]))
     if CONF_RUN_DURATION in config:
-        run_duration_config = config[CONF_RUN_DURATION]
-        if not isinstance(run_duration_config, dict):
-            cg.add(var.set_run_duration(config[CONF_RUN_DURATION]))
-        else:
-            default_run_duration = run_duration_config[CONF_DEFAULT]
-            wakeup_cause_to_run_duration = cg.StructInitializer(
-                WakeupCauseToRunDuration,
-                ("default_cause", default_run_duration),
-                (
-                    "touch_cause",
-                    run_duration_config.get(
-                        CONF_TOUCH_WAKEUP_REASON, default_run_duration
-                    ),
-                ),
-                (
-                    "gpio_cause",
-                    run_duration_config.get(
-                        CONF_GPIO_WAKEUP_REASON, default_run_duration
-                    ),
-                ),
-            )
-            cg.add(var.set_run_duration(wakeup_cause_to_run_duration))
+        cg.add(var.set_run_duration(config[CONF_RUN_DURATION]))
 
     if CONF_ESP32_EXT1_WAKEUP in config:
         conf = config[CONF_ESP32_EXT1_WAKEUP]

esphome/components/deep_sleep/deep_sleep_component.cpp

@@ -13,35 +13,12 @@ static const char *const TAG = "deep_sleep";
 
 bool global_has_deep_sleep = false;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 
-optional<uint32_t> DeepSleepComponent::get_run_duration_() const {
-#ifdef USE_ESP32
-  if (this->wakeup_cause_to_run_duration_.has_value()) {
-    esp_sleep_wakeup_cause_t wakeup_cause = esp_sleep_get_wakeup_cause();
-    switch (wakeup_cause) {
-      case ESP_SLEEP_WAKEUP_EXT0:
-      case ESP_SLEEP_WAKEUP_EXT1:
-        return this->wakeup_cause_to_run_duration_->gpio_cause;
-      case ESP_SLEEP_WAKEUP_TOUCHPAD:
-        return this->wakeup_cause_to_run_duration_->touch_cause;
-      default:
-        return this->wakeup_cause_to_run_duration_->default_cause;
-    }
-  }
-#endif
-  return this->run_duration_;
-}
-
 void DeepSleepComponent::setup() {
   ESP_LOGCONFIG(TAG, "Setting up Deep Sleep...");
   global_has_deep_sleep = true;
 
-  const optional<uint32_t> run_duration = get_run_duration_();
-  if (run_duration.has_value()) {
-    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.");
-  }
+  if (this->run_duration_.has_value())
+    this->set_timeout(*this->run_duration_, [this]() { this->begin_sleep(); });
 }
 void DeepSleepComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "Setting up Deep Sleep...");
@@ -56,11 +33,6 @@ void DeepSleepComponent::dump_config() {
   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: %u ms", 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, "  GPIO Wakeup Run Duration: %u ms", this->wakeup_cause_to_run_duration_->gpio_cause);
-  }
 #endif
 }
 void DeepSleepComponent::loop() {
@@ -77,9 +49,6 @@ void DeepSleepComponent::set_wakeup_pin_mode(WakeupPinMode wakeup_pin_mode) {
 }
 void DeepSleepComponent::set_ext1_wakeup(Ext1Wakeup ext1_wakeup) { this->ext1_wakeup_ = ext1_wakeup; }
 void DeepSleepComponent::set_touch_wakeup(bool touch_wakeup) { this->touch_wakeup_ = touch_wakeup; }
-void DeepSleepComponent::set_run_duration(WakeupCauseToRunDuration wakeup_cause_to_run_duration) {
-  wakeup_cause_to_run_duration_ = wakeup_cause_to_run_duration;
-}
 #endif
 void DeepSleepComponent::set_run_duration(uint32_t time_ms) { this->run_duration_ = time_ms; }
 void DeepSleepComponent::begin_sleep(bool manual) {
@@ -108,10 +77,9 @@ void DeepSleepComponent::begin_sleep(bool manual) {
   if (this->sleep_duration_.has_value())
     esp_sleep_enable_timer_wakeup(*this->sleep_duration_);
   if (this->wakeup_pin_ != nullptr) {
-    bool level = !this->wakeup_pin_->is_inverted();
-    if (this->wakeup_pin_mode_ == WAKEUP_PIN_MODE_INVERT_WAKEUP && this->wakeup_pin_->digital_read()) {
+    bool level = this->wakeup_pin_->is_inverted();
+    if (this->wakeup_pin_mode_ == WAKEUP_PIN_MODE_INVERT_WAKEUP && this->wakeup_pin_->digital_read())
       level = !level;
-    }
     esp_sleep_enable_ext0_wakeup(gpio_num_t(this->wakeup_pin_->get_pin()), level);
   }
   if (this->ext1_wakeup_.has_value()) {

esphome/components/deep_sleep/deep_sleep_component.h

@@ -32,15 +32,6 @@ struct Ext1Wakeup {
   esp_sleep_ext1_wakeup_mode_t wakeup_mode;
 };
 
-struct WakeupCauseToRunDuration {
-  // Run duration if woken up by timer or any other reason besides those below.
-  uint32_t default_cause;
-  // Run duration if woken up by touch pads.
-  uint32_t touch_cause;
-  // Run duration if woken up by GPIO pins.
-  uint32_t gpio_cause;
-};
-
 #endif
 
 template<typename... Ts> class EnterDeepSleepAction;
@@ -68,11 +59,6 @@ class DeepSleepComponent : public Component {
   void set_ext1_wakeup(Ext1Wakeup ext1_wakeup);
 
   void set_touch_wakeup(bool touch_wakeup);
-
-  // Set the duration in ms for how long the code should run before entering
-  // deep sleep mode, according to the cause the ESP32 has woken.
-  void set_run_duration(WakeupCauseToRunDuration wakeup_cause_to_run_duration);
-
 #endif
   /// Set a duration in ms for how long the code should run before entering deep sleep mode.
   void set_run_duration(uint32_t time_ms);
@@ -89,17 +75,12 @@ class DeepSleepComponent : public Component {
   void prevent_deep_sleep();
 
  protected:
-  // Returns nullopt if no run duration is set. Otherwise, returns the run
-  // duration before entering deep sleep.
-  optional<uint32_t> get_run_duration_() const;
-
   optional<uint64_t> sleep_duration_;
 #ifdef USE_ESP32
   InternalGPIOPin *wakeup_pin_;
   WakeupPinMode wakeup_pin_mode_{WAKEUP_PIN_MODE_IGNORE};
   optional<Ext1Wakeup> ext1_wakeup_;
   optional<bool> touch_wakeup_;
-  optional<WakeupCauseToRunDuration> wakeup_cause_to_run_duration_;
 #endif
   optional<uint32_t> run_duration_;
   bool next_enter_deep_sleep_{false};

esphome/components/demo/__init__.py

@@ -67,7 +67,7 @@ DemoClimate = demo_ns.class_("DemoClimate", climate.Climate, cg.Component)
 DemoClimateType = demo_ns.enum("DemoClimateType", is_class=True)
 DemoCover = demo_ns.class_("DemoCover", cover.Cover, cg.Component)
 DemoCoverType = demo_ns.enum("DemoCoverType", is_class=True)
-DemoFan = demo_ns.class_("DemoFan", fan.Fan, cg.Component)
+DemoFan = demo_ns.class_("DemoFan", cg.Component)
 DemoFanType = demo_ns.enum("DemoFanType", is_class=True)
 DemoLight = demo_ns.class_("DemoLight", light.LightOutput, cg.Component)
 DemoLightType = demo_ns.enum("DemoLightType", is_class=True)
@@ -411,7 +411,8 @@ async def to_code(config):
     for conf in config[CONF_FANS]:
         var = cg.new_Pvariable(conf[CONF_OUTPUT_ID])
         await cg.register_component(var, conf)
-        await fan.register_fan(var, conf)
+        fan_ = await fan.create_fan_state(conf)
+        cg.add(var.set_fan(fan_))
         cg.add(var.set_type(conf[CONF_TYPE]))
 
     for conf in config[CONF_LIGHTS]:

esphome/components/demo/demo_fan.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "esphome/core/component.h"
-#include "esphome/components/fan/fan.h"
+#include "esphome/components/fan/fan_state.h"
 
 namespace esphome {
 namespace demo {
@@ -13,10 +13,11 @@ enum class DemoFanType {
   TYPE_4,
 };
 
-class DemoFan : public fan::Fan, public Component {
+class DemoFan : public Component {
  public:
   void set_type(DemoFanType type) { type_ = type; }
-  fan::FanTraits get_traits() override {
+  void set_fan(fan::FanState *fan) { fan_ = fan; }
+  void setup() override {
     fan::FanTraits traits{};
 
     // oscillation
@@ -42,23 +43,10 @@ class DemoFan : public fan::Fan, public Component {
         break;
     }
 
-    return traits;
-  }
-
- protected:
-  void control(const fan::FanCall &call) override {
-    if (call.get_state().has_value())
-      this->state = *call.get_state();
-    if (call.get_oscillating().has_value())
-      this->oscillating = *call.get_oscillating();
-    if (call.get_speed().has_value())
-      this->speed = *call.get_speed();
-    if (call.get_direction().has_value())
-      this->direction = *call.get_direction();
-
-    this->publish_state();
+    this->fan_->set_traits(traits);
   }
 
+  fan::FanState *fan_;
   DemoFanType type_;
 };
 

esphome/components/dht/dht.cpp

@@ -114,11 +114,10 @@ bool HOT IRAM_ATTR DHT::read_sensor_(float *temperature, float *humidity, bool r
       // Wait for rising edge
       while (!this->pin_->digital_read()) {
         if (micros() - start_time > 90) {
-          if (i < 0) {
+          if (i < 0)
             error_code = 1;
-          } else {
+          else
             error_code = 2;
-          }
           break;
         }
       }
@@ -131,11 +130,10 @@ bool HOT IRAM_ATTR DHT::read_sensor_(float *temperature, float *humidity, bool r
       // Wait for falling edge
       while (this->pin_->digital_read()) {
         if ((end_time = micros()) - start_time > 90) {
-          if (i < 0) {
+          if (i < 0)
             error_code = 3;
-          } else {
+          else
             error_code = 4;
-          }
           break;
         }
       }

esphome/components/dht/sensor.py

@@ -33,7 +33,7 @@ DHT = dht_ns.class_("DHT", cg.PollingComponent)
 CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(DHT),
-        cv.Required(CONF_PIN): pins.internal_gpio_input_pin_schema,
+        cv.Required(CONF_PIN): pins.gpio_input_pin_schema,
         cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
             unit_of_measurement=UNIT_CELSIUS,
             accuracy_decimals=1,

esphome/components/display/__init__.py

@@ -3,7 +3,6 @@ import esphome.config_validation as cv
 from esphome import core, automation
 from esphome.automation import maybe_simple_id
 from esphome.const import (
-    CONF_AUTO_CLEAR_ENABLED,
     CONF_ID,
     CONF_LAMBDA,
     CONF_PAGES,
@@ -80,7 +79,6 @@ FULL_DISPLAY_SCHEMA = BASIC_DISPLAY_SCHEMA.extend(
                 cv.Optional(CONF_TO): cv.use_id(DisplayPage),
             }
         ),
-        cv.Optional(CONF_AUTO_CLEAR_ENABLED, default=True): cv.boolean,
     }
 )
 
@@ -88,10 +86,6 @@ FULL_DISPLAY_SCHEMA = BASIC_DISPLAY_SCHEMA.extend(
 async def setup_display_core_(var, config):
     if CONF_ROTATION in config:
         cg.add(var.set_rotation(DISPLAY_ROTATIONS[config[CONF_ROTATION]]))
-
-    if CONF_AUTO_CLEAR_ENABLED in config:
-        cg.add(var.set_auto_clear(config[CONF_AUTO_CLEAR_ENABLED]))
-
     if CONF_PAGES in config:
         pages = []
         for conf in config[CONF_PAGES]:

esphome/components/display/display_buffer.cpp

@@ -5,7 +5,6 @@
 #include "esphome/core/color.h"
 #include "esphome/core/log.h"
 #include "esphome/core/hal.h"
-#include "esphome/core/helpers.h"
 
 namespace esphome {
 namespace display {
@@ -16,8 +15,7 @@ const Color COLOR_OFF(0, 0, 0, 0);
 const Color COLOR_ON(255, 255, 255, 255);
 
 void DisplayBuffer::init_internal_(uint32_t buffer_length) {
-  ExternalRAMAllocator<uint8_t> allocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);
-  this->buffer_ = allocator.allocate(buffer_length);
+  this->buffer_ = new (std::nothrow) uint8_t[buffer_length];  // NOLINT
   if (this->buffer_ == nullptr) {
     ESP_LOGE(TAG, "Could not allocate buffer for display!");
     return;
@@ -176,10 +174,9 @@ void DisplayBuffer::print(int x, int y, Font *font, Color color, TextAlign align
       ESP_LOGW(TAG, "Encountered character without representation in font: '%c'", text[i]);
       if (!font->get_glyphs().empty()) {
         uint8_t glyph_width = font->get_glyphs()[0].glyph_data_->width;
-        for (int glyph_x = 0; glyph_x < glyph_width; glyph_x++) {
+        for (int glyph_x = 0; glyph_x < glyph_width; glyph_x++)
           for (int glyph_y = 0; glyph_y < height; glyph_y++)
             this->draw_pixel_at(glyph_x + x_at, glyph_y + y_start, color);
-        }
         x_at += glyph_width;
       }
 
@@ -234,14 +231,6 @@ void DisplayBuffer::image(int x, int y, Image *image, Color color_on, Color colo
         }
       }
       break;
-    case IMAGE_TYPE_TRANSPARENT_BINARY:
-      for (int img_x = 0; img_x < image->get_width(); img_x++) {
-        for (int img_y = 0; img_y < image->get_height(); img_y++) {
-          if (image->get_pixel(img_x, img_y))
-            this->draw_pixel_at(x + img_x, y + img_y, color_on);
-        }
-      }
-      break;
   }
 }
 
@@ -252,12 +241,6 @@ void DisplayBuffer::legend(int x, int y, graph::Graph *graph, Color color_on) {
 }
 #endif  // USE_GRAPH
 
-#ifdef USE_QR_CODE
-void DisplayBuffer::qr_code(int x, int y, qr_code::QrCode *qr_code, Color color_on, int scale) {
-  qr_code->draw(this, x, y, color_on, scale);
-}
-#endif  // USE_QR_CODE
-
 void DisplayBuffer::get_text_bounds(int x, int y, const char *text, Font *font, TextAlign align, int *x1, int *y1,
                                     int *width, int *height) {
   int x_offset, baseline;
@@ -353,9 +336,7 @@ void DisplayBuffer::show_page(DisplayPage *page) {
 void DisplayBuffer::show_next_page() { this->page_->show_next(); }
 void DisplayBuffer::show_prev_page() { this->page_->show_prev(); }
 void DisplayBuffer::do_update_() {
-  if (this->auto_clear_enabled_) {
-    this->clear();
-  }
+  this->clear();
   if (this->page_ != nullptr) {
     this->page_->get_writer()(*this);
   } else if (this->writer_.has_value()) {
@@ -432,11 +413,10 @@ int Font::match_next_glyph(const char *str, int *match_length) {
   int hi = this->glyphs_.size() - 1;
   while (lo != hi) {
     int mid = (lo + hi + 1) / 2;
-    if (this->glyphs_[mid].compare_to(str)) {
+    if (this->glyphs_[mid].compare_to(str))
       lo = mid;
-    } else {
+    else
       hi = mid - 1;
-    }
   }
   *match_length = this->glyphs_[lo].match_length(str);
   if (*match_length <= 0)
@@ -462,11 +442,10 @@ void Font::measure(const char *str, int *width, int *x_offset, int *baseline, in
     }
 
     const Glyph &glyph = this->glyphs_[glyph_n];
-    if (!has_char) {
+    if (!has_char)
       min_x = glyph.glyph_data_->offset_x;
-    } else {
+    else
       min_x = std::min(min_x, x + glyph.glyph_data_->offset_x);
-    }
     x += glyph.glyph_data_->width + glyph.glyph_data_->offset_x;
 
     i += match_length;
@@ -515,7 +494,7 @@ bool Animation::get_pixel(int x, int y) const {
     return false;
   const uint32_t width_8 = ((this->width_ + 7u) / 8u) * 8u;
   const uint32_t frame_index = this->height_ * width_8 * this->current_frame_;
-  if (frame_index >= (uint32_t)(this->width_ * this->height_ * this->animation_frame_count_))
+  if (frame_index >= this->width_ * this->height_ * this->animation_frame_count_)
     return false;
   const uint32_t pos = x + y * width_8 + frame_index;
   return progmem_read_byte(this->data_start_ + (pos / 8u)) & (0x80 >> (pos % 8u));
@@ -524,7 +503,7 @@ Color Animation::get_color_pixel(int x, int y) const {
   if (x < 0 || x >= this->width_ || y < 0 || y >= this->height_)
     return Color::BLACK;
   const uint32_t frame_index = this->width_ * this->height_ * this->current_frame_;
-  if (frame_index >= (uint32_t)(this->width_ * this->height_ * this->animation_frame_count_))
+  if (frame_index >= this->width_ * this->height_ * this->animation_frame_count_)
     return Color::BLACK;
   const uint32_t pos = (x + y * this->width_ + frame_index) * 3;
   const uint32_t color32 = (progmem_read_byte(this->data_start_ + pos + 2) << 0) |
@@ -536,7 +515,7 @@ Color Animation::get_grayscale_pixel(int x, int y) const {
   if (x < 0 || x >= this->width_ || y < 0 || y >= this->height_)
     return Color::BLACK;
   const uint32_t frame_index = this->width_ * this->height_ * this->current_frame_;
-  if (frame_index >= (uint32_t)(this->width_ * this->height_ * this->animation_frame_count_))
+  if (frame_index >= this->width_ * this->height_ * this->animation_frame_count_)
     return Color::BLACK;
   const uint32_t pos = (x + y * this->width_ + frame_index);
   const uint8_t gray = progmem_read_byte(this->data_start_ + pos);

esphome/components/display/display_buffer.h

@@ -14,10 +14,6 @@
 #include "esphome/components/graph/graph.h"
 #endif
 
-#ifdef USE_QR_CODE
-#include "esphome/components/qr_code/qr_code.h"
-#endif
-
 namespace esphome {
 namespace display {
 
@@ -77,12 +73,7 @@ extern const Color COLOR_OFF;
 /// Turn the pixel ON.
 extern const Color COLOR_ON;
 
-enum ImageType {
-  IMAGE_TYPE_BINARY = 0,
-  IMAGE_TYPE_GRAYSCALE = 1,
-  IMAGE_TYPE_RGB24 = 2,
-  IMAGE_TYPE_TRANSPARENT_BINARY = 3,
-};
+enum ImageType { IMAGE_TYPE_BINARY = 0, IMAGE_TYPE_GRAYSCALE = 1, IMAGE_TYPE_RGB24 = 2 };
 
 enum DisplayRotation {
   DISPLAY_ROTATION_0_DEGREES = 0,
@@ -311,17 +302,6 @@ class DisplayBuffer {
   void legend(int x, int y, graph::Graph *graph, Color color_on = COLOR_ON);
 #endif  // USE_GRAPH
 
-#ifdef USE_QR_CODE
-  /** Draw the `qr_code` with the top-left corner at [x,y] to the screen.
-   *
-   * @param x The x coordinate of the upper left corner.
-   * @param y The y coordinate of the upper left corner.
-   * @param qr_code The qr_code to draw
-   * @param color_on The color to replace in binary images for the on bits.
-   */
-  void qr_code(int x, int y, qr_code::QrCode *qr_code, Color color_on = COLOR_ON, int scale = 1);
-#endif
-
   /** Get the text bounds of the given string.
    *
    * @param x The x coordinate to place the string at, can be 0 if only interested in dimensions.
@@ -353,18 +333,15 @@ class DisplayBuffer {
   /// Internal method to set the display rotation with.
   void set_rotation(DisplayRotation rotation);
 
-  // Internal method to set display auto clearing.
-  void set_auto_clear(bool auto_clear_enabled) { this->auto_clear_enabled_ = auto_clear_enabled; }
-
-  virtual int get_height_internal() = 0;
-  virtual int get_width_internal() = 0;
-  DisplayRotation get_rotation() const { return this->rotation_; }
-
  protected:
   void vprintf_(int x, int y, Font *font, Color color, TextAlign align, const char *format, va_list arg);
 
   virtual void draw_absolute_pixel_internal(int x, int y, Color color) = 0;
 
+  virtual int get_height_internal() = 0;
+
+  virtual int get_width_internal() = 0;
+
   void init_internal_(uint32_t buffer_length);
 
   void do_update_();
@@ -375,7 +352,6 @@ class DisplayBuffer {
   DisplayPage *page_{nullptr};
   DisplayPage *previous_page_{nullptr};
   std::vector<DisplayOnPageChangeTrigger *> on_page_change_triggers_;
-  bool auto_clear_enabled_{true};
 };
 
 class DisplayPage {

esphome/components/display/display_color_utils.h

@@ -42,7 +42,7 @@ class ColorUtil {
                        ? esp_scale(((colorcode >> third_bits) & ((1 << second_bits) - 1)), ((1 << second_bits) - 1))
                        : esp_scale(((colorcode >> 8) & 0xFF), ((1 << second_bits) - 1));
 
-    third_color = (right_bit_aligned ? esp_scale(((colorcode >> 0) & ((1 << third_bits) - 1)), ((1 << third_bits) - 1))
+    third_color = (right_bit_aligned ? esp_scale(((colorcode >> 0) & 0xFF), ((1 << third_bits) - 1))
                                      : esp_scale(((colorcode >> 0) & 0xFF), (1 << third_bits) - 1));
 
     Color color_return;

esphome/components/dsmr/__init__.py

@@ -1,11 +1,9 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome import pins
 from esphome.components import uart
 from esphome.const import (
     CONF_ID,
     CONF_UART_ID,
-    CONF_RECEIVE_TIMEOUT,
 )
 
 CODEOWNERS = ["@glmnet", "@zuidwijk"]
@@ -13,13 +11,10 @@ CODEOWNERS = ["@glmnet", "@zuidwijk"]
 DEPENDENCIES = ["uart"]
 AUTO_LOAD = ["sensor", "text_sensor"]
 
-CONF_CRC_CHECK = "crc_check"
-CONF_DECRYPTION_KEY = "decryption_key"
 CONF_DSMR_ID = "dsmr_id"
+CONF_DECRYPTION_KEY = "decryption_key"
+CONF_CRC_CHECK = "crc_check"
 CONF_GAS_MBUS_ID = "gas_mbus_id"
-CONF_MAX_TELEGRAM_LENGTH = "max_telegram_length"
-CONF_REQUEST_INTERVAL = "request_interval"
-CONF_REQUEST_PIN = "request_pin"
 
 # Hack to prevent compile error due to ambiguity with lib namespace
 dsmr_ns = cg.esphome_ns.namespace("esphome::dsmr")
@@ -51,14 +46,6 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_DECRYPTION_KEY): _validate_key,
             cv.Optional(CONF_CRC_CHECK, default=True): cv.boolean,
             cv.Optional(CONF_GAS_MBUS_ID, default=1): cv.int_,
-            cv.Optional(CONF_MAX_TELEGRAM_LENGTH, default=1500): cv.int_,
-            cv.Optional(CONF_REQUEST_PIN): pins.gpio_output_pin_schema,
-            cv.Optional(
-                CONF_REQUEST_INTERVAL, default="0ms"
-            ): cv.positive_time_period_milliseconds,
-            cv.Optional(
-                CONF_RECEIVE_TIMEOUT, default="200ms"
-            ): cv.positive_time_period_milliseconds,
         }
     ).extend(uart.UART_DEVICE_SCHEMA),
     cv.only_with_arduino,
@@ -68,17 +55,10 @@ CONFIG_SCHEMA = cv.All(
 async def to_code(config):
     uart_component = await cg.get_variable(config[CONF_UART_ID])
     var = cg.new_Pvariable(config[CONF_ID], uart_component, config[CONF_CRC_CHECK])
-    cg.add(var.set_max_telegram_length(config[CONF_MAX_TELEGRAM_LENGTH]))
     if CONF_DECRYPTION_KEY in config:
         cg.add(var.set_decryption_key(config[CONF_DECRYPTION_KEY]))
     await cg.register_component(var, config)
 
-    if CONF_REQUEST_PIN in config:
-        request_pin = await cg.gpio_pin_expression(config[CONF_REQUEST_PIN])
-        cg.add(var.set_request_pin(request_pin))
-    cg.add(var.set_request_interval(config[CONF_REQUEST_INTERVAL].total_milliseconds))
-    cg.add(var.set_receive_timeout(config[CONF_RECEIVE_TIMEOUT].total_milliseconds))
-
     cg.add_define("DSMR_GAS_MBUS_ID", config[CONF_GAS_MBUS_ID])
 
     # DSMR Parser

esphome/components/dsmr/dsmr.cpp

@@ -12,275 +12,156 @@ namespace dsmr {
 
 static const char *const TAG = "dsmr";
 
-void Dsmr::setup() {
-  this->telegram_ = new char[this->max_telegram_len_];  // NOLINT
-  if (this->request_pin_ != nullptr) {
-    this->request_pin_->setup();
-  }
-}
-
 void Dsmr::loop() {
-  if (this->ready_to_request_data_()) {
-    if (this->decryption_key_.empty()) {
-      this->receive_telegram_();
-    } else {
-      this->receive_encrypted_telegram_();
-    }
-  }
-}
-
-bool Dsmr::ready_to_request_data_() {
-  // When using a request pin, then wait for the next request interval.
-  if (this->request_pin_ != nullptr) {
-    if (!this->requesting_data_ && this->request_interval_reached_()) {
-      this->start_requesting_data_();
-    }
-  }
-  // Otherwise, sink serial data until next request interval.
-  else {
-    if (this->request_interval_reached_()) {
-      this->start_requesting_data_();
-    }
-    if (!this->requesting_data_) {
-      while (this->available()) {
-        this->read();
-      }
-    }
-  }
-  return this->requesting_data_;
-}
-
-bool Dsmr::request_interval_reached_() {
-  if (this->last_request_time_ == 0) {
-    return true;
-  }
-  return millis() - this->last_request_time_ > this->request_interval_;
-}
-
-bool Dsmr::receive_timeout_reached_() { return millis() - this->last_read_time_ > this->receive_timeout_; }
-
-bool Dsmr::available_within_timeout_() {
-  // Data are available for reading on the UART bus?
-  // Then we can start reading right away.
-  if (this->available()) {
-    this->last_read_time_ = millis();
-    return true;
-  }
-  // When we're not in the process of reading a telegram, then there is
-  // no need to actively wait for new data to come in.
-  if (!header_found_) {
-    return false;
-  }
-  // A telegram is being read. The smart meter might not deliver a telegram
-  // in one go, but instead send it in chunks with small pauses in between.
-  // When the UART RX buffer cannot hold a full telegram, then make sure
-  // that the UART read buffer does not overflow while other components
-  // perform their work in their loop. Do this by not returning control to
-  // the main loop, until the read timeout is reached.
-  if (this->parent_->get_rx_buffer_size() < this->max_telegram_len_) {
-    while (!this->receive_timeout_reached_()) {
-      delay(5);
-      if (this->available()) {
-        this->last_read_time_ = millis();
-        return true;
-      }
-    }
-  }
-  // No new data has come in during the read timeout? Then stop reading the
-  // telegram and start waiting for the next one to arrive.
-  if (this->receive_timeout_reached_()) {
-    ESP_LOGW(TAG, "Timeout while reading data for telegram");
-    this->reset_telegram_();
-  }
-
-  return false;
-}
-
-void Dsmr::start_requesting_data_() {
-  if (!this->requesting_data_) {
-    if (this->request_pin_ != nullptr) {
-      ESP_LOGV(TAG, "Start requesting data from P1 port");
-      this->request_pin_->digital_write(true);
-    } else {
-      ESP_LOGV(TAG, "Start reading data from P1 port");
-    }
-    this->requesting_data_ = true;
-    this->last_request_time_ = millis();
-  }
-}
-
-void Dsmr::stop_requesting_data_() {
-  if (this->requesting_data_) {
-    if (this->request_pin_ != nullptr) {
-      ESP_LOGV(TAG, "Stop requesting data from P1 port");
-      this->request_pin_->digital_write(false);
-    } else {
-      ESP_LOGV(TAG, "Stop reading data from P1 port");
-    }
-    while (this->available()) {
-      this->read();
-    }
-    this->requesting_data_ = false;
-  }
-}
-
-void Dsmr::reset_telegram_() {
-  this->header_found_ = false;
-  this->footer_found_ = false;
-  this->bytes_read_ = 0;
-  this->crypt_bytes_read_ = 0;
-  this->crypt_telegram_len_ = 0;
-  this->last_read_time_ = 0;
+  if (this->decryption_key_.empty())
+    this->receive_telegram_();
+  else
+    this->receive_encrypted_();
 }
 
 void Dsmr::receive_telegram_() {
-  while (this->available_within_timeout_()) {
-    const char c = this->read();
+  int count = MAX_BYTES_PER_LOOP;
+  while (available() && count-- > 0) {
+    const char c = read();
 
     // Find a new telegram header, i.e. forward slash.
     if (c == '/') {
-      ESP_LOGV(TAG, "Header of telegram found");
-      this->reset_telegram_();
-      this->header_found_ = true;
+      ESP_LOGV(TAG, "Header found");
+      header_found_ = true;
+      footer_found_ = false;
+      telegram_len_ = 0;
     }
-    if (!this->header_found_)
+    if (!header_found_)
       continue;
 
     // Check for buffer overflow.
-    if (this->bytes_read_ >= this->max_telegram_len_) {
-      this->reset_telegram_();
-      ESP_LOGE(TAG, "Error: telegram larger than buffer (%d bytes)", this->max_telegram_len_);
+    if (telegram_len_ >= MAX_TELEGRAM_LENGTH) {
+      header_found_ = false;
+      footer_found_ = false;
+      ESP_LOGE(TAG, "Error: Message larger than buffer");
       return;
     }
 
     // Some v2.2 or v3 meters will send a new value which starts with '('
-    // in a new line, while the value belongs to the previous ObisId. For
-    // proper parsing, remove these new line characters.
-    if (c == '(') {
-      while (true) {
-        auto previous_char = this->telegram_[this->bytes_read_ - 1];
-        if (previous_char == '\n' || previous_char == '\r') {
-          this->bytes_read_--;
-        } else {
-          break;
-        }
-      }
-    }
+    // in a new line while the value belongs to the previous ObisId. For
+    // proper parsing remove these new line characters
+    while (c == '(' && (telegram_[telegram_len_ - 1] == '\n' || telegram_[telegram_len_ - 1] == '\r'))
+      telegram_len_--;
 
     // Store the byte in the buffer.
-    this->telegram_[this->bytes_read_] = c;
-    this->bytes_read_++;
+    telegram_[telegram_len_] = c;
+    telegram_len_++;
 
     // Check for a footer, i.e. exlamation mark, followed by a hex checksum.
     if (c == '!') {
-      ESP_LOGV(TAG, "Footer of telegram found");
-      this->footer_found_ = true;
+      ESP_LOGV(TAG, "Footer found");
+      footer_found_ = true;
       continue;
     }
     // Check for the end of the hex checksum, i.e. a newline.
-    if (this->footer_found_ && c == '\n') {
+    if (footer_found_ && c == '\n') {
+      header_found_ = false;
       // Parse the telegram and publish sensor values.
-      this->parse_telegram();
-      this->reset_telegram_();
-      return;
+      if (parse_telegram())
+        return;
     }
   }
 }
 
-void Dsmr::receive_encrypted_telegram_() {
-  while (this->available_within_timeout_()) {
-    const char c = this->read();
+void Dsmr::receive_encrypted_() {
+  // Encrypted buffer
+  uint8_t buffer[MAX_TELEGRAM_LENGTH];
+  size_t buffer_length = 0;
 
-    // Find a new telegram start byte.
-    if (!this->header_found_) {
-      if ((uint8_t) c != 0xDB) {
-        continue;
+  size_t packet_size = 0;
+  while (available()) {
+    const char c = read();
+
+    if (!header_found_) {
+      if ((uint8_t) c == 0xdb) {
+        ESP_LOGV(TAG, "Start byte 0xDB found");
+        header_found_ = true;
       }
-      ESP_LOGV(TAG, "Start byte 0xDB of encrypted telegram found");
-      this->reset_telegram_();
-      this->header_found_ = true;
     }
 
-    // Check for buffer overflow.
-    if (this->crypt_bytes_read_ >= this->max_telegram_len_) {
-      this->reset_telegram_();
-      ESP_LOGE(TAG, "Error: encrypted telegram larger than buffer (%d bytes)", this->max_telegram_len_);
+    // Sanity check
+    if (!header_found_ || buffer_length >= MAX_TELEGRAM_LENGTH) {
+      if (buffer_length == 0) {
+        ESP_LOGE(TAG, "First byte of encrypted telegram should be 0xDB, aborting.");
+      } else {
+        ESP_LOGW(TAG, "Unexpected data");
+      }
+      this->status_momentary_warning("unexpected_data");
+      this->flush();
+      while (available())
+        read();
       return;
     }
 
-    // Store the byte in the buffer.
-    this->crypt_telegram_[this->crypt_bytes_read_] = c;
-    this->crypt_bytes_read_++;
+    buffer[buffer_length++] = c;
 
-    // Read the length of the incoming encrypted telegram.
-    if (this->crypt_telegram_len_ == 0 && this->crypt_bytes_read_ > 20) {
-      // Complete header + data bytes
-      this->crypt_telegram_len_ = 13 + (this->crypt_telegram_[11] << 8 | this->crypt_telegram_[12]);
-      ESP_LOGV(TAG, "Encrypted telegram length: %d bytes", this->crypt_telegram_len_);
+    if (packet_size == 0 && buffer_length > 20) {
+      // Complete header + a few bytes of data
+      packet_size = buffer[11] << 8 | buffer[12];
+    }
+    if (buffer_length == packet_size + 13 && packet_size > 0) {
+      ESP_LOGV(TAG, "Encrypted data: %d bytes", buffer_length);
+
+      GCM<AES128> *gcmaes128{new GCM<AES128>()};
+      gcmaes128->setKey(this->decryption_key_.data(), gcmaes128->keySize());
+      // the iv is 8 bytes of the system title + 4 bytes frame counter
+      // system title is at byte 2 and frame counter at byte 15
+      for (int i = 10; i < 14; i++)
+        buffer[i] = buffer[i + 4];
+      constexpr uint16_t iv_size{12};
+      gcmaes128->setIV(&buffer[2], iv_size);
+      gcmaes128->decrypt(reinterpret_cast<uint8_t *>(this->telegram_),
+                         // the ciphertext start at byte 18
+                         &buffer[18],
+                         // cipher size
+                         buffer_length - 17);
+      delete gcmaes128;  // NOLINT(cppcoreguidelines-owning-memory)
+
+      telegram_len_ = strnlen(this->telegram_, sizeof(this->telegram_));
+      ESP_LOGV(TAG, "Decrypted data length: %d", telegram_len_);
+      ESP_LOGVV(TAG, "Decrypted data %s", this->telegram_);
+
+      parse_telegram();
+      telegram_len_ = 0;
+      return;
     }
 
-    // Check for the end of the encrypted telegram.
-    if (this->crypt_telegram_len_ == 0 || this->crypt_bytes_read_ != this->crypt_telegram_len_) {
-      continue;
+    if (!available()) {
+      // baud rate is 115200 for encrypted data, this means a few byte should arrive every time
+      // program runs faster than buffer loading then available() might return false in the middle
+      delay(4);  // Wait for data
     }
-    ESP_LOGV(TAG, "End of encrypted telegram found");
-
-    // Decrypt the encrypted telegram.
-    GCM<AES128> *gcmaes128{new GCM<AES128>()};
-    gcmaes128->setKey(this->decryption_key_.data(), gcmaes128->keySize());
-    // the iv is 8 bytes of the system title + 4 bytes frame counter
-    // system title is at byte 2 and frame counter at byte 15
-    for (int i = 10; i < 14; i++)
-      this->crypt_telegram_[i] = this->crypt_telegram_[i + 4];
-    constexpr uint16_t iv_size{12};
-    gcmaes128->setIV(&this->crypt_telegram_[2], iv_size);
-    gcmaes128->decrypt(reinterpret_cast<uint8_t *>(this->telegram_),
-                       // the ciphertext start at byte 18
-                       &this->crypt_telegram_[18],
-                       // cipher size
-                       this->crypt_bytes_read_ - 17);
-    delete gcmaes128;  // NOLINT(cppcoreguidelines-owning-memory)
-
-    this->bytes_read_ = strnlen(this->telegram_, this->max_telegram_len_);
-    ESP_LOGV(TAG, "Decrypted telegram size: %d bytes", this->bytes_read_);
-    ESP_LOGVV(TAG, "Decrypted telegram: %s", this->telegram_);
-
-    // Parse the decrypted telegram and publish sensor values.
-    this->parse_telegram();
-    this->reset_telegram_();
-    return;
+  }
+  if (buffer_length > 0) {
+    ESP_LOGW(TAG, "Timeout while waiting for encrypted data or invalid data received.");
   }
 }
 
 bool Dsmr::parse_telegram() {
   MyData data;
-  ESP_LOGV(TAG, "Trying to parse telegram");
-  this->stop_requesting_data_();
+  ESP_LOGV(TAG, "Trying to parse");
   ::dsmr::ParseResult<void> res =
-      ::dsmr::P1Parser::parse(&data, this->telegram_, this->bytes_read_, false,
+      ::dsmr::P1Parser::parse(&data, telegram_, telegram_len_, false,
                               this->crc_check_);  // Parse telegram according to data definition. Ignore unknown values.
   if (res.err) {
     // Parsing error, show it
-    auto err_str = res.fullError(this->telegram_, this->telegram_ + this->bytes_read_);
+    auto err_str = res.fullError(telegram_, telegram_ + telegram_len_);
     ESP_LOGE(TAG, "%s", err_str.c_str());
     return false;
   } else {
     this->status_clear_warning();
-    this->publish_sensors(data);
+    publish_sensors(data);
     return true;
   }
 }
 
 void Dsmr::dump_config() {
-  ESP_LOGCONFIG(TAG, "DSMR:");
-  ESP_LOGCONFIG(TAG, "  Max telegram length: %d", this->max_telegram_len_);
-  ESP_LOGCONFIG(TAG, "  Receive timeout: %.1fs", this->receive_timeout_ / 1e3f);
-  if (this->request_pin_ != nullptr) {
-    LOG_PIN("  Request Pin: ", this->request_pin_);
-  }
-  if (this->request_interval_ > 0) {
-    ESP_LOGCONFIG(TAG, "  Request Interval: %.1fs", this->request_interval_ / 1e3f);
-  }
+  ESP_LOGCONFIG(TAG, "dsmr:");
 
 #define DSMR_LOG_SENSOR(s) LOG_SENSOR("  ", #s, this->s_##s##_);
   DSMR_SENSOR_LIST(DSMR_LOG_SENSOR, )
@@ -293,31 +174,23 @@ void Dsmr::set_decryption_key(const std::string &decryption_key) {
   if (decryption_key.length() == 0) {
     ESP_LOGI(TAG, "Disabling decryption");
     this->decryption_key_.clear();
-    if (this->crypt_telegram_ != nullptr) {
-      delete[] this->crypt_telegram_;
-      this->crypt_telegram_ = nullptr;
-    }
     return;
   }
 
   if (decryption_key.length() != 32) {
-    ESP_LOGE(TAG, "Error, decryption key must be 32 character long");
+    ESP_LOGE(TAG, "Error, decryption key must be 32 character long.");
     return;
   }
   this->decryption_key_.clear();
 
-  ESP_LOGI(TAG, "Decryption key is set");
+  ESP_LOGI(TAG, "Decryption key is set.");
   // Verbose level prints decryption key
   ESP_LOGV(TAG, "Using decryption key: %s", decryption_key.c_str());
 
   char temp[3] = {0};
   for (int i = 0; i < 16; i++) {
     strncpy(temp, &(decryption_key.c_str()[i * 2]), 2);
-    this->decryption_key_.push_back(std::strtoul(temp, nullptr, 16));
-  }
-
-  if (this->crypt_telegram_ == nullptr) {
-    this->crypt_telegram_ = new uint8_t[this->max_telegram_len_];  // NOLINT
+    decryption_key_.push_back(std::strtoul(temp, nullptr, 16));
   }
 }
 

esphome/components/dsmr/dsmr.h

@@ -16,6 +16,10 @@
 namespace esphome {
 namespace dsmr {
 
+static constexpr uint32_t MAX_TELEGRAM_LENGTH = 1500;
+static constexpr uint32_t MAX_BYTES_PER_LOOP = 50;
+static constexpr uint32_t POLL_TIMEOUT = 1000;
+
 using namespace ::dsmr::fields;
 
 // DSMR_**_LIST generated by ESPHome and written in esphome/core/defines
@@ -49,7 +53,6 @@ class Dsmr : public Component, public uart::UARTDevice {
  public:
   Dsmr(uart::UARTComponent *uart, bool crc_check) : uart::UARTDevice(uart), crc_check_(crc_check) {}
 
-  void setup() override;
   void loop() override;
 
   bool parse_telegram();
@@ -69,10 +72,6 @@ class Dsmr : public Component, public uart::UARTDevice {
   void dump_config() override;
 
   void set_decryption_key(const std::string &decryption_key);
-  void set_max_telegram_length(size_t length) { this->max_telegram_len_ = length; }
-  void set_request_pin(GPIOPin *request_pin) { this->request_pin_ = request_pin; }
-  void set_request_interval(uint32_t interval) { this->request_interval_ = interval; }
-  void set_receive_timeout(uint32_t timeout) { this->receive_timeout_ = timeout; }
 
 // Sensor setters
 #define DSMR_SET_SENSOR(s) \
@@ -85,40 +84,13 @@ class Dsmr : public Component, public uart::UARTDevice {
 
  protected:
   void receive_telegram_();
-  void receive_encrypted_telegram_();
-  void reset_telegram_();
+  void receive_encrypted_();
 
-  /// Wait for UART data to become available within the read timeout.
-  ///
-  /// The smart meter might provide data in chunks, causing available() to
-  /// return 0. When we're already reading a telegram, then we don't return
-  /// right away (to handle further data in an upcoming loop) but wait a
-  /// little while using this method to see if more data are incoming.
-  /// By not returning, we prevent other components from taking so much
-  /// time that the UART RX buffer overflows and bytes of the telegram get
-  /// lost in the process.
-  bool available_within_timeout_();
+  // Telegram buffer
+  char telegram_[MAX_TELEGRAM_LENGTH];
+  int telegram_len_{0};
 
-  // Request telegram
-  uint32_t request_interval_;
-  bool request_interval_reached_();
-  GPIOPin *request_pin_{nullptr};
-  uint32_t last_request_time_{0};
-  bool requesting_data_{false};
-  bool ready_to_request_data_();
-  void start_requesting_data_();
-  void stop_requesting_data_();
-
-  // Read telegram
-  uint32_t receive_timeout_;
-  bool receive_timeout_reached_();
-  size_t max_telegram_len_;
-  char *telegram_{nullptr};
-  size_t bytes_read_{0};
-  uint8_t *crypt_telegram_{nullptr};
-  size_t crypt_telegram_len_{0};
-  size_t crypt_bytes_read_{0};
-  uint32_t last_read_time_{0};
+  // Serial parser
   bool header_found_{false};
   bool footer_found_{false};
 

esphome/components/dsmr/sensor.py

@@ -75,14 +75,14 @@ CONFIG_SCHEMA = cv.Schema(
             UNIT_KILOVOLT_AMPS_REACTIVE_HOURS,
             ICON_EMPTY,
             3,
-            DEVICE_CLASS_EMPTY,
+            DEVICE_CLASS_ENERGY,
             STATE_CLASS_NONE,
         ),
         cv.Optional("total_exported_energy"): sensor.sensor_schema(
             UNIT_KILOVOLT_AMPS_REACTIVE_HOURS,
             ICON_EMPTY,
             3,
-            DEVICE_CLASS_EMPTY,
+            DEVICE_CLASS_ENERGY,
             STATE_CLASS_NONE,
         ),
         cv.Optional("power_delivered"): sensor.sensor_schema(
@@ -166,42 +166,42 @@ CONFIG_SCHEMA = cv.Schema(
             UNIT_KILOVOLT_AMPS_REACTIVE,
             ICON_EMPTY,
             3,
-            DEVICE_CLASS_EMPTY,
+            DEVICE_CLASS_POWER,
             STATE_CLASS_MEASUREMENT,
         ),
         cv.Optional("reactive_power_delivered_l2"): sensor.sensor_schema(
             UNIT_KILOVOLT_AMPS_REACTIVE,
             ICON_EMPTY,
             3,
-            DEVICE_CLASS_EMPTY,
+            DEVICE_CLASS_POWER,
             STATE_CLASS_MEASUREMENT,
         ),
         cv.Optional("reactive_power_delivered_l3"): sensor.sensor_schema(
             UNIT_KILOVOLT_AMPS_REACTIVE,
             ICON_EMPTY,
             3,
-            DEVICE_CLASS_EMPTY,
+            DEVICE_CLASS_POWER,
             STATE_CLASS_MEASUREMENT,
         ),
         cv.Optional("reactive_power_returned_l1"): sensor.sensor_schema(
             UNIT_KILOVOLT_AMPS_REACTIVE,
             ICON_EMPTY,
             3,
-            DEVICE_CLASS_EMPTY,
+            DEVICE_CLASS_POWER,
             STATE_CLASS_MEASUREMENT,
         ),
         cv.Optional("reactive_power_returned_l2"): sensor.sensor_schema(
             UNIT_KILOVOLT_AMPS_REACTIVE,
             ICON_EMPTY,
             3,
-            DEVICE_CLASS_EMPTY,
+            DEVICE_CLASS_POWER,
             STATE_CLASS_MEASUREMENT,
         ),
         cv.Optional("reactive_power_returned_l3"): sensor.sensor_schema(
             UNIT_KILOVOLT_AMPS_REACTIVE,
             ICON_EMPTY,
             3,
-            DEVICE_CLASS_EMPTY,
+            DEVICE_CLASS_POWER,
             STATE_CLASS_MEASUREMENT,
         ),
         cv.Optional("voltage_l1"): sensor.sensor_schema(

esphome/components/duty_cycle/duty_cycle_sensor.cpp

@@ -12,6 +12,7 @@ void DutyCycleSensor::setup() {
   this->pin_->setup();
   this->store_.pin = this->pin_->to_isr();
   this->store_.last_level = this->pin_->digital_read();
+  this->last_update_ = micros();
   this->store_.last_interrupt = micros();
 
   this->pin_->attach_interrupt(DutyCycleSensorStore::gpio_intr, &this->store_, gpio::INTERRUPT_ANY_EDGE);
@@ -23,24 +24,21 @@ void DutyCycleSensor::dump_config() {
 }
 void DutyCycleSensor::update() {
   const uint32_t now = micros();
-  const uint32_t last_interrupt = this->store_.last_interrupt;  // Read the measurement taken by the interrupt
+  const bool level = this->store_.last_level;
+  const uint32_t last_interrupt = this->store_.last_interrupt;
   uint32_t on_time = this->store_.on_time;
 
-  this->store_.on_time = 0;  // Start new measurement, exactly aligned with the micros() reading
+  if (level)
+    on_time += now - last_interrupt;
+
+  const float total_time = float(now - this->last_update_);
+
+  const float value = (on_time / total_time) * 100.0f;
+  ESP_LOGD(TAG, "'%s' Got duty cycle=%.1f%%", this->get_name().c_str(), value);
+  this->publish_state(value);
+
+  this->store_.on_time = 0;
   this->store_.last_interrupt = now;
-
-  if (this->last_update_ != 0) {
-    const bool level = this->store_.last_level;
-
-    if (level)
-      on_time += now - last_interrupt;
-
-    const float total_time = float(now - this->last_update_);
-
-    const float value = (on_time * 100.0f) / total_time;
-    ESP_LOGD(TAG, "'%s' Got duty cycle=%.1f%%", this->get_name().c_str(), value);
-    this->publish_state(value);
-  }
   this->last_update_ = now;
 }
 

esphome/components/duty_cycle/duty_cycle_sensor.h

@@ -30,7 +30,7 @@ class DutyCycleSensor : public sensor::Sensor, public PollingComponent {
   InternalGPIOPin *pin_;
 
   DutyCycleSensorStore store_{};
-  uint32_t last_update_{0};
+  uint32_t last_update_;
 };
 
 }  // namespace duty_cycle

esphome/components/e131/e131.cpp

@@ -97,7 +97,7 @@ bool E131Component::process_(int universe, const E131Packet &packet) {
 
   ESP_LOGV(TAG, "Received E1.31 packet for %d universe, with %d bytes", universe, packet.count);
 
-  for (auto *light_effect : light_effects_) {
+  for (auto light_effect : light_effects_) {
     handled = light_effect->process_(universe, packet) || handled;
   }
 

esphome/components/e131/e131.h

@@ -33,9 +33,11 @@ class E131Component : public esphome::Component {
   void loop() override;
   float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
 
+ public:
   void add_effect(E131AddressableLightEffect *light_effect);
   void remove_effect(E131AddressableLightEffect *light_effect);
 
+ public:
   void set_method(E131ListenMethod listen_method) { this->listen_method_ = listen_method; }
 
  protected:
@@ -45,6 +47,7 @@ class E131Component : public esphome::Component {
   void join_(int universe);
   void leave_(int universe);
 
+ protected:
   E131ListenMethod listen_method_{E131_MULTICAST};
   std::unique_ptr<UDP> udp_;
   std::set<E131AddressableLightEffect *> light_effects_;

esphome/components/e131/e131_addressable_light_effect.cpp

@@ -47,7 +47,7 @@ void E131AddressableLightEffect::apply(light::AddressableLight &it, const Color
 }
 
 bool E131AddressableLightEffect::process_(int universe, const E131Packet &packet) {
-  auto *it = get_addressable_();
+  auto it = get_addressable_();
 
   // check if this is our universe and data are valid
   if (universe < first_universe_ || universe > get_last_universe())
@@ -57,7 +57,7 @@ bool E131AddressableLightEffect::process_(int universe, const E131Packet &packet
   // limit amount of lights per universe and received
   int output_end =
       std::min(it->size(), std::min(output_offset + get_lights_per_universe(), output_offset + packet.count - 1));
-  auto *input_data = packet.values + 1;
+  auto input_data = packet.values + 1;
 
   ESP_LOGV(TAG, "Applying data for '%s' on %d universe, for %d-%d.", get_name().c_str(), universe, output_offset,
            output_end);

esphome/components/e131/e131_addressable_light_effect.h

@@ -17,16 +17,19 @@ class E131AddressableLightEffect : public light::AddressableLightEffect {
  public:
   E131AddressableLightEffect(const std::string &name);
 
+ public:
   void start() override;
   void stop() override;
   void apply(light::AddressableLight &it, const Color &current_color) override;
 
+ public:
   int get_data_per_universe() const;
   int get_lights_per_universe() const;
   int get_first_universe() const;
   int get_last_universe() const;
   int get_universe_count() const;
 
+ public:
   void set_first_universe(int universe) { this->first_universe_ = universe; }
   void set_channels(E131LightChannels channels) { this->channels_ = channels; }
   void set_e131(E131Component *e131) { this->e131_ = e131; }
@@ -34,6 +37,7 @@ class E131AddressableLightEffect : public light::AddressableLightEffect {
  protected:
   bool process_(int universe, const E131Packet &packet);
 
+ protected:
   int first_universe_{0};
   int last_universe_{0};
   E131LightChannels channels_{E131_RGB};

esphome/components/e131/e131_packet.cpp

@@ -116,7 +116,7 @@ bool E131Component::packet_(const std::vector<uint8_t> &data, int &universe, E13
   if (data.size() < E131_MIN_PACKET_SIZE)
     return false;
 
-  auto *sbuff = reinterpret_cast<const E131RawPacket *>(&data[0]);
+  auto sbuff = reinterpret_cast<const E131RawPacket *>(&data[0]);
 
   if (memcmp(sbuff->acn_id, ACN_ID, sizeof(sbuff->acn_id)) != 0)
     return false;

esphome/components/ektf2232/ektf2232.cpp

@@ -1,166 +0,0 @@
-#include "ektf2232.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace ektf2232 {
-
-static const char *const TAG = "ektf2232";
-
-static const uint8_t SOFT_RESET_CMD[4] = {0x77, 0x77, 0x77, 0x77};
-static const uint8_t HELLO[4] = {0x55, 0x55, 0x55, 0x55};
-static const uint8_t GET_X_RES[4] = {0x53, 0x60, 0x00, 0x00};
-static const uint8_t GET_Y_RES[4] = {0x53, 0x63, 0x00, 0x00};
-static const uint8_t GET_POWER_STATE_CMD[4] = {0x53, 0x50, 0x00, 0x01};
-
-void EKTF2232TouchscreenStore::gpio_intr(EKTF2232TouchscreenStore *store) { store->touch = true; }
-
-void EKTF2232Touchscreen::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up EKT2232 Touchscreen...");
-  this->interrupt_pin_->pin_mode(gpio::FLAG_INPUT | gpio::FLAG_PULLUP);
-  this->interrupt_pin_->setup();
-
-  this->store_.pin = this->interrupt_pin_->to_isr();
-  this->interrupt_pin_->attach_interrupt(EKTF2232TouchscreenStore::gpio_intr, &this->store_,
-                                         gpio::INTERRUPT_FALLING_EDGE);
-
-  this->rts_pin_->setup();
-
-  this->hard_reset_();
-  if (!this->soft_reset_()) {
-    ESP_LOGE(TAG, "Failed to soft reset EKT2232!");
-    this->interrupt_pin_->detach_interrupt();
-    this->mark_failed();
-    return;
-  }
-
-  // Get touch resolution
-  uint8_t received[4];
-  this->write(GET_X_RES, 4);
-  if (this->read(received, 4)) {
-    ESP_LOGE(TAG, "Failed to read X resolution!");
-    this->interrupt_pin_->detach_interrupt();
-    this->mark_failed();
-    return;
-  }
-  this->x_resolution_ = ((received[2])) | ((received[3] & 0xf0) << 4);
-
-  this->write(GET_Y_RES, 4);
-  if (this->read(received, 4)) {
-    ESP_LOGE(TAG, "Failed to read Y resolution!");
-    this->interrupt_pin_->detach_interrupt();
-    this->mark_failed();
-    return;
-  }
-  this->y_resolution_ = ((received[2])) | ((received[3] & 0xf0) << 4);
-  this->store_.touch = false;
-
-  this->set_power_state(true);
-}
-
-void EKTF2232Touchscreen::loop() {
-  if (!this->store_.touch)
-    return;
-  this->store_.touch = false;
-
-  uint8_t touch_count = 0;
-  std::vector<TouchPoint> touches;
-
-  uint8_t raw[8];
-  this->read(raw, 8);
-  for (int i = 0; i < 8; i++) {
-    if (raw[7] & (1 << i))
-      touch_count++;
-  }
-
-  if (touch_count == 0) {
-    for (auto *listener : this->touch_listeners_)
-      listener->release();
-    return;
-  }
-
-  touch_count = std::min<uint8_t>(touch_count, 2);
-
-  ESP_LOGV(TAG, "Touch count: %d", touch_count);
-
-  for (int i = 0; i < touch_count; i++) {
-    uint8_t *d = raw + 1 + (i * 3);
-    uint32_t raw_x = (d[0] & 0xF0) << 4 | d[1];
-    uint32_t raw_y = (d[0] & 0x0F) << 8 | d[2];
-
-    raw_x = raw_x * this->display_height_ - 1;
-    raw_y = raw_y * this->display_width_ - 1;
-
-    TouchPoint tp;
-    switch (this->rotation_) {
-      case ROTATE_0_DEGREES:
-        tp.y = raw_x / this->x_resolution_;
-        tp.x = this->display_width_ - 1 - (raw_y / this->y_resolution_);
-        break;
-      case ROTATE_90_DEGREES:
-        tp.x = raw_x / this->x_resolution_;
-        tp.y = raw_y / this->y_resolution_;
-        break;
-      case ROTATE_180_DEGREES:
-        tp.y = this->display_height_ - 1 - (raw_x / this->x_resolution_);
-        tp.x = raw_y / this->y_resolution_;
-        break;
-      case ROTATE_270_DEGREES:
-        tp.x = this->display_height_ - 1 - (raw_x / this->x_resolution_);
-        tp.y = this->display_width_ - 1 - (raw_y / this->y_resolution_);
-        break;
-    }
-
-    this->defer([this, tp]() { this->send_touch_(tp); });
-  }
-}
-
-void EKTF2232Touchscreen::set_power_state(bool enable) {
-  uint8_t data[] = {0x54, 0x50, 0x00, 0x01};
-  data[1] |= (enable << 3);
-  this->write(data, 4);
-}
-
-bool EKTF2232Touchscreen::get_power_state() {
-  uint8_t received[4];
-  this->write(GET_POWER_STATE_CMD, 4);
-  this->store_.touch = false;
-  this->read(received, 4);
-  return (received[1] >> 3) & 1;
-}
-
-void EKTF2232Touchscreen::hard_reset_() {
-  this->rts_pin_->digital_write(false);
-  delay(15);
-  this->rts_pin_->digital_write(true);
-  delay(15);
-}
-
-bool EKTF2232Touchscreen::soft_reset_() {
-  auto err = this->write(SOFT_RESET_CMD, 4);
-  if (err != i2c::ERROR_OK)
-    return false;
-
-  uint8_t received[4];
-  uint16_t timeout = 1000;
-  while (!this->store_.touch && timeout > 0) {
-    delay(1);
-    timeout--;
-  }
-  if (timeout > 0)
-    this->store_.touch = true;
-  this->read(received, 4);
-  this->store_.touch = false;
-
-  return !memcmp(received, HELLO, 4);
-}
-
-void EKTF2232Touchscreen::dump_config() {
-  ESP_LOGCONFIG(TAG, "EKT2232 Touchscreen:");
-  LOG_I2C_DEVICE(this);
-  LOG_PIN("  Interrupt Pin: ", this->interrupt_pin_);
-  LOG_PIN("  RTS Pin: ", this->rts_pin_);
-}
-
-}  // namespace ektf2232
-}  // namespace esphome

esphome/components/ektf2232/ektf2232.h

@@ -1,45 +0,0 @@
-#pragma once
-
-#include "esphome/components/i2c/i2c.h"
-#include "esphome/components/touchscreen/touchscreen.h"
-#include "esphome/core/automation.h"
-#include "esphome/core/component.h"
-#include "esphome/core/hal.h"
-
-namespace esphome {
-namespace ektf2232 {
-
-struct EKTF2232TouchscreenStore {
-  volatile bool touch;
-  ISRInternalGPIOPin pin;
-
-  static void gpio_intr(EKTF2232TouchscreenStore *store);
-};
-
-using namespace touchscreen;
-
-class EKTF2232Touchscreen : public Touchscreen, public Component, public i2c::I2CDevice {
- public:
-  void setup() override;
-  void loop() override;
-  void dump_config() override;
-
-  void set_interrupt_pin(InternalGPIOPin *pin) { this->interrupt_pin_ = pin; }
-  void set_rts_pin(GPIOPin *pin) { this->rts_pin_ = pin; }
-
-  void set_power_state(bool enable);
-  bool get_power_state();
-
- protected:
-  void hard_reset_();
-  bool soft_reset_();
-
-  InternalGPIOPin *interrupt_pin_;
-  GPIOPin *rts_pin_;
-  EKTF2232TouchscreenStore store_;
-  uint16_t x_resolution_;
-  uint16_t y_resolution_;
-};
-
-}  // namespace ektf2232
-}  // namespace esphome

esphome/components/ektf2232/touchscreen.py

@@ -1,48 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-
-from esphome import pins
-from esphome.components import i2c, touchscreen
-from esphome.const import CONF_ID
-
-CODEOWNERS = ["@jesserockz"]
-DEPENDENCIES = ["i2c"]
-
-ektf2232_ns = cg.esphome_ns.namespace("ektf2232")
-EKTF2232Touchscreen = ektf2232_ns.class_(
-    "EKTF2232Touchscreen",
-    touchscreen.Touchscreen,
-    cg.Component,
-    i2c.I2CDevice,
-)
-
-CONF_EKTF2232_ID = "ektf2232_id"
-CONF_INTERRUPT_PIN = "interrupt_pin"
-CONF_RTS_PIN = "rts_pin"
-
-
-CONFIG_SCHEMA = touchscreen.TOUCHSCREEN_SCHEMA.extend(
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(EKTF2232Touchscreen),
-            cv.Required(CONF_INTERRUPT_PIN): cv.All(
-                pins.internal_gpio_input_pin_schema
-            ),
-            cv.Required(CONF_RTS_PIN): pins.gpio_output_pin_schema,
-        }
-    )
-    .extend(i2c.i2c_device_schema(0x15))
-    .extend(cv.COMPONENT_SCHEMA)
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await i2c.register_i2c_device(var, config)
-    await touchscreen.register_touchscreen(var, config)
-
-    interrupt_pin = await cg.gpio_pin_expression(config[CONF_INTERRUPT_PIN])
-    cg.add(var.set_interrupt_pin(interrupt_pin))
-    rts_pin = await cg.gpio_pin_expression(config[CONF_RTS_PIN])
-    cg.add(var.set_rts_pin(rts_pin))

esphome/components/esp32/__init__.py

@@ -2,9 +2,8 @@ from dataclasses import dataclass
 from typing import Union
 from pathlib import Path
 import logging
-import os
 
-from esphome.helpers import copy_file_if_changed, write_file_if_changed
+from esphome.helpers import write_file_if_changed
 from esphome.const import (
     CONF_BOARD,
     CONF_FRAMEWORK,
@@ -18,7 +17,6 @@ from esphome.const import (
     KEY_FRAMEWORK_VERSION,
     KEY_TARGET_FRAMEWORK,
     KEY_TARGET_PLATFORM,
-    __version__,
 )
 from esphome.core import CORE, HexInt
 import esphome.config_validation as cv
@@ -30,7 +28,6 @@ from .const import (  # noqa
     KEY_SDKCONFIG_OPTIONS,
     KEY_VARIANT,
     VARIANT_ESP32C3,
-    VARIANT_FRIENDLY,
     VARIANTS,
 )
 from .boards import BOARD_TO_VARIANT
@@ -107,6 +104,7 @@ def _format_framework_espidf_version(ver: cv.Version) -> str:
 #    The new version needs to be thoroughly validated before changing the
 #    recommended version as otherwise a bunch of devices could be bricked
 #  * For all constants below, update platformio.ini (in this repo)
+#    and platformio.ini/platformio-lint.ini in the esphome-docker-base repository
 
 # The default/recommended arduino framework version
 #  - https://github.com/espressif/arduino-esp32/releases
@@ -115,16 +113,16 @@ RECOMMENDED_ARDUINO_FRAMEWORK_VERSION = cv.Version(1, 0, 6)
 # The platformio/espressif32 version to use for arduino frameworks
 #  - https://github.com/platformio/platform-espressif32/releases
 #  - https://api.registry.platformio.org/v3/packages/platformio/platform/espressif32
-ARDUINO_PLATFORM_VERSION = cv.Version(3, 5, 0)
+ARDUINO_PLATFORM_VERSION = cv.Version(3, 3, 2)
 
 # The default/recommended esp-idf framework version
 #  - https://github.com/espressif/esp-idf/releases
 #  - https://api.registry.platformio.org/v3/packages/platformio/tool/framework-espidf
-RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION = cv.Version(4, 3, 2)
+RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION = cv.Version(4, 3, 0)
 # The platformio/espressif32 version to use for esp-idf frameworks
 #  - https://github.com/platformio/platform-espressif32/releases
 #  - https://api.registry.platformio.org/v3/packages/platformio/platform/espressif32
-ESP_IDF_PLATFORM_VERSION = cv.Version(3, 5, 0)
+ESP_IDF_PLATFORM_VERSION = cv.Version(3, 3, 2)
 
 
 def _arduino_check_versions(value):
@@ -149,9 +147,8 @@ def _arduino_check_versions(value):
     value[CONF_VERSION] = str(version)
     value[CONF_SOURCE] = source or _format_framework_arduino_version(version)
 
-    value[CONF_PLATFORM_VERSION] = value.get(
-        CONF_PLATFORM_VERSION, _parse_platform_version(str(ARDUINO_PLATFORM_VERSION))
-    )
+    platform_version = value.get(CONF_PLATFORM_VERSION, ARDUINO_PLATFORM_VERSION)
+    value[CONF_PLATFORM_VERSION] = str(platform_version)
 
     if version != RECOMMENDED_ARDUINO_FRAMEWORK_VERSION:
         _LOGGER.warning(
@@ -165,8 +162,8 @@ def _arduino_check_versions(value):
 def _esp_idf_check_versions(value):
     value = value.copy()
     lookups = {
-        "dev": (cv.Version(5, 0, 0), "https://github.com/espressif/esp-idf.git"),
-        "latest": (cv.Version(4, 3, 2), None),
+        "dev": (cv.Version(4, 3, 1), "https://github.com/espressif/esp-idf.git"),
+        "latest": (cv.Version(4, 3, 0), None),
         "recommended": (RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION, None),
     }
 
@@ -187,9 +184,8 @@ def _esp_idf_check_versions(value):
     value[CONF_VERSION] = str(version)
     value[CONF_SOURCE] = source or _format_framework_espidf_version(version)
 
-    value[CONF_PLATFORM_VERSION] = value.get(
-        CONF_PLATFORM_VERSION, _parse_platform_version(str(ESP_IDF_PLATFORM_VERSION))
-    )
+    platform_version = value.get(CONF_PLATFORM_VERSION, ESP_IDF_PLATFORM_VERSION)
+    value[CONF_PLATFORM_VERSION] = str(platform_version)
 
     if version != RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION:
         _LOGGER.warning(
@@ -200,15 +196,6 @@ def _esp_idf_check_versions(value):
     return value
 
 
-def _parse_platform_version(value):
-    try:
-        # if platform version is a valid version constraint, prefix the default package
-        cv.platformio_version_constraint(value)
-        return f"platformio/espressif32 @ {value}"
-    except cv.Invalid:
-        return value
-
-
 def _detect_variant(value):
     if CONF_VARIANT not in value:
         board = value[CONF_BOARD]
@@ -231,7 +218,7 @@ ARDUINO_FRAMEWORK_SCHEMA = cv.All(
         {
             cv.Optional(CONF_VERSION, default="recommended"): cv.string_strict,
             cv.Optional(CONF_SOURCE): cv.string_strict,
-            cv.Optional(CONF_PLATFORM_VERSION): _parse_platform_version,
+            cv.Optional(CONF_PLATFORM_VERSION): cv.string_strict,
         }
     ),
     _arduino_check_versions,
@@ -243,7 +230,7 @@ ESP_IDF_FRAMEWORK_SCHEMA = cv.All(
         {
             cv.Optional(CONF_VERSION, default="recommended"): cv.string_strict,
             cv.Optional(CONF_SOURCE): cv.string_strict,
-            cv.Optional(CONF_PLATFORM_VERSION): _parse_platform_version,
+            cv.Optional(CONF_PLATFORM_VERSION): cv.string_strict,
             cv.Optional(CONF_SDKCONFIG_OPTIONS, default={}): {
                 cv.string_strict: cv.string_strict
             },
@@ -289,18 +276,14 @@ async def to_code(config):
     cg.add_build_flag("-DUSE_ESP32")
     cg.add_define("ESPHOME_BOARD", config[CONF_BOARD])
     cg.add_build_flag(f"-DUSE_ESP32_VARIANT_{config[CONF_VARIANT]}")
-    cg.add_define("ESPHOME_VARIANT", VARIANT_FRIENDLY[config[CONF_VARIANT]])
 
     cg.add_platformio_option("lib_ldf_mode", "off")
 
-    framework_ver: cv.Version = CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
-
     conf = config[CONF_FRAMEWORK]
-    cg.add_platformio_option("platform", conf[CONF_PLATFORM_VERSION])
-
-    cg.add_platformio_option("extra_scripts", ["post:post_build.py"])
-
     if conf[CONF_TYPE] == FRAMEWORK_ESP_IDF:
+        cg.add_platformio_option(
+            "platform", f"espressif32 @ {conf[CONF_PLATFORM_VERSION]}"
+        )
         cg.add_platformio_option("framework", "espidf")
         cg.add_build_flag("-DUSE_ESP_IDF")
         cg.add_build_flag("-DUSE_ESP32_FRAMEWORK_ESP_IDF")
@@ -317,15 +300,6 @@ async def to_code(config):
         add_idf_sdkconfig_option("CONFIG_COMPILER_OPTIMIZATION_DEFAULT", False)
         add_idf_sdkconfig_option("CONFIG_COMPILER_OPTIMIZATION_SIZE", True)
 
-        # Increase freertos tick speed from 100Hz to 1kHz so that delay() resolution is 1ms
-        add_idf_sdkconfig_option("CONFIG_FREERTOS_HZ", 1000)
-
-        # Setup watchdog
-        add_idf_sdkconfig_option("CONFIG_ESP_TASK_WDT", True)
-        add_idf_sdkconfig_option("CONFIG_ESP_TASK_WDT_PANIC", True)
-        add_idf_sdkconfig_option("CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0", False)
-        add_idf_sdkconfig_option("CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1", False)
-
         cg.add_platformio_option("board_build.partitions", "partitions.csv")
 
         for name, value in conf[CONF_SDKCONFIG_OPTIONS].items():
@@ -337,14 +311,10 @@ async def to_code(config):
                 "CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE", False
             )
 
-        cg.add_define(
-            "USE_ESP_IDF_VERSION_CODE",
-            cg.RawExpression(
-                f"VERSION_CODE({framework_ver.major}, {framework_ver.minor}, {framework_ver.patch})"
-            ),
-        )
-
     elif conf[CONF_TYPE] == FRAMEWORK_ARDUINO:
+        cg.add_platformio_option(
+            "platform", f"espressif32 @ {conf[CONF_PLATFORM_VERSION]}"
+        )
         cg.add_platformio_option("framework", "arduino")
         cg.add_build_flag("-DUSE_ARDUINO")
         cg.add_build_flag("-DUSE_ESP32_FRAMEWORK_ARDUINO")
@@ -355,13 +325,6 @@ async def to_code(config):
 
         cg.add_platformio_option("board_build.partitions", "partitions.csv")
 
-        cg.add_define(
-            "USE_ARDUINO_VERSION_CODE",
-            cg.RawExpression(
-                f"VERSION_CODE({framework_ver.major}, {framework_ver.minor}, {framework_ver.patch})"
-            ),
-        )
-
 
 ARDUINO_PARTITIONS_CSV = """\
 nvs,      data, nvs,     0x009000, 0x005000,
@@ -431,18 +394,3 @@ def copy_files():
             CORE.relative_build_path("partitions.csv"),
             IDF_PARTITIONS_CSV,
         )
-        # IDF build scripts look for version string to put in the build.
-        # However, if the build path does not have an initialized git repo,
-        # and no version.txt file exists, the CMake script fails for some setups.
-        # Fix by manually pasting a version.txt file, containing the ESPHome version
-        write_file_if_changed(
-            CORE.relative_build_path("version.txt"),
-            __version__,
-        )
-
-    dir = os.path.dirname(__file__)
-    post_build_file = os.path.join(dir, "post_build.py.script")
-    copy_file_if_changed(
-        post_build_file,
-        CORE.relative_build_path("post_build.py"),
-    )

esphome/components/esp32/boards.py

@@ -261,37 +261,6 @@ ESP32_BOARD_PINS = {
         "SS": 33,
         "TX": 17,
     },
-    "featheresp32-s2": {
-        "SDA": 3,
-        "SCL": 4,
-        "SS": 42,
-        "MOSI": 35,
-        "SCK": 36,
-        "MISO": 37,
-        "A0": 18,
-        "A1": 17,
-        "A10": 27,
-        "A11": 12,
-        "A12": 13,
-        "A13": 35,
-        "A2": 16,
-        "A3": 15,
-        "A4": 14,
-        "A5": 8,
-        "LED": 13,
-        "TX": 39,
-        "RX": 38,
-        "T5": 5,
-        "T8": 8,
-        "T9": 9,
-        "T10": 10,
-        "T11": 11,
-        "T12": 12,
-        "T13": 13,
-        "T14": 14,
-        "DAC1": 17,
-        "DAC2": 18,
-    },
     "firebeetle32": {"LED": 2},
     "fm-devkit": {
         "D0": 34,

esphome/components/esp32/const.py

@@ -18,12 +18,4 @@ VARIANTS = [
     VARIANT_ESP32H2,
 ]
 
-VARIANT_FRIENDLY = {
-    VARIANT_ESP32: "ESP32",
-    VARIANT_ESP32S2: "ESP32-S2",
-    VARIANT_ESP32S3: "ESP32-S3",
-    VARIANT_ESP32C3: "ESP32-C3",
-    VARIANT_ESP32H2: "ESP32-H2",
-}
-
 esp32_ns = cg.esphome_ns.namespace("esp32")

esphome/components/esp32/core.cpp

@@ -6,17 +6,12 @@
 #include <freertos/FreeRTOS.h>
 #include <freertos/task.h>
 #include <esp_idf_version.h>
-#include <esp_task_wdt.h>
 #include <soc/rtc.h>
 
 #if ESP_IDF_VERSION_MAJOR >= 4
 #include <hal/cpu_hal.h>
 #endif
 
-#ifdef USE_ARDUINO
-#include <esp32-hal.h>
-#endif
-
 void setup();
 void loop();
 
@@ -26,7 +21,11 @@ void IRAM_ATTR HOT yield() { vPortYield(); }
 uint32_t IRAM_ATTR HOT millis() { return (uint32_t)(esp_timer_get_time() / 1000ULL); }
 void IRAM_ATTR HOT delay(uint32_t ms) { vTaskDelay(ms / portTICK_PERIOD_MS); }
 uint32_t IRAM_ATTR HOT micros() { return (uint32_t) esp_timer_get_time(); }
-void IRAM_ATTR HOT delayMicroseconds(uint32_t us) { delay_microseconds_safe(us); }
+void IRAM_ATTR HOT delayMicroseconds(uint32_t us) {
+  auto start = (uint64_t) esp_timer_get_time();
+  while (((uint64_t) esp_timer_get_time()) - start < us)
+    ;
+}
 void arch_restart() {
   esp_restart();
   // restart() doesn't always end execution
@@ -34,24 +33,24 @@ void arch_restart() {
     yield();
   }
 }
+void IRAM_ATTR HOT arch_feed_wdt() {
+#ifdef USE_ARDUINO
+#if CONFIG_ARDUINO_RUNNING_CORE == 0
+#ifdef CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0
+  // ESP32 uses "Task Watchdog" which is hooked to the FreeRTOS idle task.
+  // To cause the Watchdog to be triggered we need to put the current task
+  // to sleep to get the idle task scheduled.
+  delay(1);
+#endif
+#endif
+#endif  // USE_ARDUINO
 
-void arch_init() {
-  // Enable the task watchdog only on the loop task (from which we're currently running)
-#if defined(USE_ESP_IDF)
-  esp_task_wdt_add(nullptr);
-  // Idle task watchdog is disabled on ESP-IDF
-#elif defined(USE_ARDUINO)
-  enableLoopWDT();
-  // Disable idle task watchdog on the core we're using (Arduino pins the task to a core)
-#if defined(CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0) && CONFIG_ARDUINO_RUNNING_CORE == 0
-  disableCore0WDT();
-#endif
-#if defined(CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1) && CONFIG_ARDUINO_RUNNING_CORE == 1
-  disableCore1WDT();
-#endif
+#ifdef USE_ESP_IDF
+#ifdef CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0
+  delay(1);
 #endif
+#endif  // USE_ESP_IDF
 }
-void IRAM_ATTR HOT arch_feed_wdt() { esp_task_wdt_reset(); }
 
 uint8_t progmem_read_byte(const uint8_t *addr) { return *addr; }
 uint32_t arch_get_cpu_cycle_count() {

esphome/components/esp32/gpio.py

@@ -1,5 +1,4 @@
-from dataclasses import dataclass
-from typing import Any
+import logging
 
 from esphome.const import (
     CONF_ID,
@@ -18,24 +17,10 @@ import esphome.config_validation as cv
 import esphome.codegen as cg
 
 from . import boards
-from .const import (
-    KEY_BOARD,
-    KEY_ESP32,
-    KEY_VARIANT,
-    VARIANT_ESP32,
-    VARIANT_ESP32C3,
-    VARIANT_ESP32S2,
-    VARIANT_ESP32S3,
-    VARIANT_ESP32H2,
-    esp32_ns,
-)
+from .const import KEY_BOARD, KEY_ESP32, esp32_ns
 
 
-from .gpio_esp32 import esp32_validate_gpio_pin, esp32_validate_supports
-from .gpio_esp32_s2 import esp32_s2_validate_gpio_pin, esp32_s2_validate_supports
-from .gpio_esp32_c3 import esp32_c3_validate_gpio_pin, esp32_c3_validate_supports
-from .gpio_esp32_s3 import esp32_s3_validate_gpio_pin, esp32_s3_validate_supports
-from .gpio_esp32_h2 import esp32_h2_validate_gpio_pin, esp32_h2_validate_supports
+_LOGGER = logging.getLogger(__name__)
 
 
 IDFInternalGPIOPin = esp32_ns.class_("IDFInternalGPIOPin", cg.InternalGPIOPin)
@@ -74,61 +59,65 @@ def _translate_pin(value):
     return _lookup_pin(value)
 
 
-@dataclass
-class ESP32ValidationFunctions:
-    pin_validation: Any
-    usage_validation: Any
-
-
-_esp32_validations = {
-    VARIANT_ESP32: ESP32ValidationFunctions(
-        pin_validation=esp32_validate_gpio_pin, usage_validation=esp32_validate_supports
-    ),
-    VARIANT_ESP32S2: ESP32ValidationFunctions(
-        pin_validation=esp32_s2_validate_gpio_pin,
-        usage_validation=esp32_s2_validate_supports,
-    ),
-    VARIANT_ESP32C3: ESP32ValidationFunctions(
-        pin_validation=esp32_c3_validate_gpio_pin,
-        usage_validation=esp32_c3_validate_supports,
-    ),
-    VARIANT_ESP32S3: ESP32ValidationFunctions(
-        pin_validation=esp32_s3_validate_gpio_pin,
-        usage_validation=esp32_s3_validate_supports,
-    ),
-    VARIANT_ESP32H2: ESP32ValidationFunctions(
-        pin_validation=esp32_h2_validate_gpio_pin,
-        usage_validation=esp32_h2_validate_supports,
-    ),
+_ESP_SDIO_PINS = {
+    6: "Flash Clock",
+    7: "Flash Data 0",
+    8: "Flash Data 1",
+    11: "Flash Command",
 }
 
 
 def validate_gpio_pin(value):
     value = _translate_pin(value)
-    variant = CORE.data[KEY_ESP32][KEY_VARIANT]
-    if variant not in _esp32_validations:
-        raise cv.Invalid("Unsupported ESP32 variant {variant}")
-
-    return _esp32_validations[variant].pin_validation(value)
+    if value < 0 or value > 39:
+        raise cv.Invalid(f"Invalid pin number: {value} (must be 0-39)")
+    if value in _ESP_SDIO_PINS:
+        raise cv.Invalid(
+            f"This pin cannot be used on ESP32s and is already used by the flash interface (function: {_ESP_SDIO_PINS[value]})"
+        )
+    if 9 <= value <= 10:
+        _LOGGER.warning(
+            "Pin %s (9-10) might already be used by the "
+            "flash interface in QUAD IO flash mode.",
+            value,
+        )
+    if value in (20, 24, 28, 29, 30, 31):
+        # These pins are not exposed in GPIO mux (reason unknown)
+        # but they're missing from IO_MUX list in datasheet
+        raise cv.Invalid(f"The pin GPIO{value} is not usable on ESP32s.")
+    return value
 
 
 def validate_supports(value):
+    num = value[CONF_NUMBER]
     mode = value[CONF_MODE]
     is_input = mode[CONF_INPUT]
     is_output = mode[CONF_OUTPUT]
     is_open_drain = mode[CONF_OPEN_DRAIN]
     is_pullup = mode[CONF_PULLUP]
     is_pulldown = mode[CONF_PULLDOWN]
-    variant = CORE.data[KEY_ESP32][KEY_VARIANT]
-    if variant not in _esp32_validations:
-        raise cv.Invalid("Unsupported ESP32 variant {variant}")
 
+    if is_input:
+        # All ESP32 pins support input mode
+        pass
+    if is_output and 34 <= num <= 39:
+        raise cv.Invalid(
+            f"GPIO{num} (34-39) does not support output pin mode.",
+            [CONF_MODE, CONF_OUTPUT],
+        )
     if is_open_drain and not is_output:
         raise cv.Invalid(
             "Open-drain only works with output mode", [CONF_MODE, CONF_OPEN_DRAIN]
         )
+    if is_pullup and 34 <= num <= 39:
+        raise cv.Invalid(
+            f"GPIO{num} (34-39) does not support pullups.", [CONF_MODE, CONF_PULLUP]
+        )
+    if is_pulldown and 34 <= num <= 39:
+        raise cv.Invalid(
+            f"GPIO{num} (34-39) does not support pulldowns.", [CONF_MODE, CONF_PULLDOWN]
+        )
 
-    value = _esp32_validations[variant].usage_validation(value)
     if CORE.using_arduino:
         # (input, output, open_drain, pullup, pulldown)
         supported_modes = {
@@ -149,6 +138,7 @@ def validate_supports(value):
                 "This pin mode is not supported on ESP32 for arduino frameworks",
                 [CONF_MODE],
             )
+
     return value
 
 

esphome/components/esp32/gpio_arduino.cpp

@@ -9,22 +9,6 @@ namespace esp32 {
 
 static const char *const TAG = "esp32";
 
-static int IRAM_ATTR flags_to_mode(gpio::Flags flags) {
-  if (flags == gpio::FLAG_INPUT) {
-    return INPUT;
-  } else if (flags == gpio::FLAG_OUTPUT) {
-    return OUTPUT;
-  } else if (flags == (gpio::FLAG_INPUT | gpio::FLAG_PULLUP)) {
-    return INPUT_PULLUP;
-  } else if (flags == (gpio::FLAG_INPUT | gpio::FLAG_PULLDOWN)) {
-    return INPUT_PULLDOWN;
-  } else if (flags == (gpio::FLAG_OUTPUT | gpio::FLAG_OPEN_DRAIN)) {
-    return OUTPUT_OPEN_DRAIN;
-  } else {
-    return 0;
-  }
-}
-
 struct ISRPinArg {
   uint8_t pin;
   bool inverted;
@@ -59,9 +43,22 @@ void ArduinoInternalGPIOPin::attach_interrupt(void (*func)(void *), void *arg, g
 
   attachInterruptArg(pin_, func, arg, arduino_mode);
 }
-
 void ArduinoInternalGPIOPin::pin_mode(gpio::Flags flags) {
-  pinMode(pin_, flags_to_mode(flags));  // NOLINT
+  uint8_t mode;
+  if (flags == gpio::FLAG_INPUT) {
+    mode = INPUT;
+  } else if (flags == gpio::FLAG_OUTPUT) {
+    mode = OUTPUT;
+  } else if (flags == (gpio::FLAG_INPUT | gpio::FLAG_PULLUP)) {
+    mode = INPUT_PULLUP;
+  } else if (flags == (gpio::FLAG_INPUT | gpio::FLAG_PULLDOWN)) {
+    mode = INPUT_PULLDOWN;
+  } else if (flags == (gpio::FLAG_OUTPUT | gpio::FLAG_OPEN_DRAIN)) {
+    mode = OUTPUT_OPEN_DRAIN;
+  } else {
+    return;
+  }
+  pinMode(pin_, mode);  // NOLINT
 }
 
 std::string ArduinoInternalGPIOPin::dump_summary() const {
@@ -104,10 +101,6 @@ void IRAM_ATTR ISRInternalGPIOPin::clear_interrupt() {
   }
 #endif
 }
-void IRAM_ATTR ISRInternalGPIOPin::pin_mode(gpio::Flags flags) {
-  auto *arg = reinterpret_cast<ISRPinArg *>(arg_);
-  pinMode(arg->pin, flags_to_mode(flags));  // NOLINT
-}
 
 }  // namespace esphome
 

esphome/components/esp32/gpio_esp32.py

@@ -1,77 +0,0 @@
-import logging
-
-from esphome.const import (
-    CONF_INPUT,
-    CONF_MODE,
-    CONF_NUMBER,
-    CONF_OUTPUT,
-    CONF_PULLDOWN,
-    CONF_PULLUP,
-)
-import esphome.config_validation as cv
-
-
-_ESP_SDIO_PINS = {
-    6: "Flash Clock",
-    7: "Flash Data 0",
-    8: "Flash Data 1",
-    11: "Flash Command",
-}
-
-_ESP32_STRAPPING_PINS = {0, 2, 4, 12, 15}
-_LOGGER = logging.getLogger(__name__)
-
-
-def esp32_validate_gpio_pin(value):
-    if value < 0 or value > 39:
-        raise cv.Invalid(f"Invalid pin number: {value} (must be 0-39)")
-    if value in _ESP_SDIO_PINS:
-        raise cv.Invalid(
-            f"This pin cannot be used on ESP32s and is already used by the flash interface (function: {_ESP_SDIO_PINS[value]})"
-        )
-    if 9 <= value <= 10:
-        _LOGGER.warning(
-            "Pin %s (9-10) might already be used by the "
-            "flash interface in QUAD IO flash mode.",
-            value,
-        )
-    if value in _ESP32_STRAPPING_PINS:
-        _LOGGER.warning(
-            "GPIO%d is a Strapping PIN and should be avoided.\n"
-            "Attaching external pullup/down resistors to strapping pins can cause unexpected failures.\n"
-            "See https://esphome.io/guides/faq.html#why-am-i-getting-a-warning-about-strapping-pins",
-            value,
-        )
-    if value in (20, 24, 28, 29, 30, 31):
-        # These pins are not exposed in GPIO mux (reason unknown)
-        # but they're missing from IO_MUX list in datasheet
-        raise cv.Invalid(f"The pin GPIO{value} is not usable on ESP32s.")
-    return value
-
-
-def esp32_validate_supports(value):
-    num = value[CONF_NUMBER]
-    mode = value[CONF_MODE]
-    is_input = mode[CONF_INPUT]
-    is_output = mode[CONF_OUTPUT]
-    is_pullup = mode[CONF_PULLUP]
-    is_pulldown = mode[CONF_PULLDOWN]
-
-    if is_input:
-        # All ESP32 pins support input mode
-        pass
-    if is_output and 34 <= num <= 39:
-        raise cv.Invalid(
-            f"GPIO{num} (34-39) does not support output pin mode.",
-            [CONF_MODE, CONF_OUTPUT],
-        )
-    if is_pullup and 34 <= num <= 39:
-        raise cv.Invalid(
-            f"GPIO{num} (34-39) does not support pullups.", [CONF_MODE, CONF_PULLUP]
-        )
-    if is_pulldown and 34 <= num <= 39:
-        raise cv.Invalid(
-            f"GPIO{num} (34-39) does not support pulldowns.", [CONF_MODE, CONF_PULLDOWN]
-        )
-
-    return value

esphome/components/esp32/gpio_esp32_c3.py

@@ -1,53 +0,0 @@
-import logging
-
-from esphome.const import (
-    CONF_INPUT,
-    CONF_MODE,
-    CONF_NUMBER,
-)
-import esphome.config_validation as cv
-
-_ESP32C3_SPI_PSRAM_PINS = {
-    12: "SPIHD",
-    13: "SPIWP",
-    14: "SPICS0",
-    15: "SPICLK",
-    16: "SPID",
-    17: "SPIQ",
-}
-
-_ESP32C3_STRAPPING_PINS = {2, 8, 9}
-
-_LOGGER = logging.getLogger(__name__)
-
-
-def esp32_c3_validate_gpio_pin(value):
-    if value < 0 or value > 21:
-        raise cv.Invalid(f"Invalid pin number: {value} (must be 0-21)")
-    if value in _ESP32C3_SPI_PSRAM_PINS:
-        raise cv.Invalid(
-            f"This pin cannot be used on ESP32-C3s and is already used by the SPI/PSRAM interface (function: {_ESP32C3_SPI_PSRAM_PINS[value]})"
-        )
-    if value in _ESP32C3_STRAPPING_PINS:
-        _LOGGER.warning(
-            "GPIO%d is a Strapping PIN and should be avoided.\n"
-            "Attaching external pullup/down resistors to strapping pins can cause unexpected failures.\n"
-            "See https://esphome.io/guides/faq.html#why-am-i-getting-a-warning-about-strapping-pins",
-            value,
-        )
-
-    return value
-
-
-def esp32_c3_validate_supports(value):
-    num = value[CONF_NUMBER]
-    mode = value[CONF_MODE]
-    is_input = mode[CONF_INPUT]
-
-    if num < 0 or num > 21:
-        raise cv.Invalid(f"Invalid pin number: {value} (must be 0-21)")
-
-    if is_input:
-        # All ESP32 pins support input mode
-        pass
-    return value

esphome/components/esp32/gpio_esp32_h2.py

@@ -1,11 +0,0 @@
-import esphome.config_validation as cv
-
-
-def esp32_h2_validate_gpio_pin(value):
-    # ESP32-H2 not yet supported
-    raise cv.Invalid("ESP32-H2 isn't supported yet")
-
-
-def esp32_h2_validate_supports(value):
-    # ESP32-H2 not yet supported
-    raise cv.Invalid("ESP32-H2 isn't supported yet")

esphome/components/esp32/gpio_esp32_s2.py

@@ -1,80 +0,0 @@
-import logging
-
-from esphome.const import (
-    CONF_INPUT,
-    CONF_MODE,
-    CONF_NUMBER,
-    CONF_OUTPUT,
-    CONF_PULLDOWN,
-    CONF_PULLUP,
-)
-
-import esphome.config_validation as cv
-
-_ESP32S2_SPI_PSRAM_PINS = {
-    26: "SPICS1",
-    27: "SPIHD",
-    28: "SPIWP",
-    29: "SPICS0",
-    30: "SPICLK",
-    31: "SPIQ",
-    32: "SPID",
-}
-
-_ESP32S2_STRAPPING_PINS = {0, 45, 46}
-
-_LOGGER = logging.getLogger(__name__)
-
-
-def esp32_s2_validate_gpio_pin(value):
-    if value < 0 or value > 46:
-        raise cv.Invalid(f"Invalid pin number: {value} (must be 0-46)")
-
-    if value in _ESP32S2_SPI_PSRAM_PINS:
-        raise cv.Invalid(
-            f"This pin cannot be used on ESP32-S2s and is already used by the SPI/PSRAM interface (function: {_ESP32S2_SPI_PSRAM_PINS[value]})"
-        )
-    if value in _ESP32S2_STRAPPING_PINS:
-        _LOGGER.warning(
-            "GPIO%d is a Strapping PIN and should be avoided.\n"
-            "Attaching external pullup/down resistors to strapping pins can cause unexpected failures.\n"
-            "See https://esphome.io/guides/faq.html#why-am-i-getting-a-warning-about-strapping-pins",
-            value,
-        )
-
-    if value in (22, 23, 24, 25):
-        # These pins are not exposed in GPIO mux (reason unknown)
-        # but they're missing from IO_MUX list in datasheet
-        raise cv.Invalid(f"The pin GPIO{value} is not usable on ESP32-S2s.")
-
-    return value
-
-
-def esp32_s2_validate_supports(value):
-    num = value[CONF_NUMBER]
-    mode = value[CONF_MODE]
-    is_input = mode[CONF_INPUT]
-    is_output = mode[CONF_OUTPUT]
-    is_pullup = mode[CONF_PULLUP]
-    is_pulldown = mode[CONF_PULLDOWN]
-
-    if num < 0 or num > 46:
-        raise cv.Invalid(f"Invalid pin number: {num} (must be 0-46)")
-    if is_input:
-        # All ESP32 pins support input mode
-        pass
-    if is_output and num == 46:
-        raise cv.Invalid(
-            f"GPIO{num} does not support output pin mode.",
-            [CONF_MODE, CONF_OUTPUT],
-        )
-    if is_pullup and num == 46:
-        raise cv.Invalid(
-            f"GPIO{num} does not support pullups.", [CONF_MODE, CONF_PULLUP]
-        )
-    if is_pulldown and num == 46:
-        raise cv.Invalid(
-            f"GPIO{num} does not support pulldowns.", [CONF_MODE, CONF_PULLDOWN]
-        )
-
-    return value

esphome/components/esp32/gpio_esp32_s3.py

@@ -1,74 +0,0 @@
-import logging
-
-from esphome.const import (
-    CONF_INPUT,
-    CONF_MODE,
-    CONF_NUMBER,
-)
-
-import esphome.config_validation as cv
-
-_ESP_32S3_SPI_PSRAM_PINS = {
-    26: "SPICS1",
-    27: "SPIHD",
-    28: "SPIWP",
-    29: "SPICS0",
-    30: "SPICLK",
-    31: "SPIQ",
-    32: "SPID",
-}
-
-_ESP_32_ESP32_S3R8_PSRAM_PINS = {
-    33: "SPIIO4",
-    34: "SPIIO5",
-    35: "SPIIO6",
-    36: "SPIIO7",
-    37: "SPIDQS",
-}
-
-_ESP_32S3_STRAPPING_PINS = {0, 3, 45, 46}
-
-_LOGGER = logging.getLogger(__name__)
-
-
-def esp32_s3_validate_gpio_pin(value):
-    if value < 0 or value > 48:
-        raise cv.Invalid(f"Invalid pin number: {value} (must be 0-46)")
-
-    if value in _ESP_32S3_SPI_PSRAM_PINS:
-        raise cv.Invalid(
-            f"This pin cannot be used on ESP32-S3s and is already used by the SPI/PSRAM interface(function: {_ESP_32S3_SPI_PSRAM_PINS[value]})"
-        )
-    if value in _ESP_32_ESP32_S3R8_PSRAM_PINS:
-        _LOGGER.warning(
-            "GPIO%d is used by the PSRAM interface on ESP32-S3R8 / ESP32-S3R8V and should be avoided on these models",
-            value,
-        )
-
-    if value in _ESP_32S3_STRAPPING_PINS:
-        _LOGGER.warning(
-            "GPIO%d is a Strapping PIN and should be avoided.\n"
-            "Attaching external pullup/down resistors to strapping pins can cause unexpected failures.\n"
-            "See https://esphome.io/guides/faq.html#why-am-i-getting-a-warning-about-strapping-pins",
-            value,
-        )
-
-    if value in (22, 23, 24, 25):
-        # These pins are not exposed in GPIO mux (reason unknown)
-        # but they're missing from IO_MUX list in datasheet
-        raise cv.Invalid(f"The pin GPIO{value} is not usable on ESP32-S3s.")
-
-    return value
-
-
-def esp32_s3_validate_supports(value):
-    num = value[CONF_NUMBER]
-    mode = value[CONF_MODE]
-    is_input = mode[CONF_INPUT]
-
-    if num < 0 or num > 48:
-        raise cv.Invalid(f"Invalid pin number: {num} (must be 0-46)")
-    if is_input:
-        # All ESP32 pins support input mode
-        pass
-    return value

esphome/components/esp32/gpio_idf.cpp

@@ -10,7 +10,38 @@ static const char *const TAG = "esp32";
 
 bool IDFInternalGPIOPin::isr_service_installed = false;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 
-static gpio_mode_t IRAM_ATTR flags_to_mode(gpio::Flags flags) {
+struct ISRPinArg {
+  gpio_num_t pin;
+  bool inverted;
+};
+
+ISRInternalGPIOPin IDFInternalGPIOPin::to_isr() const {
+  auto *arg = new ISRPinArg{};  // NOLINT(cppcoreguidelines-owning-memory)
+  arg->pin = pin_;
+  arg->inverted = inverted_;
+  return ISRInternalGPIOPin((void *) arg);
+}
+
+void IDFInternalGPIOPin::setup() {
+  pin_mode(flags_);
+  gpio_set_drive_capability(pin_, drive_strength_);
+}
+
+void IDFInternalGPIOPin::pin_mode(gpio::Flags flags) {
+  gpio_config_t conf{};
+  conf.pin_bit_mask = 1ULL << static_cast<uint32_t>(pin_);
+  conf.mode = flags_to_mode(flags);
+  conf.pull_up_en = flags & gpio::FLAG_PULLUP ? GPIO_PULLUP_ENABLE : GPIO_PULLUP_DISABLE;
+  conf.pull_down_en = flags & gpio::FLAG_PULLDOWN ? GPIO_PULLDOWN_ENABLE : GPIO_PULLDOWN_DISABLE;
+  conf.intr_type = GPIO_INTR_DISABLE;
+  gpio_config(&conf);
+}
+
+bool IDFInternalGPIOPin::digital_read() { return bool(gpio_get_level(pin_)) != inverted_; }
+
+void IDFInternalGPIOPin::digital_write(bool value) { gpio_set_level(pin_, value != inverted_ ? 1 : 0); }
+
+gpio_mode_t IDFInternalGPIOPin::flags_to_mode(gpio::Flags flags) {
   flags = (gpio::Flags)(flags & ~(gpio::FLAG_PULLUP | gpio::FLAG_PULLDOWN));
   if (flags == gpio::FLAG_NONE) {
     return GPIO_MODE_DISABLE;
@@ -30,18 +61,6 @@ static gpio_mode_t IRAM_ATTR flags_to_mode(gpio::Flags flags) {
   }
 }
 
-struct ISRPinArg {
-  gpio_num_t pin;
-  bool inverted;
-};
-
-ISRInternalGPIOPin IDFInternalGPIOPin::to_isr() const {
-  auto *arg = new ISRPinArg{};  // NOLINT(cppcoreguidelines-owning-memory)
-  arg->pin = pin_;
-  arg->inverted = inverted_;
-  return ISRInternalGPIOPin((void *) arg);
-}
-
 void IDFInternalGPIOPin::attach_interrupt(void (*func)(void *), void *arg, gpio::InterruptType type) const {
   gpio_int_type_t idf_type = GPIO_INTR_ANYEDGE;
   switch (type) {
@@ -80,35 +99,6 @@ std::string IDFInternalGPIOPin::dump_summary() const {
   return buffer;
 }
 
-void IDFInternalGPIOPin::setup() {
-  gpio_config_t conf{};
-  conf.pin_bit_mask = 1ULL << static_cast<uint32_t>(pin_);
-  conf.mode = flags_to_mode(flags_);
-  conf.pull_up_en = flags_ & gpio::FLAG_PULLUP ? GPIO_PULLUP_ENABLE : GPIO_PULLUP_DISABLE;
-  conf.pull_down_en = flags_ & gpio::FLAG_PULLDOWN ? GPIO_PULLDOWN_ENABLE : GPIO_PULLDOWN_DISABLE;
-  conf.intr_type = GPIO_INTR_DISABLE;
-  gpio_config(&conf);
-  gpio_set_drive_capability(pin_, drive_strength_);
-}
-
-void IDFInternalGPIOPin::pin_mode(gpio::Flags flags) {
-  // can't call gpio_config here because that logs in esp-idf which may cause issues
-  gpio_set_direction(pin_, flags_to_mode(flags));
-  gpio_pull_mode_t pull_mode = GPIO_FLOATING;
-  if (flags & (gpio::FLAG_PULLUP | gpio::FLAG_PULLDOWN)) {
-    pull_mode = GPIO_PULLUP_PULLDOWN;
-  } else if (flags & gpio::FLAG_PULLUP) {
-    pull_mode = GPIO_PULLUP_ONLY;
-  } else if (flags & gpio::FLAG_PULLDOWN) {
-    pull_mode = GPIO_PULLDOWN_ONLY;
-  }
-  gpio_set_pull_mode(pin_, pull_mode);
-}
-
-bool IDFInternalGPIOPin::digital_read() { return bool(gpio_get_level(pin_)) != inverted_; }
-void IDFInternalGPIOPin::digital_write(bool value) { gpio_set_level(pin_, value != inverted_ ? 1 : 0); }
-void IDFInternalGPIOPin::detach_interrupt() const { gpio_intr_disable(pin_); }
-
 }  // namespace esp32
 
 using namespace esp32;
@@ -124,19 +114,6 @@ void IRAM_ATTR ISRInternalGPIOPin::digital_write(bool value) {
 void IRAM_ATTR ISRInternalGPIOPin::clear_interrupt() {
   // not supported
 }
-void IRAM_ATTR ISRInternalGPIOPin::pin_mode(gpio::Flags flags) {
-  auto *arg = reinterpret_cast<ISRPinArg *>(arg_);
-  gpio_set_direction(arg->pin, flags_to_mode(flags));
-  gpio_pull_mode_t pull_mode = GPIO_FLOATING;
-  if (flags & (gpio::FLAG_PULLUP | gpio::FLAG_PULLDOWN)) {
-    pull_mode = GPIO_PULLUP_PULLDOWN;
-  } else if (flags & gpio::FLAG_PULLUP) {
-    pull_mode = GPIO_PULLUP_ONLY;
-  } else if (flags & gpio::FLAG_PULLDOWN) {
-    pull_mode = GPIO_PULLDOWN_ONLY;
-  }
-  gpio_set_pull_mode(arg->pin, pull_mode);
-}
 
 }  // namespace esphome
 

esphome/components/esp32/gpio_idf.h

@@ -18,12 +18,13 @@ class IDFInternalGPIOPin : public InternalGPIOPin {
   bool digital_read() override;
   void digital_write(bool value) override;
   std::string dump_summary() const override;
-  void detach_interrupt() const override;
+  void detach_interrupt() const override { gpio_intr_disable(pin_); }
   ISRInternalGPIOPin to_isr() const override;
   uint8_t get_pin() const override { return (uint8_t) pin_; }
   bool is_inverted() const override { return inverted_; }
 
  protected:
+  static gpio_mode_t flags_to_mode(gpio::Flags flags);
   void attach_interrupt(void (*func)(void *), void *arg, gpio::InterruptType type) const override;
 
   gpio_num_t pin_;

esphome/components/esp32/post_build.py.script

@@ -1,43 +0,0 @@
-# Source https://github.com/letscontrolit/ESPEasy/pull/3845#issuecomment-1005864664
-
-import esptool
-
-# pylint: disable=E0602
-Import("env")  # noqa
-
-
-def esp32_create_combined_bin(source, target, env):
-    print("Generating combined binary for serial flashing")
-    app_offset = 0x10000
-
-    new_file_name = env.subst("$BUILD_DIR/${PROGNAME}-factory.bin")
-    sections = env.subst(env.get("FLASH_EXTRA_IMAGES"))
-    firmware_name = env.subst("$BUILD_DIR/${PROGNAME}.bin")
-    chip = env.get("BOARD_MCU")
-    flash_size = env.BoardConfig().get("upload.flash_size")
-    cmd = [
-        "--chip",
-        chip,
-        "merge_bin",
-        "-o",
-        new_file_name,
-        "--flash_size",
-        flash_size,
-    ]
-    print("    Offset | File")
-    for section in sections:
-        sect_adr, sect_file = section.split(" ", 1)
-        print(f" -  {sect_adr} | {sect_file}")
-        cmd += [sect_adr, sect_file]
-
-    print(f" - {hex(app_offset)} | {firmware_name}")
-    cmd += [hex(app_offset), firmware_name]
-
-    print()
-    print(f"Using esptool.py arguments: {' '.join(cmd)}")
-    print()
-    esptool.main(cmd)
-
-
-# pylint: disable=E0602
-env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin)  # noqa

esphome/components/esp32/preferences.cpp

@@ -76,7 +76,6 @@ class ESP32Preferences : public ESPPreferences {
   uint32_t current_offset = 0;
 
   void open() {
-    nvs_flash_init();
     esp_err_t err = nvs_open("esphome", NVS_READWRITE, &nvs_handle);
     if (err == 0)
       return;

esphome/components/esp32_ble_server/ble_characteristic.cpp

@@ -147,46 +147,40 @@ bool BLECharacteristic::is_failed() {
 }
 
 void BLECharacteristic::set_broadcast_property(bool value) {
-  if (value) {
+  if (value)
     this->properties_ = (esp_gatt_char_prop_t)(this->properties_ | ESP_GATT_CHAR_PROP_BIT_BROADCAST);
-  } else {
+  else
     this->properties_ = (esp_gatt_char_prop_t)(this->properties_ & ~ESP_GATT_CHAR_PROP_BIT_BROADCAST);
-  }
 }
 void BLECharacteristic::set_indicate_property(bool value) {
-  if (value) {
+  if (value)
     this->properties_ = (esp_gatt_char_prop_t)(this->properties_ | ESP_GATT_CHAR_PROP_BIT_INDICATE);
-  } else {
+  else
     this->properties_ = (esp_gatt_char_prop_t)(this->properties_ & ~ESP_GATT_CHAR_PROP_BIT_INDICATE);
-  }
 }
 void BLECharacteristic::set_notify_property(bool value) {
-  if (value) {
+  if (value)
     this->properties_ = (esp_gatt_char_prop_t)(this->properties_ | ESP_GATT_CHAR_PROP_BIT_NOTIFY);
-  } else {
+  else
     this->properties_ = (esp_gatt_char_prop_t)(this->properties_ & ~ESP_GATT_CHAR_PROP_BIT_NOTIFY);
-  }
 }
 void BLECharacteristic::set_read_property(bool value) {
-  if (value) {
+  if (value)
     this->properties_ = (esp_gatt_char_prop_t)(this->properties_ | ESP_GATT_CHAR_PROP_BIT_READ);
-  } else {
+  else
     this->properties_ = (esp_gatt_char_prop_t)(this->properties_ & ~ESP_GATT_CHAR_PROP_BIT_READ);
-  }
 }
 void BLECharacteristic::set_write_property(bool value) {
-  if (value) {
+  if (value)
     this->properties_ = (esp_gatt_char_prop_t)(this->properties_ | ESP_GATT_CHAR_PROP_BIT_WRITE);
-  } else {
+  else
     this->properties_ = (esp_gatt_char_prop_t)(this->properties_ & ~ESP_GATT_CHAR_PROP_BIT_WRITE);
-  }
 }
 void BLECharacteristic::set_write_no_response_property(bool value) {
-  if (value) {
+  if (value)
     this->properties_ = (esp_gatt_char_prop_t)(this->properties_ | ESP_GATT_CHAR_PROP_BIT_WRITE_NR);
-  } else {
+  else
     this->properties_ = (esp_gatt_char_prop_t)(this->properties_ & ~ESP_GATT_CHAR_PROP_BIT_WRITE_NR);
-  }
 }
 
 void BLECharacteristic::gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if,

esphome/components/esp32_ble_server/ble_server.cpp

@@ -98,20 +98,19 @@ bool BLEServer::create_device_characteristics_() {
   return true;
 }
 
-std::shared_ptr<BLEService> BLEServer::create_service(const uint8_t *uuid, bool advertise) {
+BLEService *BLEServer::create_service(const uint8_t *uuid, bool advertise) {
   return this->create_service(ESPBTUUID::from_raw(uuid), advertise);
 }
-std::shared_ptr<BLEService> BLEServer::create_service(uint16_t uuid, bool advertise) {
+BLEService *BLEServer::create_service(uint16_t uuid, bool advertise) {
   return this->create_service(ESPBTUUID::from_uint16(uuid), advertise);
 }
-std::shared_ptr<BLEService> BLEServer::create_service(const std::string &uuid, bool advertise) {
+BLEService *BLEServer::create_service(const std::string &uuid, bool advertise) {
   return this->create_service(ESPBTUUID::from_raw(uuid), advertise);
 }
-std::shared_ptr<BLEService> BLEServer::create_service(ESPBTUUID uuid, bool advertise, uint16_t num_handles,
-                                                      uint8_t inst_id) {
+BLEService *BLEServer::create_service(ESPBTUUID uuid, bool advertise, uint16_t num_handles, uint8_t inst_id) {
   ESP_LOGV(TAG, "Creating service - %s", uuid.to_string().c_str());
-  std::shared_ptr<BLEService> service = std::make_shared<BLEService>(uuid, num_handles, inst_id);
-  this->services_.emplace_back(service);
+  BLEService *service = new BLEService(uuid, num_handles, inst_id);  // NOLINT(cppcoreguidelines-owning-memory)
+  this->services_.push_back(service);
   if (advertise) {
     esp32_ble::global_ble->get_advertising()->add_service_uuid(uuid);
   }
@@ -150,12 +149,12 @@ void BLEServer::gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t ga
       break;
   }
 
-  for (const auto &service : this->services_) {
+  for (auto *service : this->services_) {
     service->gatts_event_handler(event, gatts_if, param);
   }
 }
 
-float BLEServer::get_setup_priority() const { return setup_priority::AFTER_BLUETOOTH + 10; }
+float BLEServer::get_setup_priority() const { return setup_priority::AFTER_BLUETOOTH; }
 
 void BLEServer::dump_config() { ESP_LOGCONFIG(TAG, "ESP32 BLE Server:"); }
 

esphome/components/esp32_ble_server/ble_server.h

@@ -11,7 +11,6 @@
 #include "esphome/core/preferences.h"
 
 #include <map>
-#include <memory>
 
 #ifdef USE_ESP32
 
@@ -44,11 +43,10 @@ class BLEServer : public Component {
   void set_manufacturer(const std::string &manufacturer) { this->manufacturer_ = manufacturer; }
   void set_model(const std::string &model) { this->model_ = model; }
 
-  std::shared_ptr<BLEService> create_service(const uint8_t *uuid, bool advertise = false);
-  std::shared_ptr<BLEService> create_service(uint16_t uuid, bool advertise = false);
-  std::shared_ptr<BLEService> create_service(const std::string &uuid, bool advertise = false);
-  std::shared_ptr<BLEService> create_service(ESPBTUUID uuid, bool advertise = false, uint16_t num_handles = 15,
-                                             uint8_t inst_id = 0);
+  BLEService *create_service(const uint8_t *uuid, bool advertise = false);
+  BLEService *create_service(uint16_t uuid, bool advertise = false);
+  BLEService *create_service(const std::string &uuid, bool advertise = false);
+  BLEService *create_service(ESPBTUUID uuid, bool advertise = false, uint16_t num_handles = 15, uint8_t inst_id = 0);
 
   esp_gatt_if_t get_gatts_if() { return this->gatts_if_; }
   uint32_t get_connected_client_count() { return this->connected_clients_; }
@@ -76,8 +74,8 @@ class BLEServer : public Component {
   uint32_t connected_clients_{0};
   std::map<uint16_t, void *> clients_;
 
-  std::vector<std::shared_ptr<BLEService>> services_;
-  std::shared_ptr<BLEService> device_information_service_;
+  std::vector<BLEService *> services_;
+  BLEService *device_information_service_;
 
   std::vector<BLEServiceComponent *> service_components_;
 

esphome/components/esp32_ble_server/ble_service.cpp

@@ -18,10 +18,9 @@ BLEService::~BLEService() {
 }
 
 BLECharacteristic *BLEService::get_characteristic(ESPBTUUID uuid) {
-  for (auto *chr : this->characteristics_) {
+  for (auto *chr : this->characteristics_)
     if (chr->get_uuid() == uuid)
       return chr;
-  }
   return nullptr;
 }
 

esphome/components/esp32_ble_tracker/__init__.py

@@ -18,6 +18,7 @@ from esphome.core import CORE
 from esphome.components.esp32 import add_idf_sdkconfig_option
 
 DEPENDENCIES = ["esp32"]
+AUTO_LOAD = ["xiaomi_ble", "ruuvi_ble"]
 
 CONF_ESP32_BLE_ID = "esp32_ble_id"
 CONF_SCAN_PARAMETERS = "scan_parameters"

esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp

@@ -58,12 +58,11 @@ void ESP32BLETracker::setup() {
 void ESP32BLETracker::loop() {
   BLEEvent *ble_event = this->ble_events_.pop();
   while (ble_event != nullptr) {
-    if (ble_event->type_) {
+    if (ble_event->type_)
       this->real_gattc_event_handler_(ble_event->event_.gattc.gattc_event, ble_event->event_.gattc.gattc_if,
                                       &ble_event->event_.gattc.gattc_param);
-    } else {
+    else
       this->real_gap_event_handler_(ble_event->event_.gap.gap_event, &ble_event->event_.gap.gap_param);
-    }
     delete ble_event;  // NOLINT(cppcoreguidelines-owning-memory)
     ble_event = this->ble_events_.pop();
   }
@@ -90,12 +89,11 @@ void ESP32BLETracker::loop() {
       device.parse_scan_rst(this->scan_result_buffer_[i]);
 
       bool found = false;
-      for (auto *listener : this->listeners_) {
+      for (auto *listener : this->listeners_)
         if (listener->parse_device(device))
           found = true;
-      }
 
-      for (auto *client : this->clients_) {
+      for (auto *client : this->clients_)
         if (client->parse_device(device)) {
           found = true;
           if (client->state() == ClientState::DISCOVERED) {
@@ -105,7 +103,6 @@ void ESP32BLETracker::loop() {
             }
           }
         }
-      }
 
       if (!found) {
         this->print_bt_device_info(device);
@@ -486,7 +483,6 @@ optional<ESPBLEiBeacon> ESPBLEiBeacon::from_manufacturer_data(const ServiceData
 }
 
 void ESPBTDevice::parse_scan_rst(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param) {
-  this->scan_result_ = param;
   for (uint8_t i = 0; i < ESP_BD_ADDR_LEN; i++)
     this->address_[i] = param.bda[i];
   this->address_type_ = param.ble_addr_type;
@@ -528,7 +524,7 @@ void ESPBTDevice::parse_scan_rst(const esp_ble_gap_cb_param_t::ble_scan_result_e
     ESP_LOGVV(TAG, "  Service UUID: %s", uuid.to_string().c_str());
   }
   for (auto &data : this->manufacturer_datas_) {
-    ESP_LOGVV(TAG, "  Manufacturer data: %s", format_hex_pretty(data.data).c_str());
+    ESP_LOGVV(TAG, "  Manufacturer data: %s", hexencode(data.data).c_str());
     if (this->get_ibeacon().has_value()) {
       auto ibeacon = this->get_ibeacon().value();
       ESP_LOGVV(TAG, "    iBeacon data:");
@@ -541,10 +537,10 @@ void ESPBTDevice::parse_scan_rst(const esp_ble_gap_cb_param_t::ble_scan_result_e
   for (auto &data : this->service_datas_) {
     ESP_LOGVV(TAG, "  Service data:");
     ESP_LOGVV(TAG, "    UUID: %s", data.uuid.to_string().c_str());
-    ESP_LOGVV(TAG, "    Data: %s", format_hex_pretty(data.data).c_str());
+    ESP_LOGVV(TAG, "    Data: %s", hexencode(data.data).c_str());
   }
 
-  ESP_LOGVV(TAG, "Adv data: %s", format_hex_pretty(param.ble_adv, param.adv_data_len + param.scan_rsp_len).c_str());
+  ESP_LOGVV(TAG, "Adv data: %s", hexencode(param.ble_adv, param.adv_data_len + param.scan_rsp_len).c_str());
 #endif
 }
 void ESPBTDevice::parse_adv_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param) {

esphome/components/esp32_ble_tracker/esp32_ble_tracker.h

@@ -97,8 +97,6 @@ class ESPBTDevice {
 
   const std::vector<ServiceData> &get_service_datas() const { return service_datas_; }
 
-  const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &get_scan_result() const { return scan_result_; }
-
   optional<ESPBLEiBeacon> get_ibeacon() const {
     for (auto &it : this->manufacturer_datas_) {
       auto res = ESPBLEiBeacon::from_manufacturer_data(it);
@@ -123,7 +121,6 @@ class ESPBTDevice {
   std::vector<ESPBTUUID> service_uuids_;
   std::vector<ServiceData> manufacturer_datas_{};
   std::vector<ServiceData> service_datas_{};
-  esp_ble_gap_cb_param_t::ble_scan_result_evt_param scan_result_{};
 };
 
 class ESP32BLETracker;

esphome/components/esp32_camera/__init__.py

@@ -2,8 +2,10 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import pins
 from esphome.const import (
+    CONF_DISABLED_BY_DEFAULT,
     CONF_FREQUENCY,
     CONF_ID,
+    CONF_NAME,
     CONF_PIN,
     CONF_SCL,
     CONF_SDA,
@@ -15,15 +17,11 @@ from esphome.const import (
 )
 from esphome.core import CORE
 from esphome.components.esp32 import add_idf_sdkconfig_option
-from esphome.cpp_helpers import setup_entity
 
-DEPENDENCIES = ["esp32"]
-
-AUTO_LOAD = ["psram"]
+DEPENDENCIES = ["esp32", "api"]
 
 esp32_camera_ns = cg.esphome_ns.namespace("esp32_camera")
 ESP32Camera = esp32_camera_ns.class_("ESP32Camera", cg.PollingComponent, cg.EntityBase)
-
 ESP32CameraFrameSize = esp32_camera_ns.enum("ESP32CameraFrameSize")
 FRAME_SIZES = {
     "160X120": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_160X120,
@@ -47,76 +45,29 @@ FRAME_SIZES = {
     "1600X1200": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_1600X1200,
     "UXGA": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_1600X1200,
 }
-ESP32GainControlMode = esp32_camera_ns.enum("ESP32GainControlMode")
-ENUM_GAIN_CONTROL_MODE = {
-    "MANUAL": ESP32GainControlMode.ESP32_GC_MODE_MANU,
-    "AUTO": ESP32GainControlMode.ESP32_GC_MODE_AUTO,
-}
-ESP32AgcGainCeiling = esp32_camera_ns.enum("ESP32AgcGainCeiling")
-ENUM_GAIN_CEILING = {
-    "2X": ESP32AgcGainCeiling.ESP32_GAINCEILING_2X,
-    "4X": ESP32AgcGainCeiling.ESP32_GAINCEILING_4X,
-    "8X": ESP32AgcGainCeiling.ESP32_GAINCEILING_8X,
-    "16X": ESP32AgcGainCeiling.ESP32_GAINCEILING_16X,
-    "32X": ESP32AgcGainCeiling.ESP32_GAINCEILING_32X,
-    "64X": ESP32AgcGainCeiling.ESP32_GAINCEILING_64X,
-    "128X": ESP32AgcGainCeiling.ESP32_GAINCEILING_128X,
-}
-ESP32WhiteBalanceMode = esp32_camera_ns.enum("ESP32WhiteBalanceMode")
-ENUM_WB_MODE = {
-    "AUTO": ESP32WhiteBalanceMode.ESP32_WB_MODE_AUTO,
-    "SUNNY": ESP32WhiteBalanceMode.ESP32_WB_MODE_SUNNY,
-    "CLOUDY": ESP32WhiteBalanceMode.ESP32_WB_MODE_CLOUDY,
-    "OFFICE": ESP32WhiteBalanceMode.ESP32_WB_MODE_OFFICE,
-    "HOME": ESP32WhiteBalanceMode.ESP32_WB_MODE_HOME,
-}
-ESP32SpecialEffect = esp32_camera_ns.enum("ESP32SpecialEffect")
-ENUM_SPECIAL_EFFECT = {
-    "NONE": ESP32SpecialEffect.ESP32_SPECIAL_EFFECT_NONE,
-    "NEGATIVE": ESP32SpecialEffect.ESP32_SPECIAL_EFFECT_NEGATIVE,
-    "GRAYSCALE": ESP32SpecialEffect.ESP32_SPECIAL_EFFECT_GRAYSCALE,
-    "RED_TINT": ESP32SpecialEffect.ESP32_SPECIAL_EFFECT_RED_TINT,
-    "GREEN_TINT": ESP32SpecialEffect.ESP32_SPECIAL_EFFECT_GREEN_TINT,
-    "BLUE_TINT": ESP32SpecialEffect.ESP32_SPECIAL_EFFECT_BLUE_TINT,
-    "SEPIA": ESP32SpecialEffect.ESP32_SPECIAL_EFFECT_SEPIA,
-}
 
-# pin assignment
 CONF_VSYNC_PIN = "vsync_pin"
 CONF_HREF_PIN = "href_pin"
 CONF_PIXEL_CLOCK_PIN = "pixel_clock_pin"
 CONF_EXTERNAL_CLOCK = "external_clock"
 CONF_I2C_PINS = "i2c_pins"
 CONF_POWER_DOWN_PIN = "power_down_pin"
-# image
+
+CONF_MAX_FRAMERATE = "max_framerate"
+CONF_IDLE_FRAMERATE = "idle_framerate"
 CONF_JPEG_QUALITY = "jpeg_quality"
 CONF_VERTICAL_FLIP = "vertical_flip"
 CONF_HORIZONTAL_MIRROR = "horizontal_mirror"
 CONF_SATURATION = "saturation"
-CONF_SPECIAL_EFFECT = "special_effect"
-# exposure
-CONF_AEC_MODE = "aec_mode"
-CONF_AEC2 = "aec2"
-CONF_AE_LEVEL = "ae_level"
-CONF_AEC_VALUE = "aec_value"
-# gains
-CONF_AGC_MODE = "agc_mode"
-CONF_AGC_VALUE = "agc_value"
-CONF_AGC_GAIN_CEILING = "agc_gain_ceiling"
-# white balance
-CONF_WB_MODE = "wb_mode"
-# test pattern
 CONF_TEST_PATTERN = "test_pattern"
-# framerates
-CONF_MAX_FRAMERATE = "max_framerate"
-CONF_IDLE_FRAMERATE = "idle_framerate"
 
 camera_range_param = cv.int_range(min=-2, max=2)
 
-CONFIG_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(
+CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(ESP32Camera),
-        # pin assignment
+        cv.Required(CONF_NAME): cv.string,
+        cv.Optional(CONF_DISABLED_BY_DEFAULT, default=False): cv.boolean,
         cv.Required(CONF_DATA_PINS): cv.All(
             [pins.internal_gpio_input_pin_number], cv.Length(min=8, max=8)
         ),
@@ -139,7 +90,12 @@ CONFIG_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(
         ),
         cv.Optional(CONF_RESET_PIN): pins.internal_gpio_output_pin_number,
         cv.Optional(CONF_POWER_DOWN_PIN): pins.internal_gpio_output_pin_number,
-        # image
+        cv.Optional(CONF_MAX_FRAMERATE, default="10 fps"): cv.All(
+            cv.framerate, cv.Range(min=0, min_included=False, max=60)
+        ),
+        cv.Optional(CONF_IDLE_FRAMERATE, default="0.1 fps"): cv.All(
+            cv.framerate, cv.Range(min=0, max=1)
+        ),
         cv.Optional(CONF_RESOLUTION, default="640X480"): cv.enum(
             FRAME_SIZES, upper=True
         ),
@@ -149,73 +105,30 @@ CONFIG_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(
         cv.Optional(CONF_SATURATION, default=0): camera_range_param,
         cv.Optional(CONF_VERTICAL_FLIP, default=True): cv.boolean,
         cv.Optional(CONF_HORIZONTAL_MIRROR, default=True): cv.boolean,
-        cv.Optional(CONF_SPECIAL_EFFECT, default="NONE"): cv.enum(
-            ENUM_SPECIAL_EFFECT, upper=True
-        ),
-        # exposure
-        cv.Optional(CONF_AGC_MODE, default="AUTO"): cv.enum(
-            ENUM_GAIN_CONTROL_MODE, upper=True
-        ),
-        cv.Optional(CONF_AEC2, default=False): cv.boolean,
-        cv.Optional(CONF_AE_LEVEL, default=0): camera_range_param,
-        cv.Optional(CONF_AEC_VALUE, default=300): cv.int_range(min=0, max=1200),
-        # gains
-        cv.Optional(CONF_AEC_MODE, default="AUTO"): cv.enum(
-            ENUM_GAIN_CONTROL_MODE, upper=True
-        ),
-        cv.Optional(CONF_AGC_VALUE, default=0): cv.int_range(min=0, max=30),
-        cv.Optional(CONF_AGC_GAIN_CEILING, default="2X"): cv.enum(
-            ENUM_GAIN_CEILING, upper=True
-        ),
-        # white balance
-        cv.Optional(CONF_WB_MODE, default="AUTO"): cv.enum(ENUM_WB_MODE, upper=True),
-        # test pattern
         cv.Optional(CONF_TEST_PATTERN, default=False): cv.boolean,
-        # framerates
-        cv.Optional(CONF_MAX_FRAMERATE, default="10 fps"): cv.All(
-            cv.framerate, cv.Range(min=0, min_included=False, max=60)
-        ),
-        cv.Optional(CONF_IDLE_FRAMERATE, default="0.1 fps"): cv.All(
-            cv.framerate, cv.Range(min=0, max=1)
-        ),
     }
 ).extend(cv.COMPONENT_SCHEMA)
 
 SETTERS = {
-    # pin assignment
     CONF_DATA_PINS: "set_data_pins",
     CONF_VSYNC_PIN: "set_vsync_pin",
     CONF_HREF_PIN: "set_href_pin",
     CONF_PIXEL_CLOCK_PIN: "set_pixel_clock_pin",
     CONF_RESET_PIN: "set_reset_pin",
     CONF_POWER_DOWN_PIN: "set_power_down_pin",
-    # image
     CONF_JPEG_QUALITY: "set_jpeg_quality",
     CONF_VERTICAL_FLIP: "set_vertical_flip",
     CONF_HORIZONTAL_MIRROR: "set_horizontal_mirror",
     CONF_CONTRAST: "set_contrast",
     CONF_BRIGHTNESS: "set_brightness",
     CONF_SATURATION: "set_saturation",
-    CONF_SPECIAL_EFFECT: "set_special_effect",
-    # exposure
-    CONF_AEC_MODE: "set_aec_mode",
-    CONF_AEC2: "set_aec2",
-    CONF_AE_LEVEL: "set_ae_level",
-    CONF_AEC_VALUE: "set_aec_value",
-    # gains
-    CONF_AGC_MODE: "set_agc_mode",
-    CONF_AGC_VALUE: "set_agc_value",
-    CONF_AGC_GAIN_CEILING: "set_agc_gain_ceiling",
-    # white balance
-    CONF_WB_MODE: "set_wb_mode",
-    # test pattern
     CONF_TEST_PATTERN: "set_test_pattern",
 }
 
 
 async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await setup_entity(var, config)
+    var = cg.new_Pvariable(config[CONF_ID], config[CONF_NAME])
+    cg.add(var.set_disabled_by_default(config[CONF_DISABLED_BY_DEFAULT]))
     await cg.register_component(var, config)
 
     for key, setter in SETTERS.items():
@@ -234,7 +147,9 @@ async def to_code(config):
     cg.add(var.set_frame_size(config[CONF_RESOLUTION]))
 
     cg.add_define("USE_ESP32_CAMERA")
+    cg.add_build_flag("-DBOARD_HAS_PSRAM")
 
     if CORE.using_esp_idf:
         cg.add_library("espressif/esp32-camera", "1.0.0")
         add_idf_sdkconfig_option("CONFIG_RTCIO_SUPPORT_RTC_GPIO_DESC", True)
+        add_idf_sdkconfig_option("CONFIG_ESP32_SPIRAM_SUPPORT", True)

esphome/components/esp32_camera/esp32_camera.cpp

@@ -11,14 +11,10 @@ namespace esp32_camera {
 
 static const char *const TAG = "esp32_camera";
 
-/* ---------------- public API (derivated) ---------------- */
 void ESP32Camera::setup() {
   global_esp32_camera = this;
 
-  /* initialize time to now */
   this->last_update_ = millis();
-
-  /* initialize camera */
   esp_err_t err = esp_camera_init(&this->config_);
   if (err != ESP_OK) {
     ESP_LOGE(TAG, "esp_camera_init failed: %s", esp_err_to_name(err));
@@ -27,10 +23,13 @@ void ESP32Camera::setup() {
     return;
   }
 
-  /* initialize camera parameters */
-  this->update_camera_parameters();
-
-  /* initialize RTOS */
+  sensor_t *s = esp_camera_sensor_get();
+  s->set_vflip(s, this->vertical_flip_);
+  s->set_hmirror(s, this->horizontal_mirror_);
+  s->set_contrast(s, this->contrast_);
+  s->set_brightness(s, this->brightness_);
+  s->set_saturation(s, this->saturation_);
+  s->set_colorbar(s, this->test_pattern_);
   this->framebuffer_get_queue_ = xQueueCreate(1, sizeof(camera_fb_t *));
   this->framebuffer_return_queue_ = xQueueCreate(1, sizeof(camera_fb_t *));
   xTaskCreatePinnedToCore(&ESP32Camera::framebuffer_task,
@@ -42,12 +41,13 @@ void ESP32Camera::setup() {
                           1                    // core
   );
 }
-
 void ESP32Camera::dump_config() {
   auto conf = this->config_;
   ESP_LOGCONFIG(TAG, "ESP32 Camera:");
   ESP_LOGCONFIG(TAG, "  Name: %s", this->name_.c_str());
-  ESP_LOGCONFIG(TAG, "  Internal: %s", YESNO(this->internal_));
+#ifdef USE_ARDUINO
+  ESP_LOGCONFIG(TAG, "  Board Has PSRAM: %s", YESNO(psramFound()));
+#endif  // USE_ARDUINO
   ESP_LOGCONFIG(TAG, "  Data Pins: D0:%d D1:%d D2:%d D3:%d D4:%d D5:%d D6:%d D7:%d", conf.pin_d0, conf.pin_d1,
                 conf.pin_d2, conf.pin_d3, conf.pin_d4, conf.pin_d5, conf.pin_d6, conf.pin_d7);
   ESP_LOGCONFIG(TAG, "  VSYNC Pin: %d", conf.pin_vsync);
@@ -105,17 +105,17 @@ void ESP32Camera::dump_config() {
   ESP_LOGCONFIG(TAG, "  Saturation: %d", st.saturation);
   ESP_LOGCONFIG(TAG, "  Vertical Flip: %s", ONOFF(st.vflip));
   ESP_LOGCONFIG(TAG, "  Horizontal Mirror: %s", ONOFF(st.hmirror));
-  ESP_LOGCONFIG(TAG, "  Special Effect: %u", st.special_effect);
-  ESP_LOGCONFIG(TAG, "  White Balance Mode: %u", st.wb_mode);
+  // ESP_LOGCONFIG(TAG, "  Special Effect: %u", st.special_effect);
+  // ESP_LOGCONFIG(TAG, "  White Balance Mode: %u", st.wb_mode);
   // ESP_LOGCONFIG(TAG, "  Auto White Balance: %u", st.awb);
   // ESP_LOGCONFIG(TAG, "  Auto White Balance Gain: %u", st.awb_gain);
-  ESP_LOGCONFIG(TAG, "  Auto Exposure Control: %u", st.aec);
-  ESP_LOGCONFIG(TAG, "  Auto Exposure Control 2: %u", st.aec2);
-  ESP_LOGCONFIG(TAG, "  Auto Exposure Level: %d", st.ae_level);
-  ESP_LOGCONFIG(TAG, "  Auto Exposure Value: %u", st.aec_value);
-  ESP_LOGCONFIG(TAG, "  AGC: %u", st.agc);
-  ESP_LOGCONFIG(TAG, "  AGC Gain: %u", st.agc_gain);
-  ESP_LOGCONFIG(TAG, "  Gain Ceiling: %u", st.gainceiling);
+  // ESP_LOGCONFIG(TAG, "  Auto Exposure Control: %u", st.aec);
+  // ESP_LOGCONFIG(TAG, "  Auto Exposure Control 2: %u", st.aec2);
+  // ESP_LOGCONFIG(TAG, "  Auto Exposure Level: %d", st.ae_level);
+  // ESP_LOGCONFIG(TAG, "  Auto Exposure Value: %u", st.aec_value);
+  // ESP_LOGCONFIG(TAG, "  AGC: %u", st.agc);
+  // ESP_LOGCONFIG(TAG, "  AGC Gain: %u", st.agc_gain);
+  // ESP_LOGCONFIG(TAG, "  Gain Ceiling: %u", st.gainceiling);
   // ESP_LOGCONFIG(TAG, "  BPC: %u", st.bpc);
   // ESP_LOGCONFIG(TAG, "  WPC: %u", st.wpc);
   // ESP_LOGCONFIG(TAG, "  RAW_GMA: %u", st.raw_gma);
@@ -123,7 +123,6 @@ void ESP32Camera::dump_config() {
   // ESP_LOGCONFIG(TAG, "  DCW: %u", st.dcw);
   ESP_LOGCONFIG(TAG, "  Test Pattern: %s", YESNO(st.colorbar));
 }
-
 void ESP32Camera::loop() {
   // check if we can return the image
   if (this->can_return_image_()) {
@@ -133,13 +132,6 @@ void ESP32Camera::loop() {
     this->current_image_.reset();
   }
 
-  // request idle image every idle_update_interval
-  const uint32_t now = millis();
-  if (this->idle_update_interval_ != 0 && now - this->last_idle_request_ > this->idle_update_interval_) {
-    this->last_idle_request_ = now;
-    this->request_image(IDLE);
-  }
-
   // Check if we should fetch a new image
   if (!this->has_requested_image_())
     return;
@@ -147,6 +139,7 @@ void ESP32Camera::loop() {
     // image is still in use
     return;
   }
+  const uint32_t now = millis();
   if (now - this->last_update_ <= this->max_update_interval_)
     return;
 
@@ -163,17 +156,22 @@ void ESP32Camera::loop() {
     xQueueSend(this->framebuffer_return_queue_, &fb, portMAX_DELAY);
     return;
   }
-  this->current_image_ = std::make_shared<CameraImage>(fb, this->single_requesters_ | this->stream_requesters_);
+  this->current_image_ = std::make_shared<CameraImage>(fb);
 
   ESP_LOGD(TAG, "Got Image: len=%u", fb->len);
   this->new_image_callback_.call(this->current_image_);
   this->last_update_ = now;
-  this->single_requesters_ = 0;
+  this->single_requester_ = false;
+}
+void ESP32Camera::framebuffer_task(void *pv) {
+  while (true) {
+    camera_fb_t *framebuffer = esp_camera_fb_get();
+    xQueueSend(global_esp32_camera->framebuffer_get_queue_, &framebuffer, portMAX_DELAY);
+    // return is no-op for config with 1 fb
+    xQueueReceive(global_esp32_camera->framebuffer_return_queue_, &framebuffer, portMAX_DELAY);
+    esp_camera_fb_return(framebuffer);
+  }
 }
-
-float ESP32Camera::get_setup_priority() const { return setup_priority::DATA; }
-
-/* ---------------- constructors ---------------- */
 ESP32Camera::ESP32Camera(const std::string &name) : EntityBase(name) {
   this->config_.pin_pwdn = -1;
   this->config_.pin_reset = -1;
@@ -187,10 +185,6 @@ ESP32Camera::ESP32Camera(const std::string &name) : EntityBase(name) {
 
   global_esp32_camera = this;
 }
-ESP32Camera::ESP32Camera() : ESP32Camera("") {}
-
-/* ---------------- setters ---------------- */
-/* set pin assignment */
 void ESP32Camera::set_data_pins(std::array<uint8_t, 8> pins) {
   this->config_.pin_d0 = pins[0];
   this->config_.pin_d1 = pins[1];
@@ -212,10 +206,6 @@ void ESP32Camera::set_i2c_pins(uint8_t sda, uint8_t scl) {
   this->config_.pin_sscb_sda = sda;
   this->config_.pin_sscb_scl = scl;
 }
-void ESP32Camera::set_reset_pin(uint8_t pin) { this->config_.pin_reset = pin; }
-void ESP32Camera::set_power_down_pin(uint8_t pin) { this->config_.pin_pwdn = pin; }
-
-/* set image parameters */
 void ESP32Camera::set_frame_size(ESP32CameraFrameSize size) {
   switch (size) {
     case ESP32_CAMERA_SIZE_160X120:
@@ -251,81 +241,47 @@ void ESP32Camera::set_frame_size(ESP32CameraFrameSize size) {
   }
 }
 void ESP32Camera::set_jpeg_quality(uint8_t quality) { this->config_.jpeg_quality = quality; }
+void ESP32Camera::set_reset_pin(uint8_t pin) { this->config_.pin_reset = pin; }
+void ESP32Camera::set_power_down_pin(uint8_t pin) { this->config_.pin_pwdn = pin; }
+void ESP32Camera::add_image_callback(std::function<void(std::shared_ptr<CameraImage>)> &&f) {
+  this->new_image_callback_.add(std::move(f));
+}
 void ESP32Camera::set_vertical_flip(bool vertical_flip) { this->vertical_flip_ = vertical_flip; }
 void ESP32Camera::set_horizontal_mirror(bool horizontal_mirror) { this->horizontal_mirror_ = horizontal_mirror; }
 void ESP32Camera::set_contrast(int contrast) { this->contrast_ = contrast; }
 void ESP32Camera::set_brightness(int brightness) { this->brightness_ = brightness; }
 void ESP32Camera::set_saturation(int saturation) { this->saturation_ = saturation; }
-void ESP32Camera::set_special_effect(ESP32SpecialEffect effect) { this->special_effect_ = effect; }
-/* set exposure parameters */
-void ESP32Camera::set_aec_mode(ESP32GainControlMode mode) { this->aec_mode_ = mode; }
-void ESP32Camera::set_aec2(bool aec2) { this->aec2_ = aec2; }
-void ESP32Camera::set_ae_level(int ae_level) { this->ae_level_ = ae_level; }
-void ESP32Camera::set_aec_value(uint32_t aec_value) { this->aec_value_ = aec_value; }
-/* set gains parameters */
-void ESP32Camera::set_agc_mode(ESP32GainControlMode mode) { this->agc_mode_ = mode; }
-void ESP32Camera::set_agc_value(uint8_t agc_value) { this->agc_value_ = agc_value; }
-void ESP32Camera::set_agc_gain_ceiling(ESP32AgcGainCeiling gain_ceiling) { this->agc_gain_ceiling_ = gain_ceiling; }
-/* set white balance */
-void ESP32Camera::set_wb_mode(ESP32WhiteBalanceMode mode) { this->wb_mode_ = mode; }
-/* set test mode */
-void ESP32Camera::set_test_pattern(bool test_pattern) { this->test_pattern_ = test_pattern; }
-/* set fps */
+float ESP32Camera::get_setup_priority() const { return setup_priority::DATA; }
+uint32_t ESP32Camera::hash_base() { return 3010542557UL; }
+void ESP32Camera::request_image() { this->single_requester_ = true; }
+void ESP32Camera::request_stream() { this->last_stream_request_ = millis(); }
+bool ESP32Camera::has_requested_image_() const {
+  if (this->single_requester_)
+    // single request
+    return true;
+
+  uint32_t now = millis();
+  if (now - this->last_stream_request_ < 5000)
+    // stream request
+    return true;
+
+  if (this->idle_update_interval_ != 0 && now - this->last_update_ > this->idle_update_interval_)
+    // idle update
+    return true;
+
+  return false;
+}
+bool ESP32Camera::can_return_image_() const { return this->current_image_.use_count() == 1; }
 void ESP32Camera::set_max_update_interval(uint32_t max_update_interval) {
   this->max_update_interval_ = max_update_interval;
 }
 void ESP32Camera::set_idle_update_interval(uint32_t idle_update_interval) {
   this->idle_update_interval_ = idle_update_interval;
 }
-
-/* ---------------- public API (specific) ---------------- */
-void ESP32Camera::add_image_callback(std::function<void(std::shared_ptr<CameraImage>)> &&f) {
-  this->new_image_callback_.add(std::move(f));
-}
-void ESP32Camera::start_stream(CameraRequester requester) { this->stream_requesters_ |= (1U << requester); }
-void ESP32Camera::stop_stream(CameraRequester requester) { this->stream_requesters_ &= ~(1U << requester); }
-void ESP32Camera::request_image(CameraRequester requester) { this->single_requesters_ |= (1U << requester); }
-void ESP32Camera::update_camera_parameters() {
-  sensor_t *s = esp_camera_sensor_get();
-  /* update image */
-  s->set_vflip(s, this->vertical_flip_);
-  s->set_hmirror(s, this->horizontal_mirror_);
-  s->set_contrast(s, this->contrast_);
-  s->set_brightness(s, this->brightness_);
-  s->set_saturation(s, this->saturation_);
-  s->set_special_effect(s, (int) this->special_effect_);  // 0 to 6
-  /* update exposure */
-  s->set_exposure_ctrl(s, (bool) this->aec_mode_);
-  s->set_aec2(s, this->aec2_);            // 0 = disable , 1 = enable
-  s->set_ae_level(s, this->ae_level_);    // -2 to 2
-  s->set_aec_value(s, this->aec_value_);  // 0 to 1200
-  /* update gains */
-  s->set_gain_ctrl(s, (bool) this->agc_mode_);
-  s->set_agc_gain(s, (int) this->agc_value_);  // 0 to 30
-  s->set_gainceiling(s, (gainceiling_t) this->agc_gain_ceiling_);
-  /* update white balance mode */
-  s->set_wb_mode(s, (int) this->wb_mode_);  // 0 to 4
-  /* update test patern */
-  s->set_colorbar(s, this->test_pattern_);
-}
-
-/* ---------------- Internal methods ---------------- */
-uint32_t ESP32Camera::hash_base() { return 3010542557UL; }
-bool ESP32Camera::has_requested_image_() const { return this->single_requesters_ || this->stream_requesters_; }
-bool ESP32Camera::can_return_image_() const { return this->current_image_.use_count() == 1; }
-void ESP32Camera::framebuffer_task(void *pv) {
-  while (true) {
-    camera_fb_t *framebuffer = esp_camera_fb_get();
-    xQueueSend(global_esp32_camera->framebuffer_get_queue_, &framebuffer, portMAX_DELAY);
-    // return is no-op for config with 1 fb
-    xQueueReceive(global_esp32_camera->framebuffer_return_queue_, &framebuffer, portMAX_DELAY);
-    esp_camera_fb_return(framebuffer);
-  }
-}
+void ESP32Camera::set_test_pattern(bool test_pattern) { this->test_pattern_ = test_pattern; }
 
 ESP32Camera *global_esp32_camera;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 
-/* ---------------- CameraImageReader class ---------------- */
 void CameraImageReader::set_image(std::shared_ptr<CameraImage> image) {
   this->image_ = std::move(image);
   this->offset_ = 0;
@@ -340,15 +296,10 @@ void CameraImageReader::return_image() { this->image_.reset(); }
 void CameraImageReader::consume_data(size_t consumed) { this->offset_ += consumed; }
 uint8_t *CameraImageReader::peek_data_buffer() { return this->image_->get_data_buffer() + this->offset_; }
 
-/* ---------------- CameraImage class ---------------- */
-CameraImage::CameraImage(camera_fb_t *buffer, uint8_t requesters) : buffer_(buffer), requesters_(requesters) {}
-
 camera_fb_t *CameraImage::get_raw_buffer() { return this->buffer_; }
 uint8_t *CameraImage::get_data_buffer() { return this->buffer_->buf; }
 size_t CameraImage::get_data_length() { return this->buffer_->len; }
-bool CameraImage::was_requested_by(CameraRequester requester) const {
-  return (this->requesters_ & (1 << requester)) != 0;
-}
+CameraImage::CameraImage(camera_fb_t *buffer) : buffer_(buffer) {}
 
 }  // namespace esp32_camera
 }  // namespace esphome

esphome/components/esp32_camera/esp32_camera.h

@@ -14,8 +14,29 @@ namespace esp32_camera {
 
 class ESP32Camera;
 
-/* ---------------- enum classes ---------------- */
-enum CameraRequester { IDLE, API_REQUESTER, WEB_REQUESTER };
+class CameraImage {
+ public:
+  CameraImage(camera_fb_t *buffer);
+  camera_fb_t *get_raw_buffer();
+  uint8_t *get_data_buffer();
+  size_t get_data_length();
+
+ protected:
+  camera_fb_t *buffer_;
+};
+
+class CameraImageReader {
+ public:
+  void set_image(std::shared_ptr<CameraImage> image);
+  size_t available() const;
+  uint8_t *peek_data_buffer();
+  void consume_data(size_t consumed);
+  void return_image();
+
+ protected:
+  std::shared_ptr<CameraImage> image_;
+  size_t offset_{0};
+};
 
 enum ESP32CameraFrameSize {
   ESP32_CAMERA_SIZE_160X120,    // QQVGA
@@ -30,165 +51,59 @@ enum ESP32CameraFrameSize {
   ESP32_CAMERA_SIZE_1600X1200,  // UXGA
 };
 
-enum ESP32AgcGainCeiling {
-  ESP32_GAINCEILING_2X = GAINCEILING_2X,
-  ESP32_GAINCEILING_4X = GAINCEILING_4X,
-  ESP32_GAINCEILING_8X = GAINCEILING_8X,
-  ESP32_GAINCEILING_16X = GAINCEILING_16X,
-  ESP32_GAINCEILING_32X = GAINCEILING_32X,
-  ESP32_GAINCEILING_64X = GAINCEILING_64X,
-  ESP32_GAINCEILING_128X = GAINCEILING_128X,
-};
-
-enum ESP32GainControlMode {
-  ESP32_GC_MODE_MANU = false,
-  ESP32_GC_MODE_AUTO = true,
-};
-
-enum ESP32WhiteBalanceMode {
-  ESP32_WB_MODE_AUTO = 0U,
-  ESP32_WB_MODE_SUNNY = 1U,
-  ESP32_WB_MODE_CLOUDY = 2U,
-  ESP32_WB_MODE_OFFICE = 3U,
-  ESP32_WB_MODE_HOME = 4U,
-};
-
-enum ESP32SpecialEffect {
-  ESP32_SPECIAL_EFFECT_NONE = 0U,
-  ESP32_SPECIAL_EFFECT_NEGATIVE = 1U,
-  ESP32_SPECIAL_EFFECT_GRAYSCALE = 2U,
-  ESP32_SPECIAL_EFFECT_RED_TINT = 3U,
-  ESP32_SPECIAL_EFFECT_GREEN_TINT = 4U,
-  ESP32_SPECIAL_EFFECT_BLUE_TINT = 5U,
-  ESP32_SPECIAL_EFFECT_SEPIA = 6U,
-};
-
-/* ---------------- CameraImage class ---------------- */
-class CameraImage {
- public:
-  CameraImage(camera_fb_t *buffer, uint8_t requester);
-  camera_fb_t *get_raw_buffer();
-  uint8_t *get_data_buffer();
-  size_t get_data_length();
-  bool was_requested_by(CameraRequester requester) const;
-
- protected:
-  camera_fb_t *buffer_;
-  uint8_t requesters_;
-};
-
-/* ---------------- CameraImageReader class ---------------- */
-class CameraImageReader {
- public:
-  void set_image(std::shared_ptr<CameraImage> image);
-  size_t available() const;
-  uint8_t *peek_data_buffer();
-  void consume_data(size_t consumed);
-  void return_image();
-
- protected:
-  std::shared_ptr<CameraImage> image_;
-  size_t offset_{0};
-};
-
-/* ---------------- ESP32Camera class ---------------- */
 class ESP32Camera : public Component, public EntityBase {
  public:
   ESP32Camera(const std::string &name);
-  ESP32Camera();
-
-  /* setters */
-  /* -- pin assignment */
   void set_data_pins(std::array<uint8_t, 8> pins);
   void set_vsync_pin(uint8_t pin);
   void set_href_pin(uint8_t pin);
   void set_pixel_clock_pin(uint8_t pin);
   void set_external_clock(uint8_t pin, uint32_t frequency);
   void set_i2c_pins(uint8_t sda, uint8_t scl);
-  void set_reset_pin(uint8_t pin);
-  void set_power_down_pin(uint8_t pin);
-  /* -- image */
   void set_frame_size(ESP32CameraFrameSize size);
   void set_jpeg_quality(uint8_t quality);
+  void set_reset_pin(uint8_t pin);
+  void set_power_down_pin(uint8_t pin);
   void set_vertical_flip(bool vertical_flip);
   void set_horizontal_mirror(bool horizontal_mirror);
   void set_contrast(int contrast);
   void set_brightness(int brightness);
   void set_saturation(int saturation);
-  void set_special_effect(ESP32SpecialEffect effect);
-  /* -- exposure */
-  void set_aec_mode(ESP32GainControlMode mode);
-  void set_aec2(bool aec2);
-  void set_ae_level(int ae_level);
-  void set_aec_value(uint32_t aec_value);
-  /* -- gains */
-  void set_agc_mode(ESP32GainControlMode mode);
-  void set_agc_value(uint8_t agc_value);
-  void set_agc_gain_ceiling(ESP32AgcGainCeiling gain_ceiling);
-  /* -- white balance */
-  void set_wb_mode(ESP32WhiteBalanceMode mode);
-  /* -- test */
-  void set_test_pattern(bool test_pattern);
-  /* -- framerates */
   void set_max_update_interval(uint32_t max_update_interval);
   void set_idle_update_interval(uint32_t idle_update_interval);
-
-  /* public API (derivated) */
+  void set_test_pattern(bool test_pattern);
   void setup() override;
   void loop() override;
   void dump_config() override;
-  float get_setup_priority() const override;
-  /* public API (specific) */
   void add_image_callback(std::function<void(std::shared_ptr<CameraImage>)> &&f);
-  void start_stream(CameraRequester requester);
-  void stop_stream(CameraRequester requester);
-  void request_image(CameraRequester requester);
-  void update_camera_parameters();
+  float get_setup_priority() const override;
+  void request_stream();
+  void request_image();
 
  protected:
-  /* internal methods */
   uint32_t hash_base() override;
   bool has_requested_image_() const;
   bool can_return_image_() const;
 
   static void framebuffer_task(void *pv);
 
-  /* attributes */
-  /* camera configuration */
   camera_config_t config_{};
-  /* -- image */
   bool vertical_flip_{true};
   bool horizontal_mirror_{true};
   int contrast_{0};
   int brightness_{0};
   int saturation_{0};
-  ESP32SpecialEffect special_effect_{ESP32_SPECIAL_EFFECT_NONE};
-  /* -- exposure */
-  ESP32GainControlMode aec_mode_{ESP32_GC_MODE_AUTO};
-  bool aec2_{false};
-  int ae_level_{0};
-  uint32_t aec_value_{300};
-  /* -- gains */
-  ESP32GainControlMode agc_mode_{ESP32_GC_MODE_AUTO};
-  uint8_t agc_value_{0};
-  ESP32AgcGainCeiling agc_gain_ceiling_{ESP32_GAINCEILING_2X};
-  /* -- white balance */
-  ESP32WhiteBalanceMode wb_mode_{ESP32_WB_MODE_AUTO};
-  /* -- Test */
   bool test_pattern_{false};
-  /* -- framerates */
-  uint32_t max_update_interval_{1000};
-  uint32_t idle_update_interval_{15000};
 
   esp_err_t init_error_{ESP_OK};
   std::shared_ptr<CameraImage> current_image_;
-  uint8_t single_requesters_{0};
-  uint8_t stream_requesters_{0};
+  uint32_t last_stream_request_{0};
+  bool single_requester_{false};
   QueueHandle_t framebuffer_get_queue_;
   QueueHandle_t framebuffer_return_queue_;
   CallbackManager<void(std::shared_ptr<CameraImage>)> new_image_callback_;
-
-  uint32_t last_idle_request_{0};
+  uint32_t max_update_interval_{1000};
+  uint32_t idle_update_interval_{15000};
   uint32_t last_update_{0};
 };
 

esphome/components/esp32_camera_web_server/__init__.py

@@ -1,28 +0,0 @@
-import esphome.config_validation as cv
-import esphome.codegen as cg
-from esphome.const import CONF_ID, CONF_PORT, CONF_MODE
-
-CODEOWNERS = ["@ayufan"]
-DEPENDENCIES = ["esp32_camera"]
-MULTI_CONF = True
-
-esp32_camera_web_server_ns = cg.esphome_ns.namespace("esp32_camera_web_server")
-CameraWebServer = esp32_camera_web_server_ns.class_("CameraWebServer", cg.Component)
-Mode = esp32_camera_web_server_ns.enum("Mode")
-
-MODES = {"STREAM": Mode.STREAM, "SNAPSHOT": Mode.SNAPSHOT}
-
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(CameraWebServer),
-        cv.Required(CONF_PORT): cv.port,
-        cv.Required(CONF_MODE): cv.enum(MODES, upper=True),
-    },
-).extend(cv.COMPONENT_SCHEMA)
-
-
-async def to_code(config):
-    server = cg.new_Pvariable(config[CONF_ID])
-    cg.add(server.set_port(config[CONF_PORT]))
-    cg.add(server.set_mode(config[CONF_MODE]))
-    await cg.register_component(server, config)

esphome/components/esp32_camera_web_server/camera_web_server.cpp

@@ -1,244 +0,0 @@
-#ifdef USE_ESP32
-
-#include "camera_web_server.h"
-#include "esphome/core/application.h"
-#include "esphome/core/hal.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-#include "esphome/core/util.h"
-
-#include <cstdlib>
-#include <esp_http_server.h>
-#include <utility>
-
-namespace esphome {
-namespace esp32_camera_web_server {
-
-static const int IMAGE_REQUEST_TIMEOUT = 5000;
-static const char *const TAG = "esp32_camera_web_server";
-
-#define PART_BOUNDARY "123456789000000000000987654321"
-#define CONTENT_TYPE "image/jpeg"
-#define CONTENT_LENGTH "Content-Length"
-
-static const char *const STREAM_HEADER = "HTTP/1.0 200 OK\r\n"
-                                         "Access-Control-Allow-Origin: *\r\n"
-                                         "Connection: close\r\n"
-                                         "Content-Type: multipart/x-mixed-replace;boundary=" PART_BOUNDARY "\r\n"
-                                         "\r\n"
-                                         "--" PART_BOUNDARY "\r\n";
-static const char *const STREAM_ERROR = "Content-Type: text/plain\r\n"
-                                        "\r\n"
-                                        "No frames send.\r\n"
-                                        "--" PART_BOUNDARY "\r\n";
-static const char *const STREAM_PART = "Content-Type: " CONTENT_TYPE "\r\n" CONTENT_LENGTH ": %u\r\n\r\n";
-static const char *const STREAM_BOUNDARY = "\r\n"
-                                           "--" PART_BOUNDARY "\r\n";
-
-CameraWebServer::CameraWebServer() {}
-
-CameraWebServer::~CameraWebServer() {}
-
-void CameraWebServer::setup() {
-  if (!esp32_camera::global_esp32_camera || esp32_camera::global_esp32_camera->is_failed()) {
-    this->mark_failed();
-    return;
-  }
-
-  this->semaphore_ = xSemaphoreCreateBinary();
-
-  httpd_config_t config = HTTPD_DEFAULT_CONFIG();
-  config.server_port = this->port_;
-  config.ctrl_port = this->port_;
-  config.max_open_sockets = 1;
-  config.backlog_conn = 2;
-  config.lru_purge_enable = true;
-
-  if (httpd_start(&this->httpd_, &config) != ESP_OK) {
-    mark_failed();
-    return;
-  }
-
-  httpd_uri_t uri = {
-      .uri = "/",
-      .method = HTTP_GET,
-      .handler = [](struct httpd_req *req) { return ((CameraWebServer *) req->user_ctx)->handler_(req); },
-      .user_ctx = this};
-
-  httpd_register_uri_handler(this->httpd_, &uri);
-
-  esp32_camera::global_esp32_camera->add_image_callback([this](std::shared_ptr<esp32_camera::CameraImage> image) {
-    if (this->running_ && image->was_requested_by(esp32_camera::WEB_REQUESTER)) {
-      this->image_ = std::move(image);
-      xSemaphoreGive(this->semaphore_);
-    }
-  });
-}
-
-void CameraWebServer::on_shutdown() {
-  this->running_ = false;
-  this->image_ = nullptr;
-  httpd_stop(this->httpd_);
-  this->httpd_ = nullptr;
-  vSemaphoreDelete(this->semaphore_);
-  this->semaphore_ = nullptr;
-}
-
-void CameraWebServer::dump_config() {
-  ESP_LOGCONFIG(TAG, "ESP32 Camera Web Server:");
-  ESP_LOGCONFIG(TAG, "  Port: %d", this->port_);
-  if (this->mode_ == STREAM) {
-    ESP_LOGCONFIG(TAG, "  Mode: stream");
-  } else {
-    ESP_LOGCONFIG(TAG, "  Mode: snapshot");
-  }
-
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, "  Setup Failed");
-  }
-}
-
-float CameraWebServer::get_setup_priority() const { return setup_priority::LATE; }
-
-void CameraWebServer::loop() {
-  if (!this->running_) {
-    this->image_ = nullptr;
-  }
-}
-
-std::shared_ptr<esphome::esp32_camera::CameraImage> CameraWebServer::wait_for_image_() {
-  std::shared_ptr<esphome::esp32_camera::CameraImage> image;
-  image.swap(this->image_);
-
-  if (!image) {
-    // retry as we might still be fetching image
-    xSemaphoreTake(this->semaphore_, IMAGE_REQUEST_TIMEOUT / portTICK_PERIOD_MS);
-    image.swap(this->image_);
-  }
-
-  return image;
-}
-
-esp_err_t CameraWebServer::handler_(struct httpd_req *req) {
-  esp_err_t res = ESP_FAIL;
-
-  this->image_ = nullptr;
-  this->running_ = true;
-
-  switch (this->mode_) {
-    case STREAM:
-      res = this->streaming_handler_(req);
-      break;
-
-    case SNAPSHOT:
-      res = this->snapshot_handler_(req);
-      break;
-  }
-
-  this->running_ = false;
-  this->image_ = nullptr;
-  return res;
-}
-
-static esp_err_t httpd_send_all(httpd_req_t *r, const char *buf, size_t buf_len) {
-  int ret;
-
-  while (buf_len > 0) {
-    ret = httpd_send(r, buf, buf_len);
-    if (ret < 0) {
-      return ESP_FAIL;
-    }
-    buf += ret;
-    buf_len -= ret;
-  }
-  return ESP_OK;
-}
-
-esp_err_t CameraWebServer::streaming_handler_(struct httpd_req *req) {
-  esp_err_t res = ESP_OK;
-  char part_buf[64];
-
-  // This manually constructs HTTP response to avoid chunked encoding
-  // which is not supported by some clients
-
-  res = httpd_send_all(req, STREAM_HEADER, strlen(STREAM_HEADER));
-  if (res != ESP_OK) {
-    ESP_LOGW(TAG, "STREAM: failed to set HTTP header");
-    return res;
-  }
-
-  uint32_t last_frame = millis();
-  uint32_t frames = 0;
-
-  esp32_camera::global_esp32_camera->start_stream(esphome::esp32_camera::WEB_REQUESTER);
-
-  while (res == ESP_OK && this->running_) {
-    auto image = this->wait_for_image_();
-
-    if (!image) {
-      ESP_LOGW(TAG, "STREAM: failed to acquire frame");
-      res = ESP_FAIL;
-    }
-    if (res == ESP_OK) {
-      size_t hlen = snprintf(part_buf, 64, STREAM_PART, image->get_data_length());
-      res = httpd_send_all(req, part_buf, hlen);
-    }
-    if (res == ESP_OK) {
-      res = httpd_send_all(req, (const char *) image->get_data_buffer(), image->get_data_length());
-    }
-    if (res == ESP_OK) {
-      res = httpd_send_all(req, STREAM_BOUNDARY, strlen(STREAM_BOUNDARY));
-    }
-    if (res == ESP_OK) {
-      frames++;
-      int64_t frame_time = millis() - last_frame;
-      last_frame = millis();
-
-      ESP_LOGD(TAG, "MJPG: %uB %ums (%.1ffps)", (uint32_t) image->get_data_length(), (uint32_t) frame_time,
-               1000.0 / (uint32_t) frame_time);
-    }
-  }
-
-  if (!frames) {
-    res = httpd_send_all(req, STREAM_ERROR, strlen(STREAM_ERROR));
-  }
-
-  esp32_camera::global_esp32_camera->stop_stream(esphome::esp32_camera::WEB_REQUESTER);
-
-  ESP_LOGI(TAG, "STREAM: closed. Frames: %u", frames);
-
-  return res;
-}
-
-esp_err_t CameraWebServer::snapshot_handler_(struct httpd_req *req) {
-  esp_err_t res = ESP_OK;
-
-  esp32_camera::global_esp32_camera->request_image(esphome::esp32_camera::WEB_REQUESTER);
-
-  auto image = this->wait_for_image_();
-
-  if (!image) {
-    ESP_LOGW(TAG, "SNAPSHOT: failed to acquire frame");
-    httpd_resp_send_500(req);
-    res = ESP_FAIL;
-    return res;
-  }
-
-  res = httpd_resp_set_type(req, CONTENT_TYPE);
-  if (res != ESP_OK) {
-    ESP_LOGW(TAG, "SNAPSHOT: failed to set HTTP response type");
-    return res;
-  }
-
-  httpd_resp_set_hdr(req, "Content-Disposition", "inline; filename=capture.jpg");
-
-  if (res == ESP_OK) {
-    res = httpd_resp_send(req, (const char *) image->get_data_buffer(), image->get_data_length());
-  }
-  return res;
-}
-
-}  // namespace esp32_camera_web_server
-}  // namespace esphome
-
-#endif  // USE_ESP32

esphome/components/esp32_camera_web_server/camera_web_server.h

@@ -1,50 +0,0 @@
-#pragma once
-
-#ifdef USE_ESP32
-
-#include <freertos/FreeRTOS.h>
-#include <freertos/semphr.h>
-
-#include "esphome/components/esp32_camera/esp32_camera.h"
-#include "esphome/core/component.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/preferences.h"
-
-struct httpd_req;
-
-namespace esphome {
-namespace esp32_camera_web_server {
-
-enum Mode { STREAM, SNAPSHOT };
-
-class CameraWebServer : public Component {
- public:
-  CameraWebServer();
-  ~CameraWebServer();
-
-  void setup() override;
-  void on_shutdown() override;
-  void dump_config() override;
-  float get_setup_priority() const override;
-  void set_port(uint16_t port) { this->port_ = port; }
-  void set_mode(Mode mode) { this->mode_ = mode; }
-  void loop() override;
-
- protected:
-  std::shared_ptr<esphome::esp32_camera::CameraImage> wait_for_image_();
-  esp_err_t handler_(struct httpd_req *req);
-  esp_err_t streaming_handler_(struct httpd_req *req);
-  esp_err_t snapshot_handler_(struct httpd_req *req);
-
-  uint16_t port_{0};
-  void *httpd_{nullptr};
-  SemaphoreHandle_t semaphore_;
-  std::shared_ptr<esphome::esp32_camera::CameraImage> image_;
-  bool running_{false};
-  Mode mode_{STREAM};
-};
-
-}  // namespace esp32_camera_web_server
-}  // namespace esphome
-
-#endif  // USE_ESP32