Fix missing s

2022.12.6

.devcontainer/devcontainer.json

@@ -51,6 +51,6 @@
     "files.associations": {
       "**/.vscode/*.json": "jsonc"
     },
-    "C_Cpp.clang_format_path": "/usr/bin/clang-format-13",
+    "C_Cpp.clang_format_path": "/usr/bin/clang-format-11",
   }
 }

.github/workflows/ci-docker.yml

@@ -23,11 +23,6 @@ permissions:
   contents: read
   packages: read
 
-concurrency:
-  # yamllint disable-line rule:line-length
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
   check-docker:
     name: Build docker containers

.github/workflows/ci.yml

@@ -7,7 +7,6 @@ on:
     branches: [dev, beta, release]
 
   pull_request:
-  merge_group:
 
 permissions:
   contents: read
@@ -41,10 +40,6 @@ jobs:
             file: tests/test3.yaml
             name: Test tests/test3.yaml
             pio_cache_key: test3
-          - id: test
-            file: tests/test3.1.yaml
-            name: Test tests/test3.1.yaml
-            pio_cache_key: test3.1
           - id: test
             file: tests/test4.yaml
             name: Test tests/test4.yaml
@@ -57,10 +52,6 @@ jobs:
             file: tests/test6.yaml
             name: Test tests/test6.yaml
             pio_cache_key: test6
-          - id: test
-            file: tests/test7.yaml
-            name: Test tests/test7.yaml
-            pio_cache_key: test7
           - id: pytest
             name: Run pytest
           - id: clang-format
@@ -133,7 +124,7 @@ jobs:
       - name: Install clang tools
         run: |
           sudo apt-get install \
-              clang-format-13 \
+              clang-format-11 \
               clang-tidy-11
         if: matrix.id == 'clang-tidy' || matrix.id == 'clang-format'
 
@@ -186,22 +177,9 @@ jobs:
 
       - name: Run yamllint
         if: matrix.id == 'yamllint'
-        uses: frenck/action-yamllint@v1.4.0
+        uses: frenck/action-yamllint@v1.3.1
 
       - name: Suggested changes
         run: script/ci-suggest-changes
         # yamllint disable-line rule:line-length
         if: always() && (matrix.id == 'clang-tidy' || matrix.id == 'clang-format' || matrix.id == 'lint-python')
-
-  ci-status:
-    name: CI Status
-    runs-on: ubuntu-latest
-    needs: [ci]
-    if: always()
-    steps:
-      - name: Successful deploy
-        if: ${{ !(contains(needs.*.result, 'failure')) }}
-        run: exit 0
-      - name: Failing deploy
-        if: ${{ contains(needs.*.result, 'failure') }}
-        run: exit 1

.github/workflows/release.yml

@@ -67,10 +67,8 @@ jobs:
       contents: read
       packages: write
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.image.title == 'lint' }}
     needs: [init]
     strategy:
-      fail-fast: false
       matrix:
         image:
           - title: "ha-addon"
@@ -138,18 +136,15 @@ jobs:
     runs-on: ubuntu-latest
     needs: [deploy-docker]
     steps:
-      - name: Trigger Workflow
-        uses: actions/github-script@v6
-        with:
-          github-token: ${{ secrets.DEPLOY_HA_ADDON_REPO_TOKEN }}
-          script: |
-            github.rest.actions.createWorkflowDispatch({
-              owner: "esphome",
-              repo: "home-assistant-addon",
-              workflow_id: "bump-version.yml",
-              ref: "main",
-              inputs: {
-                version: "${{ github.event.release.tag_name }}",
-                content: ${{ toJSON(github.event.release.body) }}
-              }
-            })
+      - env:
+          TOKEN: ${{ secrets.DEPLOY_HA_ADDON_REPO_TOKEN }}
+        # yamllint disable rule:line-length
+        run: |
+          TAG="${GITHUB_REF#refs/tags/}"
+          curl \
+            -u ":$TOKEN" \
+            -X POST \
+            -H "Accept: application/vnd.github.v3+json" \
+            https://api.github.com/repos/esphome/home-assistant-addon/actions/workflows/bump-version.yml/dispatches \
+            -d "{\"ref\":\"main\",\"inputs\":{\"version\":\"$TAG\"}}"
+        # yamllint enable rule:line-length

.github/workflows/stale.yml

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

.gitignore

@@ -128,5 +128,3 @@ tests/.esphome/
 
 sdkconfig.*
 !sdkconfig.defaults
-
-.tests/

.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/ambv/black
-    rev: 23.1.0
+    rev: 22.10.0
     hooks:
       - id: black
         args:
@@ -27,7 +27,7 @@ repos:
           - --branch=release
           - --branch=beta
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.1
+    rev: v3.3.0
     hooks:
       - id: pyupgrade
         args: [--py39-plus]

CODEOWNERS

@@ -11,7 +11,6 @@ esphome/*.py @esphome/core
 esphome/core/* @esphome/core
 
 # Integrations
-esphome/components/absolute_humidity/* @DAVe3283
 esphome/components/ac_dimmer/* @glmnet
 esphome/components/adc/* @esphome/core
 esphome/components/adc128s102/* @DeerMaximum
@@ -25,7 +24,6 @@ esphome/components/analog_threshold/* @ianchi
 esphome/components/animation/* @syndlex
 esphome/components/anova/* @buxtronix
 esphome/components/api/* @OttoWinter
-esphome/components/as7341/* @mrgnr
 esphome/components/async_tcp/* @OttoWinter
 esphome/components/atc_mithermometer/* @ahpohl
 esphome/components/b_parasite/* @rbaron
@@ -43,8 +41,6 @@ esphome/components/ble_client/* @buxtronix
 esphome/components/bluetooth_proxy/* @jesserockz
 esphome/components/bme680_bsec/* @trvrnrth
 esphome/components/bmp3xx/* @martgras
-esphome/components/bp1658cj/* @Cossid
-esphome/components/bp5758d/* @Cossid
 esphome/components/button/* @esphome/core
 esphome/components/canbus/* @danielschramm @mvturnho
 esphome/components/cap1188/* @MrEditor97
@@ -73,7 +69,6 @@ esphome/components/display_menu_base/* @numo68
 esphome/components/dps310/* @kbx81
 esphome/components/ds1307/* @badbadc0ffee
 esphome/components/dsmr/* @glmnet @zuidwijk
-esphome/components/ee895/* @Stock-M
 esphome/components/ektf2232/* @jesserockz
 esphome/components/ens210/* @itn3rd77
 esphome/components/esp32/* @esphome/core
@@ -92,13 +87,11 @@ esphome/components/factory_reset/* @anatoly-savchenkov
 esphome/components/fastled_base/* @OttoWinter
 esphome/components/feedback/* @ianchi
 esphome/components/fingerprint_grow/* @OnFreund @loongyh
-esphome/components/fs3000/* @kahrendt
 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/haier/* @Yarikx
 esphome/components/havells_solar/* @sourabhjaiswal
 esphome/components/hbridge/fan/* @WeekendWarrior
 esphome/components/hbridge/light/* @DotNetDann
@@ -107,33 +100,24 @@ esphome/components/hitachi_ac424/* @sourabhjaiswal
 esphome/components/homeassistant/* @OttoWinter
 esphome/components/honeywellabp/* @RubyBailey
 esphome/components/hrxl_maxsonar_wr/* @netmikey
-esphome/components/hte501/* @Stock-M
 esphome/components/hydreon_rgxx/* @functionpointer
 esphome/components/i2c/* @esphome/core
 esphome/components/i2s_audio/* @jesserockz
-esphome/components/ili9xxx/* @nielsnl68
-esphome/components/improv_base/* @esphome/core
 esphome/components/improv_serial/* @esphome/core
 esphome/components/ina260/* @MrEditor97
 esphome/components/inkbird_ibsth1_mini/* @fkirill
 esphome/components/inkplate6/* @jesserockz
 esphome/components/integration/* @OttoWinter
-esphome/components/internal_temperature/* @Mat931
 esphome/components/interval/* @esphome/core
 esphome/components/json/* @OttoWinter
 esphome/components/kalman_combinator/* @Cat-Ion
-esphome/components/key_collector/* @ssieb
-esphome/components/key_provider/* @ssieb
-esphome/components/kuntze/* @ssieb
 esphome/components/lcd_menu/* @numo68
-esphome/components/ld2410/* @sebcaps
 esphome/components/ledc/* @OttoWinter
 esphome/components/light/* @esphome/core
 esphome/components/lilygo_t5_47/touchscreen/* @jesserockz
 esphome/components/lock/* @esphome/core
 esphome/components/logger/* @esphome/core
 esphome/components/ltr390/* @sjtrny
-esphome/components/matrix_keypad/* @ssieb
 esphome/components/max31865/* @DAVe3283
 esphome/components/max44009/* @berfenger
 esphome/components/max7219digit/* @rspaargaren
@@ -154,7 +138,6 @@ esphome/components/mcp9808/* @k7hpn
 esphome/components/md5/* @esphome/core
 esphome/components/mdns/* @esphome/core
 esphome/components/media_player/* @jesserockz
-esphome/components/mics_4514/* @jesserockz
 esphome/components/midea/* @dudanov
 esphome/components/midea_ir/* @dudanov
 esphome/components/mitsubishi/* @RubyBailey
@@ -167,9 +150,8 @@ esphome/components/modbus_controller/select/* @martgras @stegm
 esphome/components/modbus_controller/sensor/* @martgras
 esphome/components/modbus_controller/switch/* @martgras
 esphome/components/modbus_controller/text_sensor/* @martgras
-esphome/components/mopeka_ble/* @Fabian-Schmidt @spbrogan
+esphome/components/mopeka_ble/* @spbrogan
 esphome/components/mopeka_pro_check/* @spbrogan
-esphome/components/mopeka_std_check/* @Fabian-Schmidt
 esphome/components/mpl3115a2/* @kbickar
 esphome/components/mpu6886/* @fabaff
 esphome/components/network/* @esphome/core
@@ -182,8 +164,6 @@ esphome/components/nfc/* @jesserockz
 esphome/components/number/* @esphome/core
 esphome/components/ota/* @esphome/core
 esphome/components/output/* @esphome/core
-esphome/components/pca9554/* @hwstar
-esphome/components/pcf85063/* @brogon
 esphome/components/pid/* @OttoWinter
 esphome/components/pipsolar/* @andreashergert1984
 esphome/components/pm1006/* @habbie
@@ -216,7 +196,6 @@ esphome/components/sdm_meter/* @jesserockz @polyfaces
 esphome/components/sdp3x/* @Azimath
 esphome/components/selec_meter/* @sourabhjaiswal
 esphome/components/select/* @esphome/core
-esphome/components/sen21231/* @shreyaskarnik
 esphome/components/sen5x/* @martgras
 esphome/components/sensirion_common/* @martgras
 esphome/components/sensor/* @esphome/core
@@ -225,12 +204,8 @@ esphome/components/sgp4x/* @SenexCrenshaw @martgras
 esphome/components/shelly_dimmer/* @edge90 @rnauber
 esphome/components/sht4x/* @sjtrny
 esphome/components/shutdown/* @esphome/core @jsuanet
-esphome/components/sigma_delta_output/* @Cat-Ion
 esphome/components/sim800l/* @glmnet
-esphome/components/sm10bit_base/* @Cossid
 esphome/components/sm2135/* @BoukeHaarsma23
-esphome/components/sm2235/* @Cossid
-esphome/components/sm2335/* @Cossid
 esphome/components/sml/* @alengwenus
 esphome/components/smt100/* @piechade
 esphome/components/sn74hc165/* @jesserockz
@@ -259,7 +234,6 @@ esphome/components/switch/* @esphome/core
 esphome/components/t6615/* @tylermenezes
 esphome/components/tca9548a/* @andreashergert1984
 esphome/components/tcl112/* @glmnet
-esphome/components/tee501/* @Stock-M
 esphome/components/teleinfo/* @0hax
 esphome/components/thermostat/* @kbx81
 esphome/components/time/* @OttoWinter
@@ -284,15 +258,12 @@ esphome/components/uart/* @esphome/core
 esphome/components/ufire_ec/* @pvizeli
 esphome/components/ufire_ise/* @pvizeli
 esphome/components/ultrasonic/* @OttoWinter
-esphome/components/vbus/* @ssieb
 esphome/components/version/* @esphome/core
 esphome/components/wake_on_lan/* @willwill2will54
 esphome/components/web_server_base/* @OttoWinter
 esphome/components/whirlpool/* @glmnet
 esphome/components/whynter/* @aeonsablaze
-esphome/components/wiegand/* @ssieb
 esphome/components/wl_134/* @hobbypunk90
-esphome/components/x9c/* @EtienneMD
 esphome/components/xiaomi_lywsd03mmc/* @ahpohl
 esphome/components/xiaomi_mhoc303/* @drug123
 esphome/components/xiaomi_mhoc401/* @vevsvevs

MANIFEST.in

@@ -1,6 +1,8 @@
 include LICENSE
 include README.md
 include requirements.txt
-recursive-include esphome *.cpp *.h *.tcc *.c
+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

@@ -6,9 +6,9 @@
 ARG BASEIMGTYPE=docker
 
 # https://github.com/hassio-addons/addon-debian-base/releases
-FROM ghcr.io/hassio-addons/debian-base:6.2.3 AS base-hassio
+FROM ghcr.io/hassio-addons/debian-base:6.1.3 AS base-hassio
 # https://hub.docker.com/_/debian?tab=tags&page=1&name=bullseye
-FROM debian:bullseye-20230208-slim AS base-docker
+FROM debian:bullseye-20221024-slim AS base-docker
 
 FROM base-${BASEIMGTYPE} AS base
 
@@ -26,7 +26,7 @@ RUN \
         python3-cryptography=3.3.2-1 \
         iputils-ping=3:20210202-1 \
         git=1:2.30.2-1 \
-        curl=7.74.0-1.3+deb11u7 \
+        curl=7.74.0-1.3+deb11u3 \
         openssh-client=1:8.4p1-5+deb11u1 \
     && rm -rf \
         /tmp/* \
@@ -51,7 +51,7 @@ RUN \
     # Ubuntu python3-pip is missing wheel
     pip3 install --no-cache-dir \
         wheel==0.37.1 \
-        platformio==6.1.6 \
+        platformio==6.1.5 \
     # Change some platformio settings
     && platformio settings set enable_telemetry No \
     && platformio settings set check_platformio_interval 1000000 \
@@ -135,7 +135,7 @@ RUN \
     apt-get update \
     # Use pinned versions so that we get updates with build caching
     && apt-get install -y --no-install-recommends \
-        clang-format-13=1:13.0.1-6~deb11u1 \
+        clang-format-11=1:11.0.1-2 \
         clang-tidy-11=1:11.0.1-2 \
         patch=2.7.6-7 \
         software-properties-common=0.96.20.2-2.1 \

docker/build.py

@@ -8,49 +8,32 @@ import re
 import sys
 
 
-CHANNEL_DEV = "dev"
-CHANNEL_BETA = "beta"
-CHANNEL_RELEASE = "release"
+CHANNEL_DEV = 'dev'
+CHANNEL_BETA = 'beta'
+CHANNEL_RELEASE = 'release'
 CHANNELS = [CHANNEL_DEV, CHANNEL_BETA, CHANNEL_RELEASE]
 
-ARCH_AMD64 = "amd64"
-ARCH_ARMV7 = "armv7"
-ARCH_AARCH64 = "aarch64"
+ARCH_AMD64 = 'amd64'
+ARCH_ARMV7 = 'armv7'
+ARCH_AARCH64 = 'aarch64'
 ARCHS = [ARCH_AMD64, ARCH_ARMV7, ARCH_AARCH64]
 
-TYPE_DOCKER = "docker"
-TYPE_HA_ADDON = "ha-addon"
-TYPE_LINT = "lint"
+TYPE_DOCKER = 'docker'
+TYPE_HA_ADDON = 'ha-addon'
+TYPE_LINT = 'lint'
 TYPES = [TYPE_DOCKER, TYPE_HA_ADDON, TYPE_LINT]
 
 
 parser = argparse.ArgumentParser()
-parser.add_argument(
-    "--tag",
-    type=str,
-    required=True,
-    help="The main docker tag to push to. If a version number also adds latest and/or beta tag",
-)
-parser.add_argument(
-    "--arch", choices=ARCHS, required=False, help="The architecture to build for"
-)
-parser.add_argument(
-    "--build-type", choices=TYPES, required=True, help="The type of build to run"
-)
-parser.add_argument(
-    "--dry-run", action="store_true", help="Don't run any commands, just print them"
-)
-subparsers = parser.add_subparsers(
-    help="Action to perform", dest="command", required=True
-)
+parser.add_argument("--tag", type=str, required=True, help="The main docker tag to push to. If a version number also adds latest and/or beta tag")
+parser.add_argument("--arch", choices=ARCHS, required=False, help="The architecture to build for")
+parser.add_argument("--build-type", choices=TYPES, required=True, help="The type of build to run")
+parser.add_argument("--dry-run", action="store_true", help="Don't run any commands, just print them")
+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"
-)
+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")
 
 
 @dataclass(frozen=True)
@@ -66,7 +49,7 @@ class DockerParams:
         prefix = {
             TYPE_DOCKER: "esphome/esphome",
             TYPE_HA_ADDON: "esphome/esphome-hassio",
-            TYPE_LINT: "esphome/esphome-lint",
+            TYPE_LINT: "esphome/esphome-lint"
         }[build_type]
         build_to = f"{prefix}-{arch}"
         baseimgtype = {
@@ -145,21 +128,13 @@ def main():
 
         # 3. build
         cmd = [
-            "docker",
-            "buildx",
-            "build",
-            "--build-arg",
-            f"BASEIMGTYPE={params.baseimgtype}",
-            "--build-arg",
-            f"BUILD_VERSION={args.tag}",
-            "--cache-from",
-            f"type=registry,ref={cache_img}",
-            "--file",
-            "docker/Dockerfile",
-            "--platform",
-            params.platform,
-            "--target",
-            params.target,
+            "docker", "buildx", "build",
+            "--build-arg", f"BASEIMGTYPE={params.baseimgtype}",
+            "--build-arg", f"BUILD_VERSION={args.tag}",
+            "--cache-from", f"type=registry,ref={cache_img}",
+            "--file", "docker/Dockerfile",
+            "--platform", params.platform,
+            "--target", params.target,
         ]
         for img in imgs:
             cmd += ["--tag", img]
@@ -185,7 +160,9 @@ def main():
             run_command(*cmd)
         # 2. Push manifests
         for target in targets:
-            run_command("docker", "manifest", "push", target)
+            run_command(
+                "docker", "manifest", "push", target
+            )
 
 
 if __name__ == "__main__":

docker/ha-addon-rootfs/etc/cont-init.d/10-requirements.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# Community Hass.io Add-ons: ESPHome
+# This files check if all user configuration requirements are met
+# ==============================================================================
+
+# Check SSL requirements, if enabled
+if bashio::config.true 'ssl'; then
+    if ! bashio::config.has_value 'certfile'; then
+        bashio::log.fatal 'SSL is enabled, but no certfile was specified.'
+        bashio::exit.nok
+    fi
+
+    if ! bashio::config.has_value 'keyfile'; then
+        bashio::log.fatal 'SSL is enabled, but no keyfile was specified'
+        bashio::exit.nok
+    fi
+
+
+    certfile="/ssl/$(bashio::config 'certfile')"
+    keyfile="/ssl/$(bashio::config 'keyfile')"
+
+    if ! bashio::fs.file_exists "${certfile}"; then
+        if ! bashio::fs.file_exists "${keyfile}"; then
+            # Both files are missing, let's print a friendlier error message
+            bashio::log.fatal 'You enabled encrypted connections using the "ssl": true option.'
+            bashio::log.fatal "However, the SSL files '${certfile}' and '${keyfile}'"
+            bashio::log.fatal "were not found. If you're using Hass.io on your local network and don't want"
+            bashio::log.fatal 'to encrypt connections to the ESPHome dashboard, you can manually disable'
+            bashio::log.fatal 'SSL by setting "ssl" to false."'
+            bashio::exit.nok
+        fi
+        bashio::log.fatal "The configured certfile '${certfile}' was not found."
+        bashio::exit.nok
+    fi
+
+    if ! bashio::fs.file_exists "/ssl/$(bashio::config 'keyfile')"; then
+        bashio::log.fatal "The configured keyfile '${keyfile}' was not found."
+        bashio::exit.nok
+    fi
+fi

docker/ha-addon-rootfs/etc/cont-init.d/20-nginx.sh

@@ -0,0 +1,34 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# Community Hass.io Add-ons: ESPHome
+# Configures NGINX for use with ESPHome
+# ==============================================================================
+
+declare certfile
+declare keyfile
+declare direct_port
+declare ingress_interface
+declare ingress_port
+
+mkdir -p /var/log/nginx
+
+direct_port=$(bashio::addon.port 6052)
+if bashio::var.has_value "${direct_port}"; then
+    if bashio::config.true 'ssl'; then
+        certfile=$(bashio::config 'certfile')
+        keyfile=$(bashio::config 'keyfile')
+
+        mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf
+        sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/servers/direct.conf
+        sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/servers/direct.conf
+    else
+        mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf
+    fi
+
+    sed -i "s/%%port%%/${direct_port}/g" /etc/nginx/servers/direct.conf
+fi
+
+ingress_port=$(bashio::addon.ingress_port)
+ingress_interface=$(bashio::addon.ip_address)
+sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf
+sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf

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

@@ -0,0 +1,9 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# Community Hass.io Add-ons: ESPHome
+# This files creates all directories used by esphome
+# ==============================================================================
+
+pio_cache_base=/data/cache/platformio
+
+mkdir -p "${pio_cache_base}"

docker/ha-addon-rootfs/etc/nginx/includes/proxy_params.conf

@@ -1,9 +1,9 @@
-proxy_http_version          1.1;
-proxy_ignore_client_abort   off;
-proxy_read_timeout          86400s;
-proxy_redirect              off;
-proxy_send_timeout          86400s;
-proxy_max_temp_file_size    0;
+proxy_http_version 1.1;
+proxy_ignore_client_abort off;
+proxy_read_timeout 86400s;
+proxy_redirect off;
+proxy_send_timeout 86400s;
+proxy_max_temp_file_size 0;
 
 proxy_set_header Accept-Encoding "";
 proxy_set_header Connection $connection_upgrade;

docker/ha-addon-rootfs/etc/nginx/includes/server_params.conf

@@ -1,7 +1,5 @@
-root            /dev/null;
-server_name     $hostname;
-
-client_max_body_size 512m;
+root /dev/null;
+server_name $hostname;
 
 add_header X-Content-Type-Options nosniff;
 add_header X-XSS-Protection "1; mode=block";

docker/ha-addon-rootfs/etc/nginx/includes/ssl_params.conf

@@ -1,6 +1,7 @@
-ssl_protocols TLSv1.2 TLSv1.3;
-ssl_prefer_server_ciphers off;
-ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
+ssl_protocols TLSv1.2;
+ssl_prefer_server_ciphers on;
+ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA;
+ssl_ecdh_curve secp384r1;
 ssl_session_timeout  10m;
 ssl_session_cache shared:SSL:10m;
 ssl_session_tickets off;

docker/ha-addon-rootfs/etc/nginx/includes/upstream.conf

@@ -1,3 +0,0 @@
-upstream esphome {
-    server unix:/var/run/esphome.sock;
-}

docker/ha-addon-rootfs/etc/nginx/nginx.conf

@@ -2,6 +2,7 @@ daemon off;
 user root;
 pid /var/run/nginx.pid;
 worker_processes 1;
+# Hass.io addon log
 error_log /proc/1/fd/1 error;
 events {
     worker_connections 1024;
@@ -9,22 +10,24 @@ events {
 
 http {
     include /etc/nginx/includes/mime.types;
-
-    access_log              off;
-    default_type            application/octet-stream;
-    gzip                    on;
-    keepalive_timeout       65;
-    sendfile                on;
-    server_tokens           off;
-
-    tcp_nodelay             on;
-    tcp_nopush              on;
+    access_log stdout;
+    default_type application/octet-stream;
+    gzip on;
+    keepalive_timeout 65;
+    sendfile on;
+    server_tokens off;
 
     map $http_upgrade $connection_upgrade {
         default upgrade;
         ''      close;
     }
 
-    include /etc/nginx/includes/upstream.conf;
+    # Use Hass.io supervisor as resolver
+    resolver 172.30.32.2;
+
+    upstream esphome {
+        server unix:/var/run/esphome.sock;
+    }
+
     include /etc/nginx/servers/*.conf;
 }

docker/ha-addon-rootfs/etc/nginx/servers/.gitkeep

@@ -1 +0,0 @@
-Without requirements or design, programming is the art of adding bugs to an empty text file. (Louis Srygley)

docker/ha-addon-rootfs/etc/nginx/servers/direct-ssl.disabled

@@ -1,26 +1,20 @@
 server {
-    {{ if not .ssl }}
-    listen 6052 default_server;
-    {{ else }}
-    listen 6052 default_server ssl http2;
-    {{ end }}
+    listen %%port%% default_server ssl http2;
 
     include /etc/nginx/includes/server_params.conf;
     include /etc/nginx/includes/proxy_params.conf;
-
-    {{ if .ssl }}
     include /etc/nginx/includes/ssl_params.conf;
 
-    ssl_certificate /ssl/{{ .certfile }};
-    ssl_certificate_key /ssl/{{ .keyfile }};
+    ssl on;
+    ssl_certificate /ssl/%%certfile%%;
+    ssl_certificate_key /ssl/%%keyfile%%;
+
+    # Clear Hass.io Ingress header
+    proxy_set_header X-HA-Ingress "";
 
     # Redirect http requests to https on the same port.
     # https://rageagainstshell.com/2016/11/redirect-http-to-https-on-the-same-port-in-nginx/
     error_page 497 https://$http_host$request_uri;
-    {{ end }}
-
-    # Clear Home Assistant Ingress header
-    proxy_set_header X-HA-Ingress "";
 
     location / {
         proxy_pass http://esphome;

docker/ha-addon-rootfs/etc/nginx/servers/direct.disabled

@@ -0,0 +1,12 @@
+server {
+    listen %%port%% default_server;
+
+    include /etc/nginx/includes/server_params.conf;
+    include /etc/nginx/includes/proxy_params.conf;
+    # Clear Hass.io Ingress header
+    proxy_set_header X-HA-Ingress "";
+
+    location / {
+        proxy_pass http://esphome;
+    }
+}

docker/ha-addon-rootfs/etc/nginx/servers/ingress.conf

@@ -1,16 +1,14 @@
 server {
-    listen 127.0.0.1:{{ .port }} default_server;
-    listen {{ .interface }}:{{ .port }} default_server;
+    listen %%interface%%:%%port%% default_server;
 
     include /etc/nginx/includes/server_params.conf;
     include /etc/nginx/includes/proxy_params.conf;
-
     # Set Home Assistant Ingress header
     proxy_set_header X-HA-Ingress "YES";
 
     location / {
+        # Only allow from Hass.io supervisor
         allow   172.30.32.2;
-        allow   127.0.0.1;
         deny    all;
 
         proxy_pass http://esphome;

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

@@ -1,32 +0,0 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
-# ==============================================================================
-# Home Assistant Add-on: ESPHome
-# Sends discovery information to Home Assistant.
-# ==============================================================================
-declare config
-declare port
-
-# We only disable it when disabled explicitly
-if bashio::config.false 'home_assistant_dashboard_integration';
-then
-    bashio::log.info "Home Assistant discovery is disabled for this add-on."
-    bashio::exit.ok
-fi
-
-port=$(bashio::addon.ingress_port)
-
-# Wait for NGINX to become available
-bashio::net.wait_for "${port}" "127.0.0.1" 300
-
-config=$(\
-    bashio::var.json \
-        host "127.0.0.1" \
-        port "^${port}" \
-)
-
-if bashio::discovery "esphome" "${config}" > /dev/null; then
-    bashio::log.info "Successfully send discovery information to Home Assistant."
-else
-    bashio::log.error "Discovery message to Home Assistant failed!"
-fi

docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/type

@@ -1 +0,0 @@
-oneshot

docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/up

@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/discovery/run

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

@@ -1,26 +0,0 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
-# ==============================================================================
-# Home Assistant Community Add-on: ESPHome
-# Take down the S6 supervision tree when ESPHome dashboard fails
-# ==============================================================================
-declare exit_code
-readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
-readonly exit_code_service="${1}"
-readonly exit_code_signal="${2}"
-
-bashio::log.info \
-  "Service ESPHome dashboard exited with code ${exit_code_service}" \
-  "(by signal ${exit_code_signal})"
-
-if [[ "${exit_code_service}" -eq 256 ]]; then
-  if [[ "${exit_code_container}" -eq 0 ]]; then
-    echo $((128 + $exit_code_signal)) > /run/s6-linux-init-container-results/exitcode
-  fi
-  [[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt
-elif [[ "${exit_code_service}" -ne 0 ]]; then
-  if [[ "${exit_code_container}" -eq 0 ]]; then
-    echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode
-  fi
-  exec /run/s6/basedir/bin/halt
-fi

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

@@ -1 +0,0 @@
-longrun

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

@@ -1,27 +0,0 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# Configures NGINX for use with ESPHome
-# ==============================================================================
-mkdir -p /var/log/nginx
-
-# Generate Ingress configuration
-bashio::var.json \
-    interface "$(bashio::addon.ip_address)" \
-    port "^$(bashio::addon.ingress_port)" \
-    | tempio \
-        -template /etc/nginx/templates/ingress.gtpl \
-        -out /etc/nginx/servers/ingress.conf
-
-# Generate direct access configuration, if enabled.
-if bashio::var.has_value "$(bashio::addon.port 6052)"; then
-    bashio::config.require.ssl
-    bashio::var.json \
-        certfile "$(bashio::config 'certfile')" \
-        keyfile "$(bashio::config 'keyfile')" \
-        ssl "^$(bashio::config 'ssl')" \
-        | tempio \
-            -template /etc/nginx/templates/direct.gtpl \
-            -out /etc/nginx/servers/direct.conf
-fi

docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type

@@ -1 +0,0 @@
-oneshot

docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up

@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-nginx/run

docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/finish

@@ -1,25 +0,0 @@
-#!/command/with-contenv bashio
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# Take down the S6 supervision tree when NGINX fails
-# ==============================================================================
-declare exit_code
-readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
-readonly exit_code_service="${1}"
-readonly exit_code_signal="${2}"
-
-bashio::log.info \
-  "Service NGINX exited with code ${exit_code_service}" \
-  "(by signal ${exit_code_signal})"
-
-if [[ "${exit_code_service}" -eq 256 ]]; then
-  if [[ "${exit_code_container}" -eq 0 ]]; then
-    echo $((128 + $exit_code_signal)) > /run/s6-linux-init-container-results/exitcode
-  fi
-  [[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt
-elif [[ "${exit_code_service}" -ne 0 ]]; then
-  if [[ "${exit_code_container}" -eq 0 ]]; then
-    echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode
-  fi
-  exec /run/s6/basedir/bin/halt
-fi

docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/type

@@ -1 +0,0 @@
-longrun

docker/ha-addon-rootfs/etc/services.d/esphome/finish

@@ -0,0 +1,15 @@
+#!/usr/bin/execlineb -S0
+# ==============================================================================
+# Community Hass.io Add-ons: ESPHome
+# Take down the S6 supervision tree when ESPHome fails
+# ==============================================================================
+
+declare APP_EXIT_CODE=${1}
+
+if [[ "${APP_EXIT_CODE}" -ne 0 ]] && [[ "${APP_EXIT_CODE}" -ne 256 ]]; then
+  bashio::log.warning "Halt add-on with exit code ${APP_EXIT_CODE}"
+  echo "${APP_EXIT_CODE}" > /run/s6-linux-init-container-results/exitcode
+  exec /run/s6/basedir/bin/halt
+fi
+
+bashio::log.info "Service restart after closing"

docker/ha-addon-rootfs/etc/services.d/esphome/run

@@ -1,19 +1,10 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
+#!/usr/bin/with-contenv bashio
 # ==============================================================================
 # Community Hass.io Add-ons: ESPHome
 # Runs the ESPHome dashboard
 # ==============================================================================
-readonly pio_cache_base=/data/cache/platformio
 
 export ESPHOME_IS_HA_ADDON=true
-export PLATFORMIO_GLOBALLIB_DIR=/piolibs
-
-# we can't set core_dir, because the settings file is stored in `core_dir/appstate.json`
-# setting `core_dir` would therefore prevent pio from accessing
-export PLATFORMIO_PLATFORMS_DIR="${pio_cache_base}/platforms"
-export PLATFORMIO_PACKAGES_DIR="${pio_cache_base}/packages"
-export PLATFORMIO_CACHE_DIR="${pio_cache_base}/cache"
 
 if bashio::config.true 'leave_front_door_open'; then
     export DISABLE_HA_AUTHENTICATION=true
@@ -39,7 +30,14 @@ else
     fi
 fi
 
-mkdir -p "${pio_cache_base}"
+pio_cache_base=/data/cache/platformio
+# we can't set core_dir, because the settings file is stored in `core_dir/appstate.json`
+# setting `core_dir` would therefore prevent pio from accessing
+export PLATFORMIO_PLATFORMS_DIR="${pio_cache_base}/platforms"
+export PLATFORMIO_PACKAGES_DIR="${pio_cache_base}/packages"
+export PLATFORMIO_CACHE_DIR="${pio_cache_base}/cache"
+
+export PLATFORMIO_GLOBALLIB_DIR=/piolibs
 
 bashio::log.info "Starting ESPHome dashboard..."
 exec esphome dashboard /config/esphome --socket /var/run/esphome.sock --ha-addon

docker/ha-addon-rootfs/etc/services.d/nginx/finish

@@ -0,0 +1,15 @@
+#!/usr/bin/execlineb -S0
+# ==============================================================================
+# Community Hass.io Add-ons: ESPHome
+# Take down the S6 supervision tree when NGINX fails
+# ==============================================================================
+
+declare APP_EXIT_CODE=${1}
+
+if [[ "${APP_EXIT_CODE}" -ne 0 ]] && [[ "${APP_EXIT_CODE}" -ne 256 ]]; then
+  bashio::log.warning "Halt add-on with exit code ${APP_EXIT_CODE}"
+  echo "${APP_EXIT_CODE}" > /run/s6-linux-init-container-results/exitcode
+  exec /run/s6/basedir/bin/halt
+fi
+
+bashio::log.info "Service restart after closing"

docker/ha-addon-rootfs/etc/services.d/nginx/run

@@ -1,11 +1,10 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
+#!/usr/bin/with-contenv bashio
 # ==============================================================================
 # Community Hass.io Add-ons: ESPHome
 # Runs the NGINX proxy
 # ==============================================================================
 
-bashio::log.info "Waiting for ESPHome dashboard to come up..."
+bashio::log.info "Waiting for dashboard to come up..."
 
 while [[ ! -S /var/run/esphome.sock ]]; do
   sleep 0.5

esphome/__main__.py

@@ -339,7 +339,7 @@ def command_config(args, config):
     _LOGGER.info("Configuration is valid!")
     if not CORE.verbose:
         config = strip_default_ids(config)
-    safe_print(yaml_util.dump(config, args.show_secrets))
+    safe_print(yaml_util.dump(config))
     return 0
 
 
@@ -665,9 +665,6 @@ def parse_args(argv):
     parser_config.add_argument(
         "configuration", help="Your YAML configuration file(s).", nargs="+"
     )
-    parser_config.add_argument(
-        "--show-secrets", help="Show secrets in output.", action="store_true"
-    )
 
     parser_compile = subparsers.add_parser(
         "compile", help="Read the configuration and compile a program."

esphome/automation.py

@@ -254,11 +254,7 @@ 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],
-        cg.TemplateArguments(cg.uint32, *template_arg.args),
-        [(cg.uint32, "iteration"), *args],
-    )
+    actions = await build_action_list(config[CONF_THEN], template_arg, args)
     cg.add(var.add_then(actions))
     return var
 

esphome/codegen.py

@@ -47,7 +47,6 @@ from esphome.cpp_helpers import (  # noqa
     build_registry_list,
     extract_registry_entry_config,
     register_parented,
-    past_safe_mode,
 )
 from esphome.cpp_types import (  # noqa
     global_ns,
@@ -64,7 +63,6 @@ from esphome.cpp_types import (  # noqa
     uint16,
     uint32,
     uint64,
-    int16,
     int32,
     int64,
     size_t,

esphome/components/a4988/a4988.cpp

@@ -46,7 +46,6 @@ void A4988::loop() {
     return;
 
   this->dir_pin_->digital_write(dir == 1);
-  delayMicroseconds(50);
   this->step_pin_->digital_write(true);
   delayMicroseconds(5);
   this->step_pin_->digital_write(false);

esphome/components/absolute_humidity/__init__.py

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

esphome/components/absolute_humidity/absolute_humidity.cpp

@@ -1,182 +0,0 @@
-#include "esphome/core/log.h"
-#include "absolute_humidity.h"
-
-namespace esphome {
-namespace absolute_humidity {
-
-static const char *const TAG = "absolute_humidity.sensor";
-
-void AbsoluteHumidityComponent::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up absolute humidity '%s'...", this->get_name().c_str());
-
-  ESP_LOGD(TAG, "  Added callback for temperature '%s'", this->temperature_sensor_->get_name().c_str());
-  this->temperature_sensor_->add_on_state_callback([this](float state) { this->temperature_callback_(state); });
-  if (this->temperature_sensor_->has_state()) {
-    this->temperature_callback_(this->temperature_sensor_->get_state());
-  }
-
-  ESP_LOGD(TAG, "  Added callback for relative humidity '%s'", this->humidity_sensor_->get_name().c_str());
-  this->humidity_sensor_->add_on_state_callback([this](float state) { this->humidity_callback_(state); });
-  if (this->humidity_sensor_->has_state()) {
-    this->humidity_callback_(this->humidity_sensor_->get_state());
-  }
-}
-
-void AbsoluteHumidityComponent::dump_config() {
-  LOG_SENSOR("", "Absolute Humidity", this);
-
-  switch (this->equation_) {
-    case BUCK:
-      ESP_LOGCONFIG(TAG, "Saturation Vapor Pressure Equation: Buck");
-      break;
-    case TETENS:
-      ESP_LOGCONFIG(TAG, "Saturation Vapor Pressure Equation: Tetens");
-      break;
-    case WOBUS:
-      ESP_LOGCONFIG(TAG, "Saturation Vapor Pressure Equation: Wobus");
-      break;
-    default:
-      ESP_LOGE(TAG, "Invalid saturation vapor pressure equation selection!");
-      break;
-  }
-
-  ESP_LOGCONFIG(TAG, "Sources");
-  ESP_LOGCONFIG(TAG, "  Temperature: '%s'", this->temperature_sensor_->get_name().c_str());
-  ESP_LOGCONFIG(TAG, "  Relative Humidity: '%s'", this->humidity_sensor_->get_name().c_str());
-}
-
-float AbsoluteHumidityComponent::get_setup_priority() const { return setup_priority::DATA; }
-
-void AbsoluteHumidityComponent::loop() {
-  if (!this->next_update_) {
-    return;
-  }
-  this->next_update_ = false;
-
-  // Ensure we have source data
-  const bool no_temperature = std::isnan(this->temperature_);
-  const bool no_humidity = std::isnan(this->humidity_);
-  if (no_temperature || no_humidity) {
-    if (no_temperature) {
-      ESP_LOGW(TAG, "No valid state from temperature sensor!");
-    }
-    if (no_humidity) {
-      ESP_LOGW(TAG, "No valid state from temperature sensor!");
-    }
-    ESP_LOGW(TAG, "Unable to calculate absolute humidity.");
-    this->publish_state(NAN);
-    this->status_set_warning();
-    return;
-  }
-
-  // Convert to desired units
-  const float temperature_c = this->temperature_;
-  const float temperature_k = temperature_c + 273.15;
-  const float hr = this->humidity_ / 100;
-
-  // Calculate saturation vapor pressure
-  float es;
-  switch (this->equation_) {
-    case BUCK:
-      es = es_buck(temperature_c);
-      break;
-    case TETENS:
-      es = es_tetens(temperature_c);
-      break;
-    case WOBUS:
-      es = es_wobus(temperature_c);
-      break;
-    default:
-      ESP_LOGE(TAG, "Invalid saturation vapor pressure equation selection!");
-      this->publish_state(NAN);
-      this->status_set_error();
-      return;
-  }
-  ESP_LOGD(TAG, "Saturation vapor pressure %f kPa", es);
-
-  // Calculate absolute humidity
-  const float absolute_humidity = vapor_density(es, hr, temperature_k);
-
-  // Publish absolute humidity
-  ESP_LOGD(TAG, "Publishing absolute humidity %f g/m³", absolute_humidity);
-  this->status_clear_warning();
-  this->publish_state(absolute_humidity);
-}
-
-// Buck equation (https://en.wikipedia.org/wiki/Arden_Buck_equation)
-// More accurate than Tetens in normal meteorologic conditions
-float AbsoluteHumidityComponent::es_buck(float temperature_c) {
-  float a, b, c, d;
-  if (temperature_c >= 0) {
-    a = 0.61121;
-    b = 18.678;
-    c = 234.5;
-    d = 257.14;
-  } else {
-    a = 0.61115;
-    b = 18.678;
-    c = 233.7;
-    d = 279.82;
-  }
-  return a * expf((b - (temperature_c / c)) * (temperature_c / (d + temperature_c)));
-}
-
-// Tetens equation (https://en.wikipedia.org/wiki/Tetens_equation)
-float AbsoluteHumidityComponent::es_tetens(float temperature_c) {
-  float a, b;
-  if (temperature_c >= 0) {
-    a = 17.27;
-    b = 237.3;
-  } else {
-    a = 21.875;
-    b = 265.5;
-  }
-  return 0.61078 * expf((a * temperature_c) / (temperature_c + b));
-}
-
-// Wobus equation
-// https://wahiduddin.net/calc/density_altitude.htm
-// https://wahiduddin.net/calc/density_algorithms.htm
-// Calculate the saturation vapor pressure (kPa)
-float AbsoluteHumidityComponent::es_wobus(float t) {
-  // THIS FUNCTION RETURNS THE SATURATION VAPOR PRESSURE ESW (MILLIBARS)
-  // OVER LIQUID WATER GIVEN THE TEMPERATURE T (CELSIUS). THE POLYNOMIAL
-  // APPROXIMATION BELOW IS DUE TO HERMAN WOBUS, A MATHEMATICIAN WHO
-  // WORKED AT THE NAVY WEATHER RESEARCH FACILITY, NORFOLK, VIRGINIA,
-  // BUT WHO IS NOW RETIRED. THE COEFFICIENTS OF THE POLYNOMIAL WERE
-  // CHOSEN TO FIT THE VALUES IN TABLE 94 ON PP. 351-353 OF THE SMITH-
-  // SONIAN METEOROLOGICAL TABLES BY ROLAND LIST (6TH EDITION). THE
-  // APPROXIMATION IS VALID FOR -50 < T < 100C.
-  //
-  //     Baker, Schlatter  17-MAY-1982     Original version.
-
-  const float c0 = +0.99999683e00;
-  const float c1 = -0.90826951e-02;
-  const float c2 = +0.78736169e-04;
-  const float c3 = -0.61117958e-06;
-  const float c4 = +0.43884187e-08;
-  const float c5 = -0.29883885e-10;
-  const float c6 = +0.21874425e-12;
-  const float c7 = -0.17892321e-14;
-  const float c8 = +0.11112018e-16;
-  const float c9 = -0.30994571e-19;
-  const float p = c0 + t * (c1 + t * (c2 + t * (c3 + t * (c4 + t * (c5 + t * (c6 + t * (c7 + t * (c8 + t * (c9)))))))));
-  return 0.61078 / pow(p, 8);
-}
-
-// From https://www.environmentalbiophysics.org/chalk-talk-how-to-calculate-absolute-humidity/
-// H/T to https://esphome.io/cookbook/bme280_environment.html
-// H/T to https://carnotcycle.wordpress.com/2012/08/04/how-to-convert-relative-humidity-to-absolute-humidity/
-float AbsoluteHumidityComponent::vapor_density(float es, float hr, float ta) {
-  // es = saturated vapor pressure (kPa)
-  // hr = relative humidity [0-1]
-  // ta = absolute temperature (K)
-
-  const float ea = hr * es * 1000;   // vapor pressure of the air (Pa)
-  const float mw = 18.01528;         // molar mass of water (g⋅mol⁻¹)
-  const float r = 8.31446261815324;  // molar gas constant (J⋅K⁻¹)
-  return (ea * mw) / (r * ta);
-}
-
-}  // namespace absolute_humidity
-}  // namespace esphome

esphome/components/absolute_humidity/absolute_humidity.h

@@ -1,76 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/sensor/sensor.h"
-
-namespace esphome {
-namespace absolute_humidity {
-
-/// Enum listing all implemented saturation vapor pressure equations.
-enum SaturationVaporPressureEquation {
-  BUCK,
-  TETENS,
-  WOBUS,
-};
-
-/// This class implements calculation of absolute humidity from temperature and relative humidity.
-class AbsoluteHumidityComponent : public sensor::Sensor, public Component {
- public:
-  AbsoluteHumidityComponent() = default;
-
-  void set_temperature_sensor(sensor::Sensor *temperature_sensor) { this->temperature_sensor_ = temperature_sensor; }
-  void set_humidity_sensor(sensor::Sensor *humidity_sensor) { this->humidity_sensor_ = humidity_sensor; }
-  void set_equation(SaturationVaporPressureEquation equation) { this->equation_ = equation; }
-
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override;
-  void loop() override;
-
- protected:
-  void temperature_callback_(float state) {
-    this->next_update_ = true;
-    this->temperature_ = state;
-  }
-  void humidity_callback_(float state) {
-    this->next_update_ = true;
-    this->humidity_ = state;
-  }
-
-  /** Buck equation for saturation vapor pressure in kPa.
-   *
-   * @param temperature_c Air temperature in °C.
-   */
-  static float es_buck(float temperature_c);
-  /** Tetens equation for saturation vapor pressure in kPa.
-   *
-   * @param temperature_c Air temperature in °C.
-   */
-  static float es_tetens(float temperature_c);
-  /** Wobus equation for saturation vapor pressure in kPa.
-   *
-   * @param temperature_c Air temperature in °C.
-   */
-  static float es_wobus(float temperature_c);
-
-  /** Calculate vapor density (absolute humidity) in g/m³.
-   *
-   * @param es Saturation vapor pressure in kPa.
-   * @param hr Relative humidity 0 to 1.
-   * @param ta Absolute temperature in K.
-   * @param heater_duration The duration in ms that the heater should turn on for when measuring.
-   */
-  static float vapor_density(float es, float hr, float ta);
-
-  sensor::Sensor *temperature_sensor_{nullptr};
-  sensor::Sensor *humidity_sensor_{nullptr};
-
-  bool next_update_{false};
-
-  float temperature_{NAN};
-  float humidity_{NAN};
-  SaturationVaporPressureEquation equation_;
-};
-
-}  // namespace absolute_humidity
-}  // namespace esphome

esphome/components/absolute_humidity/sensor.py

@@ -1,56 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor
-from esphome.const import (
-    CONF_HUMIDITY,
-    CONF_TEMPERATURE,
-    STATE_CLASS_MEASUREMENT,
-    CONF_EQUATION,
-    ICON_WATER,
-    UNIT_GRAMS_PER_CUBIC_METER,
-)
-
-absolute_humidity_ns = cg.esphome_ns.namespace("absolute_humidity")
-AbsoluteHumidityComponent = absolute_humidity_ns.class_(
-    "AbsoluteHumidityComponent", sensor.Sensor, cg.Component
-)
-
-SaturationVaporPressureEquation = absolute_humidity_ns.enum(
-    "SaturationVaporPressureEquation"
-)
-EQUATION = {
-    "BUCK": SaturationVaporPressureEquation.BUCK,
-    "TETENS": SaturationVaporPressureEquation.TETENS,
-    "WOBUS": SaturationVaporPressureEquation.WOBUS,
-}
-
-CONFIG_SCHEMA = (
-    sensor.sensor_schema(
-        unit_of_measurement=UNIT_GRAMS_PER_CUBIC_METER,
-        icon=ICON_WATER,
-        accuracy_decimals=2,
-        state_class=STATE_CLASS_MEASUREMENT,
-    )
-    .extend(
-        {
-            cv.GenerateID(): cv.declare_id(AbsoluteHumidityComponent),
-            cv.Required(CONF_TEMPERATURE): cv.use_id(sensor.Sensor),
-            cv.Required(CONF_HUMIDITY): cv.use_id(sensor.Sensor),
-            cv.Optional(CONF_EQUATION, default="WOBUS"): cv.enum(EQUATION, upper=True),
-        }
-    )
-    .extend(cv.COMPONENT_SCHEMA)
-)
-
-
-async def to_code(config):
-    var = await sensor.new_sensor(config)
-    await cg.register_component(var, config)
-
-    temperature_sensor = await cg.get_variable(config[CONF_TEMPERATURE])
-    cg.add(var.set_temperature_sensor(temperature_sensor))
-
-    humidity_sensor = await cg.get_variable(config[CONF_HUMIDITY])
-    cg.add(var.set_humidity_sensor(humidity_sensor))
-
-    cg.add(var.set_equation(config[CONF_EQUATION]))

esphome/components/adc128s102/sensor/__init__.py

@@ -16,16 +16,13 @@ ADC128S102Sensor = adc128s102_ns.class_(
 )
 CONF_ADC128S102_ID = "adc128s102_id"
 
-CONFIG_SCHEMA = (
-    sensor.sensor_schema(ADC128S102Sensor)
-    .extend(
-        {
-            cv.GenerateID(CONF_ADC128S102_ID): cv.use_id(ADC128S102),
-            cv.Required(CONF_CHANNEL): cv.int_range(min=0, max=7),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-)
+CONFIG_SCHEMA = sensor.SENSOR_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(ADC128S102Sensor),
+        cv.GenerateID(CONF_ADC128S102_ID): cv.use_id(ADC128S102),
+        cv.Required(CONF_CHANNEL): cv.int_range(min=0, max=7),
+    }
+).extend(cv.polling_component_schema("60s"))
 
 
 async def to_code(config):

esphome/components/ads1115/ads1115.cpp

@@ -9,7 +9,7 @@ static const char *const TAG = "ads1115";
 static const uint8_t ADS1115_REGISTER_CONVERSION = 0x00;
 static const uint8_t ADS1115_REGISTER_CONFIG = 0x01;
 
-static const uint8_t ADS1115_DATA_RATE_860_SPS = 0b111;  // 3300_SPS for ADS1015
+static const uint8_t ADS1115_DATA_RATE_860_SPS = 0b111;
 
 void ADS1115Component::setup() {
   ESP_LOGCONFIG(TAG, "Setting up ADS1115...");
@@ -18,9 +18,6 @@ void ADS1115Component::setup() {
     this->mark_failed();
     return;
   }
-
-  ESP_LOGCONFIG(TAG, "Configuring ADS1115...");
-
   uint16_t config = 0;
   // Clear single-shot bit
   //        0b0xxxxxxxxxxxxxxx
@@ -80,7 +77,6 @@ void ADS1115Component::dump_config() {
     LOG_SENSOR("  ", "Sensor", sensor);
     ESP_LOGCONFIG(TAG, "    Multiplexer: %u", sensor->get_multiplexer());
     ESP_LOGCONFIG(TAG, "    Gain: %u", sensor->get_gain());
-    ESP_LOGCONFIG(TAG, "    Resolution: %u", sensor->get_resolution());
   }
 }
 float ADS1115Component::request_measurement(ADS1115Sensor *sensor) {
@@ -131,45 +127,27 @@ float ADS1115Component::request_measurement(ADS1115Sensor *sensor) {
     this->status_set_warning();
     return NAN;
   }
-
-  if (sensor->get_resolution() == ADS1015_12_BITS) {
-    bool negative = (raw_conversion >> 15) == 1;
-
-    // shift raw_conversion as it's only 12-bits, left justified
-    raw_conversion = raw_conversion >> (16 - ADS1015_12_BITS);
-
-    // check if number was negative in order to keep the sign
-    if (negative) {
-      // the number was negative
-      // 1) set the negative bit back
-      raw_conversion |= 0x8000;
-      // 2) reset the former (shifted) negative bit
-      raw_conversion &= 0xF7FF;
-    }
-  }
-
   auto signed_conversion = static_cast<int16_t>(raw_conversion);
 
   float millivolts;
-  float divider = (sensor->get_resolution() == ADS1115_16_BITS) ? 32768.0f : 2048.0f;
   switch (sensor->get_gain()) {
     case ADS1115_GAIN_6P144:
-      millivolts = (signed_conversion * 6144) / divider;
+      millivolts = signed_conversion * 0.187500f;
       break;
     case ADS1115_GAIN_4P096:
-      millivolts = (signed_conversion * 4096) / divider;
+      millivolts = signed_conversion * 0.125000f;
       break;
     case ADS1115_GAIN_2P048:
-      millivolts = (signed_conversion * 2048) / divider;
+      millivolts = signed_conversion * 0.062500f;
       break;
     case ADS1115_GAIN_1P024:
-      millivolts = (signed_conversion * 1024) / divider;
+      millivolts = signed_conversion * 0.031250f;
       break;
     case ADS1115_GAIN_0P512:
-      millivolts = (signed_conversion * 512) / divider;
+      millivolts = signed_conversion * 0.015625f;
       break;
     case ADS1115_GAIN_0P256:
-      millivolts = (signed_conversion * 256) / divider;
+      millivolts = signed_conversion * 0.007813f;
       break;
     default:
       millivolts = NAN;

esphome/components/ads1115/ads1115.h

@@ -30,11 +30,6 @@ enum ADS1115Gain {
   ADS1115_GAIN_0P256 = 0b101,
 };
 
-enum ADS1115Resolution {
-  ADS1115_16_BITS = 16,
-  ADS1015_12_BITS = 12,
-};
-
 class ADS1115Sensor;
 
 class ADS1115Component : public Component, public i2c::I2CDevice {
@@ -63,17 +58,15 @@ class ADS1115Sensor : public sensor::Sensor, public PollingComponent, public vol
   void update() override;
   void set_multiplexer(ADS1115Multiplexer multiplexer) { multiplexer_ = multiplexer; }
   void set_gain(ADS1115Gain gain) { gain_ = gain; }
-  void set_resolution(ADS1115Resolution resolution) { resolution_ = resolution; }
+
   float sample() override;
   uint8_t get_multiplexer() const { return multiplexer_; }
   uint8_t get_gain() const { return gain_; }
-  uint8_t get_resolution() const { return resolution_; }
 
  protected:
   ADS1115Component *parent_;
   ADS1115Multiplexer multiplexer_;
   ADS1115Gain gain_;
-  ADS1115Resolution resolution_;
 };
 
 }  // namespace ads1115

esphome/components/ads1115/sensor.py

@@ -4,7 +4,6 @@ from esphome.components import sensor, voltage_sampler
 from esphome.const import (
     CONF_GAIN,
     CONF_MULTIPLEXER,
-    CONF_RESOLUTION,
     DEVICE_CLASS_VOLTAGE,
     STATE_CLASS_MEASUREMENT,
     UNIT_VOLT,
@@ -36,12 +35,6 @@ GAIN = {
     "0.256": ADS1115Gain.ADS1115_GAIN_0P256,
 }
 
-ADS1115Resolution = ads1115_ns.enum("ADS1115Resolution")
-RESOLUTION = {
-    "16_BITS": ADS1115Resolution.ADS1115_16_BITS,
-    "12_BITS": ADS1115Resolution.ADS1015_12_BITS,
-}
-
 
 def validate_gain(value):
     if isinstance(value, float):
@@ -70,9 +63,6 @@ CONFIG_SCHEMA = (
             cv.GenerateID(CONF_ADS1115_ID): cv.use_id(ADS1115Component),
             cv.Required(CONF_MULTIPLEXER): cv.enum(MUX, upper=True, space="_"),
             cv.Required(CONF_GAIN): validate_gain,
-            cv.Optional(CONF_RESOLUTION, default="16_BITS"): cv.enum(
-                RESOLUTION, upper=True, space="_"
-            ),
         }
     )
     .extend(cv.polling_component_schema("60s"))
@@ -87,6 +77,5 @@ async def to_code(config):
 
     cg.add(var.set_multiplexer(config[CONF_MULTIPLEXER]))
     cg.add(var.set_gain(config[CONF_GAIN]))
-    cg.add(var.set_resolution(config[CONF_RESOLUTION]))
 
     cg.add(paren.register_sensor(var))

esphome/components/am43/cover/am43_cover.cpp

@@ -65,7 +65,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_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
                                  packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);

esphome/components/analog_threshold/binary_sensor.py

@@ -15,24 +15,18 @@ AnalogThresholdBinarySensor = analog_threshold_ns.class_(
 CONF_UPPER = "upper"
 CONF_LOWER = "lower"
 
-CONFIG_SCHEMA = (
-    binary_sensor.binary_sensor_schema(AnalogThresholdBinarySensor)
-    .extend(
-        {
-            cv.Required(CONF_SENSOR_ID): cv.use_id(sensor.Sensor),
-            cv.Required(CONF_THRESHOLD): cv.Any(
-                cv.float_,
-                cv.Schema(
-                    {
-                        cv.Required(CONF_UPPER): cv.float_,
-                        cv.Required(CONF_LOWER): cv.float_,
-                    }
-                ),
+CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(AnalogThresholdBinarySensor),
+        cv.Required(CONF_SENSOR_ID): cv.use_id(sensor.Sensor),
+        cv.Required(CONF_THRESHOLD): cv.Any(
+            cv.float_,
+            cv.Schema(
+                {cv.Required(CONF_UPPER): cv.float_, cv.Required(CONF_LOWER): cv.float_}
             ),
-        }
-    )
-    .extend(cv.COMPONENT_SCHEMA)
-)
+        ),
+    }
+).extend(cv.COMPONENT_SCHEMA)
 
 
 async def to_code(config):

esphome/components/animation/__init__.py

@@ -117,7 +117,7 @@ async def to_code(config):
                 data[pos] = rgb & 255
                 pos += 1
 
-    elif config[CONF_TYPE] in ["BINARY", "TRANSPARENT_BINARY"]:
+    elif config[CONF_TYPE] == "BINARY":
         width8 = ((width + 7) // 8) * 8
         data = [0 for _ in range((height * width8 // 8) * frames)]
         for frameIndex in range(frames):

esphome/components/apds9960/apds9960.cpp

@@ -23,7 +23,7 @@ void APDS9960::setup() {
     return;
   }
 
-  if (id != 0xAB && id != 0x9C && id != 0xA8) {  // APDS9960 all should have one of these IDs
+  if (id != 0xAB && id != 0x9C) {  // APDS9960 all should have one of these IDs
     this->error_code_ = WRONG_ID;
     this->mark_failed();
     return;

esphome/components/api/api.proto

@@ -206,8 +206,6 @@ message DeviceInfoResponse {
   uint32 bluetooth_proxy_version = 11;
 
   string manufacturer = 12;
-
-  string friendly_name = 13;
 }
 
 message ListEntitiesRequest {
@@ -787,7 +785,6 @@ enum ClimateFanMode {
   CLIMATE_FAN_MIDDLE = 6;
   CLIMATE_FAN_FOCUS = 7;
   CLIMATE_FAN_DIFFUSE = 8;
-  CLIMATE_FAN_QUIET = 9;
 }
 enum ClimateSwingMode {
   CLIMATE_SWING_OFF = 0;
@@ -829,7 +826,7 @@ message ListEntitiesClimateResponse {
   repeated ClimateMode supported_modes = 7;
   float visual_min_temperature = 8;
   float visual_max_temperature = 9;
-  float visual_target_temperature_step = 10;
+  float visual_temperature_step = 10;
   // for older peer versions - in new system this
   // is if CLIMATE_PRESET_AWAY exists is supported_presets
   bool legacy_supports_away = 11;
@@ -842,7 +839,6 @@ message ListEntitiesClimateResponse {
   bool disabled_by_default = 18;
   string icon = 19;
   EntityCategory entity_category = 20;
-  float visual_current_temperature_step = 21;
 }
 message ClimateStateResponse {
   option (id) = 47;
@@ -1339,23 +1335,3 @@ message BluetoothGATTNotifyResponse {
   uint64 address = 1;
   uint32 handle = 2;
 }
-
-message BluetoothDevicePairingResponse {
-  option (id) = 85;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY";
-
-  uint64 address = 1;
-  bool paired = 2;
-  int32 error = 3;
-}
-
-message BluetoothDeviceUnpairingResponse {
-  option (id) = 86;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY";
-
-  uint64 address = 1;
-  bool success = 2;
-  int32 error = 3;
-}

esphome/components/api/api_connection.cpp

@@ -548,9 +548,7 @@ bool APIConnection::send_climate_info(climate::Climate *climate) {
 
   msg.visual_min_temperature = traits.get_visual_min_temperature();
   msg.visual_max_temperature = traits.get_visual_max_temperature();
-  msg.visual_target_temperature_step = traits.get_visual_target_temperature_step();
-  msg.visual_current_temperature_step = traits.get_visual_current_temperature_step();
-
+  msg.visual_temperature_step = traits.get_visual_temperature_step();
   msg.legacy_supports_away = traits.supports_preset(climate::CLIMATE_PRESET_AWAY);
   msg.supports_action = traits.get_supports_action();
 
@@ -932,7 +930,6 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
   DeviceInfoResponse resp{};
   resp.uses_password = this->parent_->uses_password();
   resp.name = App.get_name();
-  resp.friendly_name = App.get_friendly_name();
   resp.mac_address = get_mac_address_pretty();
   resp.esphome_version = ESPHOME_VERSION;
   resp.compilation_time = App.get_compilation_time();
@@ -953,7 +950,7 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
   resp.webserver_port = USE_WEBSERVER_PORT;
 #endif
 #ifdef USE_BLUETOOTH_PROXY
-  resp.bluetooth_proxy_version = bluetooth_proxy::global_bluetooth_proxy->has_active() ? 4 : 1;
+  resp.bluetooth_proxy_version = bluetooth_proxy::global_bluetooth_proxy->has_active() ? 3 : 1;
 #endif
   return resp;
 }

esphome/components/api/api_frame_helper.cpp

@@ -295,7 +295,7 @@ APIError APINoiseFrameHelper::state_action_() {
     if (aerr != APIError::OK)
       return aerr;
     // ignore contents, may be used in future for flags
-    prologue_.push_back((uint8_t) (frame.msg.size() >> 8));
+    prologue_.push_back((uint8_t)(frame.msg.size() >> 8));
     prologue_.push_back((uint8_t) frame.msg.size());
     prologue_.insert(prologue_.end(), frame.msg.begin(), frame.msg.end());
 
@@ -492,9 +492,9 @@ APIError APINoiseFrameHelper::write_packet(uint16_t type, const uint8_t *payload
   // tmpbuf[1], tmpbuf[2] to be set later
   const uint8_t msg_offset = 3;
   const uint8_t payload_offset = msg_offset + 4;
-  tmpbuf[msg_offset + 0] = (uint8_t) (type >> 8);  // type
+  tmpbuf[msg_offset + 0] = (uint8_t)(type >> 8);  // type
   tmpbuf[msg_offset + 1] = (uint8_t) type;
-  tmpbuf[msg_offset + 2] = (uint8_t) (payload_len >> 8);  // data_len
+  tmpbuf[msg_offset + 2] = (uint8_t)(payload_len >> 8);  // data_len
   tmpbuf[msg_offset + 3] = (uint8_t) payload_len;
   // copy data
   std::copy(payload, payload + payload_len, &tmpbuf[payload_offset]);
@@ -512,7 +512,7 @@ APIError APINoiseFrameHelper::write_packet(uint16_t type, const uint8_t *payload
   }
 
   size_t total_len = 3 + mbuf.size;
-  tmpbuf[1] = (uint8_t) (mbuf.size >> 8);
+  tmpbuf[1] = (uint8_t)(mbuf.size >> 8);
   tmpbuf[2] = (uint8_t) mbuf.size;
 
   struct iovec iov;
@@ -610,15 +610,12 @@ APIError APINoiseFrameHelper::write_raw_(const struct iovec *iov, int iovcnt) {
 APIError APINoiseFrameHelper::write_frame_(const uint8_t *data, size_t len) {
   uint8_t header[3];
   header[0] = 0x01;  // indicator
-  header[1] = (uint8_t) (len >> 8);
+  header[1] = (uint8_t)(len >> 8);
   header[2] = (uint8_t) len;
 
   struct iovec iov[2];
   iov[0].iov_base = header;
   iov[0].iov_len = 3;
-  if (len == 0) {
-    return write_raw_(iov, 1);
-  }
   iov[1].iov_base = const_cast<uint8_t *>(data);
   iov[1].iov_len = len;
 
@@ -916,9 +913,6 @@ APIError APIPlaintextFrameHelper::write_packet(uint16_t type, const uint8_t *pay
   struct iovec iov[2];
   iov[0].iov_base = &header[0];
   iov[0].iov_len = header.size();
-  if (payload_len == 0) {
-    return write_raw_(iov, 1);
-  }
   iov[1].iov_base = const_cast<uint8_t *>(payload);
   iov[1].iov_len = payload_len;
 

esphome/components/api/api_pb2.cpp

@@ -235,8 +235,6 @@ template<> const char *proto_enum_to_string<enums::ClimateFanMode>(enums::Climat
       return "CLIMATE_FAN_FOCUS";
     case enums::CLIMATE_FAN_DIFFUSE:
       return "CLIMATE_FAN_DIFFUSE";
-    case enums::CLIMATE_FAN_QUIET:
-      return "CLIMATE_FAN_QUIET";
     default:
       return "UNKNOWN";
   }
@@ -630,10 +628,6 @@ bool DeviceInfoResponse::decode_length(uint32_t field_id, ProtoLengthDelimited v
       this->manufacturer = value.as_string();
       return true;
     }
-    case 13: {
-      this->friendly_name = value.as_string();
-      return true;
-    }
     default:
       return false;
   }
@@ -651,7 +645,6 @@ void DeviceInfoResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(10, this->webserver_port);
   buffer.encode_uint32(11, this->bluetooth_proxy_version);
   buffer.encode_string(12, this->manufacturer);
-  buffer.encode_string(13, this->friendly_name);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void DeviceInfoResponse::dump_to(std::string &out) const {
@@ -706,10 +699,6 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
   out.append("  manufacturer: ");
   out.append("'").append(this->manufacturer).append("'");
   out.append("\n");
-
-  out.append("  friendly_name: ");
-  out.append("'").append(this->friendly_name).append("'");
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -3451,11 +3440,7 @@ bool ListEntitiesClimateResponse::decode_32bit(uint32_t field_id, Proto32Bit val
       return true;
     }
     case 10: {
-      this->visual_target_temperature_step = value.as_float();
-      return true;
-    }
-    case 21: {
-      this->visual_current_temperature_step = value.as_float();
+      this->visual_temperature_step = value.as_float();
       return true;
     }
     default:
@@ -3474,7 +3459,7 @@ void ListEntitiesClimateResponse::encode(ProtoWriteBuffer buffer) const {
   }
   buffer.encode_float(8, this->visual_min_temperature);
   buffer.encode_float(9, this->visual_max_temperature);
-  buffer.encode_float(10, this->visual_target_temperature_step);
+  buffer.encode_float(10, this->visual_temperature_step);
   buffer.encode_bool(11, this->legacy_supports_away);
   buffer.encode_bool(12, this->supports_action);
   for (auto &it : this->supported_fan_modes) {
@@ -3495,7 +3480,6 @@ 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);
-  buffer.encode_float(21, this->visual_current_temperature_step);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesClimateResponse::dump_to(std::string &out) const {
@@ -3542,8 +3526,8 @@ void ListEntitiesClimateResponse::dump_to(std::string &out) const {
   out.append(buffer);
   out.append("\n");
 
-  out.append("  visual_target_temperature_step: ");
-  sprintf(buffer, "%g", this->visual_target_temperature_step);
+  out.append("  visual_temperature_step: ");
+  sprintf(buffer, "%g", this->visual_temperature_step);
   out.append(buffer);
   out.append("\n");
 
@@ -3596,11 +3580,6 @@ void ListEntitiesClimateResponse::dump_to(std::string &out) const {
   out.append("  entity_category: ");
   out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
   out.append("\n");
-
-  out.append("  visual_current_temperature_step: ");
-  sprintf(buffer, "%g", this->visual_current_temperature_step);
-  out.append(buffer);
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -5974,92 +5953,6 @@ void BluetoothGATTNotifyResponse::dump_to(std::string &out) const {
   out.append("}");
 }
 #endif
-bool BluetoothDevicePairingResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->address = value.as_uint64();
-      return true;
-    }
-    case 2: {
-      this->paired = value.as_bool();
-      return true;
-    }
-    case 3: {
-      this->error = value.as_int32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothDevicePairingResponse::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_uint64(1, this->address);
-  buffer.encode_bool(2, this->paired);
-  buffer.encode_int32(3, this->error);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothDevicePairingResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothDevicePairingResponse {\n");
-  out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  paired: ");
-  out.append(YESNO(this->paired));
-  out.append("\n");
-
-  out.append("  error: ");
-  sprintf(buffer, "%d", this->error);
-  out.append(buffer);
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool BluetoothDeviceUnpairingResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->address = value.as_uint64();
-      return true;
-    }
-    case 2: {
-      this->success = value.as_bool();
-      return true;
-    }
-    case 3: {
-      this->error = value.as_int32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void BluetoothDeviceUnpairingResponse::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_uint64(1, this->address);
-  buffer.encode_bool(2, this->success);
-  buffer.encode_int32(3, this->error);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void BluetoothDeviceUnpairingResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("BluetoothDeviceUnpairingResponse {\n");
-  out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  success: ");
-  out.append(YESNO(this->success));
-  out.append("\n");
-
-  out.append("  error: ");
-  sprintf(buffer, "%d", this->error);
-  out.append(buffer);
-  out.append("\n");
-  out.append("}");
-}
-#endif
 
 }  // namespace api
 }  // namespace esphome

esphome/components/api/api_pb2.h

@@ -99,7 +99,6 @@ enum ClimateFanMode : uint32_t {
   CLIMATE_FAN_MIDDLE = 6,
   CLIMATE_FAN_FOCUS = 7,
   CLIMATE_FAN_DIFFUSE = 8,
-  CLIMATE_FAN_QUIET = 9,
 };
 enum ClimateSwingMode : uint32_t {
   CLIMATE_SWING_OFF = 0,
@@ -277,7 +276,6 @@ class DeviceInfoResponse : public ProtoMessage {
   uint32_t webserver_port{0};
   uint32_t bluetooth_proxy_version{0};
   std::string manufacturer{};
-  std::string friendly_name{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -915,7 +913,7 @@ class ListEntitiesClimateResponse : public ProtoMessage {
   std::vector<enums::ClimateMode> supported_modes{};
   float visual_min_temperature{0.0f};
   float visual_max_temperature{0.0f};
-  float visual_target_temperature_step{0.0f};
+  float visual_temperature_step{0.0f};
   bool legacy_supports_away{false};
   bool supports_action{false};
   std::vector<enums::ClimateFanMode> supported_fan_modes{};
@@ -926,7 +924,6 @@ class ListEntitiesClimateResponse : public ProtoMessage {
   bool disabled_by_default{false};
   std::string icon{};
   enums::EntityCategory entity_category{};
-  float visual_current_temperature_step{0.0f};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -1528,32 +1525,6 @@ class BluetoothGATTNotifyResponse : public ProtoMessage {
  protected:
   bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class BluetoothDevicePairingResponse : public ProtoMessage {
- public:
-  uint64_t address{0};
-  bool paired{false};
-  int32_t error{0};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class BluetoothDeviceUnpairingResponse : public ProtoMessage {
- public:
-  uint64_t address{0};
-  bool success{false};
-  int32_t error{0};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
 
 }  // namespace api
 }  // namespace esphome

esphome/components/api/api_pb2_service.cpp

@@ -425,22 +425,6 @@ bool APIServerConnectionBase::send_bluetooth_gatt_notify_response(const Bluetoot
   return this->send_message_<BluetoothGATTNotifyResponse>(msg, 84);
 }
 #endif
-#ifdef USE_BLUETOOTH_PROXY
-bool APIServerConnectionBase::send_bluetooth_device_pairing_response(const BluetoothDevicePairingResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_bluetooth_device_pairing_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<BluetoothDevicePairingResponse>(msg, 85);
-}
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-bool APIServerConnectionBase::send_bluetooth_device_unpairing_response(const BluetoothDeviceUnpairingResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_bluetooth_device_unpairing_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<BluetoothDeviceUnpairingResponse>(msg, 86);
-}
-#endif
 bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) {
   switch (msg_type) {
     case 1: {

esphome/components/api/api_pb2_service.h

@@ -209,12 +209,6 @@ class APIServerConnectionBase : public ProtoService {
 #endif
 #ifdef USE_BLUETOOTH_PROXY
   bool send_bluetooth_gatt_notify_response(const BluetoothGATTNotifyResponse &msg);
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  bool send_bluetooth_device_pairing_response(const BluetoothDevicePairingResponse &msg);
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  bool send_bluetooth_device_unpairing_response(const BluetoothDeviceUnpairingResponse &msg);
 #endif
  protected:
   bool read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) override;

esphome/components/api/api_server.cpp

@@ -309,28 +309,6 @@ void APIServer::send_bluetooth_device_connection(uint64_t address, bool connecte
   }
 }
 
-void APIServer::send_bluetooth_device_pairing(uint64_t address, bool paired, esp_err_t error) {
-  BluetoothDevicePairingResponse call;
-  call.address = address;
-  call.paired = paired;
-  call.error = error;
-
-  for (auto &client : this->clients_) {
-    client->send_bluetooth_device_pairing_response(call);
-  }
-}
-
-void APIServer::send_bluetooth_device_unpairing(uint64_t address, bool success, esp_err_t error) {
-  BluetoothDeviceUnpairingResponse call;
-  call.address = address;
-  call.success = success;
-  call.error = error;
-
-  for (auto &client : this->clients_) {
-    client->send_bluetooth_device_unpairing_response(call);
-  }
-}
-
 void APIServer::send_bluetooth_connections_free(uint8_t free, uint8_t limit) {
   BluetoothConnectionsFreeResponse call;
   call.free = free;

esphome/components/api/api_server.h

@@ -78,8 +78,6 @@ class APIServer : public Component, public Controller {
 #ifdef USE_BLUETOOTH_PROXY
   void send_bluetooth_le_advertisement(const BluetoothLEAdvertisementResponse &call);
   void send_bluetooth_device_connection(uint64_t address, bool connected, uint16_t mtu = 0, esp_err_t error = ESP_OK);
-  void send_bluetooth_device_pairing(uint64_t address, bool paired, esp_err_t error = ESP_OK);
-  void send_bluetooth_device_unpairing(uint64_t address, bool success, esp_err_t error = ESP_OK);
   void send_bluetooth_connections_free(uint8_t free, uint8_t limit);
   void send_bluetooth_gatt_read_response(const BluetoothGATTReadResponse &call);
   void send_bluetooth_gatt_write_response(const BluetoothGATTWriteResponse &call);

esphome/components/as7341/as7341.cpp

@@ -1,271 +0,0 @@
-#include "as7341.h"
-#include "esphome/core/log.h"
-#include "esphome/core/hal.h"
-
-namespace esphome {
-namespace as7341 {
-
-static const char *const TAG = "as7341";
-
-void AS7341Component::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up AS7341...");
-  LOG_I2C_DEVICE(this);
-
-  // Verify device ID
-  uint8_t id;
-  this->read_byte(AS7341_ID, &id);
-  ESP_LOGCONFIG(TAG, "  Read ID: 0x%X", id);
-  if ((id & 0xFC) != (AS7341_CHIP_ID << 2)) {
-    this->mark_failed();
-    return;
-  }
-
-  // Power on (enter IDLE state)
-  if (!this->enable_power(true)) {
-    ESP_LOGE(TAG, "  Power on failed!");
-    this->mark_failed();
-    return;
-  }
-
-  // Set configuration
-  this->write_byte(AS7341_CONFIG, 0x00);
-  this->setup_atime(this->atime_);
-  this->setup_astep(this->astep_);
-  this->setup_gain(this->gain_);
-}
-
-void AS7341Component::dump_config() {
-  ESP_LOGCONFIG(TAG, "AS7341:");
-  LOG_I2C_DEVICE(this);
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with AS7341 failed!");
-  }
-  LOG_UPDATE_INTERVAL(this);
-  ESP_LOGCONFIG(TAG, "  Gain: %u", get_gain());
-  ESP_LOGCONFIG(TAG, "  ATIME: %u", get_atime());
-  ESP_LOGCONFIG(TAG, "  ASTEP: %u", get_astep());
-
-  LOG_SENSOR("  ", "F1", this->f1_);
-  LOG_SENSOR("  ", "F2", this->f2_);
-  LOG_SENSOR("  ", "F3", this->f3_);
-  LOG_SENSOR("  ", "F4", this->f4_);
-  LOG_SENSOR("  ", "F5", this->f5_);
-  LOG_SENSOR("  ", "F6", this->f6_);
-  LOG_SENSOR("  ", "F7", this->f7_);
-  LOG_SENSOR("  ", "F8", this->f8_);
-  LOG_SENSOR("  ", "Clear", this->clear_);
-  LOG_SENSOR("  ", "NIR", this->nir_);
-}
-
-float AS7341Component::get_setup_priority() const { return setup_priority::DATA; }
-
-void AS7341Component::update() {
-  this->read_channels(this->channel_readings_);
-
-  if (this->f1_ != nullptr) {
-    this->f1_->publish_state(this->channel_readings_[0]);
-  }
-  if (this->f2_ != nullptr) {
-    this->f2_->publish_state(this->channel_readings_[1]);
-  }
-  if (this->f3_ != nullptr) {
-    this->f3_->publish_state(this->channel_readings_[2]);
-  }
-  if (this->f4_ != nullptr) {
-    this->f4_->publish_state(this->channel_readings_[3]);
-  }
-  if (this->f5_ != nullptr) {
-    this->f5_->publish_state(this->channel_readings_[6]);
-  }
-  if (this->f6_ != nullptr) {
-    this->f6_->publish_state(this->channel_readings_[7]);
-  }
-  if (this->f7_ != nullptr) {
-    this->f7_->publish_state(this->channel_readings_[8]);
-  }
-  if (this->f8_ != nullptr) {
-    this->f8_->publish_state(this->channel_readings_[9]);
-  }
-  if (this->clear_ != nullptr) {
-    this->clear_->publish_state(this->channel_readings_[10]);
-  }
-  if (this->nir_ != nullptr) {
-    this->nir_->publish_state(this->channel_readings_[11]);
-  }
-}
-
-AS7341Gain AS7341Component::get_gain() {
-  uint8_t data;
-  this->read_byte(AS7341_CFG1, &data);
-  return (AS7341Gain) data;
-}
-
-uint8_t AS7341Component::get_atime() {
-  uint8_t data;
-  this->read_byte(AS7341_ATIME, &data);
-  return data;
-}
-
-uint16_t AS7341Component::get_astep() {
-  uint16_t data;
-  this->read_byte_16(AS7341_ASTEP, &data);
-  return this->swap_bytes(data);
-}
-
-bool AS7341Component::setup_gain(AS7341Gain gain) { return this->write_byte(AS7341_CFG1, gain); }
-
-bool AS7341Component::setup_atime(uint8_t atime) { return this->write_byte(AS7341_ATIME, atime); }
-
-bool AS7341Component::setup_astep(uint16_t astep) { return this->write_byte_16(AS7341_ASTEP, swap_bytes(astep)); }
-
-bool AS7341Component::read_channels(uint16_t *data) {
-  this->set_smux_low_channels(true);
-  this->enable_spectral_measurement(true);
-  this->wait_for_data();
-  bool low_success = this->read_bytes_16(AS7341_CH0_DATA_L, data, 6);
-
-  this->set_smux_low_channels(false);
-  this->enable_spectral_measurement(true);
-  this->wait_for_data();
-  bool high_sucess = this->read_bytes_16(AS7341_CH0_DATA_L, &data[6], 6);
-
-  return low_success && high_sucess;
-}
-
-void AS7341Component::set_smux_low_channels(bool enable) {
-  this->enable_spectral_measurement(false);
-  this->set_smux_command(AS7341_SMUX_CMD_WRITE);
-
-  if (enable) {
-    this->configure_smux_low_channels();
-
-  } else {
-    this->configure_smux_high_channels();
-  }
-  this->enable_smux();
-}
-
-bool AS7341Component::set_smux_command(AS7341SmuxCommand command) {
-  uint8_t data = command << 3;  // Write to bits 4:3 of the register
-  return this->write_byte(AS7341_CFG6, data);
-}
-
-void AS7341Component::configure_smux_low_channels() {
-  // SMUX Config for F1,F2,F3,F4,NIR,Clear
-  this->write_byte(0x00, 0x30);  // F3 left set to ADC2
-  this->write_byte(0x01, 0x01);  // F1 left set to ADC0
-  this->write_byte(0x02, 0x00);  // Reserved or disabled
-  this->write_byte(0x03, 0x00);  // F8 left disabled
-  this->write_byte(0x04, 0x00);  // F6 left disabled
-  this->write_byte(0x05, 0x42);  // F4 left connected to ADC3/f2 left connected to ADC1
-  this->write_byte(0x06, 0x00);  // F5 left disbled
-  this->write_byte(0x07, 0x00);  // F7 left disbled
-  this->write_byte(0x08, 0x50);  // CLEAR connected to ADC4
-  this->write_byte(0x09, 0x00);  // F5 right disabled
-  this->write_byte(0x0A, 0x00);  // F7 right disabled
-  this->write_byte(0x0B, 0x00);  // Reserved or disabled
-  this->write_byte(0x0C, 0x20);  // F2 right connected to ADC1
-  this->write_byte(0x0D, 0x04);  // F4 right connected to ADC3
-  this->write_byte(0x0E, 0x00);  // F6/F8 right disabled
-  this->write_byte(0x0F, 0x30);  // F3 right connected to AD2
-  this->write_byte(0x10, 0x01);  // F1 right connected to AD0
-  this->write_byte(0x11, 0x50);  // CLEAR right connected to AD4
-  this->write_byte(0x12, 0x00);  // Reserved or disabled
-  this->write_byte(0x13, 0x06);  // NIR connected to ADC5
-}
-
-void AS7341Component::configure_smux_high_channels() {
-  // SMUX Config for F5,F6,F7,F8,NIR,Clear
-  this->write_byte(0x00, 0x00);  // F3 left disable
-  this->write_byte(0x01, 0x00);  // F1 left disable
-  this->write_byte(0x02, 0x00);  // reserved/disable
-  this->write_byte(0x03, 0x40);  // F8 left connected to ADC3
-  this->write_byte(0x04, 0x02);  // F6 left connected to ADC1
-  this->write_byte(0x05, 0x00);  // F4/ F2 disabled
-  this->write_byte(0x06, 0x10);  // F5 left connected to ADC0
-  this->write_byte(0x07, 0x03);  // F7 left connected to ADC2
-  this->write_byte(0x08, 0x50);  // CLEAR Connected to ADC4
-  this->write_byte(0x09, 0x10);  // F5 right connected to ADC0
-  this->write_byte(0x0A, 0x03);  // F7 right connected to ADC2
-  this->write_byte(0x0B, 0x00);  // Reserved or disabled
-  this->write_byte(0x0C, 0x00);  // F2 right disabled
-  this->write_byte(0x0D, 0x00);  // F4 right disabled
-  this->write_byte(0x0E, 0x24);  // F8 right connected to ADC2/ F6 right connected to ADC1
-  this->write_byte(0x0F, 0x00);  // F3 right disabled
-  this->write_byte(0x10, 0x00);  // F1 right disabled
-  this->write_byte(0x11, 0x50);  // CLEAR right connected to AD4
-  this->write_byte(0x12, 0x00);  // Reserved or disabled
-  this->write_byte(0x13, 0x06);  // NIR connected to ADC5
-}
-
-bool AS7341Component::enable_smux() {
-  this->set_register_bit(AS7341_ENABLE, 4);
-
-  uint16_t timeout = 1000;
-  for (uint16_t time = 0; time < timeout; time++) {
-    // The SMUXEN bit is cleared once the SMUX operation is finished
-    bool smuxen = this->read_register_bit(AS7341_ENABLE, 4);
-    if (!smuxen) {
-      return true;
-    }
-
-    delay(1);
-  }
-
-  return false;
-}
-
-bool AS7341Component::wait_for_data() {
-  uint16_t timeout = 1000;
-  for (uint16_t time = 0; time < timeout; time++) {
-    if (this->is_data_ready()) {
-      return true;
-    }
-
-    delay(1);
-  }
-
-  return false;
-}
-
-bool AS7341Component::is_data_ready() { return this->read_register_bit(AS7341_STATUS2, 6); }
-
-bool AS7341Component::enable_power(bool enable) { return this->write_register_bit(AS7341_ENABLE, enable, 0); }
-
-bool AS7341Component::enable_spectral_measurement(bool enable) {
-  return this->write_register_bit(AS7341_ENABLE, enable, 1);
-}
-
-bool AS7341Component::read_register_bit(uint8_t address, uint8_t bit_position) {
-  uint8_t data;
-  this->read_byte(address, &data);
-  bool bit = (data & (1 << bit_position)) > 0;
-  return bit;
-}
-
-bool AS7341Component::write_register_bit(uint8_t address, bool value, uint8_t bit_position) {
-  if (value) {
-    return this->set_register_bit(address, bit_position);
-  }
-
-  return this->clear_register_bit(address, bit_position);
-}
-
-bool AS7341Component::set_register_bit(uint8_t address, uint8_t bit_position) {
-  uint8_t data;
-  this->read_byte(address, &data);
-  data |= (1 << bit_position);
-  return this->write_byte(address, data);
-}
-
-bool AS7341Component::clear_register_bit(uint8_t address, uint8_t bit_position) {
-  uint8_t data;
-  this->read_byte(address, &data);
-  data &= ~(1 << bit_position);
-  return this->write_byte(address, data);
-}
-
-uint16_t AS7341Component::swap_bytes(uint16_t data) { return (data >> 8) | (data << 8); }
-
-}  // namespace as7341
-}  // namespace esphome

esphome/components/as7341/as7341.h

@@ -1,144 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/i2c/i2c.h"
-
-namespace esphome {
-namespace as7341 {
-
-static const uint8_t AS7341_CHIP_ID = 0X09;
-
-static const uint8_t AS7341_CONFIG = 0x70;
-static const uint8_t AS7341_LED = 0x74;
-
-static const uint8_t AS7341_ENABLE = 0x80;
-static const uint8_t AS7341_ATIME = 0x81;
-
-static const uint8_t AS7341_WTIME = 0x83;
-
-static const uint8_t AS7341_AUXID = 0x90;
-static const uint8_t AS7341_REVID = 0x91;
-static const uint8_t AS7341_ID = 0x92;
-static const uint8_t AS7341_STATUS = 0x93;
-
-static const uint8_t AS7341_CH0_DATA_L = 0x95;
-static const uint8_t AS7341_CH0_DATA_H = 0x96;
-static const uint8_t AS7341_CH1_DATA_L = 0x97;
-static const uint8_t AS7341_CH1_DATA_H = 0x98;
-static const uint8_t AS7341_CH2_DATA_L = 0x99;
-static const uint8_t AS7341_CH2_DATA_H = 0x9A;
-static const uint8_t AS7341_CH3_DATA_L = 0x9B;
-static const uint8_t AS7341_CH3_DATA_H = 0x9C;
-static const uint8_t AS7341_CH4_DATA_L = 0x9D;
-static const uint8_t AS7341_CH4_DATA_H = 0x9E;
-static const uint8_t AS7341_CH5_DATA_L = 0x9F;
-static const uint8_t AS7341_CH5_DATA_H = 0xA0;
-
-static const uint8_t AS7341_STATUS2 = 0xA3;
-
-static const uint8_t AS7341_CFG1 = 0xAA;  ///< Controls ADC Gain
-
-static const uint8_t AS7341_CFG6 = 0xAF;  // Stores SMUX command
-static const uint8_t AS7341_CFG9 = 0xB2;  // Config for system interrupts (SMUX, Flicker detection)
-
-static const uint8_t AS7341_ASTEP = 0xCA;      // LSB
-static const uint8_t AS7341_ASTEP_MSB = 0xCB;  // MSB
-
-enum AS7341AdcChannel {
-  AS7341_ADC_CHANNEL_0,
-  AS7341_ADC_CHANNEL_1,
-  AS7341_ADC_CHANNEL_2,
-  AS7341_ADC_CHANNEL_3,
-  AS7341_ADC_CHANNEL_4,
-  AS7341_ADC_CHANNEL_5,
-};
-
-enum AS7341SmuxCommand {
-  AS7341_SMUX_CMD_ROM_RESET,  ///< ROM code initialization of SMUX
-  AS7341_SMUX_CMD_READ,       ///< Read SMUX configuration to RAM from SMUX chain
-  AS7341_SMUX_CMD_WRITE,      ///< Write SMUX configuration from RAM to SMUX chain
-};
-
-enum AS7341Gain {
-  AS7341_GAIN_0_5X,
-  AS7341_GAIN_1X,
-  AS7341_GAIN_2X,
-  AS7341_GAIN_4X,
-  AS7341_GAIN_8X,
-  AS7341_GAIN_16X,
-  AS7341_GAIN_32X,
-  AS7341_GAIN_64X,
-  AS7341_GAIN_128X,
-  AS7341_GAIN_256X,
-  AS7341_GAIN_512X,
-};
-
-class AS7341Component : public PollingComponent, public i2c::I2CDevice {
- public:
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override;
-  void update() override;
-
-  void set_f1_sensor(sensor::Sensor *f1_sensor) { this->f1_ = f1_sensor; }
-  void set_f2_sensor(sensor::Sensor *f2_sensor) { f2_ = f2_sensor; }
-  void set_f3_sensor(sensor::Sensor *f3_sensor) { f3_ = f3_sensor; }
-  void set_f4_sensor(sensor::Sensor *f4_sensor) { f4_ = f4_sensor; }
-  void set_f5_sensor(sensor::Sensor *f5_sensor) { f5_ = f5_sensor; }
-  void set_f6_sensor(sensor::Sensor *f6_sensor) { f6_ = f6_sensor; }
-  void set_f7_sensor(sensor::Sensor *f7_sensor) { f7_ = f7_sensor; }
-  void set_f8_sensor(sensor::Sensor *f8_sensor) { f8_ = f8_sensor; }
-  void set_clear_sensor(sensor::Sensor *clear_sensor) { clear_ = clear_sensor; }
-  void set_nir_sensor(sensor::Sensor *nir_sensor) { nir_ = nir_sensor; }
-
-  void set_gain(AS7341Gain gain) { gain_ = gain; }
-  void set_atime(uint8_t atime) { atime_ = atime; }
-  void set_astep(uint16_t astep) { astep_ = astep; }
-
-  AS7341Gain get_gain();
-  uint8_t get_atime();
-  uint16_t get_astep();
-  bool setup_gain(AS7341Gain gain);
-  bool setup_atime(uint8_t atime);
-  bool setup_astep(uint16_t astep);
-
-  uint16_t read_channel(AS7341AdcChannel channel);
-  bool read_channels(uint16_t *data);
-  void set_smux_low_channels(bool enable);
-  bool set_smux_command(AS7341SmuxCommand command);
-  void configure_smux_low_channels();
-  void configure_smux_high_channels();
-  bool enable_smux();
-
-  bool wait_for_data();
-  bool is_data_ready();
-  bool enable_power(bool enable);
-  bool enable_spectral_measurement(bool enable);
-
-  bool read_register_bit(uint8_t address, uint8_t bit_position);
-  bool write_register_bit(uint8_t address, bool value, uint8_t bit_position);
-  bool set_register_bit(uint8_t address, uint8_t bit_position);
-  bool clear_register_bit(uint8_t address, uint8_t bit_position);
-  uint16_t swap_bytes(uint16_t data);
-
- protected:
-  sensor::Sensor *f1_{nullptr};
-  sensor::Sensor *f2_{nullptr};
-  sensor::Sensor *f3_{nullptr};
-  sensor::Sensor *f4_{nullptr};
-  sensor::Sensor *f5_{nullptr};
-  sensor::Sensor *f6_{nullptr};
-  sensor::Sensor *f7_{nullptr};
-  sensor::Sensor *f8_{nullptr};
-  sensor::Sensor *clear_{nullptr};
-  sensor::Sensor *nir_{nullptr};
-
-  uint16_t astep_;
-  AS7341Gain gain_;
-  uint8_t atime_;
-  uint16_t channel_readings_[12];
-};
-
-}  // namespace as7341
-}  // namespace esphome

esphome/components/as7341/sensor.py

@@ -1,112 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import i2c, sensor
-from esphome.const import (
-    CONF_GAIN,
-    CONF_ID,
-    DEVICE_CLASS_ILLUMINANCE,
-    ICON_BRIGHTNESS_5,
-    STATE_CLASS_MEASUREMENT,
-)
-
-
-CODEOWNERS = ["@mrgnr"]
-DEPENDENCIES = ["i2c"]
-
-as7341_ns = cg.esphome_ns.namespace("as7341")
-
-AS7341Component = as7341_ns.class_(
-    "AS7341Component", cg.PollingComponent, i2c.I2CDevice
-)
-
-CONF_ATIME = "atime"
-CONF_ASTEP = "astep"
-
-CONF_F1 = "f1"
-CONF_F2 = "f2"
-CONF_F3 = "f3"
-CONF_F4 = "f4"
-CONF_F5 = "f5"
-CONF_F6 = "f6"
-CONF_F7 = "f7"
-CONF_F8 = "f8"
-CONF_CLEAR = "clear"
-CONF_NIR = "nir"
-
-UNIT_COUNTS = "#"
-
-AS7341_GAIN = as7341_ns.enum("AS7341Gain")
-GAIN_OPTIONS = {
-    "X0.5": AS7341_GAIN.AS7341_GAIN_0_5X,
-    "X1": AS7341_GAIN.AS7341_GAIN_1X,
-    "X2": AS7341_GAIN.AS7341_GAIN_2X,
-    "X4": AS7341_GAIN.AS7341_GAIN_4X,
-    "X8": AS7341_GAIN.AS7341_GAIN_8X,
-    "X16": AS7341_GAIN.AS7341_GAIN_16X,
-    "X32": AS7341_GAIN.AS7341_GAIN_32X,
-    "X64": AS7341_GAIN.AS7341_GAIN_64X,
-    "X128": AS7341_GAIN.AS7341_GAIN_128X,
-    "X256": AS7341_GAIN.AS7341_GAIN_256X,
-    "X512": AS7341_GAIN.AS7341_GAIN_512X,
-}
-
-
-SENSOR_SCHEMA = sensor.sensor_schema(
-    unit_of_measurement=UNIT_COUNTS,
-    icon=ICON_BRIGHTNESS_5,
-    accuracy_decimals=0,
-    device_class=DEVICE_CLASS_ILLUMINANCE,
-    state_class=STATE_CLASS_MEASUREMENT,
-)
-
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(AS7341Component),
-            cv.Optional(CONF_F1): SENSOR_SCHEMA,
-            cv.Optional(CONF_F2): SENSOR_SCHEMA,
-            cv.Optional(CONF_F3): SENSOR_SCHEMA,
-            cv.Optional(CONF_F4): SENSOR_SCHEMA,
-            cv.Optional(CONF_F5): SENSOR_SCHEMA,
-            cv.Optional(CONF_F6): SENSOR_SCHEMA,
-            cv.Optional(CONF_F7): SENSOR_SCHEMA,
-            cv.Optional(CONF_F8): SENSOR_SCHEMA,
-            cv.Optional(CONF_CLEAR): SENSOR_SCHEMA,
-            cv.Optional(CONF_NIR): SENSOR_SCHEMA,
-            cv.Optional(CONF_GAIN, default="X8"): cv.enum(GAIN_OPTIONS),
-            cv.Optional(CONF_ATIME, default=29): cv.int_range(min=0, max=255),
-            cv.Optional(CONF_ASTEP, default=599): cv.int_range(min=0, max=65534),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(i2c.i2c_device_schema(0x39))
-)
-
-SENSORS = {
-    CONF_F1: "set_f1_sensor",
-    CONF_F2: "set_f2_sensor",
-    CONF_F3: "set_f3_sensor",
-    CONF_F4: "set_f4_sensor",
-    CONF_F5: "set_f5_sensor",
-    CONF_F6: "set_f6_sensor",
-    CONF_F7: "set_f7_sensor",
-    CONF_F8: "set_f8_sensor",
-    CONF_CLEAR: "set_clear_sensor",
-    CONF_NIR: "set_nir_sensor",
-}
-
-
-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_gain(config[CONF_GAIN]))
-    cg.add(var.set_atime(config[CONF_ATIME]))
-    cg.add(var.set_astep(config[CONF_ASTEP]))
-
-    for conf_id, set_sensor_func in SENSORS.items():
-        if conf_id in config:
-            sens = await sensor.new_sensor(config[conf_id])
-            cg.add(getattr(var, set_sensor_func)(sens))

esphome/components/b_parasite/sensor.py

@@ -80,7 +80,7 @@ async def to_code(config):
 
     cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
 
-    for config_key, setter in [
+    for (config_key, setter) in [
         (CONF_TEMPERATURE, var.set_temperature),
         (CONF_HUMIDITY, var.set_humidity),
         (CONF_BATTERY_VOLTAGE, var.set_battery_voltage),

esphome/components/bedjet/bedjet_hub.cpp

@@ -1,5 +1,3 @@
-#ifdef USE_ESP32
-
 #include "bedjet_hub.h"
 #include "bedjet_child.h"
 #include "bedjet_const.h"
@@ -543,5 +541,3 @@ void BedJetHub::register_child(BedJetClient *obj) {
 
 }  // namespace bedjet
 }  // namespace esphome
-
-#endif

esphome/components/bedjet/bedjet_hub.h

@@ -1,5 +1,4 @@
 #pragma once
-#ifdef USE_ESP32
 
 #include "esphome/components/ble_client/ble_client.h"
 #include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
@@ -15,6 +14,8 @@
 #include "esphome/components/time/real_time_clock.h"
 #endif
 
+#ifdef USE_ESP32
+
 #include <esp_gattc_api.h>
 
 namespace esphome {

esphome/components/bedjet/fan/bedjet_fan.cpp

@@ -37,13 +37,9 @@ void BedJetFan::control(const fan::FanCall &call) {
 
   // ignore speed changes if not on or turning on
   if (this->state && call.get_speed().has_value()) {
-    auto speed = *call.get_speed();
-    if (speed >= 1) {
-      this->speed = speed;
-      // Fan.speed is 1-20, but Bedjet expects 0-19, so subtract 1
-      this->parent_->set_fan_index(this->speed - 1);
-      did_change = true;
-    }
+    this->speed = *call.get_speed();
+    this->parent_->set_fan_index(this->speed);
+    did_change = true;
   }
 
   if (did_change) {
@@ -61,9 +57,8 @@ void BedJetFan::on_status(const BedjetStatusPacket *data) {
     did_change = true;
   }
 
-  // BedjetStatusPacket.fan_step is in range 0-19, but Fan.speed wants 1-20.
-  if (data->fan_step + 1 != this->speed) {
-    this->speed = data->fan_step + 1;
+  if (data->fan_step != this->speed) {
+    this->speed = data->fan_step;
     did_change = true;
   }
 

esphome/components/binary_sensor/__init__.py

@@ -27,13 +27,13 @@ from esphome.const import (
     CONF_TIMING,
     CONF_TRIGGER_ID,
     CONF_MQTT_ID,
+    DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_BATTERY,
     DEVICE_CLASS_BATTERY_CHARGING,
     DEVICE_CLASS_CARBON_MONOXIDE,
     DEVICE_CLASS_COLD,
     DEVICE_CLASS_CONNECTIVITY,
     DEVICE_CLASS_DOOR,
-    DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_GARAGE_DOOR,
     DEVICE_CLASS_GAS,
     DEVICE_CLASS_HEAT,
@@ -62,13 +62,13 @@ from esphome.util import Registry
 
 CODEOWNERS = ["@esphome/core"]
 DEVICE_CLASSES = [
+    DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_BATTERY,
     DEVICE_CLASS_BATTERY_CHARGING,
     DEVICE_CLASS_CARBON_MONOXIDE,
     DEVICE_CLASS_COLD,
     DEVICE_CLASS_CONNECTIVITY,
     DEVICE_CLASS_DOOR,
-    DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_GARAGE_DOOR,
     DEVICE_CLASS_GAS,
     DEVICE_CLASS_HEAT,
@@ -393,21 +393,28 @@ def binary_sensor_schema(
     entity_category: str = _UNDEF,
     device_class: str = _UNDEF,
 ) -> cv.Schema:
-    schema = {}
-
+    schema = BINARY_SENSOR_SCHEMA
     if class_ is not _UNDEF:
-        # Not cv.optional
-        schema[cv.GenerateID()] = cv.declare_id(class_)
-
-    for key, default, validator in [
-        (CONF_ICON, icon, cv.icon),
-        (CONF_ENTITY_CATEGORY, entity_category, cv.entity_category),
-        (CONF_DEVICE_CLASS, device_class, validate_device_class),
-    ]:
-        if default is not _UNDEF:
-            schema[cv.Optional(key, default=default)] = validator
-
-    return BINARY_SENSOR_SCHEMA.extend(schema)
+        schema = schema.extend({cv.GenerateID(): cv.declare_id(class_)})
+    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_binary_sensor_core_(var, config):

esphome/components/binary_sensor/binary_sensor.cpp

@@ -41,13 +41,16 @@ void BinarySensor::send_state_internal(bool state, bool is_initial) {
     this->state_callback_.call(state);
   }
 }
-
+std::string BinarySensor::device_class() { return ""; }
 BinarySensor::BinarySensor() : state(false) {}
 void BinarySensor::set_device_class(const std::string &device_class) { this->device_class_ = device_class; }
 std::string BinarySensor::get_device_class() {
   if (this->device_class_.has_value())
     return *this->device_class_;
-  return "";
+#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

@@ -19,15 +19,6 @@ namespace binary_sensor {
     } \
   }
 
-#define SUB_BINARY_SENSOR(name) \
- protected: \
-  binary_sensor::BinarySensor *name##_binary_sensor_{nullptr}; \
-\
- public: \
-  void set_##name##_binary_sensor(binary_sensor::BinarySensor *binary_sensor) { \
-    this->name##_binary_sensor_ = binary_sensor; \
-  }
-
 /** Base class for all binary_sensor-type classes.
  *
  * This class includes a callback that components such as MQTT can subscribe to for state changes.
@@ -80,6 +71,14 @@ class BinarySensor : public EntityBase {
 
   virtual bool is_status_binary_sensor() const;
 
+  // ========== 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)
+   */
+  virtual std::string device_class();
+
  protected:
   CallbackManager<void(bool)> state_callback_{};
   optional<std::string> device_class_{};  ///< Stores the override of the device class

esphome/components/bl0939/sensor.py

@@ -9,7 +9,6 @@ from esphome.const import (
     DEVICE_CLASS_POWER,
     DEVICE_CLASS_VOLTAGE,
     STATE_CLASS_MEASUREMENT,
-    STATE_CLASS_TOTAL_INCREASING,
     UNIT_AMPERE,
     UNIT_KILOWATT_HOURS,
     UNIT_VOLT,
@@ -67,19 +66,16 @@ CONFIG_SCHEMA = (
                 unit_of_measurement=UNIT_KILOWATT_HOURS,
                 accuracy_decimals=3,
                 device_class=DEVICE_CLASS_ENERGY,
-                state_class=STATE_CLASS_TOTAL_INCREASING,
             ),
             cv.Optional(CONF_ENERGY_2): sensor.sensor_schema(
                 unit_of_measurement=UNIT_KILOWATT_HOURS,
                 accuracy_decimals=3,
                 device_class=DEVICE_CLASS_ENERGY,
-                state_class=STATE_CLASS_TOTAL_INCREASING,
             ),
             cv.Optional(CONF_ENERGY_TOTAL): sensor.sensor_schema(
                 unit_of_measurement=UNIT_KILOWATT_HOURS,
                 accuracy_decimals=3,
                 device_class=DEVICE_CLASS_ENERGY,
-                state_class=STATE_CLASS_TOTAL_INCREASING,
             ),
         }
     )

esphome/components/ble_client/automation.cpp

@@ -1,5 +1,3 @@
-#ifdef USE_ESP32
-
 #include "automation.h"
 
 #include <esp_bt_defs.h>
@@ -75,5 +73,3 @@ void BLEWriterClientNode::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
 
 }  // namespace ble_client
 }  // namespace esphome
-
-#endif

esphome/components/ble_client/automation.h

@@ -1,13 +1,13 @@
 #pragma once
 
-#ifdef USE_ESP32
-
 #include <utility>
 #include <vector>
 
 #include "esphome/core/automation.h"
 #include "esphome/components/ble_client/ble_client.h"
 
+#ifdef USE_ESP32
+
 namespace esphome {
 namespace ble_client {
 class BLEClientConnectTrigger : public Trigger<>, public BLEClientNode {

esphome/components/bluetooth_proxy/bluetooth_connection.cpp

@@ -158,25 +158,6 @@ bool BluetoothConnection::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
   return true;
 }
 
-void BluetoothConnection::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
-  BLEClientBase::gap_event_handler(event, param);
-
-  switch (event) {
-    case ESP_GAP_BLE_AUTH_CMPL_EVT:
-      if (memcmp(param->ble_security.auth_cmpl.bd_addr, this->remote_bda_, 6) != 0)
-        break;
-      if (param->ble_security.auth_cmpl.success) {
-        api::global_api_server->send_bluetooth_device_pairing(this->address_, true);
-      } else {
-        api::global_api_server->send_bluetooth_device_pairing(this->address_, false,
-                                                              param->ble_security.auth_cmpl.fail_reason);
-      }
-      break;
-    default:
-      break;
-  }
-}
-
 esp_err_t BluetoothConnection::read_characteristic(uint16_t handle) {
   if (!this->connected()) {
     ESP_LOGW(TAG, "[%d] [%s] Cannot read GATT characteristic, not connected.", this->connection_index_,

esphome/components/bluetooth_proxy/bluetooth_connection.h

@@ -13,7 +13,6 @@ class BluetoothConnection : public esp32_ble_client::BLEClientBase {
  public:
   bool gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                            esp_ble_gattc_cb_param_t *param) override;
-  void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) override;
 
   esp_err_t read_characteristic(uint16_t handle);
   esp_err_t write_characteristic(uint16_t handle, const std::string &data, bool response);

esphome/components/bluetooth_proxy/bluetooth_proxy.cpp

@@ -257,7 +257,12 @@ void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest
         ESP_LOGI(TAG, "[%d] [%s] Connecting v1", connection->get_connection_index(), connection->address_str().c_str());
       }
       if (msg.has_address_type) {
-        uint64_to_bd_addr(msg.address, connection->remote_bda_);
+        connection->remote_bda_[0] = (msg.address >> 40) & 0xFF;
+        connection->remote_bda_[1] = (msg.address >> 32) & 0xFF;
+        connection->remote_bda_[2] = (msg.address >> 24) & 0xFF;
+        connection->remote_bda_[3] = (msg.address >> 16) & 0xFF;
+        connection->remote_bda_[4] = (msg.address >> 8) & 0xFF;
+        connection->remote_bda_[5] = (msg.address >> 0) & 0xFF;
         connection->set_remote_addr_type(static_cast<esp_ble_addr_type_t>(msg.address_type));
         connection->set_state(espbt::ClientState::DISCOVERED);
       } else {
@@ -285,27 +290,9 @@ void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest
       }
       break;
     }
-    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR: {
-      auto *connection = this->get_connection_(msg.address, false);
-      if (connection != nullptr) {
-        if (!connection->is_paired()) {
-          auto err = connection->pair();
-          if (err != ESP_OK) {
-            api::global_api_server->send_bluetooth_device_pairing(msg.address, false, err);
-          }
-        } else {
-          api::global_api_server->send_bluetooth_device_pairing(msg.address, true);
-        }
-      }
+    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR:
+    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR:
       break;
-    }
-    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR: {
-      esp_bd_addr_t address;
-      uint64_to_bd_addr(msg.address, address);
-      esp_err_t ret = esp_ble_remove_bond_device(address);
-      api::global_api_server->send_bluetooth_device_unpairing(msg.address, ret == ESP_OK, ret);
-      break;
-    }
   }
 }
 

esphome/components/bluetooth_proxy/bluetooth_proxy.h

@@ -44,15 +44,6 @@ class BluetoothProxy : public esp32_ble_tracker::ESPBTDeviceListener, public Com
   int get_bluetooth_connections_free();
   int get_bluetooth_connections_limit() { return this->connections_.size(); }
 
-  static void uint64_to_bd_addr(uint64_t address, esp_bd_addr_t bd_addr) {
-    bd_addr[0] = (address >> 40) & 0xff;
-    bd_addr[1] = (address >> 32) & 0xff;
-    bd_addr[2] = (address >> 24) & 0xff;
-    bd_addr[3] = (address >> 16) & 0xff;
-    bd_addr[4] = (address >> 8) & 0xff;
-    bd_addr[5] = (address >> 0) & 0xff;
-  }
-
   void set_active(bool active) { this->active_ = active; }
   bool has_active() { return this->active_; }
 

esphome/components/bme280/bme280.cpp

@@ -88,10 +88,7 @@ void BME280Component::setup() {
 
   // Mark as not failed before initializing. Some devices will turn off sensors to save on batteries
   // and when they come back on, the COMPONENT_STATE_FAILED bit must be unset on the component.
-  if ((this->component_state_ & COMPONENT_STATE_MASK) == COMPONENT_STATE_FAILED) {
-    this->component_state_ &= ~COMPONENT_STATE_MASK;
-    this->component_state_ |= COMPONENT_STATE_CONSTRUCTION;
-  }
+  this->component_state_ &= ~COMPONENT_STATE_FAILED;
 
   if (!this->read_byte(BME280_REGISTER_CHIPID, &chip_id)) {
     this->error_code_ = COMMUNICATION_FAILED;

esphome/components/bme680/bme680.cpp

@@ -1,6 +1,6 @@
 #include "bme680.h"
-#include "esphome/core/hal.h"
 #include "esphome/core/log.h"
+#include "esphome/core/hal.h"
 
 namespace esphome {
 namespace bme680 {
@@ -117,24 +117,18 @@ void BME680Component::setup() {
   this->calibration_.gh2 = cal2[12] << 8 | cal2[13];
   this->calibration_.gh3 = cal2[15];
 
-  uint8_t temp_var = 0;
-  if (!this->read_byte(0x02, &temp_var)) {
+  if (!this->read_byte(0x02, &this->calibration_.res_heat_range)) {
     this->mark_failed();
     return;
   }
-  this->calibration_.res_heat_range = ((temp_var & 0x30) / 16);
-
-  if (!this->read_byte(0x00, &temp_var)) {
+  if (!this->read_byte(0x00, &this->calibration_.res_heat_val)) {
     this->mark_failed();
     return;
   }
-  this->calibration_.res_heat_val = (int8_t) temp_var;
-
-  if (!this->read_byte(0x04, &temp_var)) {
+  if (!this->read_byte(0x04, &this->calibration_.range_sw_err)) {
     this->mark_failed();
     return;
   }
-  this->calibration_.range_sw_err = ((int8_t) temp_var & (int8_t) 0xf0) / 16;
 
   this->calibration_.ambient_temperature = 25;  // prime ambient temperature
 
@@ -187,7 +181,7 @@ void BME680Component::setup() {
     return;
   }
   gas0_control &= ~0b00001000;
-  gas0_control |= heat_off << 3;
+  gas0_control |= heat_off ? 0b100 : 0b000;
   if (!this->write_byte(BME680_REGISTER_CONTROL_GAS0, gas0_control)) {
     this->mark_failed();
     return;
@@ -255,12 +249,12 @@ uint8_t BME680Component::calc_heater_resistance_(uint16_t temperature) {
   if (temperature > 400)
     temperature = 400;
 
-  const int8_t ambient_temperature = this->calibration_.ambient_temperature;
+  const uint8_t ambient_temperature = this->calibration_.ambient_temperature;
   const int8_t gh1 = this->calibration_.gh1;
   const int16_t gh2 = this->calibration_.gh2;
   const int8_t gh3 = this->calibration_.gh3;
   const uint8_t res_heat_range = this->calibration_.res_heat_range;
-  const int8_t res_heat_val = this->calibration_.res_heat_val;
+  const uint8_t res_heat_val = this->calibration_.res_heat_val;
 
   uint8_t heatr_res;
   int32_t var1;
@@ -275,8 +269,8 @@ uint8_t BME680Component::calc_heater_resistance_(uint16_t temperature) {
   var3 = var1 + (var2 / 2);
   var4 = (var3 / (res_heat_range + 4));
   var5 = (131 * res_heat_val) + 65536;
-  heatr_res_x100 = (int32_t) (((var4 / var5) - 250) * 34);
-  heatr_res = (uint8_t) ((heatr_res_x100 + 50) / 100);
+  heatr_res_x100 = (int32_t)(((var4 / var5) - 250) * 34);
+  heatr_res = (uint8_t)((heatr_res_x100 + 50) / 100);
 
   return heatr_res;
 }
@@ -299,57 +293,35 @@ uint8_t BME680Component::calc_heater_duration_(uint16_t duration) {
 void BME680Component::read_data_() {
   uint8_t data[15];
   if (!this->read_bytes(BME680_REGISTER_FIELD0, data, 15)) {
-    if (this->temperature_sensor_ != nullptr)
-      this->temperature_sensor_->publish_state(NAN);
-    if (this->pressure_sensor_ != nullptr)
-      this->pressure_sensor_->publish_state(NAN);
-    if (this->humidity_sensor_ != nullptr)
-      this->humidity_sensor_->publish_state(NAN);
-    if (this->gas_resistance_sensor_ != nullptr)
-      this->gas_resistance_sensor_->publish_state(NAN);
-    ESP_LOGW(TAG, "Communication with BME680 failed!");
     this->status_set_warning();
     return;
   }
-  this->status_clear_warning();
 
   uint32_t raw_temperature = (uint32_t(data[5]) << 12) | (uint32_t(data[6]) << 4) | (uint32_t(data[7]) >> 4);
   uint32_t raw_pressure = (uint32_t(data[2]) << 12) | (uint32_t(data[3]) << 4) | (uint32_t(data[4]) >> 4);
   uint32_t raw_humidity = (uint32_t(data[8]) << 8) | uint32_t(data[9]);
-  uint16_t raw_gas = (uint16_t) ((uint32_t) data[13] * 4 | (((uint32_t) data[14]) / 64));
+  uint16_t raw_gas = (uint16_t(data[13]) << 2) | (uint16_t(14) >> 6);
   uint8_t gas_range = data[14] & 0x0F;
 
   float temperature = this->calc_temperature_(raw_temperature);
   float pressure = this->calc_pressure_(raw_pressure);
   float humidity = this->calc_humidity_(raw_humidity);
-  float gas_resistance = this->calc_gas_resistance_(raw_gas, gas_range);
-
-  bool gas_valid = (data[14] >> 5) & 1;
-  bool heat_stable = (data[14] >> 4) & 1;
-  if (this->heater_temperature_ == 0 || this->heater_duration_ == 0)
-    heat_stable = true;  // Allow reporting gas resistance when heater is disabled
+  float gas_resistance = NAN;
+  if (data[14] & 0x20) {
+    gas_resistance = this->calc_gas_resistance_(raw_gas, gas_range);
+  }
 
   ESP_LOGD(TAG, "Got temperature=%.1f°C pressure=%.1fhPa humidity=%.1f%% gas_resistance=%.1fΩ", temperature, pressure,
            humidity, gas_resistance);
-  if (!gas_valid)
-    ESP_LOGW(TAG, "Gas measurement unsuccessful, reading invalid!");
-  if (!heat_stable)
-    ESP_LOGW(TAG, "Heater unstable, reading invalid! (Normal for a few readings after a power cycle)");
-
   if (this->temperature_sensor_ != nullptr)
     this->temperature_sensor_->publish_state(temperature);
   if (this->pressure_sensor_ != nullptr)
     this->pressure_sensor_->publish_state(pressure);
   if (this->humidity_sensor_ != nullptr)
     this->humidity_sensor_->publish_state(humidity);
-  if (this->gas_resistance_sensor_ != nullptr) {
-    if (gas_valid && heat_stable) {
-      this->gas_resistance_sensor_->publish_state(gas_resistance);
-    } else {
-      this->status_set_warning();
-      this->gas_resistance_sensor_->publish_state(NAN);
-    }
-  }
+  if (this->gas_resistance_sensor_ != nullptr)
+    this->gas_resistance_sensor_->publish_state(gas_resistance);
+  this->status_clear_warning();
 }
 
 float BME680Component::calc_temperature_(uint32_t raw_temperature) {
@@ -456,22 +428,20 @@ float BME680Component::calc_humidity_(uint16_t raw_humidity) {
 
   return calc_hum;
 }
-float BME680Component::calc_gas_resistance_(uint16_t raw_gas, uint8_t range) {
+uint32_t BME680Component::calc_gas_resistance_(uint16_t raw_gas, uint8_t range) {
   float calc_gas_res;
   float var1 = 0;
   float var2 = 0;
   float var3 = 0;
-  float raw_gas_f = raw_gas;
-  float range_f = 1U << range;
   const float range_sw_err = this->calibration_.range_sw_err;
 
   var1 = 1340.0f + (5.0f * range_sw_err);
   var2 = var1 * (1.0f + BME680_GAS_LOOKUP_TABLE_1[range] / 100.0f);
   var3 = 1.0f + (BME680_GAS_LOOKUP_TABLE_2[range] / 100.0f);
 
-  calc_gas_res = 1.0f / (var3 * 0.000000125f * range_f * (((raw_gas_f - 512.0f) / var2) + 1.0f));
+  calc_gas_res = 1.0f / (var3 * 0.000000125f * float(1 << range) * (((float(raw_gas) - 512.0f) / var2) + 1.0f));
 
-  return calc_gas_res;
+  return static_cast<uint32_t>(calc_gas_res);
 }
 uint32_t BME680Component::calc_meas_duration_() {
   uint32_t tph_dur;  // Calculate in us

esphome/components/bme680/bme680.h

@@ -59,11 +59,11 @@ struct BME680CalibrationData {
   int8_t gh3;
 
   uint8_t res_heat_range;
-  int8_t res_heat_val;
-  int8_t range_sw_err;
+  uint8_t res_heat_val;
+  uint8_t range_sw_err;
 
   float tfine;
-  int8_t ambient_temperature;
+  uint8_t ambient_temperature;
 };
 
 class BME680Component : public PollingComponent, public i2c::I2CDevice {
@@ -117,7 +117,7 @@ class BME680Component : public PollingComponent, public i2c::I2CDevice {
   /// Calculate the relative humidity in % using the provided raw ADC value.
   float calc_humidity_(uint16_t raw_humidity);
   /// Calculate the gas resistance in Ω using the provided raw ADC value.
-  float calc_gas_resistance_(uint16_t raw_gas, uint8_t range);
+  uint32_t calc_gas_resistance_(uint16_t raw_gas, uint8_t range);
   /// Calculate how long the sensor will take until we can retrieve data.
   uint32_t calc_meas_duration_();
 

esphome/components/bme680_bsec/__init__.py

@@ -6,7 +6,6 @@ from esphome.const import CONF_ID
 CODEOWNERS = ["@trvrnrth"]
 DEPENDENCIES = ["i2c"]
 AUTO_LOAD = ["sensor", "text_sensor"]
-MULTI_CONF = True
 
 CONF_BME680_BSEC_ID = "bme680_bsec_id"
 CONF_TEMPERATURE_OFFSET = "temperature_offset"
@@ -55,7 +54,6 @@ async def to_code(config):
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    cg.add(var.set_device_id(str(config[CONF_ID])))
     cg.add(var.set_temperature_offset(config[CONF_TEMPERATURE_OFFSET]))
     cg.add(var.set_iaq_mode(config[CONF_IAQ_MODE]))
     cg.add(var.set_sample_rate(config[CONF_SAMPLE_RATE]))

esphome/components/bme680_bsec/bme680_bsec.cpp

@@ -10,24 +10,19 @@ static const char *const TAG = "bme680_bsec.sensor";
 
 static const std::string IAQ_ACCURACY_STATES[4] = {"Stabilizing", "Uncertain", "Calibrating", "Calibrated"};
 
-std::vector<BME680BSECComponent *>
-    BME680BSECComponent::instances;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-uint8_t BME680BSECComponent::work_buffer_[BSEC_MAX_WORKBUFFER_SIZE] = {0};
+BME680BSECComponent *BME680BSECComponent::instance;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 
 void BME680BSECComponent::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up BME680(%s) via BSEC...", this->device_id_.c_str());
+  ESP_LOGCONFIG(TAG, "Setting up BME680 via BSEC...");
+  BME680BSECComponent::instance = this;
 
-  uint8_t new_idx = BME680BSECComponent::instances.size();
-  BME680BSECComponent::instances.push_back(this);
+  this->bsec_status_ = bsec_init();
+  if (this->bsec_status_ != BSEC_OK) {
+    this->mark_failed();
+    return;
+  }
 
-  this->bsec_state_data_valid_ = false;
-
-  // Initialize the bme680_ structure (passed-in to the bme680_* functions) and the BME680 device
-  this->bme680_.dev_id =
-      new_idx;  // This is a "Place holder to store the id of the device structure" (see bme680_defs.h).
-                // This will be passed-in as first parameter to the next "read" and "write" function pointers.
-                // We currently use the index of the object in the BME680BSECComponent::instances vector to identify
-                // the different devices in the system.
+  this->bme680_.dev_id = this->address_;
   this->bme680_.intf = BME680_I2C_INTF;
   this->bme680_.read = BME680BSECComponent::read_bytes_wrapper;
   this->bme680_.write = BME680BSECComponent::write_bytes_wrapper;
@@ -40,30 +35,29 @@ void BME680BSECComponent::setup() {
     return;
   }
 
-  // Initialize the BSEC library
-  if (this->reinit_bsec_lib_() != 0) {
+  if (this->sample_rate_ == SAMPLE_RATE_ULP) {
+    const uint8_t bsec_config[] = {
+#include "config/generic_33v_300s_28d/bsec_iaq.txt"
+    };
+    this->set_config_(bsec_config);
+  } else {
+    const uint8_t bsec_config[] = {
+#include "config/generic_33v_3s_28d/bsec_iaq.txt"
+    };
+    this->set_config_(bsec_config);
+  }
+  this->update_subscription_();
+  if (this->bsec_status_ != BSEC_OK) {
     this->mark_failed();
     return;
   }
 
-  // Load the BSEC library state from storage
   this->load_state_();
 }
 
-void BME680BSECComponent::set_config_() {
-  if (this->sample_rate_ == SAMPLE_RATE_ULP) {
-    const uint8_t config[] = {
-#include "config/generic_33v_300s_28d/bsec_iaq.txt"
-    };
-    this->bsec_status_ =
-        bsec_set_configuration(config, BSEC_MAX_PROPERTY_BLOB_SIZE, this->work_buffer_, sizeof(this->work_buffer_));
-  } else {
-    const uint8_t config[] = {
-#include "config/generic_33v_3s_28d/bsec_iaq.txt"
-    };
-    this->bsec_status_ =
-        bsec_set_configuration(config, BSEC_MAX_PROPERTY_BLOB_SIZE, this->work_buffer_, sizeof(this->work_buffer_));
-  }
+void BME680BSECComponent::set_config_(const uint8_t *config) {
+  uint8_t work_buffer[BSEC_MAX_WORKBUFFER_SIZE];
+  this->bsec_status_ = bsec_set_configuration(config, BSEC_MAX_PROPERTY_BLOB_SIZE, work_buffer, sizeof(work_buffer));
 }
 
 float BME680BSECComponent::calc_sensor_sample_rate_(SampleRate sample_rate) {
@@ -124,12 +118,10 @@ void BME680BSECComponent::update_subscription_() {
   uint8_t num_sensor_settings = BSEC_MAX_PHYSICAL_SENSOR;
   this->bsec_status_ =
       bsec_update_subscription(virtual_sensors, num_virtual_sensors, sensor_settings, &num_sensor_settings);
-  ESP_LOGV(TAG, "%s: updating subscription for %d virtual sensors (out=%d sensors)", this->device_id_.c_str(),
-           num_virtual_sensors, num_sensor_settings);
 }
 
 void BME680BSECComponent::dump_config() {
-  ESP_LOGCONFIG(TAG, "%s via BSEC:", this->device_id_.c_str());
+  ESP_LOGCONFIG(TAG, "BME680 via BSEC:");
 
   bsec_version_t version;
   bsec_get_version(&version);
@@ -193,31 +185,23 @@ void BME680BSECComponent::run_() {
     return;
   }
 
-  ESP_LOGV(TAG, "%s: Performing sensor run", this->device_id_.c_str());
+  ESP_LOGV(TAG, "Performing sensor run");
 
-  // Restore BSEC library state
-  // The reinit_bsec_lib_ method is computationally expensive: it takes 1200÷2900 microseconds on a ESP32.
-  // It can be skipped entirely when there is only one device (since the BSEC library won't be shared)
-  if (BME680BSECComponent::instances.size() > 1) {
-    int res = this->reinit_bsec_lib_();
-    if (res != 0)
-      return;
-  }
-
-  this->bsec_status_ = bsec_sensor_control(curr_time_ns, &this->bme680_settings_);
+  bsec_bme_settings_t bme680_settings;
+  this->bsec_status_ = bsec_sensor_control(curr_time_ns, &bme680_settings);
   if (this->bsec_status_ < BSEC_OK) {
     ESP_LOGW(TAG, "Failed to fetch sensor control settings (BSEC Error Code %d)", this->bsec_status_);
     return;
   }
-  this->next_call_ns_ = this->bme680_settings_.next_call;
+  this->next_call_ns_ = bme680_settings.next_call;
 
-  if (this->bme680_settings_.trigger_measurement) {
-    this->bme680_.tph_sett.os_temp = this->bme680_settings_.temperature_oversampling;
-    this->bme680_.tph_sett.os_pres = this->bme680_settings_.pressure_oversampling;
-    this->bme680_.tph_sett.os_hum = this->bme680_settings_.humidity_oversampling;
-    this->bme680_.gas_sett.run_gas = this->bme680_settings_.run_gas;
-    this->bme680_.gas_sett.heatr_temp = this->bme680_settings_.heater_temperature;
-    this->bme680_.gas_sett.heatr_dur = this->bme680_settings_.heating_duration;
+  if (bme680_settings.trigger_measurement) {
+    this->bme680_.tph_sett.os_temp = bme680_settings.temperature_oversampling;
+    this->bme680_.tph_sett.os_pres = bme680_settings.pressure_oversampling;
+    this->bme680_.tph_sett.os_hum = bme680_settings.humidity_oversampling;
+    this->bme680_.gas_sett.run_gas = bme680_settings.run_gas;
+    this->bme680_.gas_sett.heatr_temp = bme680_settings.heater_temperature;
+    this->bme680_.gas_sett.heatr_dur = bme680_settings.heating_duration;
     this->bme680_.power_mode = BME680_FORCED_MODE;
     uint16_t desired_settings = BME680_OST_SEL | BME680_OSP_SEL | BME680_OSH_SEL | BME680_GAS_SENSOR_SEL;
     this->bme680_status_ = bme680_set_sensor_settings(desired_settings, &this->bme680_);
@@ -234,26 +218,19 @@ void BME680BSECComponent::run_() {
 
     uint16_t meas_dur = 0;
     bme680_get_profile_dur(&meas_dur, &this->bme680_);
-
-    // Since we are about to go "out of scope" in the loop, take a snapshot of the state now so we can restore it later
-    // TODO: it would be interesting to see if this is really needed here, or if it's needed only after each
-    // bsec_do_steps() call
-    if (BME680BSECComponent::instances.size() > 1)
-      this->snapshot_state_();
-
     ESP_LOGV(TAG, "Queueing read in %ums", meas_dur);
-    this->set_timeout("read", meas_dur, [this]() { this->read_(); });
+    this->set_timeout("read", meas_dur,
+                      [this, curr_time_ns, bme680_settings]() { this->read_(curr_time_ns, bme680_settings); });
   } else {
     ESP_LOGV(TAG, "Measurement not required");
-    this->read_();
+    this->read_(curr_time_ns, bme680_settings);
   }
 }
 
-void BME680BSECComponent::read_() {
-  ESP_LOGV(TAG, "%s: Reading data", this->device_id_.c_str());
-  int64_t curr_time_ns = this->get_time_ns_();
+void BME680BSECComponent::read_(int64_t trigger_time_ns, bsec_bme_settings_t bme680_settings) {
+  ESP_LOGV(TAG, "Reading data");
 
-  if (this->bme680_settings_.trigger_measurement) {
+  if (bme680_settings.trigger_measurement) {
     while (this->bme680_.power_mode != BME680_SLEEP_MODE) {
       this->bme680_status_ = bme680_get_sensor_mode(&this->bme680_);
       if (this->bme680_status_ != BME680_OK) {
@@ -262,7 +239,7 @@ void BME680BSECComponent::read_() {
     }
   }
 
-  if (!this->bme680_settings_.process_data) {
+  if (!bme680_settings.process_data) {
     ESP_LOGV(TAG, "Data processing not required");
     return;
   }
@@ -282,35 +259,35 @@ void BME680BSECComponent::read_() {
   bsec_input_t inputs[BSEC_MAX_PHYSICAL_SENSOR];  // Temperature, Pressure, Humidity & Gas Resistance
   uint8_t num_inputs = 0;
 
-  if (this->bme680_settings_.process_data & BSEC_PROCESS_TEMPERATURE) {
+  if (bme680_settings.process_data & BSEC_PROCESS_TEMPERATURE) {
     inputs[num_inputs].sensor_id = BSEC_INPUT_TEMPERATURE;
     inputs[num_inputs].signal = data.temperature / 100.0f;
-    inputs[num_inputs].time_stamp = curr_time_ns;
+    inputs[num_inputs].time_stamp = trigger_time_ns;
     num_inputs++;
 
     // Temperature offset from the real temperature due to external heat sources
     inputs[num_inputs].sensor_id = BSEC_INPUT_HEATSOURCE;
     inputs[num_inputs].signal = this->temperature_offset_;
-    inputs[num_inputs].time_stamp = curr_time_ns;
+    inputs[num_inputs].time_stamp = trigger_time_ns;
     num_inputs++;
   }
-  if (this->bme680_settings_.process_data & BSEC_PROCESS_HUMIDITY) {
+  if (bme680_settings.process_data & BSEC_PROCESS_HUMIDITY) {
     inputs[num_inputs].sensor_id = BSEC_INPUT_HUMIDITY;
     inputs[num_inputs].signal = data.humidity / 1000.0f;
-    inputs[num_inputs].time_stamp = curr_time_ns;
+    inputs[num_inputs].time_stamp = trigger_time_ns;
     num_inputs++;
   }
-  if (this->bme680_settings_.process_data & BSEC_PROCESS_PRESSURE) {
+  if (bme680_settings.process_data & BSEC_PROCESS_PRESSURE) {
     inputs[num_inputs].sensor_id = BSEC_INPUT_PRESSURE;
     inputs[num_inputs].signal = data.pressure;
-    inputs[num_inputs].time_stamp = curr_time_ns;
+    inputs[num_inputs].time_stamp = trigger_time_ns;
     num_inputs++;
   }
-  if (this->bme680_settings_.process_data & BSEC_PROCESS_GAS) {
+  if (bme680_settings.process_data & BSEC_PROCESS_GAS) {
     if (data.status & BME680_GASM_VALID_MSK) {
       inputs[num_inputs].sensor_id = BSEC_INPUT_GASRESISTOR;
       inputs[num_inputs].signal = data.gas_resistance;
-      inputs[num_inputs].time_stamp = curr_time_ns;
+      inputs[num_inputs].time_stamp = trigger_time_ns;
       num_inputs++;
     } else {
       ESP_LOGD(TAG, "BME680 did not report gas data");
@@ -321,22 +298,6 @@ void BME680BSECComponent::read_() {
     return;
   }
 
-  // Restore BSEC library state
-  // The reinit_bsec_lib_ method is computationally expensive: it takes 1200÷2900 microseconds on a ESP32.
-  // It can be skipped entirely when there is only one device (since the BSEC library won't be shared)
-  if (BME680BSECComponent::instances.size() > 1) {
-    int res = this->reinit_bsec_lib_();
-    if (res != 0)
-      return;
-    // Now that the BSEC library has been re-initialized, bsec_sensor_control *NEEDS* to be called in order to support
-    // multiple devices with a different set of enabled sensors (even if the bme680_settings_ data is not used)
-    this->bsec_status_ = bsec_sensor_control(curr_time_ns, &this->bme680_settings_);
-    if (this->bsec_status_ < BSEC_OK) {
-      ESP_LOGW(TAG, "Failed to fetch sensor control settings (BSEC Error Code %d)", this->bsec_status_);
-      return;
-    }
-  }
-
   bsec_output_t outputs[BSEC_NUMBER_OUTPUTS];
   uint8_t num_outputs = BSEC_NUMBER_OUTPUTS;
   this->bsec_status_ = bsec_do_steps(inputs, num_inputs, outputs, &num_outputs);
@@ -344,13 +305,6 @@ void BME680BSECComponent::read_() {
     ESP_LOGW(TAG, "BSEC failed to process signals (BSEC Error Code %d)", this->bsec_status_);
     return;
   }
-  ESP_LOGV(TAG, "%s: after bsec_do_steps: num_inputs=%d num_outputs=%d", this->device_id_.c_str(), num_inputs,
-           num_outputs);
-
-  // Since we are about to go "out of scope" in the loop, take a snapshot of the state now so we can restore it later
-  if (BME680BSECComponent::instances.size() > 1)
-    this->snapshot_state_();
-
   if (num_outputs < 1) {
     ESP_LOGD(TAG, "No signal outputs provided by BSEC");
     return;
@@ -360,7 +314,7 @@ void BME680BSECComponent::read_() {
 }
 
 void BME680BSECComponent::publish_(const bsec_output_t *outputs, uint8_t num_outputs) {
-  ESP_LOGV(TAG, "%s: Queuing sensor state publish actions", this->device_id_.c_str());
+  ESP_LOGV(TAG, "Queuing sensor state publish actions");
   for (uint8_t i = 0; i < num_outputs; i++) {
     float signal = outputs[i].signal;
     switch (outputs[i].sensor_id) {
@@ -422,20 +376,12 @@ void BME680BSECComponent::publish_sensor_(text_sensor::TextSensor *sensor, const
   sensor->publish_state(value);
 }
 
-// Communication function - read
-// First parameter is the "dev_id" member of our "bme680_" object, which is passed-back here as-is
-int8_t BME680BSECComponent::read_bytes_wrapper(uint8_t devid, uint8_t a_register, uint8_t *data, uint16_t len) {
-  BME680BSECComponent *inst = instances[devid];
-  // Use the I2CDevice::read_bytes method to perform the actual I2C register read
-  return inst->read_bytes(a_register, data, len) ? 0 : -1;
+int8_t BME680BSECComponent::read_bytes_wrapper(uint8_t address, uint8_t a_register, uint8_t *data, uint16_t len) {
+  return BME680BSECComponent::instance->read_bytes(a_register, data, len) ? 0 : -1;
 }
 
-// Communication function - write
-// First parameter is the "dev_id" member of our "bme680_" object, which is passed-back here as-is
-int8_t BME680BSECComponent::write_bytes_wrapper(uint8_t devid, uint8_t a_register, uint8_t *data, uint16_t len) {
-  BME680BSECComponent *inst = instances[devid];
-  // Use the I2CDevice::write_bytes method to perform the actual I2C register write
-  return inst->write_bytes(a_register, data, len) ? 0 : -1;
+int8_t BME680BSECComponent::write_bytes_wrapper(uint8_t address, uint8_t a_register, uint8_t *data, uint16_t len) {
+  return BME680BSECComponent::instance->write_bytes(a_register, data, len) ? 0 : -1;
 }
 
 void BME680BSECComponent::delay_ms(uint32_t period) {
@@ -443,97 +389,41 @@ void BME680BSECComponent::delay_ms(uint32_t period) {
   delay(period);
 }
 
-// Fetch the BSEC library state and save it in the bsec_state_data_ member (volatile memory)
-// Used to share the library when using more than one sensor
-void BME680BSECComponent::snapshot_state_() {
-  uint32_t num_serialized_state = BSEC_MAX_STATE_BLOB_SIZE;
-  this->bsec_status_ = bsec_get_state(0, this->bsec_state_data_, BSEC_MAX_STATE_BLOB_SIZE, this->work_buffer_,
-                                      sizeof(this->work_buffer_), &num_serialized_state);
-  if (this->bsec_status_ != BSEC_OK) {
-    ESP_LOGW(TAG, "%s: Failed to fetch BSEC library state for snapshot (BSEC Error Code %d)", this->device_id_.c_str(),
-             this->bsec_status_);
-    return;
-  }
-  this->bsec_state_data_valid_ = true;
-}
-
-// Restores the BSEC library state from a snapshot in memory
-// Used to share the library when using more than one sensor
-void BME680BSECComponent::restore_state_() {
-  if (!this->bsec_state_data_valid_) {
-    ESP_LOGV(TAG, "%s: BSEC state data NOT valid, aborting restore_state_()", this->device_id_.c_str());
-    return;
-  }
-
-  this->bsec_status_ =
-      bsec_set_state(this->bsec_state_data_, BSEC_MAX_STATE_BLOB_SIZE, this->work_buffer_, sizeof(this->work_buffer_));
-  if (this->bsec_status_ != BSEC_OK) {
-    ESP_LOGW(TAG, "Failed to restore BSEC library state (BSEC Error Code %d)", this->bsec_status_);
-    return;
-  }
-}
-
-int BME680BSECComponent::reinit_bsec_lib_() {
-  this->bsec_status_ = bsec_init();
-  if (this->bsec_status_ != BSEC_OK) {
-    this->mark_failed();
-    return -1;
-  }
-
-  this->set_config_();
-  if (this->bsec_status_ != BSEC_OK) {
-    this->mark_failed();
-    return -2;
-  }
-
-  this->restore_state_();
-
-  this->update_subscription_();
-  if (this->bsec_status_ != BSEC_OK) {
-    this->mark_failed();
-    return -3;
-  }
-
-  return 0;
-}
-
 void BME680BSECComponent::load_state_() {
-  uint32_t hash = fnv1_hash("bme680_bsec_state_" + this->device_id_);
+  uint32_t hash = fnv1_hash("bme680_bsec_state_" + to_string(this->address_));
   this->bsec_state_ = global_preferences->make_preference<uint8_t[BSEC_MAX_STATE_BLOB_SIZE]>(hash, true);
 
-  if (!this->bsec_state_.load(&this->bsec_state_data_)) {
-    // No saved BSEC library state available
-    return;
+  uint8_t state[BSEC_MAX_STATE_BLOB_SIZE];
+  if (this->bsec_state_.load(&state)) {
+    ESP_LOGV(TAG, "Loading state");
+    uint8_t work_buffer[BSEC_MAX_WORKBUFFER_SIZE];
+    this->bsec_status_ = bsec_set_state(state, BSEC_MAX_STATE_BLOB_SIZE, work_buffer, sizeof(work_buffer));
+    if (this->bsec_status_ != BSEC_OK) {
+      ESP_LOGW(TAG, "Failed to load state (BSEC Error Code %d)", this->bsec_status_);
+    }
+    ESP_LOGI(TAG, "Loaded state");
   }
-
-  ESP_LOGV(TAG, "%s: Loading BSEC library state", this->device_id_.c_str());
-  this->bsec_status_ =
-      bsec_set_state(this->bsec_state_data_, BSEC_MAX_STATE_BLOB_SIZE, this->work_buffer_, sizeof(this->work_buffer_));
-  if (this->bsec_status_ != BSEC_OK) {
-    ESP_LOGW(TAG, "%s: Failed to load BSEC library state (BSEC Error Code %d)", this->device_id_.c_str(),
-             this->bsec_status_);
-    return;
-  }
-  // All OK: set the BSEC state data as valid
-  this->bsec_state_data_valid_ = true;
-  ESP_LOGI(TAG, "%s: Loaded BSEC library state", this->device_id_.c_str());
 }
 
 void BME680BSECComponent::save_state_(uint8_t accuracy) {
   if (accuracy < 3 || (millis() - this->last_state_save_ms_ < this->state_save_interval_ms_)) {
     return;
   }
-  if (BME680BSECComponent::instances.size() <= 1) {
-    // When a single device is in use, no snapshot is taken regularly so one is taken now
-    // On multiple devices, a snapshot is taken at every loop, so there is no need to take one here
-    this->snapshot_state_();
-  }
-  if (!this->bsec_state_data_valid_)
+
+  ESP_LOGV(TAG, "Saving state");
+
+  uint8_t state[BSEC_MAX_STATE_BLOB_SIZE];
+  uint8_t work_buffer[BSEC_MAX_STATE_BLOB_SIZE];
+  uint32_t num_serialized_state = BSEC_MAX_STATE_BLOB_SIZE;
+
+  this->bsec_status_ =
+      bsec_get_state(0, state, BSEC_MAX_STATE_BLOB_SIZE, work_buffer, BSEC_MAX_STATE_BLOB_SIZE, &num_serialized_state);
+  if (this->bsec_status_ != BSEC_OK) {
+    ESP_LOGW(TAG, "Failed fetch state for save (BSEC Error Code %d)", this->bsec_status_);
     return;
+  }
 
-  ESP_LOGV(TAG, "%s: Saving state", this->device_id_.c_str());
-
-  if (!this->bsec_state_.save(&this->bsec_state_data_)) {
+  if (!this->bsec_state_.save(&state)) {
     ESP_LOGW(TAG, "Failed to save state");
     return;
   }

esphome/components/bme680_bsec/bme680_bsec.h

@@ -31,7 +31,6 @@ enum SampleRate {
 
 class BME680BSECComponent : public Component, public i2c::I2CDevice {
  public:
-  void set_device_id(const std::string &devid) { this->device_id_.assign(devid); }
   void set_temperature_offset(float offset) { this->temperature_offset_ = offset; }
   void set_iaq_mode(IAQMode iaq_mode) { this->iaq_mode_ = iaq_mode; }
   void set_state_save_interval(uint32_t interval) { this->state_save_interval_ms_ = interval; }
@@ -51,9 +50,9 @@ class BME680BSECComponent : public Component, public i2c::I2CDevice {
   void set_co2_equivalent_sensor(sensor::Sensor *sensor) { this->co2_equivalent_sensor_ = sensor; }
   void set_breath_voc_equivalent_sensor(sensor::Sensor *sensor) { this->breath_voc_equivalent_sensor_ = sensor; }
 
-  static std::vector<BME680BSECComponent *> instances;
-  static int8_t read_bytes_wrapper(uint8_t devid, uint8_t a_register, uint8_t *data, uint16_t len);
-  static int8_t write_bytes_wrapper(uint8_t devid, uint8_t a_register, uint8_t *data, uint16_t len);
+  static BME680BSECComponent *instance;
+  static int8_t read_bytes_wrapper(uint8_t address, uint8_t a_register, uint8_t *data, uint16_t len);
+  static int8_t write_bytes_wrapper(uint8_t address, uint8_t a_register, uint8_t *data, uint16_t len);
   static void delay_ms(uint32_t period);
 
   void setup() override;
@@ -62,33 +61,23 @@ class BME680BSECComponent : public Component, public i2c::I2CDevice {
   void loop() override;
 
  protected:
-  void set_config_();
+  void set_config_(const uint8_t *config);
   float calc_sensor_sample_rate_(SampleRate sample_rate);
   void update_subscription_();
 
   void run_();
-  void read_();
+  void read_(int64_t trigger_time_ns, bsec_bme_settings_t bme680_settings);
   void publish_(const bsec_output_t *outputs, uint8_t num_outputs);
   int64_t get_time_ns_();
 
   void publish_sensor_(sensor::Sensor *sensor, float value, bool change_only = false);
   void publish_sensor_(text_sensor::TextSensor *sensor, const std::string &value);
 
-  void snapshot_state_();  // Fetch the current BSEC library state and save it in the bsec_state_data_ member (volatile
-                           // memory)
-  void restore_state_();   // Push the state contained in the bsec_state_data_ member (volatile memory) to the BSEC
-                           // library
-  int reinit_bsec_lib_();  // Prepare the BSEC library to be used again after this object returns active
-                           // (as the library may have been used by other objects)
-  void load_state_();      // Initialize the ESP preferences object; retrieve the BSEC library state from the ESP
-                           // preferences (storage); then save it in the bsec_state_data_ member (volatile memory) and
-                           // push it to the BSEC library
-  void save_state_(
-      uint8_t accuracy);  // Save the bsec_state_data_ member (volatile memory) to the ESP preferences (storage)
+  void load_state_();
+  void save_state_(uint8_t accuracy);
 
   void queue_push_(std::function<void()> &&f) { this->queue_.push(std::move(f)); }
 
-  static uint8_t work_buffer_[BSEC_MAX_WORKBUFFER_SIZE];
   struct bme680_dev bme680_;
   bsec_library_return_t bsec_status_{BSEC_OK};
   int8_t bme680_status_{BME680_OK};
@@ -99,14 +88,10 @@ class BME680BSECComponent : public Component, public i2c::I2CDevice {
 
   std::queue<std::function<void()>> queue_;
 
-  bool bsec_state_data_valid_;
-  uint8_t bsec_state_data_[BSEC_MAX_STATE_BLOB_SIZE];  // This is the current snapshot of the BSEC library state
   ESPPreferenceObject bsec_state_;
   uint32_t state_save_interval_ms_{21600000};  // 6 hours - 4 times a day
   uint32_t last_state_save_ms_ = 0;
-  bsec_bme_settings_t bme680_settings_;
 
-  std::string device_id_;
   float temperature_offset_{0};
   IAQMode iaq_mode_{IAQ_MODE_STATIC};
 

esphome/components/bmp280/bmp280.cpp

@@ -1,5 +1,4 @@
 #include "bmp280.h"
-#include "esphome/core/hal.h"
 #include "esphome/core/log.h"
 
 namespace esphome {
@@ -12,11 +11,8 @@ static const uint8_t BMP280_REGISTER_CONTROL = 0xF4;
 static const uint8_t BMP280_REGISTER_CONFIG = 0xF5;
 static const uint8_t BMP280_REGISTER_PRESSUREDATA = 0xF7;
 static const uint8_t BMP280_REGISTER_TEMPDATA = 0xFA;
-static const uint8_t BMP280_REGISTER_RESET = 0xE0;
 
 static const uint8_t BMP280_MODE_FORCED = 0b01;
-static const uint8_t BMP280_SOFT_RESET = 0xB6;
-static const uint8_t BMP280_STATUS_IM_UPDATE = 0b01;
 
 inline uint16_t combine_bytes(uint8_t msb, uint8_t lsb) { return ((msb & 0xFF) << 8) | (lsb & 0xFF); }
 
@@ -70,28 +66,6 @@ void BMP280Component::setup() {
     return;
   }
 
-  // Send a soft reset.
-  if (!this->write_byte(BMP280_REGISTER_RESET, BMP280_SOFT_RESET)) {
-    this->mark_failed();
-    return;
-  }
-  // Wait until the NVM data has finished loading.
-  uint8_t status;
-  uint8_t retry = 5;
-  do {
-    delay(2);
-    if (!this->read_byte(BMP280_REGISTER_STATUS, &status)) {
-      ESP_LOGW(TAG, "Error reading status register.");
-      this->mark_failed();
-      return;
-    }
-  } while ((status & BMP280_STATUS_IM_UPDATE) && (--retry));
-  if (status & BMP280_STATUS_IM_UPDATE) {
-    ESP_LOGW(TAG, "Timeout loading NVM.");
-    this->mark_failed();
-    return;
-  }
-
   // Read calibration
   this->calibration_.t1 = this->read_u16_le_(0x88);
   this->calibration_.t2 = this->read_s16_le_(0x8A);

esphome/components/bp1658cj/__init__.py

@@ -1,44 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome import pins
-from esphome.const import (
-    CONF_CLOCK_PIN,
-    CONF_DATA_PIN,
-    CONF_ID,
-)
-
-CODEOWNERS = ["@Cossid"]
-MULTI_CONF = True
-
-CONF_MAX_POWER_COLOR_CHANNELS = "max_power_color_channels"
-CONF_MAX_POWER_WHITE_CHANNELS = "max_power_white_channels"
-
-AUTO_LOAD = ["output"]
-bp1658cj_ns = cg.esphome_ns.namespace("bp1658cj")
-BP1658CJ = bp1658cj_ns.class_("BP1658CJ", cg.Component)
-
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(BP1658CJ),
-        cv.Required(CONF_DATA_PIN): pins.gpio_output_pin_schema,
-        cv.Required(CONF_CLOCK_PIN): pins.gpio_output_pin_schema,
-        cv.Optional(CONF_MAX_POWER_COLOR_CHANNELS, default=2): cv.int_range(
-            min=0, max=15
-        ),
-        cv.Optional(CONF_MAX_POWER_WHITE_CHANNELS, default=4): cv.int_range(
-            min=0, max=15
-        ),
-    }
-).extend(cv.COMPONENT_SCHEMA)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-
-    data = await cg.gpio_pin_expression(config[CONF_DATA_PIN])
-    cg.add(var.set_data_pin(data))
-    clock = await cg.gpio_pin_expression(config[CONF_CLOCK_PIN])
-    cg.add(var.set_clock_pin(clock))
-    cg.add(var.set_max_power_color_channels(config[CONF_MAX_POWER_COLOR_CHANNELS]))
-    cg.add(var.set_max_power_white_channels(config[CONF_MAX_POWER_WHITE_CHANNELS]))

esphome/components/bp1658cj/bp1658cj.cpp

@@ -1,110 +0,0 @@
-#include "bp1658cj.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace bp1658cj {
-
-static const char *const TAG = "bp1658cj";
-
-static const uint8_t BP1658CJ_MODEL_ID = 0x80;
-static const uint8_t BP1658CJ_ADDR_STANDBY = 0x0;
-static const uint8_t BP1658CJ_ADDR_START_3CH = 0x10;
-static const uint8_t BP1658CJ_ADDR_START_2CH = 0x20;
-static const uint8_t BP1658CJ_ADDR_START_5CH = 0x30;
-
-void BP1658CJ::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up BP1658CJ Output Component...");
-  this->data_pin_->setup();
-  this->data_pin_->digital_write(false);
-  this->clock_pin_->setup();
-  this->clock_pin_->digital_write(false);
-  this->pwm_amounts_.resize(5, 0);
-}
-void BP1658CJ::dump_config() {
-  ESP_LOGCONFIG(TAG, "BP1658CJ:");
-  LOG_PIN("  Data Pin: ", this->data_pin_);
-  LOG_PIN("  Clock Pin: ", this->clock_pin_);
-  ESP_LOGCONFIG(TAG, "  Color Channels Max Power: %u", this->max_power_color_channels_);
-  ESP_LOGCONFIG(TAG, "  White Channels Max Power: %u", this->max_power_white_channels_);
-}
-
-void BP1658CJ::loop() {
-  if (!this->update_)
-    return;
-
-  uint8_t data[12];
-  if (this->pwm_amounts_[0] == 0 && this->pwm_amounts_[1] == 0 && this->pwm_amounts_[2] == 0 &&
-      this->pwm_amounts_[3] == 0 && this->pwm_amounts_[4] == 0) {
-    // Off / Sleep
-    data[0] = BP1658CJ_MODEL_ID + BP1658CJ_ADDR_STANDBY;
-    for (int i = 1; i < 12; i++)
-      data[i] = 0;
-    this->write_buffer_(data, 12);
-  } else if (this->pwm_amounts_[0] == 0 && this->pwm_amounts_[1] == 0 && this->pwm_amounts_[2] == 0 &&
-             (this->pwm_amounts_[3] > 0 || this->pwm_amounts_[4] > 0)) {
-    // Only data on white channels
-    data[0] = BP1658CJ_MODEL_ID + BP1658CJ_ADDR_START_2CH;
-    data[1] = 0 << 4 | this->max_power_white_channels_;
-    for (int i = 2, j = 0; i < 12; i += 2, j++) {
-      data[i] = this->pwm_amounts_[j] & 0x1F;
-      data[i + 1] = (this->pwm_amounts_[j] >> 5) & 0x1F;
-    }
-    this->write_buffer_(data, 12);
-  } else if ((this->pwm_amounts_[0] > 0 || this->pwm_amounts_[1] > 0 || this->pwm_amounts_[2] > 0) &&
-             this->pwm_amounts_[3] == 0 && this->pwm_amounts_[4] == 0) {
-    // Only data on RGB channels
-    data[0] = BP1658CJ_MODEL_ID + BP1658CJ_ADDR_START_3CH;
-    data[1] = this->max_power_color_channels_ << 4 | 0;
-    for (int i = 2, j = 0; i < 12; i += 2, j++) {
-      data[i] = this->pwm_amounts_[j] & 0x1F;
-      data[i + 1] = (this->pwm_amounts_[j] >> 5) & 0x1F;
-    }
-    this->write_buffer_(data, 12);
-  } else {
-    // All channels
-    data[0] = BP1658CJ_MODEL_ID + BP1658CJ_ADDR_START_5CH;
-    data[1] = this->max_power_color_channels_ << 4 | this->max_power_white_channels_;
-    for (int i = 2, j = 0; i < 12; i += 2, j++) {
-      data[i] = this->pwm_amounts_[j] & 0x1F;
-      data[i + 1] = (this->pwm_amounts_[j] >> 5) & 0x1F;
-    }
-    this->write_buffer_(data, 12);
-  }
-
-  this->update_ = false;
-}
-
-void BP1658CJ::set_channel_value_(uint8_t channel, uint16_t value) {
-  if (this->pwm_amounts_[channel] != value) {
-    this->update_ = true;
-    this->update_channel_ = channel;
-  }
-  this->pwm_amounts_[channel] = value;
-}
-void BP1658CJ::write_bit_(bool value) {
-  this->clock_pin_->digital_write(false);
-  this->data_pin_->digital_write(value);
-  this->clock_pin_->digital_write(true);
-}
-
-void BP1658CJ::write_byte_(uint8_t data) {
-  for (uint8_t mask = 0x80; mask; mask >>= 1) {
-    this->write_bit_(data & mask);
-  }
-  this->clock_pin_->digital_write(false);
-  this->data_pin_->digital_write(true);
-  this->clock_pin_->digital_write(true);
-}
-
-void BP1658CJ::write_buffer_(uint8_t *buffer, uint8_t size) {
-  this->data_pin_->digital_write(false);
-  for (uint32_t i = 0; i < size; i++) {
-    this->write_byte_(buffer[i]);
-  }
-  this->clock_pin_->digital_write(false);
-  this->clock_pin_->digital_write(true);
-  this->data_pin_->digital_write(true);
-}
-
-}  // namespace bp1658cj
-}  // namespace esphome

esphome/components/bp1658cj/bp1658cj.h

@@ -1,64 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/hal.h"
-#include "esphome/components/output/float_output.h"
-#include <vector>
-
-namespace esphome {
-namespace bp1658cj {
-
-class BP1658CJ : public Component {
- public:
-  class Channel;
-
-  void set_data_pin(GPIOPin *data_pin) { data_pin_ = data_pin; }
-  void set_clock_pin(GPIOPin *clock_pin) { clock_pin_ = clock_pin; }
-  void set_max_power_color_channels(uint8_t max_power_color_channels) {
-    max_power_color_channels_ = max_power_color_channels;
-  }
-  void set_max_power_white_channels(uint8_t max_power_white_channels) {
-    max_power_white_channels_ = max_power_white_channels;
-  }
-
-  void setup() override;
-
-  void dump_config() override;
-
-  float get_setup_priority() const override { return setup_priority::HARDWARE; }
-
-  /// Send new values if they were updated.
-  void loop() override;
-
-  class Channel : public output::FloatOutput {
-   public:
-    void set_parent(BP1658CJ *parent) { parent_ = parent; }
-    void set_channel(uint8_t channel) { channel_ = channel; }
-
-   protected:
-    void write_state(float state) override {
-      auto amount = static_cast<uint16_t>(state * 0x3FF);
-      this->parent_->set_channel_value_(this->channel_, amount);
-    }
-
-    BP1658CJ *parent_;
-    uint8_t channel_;
-  };
-
- protected:
-  void set_channel_value_(uint8_t channel, uint16_t value);
-  void write_bit_(bool value);
-  void write_byte_(uint8_t data);
-  void write_buffer_(uint8_t *buffer, uint8_t size);
-
-  GPIOPin *data_pin_;
-  GPIOPin *clock_pin_;
-  uint8_t max_power_color_channels_{4};
-  uint8_t max_power_white_channels_{6};
-  uint8_t update_channel_;
-  std::vector<uint16_t> pwm_amounts_;
-  bool update_{true};
-};
-
-}  // namespace bp1658cj
-}  // namespace esphome