diff --git a/.dockerignore b/.dockerignore
index 9f14b98059..7998ff877f 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -75,6 +75,9 @@ target/
# pyenv
.python-version
+# asdf
+.tool-versions
+
# celery beat schedule file
celerybeat-schedule
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 3bf9c4e1f6..5703d39be1 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -7,11 +7,16 @@
- [ ] Bugfix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] Code quality improvements to existing code or addition of tests
- [ ] Other
-**Related issue or feature (if applicable):** fixes
+**Related issue or feature (if applicable):**
-**Pull request in [esphome-docs](https://github.com/esphome/esphome-docs) with documentation (if applicable):** esphome/esphome-docs#
+- fixes
+
+**Pull request in [esphome-docs](https://github.com/esphome/esphome-docs) with documentation (if applicable):**
+
+- esphome/esphome-docs#
## Test Environment
@@ -23,12 +28,6 @@
- [ ] RTL87xx
## Example entry for `config.yaml`:
-
```yaml
# Example config.yaml
diff --git a/.github/actions/build-image/action.yaml b/.github/actions/build-image/action.yaml
index 56be20bd87..5c686605c3 100644
--- a/.github/actions/build-image/action.yaml
+++ b/.github/actions/build-image/action.yaml
@@ -46,7 +46,10 @@ runs:
- name: Build and push to ghcr by digest
id: build-ghcr
- uses: docker/build-push-action@v6.7.0
+ uses: docker/build-push-action@v6.9.0
+ env:
+ DOCKER_BUILD_SUMMARY: false
+ DOCKER_BUILD_RECORD_UPLOAD: false
with:
context: .
file: ./docker/Dockerfile
@@ -69,7 +72,10 @@ runs:
- name: Build and push to dockerhub by digest
id: build-dockerhub
- uses: docker/build-push-action@v6.7.0
+ uses: docker/build-push-action@v6.9.0
+ env:
+ DOCKER_BUILD_SUMMARY: false
+ DOCKER_BUILD_RECORD_UPLOAD: false
with:
context: .
file: ./docker/Dockerfile
diff --git a/.github/actions/restore-python/action.yml b/.github/actions/restore-python/action.yml
index c618a5ca97..06c54578f5 100644
--- a/.github/actions/restore-python/action.yml
+++ b/.github/actions/restore-python/action.yml
@@ -17,12 +17,12 @@ runs:
steps:
- name: Set up Python ${{ inputs.python-version }}
id: python
- uses: actions/setup-python@v5.2.0
+ uses: actions/setup-python@v5.3.0
with:
python-version: ${{ inputs.python-version }}
- name: Restore Python virtual environment
id: cache-venv
- uses: actions/cache/restore@v4.0.2
+ uses: actions/cache/restore@v4.1.2
with:
path: venv
# yamllint disable-line rule:line-length
diff --git a/.github/workflows/ci-api-proto.yml b/.github/workflows/ci-api-proto.yml
index 8112c4e0ff..a6b2e2b2b3 100644
--- a/.github/workflows/ci-api-proto.yml
+++ b/.github/workflows/ci-api-proto.yml
@@ -23,7 +23,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4.1.7
- name: Set up Python
- uses: actions/setup-python@v5.2.0
+ uses: actions/setup-python@v5.3.0
with:
python-version: "3.11"
diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml
index 891367d16a..435a58498e 100644
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -42,11 +42,11 @@ jobs:
steps:
- uses: actions/checkout@v4.1.7
- name: Set up Python
- uses: actions/setup-python@v5.2.0
+ uses: actions/setup-python@v5.3.0
with:
python-version: "3.9"
- name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v3.6.1
+ uses: docker/setup-buildx-action@v3.7.1
- name: Set up QEMU
uses: docker/setup-qemu-action@v3.2.0
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7c4fa65695..82a55d0e2a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,12 +41,12 @@ jobs:
run: echo key="${{ hashFiles('requirements.txt', 'requirements_optional.txt', 'requirements_test.txt') }}" >> $GITHUB_OUTPUT
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
id: python
- uses: actions/setup-python@v5.2.0
+ uses: actions/setup-python@v5.3.0
with:
python-version: ${{ env.DEFAULT_PYTHON }}
- name: Restore Python virtual environment
id: cache-venv
- uses: actions/cache@v4.0.2
+ uses: actions/cache@v4.1.2
with:
path: venv
# yamllint disable-line rule:line-length
@@ -302,20 +302,22 @@ jobs:
- name: Cache platformio
if: github.ref == 'refs/heads/dev'
- uses: actions/cache@v4.0.2
+ uses: actions/cache@v4.1.2
with:
path: ~/.platformio
key: platformio-${{ matrix.pio_cache_key }}
- name: Cache platformio
if: github.ref != 'refs/heads/dev'
- uses: actions/cache/restore@v4.0.2
+ uses: actions/cache/restore@v4.1.2
with:
path: ~/.platformio
key: platformio-${{ matrix.pio_cache_key }}
- name: Install clang-tidy
- run: sudo apt-get install clang-tidy-14
+ run: |
+ sudo apt-get update
+ sudo apt-get install clang-tidy-14
- name: Register problem matchers
run: |
@@ -397,7 +399,9 @@ jobs:
file: ${{ fromJson(needs.list-components.outputs.components) }}
steps:
- name: Install dependencies
- run: sudo apt-get install libsdl2-dev
+ run: |
+ sudo apt-get update
+ sudo apt-get install libsdl2-dev
- name: Check out code from GitHub
uses: actions/checkout@v4.1.7
@@ -451,7 +455,9 @@ jobs:
run: echo ${{ matrix.components }}
- name: Install dependencies
- run: sudo apt-get install libsdl2-dev
+ run: |
+ sudo apt-get update
+ sudo apt-get install libsdl2-dev
- name: Check out code from GitHub
uses: actions/checkout@v4.1.7
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 0000000000..ddeb0a99d2
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,91 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL Advanced"
+
+on:
+ workflow_dispatch:
+ schedule:
+ - cron: "30 18 * * 4"
+
+jobs:
+ analyze:
+ name: Analyze (${{ matrix.language }})
+ # Runner size impacts CodeQL analysis time. To learn more, please see:
+ # - https://gh.io/recommended-hardware-resources-for-running-codeql
+ # - https://gh.io/supported-runners-and-hardware-resources
+ # - https://gh.io/using-larger-runners (GitHub.com only)
+ # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+ runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+ permissions:
+ # required for all workflows
+ security-events: write
+
+ # required to fetch internal or private CodeQL packs
+ packages: read
+
+ # only required for workflows in private repositories
+ actions: read
+ contents: read
+
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ # - language: c-cpp
+ # build-mode: autobuild
+ - language: python
+ build-mode: none
+ # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
+ # Use `c-cpp` to analyze code written in C, C++ or both
+ # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+ # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+ # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+ # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+ # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+ # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ # Initializes the CodeQL tools for scanning.
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init@v3
+ with:
+ languages: ${{ matrix.language }}
+ build-mode: ${{ matrix.build-mode }}
+ # If you wish to specify custom queries, you can do so here or in a config file.
+ # By default, queries listed here will override any specified in a config file.
+ # Prefix the list here with "+" to use these queries and those in the config file.
+
+ # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+ # queries: security-extended,security-and-quality
+
+ # If the analyze step fails for one of the languages you are analyzing with
+ # "We were unable to automatically build your code", modify the matrix above
+ # to set the build mode to "manual" for that language. Then modify this step
+ # to build your code.
+ # ℹ️ Command-line programs to run using the OS shell.
+ # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+ - if: matrix.build-mode == 'manual'
+ shell: bash
+ run: |
+ echo 'If you are using a "manual" build mode for one or more of the' \
+ 'languages you are analyzing, replace this with the commands to build' \
+ 'your code, for example:'
+ echo ' make bootstrap'
+ echo ' make release'
+ exit 1
+
+ - name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@v3
+ with:
+ category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 522de63360..5072bec222 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -53,7 +53,7 @@ jobs:
steps:
- uses: actions/checkout@v4.1.7
- name: Set up Python
- uses: actions/setup-python@v5.2.0
+ uses: actions/setup-python@v5.3.0
with:
python-version: "3.x"
- name: Set up python environment
@@ -65,7 +65,7 @@ jobs:
pip3 install build
python3 -m build
- name: Publish
- uses: pypa/gh-action-pypi-publish@v1.10.1
+ uses: pypa/gh-action-pypi-publish@v1.10.3
deploy-docker:
name: Build ESPHome ${{ matrix.platform }}
@@ -85,12 +85,12 @@ jobs:
steps:
- uses: actions/checkout@v4.1.7
- name: Set up Python
- uses: actions/setup-python@v5.2.0
+ uses: actions/setup-python@v5.3.0
with:
python-version: "3.9"
- name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v3.6.1
+ uses: docker/setup-buildx-action@v3.7.1
- name: Set up QEMU
if: matrix.platform != 'linux/amd64'
uses: docker/setup-qemu-action@v3.2.0
@@ -141,7 +141,7 @@ jobs:
echo name=$(cat /tmp/platform) >> $GITHUB_OUTPUT
- name: Upload digests
- uses: actions/upload-artifact@v4.4.0
+ uses: actions/upload-artifact@v4.4.3
with:
name: digests-${{ steps.sanitize.outputs.name }}
path: /tmp/digests
@@ -184,7 +184,7 @@ jobs:
merge-multiple: true
- name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v3.6.1
+ uses: docker/setup-buildx-action@v3.7.1
- name: Log in to docker hub
if: matrix.registry == 'dockerhub'
diff --git a/.github/workflows/sync-device-classes.yml b/.github/workflows/sync-device-classes.yml
index e834ff3793..7a46d596a1 100644
--- a/.github/workflows/sync-device-classes.yml
+++ b/.github/workflows/sync-device-classes.yml
@@ -22,7 +22,7 @@ jobs:
path: lib/home-assistant
- name: Setup Python
- uses: actions/setup-python@v5.2.0
+ uses: actions/setup-python@v5.3.0
with:
python-version: 3.12
@@ -36,7 +36,7 @@ jobs:
python ./script/sync-device_class.py
- name: Commit changes
- uses: peter-evans/create-pull-request@v7.0.0
+ uses: peter-evans/create-pull-request@v7.0.5
with:
commit-message: "Synchronise Device Classes from Home Assistant"
committer: esphomebot
diff --git a/.gitignore b/.gitignore
index 79820249ac..ad38e26fdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,6 +75,9 @@ cov.xml
# pyenv
.python-version
+# asdf
+.tool-versions
+
# Environments
.env
.venv
diff --git a/CODEOWNERS b/CODEOWNERS
index 1d4df3ccb8..5eb1f863f2 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -24,6 +24,7 @@ esphome/components/ade7953_i2c/* @angelnu
esphome/components/ade7953_spi/* @angelnu
esphome/components/ads1118/* @solomondg1
esphome/components/ags10/* @mak-42
+esphome/components/aic3204/* @kbx81
esphome/components/airthings_ble/* @jeromelaban
esphome/components/airthings_wave_base/* @jeromelaban @kpfleming @ncareau
esphome/components/airthings_wave_mini/* @ncareau
@@ -47,6 +48,9 @@ esphome/components/at581x/* @X-Ryl669
esphome/components/atc_mithermometer/* @ahpohl
esphome/components/atm90e26/* @danieltwagner
esphome/components/atm90e32/* @circuitsetup @descipher
+esphome/components/audio/* @kahrendt
+esphome/components/audio_dac/* @kbx81
+esphome/components/axs15231/* @clydebarrow
esphome/components/b_parasite/* @rbaron
esphome/components/ballu/* @bazuchan
esphome/components/bang_bang/* @OttoWinter
@@ -81,12 +85,13 @@ esphome/components/bmp581/* @kahrendt
esphome/components/bp1658cj/* @Cossid
esphome/components/bp5758d/* @Cossid
esphome/components/button/* @esphome/core
+esphome/components/bytebuffer/* @clydebarrow
esphome/components/canbus/* @danielschramm @mvturnho
esphome/components/cap1188/* @mreditor97
esphome/components/captive_portal/* @OttoWinter
esphome/components/ccs811/* @habbie
esphome/components/cd74hc4067/* @asoehlke
-esphome/components/ch422g/* @jesterret
+esphome/components/ch422g/* @clydebarrow @jesterret
esphome/components/climate/* @esphome/core
esphome/components/climate_ir/* @glmnet
esphome/components/color_temperature/* @jesserockz
@@ -152,6 +157,7 @@ esphome/components/ft63x6/* @gpambrozio
esphome/components/gcja5/* @gcormier
esphome/components/gdk101/* @Szewcson
esphome/components/globals/* @esphome/core
+esphome/components/gp2y1010au0f/* @zry98
esphome/components/gp8403/* @jesserockz
esphome/components/gpio/* @esphome/core
esphome/components/gpio/one_wire/* @ssieb
@@ -159,6 +165,7 @@ esphome/components/gps/* @coogle
esphome/components/graph/* @synco
esphome/components/graphical_display_menu/* @MrMDavidson
esphome/components/gree/* @orestismers
+esphome/components/grove_gas_mc_v2/* @YorkshireIoT
esphome/components/grove_tb6612fng/* @max246
esphome/components/growatt_solar/* @leeuwte
esphome/components/gt911/* @clydebarrow @jesserockz
@@ -166,6 +173,7 @@ esphome/components/haier/* @paveldn
esphome/components/haier/binary_sensor/* @paveldn
esphome/components/haier/button/* @paveldn
esphome/components/haier/sensor/* @paveldn
+esphome/components/haier/switch/* @paveldn
esphome/components/haier/text_sensor/* @paveldn
esphome/components/havells_solar/* @sourabhjaiswal
esphome/components/hbridge/fan/* @WeekendWarrior
@@ -191,10 +199,11 @@ esphome/components/htu31d/* @betterengineering
esphome/components/hydreon_rgxx/* @functionpointer
esphome/components/hyt271/* @Philippe12
esphome/components/i2c/* @esphome/core
+esphome/components/i2c_device/* @gabest11
esphome/components/i2s_audio/* @jesserockz
esphome/components/i2s_audio/media_player/* @jesserockz
esphome/components/i2s_audio/microphone/* @jesserockz
-esphome/components/i2s_audio/speaker/* @jesserockz
+esphome/components/i2s_audio/speaker/* @jesserockz @kahrendt
esphome/components/iaqcore/* @yozik04
esphome/components/ili9xxx/* @clydebarrow @nielsnl68
esphome/components/improv_base/* @esphome/core
@@ -227,10 +236,12 @@ esphome/components/lilygo_t5_47/touchscreen/* @jesserockz
esphome/components/lock/* @esphome/core
esphome/components/logger/* @esphome/core
esphome/components/ltr390/* @latonita @sjtrny
+esphome/components/ltr501/* @latonita
esphome/components/ltr_als_ps/* @latonita
esphome/components/lvgl/* @clydebarrow
esphome/components/m5stack_8angle/* @rnauber
esphome/components/matrix_keypad/* @ssieb
+esphome/components/max17043/* @blacknell
esphome/components/max31865/* @DAVe3283
esphome/components/max44009/* @berfenger
esphome/components/max6956/* @looping40
@@ -277,6 +288,7 @@ esphome/components/mopeka_std_check/* @Fabian-Schmidt
esphome/components/mpl3115a2/* @kbickar
esphome/components/mpu6886/* @fabaff
esphome/components/ms8607/* @e28eta
+esphome/components/nau7802/* @cujomalainey
esphome/components/network/* @esphome/core
esphome/components/nextion/* @edwardtfn @senexcrenshaw
esphome/components/nextion/binary_sensor/* @senexcrenshaw
@@ -285,9 +297,11 @@ esphome/components/nextion/switch/* @senexcrenshaw
esphome/components/nextion/text_sensor/* @senexcrenshaw
esphome/components/nfc/* @jesserockz @kbx81
esphome/components/noblex/* @AGalfra
+esphome/components/npi19/* @bakerkj
esphome/components/number/* @esphome/core
esphome/components/one_wire/* @ssieb
esphome/components/online_image/* @guillempages
+esphome/components/opentherm/* @olegtarasov
esphome/components/ota/* @esphome/core
esphome/components/output/* @esphome/core
esphome/components/pca6416a/* @Mat931
@@ -315,7 +329,7 @@ esphome/components/pvvx_mithermometer/* @pasiz
esphome/components/pylontech/* @functionpointer
esphome/components/qmp6988/* @andrewpc
esphome/components/qr_code/* @wjtje
-esphome/components/qspi_amoled/* @clydebarrow
+esphome/components/qspi_dbi/* @clydebarrow
esphome/components/qwiic_pir/* @kahrendt
esphome/components/radon_eye_ble/* @jeffeb3
esphome/components/radon_eye_rd200/* @jeffeb3
@@ -364,7 +378,7 @@ esphome/components/smt100/* @piechade
esphome/components/sn74hc165/* @jesserockz
esphome/components/socket/* @esphome/core
esphome/components/sonoff_d1/* @anatoly-savchenkov
-esphome/components/speaker/* @jesserockz
+esphome/components/speaker/* @jesserockz @kahrendt
esphome/components/spi/* @clydebarrow @esphome/core
esphome/components/spi_device/* @clydebarrow
esphome/components/spi_led_strip/* @clydebarrow
@@ -394,10 +408,13 @@ esphome/components/sun/* @OttoWinter
esphome/components/sun_gtil2/* @Mat931
esphome/components/switch/* @esphome/core
esphome/components/t6615/* @tylermenezes
+esphome/components/tc74/* @sethgirvan
esphome/components/tca9548a/* @andreashergert1984
+esphome/components/tca9555/* @mobrembski
esphome/components/tcl112/* @glmnet
esphome/components/tee501/* @Stock-M
esphome/components/teleinfo/* @0hax
+esphome/components/tem3200/* @bakerkj
esphome/components/template/alarm_control_panel/* @grahambrown11 @hwstar
esphome/components/template/datetime/* @rfdarter
esphome/components/template/event/* @nohat
diff --git a/README.md b/README.md
index bb6fb37d3a..da1b2b3650 100644
--- a/README.md
+++ b/README.md
@@ -7,3 +7,5 @@
For issues, please go to [the issue tracker](https://github.com/esphome/issues/issues).
For feature requests, please see [feature requests](https://github.com/esphome/feature-requests/issues).
+
+[![ESPHome - A project from the Open Home Foundation](https://www.openhomefoundation.org/badges/esphome.png)](https://www.openhomefoundation.org/)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4393d5a447..52a4794f24 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -33,7 +33,7 @@ RUN \
python3-venv=3.11.2-1+b1 \
python3-wheel=0.38.4-2 \
iputils-ping=3:20221126-1 \
- git=1:2.39.2-1.1 \
+ git=1:2.39.5-0+deb12u1 \
curl=7.88.1-10+deb12u7 \
openssh-client=1:9.2p1-2+deb12u3 \
python3-cffi=1.15.1-5 \
@@ -49,7 +49,7 @@ RUN \
zlib1g-dev=1:1.2.13.dfsg-1 \
libjpeg-dev=1:2.1.5-2 \
libfreetype-dev=2.12.1+dfsg-5+deb12u3 \
- libssl-dev=3.0.14-1~deb12u1 \
+ libssl-dev=3.0.14-1~deb12u2 \
libffi-dev=3.4.4-1 \
libopenjp2-7=2.5.0-2 \
libtiff6=4.5.0-6+deb12u1 \
@@ -86,7 +86,7 @@ RUN \
pip3 install \
--break-system-packages --no-cache-dir \
# Keep platformio version in sync with requirements.txt
- platformio==6.1.15 \
+ platformio==6.1.16 \
# Change some platformio settings
&& platformio settings set enable_telemetry No \
&& platformio settings set check_platformio_interval 1000000 \
@@ -96,14 +96,19 @@ RUN \
# First install requirements to leverage caching when requirements don't change
# tmpfs is for https://github.com/rust-lang/cargo/issues/8719
-COPY requirements.txt requirements_optional.txt script/platformio_install_deps.py platformio.ini /
+COPY requirements.txt requirements_optional.txt /
RUN --mount=type=tmpfs,target=/root/.cargo if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
- export PIP_EXTRA_INDEX_URL="https://www.piwheels.org/simple"; \
+ curl -L https://www.piwheels.org/cp311/cryptography-43.0.0-cp37-abi3-linux_armv7l.whl -o /tmp/cryptography-43.0.0-cp37-abi3-linux_armv7l.whl \
+ && pip3 install --break-system-packages --no-cache-dir /tmp/cryptography-43.0.0-cp37-abi3-linux_armv7l.whl \
+ && rm /tmp/cryptography-43.0.0-cp37-abi3-linux_armv7l.whl \
+ && export PIP_EXTRA_INDEX_URL="https://www.piwheels.org/simple"; \
fi; \
CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse CARGO_HOME=/root/.cargo \
pip3 install \
- --break-system-packages --no-cache-dir -r /requirements.txt -r /requirements_optional.txt \
- && /platformio_install_deps.py /platformio.ini --libraries
+ --break-system-packages --no-cache-dir -r /requirements.txt -r /requirements_optional.txt
+
+COPY script/platformio_install_deps.py platformio.ini /
+RUN /platformio_install_deps.py /platformio.ini --libraries
# Avoid unsafe git error when container user and file config volume permissions don't match
RUN git config --system --add safe.directory '*'
diff --git a/esphome/automation.py b/esphome/automation.py
index 0bd6cf0af0..34159561c2 100644
--- a/esphome/automation.py
+++ b/esphome/automation.py
@@ -1,6 +1,8 @@
import esphome.codegen as cg
import esphome.config_validation as cv
from esphome.const import (
+ CONF_ALL,
+ CONF_ANY,
CONF_AUTOMATION_ID,
CONF_CONDITION,
CONF_COUNT,
@@ -73,6 +75,13 @@ def validate_potentially_and_condition(value):
return validate_condition(value)
+def validate_potentially_or_condition(value):
+ if isinstance(value, list):
+ with cv.remove_prepend_path(["or"]):
+ return validate_condition({"or": value})
+ return validate_condition(value)
+
+
DelayAction = cg.esphome_ns.class_("DelayAction", Action, cg.Component)
LambdaAction = cg.esphome_ns.class_("LambdaAction", Action)
IfAction = cg.esphome_ns.class_("IfAction", Action)
@@ -166,6 +175,18 @@ async def or_condition_to_code(config, condition_id, template_arg, args):
return cg.new_Pvariable(condition_id, template_arg, conditions)
+@register_condition("all", AndCondition, validate_condition_list)
+async def all_condition_to_code(config, condition_id, template_arg, args):
+ conditions = await build_condition_list(config, template_arg, args)
+ return cg.new_Pvariable(condition_id, template_arg, conditions)
+
+
+@register_condition("any", OrCondition, validate_condition_list)
+async def any_condition_to_code(config, condition_id, template_arg, args):
+ conditions = await build_condition_list(config, template_arg, args)
+ return cg.new_Pvariable(condition_id, template_arg, conditions)
+
+
@register_condition("not", NotCondition, validate_potentially_and_condition)
async def not_condition_to_code(config, condition_id, template_arg, args):
condition = await build_condition(config, template_arg, args)
@@ -223,15 +244,21 @@ async def delay_action_to_code(config, action_id, template_arg, args):
IfAction,
cv.All(
{
- cv.Required(CONF_CONDITION): validate_potentially_and_condition,
+ cv.Exclusive(
+ CONF_CONDITION, CONF_CONDITION
+ ): validate_potentially_and_condition,
+ cv.Exclusive(CONF_ANY, CONF_CONDITION): validate_potentially_or_condition,
+ cv.Exclusive(CONF_ALL, CONF_CONDITION): validate_potentially_and_condition,
cv.Optional(CONF_THEN): validate_action_list,
cv.Optional(CONF_ELSE): validate_action_list,
},
cv.has_at_least_one_key(CONF_THEN, CONF_ELSE),
+ cv.has_at_least_one_key(CONF_CONDITION, CONF_ANY, CONF_ALL),
),
)
async def if_action_to_code(config, action_id, template_arg, args):
- conditions = await build_condition(config[CONF_CONDITION], template_arg, args)
+ cond_conf = next(el for el in config if el in (CONF_ANY, CONF_ALL, CONF_CONDITION))
+ conditions = await build_condition(config[cond_conf], template_arg, args)
var = cg.new_Pvariable(action_id, template_arg, conditions)
if CONF_THEN in config:
actions = await build_action_list(config[CONF_THEN], template_arg, args)
diff --git a/esphome/components/aic3204/__init__.py b/esphome/components/aic3204/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/aic3204/aic3204.cpp b/esphome/components/aic3204/aic3204.cpp
new file mode 100644
index 0000000000..0560f2366b
--- /dev/null
+++ b/esphome/components/aic3204/aic3204.cpp
@@ -0,0 +1,173 @@
+#include "aic3204.h"
+
+#include "esphome/core/defines.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace aic3204 {
+
+static const char *const TAG = "aic3204";
+
+#define ERROR_CHECK(err, msg) \
+ if (!(err)) { \
+ ESP_LOGE(TAG, msg); \
+ this->mark_failed(); \
+ return; \
+ }
+
+void AIC3204::setup() {
+ ESP_LOGCONFIG(TAG, "Setting up AIC3204...");
+
+ // Set register page to 0
+ ERROR_CHECK(this->write_byte(AIC3204_PAGE_CTRL, 0x00), "Set page 0 failed");
+ // Initiate SW reset (PLL is powered off as part of reset)
+ ERROR_CHECK(this->write_byte(AIC3204_SW_RST, 0x01), "Software reset failed");
+ // *** Program clock settings ***
+ // Default is CODEC_CLKIN is from MCLK pin. Don't need to change this.
+ // MDAC*NDAC*FOSR*48Khz = mClk (24.576 MHz when the XMOS is expecting 48kHz audio)
+ // (See page 51 of https://www.ti.com/lit/ml/slaa557/slaa557.pdf)
+ // We do need MDAC*DOSR/32 >= the resource compute level for the processing block
+ // So here 2*128/32 = 8, which is equal to processing block 1 's resource compute
+ // See page 5 of https://www.ti.com/lit/an/slaa404c/slaa404c.pdf for the workflow
+ // for determining these settings.
+
+ // Power up NDAC and set to 2
+ ERROR_CHECK(this->write_byte(AIC3204_NDAC, 0x82), "Set NDAC failed");
+ // Power up MDAC and set to 2
+ ERROR_CHECK(this->write_byte(AIC3204_MDAC, 0x82), "Set MDAC failed");
+ // Program DOSR = 128
+ ERROR_CHECK(this->write_byte(AIC3204_DOSR, 0x80), "Set DOSR failed");
+ // Set Audio Interface Config: I2S, 32 bits, DOUT always driving
+ ERROR_CHECK(this->write_byte(AIC3204_CODEC_IF, 0x30), "Set CODEC_IF failed");
+ // For I2S Firmware only, set SCLK/MFP3 pin as Audio Data In
+ ERROR_CHECK(this->write_byte(AIC3204_SCLK_MFP3, 0x02), "Set SCLK/MFP3 failed");
+ ERROR_CHECK(this->write_byte(AIC3204_AUDIO_IF_4, 0x01), "Set AUDIO_IF_4 failed");
+ ERROR_CHECK(this->write_byte(AIC3204_AUDIO_IF_5, 0x01), "Set AUDIO_IF_5 failed");
+ // Program the DAC processing block to be used - PRB_P1
+ ERROR_CHECK(this->write_byte(AIC3204_DAC_SIG_PROC, 0x01), "Set DAC_SIG_PROC failed");
+
+ // *** Select Page 1 ***
+ ERROR_CHECK(this->write_byte(AIC3204_PAGE_CTRL, 0x01), "Set page 1 failed");
+ // Enable the internal AVDD_LDO:
+ ERROR_CHECK(this->write_byte(AIC3204_LDO_CTRL, 0x09), "Set LDO_CTRL failed");
+ // *** Program Analog Blocks ***
+ // Disable Internal Crude AVdd in presence of external AVdd supply or before powering up internal AVdd LDO
+ ERROR_CHECK(this->write_byte(AIC3204_PWR_CFG, 0x08), "Set PWR_CFG failed");
+ // Enable Master Analog Power Control
+ ERROR_CHECK(this->write_byte(AIC3204_LDO_CTRL, 0x01), "Set LDO_CTRL failed");
+ // Page 125: Common mode control register, set d6 to 1 to make the full chip common mode = 0.75 v
+ // We are using the internal AVdd regulator with a nominal output of 1.72 V (see LDO_CTRL_REGISTER on page 123)
+ // Page 86 says to only set the common mode voltage to 0.9 v if AVdd >= 1.8... but it isn't on our hardware
+ // We also adjust the HPL and HPR gains to -2dB gian later in this config flow compensate (see page 47)
+ // (All pages refer to the TLV320AIC3204 Application Reference Guide)
+ ERROR_CHECK(this->write_byte(AIC3204_CM_CTRL, 0x40), "Set CM_CTRL failed");
+ // *** Set PowerTune Modes ***
+ // Set the Left & Right DAC PowerTune mode to PTM_P3/4. Use Class-AB driver.
+ ERROR_CHECK(this->write_byte(AIC3204_PLAY_CFG1, 0x00), "Set PLAY_CFG1 failed");
+ ERROR_CHECK(this->write_byte(AIC3204_PLAY_CFG2, 0x00), "Set PLAY_CFG2 failed");
+ // Set the REF charging time to 40ms
+ ERROR_CHECK(this->write_byte(AIC3204_REF_STARTUP, 0x01), "Set REF_STARTUP failed");
+ // HP soft stepping settings for optimal pop performance at power up
+ // Rpop used is 6k with N = 6 and soft step = 20usec. This should work with 47uF coupling
+ // capacitor. Can try N=5,6 or 7 time constants as well. Trade-off delay vs “pop” sound.
+ ERROR_CHECK(this->write_byte(AIC3204_HP_START, 0x25), "Set HP_START failed");
+ // Route Left DAC to HPL
+ ERROR_CHECK(this->write_byte(AIC3204_HPL_ROUTE, 0x08), "Set HPL_ROUTE failed");
+ // Route Right DAC to HPR
+ ERROR_CHECK(this->write_byte(AIC3204_HPR_ROUTE, 0x08), "Set HPR_ROUTE failed");
+ // Route Left DAC to LOL
+ ERROR_CHECK(this->write_byte(AIC3204_LOL_ROUTE, 0x08), "Set LOL_ROUTE failed");
+ // Route Right DAC to LOR
+ ERROR_CHECK(this->write_byte(AIC3204_LOR_ROUTE, 0x08), "Set LOR_ROUTE failed");
+
+ // Unmute HPL and set gain to -2dB (see comment before configuring the AIC3204_CM_CTRL register)
+ ERROR_CHECK(this->write_byte(AIC3204_HPL_GAIN, 0x3e), "Set HPL_GAIN failed");
+ // Unmute HPR and set gain to -2dB (see comment before configuring the AIC3204_CM_CTRL register)
+ ERROR_CHECK(this->write_byte(AIC3204_HPR_GAIN, 0x3e), "Set HPR_GAIN failed");
+ // Unmute LOL and set gain to 0dB
+ ERROR_CHECK(this->write_byte(AIC3204_LOL_DRV_GAIN, 0x00), "Set LOL_DRV_GAIN failed");
+ // Unmute LOR and set gain to 0dB
+ ERROR_CHECK(this->write_byte(AIC3204_LOR_DRV_GAIN, 0x00), "Set LOR_DRV_GAIN failed");
+
+ // Power up HPL and HPR, LOL and LOR drivers
+ ERROR_CHECK(this->write_byte(AIC3204_OP_PWR_CTRL, 0x3C), "Set OP_PWR_CTRL failed");
+
+ // Wait for 2.5 sec for soft stepping to take effect before attempting power-up
+ this->set_timeout(2500, [this]() {
+ // *** Power Up DAC ***
+ // Select Page 0
+ ERROR_CHECK(this->write_byte(AIC3204_PAGE_CTRL, 0x00), "Set PAGE_CTRL failed");
+ // Power up the Left and Right DAC Channels. Route Left data to Left DAC and Right data to Right DAC.
+ // DAC Vol control soft step 1 step per DAC word clock.
+ ERROR_CHECK(this->write_byte(AIC3204_DAC_CH_SET1, 0xd4), "Set DAC_CH_SET1 failed");
+ // Set left and right DAC digital volume control
+ ERROR_CHECK(this->write_volume_(), "Set volume failed");
+ // Unmute left and right channels
+ ERROR_CHECK(this->write_mute_(), "Set mute failed");
+ });
+}
+
+void AIC3204::dump_config() {
+ ESP_LOGCONFIG(TAG, "AIC3204:");
+ LOG_I2C_DEVICE(this);
+
+ if (this->is_failed()) {
+ ESP_LOGE(TAG, "Communication with AIC3204 failed");
+ }
+}
+
+bool AIC3204::set_mute_off() {
+ this->is_muted_ = false;
+ return this->write_mute_();
+}
+
+bool AIC3204::set_mute_on() {
+ this->is_muted_ = true;
+ return this->write_mute_();
+}
+
+bool AIC3204::set_auto_mute_mode(uint8_t auto_mute_mode) {
+ this->auto_mute_mode_ = auto_mute_mode & 0x07;
+ ESP_LOGVV(TAG, "Setting auto_mute_mode to 0x%.2x", this->auto_mute_mode_);
+ return this->write_mute_();
+}
+
+bool AIC3204::set_volume(float volume) {
+ this->volume_ = clamp(volume, 0.0, 1.0);
+ return this->write_volume_();
+}
+
+bool AIC3204::is_muted() { return this->is_muted_; }
+
+float AIC3204::volume() { return this->volume_; }
+
+bool AIC3204::write_mute_() {
+ uint8_t mute_mode_byte = this->auto_mute_mode_ << 4; // auto-mute control is bits 4-6
+ mute_mode_byte |= this->is_muted_ ? 0x0c : 0x00; // mute bits are 2-3
+ if (!this->write_byte(AIC3204_PAGE_CTRL, 0x00) || !this->write_byte(AIC3204_DAC_CH_SET2, mute_mode_byte)) {
+ ESP_LOGE(TAG, "Writing mute modes failed");
+ return false;
+ }
+ return true;
+}
+
+bool AIC3204::write_volume_() {
+ const int8_t dvc_min_byte = -127;
+ const int8_t dvc_max_byte = 48;
+
+ int8_t volume_byte = dvc_min_byte + (this->volume_ * (dvc_max_byte - dvc_min_byte));
+ volume_byte = clamp(volume_byte, dvc_min_byte, dvc_max_byte);
+
+ ESP_LOGVV(TAG, "Setting volume to 0x%.2x", volume_byte & 0xFF);
+
+ if ((!this->write_byte(AIC3204_PAGE_CTRL, 0x00)) || (!this->write_byte(AIC3204_DACL_VOL_D, volume_byte)) ||
+ (!this->write_byte(AIC3204_DACR_VOL_D, volume_byte))) {
+ ESP_LOGE(TAG, "Writing volume failed");
+ return false;
+ }
+ return true;
+}
+
+} // namespace aic3204
+} // namespace esphome
diff --git a/esphome/components/aic3204/aic3204.h b/esphome/components/aic3204/aic3204.h
new file mode 100644
index 0000000000..783a58a2b9
--- /dev/null
+++ b/esphome/components/aic3204/aic3204.h
@@ -0,0 +1,88 @@
+#pragma once
+
+#include "esphome/components/audio_dac/audio_dac.h"
+#include "esphome/components/i2c/i2c.h"
+#include "esphome/core/component.h"
+#include "esphome/core/defines.h"
+#include "esphome/core/hal.h"
+
+namespace esphome {
+namespace aic3204 {
+
+// TLV320AIC3204 Register Addresses
+// Page 0
+static const uint8_t AIC3204_PAGE_CTRL = 0x00; // Register 0 - Page Control
+static const uint8_t AIC3204_SW_RST = 0x01; // Register 1 - Software Reset
+static const uint8_t AIC3204_CLK_PLL1 = 0x04; // Register 4 - Clock Setting Register 1, Multiplexers
+static const uint8_t AIC3204_CLK_PLL2 = 0x05; // Register 5 - Clock Setting Register 2, P and R values
+static const uint8_t AIC3204_CLK_PLL3 = 0x06; // Register 6 - Clock Setting Register 3, J values
+static const uint8_t AIC3204_NDAC = 0x0B; // Register 11 - NDAC Divider Value
+static const uint8_t AIC3204_MDAC = 0x0C; // Register 12 - MDAC Divider Value
+static const uint8_t AIC3204_DOSR = 0x0E; // Register 14 - DOSR Divider Value (LS Byte)
+static const uint8_t AIC3204_NADC = 0x12; // Register 18 - NADC Divider Value
+static const uint8_t AIC3204_MADC = 0x13; // Register 19 - MADC Divider Value
+static const uint8_t AIC3204_AOSR = 0x14; // Register 20 - AOSR Divider Value
+static const uint8_t AIC3204_CODEC_IF = 0x1B; // Register 27 - CODEC Interface Control
+static const uint8_t AIC3204_AUDIO_IF_4 = 0x1F; // Register 31 - Audio Interface Setting Register 4
+static const uint8_t AIC3204_AUDIO_IF_5 = 0x20; // Register 32 - Audio Interface Setting Register 5
+static const uint8_t AIC3204_SCLK_MFP3 = 0x38; // Register 56 - SCLK/MFP3 Function Control
+static const uint8_t AIC3204_DAC_SIG_PROC = 0x3C; // Register 60 - DAC Sig Processing Block Control
+static const uint8_t AIC3204_ADC_SIG_PROC = 0x3D; // Register 61 - ADC Sig Processing Block Control
+static const uint8_t AIC3204_DAC_CH_SET1 = 0x3F; // Register 63 - DAC Channel Setup 1
+static const uint8_t AIC3204_DAC_CH_SET2 = 0x40; // Register 64 - DAC Channel Setup 2
+static const uint8_t AIC3204_DACL_VOL_D = 0x41; // Register 65 - DAC Left Digital Vol Control
+static const uint8_t AIC3204_DACR_VOL_D = 0x42; // Register 66 - DAC Right Digital Vol Control
+static const uint8_t AIC3204_DRC_ENABLE = 0x44;
+static const uint8_t AIC3204_ADC_CH_SET = 0x51; // Register 81 - ADC Channel Setup
+static const uint8_t AIC3204_ADC_FGA_MUTE = 0x52; // Register 82 - ADC Fine Gain Adjust/Mute
+
+// Page 1
+static const uint8_t AIC3204_PWR_CFG = 0x01; // Register 1 - Power Config
+static const uint8_t AIC3204_LDO_CTRL = 0x02; // Register 2 - LDO Control
+static const uint8_t AIC3204_PLAY_CFG1 = 0x03; // Register 3 - Playback Config 1
+static const uint8_t AIC3204_PLAY_CFG2 = 0x04; // Register 4 - Playback Config 2
+static const uint8_t AIC3204_OP_PWR_CTRL = 0x09; // Register 9 - Output Driver Power Control
+static const uint8_t AIC3204_CM_CTRL = 0x0A; // Register 10 - Common Mode Control
+static const uint8_t AIC3204_HPL_ROUTE = 0x0C; // Register 12 - HPL Routing Select
+static const uint8_t AIC3204_HPR_ROUTE = 0x0D; // Register 13 - HPR Routing Select
+static const uint8_t AIC3204_LOL_ROUTE = 0x0E; // Register 14 - LOL Routing Selection
+static const uint8_t AIC3204_LOR_ROUTE = 0x0F; // Register 15 - LOR Routing Selection
+static const uint8_t AIC3204_HPL_GAIN = 0x10; // Register 16 - HPL Driver Gain
+static const uint8_t AIC3204_HPR_GAIN = 0x11; // Register 17 - HPR Driver Gain
+static const uint8_t AIC3204_LOL_DRV_GAIN = 0x12; // Register 18 - LOL Driver Gain Setting
+static const uint8_t AIC3204_LOR_DRV_GAIN = 0x13; // Register 19 - LOR Driver Gain Setting
+static const uint8_t AIC3204_HP_START = 0x14; // Register 20 - Headphone Driver Startup
+static const uint8_t AIC3204_LPGA_P_ROUTE = 0x34; // Register 52 - Left PGA Positive Input Route
+static const uint8_t AIC3204_LPGA_N_ROUTE = 0x36; // Register 54 - Left PGA Negative Input Route
+static const uint8_t AIC3204_RPGA_P_ROUTE = 0x37; // Register 55 - Right PGA Positive Input Route
+static const uint8_t AIC3204_RPGA_N_ROUTE = 0x39; // Register 57 - Right PGA Negative Input Route
+static const uint8_t AIC3204_LPGA_VOL = 0x3B; // Register 59 - Left PGA Volume
+static const uint8_t AIC3204_RPGA_VOL = 0x3C; // Register 60 - Right PGA Volume
+static const uint8_t AIC3204_ADC_PTM = 0x3D; // Register 61 - ADC Power Tune Config
+static const uint8_t AIC3204_AN_IN_CHRG = 0x47; // Register 71 - Analog Input Quick Charging Config
+static const uint8_t AIC3204_REF_STARTUP = 0x7B; // Register 123 - Reference Power Up Config
+
+class AIC3204 : public audio_dac::AudioDac, public Component, public i2c::I2CDevice {
+ public:
+ void setup() override;
+ void dump_config() override;
+ float get_setup_priority() const override { return setup_priority::DATA; }
+
+ bool set_mute_off() override;
+ bool set_mute_on() override;
+ bool set_auto_mute_mode(uint8_t auto_mute_mode);
+ bool set_volume(float volume) override;
+
+ bool is_muted() override;
+ float volume() override;
+
+ protected:
+ bool write_mute_();
+ bool write_volume_();
+
+ uint8_t auto_mute_mode_{0};
+ float volume_{0};
+};
+
+} // namespace aic3204
+} // namespace esphome
diff --git a/esphome/components/aic3204/audio_dac.py b/esphome/components/aic3204/audio_dac.py
new file mode 100644
index 0000000000..da7a54df54
--- /dev/null
+++ b/esphome/components/aic3204/audio_dac.py
@@ -0,0 +1,52 @@
+from esphome import automation
+import esphome.codegen as cg
+from esphome.components import i2c
+from esphome.components.audio_dac import AudioDac
+import esphome.config_validation as cv
+from esphome.const import CONF_ID, CONF_MODE
+
+CODEOWNERS = ["@kbx81"]
+DEPENDENCIES = ["i2c"]
+
+aic3204_ns = cg.esphome_ns.namespace("aic3204")
+AIC3204 = aic3204_ns.class_("AIC3204", AudioDac, cg.Component, i2c.I2CDevice)
+
+SetAutoMuteAction = aic3204_ns.class_("SetAutoMuteAction", automation.Action)
+
+CONFIG_SCHEMA = (
+ cv.Schema(
+ {
+ cv.GenerateID(): cv.declare_id(AIC3204),
+ }
+ )
+ .extend(cv.COMPONENT_SCHEMA)
+ .extend(i2c.i2c_device_schema(0x18))
+)
+
+
+SET_AUTO_MUTE_ACTION_SCHEMA = cv.maybe_simple_value(
+ {
+ cv.GenerateID(): cv.use_id(AIC3204),
+ cv.Required(CONF_MODE): cv.templatable(cv.int_range(max=7, min=0)),
+ },
+ key=CONF_MODE,
+)
+
+
+@automation.register_action(
+ "aic3204.set_auto_mute_mode", SetAutoMuteAction, SET_AUTO_MUTE_ACTION_SCHEMA
+)
+async def aic3204_set_volume_to_code(config, action_id, template_arg, args):
+ paren = await cg.get_variable(config[CONF_ID])
+ var = cg.new_Pvariable(action_id, template_arg, paren)
+
+ template_ = await cg.templatable(config.get(CONF_MODE), args, int)
+ cg.add(var.set_auto_mute_mode(template_))
+
+ return var
+
+
+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)
diff --git a/esphome/components/aic3204/automation.h b/esphome/components/aic3204/automation.h
new file mode 100644
index 0000000000..416a88fa12
--- /dev/null
+++ b/esphome/components/aic3204/automation.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "esphome/core/automation.h"
+#include "esphome/core/component.h"
+#include "aic3204.h"
+
+namespace esphome {
+namespace aic3204 {
+
+template class SetAutoMuteAction : public Action {
+ public:
+ explicit SetAutoMuteAction(AIC3204 *aic3204) : aic3204_(aic3204) {}
+
+ TEMPLATABLE_VALUE(uint8_t, auto_mute_mode)
+
+ void play(Ts... x) override { this->aic3204_->set_auto_mute_mode(this->auto_mute_mode_.value(x...)); }
+
+ protected:
+ AIC3204 *aic3204_;
+};
+
+} // namespace aic3204
+} // namespace esphome
diff --git a/esphome/components/alarm_control_panel/__init__.py b/esphome/components/alarm_control_panel/__init__.py
index 8987d708fd..379fbf32f9 100644
--- a/esphome/components/alarm_control_panel/__init__.py
+++ b/esphome/components/alarm_control_panel/__init__.py
@@ -9,7 +9,7 @@ from esphome.const import (
CONF_MQTT_ID,
CONF_ON_STATE,
CONF_TRIGGER_ID,
- CONF_WEB_SERVER_ID,
+ CONF_WEB_SERVER,
)
from esphome.core import CORE, coroutine_with_priority
from esphome.cpp_helpers import setup_entity
@@ -195,9 +195,8 @@ async def setup_alarm_control_panel_core_(var, config):
for conf in config.get(CONF_ON_READY, []):
trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
await automation.build_automation(trigger, [], conf)
- if (webserver_id := config.get(CONF_WEB_SERVER_ID)) is not None:
- web_server_ = await cg.get_variable(webserver_id)
- web_server.add_entity_to_sorting_list(web_server_, var, config)
+ if web_server_config := config.get(CONF_WEB_SERVER):
+ await web_server.add_entity_config(var, web_server_config)
if mqtt_id := config.get(CONF_MQTT_ID):
mqtt_ = cg.new_Pvariable(mqtt_id, var)
await mqtt.register_mqtt_component(mqtt_, config)
diff --git a/esphome/components/animation/__init__.py b/esphome/components/animation/__init__.py
index dbfc82c891..5a308855de 100644
--- a/esphome/components/animation/__init__.py
+++ b/esphome/components/animation/__init__.py
@@ -1,26 +1,26 @@
import logging
from esphome import automation, core
+import esphome.codegen as cg
from esphome.components import font
import esphome.components.image as espImage
from esphome.components.image import (
CONF_USE_TRANSPARENCY,
LOCAL_SCHEMA,
- WEB_SCHEMA,
- SOURCE_WEB,
SOURCE_LOCAL,
+ SOURCE_WEB,
+ WEB_SCHEMA,
)
import esphome.config_validation as cv
-import esphome.codegen as cg
from esphome.const import (
CONF_FILE,
CONF_ID,
+ CONF_PATH,
CONF_RAW_DATA_ID,
CONF_REPEAT,
CONF_RESIZE,
- CONF_TYPE,
CONF_SOURCE,
- CONF_PATH,
+ CONF_TYPE,
CONF_URL,
)
from esphome.core import CORE, HexInt
@@ -172,6 +172,9 @@ async def to_code(config):
path = CORE.relative_config_path(conf_file[CONF_PATH])
elif conf_file[CONF_SOURCE] == SOURCE_WEB:
path = espImage.compute_local_image_path(conf_file).as_posix()
+ else:
+ raise core.EsphomeError(f"Unknown animation source: {conf_file[CONF_SOURCE]}")
+
try:
image = Image.open(path)
except Exception as e:
@@ -183,13 +186,12 @@ async def to_code(config):
new_width_max, new_height_max = config[CONF_RESIZE]
ratio = min(new_width_max / width, new_height_max / height)
width, height = int(width * ratio), int(height * ratio)
- else:
- if width > 500 or height > 500:
- _LOGGER.warning(
- 'The image "%s" you requested is very big. Please consider'
- " using the resize parameter.",
- path,
- )
+ elif width > 500 or height > 500:
+ _LOGGER.warning(
+ 'The image "%s" you requested is very big. Please consider'
+ " using the resize parameter.",
+ path,
+ )
transparent = config[CONF_USE_TRANSPARENCY]
@@ -269,7 +271,8 @@ async def to_code(config):
pos += 1
elif config[CONF_TYPE] in ["RGB565", "TRANSPARENT_IMAGE"]:
- data = [0 for _ in range(height * width * 2 * frames)]
+ bytes_per_pixel = 3 if transparent else 2
+ data = [0 for _ in range(height * width * bytes_per_pixel * frames)]
pos = 0
for frameIndex in range(frames):
image.seek(frameIndex)
@@ -286,17 +289,13 @@ async def to_code(config):
G = g >> 2
B = b >> 3
rgb = (R << 11) | (G << 5) | B
-
- if transparent:
- if rgb == 0x0020:
- rgb = 0
- if a < 0x80:
- rgb = 0x0020
-
data[pos] = rgb >> 8
pos += 1
data[pos] = rgb & 0xFF
pos += 1
+ if transparent:
+ data[pos] = a
+ pos += 1
elif config[CONF_TYPE] in ["BINARY", "TRANSPARENT_BINARY"]:
width8 = ((width + 7) // 8) * 8
@@ -306,6 +305,8 @@ async def to_code(config):
if transparent:
alpha = image.split()[-1]
has_alpha = alpha.getextrema()[0] < 0xFF
+ else:
+ has_alpha = False
frame = image.convert("1", dither=Image.Dither.NONE)
if CONF_RESIZE in config:
frame = frame.resize([width, height])
diff --git a/esphome/components/animation/animation.cpp b/esphome/components/animation/animation.cpp
index 7e0efa97e0..1375dfe07e 100644
--- a/esphome/components/animation/animation.cpp
+++ b/esphome/components/animation/animation.cpp
@@ -62,7 +62,7 @@ void Animation::set_frame(int frame) {
}
void Animation::update_data_start_() {
- const uint32_t image_size = image_type_to_width_stride(this->width_, this->type_) * this->height_;
+ const uint32_t image_size = this->get_width_stride() * this->height_;
this->data_start_ = this->animation_data_start_ + image_size * this->current_frame_;
}
diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index ad6fc79cf3..684540ffa6 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -62,6 +62,8 @@ service APIConnection {
rpc unsubscribe_bluetooth_le_advertisements(UnsubscribeBluetoothLEAdvertisementsRequest) returns (void) {}
rpc subscribe_voice_assistant(SubscribeVoiceAssistantRequest) returns (void) {}
+ rpc voice_assistant_get_configuration(VoiceAssistantConfigurationRequest) returns (VoiceAssistantConfigurationResponse) {}
+ rpc voice_assistant_set_configuration(VoiceAssistantSetConfiguration) returns (void) {}
rpc alarm_control_panel_command (AlarmControlPanelCommandRequest) returns (void) {}
}
@@ -1118,6 +1120,7 @@ message MediaPlayerSupportedFormat {
uint32 sample_rate = 2;
uint32 num_channels = 3;
MediaPlayerFormatPurpose purpose = 4;
+ uint32 sample_bytes = 5;
}
message ListEntitiesMediaPlayerResponse {
option (id) = 63;
@@ -1553,6 +1556,53 @@ message VoiceAssistantTimerEventResponse {
bool is_active = 6;
}
+message VoiceAssistantAnnounceRequest {
+ option (id) = 119;
+ option (source) = SOURCE_CLIENT;
+ option (ifdef) = "USE_VOICE_ASSISTANT";
+
+ string media_id = 1;
+ string text = 2;
+}
+
+message VoiceAssistantAnnounceFinished {
+ option (id) = 120;
+ option (source) = SOURCE_SERVER;
+ option (ifdef) = "USE_VOICE_ASSISTANT";
+
+ bool success = 1;
+}
+
+message VoiceAssistantWakeWord {
+ string id = 1;
+ string wake_word = 2;
+ repeated string trained_languages = 3;
+}
+
+message VoiceAssistantConfigurationRequest {
+ option (id) = 121;
+ option (source) = SOURCE_CLIENT;
+ option (ifdef) = "USE_VOICE_ASSISTANT";
+}
+
+message VoiceAssistantConfigurationResponse {
+ option (id) = 122;
+ option (source) = SOURCE_SERVER;
+ option (ifdef) = "USE_VOICE_ASSISTANT";
+
+ repeated VoiceAssistantWakeWord available_wake_words = 1;
+ repeated string active_wake_words = 2;
+ uint32 max_active_wake_words = 3;
+}
+
+message VoiceAssistantSetConfiguration {
+ option (id) = 123;
+ option (source) = SOURCE_CLIENT;
+ option (ifdef) = "USE_VOICE_ASSISTANT";
+
+ repeated string active_wake_words = 1;
+}
+
// ==================== ALARM CONTROL PANEL ====================
enum AlarmControlPanelState {
ALARM_STATE_DISARMED = 0;
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index a655d06e66..bb55a2ccf6 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -1,4 +1,5 @@
#include "api_connection.h"
+#ifdef USE_API
#include
#include
#include
@@ -1032,6 +1033,7 @@ bool APIConnection::send_media_player_info(media_player::MediaPlayer *media_play
media_format.sample_rate = supported_format.sample_rate;
media_format.num_channels = supported_format.num_channels;
media_format.purpose = static_cast(supported_format.purpose);
+ media_format.sample_bytes = supported_format.sample_bytes;
msg.supported_formats.push_back(media_format);
}
@@ -1213,6 +1215,52 @@ void APIConnection::on_voice_assistant_timer_event_response(const VoiceAssistant
}
};
+void APIConnection::on_voice_assistant_announce_request(const VoiceAssistantAnnounceRequest &msg) {
+ if (voice_assistant::global_voice_assistant != nullptr) {
+ if (voice_assistant::global_voice_assistant->get_api_connection() != this) {
+ return;
+ }
+
+ voice_assistant::global_voice_assistant->on_announce(msg);
+ }
+}
+
+VoiceAssistantConfigurationResponse APIConnection::voice_assistant_get_configuration(
+ const VoiceAssistantConfigurationRequest &msg) {
+ VoiceAssistantConfigurationResponse resp;
+ if (voice_assistant::global_voice_assistant != nullptr) {
+ if (voice_assistant::global_voice_assistant->get_api_connection() != this) {
+ return resp;
+ }
+
+ auto &config = voice_assistant::global_voice_assistant->get_configuration();
+ for (auto &wake_word : config.available_wake_words) {
+ VoiceAssistantWakeWord resp_wake_word;
+ resp_wake_word.id = wake_word.id;
+ resp_wake_word.wake_word = wake_word.wake_word;
+ for (const auto &lang : wake_word.trained_languages) {
+ resp_wake_word.trained_languages.push_back(lang);
+ }
+ resp.available_wake_words.push_back(std::move(resp_wake_word));
+ }
+ for (auto &wake_word_id : config.active_wake_words) {
+ resp.active_wake_words.push_back(wake_word_id);
+ }
+ resp.max_active_wake_words = config.max_active_wake_words;
+ }
+ return resp;
+}
+
+void APIConnection::voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg) {
+ if (voice_assistant::global_voice_assistant != nullptr) {
+ if (voice_assistant::global_voice_assistant->get_api_connection() != this) {
+ return;
+ }
+
+ voice_assistant::global_voice_assistant->on_set_configuration(msg.active_wake_words);
+ }
+}
+
#endif
#ifdef USE_ALARM_CONTROL_PANEL
@@ -1521,3 +1569,4 @@ void APIConnection::on_fatal_error() {
} // namespace api
} // namespace esphome
+#endif
diff --git a/esphome/components/api/api_connection.h b/esphome/components/api/api_connection.h
index 714e806470..043aaee421 100644
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -1,12 +1,13 @@
#pragma once
+#include "esphome/core/defines.h"
+#ifdef USE_API
#include "api_frame_helper.h"
#include "api_pb2.h"
#include "api_pb2_service.h"
#include "api_server.h"
#include "esphome/core/application.h"
#include "esphome/core/component.h"
-#include "esphome/core/defines.h"
#include
@@ -151,6 +152,10 @@ class APIConnection : public APIServerConnection {
void on_voice_assistant_event_response(const VoiceAssistantEventResponse &msg) override;
void on_voice_assistant_audio(const VoiceAssistantAudio &msg) override;
void on_voice_assistant_timer_event_response(const VoiceAssistantTimerEventResponse &msg) override;
+ void on_voice_assistant_announce_request(const VoiceAssistantAnnounceRequest &msg) override;
+ VoiceAssistantConfigurationResponse voice_assistant_get_configuration(
+ const VoiceAssistantConfigurationRequest &msg) override;
+ void voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg) override;
#endif
#ifdef USE_ALARM_CONTROL_PANEL
@@ -264,3 +269,4 @@ class APIConnection : public APIServerConnection {
} // namespace api
} // namespace esphome
+#endif
diff --git a/esphome/components/api/api_frame_helper.cpp b/esphome/components/api/api_frame_helper.cpp
index f4b18a1fd6..62f375508c 100644
--- a/esphome/components/api/api_frame_helper.cpp
+++ b/esphome/components/api/api_frame_helper.cpp
@@ -1,5 +1,5 @@
#include "api_frame_helper.h"
-
+#ifdef USE_API
#include "esphome/core/log.h"
#include "esphome/core/hal.h"
#include "esphome/core/helpers.h"
@@ -1028,3 +1028,4 @@ APIError APIPlaintextFrameHelper::shutdown(int how) {
} // namespace api
} // namespace esphome
+#endif
diff --git a/esphome/components/api/api_frame_helper.h b/esphome/components/api/api_frame_helper.h
index bf4872d2d6..56d8bf1973 100644
--- a/esphome/components/api/api_frame_helper.h
+++ b/esphome/components/api/api_frame_helper.h
@@ -5,7 +5,7 @@
#include
#include "esphome/core/defines.h"
-
+#ifdef USE_API
#ifdef USE_API_NOISE
#include "noise/protocol.h"
#endif
@@ -190,3 +190,4 @@ class APIPlaintextFrameHelper : public APIFrameHelper {
} // namespace api
} // namespace esphome
+#endif
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index c944d0dae8..8df152881c 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -5149,6 +5149,10 @@ bool MediaPlayerSupportedFormat::decode_varint(uint32_t field_id, ProtoVarInt va
this->purpose = value.as_enum();
return true;
}
+ case 5: {
+ this->sample_bytes = value.as_uint32();
+ return true;
+ }
default:
return false;
}
@@ -5168,6 +5172,7 @@ void MediaPlayerSupportedFormat::encode(ProtoWriteBuffer buffer) const {
buffer.encode_uint32(2, this->sample_rate);
buffer.encode_uint32(3, this->num_channels);
buffer.encode_enum(4, this->purpose);
+ buffer.encode_uint32(5, this->sample_bytes);
}
#ifdef HAS_PROTO_MESSAGE_DUMP
void MediaPlayerSupportedFormat::dump_to(std::string &out) const {
@@ -5190,6 +5195,11 @@ void MediaPlayerSupportedFormat::dump_to(std::string &out) const {
out.append(" purpose: ");
out.append(proto_enum_to_string(this->purpose));
out.append("\n");
+
+ out.append(" sample_bytes: ");
+ sprintf(buffer, "%" PRIu32, this->sample_bytes);
+ out.append(buffer);
+ out.append("\n");
out.append("}");
}
#endif
@@ -7061,6 +7071,193 @@ void VoiceAssistantTimerEventResponse::dump_to(std::string &out) const {
out.append("}");
}
#endif
+bool VoiceAssistantAnnounceRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+ switch (field_id) {
+ case 1: {
+ this->media_id = value.as_string();
+ return true;
+ }
+ case 2: {
+ this->text = value.as_string();
+ return true;
+ }
+ default:
+ return false;
+ }
+}
+void VoiceAssistantAnnounceRequest::encode(ProtoWriteBuffer buffer) const {
+ buffer.encode_string(1, this->media_id);
+ buffer.encode_string(2, this->text);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void VoiceAssistantAnnounceRequest::dump_to(std::string &out) const {
+ __attribute__((unused)) char buffer[64];
+ out.append("VoiceAssistantAnnounceRequest {\n");
+ out.append(" media_id: ");
+ out.append("'").append(this->media_id).append("'");
+ out.append("\n");
+
+ out.append(" text: ");
+ out.append("'").append(this->text).append("'");
+ out.append("\n");
+ out.append("}");
+}
+#endif
+bool VoiceAssistantAnnounceFinished::decode_varint(uint32_t field_id, ProtoVarInt value) {
+ switch (field_id) {
+ case 1: {
+ this->success = value.as_bool();
+ return true;
+ }
+ default:
+ return false;
+ }
+}
+void VoiceAssistantAnnounceFinished::encode(ProtoWriteBuffer buffer) const { buffer.encode_bool(1, this->success); }
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void VoiceAssistantAnnounceFinished::dump_to(std::string &out) const {
+ __attribute__((unused)) char buffer[64];
+ out.append("VoiceAssistantAnnounceFinished {\n");
+ out.append(" success: ");
+ out.append(YESNO(this->success));
+ out.append("\n");
+ out.append("}");
+}
+#endif
+bool VoiceAssistantWakeWord::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+ switch (field_id) {
+ case 1: {
+ this->id = value.as_string();
+ return true;
+ }
+ case 2: {
+ this->wake_word = value.as_string();
+ return true;
+ }
+ case 3: {
+ this->trained_languages.push_back(value.as_string());
+ return true;
+ }
+ default:
+ return false;
+ }
+}
+void VoiceAssistantWakeWord::encode(ProtoWriteBuffer buffer) const {
+ buffer.encode_string(1, this->id);
+ buffer.encode_string(2, this->wake_word);
+ for (auto &it : this->trained_languages) {
+ buffer.encode_string(3, it, true);
+ }
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void VoiceAssistantWakeWord::dump_to(std::string &out) const {
+ __attribute__((unused)) char buffer[64];
+ out.append("VoiceAssistantWakeWord {\n");
+ out.append(" id: ");
+ out.append("'").append(this->id).append("'");
+ out.append("\n");
+
+ out.append(" wake_word: ");
+ out.append("'").append(this->wake_word).append("'");
+ out.append("\n");
+
+ for (const auto &it : this->trained_languages) {
+ out.append(" trained_languages: ");
+ out.append("'").append(it).append("'");
+ out.append("\n");
+ }
+ out.append("}");
+}
+#endif
+void VoiceAssistantConfigurationRequest::encode(ProtoWriteBuffer buffer) const {}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void VoiceAssistantConfigurationRequest::dump_to(std::string &out) const {
+ out.append("VoiceAssistantConfigurationRequest {}");
+}
+#endif
+bool VoiceAssistantConfigurationResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+ switch (field_id) {
+ case 3: {
+ this->max_active_wake_words = value.as_uint32();
+ return true;
+ }
+ default:
+ return false;
+ }
+}
+bool VoiceAssistantConfigurationResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+ switch (field_id) {
+ case 1: {
+ this->available_wake_words.push_back(value.as_message());
+ return true;
+ }
+ case 2: {
+ this->active_wake_words.push_back(value.as_string());
+ return true;
+ }
+ default:
+ return false;
+ }
+}
+void VoiceAssistantConfigurationResponse::encode(ProtoWriteBuffer buffer) const {
+ for (auto &it : this->available_wake_words) {
+ buffer.encode_message(1, it, true);
+ }
+ for (auto &it : this->active_wake_words) {
+ buffer.encode_string(2, it, true);
+ }
+ buffer.encode_uint32(3, this->max_active_wake_words);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void VoiceAssistantConfigurationResponse::dump_to(std::string &out) const {
+ __attribute__((unused)) char buffer[64];
+ out.append("VoiceAssistantConfigurationResponse {\n");
+ for (const auto &it : this->available_wake_words) {
+ out.append(" available_wake_words: ");
+ it.dump_to(out);
+ out.append("\n");
+ }
+
+ for (const auto &it : this->active_wake_words) {
+ out.append(" active_wake_words: ");
+ out.append("'").append(it).append("'");
+ out.append("\n");
+ }
+
+ out.append(" max_active_wake_words: ");
+ sprintf(buffer, "%" PRIu32, this->max_active_wake_words);
+ out.append(buffer);
+ out.append("\n");
+ out.append("}");
+}
+#endif
+bool VoiceAssistantSetConfiguration::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+ switch (field_id) {
+ case 1: {
+ this->active_wake_words.push_back(value.as_string());
+ return true;
+ }
+ default:
+ return false;
+ }
+}
+void VoiceAssistantSetConfiguration::encode(ProtoWriteBuffer buffer) const {
+ for (auto &it : this->active_wake_words) {
+ buffer.encode_string(1, it, true);
+ }
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void VoiceAssistantSetConfiguration::dump_to(std::string &out) const {
+ __attribute__((unused)) char buffer[64];
+ out.append("VoiceAssistantSetConfiguration {\n");
+ for (const auto &it : this->active_wake_words) {
+ out.append(" active_wake_words: ");
+ out.append("'").append(it).append("'");
+ out.append("\n");
+ }
+ out.append("}");
+}
+#endif
bool ListEntitiesAlarmControlPanelResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
switch (field_id) {
case 6: {
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index 3f609c793c..063c217bf7 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -1277,6 +1277,7 @@ class MediaPlayerSupportedFormat : public ProtoMessage {
uint32_t sample_rate{0};
uint32_t num_channels{0};
enums::MediaPlayerFormatPurpose purpose{};
+ uint32_t sample_bytes{0};
void encode(ProtoWriteBuffer buffer) const override;
#ifdef HAS_PROTO_MESSAGE_DUMP
void dump_to(std::string &out) const override;
@@ -1825,6 +1826,76 @@ class VoiceAssistantTimerEventResponse : public ProtoMessage {
bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
};
+class VoiceAssistantAnnounceRequest : public ProtoMessage {
+ public:
+ std::string media_id{};
+ std::string text{};
+ void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+ void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+ bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+};
+class VoiceAssistantAnnounceFinished : public ProtoMessage {
+ public:
+ bool success{false};
+ 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 VoiceAssistantWakeWord : public ProtoMessage {
+ public:
+ std::string id{};
+ std::string wake_word{};
+ std::vector trained_languages{};
+ void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+ void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+ bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+};
+class VoiceAssistantConfigurationRequest : public ProtoMessage {
+ public:
+ void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+ void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+};
+class VoiceAssistantConfigurationResponse : public ProtoMessage {
+ public:
+ std::vector available_wake_words{};
+ std::vector active_wake_words{};
+ uint32_t max_active_wake_words{0};
+ void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+ void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+ bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+ bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class VoiceAssistantSetConfiguration : public ProtoMessage {
+ public:
+ std::vector active_wake_words{};
+ void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+ void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+ bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+};
class ListEntitiesAlarmControlPanelResponse : public ProtoMessage {
public:
std::string object_id{};
diff --git a/esphome/components/api/api_pb2_service.cpp b/esphome/components/api/api_pb2_service.cpp
index 269a755e9e..6e11d7169d 100644
--- a/esphome/components/api/api_pb2_service.cpp
+++ b/esphome/components/api/api_pb2_service.cpp
@@ -486,6 +486,29 @@ bool APIServerConnectionBase::send_voice_assistant_audio(const VoiceAssistantAud
#endif
#ifdef USE_VOICE_ASSISTANT
#endif
+#ifdef USE_VOICE_ASSISTANT
+#endif
+#ifdef USE_VOICE_ASSISTANT
+bool APIServerConnectionBase::send_voice_assistant_announce_finished(const VoiceAssistantAnnounceFinished &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+ ESP_LOGVV(TAG, "send_voice_assistant_announce_finished: %s", msg.dump().c_str());
+#endif
+ return this->send_message_(msg, 120);
+}
+#endif
+#ifdef USE_VOICE_ASSISTANT
+#endif
+#ifdef USE_VOICE_ASSISTANT
+bool APIServerConnectionBase::send_voice_assistant_configuration_response(
+ const VoiceAssistantConfigurationResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+ ESP_LOGVV(TAG, "send_voice_assistant_configuration_response: %s", msg.dump().c_str());
+#endif
+ return this->send_message_(msg, 122);
+}
+#endif
+#ifdef USE_VOICE_ASSISTANT
+#endif
#ifdef USE_ALARM_CONTROL_PANEL
bool APIServerConnectionBase::send_list_entities_alarm_control_panel_response(
const ListEntitiesAlarmControlPanelResponse &msg) {
@@ -1135,6 +1158,39 @@ bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
ESP_LOGVV(TAG, "on_update_command_request: %s", msg.dump().c_str());
#endif
this->on_update_command_request(msg);
+#endif
+ break;
+ }
+ case 119: {
+#ifdef USE_VOICE_ASSISTANT
+ VoiceAssistantAnnounceRequest msg;
+ msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+ ESP_LOGVV(TAG, "on_voice_assistant_announce_request: %s", msg.dump().c_str());
+#endif
+ this->on_voice_assistant_announce_request(msg);
+#endif
+ break;
+ }
+ case 121: {
+#ifdef USE_VOICE_ASSISTANT
+ VoiceAssistantConfigurationRequest msg;
+ msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+ ESP_LOGVV(TAG, "on_voice_assistant_configuration_request: %s", msg.dump().c_str());
+#endif
+ this->on_voice_assistant_configuration_request(msg);
+#endif
+ break;
+ }
+ case 123: {
+#ifdef USE_VOICE_ASSISTANT
+ VoiceAssistantSetConfiguration msg;
+ msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+ ESP_LOGVV(TAG, "on_voice_assistant_set_configuration: %s", msg.dump().c_str());
+#endif
+ this->on_voice_assistant_set_configuration(msg);
#endif
break;
}
@@ -1625,6 +1681,35 @@ void APIServerConnection::on_subscribe_voice_assistant_request(const SubscribeVo
this->subscribe_voice_assistant(msg);
}
#endif
+#ifdef USE_VOICE_ASSISTANT
+void APIServerConnection::on_voice_assistant_configuration_request(const VoiceAssistantConfigurationRequest &msg) {
+ if (!this->is_connection_setup()) {
+ this->on_no_setup_connection();
+ return;
+ }
+ if (!this->is_authenticated()) {
+ this->on_unauthenticated_access();
+ return;
+ }
+ VoiceAssistantConfigurationResponse ret = this->voice_assistant_get_configuration(msg);
+ if (!this->send_voice_assistant_configuration_response(ret)) {
+ this->on_fatal_error();
+ }
+}
+#endif
+#ifdef USE_VOICE_ASSISTANT
+void APIServerConnection::on_voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg) {
+ if (!this->is_connection_setup()) {
+ this->on_no_setup_connection();
+ return;
+ }
+ if (!this->is_authenticated()) {
+ this->on_unauthenticated_access();
+ return;
+ }
+ this->voice_assistant_set_configuration(msg);
+}
+#endif
#ifdef USE_ALARM_CONTROL_PANEL
void APIServerConnection::on_alarm_control_panel_command_request(const AlarmControlPanelCommandRequest &msg) {
if (!this->is_connection_setup()) {
diff --git a/esphome/components/api/api_pb2_service.h b/esphome/components/api/api_pb2_service.h
index 83bfc2ed98..51b94bf530 100644
--- a/esphome/components/api/api_pb2_service.h
+++ b/esphome/components/api/api_pb2_service.h
@@ -247,6 +247,21 @@ class APIServerConnectionBase : public ProtoService {
#ifdef USE_VOICE_ASSISTANT
virtual void on_voice_assistant_timer_event_response(const VoiceAssistantTimerEventResponse &value){};
#endif
+#ifdef USE_VOICE_ASSISTANT
+ virtual void on_voice_assistant_announce_request(const VoiceAssistantAnnounceRequest &value){};
+#endif
+#ifdef USE_VOICE_ASSISTANT
+ bool send_voice_assistant_announce_finished(const VoiceAssistantAnnounceFinished &msg);
+#endif
+#ifdef USE_VOICE_ASSISTANT
+ virtual void on_voice_assistant_configuration_request(const VoiceAssistantConfigurationRequest &value){};
+#endif
+#ifdef USE_VOICE_ASSISTANT
+ bool send_voice_assistant_configuration_response(const VoiceAssistantConfigurationResponse &msg);
+#endif
+#ifdef USE_VOICE_ASSISTANT
+ virtual void on_voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &value){};
+#endif
#ifdef USE_ALARM_CONTROL_PANEL
bool send_list_entities_alarm_control_panel_response(const ListEntitiesAlarmControlPanelResponse &msg);
#endif
@@ -419,6 +434,13 @@ class APIServerConnection : public APIServerConnectionBase {
#ifdef USE_VOICE_ASSISTANT
virtual void subscribe_voice_assistant(const SubscribeVoiceAssistantRequest &msg) = 0;
#endif
+#ifdef USE_VOICE_ASSISTANT
+ virtual VoiceAssistantConfigurationResponse voice_assistant_get_configuration(
+ const VoiceAssistantConfigurationRequest &msg) = 0;
+#endif
+#ifdef USE_VOICE_ASSISTANT
+ virtual void voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg) = 0;
+#endif
#ifdef USE_ALARM_CONTROL_PANEL
virtual void alarm_control_panel_command(const AlarmControlPanelCommandRequest &msg) = 0;
#endif
@@ -520,6 +542,12 @@ class APIServerConnection : public APIServerConnectionBase {
#ifdef USE_VOICE_ASSISTANT
void on_subscribe_voice_assistant_request(const SubscribeVoiceAssistantRequest &msg) override;
#endif
+#ifdef USE_VOICE_ASSISTANT
+ void on_voice_assistant_configuration_request(const VoiceAssistantConfigurationRequest &msg) override;
+#endif
+#ifdef USE_VOICE_ASSISTANT
+ void on_voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg) override;
+#endif
#ifdef USE_ALARM_CONTROL_PANEL
void on_alarm_control_panel_command_request(const AlarmControlPanelCommandRequest &msg) override;
#endif
diff --git a/esphome/components/api/api_server.cpp b/esphome/components/api/api_server.cpp
index 0fde3e47af..f16b5a13cf 100644
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -1,4 +1,5 @@
#include "api_server.h"
+#ifdef USE_API
#include
#include "api_connection.h"
#include "esphome/components/network/util.h"
@@ -403,3 +404,4 @@ void APIServer::on_alarm_control_panel_update(alarm_control_panel::AlarmControlP
} // namespace api
} // namespace esphome
+#endif
diff --git a/esphome/components/api/api_server.h b/esphome/components/api/api_server.h
index 899eaede49..42e0b1048a 100644
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -1,5 +1,7 @@
#pragma once
+#include "esphome/core/defines.h"
+#ifdef USE_API
#include "api_noise_context.h"
#include "api_pb2.h"
#include "api_pb2_service.h"
@@ -7,7 +9,6 @@
#include "esphome/core/automation.h"
#include "esphome/core/component.h"
#include "esphome/core/controller.h"
-#include "esphome/core/defines.h"
#include "esphome/core/log.h"
#include "list_entities.h"
#include "subscribe_state.h"
@@ -153,3 +154,4 @@ template class APIConnectedCondition : public Condition {
} // namespace api
} // namespace esphome
+#endif
diff --git a/esphome/components/api/custom_api_device.h b/esphome/components/api/custom_api_device.h
index 845a35fc54..1a8e189f41 100644
--- a/esphome/components/api/custom_api_device.h
+++ b/esphome/components/api/custom_api_device.h
@@ -1,9 +1,9 @@
#pragma once
#include