mirror of
https://github.com/esphome/esphome.git
synced 2024-09-28 04:09:16 +02:00
Merge branch 'dev' into hob2hood_protocol
This commit is contained in:
commit
a93ced6e85
30
.github/actions/build-image/action.yaml
vendored
30
.github/actions/build-image/action.yaml
vendored
@ -34,6 +34,16 @@ runs:
|
|||||||
echo $l >> $GITHUB_OUTPUT
|
echo $l >> $GITHUB_OUTPUT
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# set cache-to only if dev branch
|
||||||
|
- id: cache-to
|
||||||
|
shell: bash
|
||||||
|
run: |-
|
||||||
|
if [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then
|
||||||
|
echo "value=type=gha,mode=max" >> $GITHUB_OUTPUT
|
||||||
|
else
|
||||||
|
echo "value=" >> $GITHUB_OUTPUT
|
||||||
|
fi
|
||||||
|
|
||||||
- name: Build and push to ghcr by digest
|
- name: Build and push to ghcr by digest
|
||||||
id: build-ghcr
|
id: build-ghcr
|
||||||
uses: docker/build-push-action@v5.3.0
|
uses: docker/build-push-action@v5.3.0
|
||||||
@ -43,7 +53,7 @@ runs:
|
|||||||
platforms: ${{ inputs.platform }}
|
platforms: ${{ inputs.platform }}
|
||||||
target: ${{ inputs.target }}
|
target: ${{ inputs.target }}
|
||||||
cache-from: type=gha
|
cache-from: type=gha
|
||||||
cache-to: type=gha,mode=max
|
cache-to: ${{ steps.cache-to.outputs.value }}
|
||||||
build-args: |
|
build-args: |
|
||||||
BASEIMGTYPE=${{ inputs.baseimg }}
|
BASEIMGTYPE=${{ inputs.baseimg }}
|
||||||
BUILD_VERSION=${{ inputs.version }}
|
BUILD_VERSION=${{ inputs.version }}
|
||||||
@ -57,14 +67,6 @@ runs:
|
|||||||
digest="${{ steps.build-ghcr.outputs.digest }}"
|
digest="${{ steps.build-ghcr.outputs.digest }}"
|
||||||
touch "/tmp/digests/${{ inputs.target }}/ghcr/${digest#sha256:}"
|
touch "/tmp/digests/${{ inputs.target }}/ghcr/${digest#sha256:}"
|
||||||
|
|
||||||
- name: Upload ghcr digest
|
|
||||||
uses: actions/upload-artifact@v3.1.3
|
|
||||||
with:
|
|
||||||
name: digests-${{ inputs.target }}-ghcr
|
|
||||||
path: /tmp/digests/${{ inputs.target }}/ghcr/*
|
|
||||||
if-no-files-found: error
|
|
||||||
retention-days: 1
|
|
||||||
|
|
||||||
- name: Build and push to dockerhub by digest
|
- name: Build and push to dockerhub by digest
|
||||||
id: build-dockerhub
|
id: build-dockerhub
|
||||||
uses: docker/build-push-action@v5.3.0
|
uses: docker/build-push-action@v5.3.0
|
||||||
@ -74,7 +76,7 @@ runs:
|
|||||||
platforms: ${{ inputs.platform }}
|
platforms: ${{ inputs.platform }}
|
||||||
target: ${{ inputs.target }}
|
target: ${{ inputs.target }}
|
||||||
cache-from: type=gha
|
cache-from: type=gha
|
||||||
cache-to: type=gha,mode=max
|
cache-to: ${{ steps.cache-to.outputs.value }}
|
||||||
build-args: |
|
build-args: |
|
||||||
BASEIMGTYPE=${{ inputs.baseimg }}
|
BASEIMGTYPE=${{ inputs.baseimg }}
|
||||||
BUILD_VERSION=${{ inputs.version }}
|
BUILD_VERSION=${{ inputs.version }}
|
||||||
@ -87,11 +89,3 @@ runs:
|
|||||||
mkdir -p /tmp/digests/${{ inputs.target }}/dockerhub
|
mkdir -p /tmp/digests/${{ inputs.target }}/dockerhub
|
||||||
digest="${{ steps.build-dockerhub.outputs.digest }}"
|
digest="${{ steps.build-dockerhub.outputs.digest }}"
|
||||||
touch "/tmp/digests/${{ inputs.target }}/dockerhub/${digest#sha256:}"
|
touch "/tmp/digests/${{ inputs.target }}/dockerhub/${digest#sha256:}"
|
||||||
|
|
||||||
- name: Upload dockerhub digest
|
|
||||||
uses: actions/upload-artifact@v3.1.3
|
|
||||||
with:
|
|
||||||
name: digests-${{ inputs.target }}-dockerhub
|
|
||||||
path: /tmp/digests/${{ inputs.target }}/dockerhub/*
|
|
||||||
if-no-files-found: error
|
|
||||||
retention-days: 1
|
|
||||||
|
2
.github/workflows/ci-api-proto.yml
vendored
2
.github/workflows/ci-api-proto.yml
vendored
@ -21,7 +21,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4.1.1
|
uses: actions/checkout@v4.1.5
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v5.1.0
|
uses: actions/setup-python@v5.1.0
|
||||||
with:
|
with:
|
||||||
|
2
.github/workflows/ci-docker.yml
vendored
2
.github/workflows/ci-docker.yml
vendored
@ -40,7 +40,7 @@ jobs:
|
|||||||
arch: [amd64, armv7, aarch64]
|
arch: [amd64, armv7, aarch64]
|
||||||
build_type: ["ha-addon", "docker", "lint"]
|
build_type: ["ha-addon", "docker", "lint"]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4.1.1
|
- uses: actions/checkout@v4.1.5
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v5.1.0
|
uses: actions/setup-python@v5.1.0
|
||||||
with:
|
with:
|
||||||
|
44
.github/workflows/ci.yml
vendored
44
.github/workflows/ci.yml
vendored
@ -34,7 +34,7 @@ jobs:
|
|||||||
cache-key: ${{ steps.cache-key.outputs.key }}
|
cache-key: ${{ steps.cache-key.outputs.key }}
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code from GitHub
|
- name: Check out code from GitHub
|
||||||
uses: actions/checkout@v4.1.1
|
uses: actions/checkout@v4.1.5
|
||||||
- name: Generate cache-key
|
- name: Generate cache-key
|
||||||
id: cache-key
|
id: cache-key
|
||||||
run: echo key="${{ hashFiles('requirements.txt', 'requirements_optional.txt', 'requirements_test.txt') }}" >> $GITHUB_OUTPUT
|
run: echo key="${{ hashFiles('requirements.txt', 'requirements_optional.txt', 'requirements_test.txt') }}" >> $GITHUB_OUTPUT
|
||||||
@ -66,7 +66,7 @@ jobs:
|
|||||||
- common
|
- common
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code from GitHub
|
- name: Check out code from GitHub
|
||||||
uses: actions/checkout@v4.1.1
|
uses: actions/checkout@v4.1.5
|
||||||
- name: Restore Python
|
- name: Restore Python
|
||||||
uses: ./.github/actions/restore-python
|
uses: ./.github/actions/restore-python
|
||||||
with:
|
with:
|
||||||
@ -87,7 +87,7 @@ jobs:
|
|||||||
- common
|
- common
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code from GitHub
|
- name: Check out code from GitHub
|
||||||
uses: actions/checkout@v4.1.1
|
uses: actions/checkout@v4.1.5
|
||||||
- name: Restore Python
|
- name: Restore Python
|
||||||
uses: ./.github/actions/restore-python
|
uses: ./.github/actions/restore-python
|
||||||
with:
|
with:
|
||||||
@ -108,7 +108,7 @@ jobs:
|
|||||||
- common
|
- common
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code from GitHub
|
- name: Check out code from GitHub
|
||||||
uses: actions/checkout@v4.1.1
|
uses: actions/checkout@v4.1.5
|
||||||
- name: Restore Python
|
- name: Restore Python
|
||||||
uses: ./.github/actions/restore-python
|
uses: ./.github/actions/restore-python
|
||||||
with:
|
with:
|
||||||
@ -129,7 +129,7 @@ jobs:
|
|||||||
- common
|
- common
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code from GitHub
|
- name: Check out code from GitHub
|
||||||
uses: actions/checkout@v4.1.1
|
uses: actions/checkout@v4.1.5
|
||||||
- name: Restore Python
|
- name: Restore Python
|
||||||
uses: ./.github/actions/restore-python
|
uses: ./.github/actions/restore-python
|
||||||
with:
|
with:
|
||||||
@ -150,7 +150,7 @@ jobs:
|
|||||||
- common
|
- common
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code from GitHub
|
- name: Check out code from GitHub
|
||||||
uses: actions/checkout@v4.1.1
|
uses: actions/checkout@v4.1.5
|
||||||
- name: Restore Python
|
- name: Restore Python
|
||||||
uses: ./.github/actions/restore-python
|
uses: ./.github/actions/restore-python
|
||||||
with:
|
with:
|
||||||
@ -199,7 +199,7 @@ jobs:
|
|||||||
- common
|
- common
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code from GitHub
|
- name: Check out code from GitHub
|
||||||
uses: actions/checkout@v4.1.1
|
uses: actions/checkout@v4.1.5
|
||||||
- name: Restore Python
|
- name: Restore Python
|
||||||
uses: ./.github/actions/restore-python
|
uses: ./.github/actions/restore-python
|
||||||
with:
|
with:
|
||||||
@ -229,7 +229,7 @@ jobs:
|
|||||||
- common
|
- common
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code from GitHub
|
- name: Check out code from GitHub
|
||||||
uses: actions/checkout@v4.1.1
|
uses: actions/checkout@v4.1.5
|
||||||
- name: Restore Python
|
- name: Restore Python
|
||||||
uses: ./.github/actions/restore-python
|
uses: ./.github/actions/restore-python
|
||||||
with:
|
with:
|
||||||
@ -254,7 +254,7 @@ jobs:
|
|||||||
matrix: ${{ steps.set-matrix.outputs.matrix }}
|
matrix: ${{ steps.set-matrix.outputs.matrix }}
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code from GitHub
|
- name: Check out code from GitHub
|
||||||
uses: actions/checkout@v4.1.1
|
uses: actions/checkout@v4.1.5
|
||||||
- name: Find all YAML test files
|
- name: Find all YAML test files
|
||||||
id: set-matrix
|
id: set-matrix
|
||||||
run: echo "matrix=$(ls tests/test*.yaml | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
|
run: echo "matrix=$(ls tests/test*.yaml | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
|
||||||
@ -271,7 +271,7 @@ jobs:
|
|||||||
file: ${{ fromJson(needs.compile-tests-list.outputs.matrix) }}
|
file: ${{ fromJson(needs.compile-tests-list.outputs.matrix) }}
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code from GitHub
|
- name: Check out code from GitHub
|
||||||
uses: actions/checkout@v4.1.1
|
uses: actions/checkout@v4.1.5
|
||||||
- name: Restore Python
|
- name: Restore Python
|
||||||
uses: ./.github/actions/restore-python
|
uses: ./.github/actions/restore-python
|
||||||
with:
|
with:
|
||||||
@ -303,7 +303,7 @@ jobs:
|
|||||||
file: ${{ fromJson(needs.compile-tests-list.outputs.matrix) }}
|
file: ${{ fromJson(needs.compile-tests-list.outputs.matrix) }}
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code from GitHub
|
- name: Check out code from GitHub
|
||||||
uses: actions/checkout@v4.1.1
|
uses: actions/checkout@v4.1.5
|
||||||
- name: Restore Python
|
- name: Restore Python
|
||||||
uses: ./.github/actions/restore-python
|
uses: ./.github/actions/restore-python
|
||||||
with:
|
with:
|
||||||
@ -358,18 +358,26 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code from GitHub
|
- name: Check out code from GitHub
|
||||||
uses: actions/checkout@v4.1.1
|
uses: actions/checkout@v4.1.5
|
||||||
- name: Restore Python
|
- name: Restore Python
|
||||||
uses: ./.github/actions/restore-python
|
uses: ./.github/actions/restore-python
|
||||||
with:
|
with:
|
||||||
python-version: ${{ env.DEFAULT_PYTHON }}
|
python-version: ${{ env.DEFAULT_PYTHON }}
|
||||||
cache-key: ${{ needs.common.outputs.cache-key }}
|
cache-key: ${{ needs.common.outputs.cache-key }}
|
||||||
|
|
||||||
- name: Cache platformio
|
- name: Cache platformio
|
||||||
|
if: github.ref == 'refs/heads/dev'
|
||||||
uses: actions/cache@v4.0.2
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: ~/.platformio
|
path: ~/.platformio
|
||||||
# yamllint disable-line rule:line-length
|
key: platformio-${{ matrix.pio_cache_key }}
|
||||||
key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}
|
|
||||||
|
- name: Cache platformio
|
||||||
|
if: github.ref != 'refs/heads/dev'
|
||||||
|
uses: actions/cache/restore@v4.0.2
|
||||||
|
with:
|
||||||
|
path: ~/.platformio
|
||||||
|
key: platformio-${{ matrix.pio_cache_key }}
|
||||||
|
|
||||||
- name: Install clang-tidy
|
- name: Install clang-tidy
|
||||||
run: sudo apt-get install clang-tidy-14
|
run: sudo apt-get install clang-tidy-14
|
||||||
@ -402,7 +410,7 @@ jobs:
|
|||||||
count: ${{ steps.list-components.outputs.count }}
|
count: ${{ steps.list-components.outputs.count }}
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code from GitHub
|
- name: Check out code from GitHub
|
||||||
uses: actions/checkout@v4.1.1
|
uses: actions/checkout@v4.1.5
|
||||||
with:
|
with:
|
||||||
# Fetch enough history so `git merge-base refs/remotes/origin/dev HEAD` works.
|
# Fetch enough history so `git merge-base refs/remotes/origin/dev HEAD` works.
|
||||||
fetch-depth: 500
|
fetch-depth: 500
|
||||||
@ -450,7 +458,7 @@ jobs:
|
|||||||
run: sudo apt-get install libsodium-dev
|
run: sudo apt-get install libsodium-dev
|
||||||
|
|
||||||
- name: Check out code from GitHub
|
- name: Check out code from GitHub
|
||||||
uses: actions/checkout@v4.1.1
|
uses: actions/checkout@v4.1.5
|
||||||
- name: Restore Python
|
- name: Restore Python
|
||||||
uses: ./.github/actions/restore-python
|
uses: ./.github/actions/restore-python
|
||||||
with:
|
with:
|
||||||
@ -476,7 +484,7 @@ jobs:
|
|||||||
matrix: ${{ steps.split.outputs.components }}
|
matrix: ${{ steps.split.outputs.components }}
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code from GitHub
|
- name: Check out code from GitHub
|
||||||
uses: actions/checkout@v4.1.1
|
uses: actions/checkout@v4.1.5
|
||||||
- name: Split components into 20 groups
|
- name: Split components into 20 groups
|
||||||
id: split
|
id: split
|
||||||
run: |
|
run: |
|
||||||
@ -504,7 +512,7 @@ jobs:
|
|||||||
run: sudo apt-get install libsodium-dev
|
run: sudo apt-get install libsodium-dev
|
||||||
|
|
||||||
- name: Check out code from GitHub
|
- name: Check out code from GitHub
|
||||||
uses: actions/checkout@v4.1.1
|
uses: actions/checkout@v4.1.5
|
||||||
- name: Restore Python
|
- name: Restore Python
|
||||||
uses: ./.github/actions/restore-python
|
uses: ./.github/actions/restore-python
|
||||||
with:
|
with:
|
||||||
|
30
.github/workflows/release.yml
vendored
30
.github/workflows/release.yml
vendored
@ -19,7 +19,7 @@ jobs:
|
|||||||
tag: ${{ steps.tag.outputs.tag }}
|
tag: ${{ steps.tag.outputs.tag }}
|
||||||
branch_build: ${{ steps.tag.outputs.branch_build }}
|
branch_build: ${{ steps.tag.outputs.branch_build }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4.1.1
|
- uses: actions/checkout@v4.1.5
|
||||||
- name: Get tag
|
- name: Get tag
|
||||||
id: tag
|
id: tag
|
||||||
# yamllint disable rule:line-length
|
# yamllint disable rule:line-length
|
||||||
@ -51,7 +51,7 @@ jobs:
|
|||||||
contents: read
|
contents: read
|
||||||
id-token: write
|
id-token: write
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4.1.1
|
- uses: actions/checkout@v4.1.5
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v5.1.0
|
uses: actions/setup-python@v5.1.0
|
||||||
with:
|
with:
|
||||||
@ -81,7 +81,7 @@ jobs:
|
|||||||
- linux/arm/v7
|
- linux/arm/v7
|
||||||
- linux/arm64
|
- linux/arm64
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4.1.1
|
- uses: actions/checkout@v4.1.5
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v5.1.0
|
uses: actions/setup-python@v5.1.0
|
||||||
with:
|
with:
|
||||||
@ -132,6 +132,19 @@ jobs:
|
|||||||
suffix: lint
|
suffix: lint
|
||||||
version: ${{ needs.init.outputs.tag }}
|
version: ${{ needs.init.outputs.tag }}
|
||||||
|
|
||||||
|
- name: Sanitize platform name
|
||||||
|
id: sanitize
|
||||||
|
run: |
|
||||||
|
echo "${{ matrix.platform }}" | sed 's|/|-|g' > /tmp/platform
|
||||||
|
echo name=$(cat /tmp/platform) >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
- name: Upload digests
|
||||||
|
uses: actions/upload-artifact@v4.3.3
|
||||||
|
with:
|
||||||
|
name: digests-${{ steps.sanitize.outputs.name }}
|
||||||
|
path: /tmp/digests
|
||||||
|
retention-days: 1
|
||||||
|
|
||||||
deploy-manifest:
|
deploy-manifest:
|
||||||
name: Publish ESPHome ${{ matrix.image.title }} to ${{ matrix.registry }}
|
name: Publish ESPHome ${{ matrix.image.title }} to ${{ matrix.registry }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
@ -159,12 +172,15 @@ jobs:
|
|||||||
- ghcr
|
- ghcr
|
||||||
- dockerhub
|
- dockerhub
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4.1.1
|
- uses: actions/checkout@v4.1.5
|
||||||
|
|
||||||
- name: Download digests
|
- name: Download digests
|
||||||
uses: actions/download-artifact@v3.0.2
|
uses: actions/download-artifact@v4.1.7
|
||||||
with:
|
with:
|
||||||
name: digests-${{ matrix.image.target }}-${{ matrix.registry }}
|
pattern: digests-*
|
||||||
path: /tmp/digests
|
path: /tmp/digests
|
||||||
|
merge-multiple: true
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3.3.0
|
uses: docker/setup-buildx-action@v3.3.0
|
||||||
|
|
||||||
@ -195,7 +211,7 @@ jobs:
|
|||||||
done
|
done
|
||||||
|
|
||||||
- name: Create manifest list and push
|
- name: Create manifest list and push
|
||||||
working-directory: /tmp/digests
|
working-directory: /tmp/digests/${{ matrix.image.target }}/${{ matrix.registry }}
|
||||||
run: |
|
run: |
|
||||||
docker buildx imagetools create $(jq -Rcnr 'inputs | . / "," | map("-t " + .) | join(" ")' <<< "${{ steps.tags.outputs.tags}}") \
|
docker buildx imagetools create $(jq -Rcnr 'inputs | . / "," | map("-t " + .) | join(" ")' <<< "${{ steps.tags.outputs.tags}}") \
|
||||||
$(printf '${{ steps.tags.outputs.image }}@sha256:%s ' *)
|
$(printf '${{ steps.tags.outputs.image }}@sha256:%s ' *)
|
||||||
|
4
.github/workflows/sync-device-classes.yml
vendored
4
.github/workflows/sync-device-classes.yml
vendored
@ -13,10 +13,10 @@ jobs:
|
|||||||
if: github.repository == 'esphome/esphome'
|
if: github.repository == 'esphome/esphome'
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4.1.1
|
uses: actions/checkout@v4.1.5
|
||||||
|
|
||||||
- name: Checkout Home Assistant
|
- name: Checkout Home Assistant
|
||||||
uses: actions/checkout@v4.1.1
|
uses: actions/checkout@v4.1.5
|
||||||
with:
|
with:
|
||||||
repository: home-assistant/core
|
repository: home-assistant/core
|
||||||
path: lib/home-assistant
|
path: lib/home-assistant
|
||||||
|
2
.github/workflows/yaml-lint.yml
vendored
2
.github/workflows/yaml-lint.yml
vendored
@ -18,7 +18,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code from GitHub
|
- name: Check out code from GitHub
|
||||||
uses: actions/checkout@v4.1.1
|
uses: actions/checkout@v4.1.5
|
||||||
- name: Run yamllint
|
- name: Run yamllint
|
||||||
uses: frenck/action-yamllint@v1.5.0
|
uses: frenck/action-yamllint@v1.5.0
|
||||||
with:
|
with:
|
||||||
|
@ -40,3 +40,10 @@ repos:
|
|||||||
hooks:
|
hooks:
|
||||||
- id: clang-format
|
- id: clang-format
|
||||||
types_or: [c, c++]
|
types_or: [c, c++]
|
||||||
|
- repo: local
|
||||||
|
hooks:
|
||||||
|
- id: pylint
|
||||||
|
name: pylint
|
||||||
|
entry: pylint
|
||||||
|
language: system
|
||||||
|
types: [python]
|
||||||
|
@ -135,6 +135,7 @@ esphome/components/fs3000/* @kahrendt
|
|||||||
esphome/components/ft5x06/* @clydebarrow
|
esphome/components/ft5x06/* @clydebarrow
|
||||||
esphome/components/ft63x6/* @gpambrozio
|
esphome/components/ft63x6/* @gpambrozio
|
||||||
esphome/components/gcja5/* @gcormier
|
esphome/components/gcja5/* @gcormier
|
||||||
|
esphome/components/gdk101/* @Szewcson
|
||||||
esphome/components/globals/* @esphome/core
|
esphome/components/globals/* @esphome/core
|
||||||
esphome/components/gp8403/* @jesserockz
|
esphome/components/gp8403/* @jesserockz
|
||||||
esphome/components/gpio/* @esphome/core
|
esphome/components/gpio/* @esphome/core
|
||||||
|
@ -65,7 +65,7 @@ def choose_prompt(options, purpose: str = None):
|
|||||||
f'Found multiple options{f" for {purpose}" if purpose else ""}, please choose one:'
|
f'Found multiple options{f" for {purpose}" if purpose else ""}, please choose one:'
|
||||||
)
|
)
|
||||||
for i, (desc, _) in enumerate(options):
|
for i, (desc, _) in enumerate(options):
|
||||||
safe_print(f" [{i+1}] {desc}")
|
safe_print(f" [{i + 1}] {desc}")
|
||||||
|
|
||||||
while True:
|
while True:
|
||||||
opt = input("(number): ")
|
opt = input("(number): ")
|
||||||
|
@ -18,11 +18,23 @@ from esphome.components.esp32.const import (
|
|||||||
|
|
||||||
CODEOWNERS = ["@esphome/core"]
|
CODEOWNERS = ["@esphome/core"]
|
||||||
|
|
||||||
|
adc_ns = cg.esphome_ns.namespace("adc")
|
||||||
|
|
||||||
|
|
||||||
|
"""
|
||||||
|
From the below patch versions (and 5.2+) ADC_ATTEN_DB_11 is deprecated and replaced with ADC_ATTEN_DB_12.
|
||||||
|
4.4.7
|
||||||
|
5.0.5
|
||||||
|
5.1.3
|
||||||
|
5.2+
|
||||||
|
"""
|
||||||
|
|
||||||
ATTENUATION_MODES = {
|
ATTENUATION_MODES = {
|
||||||
"0db": cg.global_ns.ADC_ATTEN_DB_0,
|
"0db": cg.global_ns.ADC_ATTEN_DB_0,
|
||||||
"2.5db": cg.global_ns.ADC_ATTEN_DB_2_5,
|
"2.5db": cg.global_ns.ADC_ATTEN_DB_2_5,
|
||||||
"6db": cg.global_ns.ADC_ATTEN_DB_6,
|
"6db": cg.global_ns.ADC_ATTEN_DB_6,
|
||||||
"11db": cg.global_ns.ADC_ATTEN_DB_11,
|
"11db": adc_ns.ADC_ATTEN_DB_12_COMPAT,
|
||||||
|
"12db": adc_ns.ADC_ATTEN_DB_12_COMPAT,
|
||||||
"auto": "auto",
|
"auto": "auto",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ extern "C"
|
|||||||
}
|
}
|
||||||
|
|
||||||
// load characteristics for each attenuation
|
// load characteristics for each attenuation
|
||||||
for (int32_t i = 0; i <= ADC_ATTEN_DB_11; i++) {
|
for (int32_t i = 0; i <= ADC_ATTEN_DB_12_COMPAT; i++) {
|
||||||
auto adc_unit = channel1_ != ADC1_CHANNEL_MAX ? ADC_UNIT_1 : ADC_UNIT_2;
|
auto adc_unit = channel1_ != ADC1_CHANNEL_MAX ? ADC_UNIT_1 : ADC_UNIT_2;
|
||||||
auto cal_value = esp_adc_cal_characterize(adc_unit, (adc_atten_t) i, ADC_WIDTH_MAX_SOC_BITS,
|
auto cal_value = esp_adc_cal_characterize(adc_unit, (adc_atten_t) i, ADC_WIDTH_MAX_SOC_BITS,
|
||||||
1100, // default vref
|
1100, // default vref
|
||||||
@ -118,8 +118,8 @@ void ADCSensor::dump_config() {
|
|||||||
case ADC_ATTEN_DB_6:
|
case ADC_ATTEN_DB_6:
|
||||||
ESP_LOGCONFIG(TAG, " Attenuation: 6db");
|
ESP_LOGCONFIG(TAG, " Attenuation: 6db");
|
||||||
break;
|
break;
|
||||||
case ADC_ATTEN_DB_11:
|
case ADC_ATTEN_DB_12_COMPAT:
|
||||||
ESP_LOGCONFIG(TAG, " Attenuation: 11db");
|
ESP_LOGCONFIG(TAG, " Attenuation: 12db");
|
||||||
break;
|
break;
|
||||||
default: // This is to satisfy the unused ADC_ATTEN_MAX
|
default: // This is to satisfy the unused ADC_ATTEN_MAX
|
||||||
break;
|
break;
|
||||||
@ -183,12 +183,12 @@ float ADCSensor::sample() {
|
|||||||
return mv / 1000.0f;
|
return mv / 1000.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
int raw11 = ADC_MAX, raw6 = ADC_MAX, raw2 = ADC_MAX, raw0 = ADC_MAX;
|
int raw12 = ADC_MAX, raw6 = ADC_MAX, raw2 = ADC_MAX, raw0 = ADC_MAX;
|
||||||
|
|
||||||
if (channel1_ != ADC1_CHANNEL_MAX) {
|
if (channel1_ != ADC1_CHANNEL_MAX) {
|
||||||
adc1_config_channel_atten(channel1_, ADC_ATTEN_DB_11);
|
adc1_config_channel_atten(channel1_, ADC_ATTEN_DB_12_COMPAT);
|
||||||
raw11 = adc1_get_raw(channel1_);
|
raw12 = adc1_get_raw(channel1_);
|
||||||
if (raw11 < ADC_MAX) {
|
if (raw12 < ADC_MAX) {
|
||||||
adc1_config_channel_atten(channel1_, ADC_ATTEN_DB_6);
|
adc1_config_channel_atten(channel1_, ADC_ATTEN_DB_6);
|
||||||
raw6 = adc1_get_raw(channel1_);
|
raw6 = adc1_get_raw(channel1_);
|
||||||
if (raw6 < ADC_MAX) {
|
if (raw6 < ADC_MAX) {
|
||||||
@ -201,9 +201,9 @@ float ADCSensor::sample() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (channel2_ != ADC2_CHANNEL_MAX) {
|
} else if (channel2_ != ADC2_CHANNEL_MAX) {
|
||||||
adc2_config_channel_atten(channel2_, ADC_ATTEN_DB_11);
|
adc2_config_channel_atten(channel2_, ADC_ATTEN_DB_12_COMPAT);
|
||||||
adc2_get_raw(channel2_, ADC_WIDTH_MAX_SOC_BITS, &raw11);
|
adc2_get_raw(channel2_, ADC_WIDTH_MAX_SOC_BITS, &raw12);
|
||||||
if (raw11 < ADC_MAX) {
|
if (raw12 < ADC_MAX) {
|
||||||
adc2_config_channel_atten(channel2_, ADC_ATTEN_DB_6);
|
adc2_config_channel_atten(channel2_, ADC_ATTEN_DB_6);
|
||||||
adc2_get_raw(channel2_, ADC_WIDTH_MAX_SOC_BITS, &raw6);
|
adc2_get_raw(channel2_, ADC_WIDTH_MAX_SOC_BITS, &raw6);
|
||||||
if (raw6 < ADC_MAX) {
|
if (raw6 < ADC_MAX) {
|
||||||
@ -217,25 +217,25 @@ float ADCSensor::sample() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (raw0 == -1 || raw2 == -1 || raw6 == -1 || raw11 == -1) {
|
if (raw0 == -1 || raw2 == -1 || raw6 == -1 || raw12 == -1) {
|
||||||
return NAN;
|
return NAN;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t mv11 = esp_adc_cal_raw_to_voltage(raw11, &cal_characteristics_[(int32_t) ADC_ATTEN_DB_11]);
|
uint32_t mv12 = esp_adc_cal_raw_to_voltage(raw12, &cal_characteristics_[(int32_t) ADC_ATTEN_DB_12_COMPAT]);
|
||||||
uint32_t mv6 = esp_adc_cal_raw_to_voltage(raw6, &cal_characteristics_[(int32_t) ADC_ATTEN_DB_6]);
|
uint32_t mv6 = esp_adc_cal_raw_to_voltage(raw6, &cal_characteristics_[(int32_t) ADC_ATTEN_DB_6]);
|
||||||
uint32_t mv2 = esp_adc_cal_raw_to_voltage(raw2, &cal_characteristics_[(int32_t) ADC_ATTEN_DB_2_5]);
|
uint32_t mv2 = esp_adc_cal_raw_to_voltage(raw2, &cal_characteristics_[(int32_t) ADC_ATTEN_DB_2_5]);
|
||||||
uint32_t mv0 = esp_adc_cal_raw_to_voltage(raw0, &cal_characteristics_[(int32_t) ADC_ATTEN_DB_0]);
|
uint32_t mv0 = esp_adc_cal_raw_to_voltage(raw0, &cal_characteristics_[(int32_t) ADC_ATTEN_DB_0]);
|
||||||
|
|
||||||
// Contribution of each value, in range 0-2048 (12 bit ADC) or 0-4096 (13 bit ADC)
|
// Contribution of each value, in range 0-2048 (12 bit ADC) or 0-4096 (13 bit ADC)
|
||||||
uint32_t c11 = std::min(raw11, ADC_HALF);
|
uint32_t c12 = std::min(raw12, ADC_HALF);
|
||||||
uint32_t c6 = ADC_HALF - std::abs(raw6 - ADC_HALF);
|
uint32_t c6 = ADC_HALF - std::abs(raw6 - ADC_HALF);
|
||||||
uint32_t c2 = ADC_HALF - std::abs(raw2 - ADC_HALF);
|
uint32_t c2 = ADC_HALF - std::abs(raw2 - ADC_HALF);
|
||||||
uint32_t c0 = std::min(ADC_MAX - raw0, ADC_HALF);
|
uint32_t c0 = std::min(ADC_MAX - raw0, ADC_HALF);
|
||||||
// max theoretical csum value is 4096*4 = 16384
|
// max theoretical csum value is 4096*4 = 16384
|
||||||
uint32_t csum = c11 + c6 + c2 + c0;
|
uint32_t csum = c12 + c6 + c2 + c0;
|
||||||
|
|
||||||
// each mv is max 3900; so max value is 3900*4096*4, fits in unsigned32
|
// each mv is max 3900; so max value is 3900*4096*4, fits in unsigned32
|
||||||
uint32_t mv_scaled = (mv11 * c11) + (mv6 * c6) + (mv2 * c2) + (mv0 * c0);
|
uint32_t mv_scaled = (mv12 * c12) + (mv6 * c6) + (mv2 * c2) + (mv0 * c0);
|
||||||
return mv_scaled / (float) (csum * 1000U);
|
return mv_scaled / (float) (csum * 1000U);
|
||||||
}
|
}
|
||||||
#endif // USE_ESP32
|
#endif // USE_ESP32
|
||||||
|
@ -1,19 +1,34 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "esphome/core/component.h"
|
|
||||||
#include "esphome/core/hal.h"
|
|
||||||
#include "esphome/core/defines.h"
|
|
||||||
#include "esphome/components/sensor/sensor.h"
|
#include "esphome/components/sensor/sensor.h"
|
||||||
#include "esphome/components/voltage_sampler/voltage_sampler.h"
|
#include "esphome/components/voltage_sampler/voltage_sampler.h"
|
||||||
|
#include "esphome/core/component.h"
|
||||||
|
#include "esphome/core/defines.h"
|
||||||
|
#include "esphome/core/hal.h"
|
||||||
|
|
||||||
#ifdef USE_ESP32
|
#ifdef USE_ESP32
|
||||||
#include "driver/adc.h"
|
|
||||||
#include <esp_adc_cal.h>
|
#include <esp_adc_cal.h>
|
||||||
|
#include "driver/adc.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace esphome {
|
namespace esphome {
|
||||||
namespace adc {
|
namespace adc {
|
||||||
|
|
||||||
|
#ifdef USE_ESP32
|
||||||
|
// clang-format off
|
||||||
|
#if (ESP_IDF_VERSION_MAJOR == 4 && ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 7)) || \
|
||||||
|
(ESP_IDF_VERSION_MAJOR == 5 && \
|
||||||
|
((ESP_IDF_VERSION_MINOR == 0 && ESP_IDF_VERSION_PATCH >= 5) || \
|
||||||
|
(ESP_IDF_VERSION_MINOR == 1 && ESP_IDF_VERSION_PATCH >= 3) || \
|
||||||
|
(ESP_IDF_VERSION_MINOR >= 2)) \
|
||||||
|
)
|
||||||
|
// clang-format on
|
||||||
|
static const adc_atten_t ADC_ATTEN_DB_12_COMPAT = ADC_ATTEN_DB_12;
|
||||||
|
#else
|
||||||
|
static const adc_atten_t ADC_ATTEN_DB_12_COMPAT = ADC_ATTEN_DB_11;
|
||||||
|
#endif
|
||||||
|
#endif // USE_ESP32
|
||||||
|
|
||||||
class ADCSensor : public sensor::Sensor, public PollingComponent, public voltage_sampler::VoltageSampler {
|
class ADCSensor : public sensor::Sensor, public PollingComponent, public voltage_sampler::VoltageSampler {
|
||||||
public:
|
public:
|
||||||
#ifdef USE_ESP32
|
#ifdef USE_ESP32
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
import logging
|
||||||
|
|
||||||
import esphome.codegen as cg
|
import esphome.codegen as cg
|
||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
import esphome.final_validate as fv
|
import esphome.final_validate as fv
|
||||||
@ -19,16 +21,29 @@ from . import (
|
|||||||
ATTENUATION_MODES,
|
ATTENUATION_MODES,
|
||||||
ESP32_VARIANT_ADC1_PIN_TO_CHANNEL,
|
ESP32_VARIANT_ADC1_PIN_TO_CHANNEL,
|
||||||
ESP32_VARIANT_ADC2_PIN_TO_CHANNEL,
|
ESP32_VARIANT_ADC2_PIN_TO_CHANNEL,
|
||||||
|
adc_ns,
|
||||||
validate_adc_pin,
|
validate_adc_pin,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
|
||||||
AUTO_LOAD = ["voltage_sampler"]
|
AUTO_LOAD = ["voltage_sampler"]
|
||||||
|
|
||||||
|
|
||||||
|
_attenuation = cv.enum(ATTENUATION_MODES, lower=True)
|
||||||
|
|
||||||
|
|
||||||
def validate_config(config):
|
def validate_config(config):
|
||||||
if config[CONF_RAW] and config.get(CONF_ATTENUATION, None) == "auto":
|
if config[CONF_RAW] and config.get(CONF_ATTENUATION, None) == "auto":
|
||||||
raise cv.Invalid("Automatic attenuation cannot be used when raw output is set")
|
raise cv.Invalid("Automatic attenuation cannot be used when raw output is set")
|
||||||
|
|
||||||
|
if config.get(CONF_ATTENUATION) == "11db":
|
||||||
|
_LOGGER.warning(
|
||||||
|
"`attenuation: 11db` is deprecated, use `attenuation: 12db` instead"
|
||||||
|
)
|
||||||
|
# Alter value here so `config` command prints the recommended change
|
||||||
|
config[CONF_ATTENUATION] = _attenuation("12db")
|
||||||
|
|
||||||
return config
|
return config
|
||||||
|
|
||||||
|
|
||||||
@ -47,7 +62,6 @@ def final_validate_config(config):
|
|||||||
return config
|
return config
|
||||||
|
|
||||||
|
|
||||||
adc_ns = cg.esphome_ns.namespace("adc")
|
|
||||||
ADCSensor = adc_ns.class_(
|
ADCSensor = adc_ns.class_(
|
||||||
"ADCSensor", sensor.Sensor, cg.PollingComponent, voltage_sampler.VoltageSampler
|
"ADCSensor", sensor.Sensor, cg.PollingComponent, voltage_sampler.VoltageSampler
|
||||||
)
|
)
|
||||||
@ -65,7 +79,7 @@ CONFIG_SCHEMA = cv.All(
|
|||||||
cv.Required(CONF_PIN): validate_adc_pin,
|
cv.Required(CONF_PIN): validate_adc_pin,
|
||||||
cv.Optional(CONF_RAW, default=False): cv.boolean,
|
cv.Optional(CONF_RAW, default=False): cv.boolean,
|
||||||
cv.SplitDefault(CONF_ATTENUATION, esp32="0db"): cv.All(
|
cv.SplitDefault(CONF_ATTENUATION, esp32="0db"): cv.All(
|
||||||
cv.only_on_esp32, cv.enum(ATTENUATION_MODES, lower=True)
|
cv.only_on_esp32, _attenuation
|
||||||
),
|
),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
@ -19,6 +19,7 @@ from esphome.const import (
|
|||||||
CONF_RESET_PIN,
|
CONF_RESET_PIN,
|
||||||
CONF_REVERSE_ACTIVE_ENERGY,
|
CONF_REVERSE_ACTIVE_ENERGY,
|
||||||
CONF_VOLTAGE,
|
CONF_VOLTAGE,
|
||||||
|
CONF_VOLTAGE_GAIN,
|
||||||
DEVICE_CLASS_APPARENT_POWER,
|
DEVICE_CLASS_APPARENT_POWER,
|
||||||
DEVICE_CLASS_CURRENT,
|
DEVICE_CLASS_CURRENT,
|
||||||
DEVICE_CLASS_ENERGY,
|
DEVICE_CLASS_ENERGY,
|
||||||
@ -47,7 +48,6 @@ CONF_CURRENT_GAIN = "current_gain"
|
|||||||
CONF_IRQ0_PIN = "irq0_pin"
|
CONF_IRQ0_PIN = "irq0_pin"
|
||||||
CONF_IRQ1_PIN = "irq1_pin"
|
CONF_IRQ1_PIN = "irq1_pin"
|
||||||
CONF_POWER_GAIN = "power_gain"
|
CONF_POWER_GAIN = "power_gain"
|
||||||
CONF_VOLTAGE_GAIN = "voltage_gain"
|
|
||||||
|
|
||||||
CONF_NEUTRAL = "neutral"
|
CONF_NEUTRAL = "neutral"
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@ from esphome.const import (
|
|||||||
CONF_IRQ_PIN,
|
CONF_IRQ_PIN,
|
||||||
CONF_VOLTAGE,
|
CONF_VOLTAGE,
|
||||||
CONF_FREQUENCY,
|
CONF_FREQUENCY,
|
||||||
|
CONF_VOLTAGE_GAIN,
|
||||||
DEVICE_CLASS_CURRENT,
|
DEVICE_CLASS_CURRENT,
|
||||||
DEVICE_CLASS_APPARENT_POWER,
|
DEVICE_CLASS_APPARENT_POWER,
|
||||||
DEVICE_CLASS_POWER,
|
DEVICE_CLASS_POWER,
|
||||||
@ -36,7 +37,6 @@ CONF_POWER_FACTOR_B = "power_factor_b"
|
|||||||
CONF_VOLTAGE_PGA_GAIN = "voltage_pga_gain"
|
CONF_VOLTAGE_PGA_GAIN = "voltage_pga_gain"
|
||||||
CONF_CURRENT_PGA_GAIN_A = "current_pga_gain_a"
|
CONF_CURRENT_PGA_GAIN_A = "current_pga_gain_a"
|
||||||
CONF_CURRENT_PGA_GAIN_B = "current_pga_gain_b"
|
CONF_CURRENT_PGA_GAIN_B = "current_pga_gain_b"
|
||||||
CONF_VOLTAGE_GAIN = "voltage_gain"
|
|
||||||
CONF_CURRENT_GAIN_A = "current_gain_a"
|
CONF_CURRENT_GAIN_A = "current_gain_a"
|
||||||
CONF_CURRENT_GAIN_B = "current_gain_b"
|
CONF_CURRENT_GAIN_B = "current_gain_b"
|
||||||
CONF_ACTIVE_POWER_GAIN_A = "active_power_gain_a"
|
CONF_ACTIVE_POWER_GAIN_A = "active_power_gain_a"
|
||||||
|
@ -157,7 +157,7 @@ async def to_code(config):
|
|||||||
pixels = list(frame.getdata())
|
pixels = list(frame.getdata())
|
||||||
if len(pixels) != height * width:
|
if len(pixels) != height * width:
|
||||||
raise core.EsphomeError(
|
raise core.EsphomeError(
|
||||||
f"Unexpected number of pixels in {path} frame {frameIndex}: ({len(pixels)} != {height*width})"
|
f"Unexpected number of pixels in {path} frame {frameIndex}: ({len(pixels)} != {height * width})"
|
||||||
)
|
)
|
||||||
for pix, a in pixels:
|
for pix, a in pixels:
|
||||||
if transparent:
|
if transparent:
|
||||||
@ -180,7 +180,7 @@ async def to_code(config):
|
|||||||
pixels = list(frame.getdata())
|
pixels = list(frame.getdata())
|
||||||
if len(pixels) != height * width:
|
if len(pixels) != height * width:
|
||||||
raise core.EsphomeError(
|
raise core.EsphomeError(
|
||||||
f"Unexpected number of pixels in {path} frame {frameIndex}: ({len(pixels)} != {height*width})"
|
f"Unexpected number of pixels in {path} frame {frameIndex}: ({len(pixels)} != {height * width})"
|
||||||
)
|
)
|
||||||
for pix in pixels:
|
for pix in pixels:
|
||||||
data[pos] = pix[0]
|
data[pos] = pix[0]
|
||||||
@ -203,7 +203,7 @@ async def to_code(config):
|
|||||||
pixels = list(frame.getdata())
|
pixels = list(frame.getdata())
|
||||||
if len(pixels) != height * width:
|
if len(pixels) != height * width:
|
||||||
raise core.EsphomeError(
|
raise core.EsphomeError(
|
||||||
f"Unexpected number of pixels in {path} frame {frameIndex}: ({len(pixels)} != {height*width})"
|
f"Unexpected number of pixels in {path} frame {frameIndex}: ({len(pixels)} != {height * width})"
|
||||||
)
|
)
|
||||||
for r, g, b, a in pixels:
|
for r, g, b, a in pixels:
|
||||||
if transparent:
|
if transparent:
|
||||||
@ -232,7 +232,7 @@ async def to_code(config):
|
|||||||
pixels = list(frame.getdata())
|
pixels = list(frame.getdata())
|
||||||
if len(pixels) != height * width:
|
if len(pixels) != height * width:
|
||||||
raise core.EsphomeError(
|
raise core.EsphomeError(
|
||||||
f"Unexpected number of pixels in {path} frame {frameIndex}: ({len(pixels)} != {height*width})"
|
f"Unexpected number of pixels in {path} frame {frameIndex}: ({len(pixels)} != {height * width})"
|
||||||
)
|
)
|
||||||
for r, g, b, a in pixels:
|
for r, g, b, a in pixels:
|
||||||
R = r >> 3
|
R = r >> 3
|
||||||
|
@ -1147,6 +1147,9 @@ message MediaPlayerCommandRequest {
|
|||||||
|
|
||||||
bool has_media_url = 6;
|
bool has_media_url = 6;
|
||||||
string media_url = 7;
|
string media_url = 7;
|
||||||
|
|
||||||
|
bool has_announcement = 8;
|
||||||
|
bool announcement = 9;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ==================== BLUETOOTH ====================
|
// ==================== BLUETOOTH ====================
|
||||||
|
@ -1002,7 +1002,11 @@ bool APIConnection::send_media_player_state(media_player::MediaPlayer *media_pla
|
|||||||
|
|
||||||
MediaPlayerStateResponse resp{};
|
MediaPlayerStateResponse resp{};
|
||||||
resp.key = media_player->get_object_id_hash();
|
resp.key = media_player->get_object_id_hash();
|
||||||
resp.state = static_cast<enums::MediaPlayerState>(media_player->state);
|
|
||||||
|
media_player::MediaPlayerState report_state = media_player->state == media_player::MEDIA_PLAYER_STATE_ANNOUNCING
|
||||||
|
? media_player::MEDIA_PLAYER_STATE_PLAYING
|
||||||
|
: media_player->state;
|
||||||
|
resp.state = static_cast<enums::MediaPlayerState>(report_state);
|
||||||
resp.volume = media_player->volume;
|
resp.volume = media_player->volume;
|
||||||
resp.muted = media_player->is_muted();
|
resp.muted = media_player->is_muted();
|
||||||
return this->send_media_player_state_response(resp);
|
return this->send_media_player_state_response(resp);
|
||||||
@ -1038,6 +1042,9 @@ void APIConnection::media_player_command(const MediaPlayerCommandRequest &msg) {
|
|||||||
if (msg.has_media_url) {
|
if (msg.has_media_url) {
|
||||||
call.set_media_url(msg.media_url);
|
call.set_media_url(msg.media_url);
|
||||||
}
|
}
|
||||||
|
if (msg.has_announcement) {
|
||||||
|
call.set_announcement(msg.announcement);
|
||||||
|
}
|
||||||
call.perform();
|
call.perform();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -5253,6 +5253,14 @@ bool MediaPlayerCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt val
|
|||||||
this->has_media_url = value.as_bool();
|
this->has_media_url = value.as_bool();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
case 8: {
|
||||||
|
this->has_announcement = value.as_bool();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
case 9: {
|
||||||
|
this->announcement = value.as_bool();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -5289,6 +5297,8 @@ void MediaPlayerCommandRequest::encode(ProtoWriteBuffer buffer) const {
|
|||||||
buffer.encode_float(5, this->volume);
|
buffer.encode_float(5, this->volume);
|
||||||
buffer.encode_bool(6, this->has_media_url);
|
buffer.encode_bool(6, this->has_media_url);
|
||||||
buffer.encode_string(7, this->media_url);
|
buffer.encode_string(7, this->media_url);
|
||||||
|
buffer.encode_bool(8, this->has_announcement);
|
||||||
|
buffer.encode_bool(9, this->announcement);
|
||||||
}
|
}
|
||||||
#ifdef HAS_PROTO_MESSAGE_DUMP
|
#ifdef HAS_PROTO_MESSAGE_DUMP
|
||||||
void MediaPlayerCommandRequest::dump_to(std::string &out) const {
|
void MediaPlayerCommandRequest::dump_to(std::string &out) const {
|
||||||
@ -5323,6 +5333,14 @@ void MediaPlayerCommandRequest::dump_to(std::string &out) const {
|
|||||||
out.append(" media_url: ");
|
out.append(" media_url: ");
|
||||||
out.append("'").append(this->media_url).append("'");
|
out.append("'").append(this->media_url).append("'");
|
||||||
out.append("\n");
|
out.append("\n");
|
||||||
|
|
||||||
|
out.append(" has_announcement: ");
|
||||||
|
out.append(YESNO(this->has_announcement));
|
||||||
|
out.append("\n");
|
||||||
|
|
||||||
|
out.append(" announcement: ");
|
||||||
|
out.append(YESNO(this->announcement));
|
||||||
|
out.append("\n");
|
||||||
out.append("}");
|
out.append("}");
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -1298,6 +1298,8 @@ class MediaPlayerCommandRequest : public ProtoMessage {
|
|||||||
float volume{0.0f};
|
float volume{0.0f};
|
||||||
bool has_media_url{false};
|
bool has_media_url{false};
|
||||||
std::string media_url{};
|
std::string media_url{};
|
||||||
|
bool has_announcement{false};
|
||||||
|
bool announcement{false};
|
||||||
void encode(ProtoWriteBuffer buffer) const override;
|
void encode(ProtoWriteBuffer buffer) const override;
|
||||||
#ifdef HAS_PROTO_MESSAGE_DUMP
|
#ifdef HAS_PROTO_MESSAGE_DUMP
|
||||||
void dump_to(std::string &out) const override;
|
void dump_to(std::string &out) const override;
|
||||||
|
@ -54,7 +54,6 @@ FAST_FILTER = {
|
|||||||
"LSB10": 7,
|
"LSB10": 7,
|
||||||
}
|
}
|
||||||
|
|
||||||
CONF_ANGLE = "angle"
|
|
||||||
CONF_RAW_ANGLE = "raw_angle"
|
CONF_RAW_ANGLE = "raw_angle"
|
||||||
CONF_RAW_POSITION = "raw_position"
|
CONF_RAW_POSITION = "raw_position"
|
||||||
CONF_WATCHDOG = "watchdog"
|
CONF_WATCHDOG = "watchdog"
|
||||||
|
@ -11,6 +11,7 @@ from esphome.const import (
|
|||||||
CONF_MAGNITUDE,
|
CONF_MAGNITUDE,
|
||||||
CONF_STATUS,
|
CONF_STATUS,
|
||||||
CONF_POSITION,
|
CONF_POSITION,
|
||||||
|
CONF_ANGLE,
|
||||||
)
|
)
|
||||||
from .. import as5600_ns, AS5600Component
|
from .. import as5600_ns, AS5600Component
|
||||||
|
|
||||||
@ -19,7 +20,6 @@ DEPENDENCIES = ["as5600"]
|
|||||||
|
|
||||||
AS5600Sensor = as5600_ns.class_("AS5600Sensor", sensor.Sensor, cg.PollingComponent)
|
AS5600Sensor = as5600_ns.class_("AS5600Sensor", sensor.Sensor, cg.PollingComponent)
|
||||||
|
|
||||||
CONF_ANGLE = "angle"
|
|
||||||
CONF_RAW_ANGLE = "raw_angle"
|
CONF_RAW_ANGLE = "raw_angle"
|
||||||
CONF_RAW_POSITION = "raw_position"
|
CONF_RAW_POSITION = "raw_position"
|
||||||
CONF_WATCHDOG = "watchdog"
|
CONF_WATCHDOG = "watchdog"
|
||||||
|
@ -22,7 +22,6 @@ CONF_AT581X_ID = "at581x_id"
|
|||||||
|
|
||||||
|
|
||||||
CONF_SENSING_DISTANCE = "sensing_distance"
|
CONF_SENSING_DISTANCE = "sensing_distance"
|
||||||
CONF_SENSITIVITY = "sensitivity"
|
|
||||||
CONF_POWERON_SELFCHECK_TIME = "poweron_selfcheck_time"
|
CONF_POWERON_SELFCHECK_TIME = "poweron_selfcheck_time"
|
||||||
CONF_PROTECT_TIME = "protect_time"
|
CONF_PROTECT_TIME = "protect_time"
|
||||||
CONF_TRIGGER_BASE = "trigger_base"
|
CONF_TRIGGER_BASE = "trigger_base"
|
||||||
|
@ -6,6 +6,7 @@ from esphome.const import (
|
|||||||
CONF_ENERGY,
|
CONF_ENERGY,
|
||||||
CONF_EXTERNAL_TEMPERATURE,
|
CONF_EXTERNAL_TEMPERATURE,
|
||||||
CONF_ID,
|
CONF_ID,
|
||||||
|
CONF_INTERNAL_TEMPERATURE,
|
||||||
CONF_POWER,
|
CONF_POWER,
|
||||||
CONF_VOLTAGE,
|
CONF_VOLTAGE,
|
||||||
DEVICE_CLASS_CURRENT,
|
DEVICE_CLASS_CURRENT,
|
||||||
@ -24,7 +25,6 @@ from esphome.const import (
|
|||||||
|
|
||||||
DEPENDENCIES = ["uart"]
|
DEPENDENCIES = ["uart"]
|
||||||
|
|
||||||
CONF_INTERNAL_TEMPERATURE = "internal_temperature"
|
|
||||||
|
|
||||||
bl0940_ns = cg.esphome_ns.namespace("bl0940")
|
bl0940_ns = cg.esphome_ns.namespace("bl0940")
|
||||||
BL0940 = bl0940_ns.class_("BL0940", cg.PollingComponent, uart.UARTDevice)
|
BL0940 = bl0940_ns.class_("BL0940", cg.PollingComponent, uart.UARTDevice)
|
||||||
|
@ -6,16 +6,6 @@
|
|||||||
|
|
||||||
#ifdef USE_ESP32
|
#ifdef USE_ESP32
|
||||||
|
|
||||||
#ifdef USE_ARDUINO
|
|
||||||
#include "mbedtls/aes.h"
|
|
||||||
#include "mbedtls/base64.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef USE_ESP_IDF
|
|
||||||
#define MBEDTLS_AES_ALT
|
|
||||||
#include <aes_alt.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace esphome {
|
namespace esphome {
|
||||||
namespace ble_presence {
|
namespace ble_presence {
|
||||||
|
|
||||||
@ -72,7 +62,7 @@ class BLEPresenceDevice : public binary_sensor::BinarySensorInitiallyOff,
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case MATCH_BY_IRK:
|
case MATCH_BY_IRK:
|
||||||
if (resolve_irk_(device.address_uint64(), this->irk_)) {
|
if (device.resolve_irk(this->irk_)) {
|
||||||
this->set_found_(true);
|
this->set_found_(true);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -142,43 +132,6 @@ class BLEPresenceDevice : public binary_sensor::BinarySensorInitiallyOff,
|
|||||||
bool check_ibeacon_minor_{false};
|
bool check_ibeacon_minor_{false};
|
||||||
bool check_minimum_rssi_{false};
|
bool check_minimum_rssi_{false};
|
||||||
|
|
||||||
bool resolve_irk_(uint64_t addr64, const uint8_t *irk) {
|
|
||||||
uint8_t ecb_key[16];
|
|
||||||
uint8_t ecb_plaintext[16];
|
|
||||||
uint8_t ecb_ciphertext[16];
|
|
||||||
|
|
||||||
memcpy(&ecb_key, irk, 16);
|
|
||||||
memset(&ecb_plaintext, 0, 16);
|
|
||||||
|
|
||||||
ecb_plaintext[13] = (addr64 >> 40) & 0xff;
|
|
||||||
ecb_plaintext[14] = (addr64 >> 32) & 0xff;
|
|
||||||
ecb_plaintext[15] = (addr64 >> 24) & 0xff;
|
|
||||||
|
|
||||||
mbedtls_aes_context ctx = {0, 0, {0}};
|
|
||||||
mbedtls_aes_init(&ctx);
|
|
||||||
|
|
||||||
if (mbedtls_aes_setkey_enc(&ctx, ecb_key, 128) != 0) {
|
|
||||||
mbedtls_aes_free(&ctx);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mbedtls_aes_crypt_ecb(&ctx,
|
|
||||||
#ifdef USE_ARDUINO
|
|
||||||
MBEDTLS_AES_ENCRYPT,
|
|
||||||
#elif defined(USE_ESP_IDF)
|
|
||||||
ESP_AES_ENCRYPT,
|
|
||||||
#endif
|
|
||||||
ecb_plaintext, ecb_ciphertext) != 0) {
|
|
||||||
mbedtls_aes_free(&ctx);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
mbedtls_aes_free(&ctx);
|
|
||||||
|
|
||||||
return ecb_ciphertext[15] == (addr64 & 0xff) && ecb_ciphertext[14] == ((addr64 >> 8) & 0xff) &&
|
|
||||||
ecb_ciphertext[13] == ((addr64 >> 16) & 0xff);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool found_{false};
|
bool found_{false};
|
||||||
uint32_t last_seen_{};
|
uint32_t last_seen_{};
|
||||||
uint32_t timeout_{};
|
uint32_t timeout_{};
|
||||||
|
@ -15,6 +15,10 @@ class BLERSSISensor : public sensor::Sensor, public esp32_ble_tracker::ESPBTDevi
|
|||||||
this->match_by_ = MATCH_BY_MAC_ADDRESS;
|
this->match_by_ = MATCH_BY_MAC_ADDRESS;
|
||||||
this->address_ = address;
|
this->address_ = address;
|
||||||
}
|
}
|
||||||
|
void set_irk(uint8_t *irk) {
|
||||||
|
this->match_by_ = MATCH_BY_IRK;
|
||||||
|
this->irk_ = irk;
|
||||||
|
}
|
||||||
void set_service_uuid16(uint16_t uuid) {
|
void set_service_uuid16(uint16_t uuid) {
|
||||||
this->match_by_ = MATCH_BY_SERVICE_UUID;
|
this->match_by_ = MATCH_BY_SERVICE_UUID;
|
||||||
this->uuid_ = esp32_ble_tracker::ESPBTUUID::from_uint16(uuid);
|
this->uuid_ = esp32_ble_tracker::ESPBTUUID::from_uint16(uuid);
|
||||||
@ -53,6 +57,13 @@ class BLERSSISensor : public sensor::Sensor, public esp32_ble_tracker::ESPBTDevi
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case MATCH_BY_IRK:
|
||||||
|
if (device.resolve_irk(this->irk_)) {
|
||||||
|
this->publish_state(device.get_rssi());
|
||||||
|
this->found_ = true;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
break;
|
||||||
case MATCH_BY_SERVICE_UUID:
|
case MATCH_BY_SERVICE_UUID:
|
||||||
for (auto uuid : device.get_service_uuids()) {
|
for (auto uuid : device.get_service_uuids()) {
|
||||||
if (this->uuid_ == uuid) {
|
if (this->uuid_ == uuid) {
|
||||||
@ -91,12 +102,13 @@ class BLERSSISensor : public sensor::Sensor, public esp32_ble_tracker::ESPBTDevi
|
|||||||
float get_setup_priority() const override { return setup_priority::DATA; }
|
float get_setup_priority() const override { return setup_priority::DATA; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
enum MatchType { MATCH_BY_MAC_ADDRESS, MATCH_BY_SERVICE_UUID, MATCH_BY_IBEACON_UUID };
|
enum MatchType { MATCH_BY_MAC_ADDRESS, MATCH_BY_IRK, MATCH_BY_SERVICE_UUID, MATCH_BY_IBEACON_UUID };
|
||||||
MatchType match_by_;
|
MatchType match_by_;
|
||||||
|
|
||||||
bool found_{false};
|
bool found_{false};
|
||||||
|
|
||||||
uint64_t address_;
|
uint64_t address_;
|
||||||
|
uint8_t *irk_;
|
||||||
|
|
||||||
esp32_ble_tracker::ESPBTUUID uuid_;
|
esp32_ble_tracker::ESPBTUUID uuid_;
|
||||||
|
|
||||||
|
@ -12,6 +12,8 @@ from esphome.const import (
|
|||||||
UNIT_DECIBEL_MILLIWATT,
|
UNIT_DECIBEL_MILLIWATT,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
CONF_IRK = "irk"
|
||||||
|
|
||||||
DEPENDENCIES = ["esp32_ble_tracker"]
|
DEPENDENCIES = ["esp32_ble_tracker"]
|
||||||
|
|
||||||
ble_rssi_ns = cg.esphome_ns.namespace("ble_rssi")
|
ble_rssi_ns = cg.esphome_ns.namespace("ble_rssi")
|
||||||
@ -39,6 +41,7 @@ CONFIG_SCHEMA = cv.All(
|
|||||||
.extend(
|
.extend(
|
||||||
{
|
{
|
||||||
cv.Optional(CONF_MAC_ADDRESS): cv.mac_address,
|
cv.Optional(CONF_MAC_ADDRESS): cv.mac_address,
|
||||||
|
cv.Optional(CONF_IRK): cv.uuid,
|
||||||
cv.Optional(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
|
cv.Optional(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
|
||||||
cv.Optional(CONF_IBEACON_MAJOR): cv.uint16_t,
|
cv.Optional(CONF_IBEACON_MAJOR): cv.uint16_t,
|
||||||
cv.Optional(CONF_IBEACON_MINOR): cv.uint16_t,
|
cv.Optional(CONF_IBEACON_MINOR): cv.uint16_t,
|
||||||
@ -47,7 +50,9 @@ CONFIG_SCHEMA = cv.All(
|
|||||||
)
|
)
|
||||||
.extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
|
.extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
|
||||||
.extend(cv.COMPONENT_SCHEMA),
|
.extend(cv.COMPONENT_SCHEMA),
|
||||||
cv.has_exactly_one_key(CONF_MAC_ADDRESS, CONF_SERVICE_UUID, CONF_IBEACON_UUID),
|
cv.has_exactly_one_key(
|
||||||
|
CONF_MAC_ADDRESS, CONF_IRK, CONF_SERVICE_UUID, CONF_IBEACON_UUID
|
||||||
|
),
|
||||||
_validate,
|
_validate,
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -60,6 +65,10 @@ async def to_code(config):
|
|||||||
if mac_address := config.get(CONF_MAC_ADDRESS):
|
if mac_address := config.get(CONF_MAC_ADDRESS):
|
||||||
cg.add(var.set_address(mac_address.as_hex))
|
cg.add(var.set_address(mac_address.as_hex))
|
||||||
|
|
||||||
|
if irk := config.get(CONF_IRK):
|
||||||
|
irk = esp32_ble_tracker.as_hex_array(str(irk))
|
||||||
|
cg.add(var.set_irk(irk))
|
||||||
|
|
||||||
if service_uuid := config.get(CONF_SERVICE_UUID):
|
if service_uuid := config.get(CONF_SERVICE_UUID):
|
||||||
if len(service_uuid) == len(esp32_ble_tracker.bt_uuid16_format):
|
if len(service_uuid) == len(esp32_ble_tracker.bt_uuid16_format):
|
||||||
cg.add(var.set_service_uuid16(esp32_ble_tracker.as_hex(service_uuid)))
|
cg.add(var.set_service_uuid16(esp32_ble_tracker.as_hex(service_uuid)))
|
||||||
|
@ -1 +1,108 @@
|
|||||||
|
import esphome.codegen as cg
|
||||||
|
import esphome.config_validation as cv
|
||||||
|
from esphome.components import sensor
|
||||||
|
from esphome.const import (
|
||||||
|
CONF_HUMIDITY,
|
||||||
|
CONF_ID,
|
||||||
|
CONF_IIR_FILTER,
|
||||||
|
CONF_OVERSAMPLING,
|
||||||
|
CONF_PRESSURE,
|
||||||
|
CONF_TEMPERATURE,
|
||||||
|
DEVICE_CLASS_HUMIDITY,
|
||||||
|
DEVICE_CLASS_PRESSURE,
|
||||||
|
DEVICE_CLASS_TEMPERATURE,
|
||||||
|
STATE_CLASS_MEASUREMENT,
|
||||||
|
UNIT_CELSIUS,
|
||||||
|
UNIT_HECTOPASCAL,
|
||||||
|
UNIT_PERCENT,
|
||||||
|
)
|
||||||
|
|
||||||
CODEOWNERS = ["@esphome/core"]
|
CODEOWNERS = ["@esphome/core"]
|
||||||
|
|
||||||
|
bme280_ns = cg.esphome_ns.namespace("bme280_base")
|
||||||
|
BME280Oversampling = bme280_ns.enum("BME280Oversampling")
|
||||||
|
OVERSAMPLING_OPTIONS = {
|
||||||
|
"NONE": BME280Oversampling.BME280_OVERSAMPLING_NONE,
|
||||||
|
"1X": BME280Oversampling.BME280_OVERSAMPLING_1X,
|
||||||
|
"2X": BME280Oversampling.BME280_OVERSAMPLING_2X,
|
||||||
|
"4X": BME280Oversampling.BME280_OVERSAMPLING_4X,
|
||||||
|
"8X": BME280Oversampling.BME280_OVERSAMPLING_8X,
|
||||||
|
"16X": BME280Oversampling.BME280_OVERSAMPLING_16X,
|
||||||
|
}
|
||||||
|
|
||||||
|
BME280IIRFilter = bme280_ns.enum("BME280IIRFilter")
|
||||||
|
IIR_FILTER_OPTIONS = {
|
||||||
|
"OFF": BME280IIRFilter.BME280_IIR_FILTER_OFF,
|
||||||
|
"2X": BME280IIRFilter.BME280_IIR_FILTER_2X,
|
||||||
|
"4X": BME280IIRFilter.BME280_IIR_FILTER_4X,
|
||||||
|
"8X": BME280IIRFilter.BME280_IIR_FILTER_8X,
|
||||||
|
"16X": BME280IIRFilter.BME280_IIR_FILTER_16X,
|
||||||
|
}
|
||||||
|
|
||||||
|
CONFIG_SCHEMA_BASE = cv.Schema(
|
||||||
|
{
|
||||||
|
cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
|
||||||
|
unit_of_measurement=UNIT_CELSIUS,
|
||||||
|
accuracy_decimals=1,
|
||||||
|
device_class=DEVICE_CLASS_TEMPERATURE,
|
||||||
|
state_class=STATE_CLASS_MEASUREMENT,
|
||||||
|
).extend(
|
||||||
|
{
|
||||||
|
cv.Optional(CONF_OVERSAMPLING, default="16X"): cv.enum(
|
||||||
|
OVERSAMPLING_OPTIONS, upper=True
|
||||||
|
),
|
||||||
|
}
|
||||||
|
),
|
||||||
|
cv.Optional(CONF_PRESSURE): sensor.sensor_schema(
|
||||||
|
unit_of_measurement=UNIT_HECTOPASCAL,
|
||||||
|
accuracy_decimals=1,
|
||||||
|
device_class=DEVICE_CLASS_PRESSURE,
|
||||||
|
state_class=STATE_CLASS_MEASUREMENT,
|
||||||
|
).extend(
|
||||||
|
{
|
||||||
|
cv.Optional(CONF_OVERSAMPLING, default="16X"): cv.enum(
|
||||||
|
OVERSAMPLING_OPTIONS, upper=True
|
||||||
|
),
|
||||||
|
}
|
||||||
|
),
|
||||||
|
cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(
|
||||||
|
unit_of_measurement=UNIT_PERCENT,
|
||||||
|
accuracy_decimals=1,
|
||||||
|
device_class=DEVICE_CLASS_HUMIDITY,
|
||||||
|
state_class=STATE_CLASS_MEASUREMENT,
|
||||||
|
).extend(
|
||||||
|
{
|
||||||
|
cv.Optional(CONF_OVERSAMPLING, default="16X"): cv.enum(
|
||||||
|
OVERSAMPLING_OPTIONS, upper=True
|
||||||
|
),
|
||||||
|
}
|
||||||
|
),
|
||||||
|
cv.Optional(CONF_IIR_FILTER, default="OFF"): cv.enum(
|
||||||
|
IIR_FILTER_OPTIONS, upper=True
|
||||||
|
),
|
||||||
|
}
|
||||||
|
).extend(cv.polling_component_schema("60s"))
|
||||||
|
|
||||||
|
|
||||||
|
async def to_code_base(config):
|
||||||
|
var = cg.new_Pvariable(config[CONF_ID])
|
||||||
|
await cg.register_component(var, config)
|
||||||
|
|
||||||
|
if temperature_config := config.get(CONF_TEMPERATURE):
|
||||||
|
sens = await sensor.new_sensor(temperature_config)
|
||||||
|
cg.add(var.set_temperature_sensor(sens))
|
||||||
|
cg.add(var.set_temperature_oversampling(temperature_config[CONF_OVERSAMPLING]))
|
||||||
|
|
||||||
|
if pressure_config := config.get(CONF_PRESSURE):
|
||||||
|
sens = await sensor.new_sensor(pressure_config)
|
||||||
|
cg.add(var.set_pressure_sensor(sens))
|
||||||
|
cg.add(var.set_pressure_oversampling(pressure_config[CONF_OVERSAMPLING]))
|
||||||
|
|
||||||
|
if humidity_config := config.get(CONF_HUMIDITY):
|
||||||
|
sens = await sensor.new_sensor(humidity_config)
|
||||||
|
cg.add(var.set_humidity_sensor(sens))
|
||||||
|
cg.add(var.set_humidity_oversampling(humidity_config[CONF_OVERSAMPLING]))
|
||||||
|
|
||||||
|
cg.add(var.set_iir_filter(config[CONF_IIR_FILTER]))
|
||||||
|
|
||||||
|
return var
|
||||||
|
@ -1,106 +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_ID,
|
|
||||||
CONF_IIR_FILTER,
|
|
||||||
CONF_OVERSAMPLING,
|
|
||||||
CONF_PRESSURE,
|
|
||||||
CONF_TEMPERATURE,
|
|
||||||
DEVICE_CLASS_HUMIDITY,
|
|
||||||
DEVICE_CLASS_PRESSURE,
|
|
||||||
DEVICE_CLASS_TEMPERATURE,
|
|
||||||
STATE_CLASS_MEASUREMENT,
|
|
||||||
UNIT_CELSIUS,
|
|
||||||
UNIT_HECTOPASCAL,
|
|
||||||
UNIT_PERCENT,
|
|
||||||
)
|
|
||||||
|
|
||||||
bme280_ns = cg.esphome_ns.namespace("bme280_base")
|
|
||||||
BME280Oversampling = bme280_ns.enum("BME280Oversampling")
|
|
||||||
OVERSAMPLING_OPTIONS = {
|
|
||||||
"NONE": BME280Oversampling.BME280_OVERSAMPLING_NONE,
|
|
||||||
"1X": BME280Oversampling.BME280_OVERSAMPLING_1X,
|
|
||||||
"2X": BME280Oversampling.BME280_OVERSAMPLING_2X,
|
|
||||||
"4X": BME280Oversampling.BME280_OVERSAMPLING_4X,
|
|
||||||
"8X": BME280Oversampling.BME280_OVERSAMPLING_8X,
|
|
||||||
"16X": BME280Oversampling.BME280_OVERSAMPLING_16X,
|
|
||||||
}
|
|
||||||
|
|
||||||
BME280IIRFilter = bme280_ns.enum("BME280IIRFilter")
|
|
||||||
IIR_FILTER_OPTIONS = {
|
|
||||||
"OFF": BME280IIRFilter.BME280_IIR_FILTER_OFF,
|
|
||||||
"2X": BME280IIRFilter.BME280_IIR_FILTER_2X,
|
|
||||||
"4X": BME280IIRFilter.BME280_IIR_FILTER_4X,
|
|
||||||
"8X": BME280IIRFilter.BME280_IIR_FILTER_8X,
|
|
||||||
"16X": BME280IIRFilter.BME280_IIR_FILTER_16X,
|
|
||||||
}
|
|
||||||
|
|
||||||
CONFIG_SCHEMA_BASE = cv.Schema(
|
|
||||||
{
|
|
||||||
cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
|
|
||||||
unit_of_measurement=UNIT_CELSIUS,
|
|
||||||
accuracy_decimals=1,
|
|
||||||
device_class=DEVICE_CLASS_TEMPERATURE,
|
|
||||||
state_class=STATE_CLASS_MEASUREMENT,
|
|
||||||
).extend(
|
|
||||||
{
|
|
||||||
cv.Optional(CONF_OVERSAMPLING, default="16X"): cv.enum(
|
|
||||||
OVERSAMPLING_OPTIONS, upper=True
|
|
||||||
),
|
|
||||||
}
|
|
||||||
),
|
|
||||||
cv.Optional(CONF_PRESSURE): sensor.sensor_schema(
|
|
||||||
unit_of_measurement=UNIT_HECTOPASCAL,
|
|
||||||
accuracy_decimals=1,
|
|
||||||
device_class=DEVICE_CLASS_PRESSURE,
|
|
||||||
state_class=STATE_CLASS_MEASUREMENT,
|
|
||||||
).extend(
|
|
||||||
{
|
|
||||||
cv.Optional(CONF_OVERSAMPLING, default="16X"): cv.enum(
|
|
||||||
OVERSAMPLING_OPTIONS, upper=True
|
|
||||||
),
|
|
||||||
}
|
|
||||||
),
|
|
||||||
cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(
|
|
||||||
unit_of_measurement=UNIT_PERCENT,
|
|
||||||
accuracy_decimals=1,
|
|
||||||
device_class=DEVICE_CLASS_HUMIDITY,
|
|
||||||
state_class=STATE_CLASS_MEASUREMENT,
|
|
||||||
).extend(
|
|
||||||
{
|
|
||||||
cv.Optional(CONF_OVERSAMPLING, default="16X"): cv.enum(
|
|
||||||
OVERSAMPLING_OPTIONS, upper=True
|
|
||||||
),
|
|
||||||
}
|
|
||||||
),
|
|
||||||
cv.Optional(CONF_IIR_FILTER, default="OFF"): cv.enum(
|
|
||||||
IIR_FILTER_OPTIONS, upper=True
|
|
||||||
),
|
|
||||||
}
|
|
||||||
).extend(cv.polling_component_schema("60s"))
|
|
||||||
|
|
||||||
|
|
||||||
async def to_code(config, func=None):
|
|
||||||
var = cg.new_Pvariable(config[CONF_ID])
|
|
||||||
await cg.register_component(var, config)
|
|
||||||
if func is not None:
|
|
||||||
await func(var, config)
|
|
||||||
|
|
||||||
if temperature_config := config.get(CONF_TEMPERATURE):
|
|
||||||
sens = await sensor.new_sensor(temperature_config)
|
|
||||||
cg.add(var.set_temperature_sensor(sens))
|
|
||||||
cg.add(var.set_temperature_oversampling(temperature_config[CONF_OVERSAMPLING]))
|
|
||||||
|
|
||||||
if pressure_config := config.get(CONF_PRESSURE):
|
|
||||||
sens = await sensor.new_sensor(pressure_config)
|
|
||||||
cg.add(var.set_pressure_sensor(sens))
|
|
||||||
cg.add(var.set_pressure_oversampling(pressure_config[CONF_OVERSAMPLING]))
|
|
||||||
|
|
||||||
if humidity_config := config.get(CONF_HUMIDITY):
|
|
||||||
sens = await sensor.new_sensor(humidity_config)
|
|
||||||
cg.add(var.set_humidity_sensor(sens))
|
|
||||||
cg.add(var.set_humidity_oversampling(humidity_config[CONF_OVERSAMPLING]))
|
|
||||||
|
|
||||||
cg.add(var.set_iir_filter(config[CONF_IIR_FILTER]))
|
|
@ -1,9 +1,10 @@
|
|||||||
import esphome.codegen as cg
|
import esphome.codegen as cg
|
||||||
|
import esphome.config_validation as cv
|
||||||
from esphome.components import i2c
|
from esphome.components import i2c
|
||||||
from ..bme280_base.sensor import to_code as to_code_base, cv, CONFIG_SCHEMA_BASE
|
from ..bme280_base import to_code_base, CONFIG_SCHEMA_BASE
|
||||||
|
|
||||||
DEPENDENCIES = ["i2c"]
|
|
||||||
AUTO_LOAD = ["bme280_base"]
|
AUTO_LOAD = ["bme280_base"]
|
||||||
|
DEPENDENCIES = ["i2c"]
|
||||||
|
|
||||||
bme280_ns = cg.esphome_ns.namespace("bme280_i2c")
|
bme280_ns = cg.esphome_ns.namespace("bme280_i2c")
|
||||||
BME280I2CComponent = bme280_ns.class_(
|
BME280I2CComponent = bme280_ns.class_(
|
||||||
@ -16,4 +17,5 @@ CONFIG_SCHEMA = CONFIG_SCHEMA_BASE.extend(
|
|||||||
|
|
||||||
|
|
||||||
async def to_code(config):
|
async def to_code(config):
|
||||||
await to_code_base(config, func=i2c.register_i2c_device)
|
var = await to_code_base(config)
|
||||||
|
await i2c.register_i2c_device(var, config)
|
||||||
|
@ -1 +0,0 @@
|
|||||||
CODEOWNERS = ["@apbodrov"]
|
|
@ -4,19 +4,19 @@
|
|||||||
#include "bme280_spi.h"
|
#include "bme280_spi.h"
|
||||||
#include <esphome/components/bme280_base/bme280_base.h>
|
#include <esphome/components/bme280_base/bme280_base.h>
|
||||||
|
|
||||||
int set_bit(uint8_t num, int position) {
|
namespace esphome {
|
||||||
|
namespace bme280_spi {
|
||||||
|
|
||||||
|
uint8_t set_bit(uint8_t num, int position) {
|
||||||
int mask = 1 << position;
|
int mask = 1 << position;
|
||||||
return num | mask;
|
return num | mask;
|
||||||
}
|
}
|
||||||
|
|
||||||
int clear_bit(uint8_t num, int position) {
|
uint8_t clear_bit(uint8_t num, int position) {
|
||||||
int mask = 1 << position;
|
int mask = 1 << position;
|
||||||
return num & ~mask;
|
return num & ~mask;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace esphome {
|
|
||||||
namespace bme280_spi {
|
|
||||||
|
|
||||||
void BME280SPIComponent::setup() {
|
void BME280SPIComponent::setup() {
|
||||||
this->spi_setup();
|
this->spi_setup();
|
||||||
BME280Component::setup();
|
BME280Component::setup();
|
||||||
@ -30,34 +30,33 @@ void BME280SPIComponent::setup() {
|
|||||||
|
|
||||||
bool BME280SPIComponent::read_byte(uint8_t a_register, uint8_t *data) {
|
bool BME280SPIComponent::read_byte(uint8_t a_register, uint8_t *data) {
|
||||||
this->enable();
|
this->enable();
|
||||||
// cause: *data = this->delegate_->transfer(tmp) doesnt work
|
this->transfer_byte(set_bit(a_register, 7));
|
||||||
this->delegate_->transfer(set_bit(a_register, 7));
|
*data = this->transfer_byte(0);
|
||||||
*data = this->delegate_->transfer(0);
|
|
||||||
this->disable();
|
this->disable();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool BME280SPIComponent::write_byte(uint8_t a_register, uint8_t data) {
|
bool BME280SPIComponent::write_byte(uint8_t a_register, uint8_t data) {
|
||||||
this->enable();
|
this->enable();
|
||||||
this->delegate_->transfer(clear_bit(a_register, 7));
|
this->transfer_byte(clear_bit(a_register, 7));
|
||||||
this->delegate_->transfer(data);
|
this->transfer_byte(data);
|
||||||
this->disable();
|
this->disable();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool BME280SPIComponent::read_bytes(uint8_t a_register, uint8_t *data, size_t len) {
|
bool BME280SPIComponent::read_bytes(uint8_t a_register, uint8_t *data, size_t len) {
|
||||||
this->enable();
|
this->enable();
|
||||||
this->delegate_->transfer(set_bit(a_register, 7));
|
this->transfer_byte(set_bit(a_register, 7));
|
||||||
this->delegate_->read_array(data, len);
|
this->read_array(data, len);
|
||||||
this->disable();
|
this->disable();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool BME280SPIComponent::read_byte_16(uint8_t a_register, uint16_t *data) {
|
bool BME280SPIComponent::read_byte_16(uint8_t a_register, uint16_t *data) {
|
||||||
this->enable();
|
this->enable();
|
||||||
this->delegate_->transfer(set_bit(a_register, 7));
|
this->transfer_byte(set_bit(a_register, 7));
|
||||||
((uint8_t *) data)[1] = this->delegate_->transfer(0);
|
((uint8_t *) data)[1] = this->transfer_byte(0);
|
||||||
((uint8_t *) data)[0] = this->delegate_->transfer(0);
|
((uint8_t *) data)[0] = this->transfer_byte(0);
|
||||||
this->disable();
|
this->disable();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -1,13 +1,11 @@
|
|||||||
import esphome.codegen as cg
|
import esphome.codegen as cg
|
||||||
|
import esphome.config_validation as cv
|
||||||
from esphome.components import spi
|
from esphome.components import spi
|
||||||
from esphome.components.bme280_base.sensor import (
|
from ..bme280_base import to_code_base, CONFIG_SCHEMA_BASE
|
||||||
to_code as to_code_base,
|
|
||||||
cv,
|
|
||||||
CONFIG_SCHEMA_BASE,
|
|
||||||
)
|
|
||||||
|
|
||||||
DEPENDENCIES = ["spi"]
|
|
||||||
AUTO_LOAD = ["bme280_base"]
|
AUTO_LOAD = ["bme280_base"]
|
||||||
|
CODEOWNERS = ["@apbodrov"]
|
||||||
|
DEPENDENCIES = ["spi"]
|
||||||
|
|
||||||
|
|
||||||
bme280_spi_ns = cg.esphome_ns.namespace("bme280_spi")
|
bme280_spi_ns = cg.esphome_ns.namespace("bme280_spi")
|
||||||
@ -21,4 +19,5 @@ CONFIG_SCHEMA = CONFIG_SCHEMA_BASE.extend(spi.spi_device_schema()).extend(
|
|||||||
|
|
||||||
|
|
||||||
async def to_code(config):
|
async def to_code(config):
|
||||||
await to_code_base(config, func=spi.register_spi_device)
|
var = await to_code_base(config)
|
||||||
|
await spi.register_spi_device(var, config)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import esphome.codegen as cg
|
import esphome.codegen as cg
|
||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
from esphome.components import i2c, esp32
|
from esphome.components import i2c, esp32
|
||||||
from esphome.const import CONF_ID
|
from esphome.const import CONF_ID, CONF_TEMPERATURE_OFFSET
|
||||||
|
|
||||||
CODEOWNERS = ["@trvrnrth"]
|
CODEOWNERS = ["@trvrnrth"]
|
||||||
DEPENDENCIES = ["i2c"]
|
DEPENDENCIES = ["i2c"]
|
||||||
@ -9,7 +9,6 @@ AUTO_LOAD = ["sensor", "text_sensor"]
|
|||||||
MULTI_CONF = True
|
MULTI_CONF = True
|
||||||
|
|
||||||
CONF_BME680_BSEC_ID = "bme680_bsec_id"
|
CONF_BME680_BSEC_ID = "bme680_bsec_id"
|
||||||
CONF_TEMPERATURE_OFFSET = "temperature_offset"
|
|
||||||
CONF_IAQ_MODE = "iaq_mode"
|
CONF_IAQ_MODE = "iaq_mode"
|
||||||
CONF_SUPPLY_VOLTAGE = "supply_voltage"
|
CONF_SUPPLY_VOLTAGE = "supply_voltage"
|
||||||
CONF_SAMPLE_RATE = "sample_rate"
|
CONF_SAMPLE_RATE = "sample_rate"
|
||||||
|
@ -14,15 +14,41 @@ CONF_HEX = "hex"
|
|||||||
|
|
||||||
|
|
||||||
def hex_color(value):
|
def hex_color(value):
|
||||||
|
if isinstance(value, int):
|
||||||
|
value = str(value)
|
||||||
|
if not isinstance(value, str):
|
||||||
|
raise cv.Invalid("Invalid value for hex color")
|
||||||
if len(value) != 6:
|
if len(value) != 6:
|
||||||
raise cv.Invalid("Color must have six digits")
|
raise cv.Invalid("Hex color must have six digits")
|
||||||
try:
|
try:
|
||||||
return (int(value[0:2], 16), int(value[2:4], 16), int(value[4:6], 16))
|
return int(value[0:2], 16), int(value[2:4], 16), int(value[4:6], 16)
|
||||||
except ValueError as exc:
|
except ValueError as exc:
|
||||||
raise cv.Invalid("Color must be hexadecimal") from exc
|
raise cv.Invalid("Color must be hexadecimal") from exc
|
||||||
|
|
||||||
|
|
||||||
CONFIG_SCHEMA = cv.Any(
|
components = {
|
||||||
|
CONF_RED,
|
||||||
|
CONF_RED_INT,
|
||||||
|
CONF_GREEN,
|
||||||
|
CONF_GREEN_INT,
|
||||||
|
CONF_BLUE,
|
||||||
|
CONF_BLUE_INT,
|
||||||
|
CONF_WHITE,
|
||||||
|
CONF_WHITE_INT,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def validate_color(config):
|
||||||
|
has_components = set(config) & components
|
||||||
|
has_hex = CONF_HEX in config
|
||||||
|
if has_hex and has_components:
|
||||||
|
raise cv.Invalid("Hex color value may not be combined with component values")
|
||||||
|
if not has_hex and not has_components:
|
||||||
|
raise cv.Invalid("Must provide at least one color option")
|
||||||
|
return config
|
||||||
|
|
||||||
|
|
||||||
|
CONFIG_SCHEMA = cv.All(
|
||||||
cv.Schema(
|
cv.Schema(
|
||||||
{
|
{
|
||||||
cv.Required(CONF_ID): cv.declare_id(ColorStruct),
|
cv.Required(CONF_ID): cv.declare_id(ColorStruct),
|
||||||
@ -34,14 +60,10 @@ CONFIG_SCHEMA = cv.Any(
|
|||||||
cv.Exclusive(CONF_BLUE_INT, "blue"): cv.uint8_t,
|
cv.Exclusive(CONF_BLUE_INT, "blue"): cv.uint8_t,
|
||||||
cv.Exclusive(CONF_WHITE, "white"): cv.percentage,
|
cv.Exclusive(CONF_WHITE, "white"): cv.percentage,
|
||||||
cv.Exclusive(CONF_WHITE_INT, "white"): cv.uint8_t,
|
cv.Exclusive(CONF_WHITE_INT, "white"): cv.uint8_t,
|
||||||
|
cv.Optional(CONF_HEX): hex_color,
|
||||||
}
|
}
|
||||||
).extend(cv.COMPONENT_SCHEMA),
|
).extend(cv.COMPONENT_SCHEMA),
|
||||||
cv.Schema(
|
validate_color,
|
||||||
{
|
|
||||||
cv.Required(CONF_ID): cv.declare_id(ColorStruct),
|
|
||||||
cv.Required(CONF_HEX): hex_color,
|
|
||||||
}
|
|
||||||
).extend(cv.COMPONENT_SCHEMA),
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@ from esphome.const import (
|
|||||||
CONF_ID,
|
CONF_ID,
|
||||||
CONF_POWER,
|
CONF_POWER,
|
||||||
CONF_VOLTAGE,
|
CONF_VOLTAGE,
|
||||||
|
CONF_VOLTAGE_GAIN,
|
||||||
UNIT_VOLT,
|
UNIT_VOLT,
|
||||||
UNIT_AMPERE,
|
UNIT_AMPERE,
|
||||||
UNIT_WATT,
|
UNIT_WATT,
|
||||||
@ -33,7 +34,6 @@ CONF_SAMPLES = "samples"
|
|||||||
CONF_PHASE_OFFSET = "phase_offset"
|
CONF_PHASE_OFFSET = "phase_offset"
|
||||||
CONF_PGA_GAIN = "pga_gain"
|
CONF_PGA_GAIN = "pga_gain"
|
||||||
CONF_CURRENT_GAIN = "current_gain"
|
CONF_CURRENT_GAIN = "current_gain"
|
||||||
CONF_VOLTAGE_GAIN = "voltage_gain"
|
|
||||||
CONF_CURRENT_HPF = "current_hpf"
|
CONF_CURRENT_HPF = "current_hpf"
|
||||||
CONF_VOLTAGE_HPF = "voltage_hpf"
|
CONF_VOLTAGE_HPF = "voltage_hpf"
|
||||||
CONF_PULSE_ENERGY = "pulse_energy"
|
CONF_PULSE_ENERGY = "pulse_energy"
|
||||||
|
@ -15,6 +15,7 @@ void CST816Touchscreen::continue_setup_() {
|
|||||||
}
|
}
|
||||||
switch (this->chip_id_) {
|
switch (this->chip_id_) {
|
||||||
case CST820_CHIP_ID:
|
case CST820_CHIP_ID:
|
||||||
|
case CST826_CHIP_ID:
|
||||||
case CST716_CHIP_ID:
|
case CST716_CHIP_ID:
|
||||||
case CST816S_CHIP_ID:
|
case CST816S_CHIP_ID:
|
||||||
case CST816D_CHIP_ID:
|
case CST816D_CHIP_ID:
|
||||||
@ -90,6 +91,9 @@ void CST816Touchscreen::dump_config() {
|
|||||||
case CST820_CHIP_ID:
|
case CST820_CHIP_ID:
|
||||||
name = "CST820";
|
name = "CST820";
|
||||||
break;
|
break;
|
||||||
|
case CST826_CHIP_ID:
|
||||||
|
name = "CST826";
|
||||||
|
break;
|
||||||
case CST816S_CHIP_ID:
|
case CST816S_CHIP_ID:
|
||||||
name = "CST816S";
|
name = "CST816S";
|
||||||
break;
|
break;
|
||||||
|
@ -24,6 +24,7 @@ static const uint8_t REG_SLEEP = 0xE5;
|
|||||||
static const uint8_t REG_IRQ_CTL = 0xFA;
|
static const uint8_t REG_IRQ_CTL = 0xFA;
|
||||||
static const uint8_t IRQ_EN_MOTION = 0x70;
|
static const uint8_t IRQ_EN_MOTION = 0x70;
|
||||||
|
|
||||||
|
static const uint8_t CST826_CHIP_ID = 0x11;
|
||||||
static const uint8_t CST820_CHIP_ID = 0xB7;
|
static const uint8_t CST820_CHIP_ID = 0xB7;
|
||||||
static const uint8_t CST816S_CHIP_ID = 0xB4;
|
static const uint8_t CST816S_CHIP_ID = 0xB4;
|
||||||
static const uint8_t CST816D_CHIP_ID = 0xB6;
|
static const uint8_t CST816D_CHIP_ID = 0xB6;
|
||||||
|
@ -1,14 +1,13 @@
|
|||||||
import esphome.codegen as cg
|
import esphome.codegen as cg
|
||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
from esphome.components import climate_ir
|
from esphome.components import climate_ir
|
||||||
from esphome.const import CONF_ID
|
from esphome.const import CONF_ID, CONF_USE_FAHRENHEIT
|
||||||
|
|
||||||
AUTO_LOAD = ["climate_ir"]
|
AUTO_LOAD = ["climate_ir"]
|
||||||
|
|
||||||
daikin_brc_ns = cg.esphome_ns.namespace("daikin_brc")
|
daikin_brc_ns = cg.esphome_ns.namespace("daikin_brc")
|
||||||
DaikinBrcClimate = daikin_brc_ns.class_("DaikinBrcClimate", climate_ir.ClimateIR)
|
DaikinBrcClimate = daikin_brc_ns.class_("DaikinBrcClimate", climate_ir.ClimateIR)
|
||||||
|
|
||||||
CONF_USE_FAHRENHEIT = "use_fahrenheit"
|
|
||||||
|
|
||||||
CONFIG_SCHEMA = climate_ir.CLIMATE_IR_WITH_RECEIVER_SCHEMA.extend(
|
CONFIG_SCHEMA = climate_ir.CLIMATE_IR_WITH_RECEIVER_SCHEMA.extend(
|
||||||
{
|
{
|
||||||
|
@ -169,7 +169,7 @@ async def to_code(config):
|
|||||||
{
|
{
|
||||||
cv.Required(CONF_ID): cv.use_id(DateEntity),
|
cv.Required(CONF_ID): cv.use_id(DateEntity),
|
||||||
cv.Required(CONF_DATE): cv.Any(
|
cv.Required(CONF_DATE): cv.Any(
|
||||||
cv.returning_lambda, cv.date_time(allowed_time=False)
|
cv.returning_lambda, cv.date_time(date=True, time=False)
|
||||||
),
|
),
|
||||||
}
|
}
|
||||||
),
|
),
|
||||||
@ -200,7 +200,7 @@ async def datetime_date_set_to_code(config, action_id, template_arg, args):
|
|||||||
{
|
{
|
||||||
cv.Required(CONF_ID): cv.use_id(TimeEntity),
|
cv.Required(CONF_ID): cv.use_id(TimeEntity),
|
||||||
cv.Required(CONF_TIME): cv.Any(
|
cv.Required(CONF_TIME): cv.Any(
|
||||||
cv.returning_lambda, cv.date_time(allowed_date=False)
|
cv.returning_lambda, cv.date_time(date=False, time=True)
|
||||||
),
|
),
|
||||||
}
|
}
|
||||||
),
|
),
|
||||||
@ -230,7 +230,9 @@ async def datetime_time_set_to_code(config, action_id, template_arg, args):
|
|||||||
cv.Schema(
|
cv.Schema(
|
||||||
{
|
{
|
||||||
cv.Required(CONF_ID): cv.use_id(DateTimeEntity),
|
cv.Required(CONF_ID): cv.use_id(DateTimeEntity),
|
||||||
cv.Required(CONF_DATETIME): cv.Any(cv.returning_lambda, cv.date_time()),
|
cv.Required(CONF_DATETIME): cv.Any(
|
||||||
|
cv.returning_lambda, cv.date_time(date=True, time=True)
|
||||||
|
),
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
@ -8,62 +8,16 @@
|
|||||||
#include <cinttypes>
|
#include <cinttypes>
|
||||||
#include <climits>
|
#include <climits>
|
||||||
|
|
||||||
#ifdef USE_ESP32
|
|
||||||
|
|
||||||
#include <esp_heap_caps.h>
|
|
||||||
#include <esp_system.h>
|
|
||||||
|
|
||||||
#include <esp_chip_info.h>
|
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32)
|
|
||||||
#include <esp32/rom/rtc.h>
|
|
||||||
#elif defined(USE_ESP32_VARIANT_ESP32C3)
|
|
||||||
#include <esp32c3/rom/rtc.h>
|
|
||||||
#elif defined(USE_ESP32_VARIANT_ESP32C6)
|
|
||||||
#include <esp32c6/rom/rtc.h>
|
|
||||||
#elif defined(USE_ESP32_VARIANT_ESP32S2)
|
|
||||||
#include <esp32s2/rom/rtc.h>
|
|
||||||
#elif defined(USE_ESP32_VARIANT_ESP32S3)
|
|
||||||
#include <esp32s3/rom/rtc.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif // USE_ESP32
|
|
||||||
|
|
||||||
#ifdef USE_ARDUINO
|
|
||||||
#ifdef USE_RP2040
|
|
||||||
#include <Arduino.h>
|
|
||||||
#elif defined(USE_ESP32) || defined(USE_ESP8266)
|
|
||||||
#include <Esp.h>
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace esphome {
|
namespace esphome {
|
||||||
namespace debug {
|
namespace debug {
|
||||||
|
|
||||||
static const char *const TAG = "debug";
|
static const char *const TAG = "debug";
|
||||||
|
|
||||||
static uint32_t get_free_heap() {
|
|
||||||
#if defined(USE_ESP8266)
|
|
||||||
return ESP.getFreeHeap(); // NOLINT(readability-static-accessed-through-instance)
|
|
||||||
#elif defined(USE_ESP32)
|
|
||||||
return heap_caps_get_free_size(MALLOC_CAP_INTERNAL);
|
|
||||||
#elif defined(USE_RP2040)
|
|
||||||
return rp2040.getFreeHeap();
|
|
||||||
#elif defined(USE_LIBRETINY)
|
|
||||||
return lt_heap_get_free();
|
|
||||||
#elif defined(USE_HOST)
|
|
||||||
return INT_MAX;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void DebugComponent::dump_config() {
|
void DebugComponent::dump_config() {
|
||||||
#ifndef ESPHOME_LOG_HAS_DEBUG
|
#ifndef ESPHOME_LOG_HAS_DEBUG
|
||||||
return; // Can't log below if debug logging is disabled
|
return; // Can't log below if debug logging is disabled
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
std::string device_info;
|
|
||||||
std::string reset_reason;
|
|
||||||
device_info.reserve(256);
|
|
||||||
|
|
||||||
ESP_LOGCONFIG(TAG, "Debug component:");
|
ESP_LOGCONFIG(TAG, "Debug component:");
|
||||||
#ifdef USE_TEXT_SENSOR
|
#ifdef USE_TEXT_SENSOR
|
||||||
LOG_TEXT_SENSOR(" ", "Device info", this->device_info_);
|
LOG_TEXT_SENSOR(" ", "Device info", this->device_info_);
|
||||||
@ -76,305 +30,15 @@ void DebugComponent::dump_config() {
|
|||||||
#endif // defined(USE_ESP8266) && USE_ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
|
#endif // defined(USE_ESP8266) && USE_ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
|
||||||
#endif // USE_SENSOR
|
#endif // USE_SENSOR
|
||||||
|
|
||||||
|
std::string device_info;
|
||||||
|
device_info.reserve(256);
|
||||||
ESP_LOGD(TAG, "ESPHome version %s", ESPHOME_VERSION);
|
ESP_LOGD(TAG, "ESPHome version %s", ESPHOME_VERSION);
|
||||||
device_info += ESPHOME_VERSION;
|
device_info += ESPHOME_VERSION;
|
||||||
|
|
||||||
this->free_heap_ = get_free_heap();
|
this->free_heap_ = get_free_heap_();
|
||||||
ESP_LOGD(TAG, "Free Heap Size: %" PRIu32 " bytes", this->free_heap_);
|
ESP_LOGD(TAG, "Free Heap Size: %" PRIu32 " bytes", this->free_heap_);
|
||||||
|
|
||||||
#if defined(USE_ARDUINO) && (defined(USE_ESP32) || defined(USE_ESP8266))
|
get_device_info_(device_info);
|
||||||
const char *flash_mode;
|
|
||||||
switch (ESP.getFlashChipMode()) { // NOLINT(readability-static-accessed-through-instance)
|
|
||||||
case FM_QIO:
|
|
||||||
flash_mode = "QIO";
|
|
||||||
break;
|
|
||||||
case FM_QOUT:
|
|
||||||
flash_mode = "QOUT";
|
|
||||||
break;
|
|
||||||
case FM_DIO:
|
|
||||||
flash_mode = "DIO";
|
|
||||||
break;
|
|
||||||
case FM_DOUT:
|
|
||||||
flash_mode = "DOUT";
|
|
||||||
break;
|
|
||||||
#ifdef USE_ESP32
|
|
||||||
case FM_FAST_READ:
|
|
||||||
flash_mode = "FAST_READ";
|
|
||||||
break;
|
|
||||||
case FM_SLOW_READ:
|
|
||||||
flash_mode = "SLOW_READ";
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
default:
|
|
||||||
flash_mode = "UNKNOWN";
|
|
||||||
}
|
|
||||||
ESP_LOGD(TAG, "Flash Chip: Size=%ukB Speed=%uMHz Mode=%s",
|
|
||||||
ESP.getFlashChipSize() / 1024, // NOLINT
|
|
||||||
ESP.getFlashChipSpeed() / 1000000, flash_mode); // NOLINT
|
|
||||||
device_info += "|Flash: " + to_string(ESP.getFlashChipSize() / 1024) + // NOLINT
|
|
||||||
"kB Speed:" + to_string(ESP.getFlashChipSpeed() / 1000000) + "MHz Mode:"; // NOLINT
|
|
||||||
device_info += flash_mode;
|
|
||||||
#endif // USE_ARDUINO && (USE_ESP32 || USE_ESP8266)
|
|
||||||
|
|
||||||
#ifdef USE_ESP32
|
|
||||||
esp_chip_info_t info;
|
|
||||||
esp_chip_info(&info);
|
|
||||||
const char *model;
|
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32)
|
|
||||||
model = "ESP32";
|
|
||||||
#elif defined(USE_ESP32_VARIANT_ESP32C3)
|
|
||||||
model = "ESP32-C3";
|
|
||||||
#elif defined(USE_ESP32_VARIANT_ESP32C6)
|
|
||||||
model = "ESP32-C6";
|
|
||||||
#elif defined(USE_ESP32_VARIANT_ESP32S2)
|
|
||||||
model = "ESP32-S2";
|
|
||||||
#elif defined(USE_ESP32_VARIANT_ESP32S3)
|
|
||||||
model = "ESP32-S3";
|
|
||||||
#elif defined(USE_ESP32_VARIANT_ESP32H2)
|
|
||||||
model = "ESP32-H2";
|
|
||||||
#else
|
|
||||||
model = "UNKNOWN";
|
|
||||||
#endif
|
|
||||||
std::string features;
|
|
||||||
if (info.features & CHIP_FEATURE_EMB_FLASH) {
|
|
||||||
features += "EMB_FLASH,";
|
|
||||||
info.features &= ~CHIP_FEATURE_EMB_FLASH;
|
|
||||||
}
|
|
||||||
if (info.features & CHIP_FEATURE_WIFI_BGN) {
|
|
||||||
features += "WIFI_BGN,";
|
|
||||||
info.features &= ~CHIP_FEATURE_WIFI_BGN;
|
|
||||||
}
|
|
||||||
if (info.features & CHIP_FEATURE_BLE) {
|
|
||||||
features += "BLE,";
|
|
||||||
info.features &= ~CHIP_FEATURE_BLE;
|
|
||||||
}
|
|
||||||
if (info.features & CHIP_FEATURE_BT) {
|
|
||||||
features += "BT,";
|
|
||||||
info.features &= ~CHIP_FEATURE_BT;
|
|
||||||
}
|
|
||||||
if (info.features & CHIP_FEATURE_EMB_PSRAM) {
|
|
||||||
features += "EMB_PSRAM,";
|
|
||||||
info.features &= ~CHIP_FEATURE_EMB_PSRAM;
|
|
||||||
}
|
|
||||||
if (info.features)
|
|
||||||
features += "Other:" + format_hex(info.features);
|
|
||||||
ESP_LOGD(TAG, "Chip: Model=%s, Features=%s Cores=%u, Revision=%u", model, features.c_str(), info.cores,
|
|
||||||
info.revision);
|
|
||||||
device_info += "|Chip: ";
|
|
||||||
device_info += model;
|
|
||||||
device_info += " Features:";
|
|
||||||
device_info += features;
|
|
||||||
device_info += " Cores:" + to_string(info.cores);
|
|
||||||
device_info += " Revision:" + to_string(info.revision);
|
|
||||||
|
|
||||||
ESP_LOGD(TAG, "ESP-IDF Version: %s", esp_get_idf_version());
|
|
||||||
device_info += "|ESP-IDF: ";
|
|
||||||
device_info += esp_get_idf_version();
|
|
||||||
|
|
||||||
std::string mac = get_mac_address_pretty();
|
|
||||||
ESP_LOGD(TAG, "EFuse MAC: %s", mac.c_str());
|
|
||||||
device_info += "|EFuse MAC: ";
|
|
||||||
device_info += mac;
|
|
||||||
|
|
||||||
switch (rtc_get_reset_reason(0)) {
|
|
||||||
case POWERON_RESET:
|
|
||||||
reset_reason = "Power On Reset";
|
|
||||||
break;
|
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32)
|
|
||||||
case SW_RESET:
|
|
||||||
#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
|
||||||
case RTC_SW_SYS_RESET:
|
|
||||||
#endif
|
|
||||||
reset_reason = "Software Reset Digital Core";
|
|
||||||
break;
|
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32)
|
|
||||||
case OWDT_RESET:
|
|
||||||
reset_reason = "Watch Dog Reset Digital Core";
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
case DEEPSLEEP_RESET:
|
|
||||||
reset_reason = "Deep Sleep Reset Digital Core";
|
|
||||||
break;
|
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32)
|
|
||||||
case SDIO_RESET:
|
|
||||||
reset_reason = "SLC Module Reset Digital Core";
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
case TG0WDT_SYS_RESET:
|
|
||||||
reset_reason = "Timer Group 0 Watch Dog Reset Digital Core";
|
|
||||||
break;
|
|
||||||
case TG1WDT_SYS_RESET:
|
|
||||||
reset_reason = "Timer Group 1 Watch Dog Reset Digital Core";
|
|
||||||
break;
|
|
||||||
case RTCWDT_SYS_RESET:
|
|
||||||
reset_reason = "RTC Watch Dog Reset Digital Core";
|
|
||||||
break;
|
|
||||||
#if !defined(USE_ESP32_VARIANT_ESP32C6)
|
|
||||||
case INTRUSION_RESET:
|
|
||||||
reset_reason = "Intrusion Reset CPU";
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32)
|
|
||||||
case TGWDT_CPU_RESET:
|
|
||||||
reset_reason = "Timer Group Reset CPU";
|
|
||||||
break;
|
|
||||||
#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
|
||||||
case TG0WDT_CPU_RESET:
|
|
||||||
reset_reason = "Timer Group 0 Reset CPU";
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32)
|
|
||||||
case SW_CPU_RESET:
|
|
||||||
#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
|
||||||
case RTC_SW_CPU_RESET:
|
|
||||||
#endif
|
|
||||||
reset_reason = "Software Reset CPU";
|
|
||||||
break;
|
|
||||||
case RTCWDT_CPU_RESET:
|
|
||||||
reset_reason = "RTC Watch Dog Reset CPU";
|
|
||||||
break;
|
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32)
|
|
||||||
case EXT_CPU_RESET:
|
|
||||||
reset_reason = "External CPU Reset";
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
case RTCWDT_BROWN_OUT_RESET:
|
|
||||||
reset_reason = "Voltage Unstable Reset";
|
|
||||||
break;
|
|
||||||
case RTCWDT_RTC_RESET:
|
|
||||||
reset_reason = "RTC Watch Dog Reset Digital Core And RTC Module";
|
|
||||||
break;
|
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
|
||||||
case TG1WDT_CPU_RESET:
|
|
||||||
reset_reason = "Timer Group 1 Reset CPU";
|
|
||||||
break;
|
|
||||||
case SUPER_WDT_RESET:
|
|
||||||
reset_reason = "Super Watchdog Reset Digital Core And RTC Module";
|
|
||||||
break;
|
|
||||||
case GLITCH_RTC_RESET:
|
|
||||||
reset_reason = "Glitch Reset Digital Core And RTC Module";
|
|
||||||
break;
|
|
||||||
case EFUSE_RESET:
|
|
||||||
reset_reason = "eFuse Reset Digital Core";
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S3)
|
|
||||||
case USB_UART_CHIP_RESET:
|
|
||||||
reset_reason = "USB UART Reset Digital Core";
|
|
||||||
break;
|
|
||||||
case USB_JTAG_CHIP_RESET:
|
|
||||||
reset_reason = "USB JTAG Reset Digital Core";
|
|
||||||
break;
|
|
||||||
case POWER_GLITCH_RESET:
|
|
||||||
reset_reason = "Power Glitch Reset Digital Core And RTC Module";
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
default:
|
|
||||||
reset_reason = "Unknown Reset Reason";
|
|
||||||
}
|
|
||||||
ESP_LOGD(TAG, "Reset Reason: %s", reset_reason.c_str());
|
|
||||||
device_info += "|Reset: ";
|
|
||||||
device_info += reset_reason;
|
|
||||||
|
|
||||||
const char *wakeup_reason;
|
|
||||||
switch (rtc_get_wakeup_cause()) {
|
|
||||||
case NO_SLEEP:
|
|
||||||
wakeup_reason = "No Sleep";
|
|
||||||
break;
|
|
||||||
case EXT_EVENT0_TRIG:
|
|
||||||
wakeup_reason = "External Event 0";
|
|
||||||
break;
|
|
||||||
case EXT_EVENT1_TRIG:
|
|
||||||
wakeup_reason = "External Event 1";
|
|
||||||
break;
|
|
||||||
case GPIO_TRIG:
|
|
||||||
wakeup_reason = "GPIO";
|
|
||||||
break;
|
|
||||||
case TIMER_EXPIRE:
|
|
||||||
wakeup_reason = "Wakeup Timer";
|
|
||||||
break;
|
|
||||||
case SDIO_TRIG:
|
|
||||||
wakeup_reason = "SDIO";
|
|
||||||
break;
|
|
||||||
case MAC_TRIG:
|
|
||||||
wakeup_reason = "MAC";
|
|
||||||
break;
|
|
||||||
case UART0_TRIG:
|
|
||||||
wakeup_reason = "UART0";
|
|
||||||
break;
|
|
||||||
case UART1_TRIG:
|
|
||||||
wakeup_reason = "UART1";
|
|
||||||
break;
|
|
||||||
case TOUCH_TRIG:
|
|
||||||
wakeup_reason = "Touch";
|
|
||||||
break;
|
|
||||||
case SAR_TRIG:
|
|
||||||
wakeup_reason = "SAR";
|
|
||||||
break;
|
|
||||||
case BT_TRIG:
|
|
||||||
wakeup_reason = "BT";
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
wakeup_reason = "Unknown";
|
|
||||||
}
|
|
||||||
ESP_LOGD(TAG, "Wakeup Reason: %s", wakeup_reason);
|
|
||||||
device_info += "|Wakeup: ";
|
|
||||||
device_info += wakeup_reason;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(USE_ESP8266) && !defined(CLANG_TIDY)
|
|
||||||
ESP_LOGD(TAG, "Chip ID: 0x%08X", ESP.getChipId());
|
|
||||||
ESP_LOGD(TAG, "SDK Version: %s", ESP.getSdkVersion());
|
|
||||||
ESP_LOGD(TAG, "Core Version: %s", ESP.getCoreVersion().c_str());
|
|
||||||
ESP_LOGD(TAG, "Boot Version=%u Mode=%u", ESP.getBootVersion(), ESP.getBootMode());
|
|
||||||
ESP_LOGD(TAG, "CPU Frequency: %u", ESP.getCpuFreqMHz());
|
|
||||||
ESP_LOGD(TAG, "Flash Chip ID=0x%08X", ESP.getFlashChipId());
|
|
||||||
ESP_LOGD(TAG, "Reset Reason: %s", ESP.getResetReason().c_str());
|
|
||||||
ESP_LOGD(TAG, "Reset Info: %s", ESP.getResetInfo().c_str());
|
|
||||||
|
|
||||||
device_info += "|Chip: 0x" + format_hex(ESP.getChipId());
|
|
||||||
device_info += "|SDK: ";
|
|
||||||
device_info += ESP.getSdkVersion();
|
|
||||||
device_info += "|Core: ";
|
|
||||||
device_info += ESP.getCoreVersion().c_str();
|
|
||||||
device_info += "|Boot: ";
|
|
||||||
device_info += to_string(ESP.getBootVersion());
|
|
||||||
device_info += "|Mode: " + to_string(ESP.getBootMode());
|
|
||||||
device_info += "|CPU: " + to_string(ESP.getCpuFreqMHz());
|
|
||||||
device_info += "|Flash: 0x" + format_hex(ESP.getFlashChipId());
|
|
||||||
device_info += "|Reset: ";
|
|
||||||
device_info += ESP.getResetReason().c_str();
|
|
||||||
device_info += "|";
|
|
||||||
device_info += ESP.getResetInfo().c_str();
|
|
||||||
|
|
||||||
reset_reason = ESP.getResetReason().c_str();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef USE_RP2040
|
|
||||||
ESP_LOGD(TAG, "CPU Frequency: %u", rp2040.f_cpu());
|
|
||||||
device_info += "CPU Frequency: " + to_string(rp2040.f_cpu());
|
|
||||||
#endif // USE_RP2040
|
|
||||||
|
|
||||||
#ifdef USE_LIBRETINY
|
|
||||||
ESP_LOGD(TAG, "LibreTiny Version: %s", lt_get_version());
|
|
||||||
ESP_LOGD(TAG, "Chip: %s (%04x) @ %u MHz", lt_cpu_get_model_name(), lt_cpu_get_model(), lt_cpu_get_freq_mhz());
|
|
||||||
ESP_LOGD(TAG, "Chip ID: 0x%06X", lt_cpu_get_mac_id());
|
|
||||||
ESP_LOGD(TAG, "Board: %s", lt_get_board_code());
|
|
||||||
ESP_LOGD(TAG, "Flash: %u KiB / RAM: %u KiB", lt_flash_get_size() / 1024, lt_ram_get_size() / 1024);
|
|
||||||
ESP_LOGD(TAG, "Reset Reason: %s", lt_get_reboot_reason_name(lt_get_reboot_reason()));
|
|
||||||
|
|
||||||
device_info += "|Version: ";
|
|
||||||
device_info += LT_BANNER_STR + 10;
|
|
||||||
device_info += "|Reset Reason: ";
|
|
||||||
device_info += lt_get_reboot_reason_name(lt_get_reboot_reason());
|
|
||||||
device_info += "|Chip Name: ";
|
|
||||||
device_info += lt_cpu_get_model_name();
|
|
||||||
device_info += "|Chip ID: 0x" + format_hex(lt_cpu_get_mac_id());
|
|
||||||
device_info += "|Flash: " + to_string(lt_flash_get_size() / 1024) + " KiB";
|
|
||||||
device_info += "|RAM: " + to_string(lt_ram_get_size() / 1024) + " KiB";
|
|
||||||
|
|
||||||
reset_reason = lt_get_reboot_reason_name(lt_get_reboot_reason());
|
|
||||||
#endif // USE_LIBRETINY
|
|
||||||
|
|
||||||
#ifdef USE_TEXT_SENSOR
|
#ifdef USE_TEXT_SENSOR
|
||||||
if (this->device_info_ != nullptr) {
|
if (this->device_info_ != nullptr) {
|
||||||
@ -383,14 +47,14 @@ void DebugComponent::dump_config() {
|
|||||||
this->device_info_->publish_state(device_info);
|
this->device_info_->publish_state(device_info);
|
||||||
}
|
}
|
||||||
if (this->reset_reason_ != nullptr) {
|
if (this->reset_reason_ != nullptr) {
|
||||||
this->reset_reason_->publish_state(reset_reason);
|
this->reset_reason_->publish_state(get_reset_reason_());
|
||||||
}
|
}
|
||||||
#endif // USE_TEXT_SENSOR
|
#endif // USE_TEXT_SENSOR
|
||||||
}
|
}
|
||||||
|
|
||||||
void DebugComponent::loop() {
|
void DebugComponent::loop() {
|
||||||
// log when free heap space has halved
|
// log when free heap space has halved
|
||||||
uint32_t new_free_heap = get_free_heap();
|
uint32_t new_free_heap = get_free_heap_();
|
||||||
if (new_free_heap < this->free_heap_ / 2) {
|
if (new_free_heap < this->free_heap_ / 2) {
|
||||||
this->free_heap_ = new_free_heap;
|
this->free_heap_ = new_free_heap;
|
||||||
ESP_LOGD(TAG, "Free Heap Size: %" PRIu32 " bytes", this->free_heap_);
|
ESP_LOGD(TAG, "Free Heap Size: %" PRIu32 " bytes", this->free_heap_);
|
||||||
@ -411,38 +75,16 @@ void DebugComponent::loop() {
|
|||||||
void DebugComponent::update() {
|
void DebugComponent::update() {
|
||||||
#ifdef USE_SENSOR
|
#ifdef USE_SENSOR
|
||||||
if (this->free_sensor_ != nullptr) {
|
if (this->free_sensor_ != nullptr) {
|
||||||
this->free_sensor_->publish_state(get_free_heap());
|
this->free_sensor_->publish_state(get_free_heap_());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this->block_sensor_ != nullptr) {
|
|
||||||
#if defined(USE_ESP8266)
|
|
||||||
// NOLINTNEXTLINE(readability-static-accessed-through-instance)
|
|
||||||
this->block_sensor_->publish_state(ESP.getMaxFreeBlockSize());
|
|
||||||
#elif defined(USE_ESP32)
|
|
||||||
this->block_sensor_->publish_state(heap_caps_get_largest_free_block(MALLOC_CAP_INTERNAL));
|
|
||||||
#elif defined(USE_LIBRETINY)
|
|
||||||
this->block_sensor_->publish_state(lt_heap_get_max_alloc());
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
#if defined(USE_ESP8266) && USE_ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
|
|
||||||
if (this->fragmentation_sensor_ != nullptr) {
|
|
||||||
// NOLINTNEXTLINE(readability-static-accessed-through-instance)
|
|
||||||
this->fragmentation_sensor_->publish_state(ESP.getHeapFragmentation());
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (this->loop_time_sensor_ != nullptr) {
|
if (this->loop_time_sensor_ != nullptr) {
|
||||||
this->loop_time_sensor_->publish_state(this->max_loop_time_);
|
this->loop_time_sensor_->publish_state(this->max_loop_time_);
|
||||||
this->max_loop_time_ = 0;
|
this->max_loop_time_ = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef USE_ESP32
|
|
||||||
if (this->psram_sensor_ != nullptr) {
|
|
||||||
this->psram_sensor_->publish_state(heap_caps_get_free_size(MALLOC_CAP_SPIRAM));
|
|
||||||
}
|
|
||||||
#endif // USE_ESP32
|
|
||||||
#endif // USE_SENSOR
|
#endif // USE_SENSOR
|
||||||
|
update_platform_();
|
||||||
}
|
}
|
||||||
|
|
||||||
float DebugComponent::get_setup_priority() const { return setup_priority::LATE; }
|
float DebugComponent::get_setup_priority() const { return setup_priority::LATE; }
|
||||||
|
@ -59,6 +59,11 @@ class DebugComponent : public PollingComponent {
|
|||||||
text_sensor::TextSensor *device_info_{nullptr};
|
text_sensor::TextSensor *device_info_{nullptr};
|
||||||
text_sensor::TextSensor *reset_reason_{nullptr};
|
text_sensor::TextSensor *reset_reason_{nullptr};
|
||||||
#endif // USE_TEXT_SENSOR
|
#endif // USE_TEXT_SENSOR
|
||||||
|
|
||||||
|
std::string get_reset_reason_();
|
||||||
|
uint32_t get_free_heap_();
|
||||||
|
void get_device_info_(std::string &device_info);
|
||||||
|
void update_platform_();
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace debug
|
} // namespace debug
|
||||||
|
287
esphome/components/debug/debug_esp32.cpp
Normal file
287
esphome/components/debug/debug_esp32.cpp
Normal file
@ -0,0 +1,287 @@
|
|||||||
|
#include "debug_component.h"
|
||||||
|
#ifdef USE_ESP32
|
||||||
|
#include "esphome/core/log.h"
|
||||||
|
|
||||||
|
#include <esp_heap_caps.h>
|
||||||
|
#include <esp_system.h>
|
||||||
|
#include <esp_chip_info.h>
|
||||||
|
|
||||||
|
#if defined(USE_ESP32_VARIANT_ESP32)
|
||||||
|
#include <esp32/rom/rtc.h>
|
||||||
|
#elif defined(USE_ESP32_VARIANT_ESP32C3)
|
||||||
|
#include <esp32c3/rom/rtc.h>
|
||||||
|
#elif defined(USE_ESP32_VARIANT_ESP32C6)
|
||||||
|
#include <esp32c6/rom/rtc.h>
|
||||||
|
#elif defined(USE_ESP32_VARIANT_ESP32S2)
|
||||||
|
#include <esp32s2/rom/rtc.h>
|
||||||
|
#elif defined(USE_ESP32_VARIANT_ESP32S3)
|
||||||
|
#include <esp32s3/rom/rtc.h>
|
||||||
|
#endif
|
||||||
|
#ifdef USE_ARDUINO
|
||||||
|
#include <Esp.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace esphome {
|
||||||
|
namespace debug {
|
||||||
|
|
||||||
|
static const char *const TAG = "debug";
|
||||||
|
|
||||||
|
std::string DebugComponent::get_reset_reason_() {
|
||||||
|
std::string reset_reason;
|
||||||
|
switch (rtc_get_reset_reason(0)) {
|
||||||
|
case POWERON_RESET:
|
||||||
|
reset_reason = "Power On Reset";
|
||||||
|
break;
|
||||||
|
#if defined(USE_ESP32_VARIANT_ESP32)
|
||||||
|
case SW_RESET:
|
||||||
|
#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
||||||
|
case RTC_SW_SYS_RESET:
|
||||||
|
#endif
|
||||||
|
reset_reason = "Software Reset Digital Core";
|
||||||
|
break;
|
||||||
|
#if defined(USE_ESP32_VARIANT_ESP32)
|
||||||
|
case OWDT_RESET:
|
||||||
|
reset_reason = "Watch Dog Reset Digital Core";
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
case DEEPSLEEP_RESET:
|
||||||
|
reset_reason = "Deep Sleep Reset Digital Core";
|
||||||
|
break;
|
||||||
|
#if defined(USE_ESP32_VARIANT_ESP32)
|
||||||
|
case SDIO_RESET:
|
||||||
|
reset_reason = "SLC Module Reset Digital Core";
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
case TG0WDT_SYS_RESET:
|
||||||
|
reset_reason = "Timer Group 0 Watch Dog Reset Digital Core";
|
||||||
|
break;
|
||||||
|
case TG1WDT_SYS_RESET:
|
||||||
|
reset_reason = "Timer Group 1 Watch Dog Reset Digital Core";
|
||||||
|
break;
|
||||||
|
case RTCWDT_SYS_RESET:
|
||||||
|
reset_reason = "RTC Watch Dog Reset Digital Core";
|
||||||
|
break;
|
||||||
|
#if !defined(USE_ESP32_VARIANT_ESP32C6)
|
||||||
|
case INTRUSION_RESET:
|
||||||
|
reset_reason = "Intrusion Reset CPU";
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(USE_ESP32_VARIANT_ESP32)
|
||||||
|
case TGWDT_CPU_RESET:
|
||||||
|
reset_reason = "Timer Group Reset CPU";
|
||||||
|
break;
|
||||||
|
#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
||||||
|
case TG0WDT_CPU_RESET:
|
||||||
|
reset_reason = "Timer Group 0 Reset CPU";
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(USE_ESP32_VARIANT_ESP32)
|
||||||
|
case SW_CPU_RESET:
|
||||||
|
#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
||||||
|
case RTC_SW_CPU_RESET:
|
||||||
|
#endif
|
||||||
|
reset_reason = "Software Reset CPU";
|
||||||
|
break;
|
||||||
|
case RTCWDT_CPU_RESET:
|
||||||
|
reset_reason = "RTC Watch Dog Reset CPU";
|
||||||
|
break;
|
||||||
|
#if defined(USE_ESP32_VARIANT_ESP32)
|
||||||
|
case EXT_CPU_RESET:
|
||||||
|
reset_reason = "External CPU Reset";
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
case RTCWDT_BROWN_OUT_RESET:
|
||||||
|
reset_reason = "Voltage Unstable Reset";
|
||||||
|
break;
|
||||||
|
case RTCWDT_RTC_RESET:
|
||||||
|
reset_reason = "RTC Watch Dog Reset Digital Core And RTC Module";
|
||||||
|
break;
|
||||||
|
#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
||||||
|
case TG1WDT_CPU_RESET:
|
||||||
|
reset_reason = "Timer Group 1 Reset CPU";
|
||||||
|
break;
|
||||||
|
case SUPER_WDT_RESET:
|
||||||
|
reset_reason = "Super Watchdog Reset Digital Core And RTC Module";
|
||||||
|
break;
|
||||||
|
case GLITCH_RTC_RESET:
|
||||||
|
reset_reason = "Glitch Reset Digital Core And RTC Module";
|
||||||
|
break;
|
||||||
|
case EFUSE_RESET:
|
||||||
|
reset_reason = "eFuse Reset Digital Core";
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S3)
|
||||||
|
case USB_UART_CHIP_RESET:
|
||||||
|
reset_reason = "USB UART Reset Digital Core";
|
||||||
|
break;
|
||||||
|
case USB_JTAG_CHIP_RESET:
|
||||||
|
reset_reason = "USB JTAG Reset Digital Core";
|
||||||
|
break;
|
||||||
|
case POWER_GLITCH_RESET:
|
||||||
|
reset_reason = "Power Glitch Reset Digital Core And RTC Module";
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
default:
|
||||||
|
reset_reason = "Unknown Reset Reason";
|
||||||
|
}
|
||||||
|
ESP_LOGD(TAG, "Reset Reason: %s", reset_reason.c_str());
|
||||||
|
return reset_reason;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t DebugComponent::get_free_heap_() { return heap_caps_get_free_size(MALLOC_CAP_INTERNAL); }
|
||||||
|
|
||||||
|
void DebugComponent::get_device_info_(std::string &device_info) {
|
||||||
|
#if defined(USE_ARDUINO)
|
||||||
|
const char *flash_mode;
|
||||||
|
switch (ESP.getFlashChipMode()) { // NOLINT(readability-static-accessed-through-instance)
|
||||||
|
case FM_QIO:
|
||||||
|
flash_mode = "QIO";
|
||||||
|
break;
|
||||||
|
case FM_QOUT:
|
||||||
|
flash_mode = "QOUT";
|
||||||
|
break;
|
||||||
|
case FM_DIO:
|
||||||
|
flash_mode = "DIO";
|
||||||
|
break;
|
||||||
|
case FM_DOUT:
|
||||||
|
flash_mode = "DOUT";
|
||||||
|
break;
|
||||||
|
case FM_FAST_READ:
|
||||||
|
flash_mode = "FAST_READ";
|
||||||
|
break;
|
||||||
|
case FM_SLOW_READ:
|
||||||
|
flash_mode = "SLOW_READ";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
flash_mode = "UNKNOWN";
|
||||||
|
}
|
||||||
|
ESP_LOGD(TAG, "Flash Chip: Size=%ukB Speed=%uMHz Mode=%s",
|
||||||
|
ESP.getFlashChipSize() / 1024, // NOLINT
|
||||||
|
ESP.getFlashChipSpeed() / 1000000, flash_mode); // NOLINT
|
||||||
|
device_info += "|Flash: " + to_string(ESP.getFlashChipSize() / 1024) + // NOLINT
|
||||||
|
"kB Speed:" + to_string(ESP.getFlashChipSpeed() / 1000000) + "MHz Mode:"; // NOLINT
|
||||||
|
device_info += flash_mode;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
esp_chip_info_t info;
|
||||||
|
esp_chip_info(&info);
|
||||||
|
const char *model;
|
||||||
|
#if defined(USE_ESP32_VARIANT_ESP32)
|
||||||
|
model = "ESP32";
|
||||||
|
#elif defined(USE_ESP32_VARIANT_ESP32C3)
|
||||||
|
model = "ESP32-C3";
|
||||||
|
#elif defined(USE_ESP32_VARIANT_ESP32C6)
|
||||||
|
model = "ESP32-C6";
|
||||||
|
#elif defined(USE_ESP32_VARIANT_ESP32S2)
|
||||||
|
model = "ESP32-S2";
|
||||||
|
#elif defined(USE_ESP32_VARIANT_ESP32S3)
|
||||||
|
model = "ESP32-S3";
|
||||||
|
#elif defined(USE_ESP32_VARIANT_ESP32H2)
|
||||||
|
model = "ESP32-H2";
|
||||||
|
#else
|
||||||
|
model = "UNKNOWN";
|
||||||
|
#endif
|
||||||
|
std::string features;
|
||||||
|
if (info.features & CHIP_FEATURE_EMB_FLASH) {
|
||||||
|
features += "EMB_FLASH,";
|
||||||
|
info.features &= ~CHIP_FEATURE_EMB_FLASH;
|
||||||
|
}
|
||||||
|
if (info.features & CHIP_FEATURE_WIFI_BGN) {
|
||||||
|
features += "WIFI_BGN,";
|
||||||
|
info.features &= ~CHIP_FEATURE_WIFI_BGN;
|
||||||
|
}
|
||||||
|
if (info.features & CHIP_FEATURE_BLE) {
|
||||||
|
features += "BLE,";
|
||||||
|
info.features &= ~CHIP_FEATURE_BLE;
|
||||||
|
}
|
||||||
|
if (info.features & CHIP_FEATURE_BT) {
|
||||||
|
features += "BT,";
|
||||||
|
info.features &= ~CHIP_FEATURE_BT;
|
||||||
|
}
|
||||||
|
if (info.features & CHIP_FEATURE_EMB_PSRAM) {
|
||||||
|
features += "EMB_PSRAM,";
|
||||||
|
info.features &= ~CHIP_FEATURE_EMB_PSRAM;
|
||||||
|
}
|
||||||
|
if (info.features)
|
||||||
|
features += "Other:" + format_hex(info.features);
|
||||||
|
ESP_LOGD(TAG, "Chip: Model=%s, Features=%s Cores=%u, Revision=%u", model, features.c_str(), info.cores,
|
||||||
|
info.revision);
|
||||||
|
device_info += "|Chip: ";
|
||||||
|
device_info += model;
|
||||||
|
device_info += " Features:";
|
||||||
|
device_info += features;
|
||||||
|
device_info += " Cores:" + to_string(info.cores);
|
||||||
|
device_info += " Revision:" + to_string(info.revision);
|
||||||
|
|
||||||
|
ESP_LOGD(TAG, "ESP-IDF Version: %s", esp_get_idf_version());
|
||||||
|
device_info += "|ESP-IDF: ";
|
||||||
|
device_info += esp_get_idf_version();
|
||||||
|
|
||||||
|
std::string mac = get_mac_address_pretty();
|
||||||
|
ESP_LOGD(TAG, "EFuse MAC: %s", mac.c_str());
|
||||||
|
device_info += "|EFuse MAC: ";
|
||||||
|
device_info += mac;
|
||||||
|
|
||||||
|
device_info += "|Reset: ";
|
||||||
|
device_info += get_reset_reason_();
|
||||||
|
|
||||||
|
const char *wakeup_reason;
|
||||||
|
switch (rtc_get_wakeup_cause()) {
|
||||||
|
case NO_SLEEP:
|
||||||
|
wakeup_reason = "No Sleep";
|
||||||
|
break;
|
||||||
|
case EXT_EVENT0_TRIG:
|
||||||
|
wakeup_reason = "External Event 0";
|
||||||
|
break;
|
||||||
|
case EXT_EVENT1_TRIG:
|
||||||
|
wakeup_reason = "External Event 1";
|
||||||
|
break;
|
||||||
|
case GPIO_TRIG:
|
||||||
|
wakeup_reason = "GPIO";
|
||||||
|
break;
|
||||||
|
case TIMER_EXPIRE:
|
||||||
|
wakeup_reason = "Wakeup Timer";
|
||||||
|
break;
|
||||||
|
case SDIO_TRIG:
|
||||||
|
wakeup_reason = "SDIO";
|
||||||
|
break;
|
||||||
|
case MAC_TRIG:
|
||||||
|
wakeup_reason = "MAC";
|
||||||
|
break;
|
||||||
|
case UART0_TRIG:
|
||||||
|
wakeup_reason = "UART0";
|
||||||
|
break;
|
||||||
|
case UART1_TRIG:
|
||||||
|
wakeup_reason = "UART1";
|
||||||
|
break;
|
||||||
|
case TOUCH_TRIG:
|
||||||
|
wakeup_reason = "Touch";
|
||||||
|
break;
|
||||||
|
case SAR_TRIG:
|
||||||
|
wakeup_reason = "SAR";
|
||||||
|
break;
|
||||||
|
case BT_TRIG:
|
||||||
|
wakeup_reason = "BT";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
wakeup_reason = "Unknown";
|
||||||
|
}
|
||||||
|
ESP_LOGD(TAG, "Wakeup Reason: %s", wakeup_reason);
|
||||||
|
device_info += "|Wakeup: ";
|
||||||
|
device_info += wakeup_reason;
|
||||||
|
}
|
||||||
|
|
||||||
|
void DebugComponent::update_platform_() {
|
||||||
|
#ifdef USE_SENSOR
|
||||||
|
if (this->block_sensor_ != nullptr) {
|
||||||
|
this->block_sensor_->publish_state(heap_caps_get_largest_free_block(MALLOC_CAP_INTERNAL));
|
||||||
|
}
|
||||||
|
if (this->psram_sensor_ != nullptr) {
|
||||||
|
this->psram_sensor_->publish_state(heap_caps_get_free_size(MALLOC_CAP_SPIRAM));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace debug
|
||||||
|
} // namespace esphome
|
||||||
|
#endif
|
94
esphome/components/debug/debug_esp8266.cpp
Normal file
94
esphome/components/debug/debug_esp8266.cpp
Normal file
@ -0,0 +1,94 @@
|
|||||||
|
#include "debug_component.h"
|
||||||
|
#ifdef USE_ESP8266
|
||||||
|
#include "esphome/core/log.h"
|
||||||
|
#include <Esp.h>
|
||||||
|
|
||||||
|
namespace esphome {
|
||||||
|
namespace debug {
|
||||||
|
|
||||||
|
static const char *const TAG = "debug";
|
||||||
|
|
||||||
|
std::string DebugComponent::get_reset_reason_() {
|
||||||
|
#if !defined(CLANG_TIDY)
|
||||||
|
return ESP.getResetReason().c_str();
|
||||||
|
#else
|
||||||
|
return "";
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t DebugComponent::get_free_heap_() {
|
||||||
|
return ESP.getFreeHeap(); // NOLINT(readability-static-accessed-through-instance)
|
||||||
|
}
|
||||||
|
|
||||||
|
void DebugComponent::get_device_info_(std::string &device_info) {
|
||||||
|
const char *flash_mode;
|
||||||
|
switch (ESP.getFlashChipMode()) { // NOLINT(readability-static-accessed-through-instance)
|
||||||
|
case FM_QIO:
|
||||||
|
flash_mode = "QIO";
|
||||||
|
break;
|
||||||
|
case FM_QOUT:
|
||||||
|
flash_mode = "QOUT";
|
||||||
|
break;
|
||||||
|
case FM_DIO:
|
||||||
|
flash_mode = "DIO";
|
||||||
|
break;
|
||||||
|
case FM_DOUT:
|
||||||
|
flash_mode = "DOUT";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
flash_mode = "UNKNOWN";
|
||||||
|
}
|
||||||
|
ESP_LOGD(TAG, "Flash Chip: Size=%ukB Speed=%uMHz Mode=%s",
|
||||||
|
ESP.getFlashChipSize() / 1024, // NOLINT
|
||||||
|
ESP.getFlashChipSpeed() / 1000000, flash_mode); // NOLINT
|
||||||
|
device_info += "|Flash: " + to_string(ESP.getFlashChipSize() / 1024) + // NOLINT
|
||||||
|
"kB Speed:" + to_string(ESP.getFlashChipSpeed() / 1000000) + "MHz Mode:"; // NOLINT
|
||||||
|
device_info += flash_mode;
|
||||||
|
|
||||||
|
#if !defined(CLANG_TIDY)
|
||||||
|
auto reset_reason = get_reset_reason_();
|
||||||
|
ESP_LOGD(TAG, "Chip ID: 0x%08X", ESP.getChipId());
|
||||||
|
ESP_LOGD(TAG, "SDK Version: %s", ESP.getSdkVersion());
|
||||||
|
ESP_LOGD(TAG, "Core Version: %s", ESP.getCoreVersion().c_str());
|
||||||
|
ESP_LOGD(TAG, "Boot Version=%u Mode=%u", ESP.getBootVersion(), ESP.getBootMode());
|
||||||
|
ESP_LOGD(TAG, "CPU Frequency: %u", ESP.getCpuFreqMHz());
|
||||||
|
ESP_LOGD(TAG, "Flash Chip ID=0x%08X", ESP.getFlashChipId());
|
||||||
|
ESP_LOGD(TAG, "Reset Reason: %s", reset_reason.c_str());
|
||||||
|
ESP_LOGD(TAG, "Reset Info: %s", ESP.getResetInfo().c_str());
|
||||||
|
|
||||||
|
device_info += "|Chip: 0x" + format_hex(ESP.getChipId());
|
||||||
|
device_info += "|SDK: ";
|
||||||
|
device_info += ESP.getSdkVersion();
|
||||||
|
device_info += "|Core: ";
|
||||||
|
device_info += ESP.getCoreVersion().c_str();
|
||||||
|
device_info += "|Boot: ";
|
||||||
|
device_info += to_string(ESP.getBootVersion());
|
||||||
|
device_info += "|Mode: " + to_string(ESP.getBootMode());
|
||||||
|
device_info += "|CPU: " + to_string(ESP.getCpuFreqMHz());
|
||||||
|
device_info += "|Flash: 0x" + format_hex(ESP.getFlashChipId());
|
||||||
|
device_info += "|Reset: ";
|
||||||
|
device_info += reset_reason;
|
||||||
|
device_info += "|";
|
||||||
|
device_info += ESP.getResetInfo().c_str();
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
void DebugComponent::update_platform_() {
|
||||||
|
#ifdef USE_SENSOR
|
||||||
|
if (this->block_sensor_ != nullptr) {
|
||||||
|
// NOLINTNEXTLINE(readability-static-accessed-through-instance)
|
||||||
|
this->block_sensor_->publish_state(ESP.getMaxFreeBlockSize());
|
||||||
|
}
|
||||||
|
#if USE_ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
|
||||||
|
if (this->fragmentation_sensor_ != nullptr) {
|
||||||
|
// NOLINTNEXTLINE(readability-static-accessed-through-instance)
|
||||||
|
this->fragmentation_sensor_->publish_state(ESP.getHeapFragmentation());
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace debug
|
||||||
|
} // namespace esphome
|
||||||
|
#endif
|
18
esphome/components/debug/debug_host.cpp
Normal file
18
esphome/components/debug/debug_host.cpp
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
#include "debug_component.h"
|
||||||
|
#ifdef USE_HOST
|
||||||
|
#include <climits>
|
||||||
|
|
||||||
|
namespace esphome {
|
||||||
|
namespace debug {
|
||||||
|
|
||||||
|
std::string DebugComponent::get_reset_reason_() { return ""; }
|
||||||
|
|
||||||
|
uint32_t DebugComponent::get_free_heap_() { return INT_MAX; }
|
||||||
|
|
||||||
|
void DebugComponent::get_device_info_(std::string &device_info) {}
|
||||||
|
|
||||||
|
void DebugComponent::update_platform_() {}
|
||||||
|
|
||||||
|
} // namespace debug
|
||||||
|
} // namespace esphome
|
||||||
|
#endif
|
44
esphome/components/debug/debug_libretiny.cpp
Normal file
44
esphome/components/debug/debug_libretiny.cpp
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
#include "debug_component.h"
|
||||||
|
#ifdef USE_LIBRETINY
|
||||||
|
#include "esphome/core/log.h"
|
||||||
|
|
||||||
|
namespace esphome {
|
||||||
|
namespace debug {
|
||||||
|
|
||||||
|
static const char *const TAG = "debug";
|
||||||
|
|
||||||
|
std::string DebugComponent::get_reset_reason_() { return lt_get_reboot_reason_name(lt_get_reboot_reason()); }
|
||||||
|
|
||||||
|
uint32_t DebugComponent::get_free_heap_() { return lt_heap_get_free(); }
|
||||||
|
|
||||||
|
void DebugComponent::get_device_info_(std::string &device_info) {
|
||||||
|
reset_reason = get_reset_reason_();
|
||||||
|
ESP_LOGD(TAG, "LibreTiny Version: %s", lt_get_version());
|
||||||
|
ESP_LOGD(TAG, "Chip: %s (%04x) @ %u MHz", lt_cpu_get_model_name(), lt_cpu_get_model(), lt_cpu_get_freq_mhz());
|
||||||
|
ESP_LOGD(TAG, "Chip ID: 0x%06X", lt_cpu_get_mac_id());
|
||||||
|
ESP_LOGD(TAG, "Board: %s", lt_get_board_code());
|
||||||
|
ESP_LOGD(TAG, "Flash: %u KiB / RAM: %u KiB", lt_flash_get_size() / 1024, lt_ram_get_size() / 1024);
|
||||||
|
ESP_LOGD(TAG, "Reset Reason: %s", reset_reason.c_str());
|
||||||
|
|
||||||
|
device_info += "|Version: ";
|
||||||
|
device_info += LT_BANNER_STR + 10;
|
||||||
|
device_info += "|Reset Reason: ";
|
||||||
|
device_info += reset_reason;
|
||||||
|
device_info += "|Chip Name: ";
|
||||||
|
device_info += lt_cpu_get_model_name();
|
||||||
|
device_info += "|Chip ID: 0x" + format_hex(lt_cpu_get_mac_id());
|
||||||
|
device_info += "|Flash: " + to_string(lt_flash_get_size() / 1024) + " KiB";
|
||||||
|
device_info += "|RAM: " + to_string(lt_ram_get_size() / 1024) + " KiB";
|
||||||
|
}
|
||||||
|
|
||||||
|
void DebugComponent::update_platform_() {
|
||||||
|
#ifdef USE_SENSOR
|
||||||
|
if (this->block_sensor_ != nullptr) {
|
||||||
|
this->block_sensor_->publish_state(lt_heap_get_max_alloc());
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace debug
|
||||||
|
} // namespace esphome
|
||||||
|
#endif
|
23
esphome/components/debug/debug_rp2040.cpp
Normal file
23
esphome/components/debug/debug_rp2040.cpp
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
#include "debug_component.h"
|
||||||
|
#ifdef USE_RP2040
|
||||||
|
#include "esphome/core/log.h"
|
||||||
|
#include <Arduino.h>
|
||||||
|
namespace esphome {
|
||||||
|
namespace debug {
|
||||||
|
|
||||||
|
static const char *const TAG = "debug";
|
||||||
|
|
||||||
|
std::string DebugComponent::get_reset_reason_() { return ""; }
|
||||||
|
|
||||||
|
uint32_t DebugComponent::get_free_heap_() { return rp2040.getFreeHeap(); }
|
||||||
|
|
||||||
|
void DebugComponent::get_device_info_(std::string &device_info) {
|
||||||
|
ESP_LOGD(TAG, "CPU Frequency: %u", rp2040.f_cpu());
|
||||||
|
device_info += "CPU Frequency: " + to_string(rp2040.f_cpu());
|
||||||
|
}
|
||||||
|
|
||||||
|
void DebugComponent::update_platform_() {}
|
||||||
|
|
||||||
|
} // namespace debug
|
||||||
|
} // namespace esphome
|
||||||
|
#endif
|
@ -2,7 +2,7 @@ import esphome.codegen as cg
|
|||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
from esphome import automation
|
from esphome import automation
|
||||||
from esphome.automation import maybe_simple_id
|
from esphome.automation import maybe_simple_id
|
||||||
from esphome.const import CONF_ID
|
from esphome.const import CONF_FACTORY_RESET, CONF_ID, CONF_SENSITIVITY
|
||||||
from esphome.components import uart
|
from esphome.components import uart
|
||||||
|
|
||||||
CODEOWNERS = ["@niklasweber"]
|
CODEOWNERS = ["@niklasweber"]
|
||||||
@ -28,8 +28,6 @@ CONF_DELAY_AFTER_DETECT = "delay_after_detect"
|
|||||||
CONF_DELAY_AFTER_DISAPPEAR = "delay_after_disappear"
|
CONF_DELAY_AFTER_DISAPPEAR = "delay_after_disappear"
|
||||||
CONF_DETECTION_SEGMENTS = "detection_segments"
|
CONF_DETECTION_SEGMENTS = "detection_segments"
|
||||||
CONF_OUTPUT_LATENCY = "output_latency"
|
CONF_OUTPUT_LATENCY = "output_latency"
|
||||||
CONF_FACTORY_RESET = "factory_reset"
|
|
||||||
CONF_SENSITIVITY = "sensitivity"
|
|
||||||
|
|
||||||
CONFIG_SCHEMA = cv.All(
|
CONFIG_SCHEMA = cv.All(
|
||||||
cv.Schema(
|
cv.Schema(
|
||||||
|
@ -15,11 +15,11 @@ class Rect {
|
|||||||
int16_t h; ///< Height of region
|
int16_t h; ///< Height of region
|
||||||
|
|
||||||
Rect() : x(VALUE_NO_SET), y(VALUE_NO_SET), w(VALUE_NO_SET), h(VALUE_NO_SET) {} // NOLINT
|
Rect() : x(VALUE_NO_SET), y(VALUE_NO_SET), w(VALUE_NO_SET), h(VALUE_NO_SET) {} // NOLINT
|
||||||
inline Rect(int16_t x, int16_t y, int16_t w, int16_t h) ALWAYS_INLINE : x(x), y(y), w(w), h(h) {}
|
inline Rect(int16_t x, int16_t y, int16_t w, int16_t h) ESPHOME_ALWAYS_INLINE : x(x), y(y), w(w), h(h) {}
|
||||||
inline int16_t x2() const { return this->x + this->w; }; ///< X coordinate of corner
|
inline int16_t x2() const { return this->x + this->w; }; ///< X coordinate of corner
|
||||||
inline int16_t y2() const { return this->y + this->h; }; ///< Y coordinate of corner
|
inline int16_t y2() const { return this->y + this->h; }; ///< Y coordinate of corner
|
||||||
|
|
||||||
inline bool is_set() const ALWAYS_INLINE { return (this->h != VALUE_NO_SET) && (this->w != VALUE_NO_SET); }
|
inline bool is_set() const ESPHOME_ALWAYS_INLINE { return (this->h != VALUE_NO_SET) && (this->w != VALUE_NO_SET); }
|
||||||
|
|
||||||
void expand(int16_t horizontal, int16_t vertical);
|
void expand(int16_t horizontal, int16_t vertical);
|
||||||
|
|
||||||
|
@ -23,7 +23,6 @@ CODEOWNERS = ["@numo68"]
|
|||||||
|
|
||||||
display_menu_base_ns = cg.esphome_ns.namespace("display_menu_base")
|
display_menu_base_ns = cg.esphome_ns.namespace("display_menu_base")
|
||||||
|
|
||||||
CONF_DISPLAY_ID = "display_id"
|
|
||||||
|
|
||||||
CONF_ROTARY = "rotary"
|
CONF_ROTARY = "rotary"
|
||||||
CONF_JOYSTICK = "joystick"
|
CONF_JOYSTICK = "joystick"
|
||||||
|
@ -4,6 +4,7 @@ from esphome.components import sensor
|
|||||||
from esphome.const import (
|
from esphome.const import (
|
||||||
CONF_EXTERNAL_TEMPERATURE,
|
CONF_EXTERNAL_TEMPERATURE,
|
||||||
CONF_ID,
|
CONF_ID,
|
||||||
|
CONF_INTERNAL_TEMPERATURE,
|
||||||
CONF_SPEED,
|
CONF_SPEED,
|
||||||
DEVICE_CLASS_TEMPERATURE,
|
DEVICE_CLASS_TEMPERATURE,
|
||||||
STATE_CLASS_MEASUREMENT,
|
STATE_CLASS_MEASUREMENT,
|
||||||
@ -16,7 +17,6 @@ from .. import EMC2101_COMPONENT_SCHEMA, CONF_EMC2101_ID, emc2101_ns
|
|||||||
|
|
||||||
DEPENDENCIES = ["emc2101"]
|
DEPENDENCIES = ["emc2101"]
|
||||||
|
|
||||||
CONF_INTERNAL_TEMPERATURE = "internal_temperature"
|
|
||||||
CONF_DUTY_CYCLE = "duty_cycle"
|
CONF_DUTY_CYCLE = "duty_cycle"
|
||||||
|
|
||||||
EMC2101Sensor = emc2101_ns.class_("EMC2101Sensor", cg.PollingComponent)
|
EMC2101Sensor = emc2101_ns.class_("EMC2101Sensor", cg.PollingComponent)
|
||||||
|
@ -2,6 +2,7 @@ import esphome.codegen as cg
|
|||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
from esphome.components import i2c, sensor
|
from esphome.components import i2c, sensor
|
||||||
from esphome.const import (
|
from esphome.const import (
|
||||||
|
CONF_COMPENSATION,
|
||||||
CONF_ECO2,
|
CONF_ECO2,
|
||||||
CONF_HUMIDITY,
|
CONF_HUMIDITY,
|
||||||
CONF_ID,
|
CONF_ID,
|
||||||
@ -27,7 +28,6 @@ ENS160Component = ens160_ns.class_(
|
|||||||
)
|
)
|
||||||
|
|
||||||
CONF_AQI = "aqi"
|
CONF_AQI = "aqi"
|
||||||
CONF_COMPENSATION = "compensation"
|
|
||||||
UNIT_INDEX = "index"
|
UNIT_INDEX = "index"
|
||||||
|
|
||||||
CONFIG_SCHEMA = (
|
CONFIG_SCHEMA = (
|
||||||
|
@ -227,7 +227,7 @@ ARDUINO_PLATFORM_VERSION = cv.Version(5, 4, 0)
|
|||||||
# The default/recommended esp-idf framework version
|
# The default/recommended esp-idf framework version
|
||||||
# - https://github.com/espressif/esp-idf/releases
|
# - https://github.com/espressif/esp-idf/releases
|
||||||
# - https://api.registry.platformio.org/v3/packages/platformio/tool/framework-espidf
|
# - https://api.registry.platformio.org/v3/packages/platformio/tool/framework-espidf
|
||||||
RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION = cv.Version(4, 4, 6)
|
RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION = cv.Version(4, 4, 7)
|
||||||
# The platformio/espressif32 version to use for esp-idf frameworks
|
# The platformio/espressif32 version to use for esp-idf frameworks
|
||||||
# - https://github.com/platformio/platform-espressif32/releases
|
# - https://github.com/platformio/platform-espressif32/releases
|
||||||
# - https://api.registry.platformio.org/v3/packages/platformio/platform/espressif32
|
# - https://api.registry.platformio.org/v3/packages/platformio/platform/espressif32
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import esphome.codegen as cg
|
import esphome.codegen as cg
|
||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
from esphome import automation
|
from esphome import automation
|
||||||
from esphome.const import CONF_ID
|
from esphome.const import CONF_ENABLE_ON_BOOT, CONF_ID
|
||||||
from esphome.core import CORE
|
from esphome.core import CORE
|
||||||
from esphome.components.esp32 import add_idf_sdkconfig_option, get_esp32_variant, const
|
from esphome.components.esp32 import add_idf_sdkconfig_option, get_esp32_variant, const
|
||||||
|
|
||||||
@ -11,7 +11,6 @@ CONFLICTS_WITH = ["esp32_ble_beacon"]
|
|||||||
|
|
||||||
CONF_BLE_ID = "ble_id"
|
CONF_BLE_ID = "ble_id"
|
||||||
CONF_IO_CAPABILITY = "io_capability"
|
CONF_IO_CAPABILITY = "io_capability"
|
||||||
CONF_ENABLE_ON_BOOT = "enable_on_boot"
|
|
||||||
|
|
||||||
NO_BLUETOOTH_VARIANTS = [const.VARIANT_ESP32S2]
|
NO_BLUETOOTH_VARIANTS = [const.VARIANT_ESP32S2]
|
||||||
|
|
||||||
|
@ -1,6 +1,11 @@
|
|||||||
#ifdef USE_ESP32
|
#ifdef USE_ESP32
|
||||||
|
|
||||||
#include "ble.h"
|
#include "ble.h"
|
||||||
|
|
||||||
|
#ifdef USE_ESP32_VARIANT_ESP32C6
|
||||||
|
#include "const_esp32c6.h"
|
||||||
|
#endif // USE_ESP32_VARIANT_ESP32C6
|
||||||
|
|
||||||
#include "esphome/core/application.h"
|
#include "esphome/core/application.h"
|
||||||
#include "esphome/core/log.h"
|
#include "esphome/core/log.h"
|
||||||
|
|
||||||
@ -114,7 +119,11 @@ bool ESP32BLE::ble_setup_() {
|
|||||||
if (esp_bt_controller_get_status() != ESP_BT_CONTROLLER_STATUS_ENABLED) {
|
if (esp_bt_controller_get_status() != ESP_BT_CONTROLLER_STATUS_ENABLED) {
|
||||||
// start bt controller
|
// start bt controller
|
||||||
if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_IDLE) {
|
if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_IDLE) {
|
||||||
|
#ifdef USE_ESP32_VARIANT_ESP32C6
|
||||||
|
esp_bt_controller_config_t cfg = BT_CONTROLLER_CONFIG;
|
||||||
|
#else
|
||||||
esp_bt_controller_config_t cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
|
esp_bt_controller_config_t cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
|
||||||
|
#endif
|
||||||
err = esp_bt_controller_init(&cfg);
|
err = esp_bt_controller_init(&cfg);
|
||||||
if (err != ESP_OK) {
|
if (err != ESP_OK) {
|
||||||
ESP_LOGE(TAG, "esp_bt_controller_init failed: %s", esp_err_to_name(err));
|
ESP_LOGE(TAG, "esp_bt_controller_init failed: %s", esp_err_to_name(err));
|
||||||
|
67
esphome/components/esp32_ble/const_esp32c6.h
Normal file
67
esphome/components/esp32_ble/const_esp32c6.h
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#ifdef USE_ESP32_VARIANT_ESP32C6
|
||||||
|
|
||||||
|
#include <esp_bt.h>
|
||||||
|
|
||||||
|
namespace esphome {
|
||||||
|
namespace esp32_ble {
|
||||||
|
|
||||||
|
static const esp_bt_controller_config_t BT_CONTROLLER_CONFIG = {
|
||||||
|
.config_version = CONFIG_VERSION,
|
||||||
|
.ble_ll_resolv_list_size = CONFIG_BT_LE_LL_RESOLV_LIST_SIZE,
|
||||||
|
.ble_hci_evt_hi_buf_count = DEFAULT_BT_LE_HCI_EVT_HI_BUF_COUNT,
|
||||||
|
.ble_hci_evt_lo_buf_count = DEFAULT_BT_LE_HCI_EVT_LO_BUF_COUNT,
|
||||||
|
.ble_ll_sync_list_cnt = DEFAULT_BT_LE_MAX_PERIODIC_ADVERTISER_LIST,
|
||||||
|
.ble_ll_sync_cnt = DEFAULT_BT_LE_MAX_PERIODIC_SYNCS,
|
||||||
|
.ble_ll_rsp_dup_list_count = CONFIG_BT_LE_LL_DUP_SCAN_LIST_COUNT,
|
||||||
|
.ble_ll_adv_dup_list_count = CONFIG_BT_LE_LL_DUP_SCAN_LIST_COUNT,
|
||||||
|
.ble_ll_tx_pwr_dbm = BLE_LL_TX_PWR_DBM_N,
|
||||||
|
.rtc_freq = RTC_FREQ_N,
|
||||||
|
.ble_ll_sca = CONFIG_BT_LE_LL_SCA,
|
||||||
|
.ble_ll_scan_phy_number = BLE_LL_SCAN_PHY_NUMBER_N,
|
||||||
|
.ble_ll_conn_def_auth_pyld_tmo = BLE_LL_CONN_DEF_AUTH_PYLD_TMO_N,
|
||||||
|
.ble_ll_jitter_usecs = BLE_LL_JITTER_USECS_N,
|
||||||
|
.ble_ll_sched_max_adv_pdu_usecs = BLE_LL_SCHED_MAX_ADV_PDU_USECS_N,
|
||||||
|
.ble_ll_sched_direct_adv_max_usecs = BLE_LL_SCHED_DIRECT_ADV_MAX_USECS_N,
|
||||||
|
.ble_ll_sched_adv_max_usecs = BLE_LL_SCHED_ADV_MAX_USECS_N,
|
||||||
|
.ble_scan_rsp_data_max_len = DEFAULT_BT_LE_SCAN_RSP_DATA_MAX_LEN_N,
|
||||||
|
.ble_ll_cfg_num_hci_cmd_pkts = BLE_LL_CFG_NUM_HCI_CMD_PKTS_N,
|
||||||
|
.ble_ll_ctrl_proc_timeout_ms = BLE_LL_CTRL_PROC_TIMEOUT_MS_N,
|
||||||
|
.nimble_max_connections = DEFAULT_BT_LE_MAX_CONNECTIONS,
|
||||||
|
.ble_whitelist_size = DEFAULT_BT_NIMBLE_WHITELIST_SIZE, // NOLINT
|
||||||
|
.ble_acl_buf_size = DEFAULT_BT_LE_ACL_BUF_SIZE,
|
||||||
|
.ble_acl_buf_count = DEFAULT_BT_LE_ACL_BUF_COUNT,
|
||||||
|
.ble_hci_evt_buf_size = DEFAULT_BT_LE_HCI_EVT_BUF_SIZE,
|
||||||
|
.ble_multi_adv_instances = DEFAULT_BT_LE_MAX_EXT_ADV_INSTANCES,
|
||||||
|
.ble_ext_adv_max_size = DEFAULT_BT_LE_EXT_ADV_MAX_SIZE,
|
||||||
|
.controller_task_stack_size = NIMBLE_LL_STACK_SIZE,
|
||||||
|
.controller_task_prio = ESP_TASK_BT_CONTROLLER_PRIO,
|
||||||
|
.controller_run_cpu = 0,
|
||||||
|
.enable_qa_test = RUN_QA_TEST,
|
||||||
|
.enable_bqb_test = RUN_BQB_TEST,
|
||||||
|
.enable_uart_hci = HCI_UART_EN,
|
||||||
|
.ble_hci_uart_port = DEFAULT_BT_LE_HCI_UART_PORT,
|
||||||
|
.ble_hci_uart_baud = DEFAULT_BT_LE_HCI_UART_BAUD,
|
||||||
|
.ble_hci_uart_data_bits = DEFAULT_BT_LE_HCI_UART_DATA_BITS,
|
||||||
|
.ble_hci_uart_stop_bits = DEFAULT_BT_LE_HCI_UART_STOP_BITS,
|
||||||
|
.ble_hci_uart_flow_ctrl = DEFAULT_BT_LE_HCI_UART_FLOW_CTRL,
|
||||||
|
.ble_hci_uart_uart_parity = DEFAULT_BT_LE_HCI_UART_PARITY,
|
||||||
|
.enable_tx_cca = DEFAULT_BT_LE_TX_CCA_ENABLED,
|
||||||
|
.cca_rssi_thresh = 256 - DEFAULT_BT_LE_CCA_RSSI_THRESH,
|
||||||
|
.sleep_en = NIMBLE_SLEEP_ENABLE,
|
||||||
|
.coex_phy_coded_tx_rx_time_limit = DEFAULT_BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF,
|
||||||
|
.dis_scan_backoff = NIMBLE_DISABLE_SCAN_BACKOFF,
|
||||||
|
.ble_scan_classify_filter_enable = 1,
|
||||||
|
.main_xtal_freq = CONFIG_XTAL_FREQ,
|
||||||
|
.version_num = (uint8_t) efuse_hal_chip_revision(),
|
||||||
|
.cpu_freq_mhz = CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ,
|
||||||
|
.ignore_wl_for_direct_adv = 0,
|
||||||
|
.enable_pcl = DEFAULT_BT_LE_POWER_CONTROL_ENABLED,
|
||||||
|
.config_magic = CONFIG_MAGIC,
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace esp32_ble
|
||||||
|
} // namespace esphome
|
||||||
|
|
||||||
|
#endif // USE_ESP32_VARIANT_ESP32C6
|
@ -25,6 +25,9 @@
|
|||||||
#include <esp32-hal-bt.h>
|
#include <esp32-hal-bt.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define MBEDTLS_AES_ALT
|
||||||
|
#include <aes_alt.h>
|
||||||
|
|
||||||
// bt_trace.h
|
// bt_trace.h
|
||||||
#undef TAG
|
#undef TAG
|
||||||
|
|
||||||
@ -692,6 +695,39 @@ void ESP32BLETracker::print_bt_device_info(const ESPBTDevice &device) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool ESPBTDevice::resolve_irk(const uint8_t *irk) const {
|
||||||
|
uint8_t ecb_key[16];
|
||||||
|
uint8_t ecb_plaintext[16];
|
||||||
|
uint8_t ecb_ciphertext[16];
|
||||||
|
|
||||||
|
uint64_t addr64 = esp32_ble::ble_addr_to_uint64(this->address_);
|
||||||
|
|
||||||
|
memcpy(&ecb_key, irk, 16);
|
||||||
|
memset(&ecb_plaintext, 0, 16);
|
||||||
|
|
||||||
|
ecb_plaintext[13] = (addr64 >> 40) & 0xff;
|
||||||
|
ecb_plaintext[14] = (addr64 >> 32) & 0xff;
|
||||||
|
ecb_plaintext[15] = (addr64 >> 24) & 0xff;
|
||||||
|
|
||||||
|
mbedtls_aes_context ctx = {0, 0, {0}};
|
||||||
|
mbedtls_aes_init(&ctx);
|
||||||
|
|
||||||
|
if (mbedtls_aes_setkey_enc(&ctx, ecb_key, 128) != 0) {
|
||||||
|
mbedtls_aes_free(&ctx);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mbedtls_aes_crypt_ecb(&ctx, ESP_AES_ENCRYPT, ecb_plaintext, ecb_ciphertext) != 0) {
|
||||||
|
mbedtls_aes_free(&ctx);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
mbedtls_aes_free(&ctx);
|
||||||
|
|
||||||
|
return ecb_ciphertext[15] == (addr64 & 0xff) && ecb_ciphertext[14] == ((addr64 >> 8) & 0xff) &&
|
||||||
|
ecb_ciphertext[13] == ((addr64 >> 16) & 0xff);
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace esp32_ble_tracker
|
} // namespace esp32_ble_tracker
|
||||||
} // namespace esphome
|
} // namespace esphome
|
||||||
|
|
||||||
|
@ -86,6 +86,8 @@ class ESPBTDevice {
|
|||||||
|
|
||||||
const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &get_scan_result() const { return scan_result_; }
|
const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &get_scan_result() const { return scan_result_; }
|
||||||
|
|
||||||
|
bool resolve_irk(const uint8_t *irk) const;
|
||||||
|
|
||||||
optional<ESPBLEiBeacon> get_ibeacon() const {
|
optional<ESPBLEiBeacon> get_ibeacon() const {
|
||||||
for (auto &it : this->manufacturer_datas_) {
|
for (auto &it : this->manufacturer_datas_) {
|
||||||
auto res = ESPBLEiBeacon::from_manufacturer_data(it);
|
auto res = ESPBLEiBeacon::from_manufacturer_data(it);
|
||||||
|
@ -14,6 +14,7 @@ from esphome.const import (
|
|||||||
CONF_BRIGHTNESS,
|
CONF_BRIGHTNESS,
|
||||||
CONF_CONTRAST,
|
CONF_CONTRAST,
|
||||||
CONF_TRIGGER_ID,
|
CONF_TRIGGER_ID,
|
||||||
|
CONF_VSYNC_PIN,
|
||||||
)
|
)
|
||||||
from esphome.core import CORE
|
from esphome.core import CORE
|
||||||
from esphome.components.esp32 import add_idf_sdkconfig_option
|
from esphome.components.esp32 import add_idf_sdkconfig_option
|
||||||
@ -112,7 +113,6 @@ ENUM_SPECIAL_EFFECT = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# pin assignment
|
# pin assignment
|
||||||
CONF_VSYNC_PIN = "vsync_pin"
|
|
||||||
CONF_HREF_PIN = "href_pin"
|
CONF_HREF_PIN = "href_pin"
|
||||||
CONF_PIXEL_CLOCK_PIN = "pixel_clock_pin"
|
CONF_PIXEL_CLOCK_PIN = "pixel_clock_pin"
|
||||||
CONF_EXTERNAL_CLOCK = "external_clock"
|
CONF_EXTERNAL_CLOCK = "external_clock"
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
#include "ethernet_component.h"
|
#include "ethernet_component.h"
|
||||||
|
#include "esphome/core/application.h"
|
||||||
#include "esphome/core/log.h"
|
#include "esphome/core/log.h"
|
||||||
#include "esphome/core/util.h"
|
#include "esphome/core/util.h"
|
||||||
#include "esphome/core/application.h"
|
|
||||||
|
|
||||||
#ifdef USE_ESP32
|
#ifdef USE_ESP32
|
||||||
|
|
||||||
#include <cinttypes>
|
|
||||||
#include <lwip/dns.h>
|
#include <lwip/dns.h>
|
||||||
|
#include <cinttypes>
|
||||||
#include "esp_event.h"
|
#include "esp_event.h"
|
||||||
|
|
||||||
#ifdef USE_ETHERNET_SPI
|
#ifdef USE_ETHERNET_SPI
|
||||||
@ -184,6 +184,10 @@ void EthernetComponent::setup() {
|
|||||||
// KSZ8081RNA default is incorrect. It expects a 25MHz clock instead of the 50MHz we provide.
|
// KSZ8081RNA default is incorrect. It expects a 25MHz clock instead of the 50MHz we provide.
|
||||||
this->ksz8081_set_clock_reference_(mac);
|
this->ksz8081_set_clock_reference_(mac);
|
||||||
}
|
}
|
||||||
|
if (this->type_ == ETHERNET_TYPE_RTL8201 && this->clk_mode_ == EMAC_CLK_EXT_IN) {
|
||||||
|
// Change in default behavior of RTL8201FI may require register setting to enable external clock
|
||||||
|
this->rtl8201_set_rmii_mode_(mac);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// use ESP internal eth mac
|
// use ESP internal eth mac
|
||||||
@ -554,9 +558,10 @@ bool EthernetComponent::powerdown() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifndef USE_ETHERNET_SPI
|
#ifndef USE_ETHERNET_SPI
|
||||||
void EthernetComponent::ksz8081_set_clock_reference_(esp_eth_mac_t *mac) {
|
|
||||||
#define KSZ80XX_PC2R_REG_ADDR (0x1F)
|
|
||||||
|
|
||||||
|
constexpr uint8_t KSZ80XX_PC2R_REG_ADDR = 0x1F;
|
||||||
|
|
||||||
|
void EthernetComponent::ksz8081_set_clock_reference_(esp_eth_mac_t *mac) {
|
||||||
esp_err_t err;
|
esp_err_t err;
|
||||||
|
|
||||||
uint32_t phy_control_2;
|
uint32_t phy_control_2;
|
||||||
@ -581,9 +586,47 @@ void EthernetComponent::ksz8081_set_clock_reference_(esp_eth_mac_t *mac) {
|
|||||||
ESPHL_ERROR_CHECK(err, "Read PHY Control 2 failed");
|
ESPHL_ERROR_CHECK(err, "Read PHY Control 2 failed");
|
||||||
ESP_LOGVV(TAG, "KSZ8081 PHY Control 2: %s", format_hex_pretty((u_int8_t *) &phy_control_2, 2).c_str());
|
ESP_LOGVV(TAG, "KSZ8081 PHY Control 2: %s", format_hex_pretty((u_int8_t *) &phy_control_2, 2).c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
#undef KSZ80XX_PC2R_REG_ADDR
|
|
||||||
}
|
}
|
||||||
|
constexpr uint8_t RTL8201_RMSR_REG_ADDR = 0x10;
|
||||||
|
void EthernetComponent::rtl8201_set_rmii_mode_(esp_eth_mac_t *mac) {
|
||||||
|
esp_err_t err;
|
||||||
|
uint32_t phy_rmii_mode;
|
||||||
|
err = mac->write_phy_reg(mac, this->phy_addr_, 0x1f, 0x07);
|
||||||
|
ESPHL_ERROR_CHECK(err, "Setting Page 7 failed");
|
||||||
|
|
||||||
|
/*
|
||||||
|
* RTL8201 RMII Mode Setting Register (RMSR)
|
||||||
|
* Page 7 Register 16
|
||||||
|
*
|
||||||
|
* bit 0 Reserved 0
|
||||||
|
* bit 1 Rg_rmii_rxdsel 1 (default)
|
||||||
|
* bit 2 Rg_rmii_rxdv_sel: 0 (default)
|
||||||
|
* bit 3 RMII Mode: 1 (RMII Mode)
|
||||||
|
* bit 4~7 Rg_rmii_rx_offset: 1111 (default)
|
||||||
|
* bit 8~11 Rg_rmii_tx_offset: 1111 (default)
|
||||||
|
* bit 12 Rg_rmii_clkdir: 1 (Input)
|
||||||
|
* bit 13~15 Reserved 000
|
||||||
|
*
|
||||||
|
* Binary: 0001 1111 1111 1010
|
||||||
|
* Hex: 0x1FFA
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
err = mac->read_phy_reg(mac, this->phy_addr_, RTL8201_RMSR_REG_ADDR, &(phy_rmii_mode));
|
||||||
|
ESPHL_ERROR_CHECK(err, "Read PHY RMSR Register failed");
|
||||||
|
ESP_LOGV(TAG, "Hardware default RTL8201 RMII Mode Register is: 0x%04X", phy_rmii_mode);
|
||||||
|
|
||||||
|
err = mac->write_phy_reg(mac, this->phy_addr_, RTL8201_RMSR_REG_ADDR, 0x1FFA);
|
||||||
|
ESPHL_ERROR_CHECK(err, "Setting Register 16 RMII Mode Setting failed");
|
||||||
|
|
||||||
|
err = mac->read_phy_reg(mac, this->phy_addr_, RTL8201_RMSR_REG_ADDR, &(phy_rmii_mode));
|
||||||
|
ESPHL_ERROR_CHECK(err, "Read PHY RMSR Register failed");
|
||||||
|
ESP_LOGV(TAG, "Setting RTL8201 RMII Mode Register to: 0x%04X", phy_rmii_mode);
|
||||||
|
|
||||||
|
err = mac->write_phy_reg(mac, this->phy_addr_, 0x1f, 0x0);
|
||||||
|
ESPHL_ERROR_CHECK(err, "Setting Page 0 failed");
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
} // namespace ethernet
|
} // namespace ethernet
|
||||||
|
@ -86,6 +86,8 @@ class EthernetComponent : public Component {
|
|||||||
void dump_connect_params_();
|
void dump_connect_params_();
|
||||||
/// @brief Set `RMII Reference Clock Select` bit for KSZ8081.
|
/// @brief Set `RMII Reference Clock Select` bit for KSZ8081.
|
||||||
void ksz8081_set_clock_reference_(esp_eth_mac_t *mac);
|
void ksz8081_set_clock_reference_(esp_eth_mac_t *mac);
|
||||||
|
/// @brief Set `RMII Mode Setting Register` for RTL8201.
|
||||||
|
void rtl8201_set_rmii_mode_(esp_eth_mac_t *mac);
|
||||||
|
|
||||||
std::string use_address_;
|
std::string use_address_;
|
||||||
#ifdef USE_ETHERNET_SPI
|
#ifdef USE_ETHERNET_SPI
|
||||||
|
@ -49,7 +49,16 @@ def _process_git_config(config: dict, refresh) -> str:
|
|||||||
password=config.get(CONF_PASSWORD),
|
password=config.get(CONF_PASSWORD),
|
||||||
)
|
)
|
||||||
|
|
||||||
if (repo_dir / "esphome" / "components").is_dir():
|
if path := config.get(CONF_PATH):
|
||||||
|
if (repo_dir / path).is_dir():
|
||||||
|
components_dir = repo_dir / path
|
||||||
|
else:
|
||||||
|
raise cv.Invalid(
|
||||||
|
"Could not find components folder for source. Please check the source contains a '"
|
||||||
|
+ path
|
||||||
|
+ "' folder"
|
||||||
|
)
|
||||||
|
elif (repo_dir / "esphome" / "components").is_dir():
|
||||||
components_dir = repo_dir / "esphome" / "components"
|
components_dir = repo_dir / "esphome" / "components"
|
||||||
elif (repo_dir / "components").is_dir():
|
elif (repo_dir / "components").is_dir():
|
||||||
components_dir = repo_dir / "components"
|
components_dir = repo_dir / "components"
|
||||||
|
32
esphome/components/gdk101/__init__.py
Normal file
32
esphome/components/gdk101/__init__.py
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
import esphome.codegen as cg
|
||||||
|
import esphome.config_validation as cv
|
||||||
|
from esphome.components import i2c
|
||||||
|
from esphome.const import CONF_ID
|
||||||
|
|
||||||
|
CODEOWNERS = ["@Szewcson"]
|
||||||
|
|
||||||
|
DEPENDENCIES = ["i2c"]
|
||||||
|
MULTI_CONF = True
|
||||||
|
|
||||||
|
CONF_GDK101_ID = "gdk101_id"
|
||||||
|
|
||||||
|
gdk101_ns = cg.esphome_ns.namespace("gdk101")
|
||||||
|
GDK101Component = gdk101_ns.class_(
|
||||||
|
"GDK101Component", cg.PollingComponent, i2c.I2CDevice
|
||||||
|
)
|
||||||
|
|
||||||
|
CONFIG_SCHEMA = (
|
||||||
|
cv.Schema(
|
||||||
|
{
|
||||||
|
cv.GenerateID(): cv.declare_id(GDK101Component),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
.extend(cv.polling_component_schema("60s"))
|
||||||
|
.extend(i2c.i2c_device_schema(0x18))
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
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)
|
29
esphome/components/gdk101/binary_sensor.py
Normal file
29
esphome/components/gdk101/binary_sensor.py
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
import esphome.codegen as cg
|
||||||
|
import esphome.config_validation as cv
|
||||||
|
from esphome.components import binary_sensor
|
||||||
|
from esphome.const import (
|
||||||
|
CONF_VIBRATIONS,
|
||||||
|
DEVICE_CLASS_VIBRATION,
|
||||||
|
ENTITY_CATEGORY_DIAGNOSTIC,
|
||||||
|
ICON_VIBRATE,
|
||||||
|
)
|
||||||
|
from . import CONF_GDK101_ID, GDK101Component
|
||||||
|
|
||||||
|
DEPENDENCIES = ["gdk101"]
|
||||||
|
|
||||||
|
CONFIG_SCHEMA = cv.Schema(
|
||||||
|
{
|
||||||
|
cv.GenerateID(CONF_GDK101_ID): cv.use_id(GDK101Component),
|
||||||
|
cv.Required(CONF_VIBRATIONS): binary_sensor.binary_sensor_schema(
|
||||||
|
device_class=DEVICE_CLASS_VIBRATION,
|
||||||
|
entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
|
||||||
|
icon=ICON_VIBRATE,
|
||||||
|
),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
async def to_code(config):
|
||||||
|
hub = await cg.get_variable(config[CONF_GDK101_ID])
|
||||||
|
var = await binary_sensor.new_binary_sensor(config[CONF_VIBRATIONS])
|
||||||
|
cg.add(hub.set_vibration_binary_sensor(var))
|
189
esphome/components/gdk101/gdk101.cpp
Normal file
189
esphome/components/gdk101/gdk101.cpp
Normal file
@ -0,0 +1,189 @@
|
|||||||
|
#include "gdk101.h"
|
||||||
|
#include "esphome/core/hal.h"
|
||||||
|
#include "esphome/core/log.h"
|
||||||
|
|
||||||
|
namespace esphome {
|
||||||
|
namespace gdk101 {
|
||||||
|
|
||||||
|
static const char *const TAG = "gdk101";
|
||||||
|
static const uint8_t NUMBER_OF_READ_RETRIES = 5;
|
||||||
|
|
||||||
|
void GDK101Component::update() {
|
||||||
|
uint8_t data[2];
|
||||||
|
if (!this->read_dose_1m_(data)) {
|
||||||
|
this->status_set_warning("Failed to read dose 1m");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!this->read_dose_10m_(data)) {
|
||||||
|
this->status_set_warning("Failed to read dose 10m");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!this->read_status_(data)) {
|
||||||
|
this->status_set_warning("Failed to read status");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!this->read_measurement_duration_(data)) {
|
||||||
|
this->status_set_warning("Failed to read measurement duration");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this->status_clear_warning();
|
||||||
|
}
|
||||||
|
|
||||||
|
void GDK101Component::setup() {
|
||||||
|
uint8_t data[2];
|
||||||
|
ESP_LOGCONFIG(TAG, "Setting up GDK101...");
|
||||||
|
// first, reset the sensor
|
||||||
|
if (!this->reset_sensor_(data)) {
|
||||||
|
this->status_set_error("Reset failed!");
|
||||||
|
this->mark_failed();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// sensor should acknowledge success of the reset procedure
|
||||||
|
if (data[0] != 1) {
|
||||||
|
this->status_set_error("Reset not acknowledged!");
|
||||||
|
this->mark_failed();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
delay(10);
|
||||||
|
// read firmware version
|
||||||
|
if (!this->read_fw_version_(data)) {
|
||||||
|
this->status_set_error("Failed to read firmware version");
|
||||||
|
this->mark_failed();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void GDK101Component::dump_config() {
|
||||||
|
ESP_LOGCONFIG(TAG, "GDK101:");
|
||||||
|
LOG_I2C_DEVICE(this);
|
||||||
|
if (this->is_failed()) {
|
||||||
|
ESP_LOGE(TAG, "Communication with GDK101 failed!");
|
||||||
|
}
|
||||||
|
#ifdef USE_SENSOR
|
||||||
|
LOG_SENSOR(" ", "Firmware Version", this->fw_version_sensor_);
|
||||||
|
LOG_SENSOR(" ", "Average Radaition Dose per 1 minute", this->rad_1m_sensor_);
|
||||||
|
LOG_SENSOR(" ", "Average Radaition Dose per 10 minutes", this->rad_10m_sensor_);
|
||||||
|
LOG_SENSOR(" ", "Status", this->status_sensor_);
|
||||||
|
LOG_SENSOR(" ", "Measurement Duration", this->measurement_duration_sensor_);
|
||||||
|
#endif // USE_SENSOR
|
||||||
|
|
||||||
|
#ifdef USE_BINARY_SENSOR
|
||||||
|
LOG_BINARY_SENSOR(" ", "Vibration Status", this->vibration_binary_sensor_);
|
||||||
|
#endif // USE_BINARY_SENSOR
|
||||||
|
}
|
||||||
|
|
||||||
|
float GDK101Component::get_setup_priority() const { return setup_priority::DATA; }
|
||||||
|
|
||||||
|
bool GDK101Component::read_bytes_with_retry_(uint8_t a_register, uint8_t *data, uint8_t len) {
|
||||||
|
uint8_t retry = NUMBER_OF_READ_RETRIES;
|
||||||
|
bool status = false;
|
||||||
|
while (!status && retry) {
|
||||||
|
status = this->read_bytes(a_register, data, len);
|
||||||
|
retry--;
|
||||||
|
}
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool GDK101Component::reset_sensor_(uint8_t *data) {
|
||||||
|
// It looks like reset is not so well designed in that sensor
|
||||||
|
// After sending reset command it looks that sensor start performing reset and is unresponsible during read
|
||||||
|
// after a while we can send another reset command and read "0x01" as confirmation
|
||||||
|
// Documentation not going in to such details unfortunately
|
||||||
|
if (!this->read_bytes_with_retry_(GDK101_REG_RESET, data, 2)) {
|
||||||
|
ESP_LOGE(TAG, "Updating GDK101 failed!");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool GDK101Component::read_dose_1m_(uint8_t *data) {
|
||||||
|
#ifdef USE_SENSOR
|
||||||
|
if (this->rad_1m_sensor_ != nullptr) {
|
||||||
|
if (!this->read_bytes(GDK101_REG_READ_1MIN_AVG, data, 2)) {
|
||||||
|
ESP_LOGE(TAG, "Updating GDK101 failed!");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const float dose = data[0] + (data[1] / 100.0f);
|
||||||
|
|
||||||
|
this->rad_1m_sensor_->publish_state(dose);
|
||||||
|
}
|
||||||
|
#endif // USE_SENSOR
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool GDK101Component::read_dose_10m_(uint8_t *data) {
|
||||||
|
#ifdef USE_SENSOR
|
||||||
|
if (this->rad_10m_sensor_ != nullptr) {
|
||||||
|
if (!this->read_bytes(GDK101_REG_READ_10MIN_AVG, data, 2)) {
|
||||||
|
ESP_LOGE(TAG, "Updating GDK101 failed!");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const float dose = data[0] + (data[1] / 100.0f);
|
||||||
|
|
||||||
|
this->rad_10m_sensor_->publish_state(dose);
|
||||||
|
}
|
||||||
|
#endif // USE_SENSOR
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool GDK101Component::read_status_(uint8_t *data) {
|
||||||
|
if (!this->read_bytes(GDK101_REG_READ_STATUS, data, 2)) {
|
||||||
|
ESP_LOGE(TAG, "Updating GDK101 failed!");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef USE_SENSOR
|
||||||
|
if (this->status_sensor_ != nullptr) {
|
||||||
|
this->status_sensor_->publish_state(data[0]);
|
||||||
|
}
|
||||||
|
#endif // USE_SENSOR
|
||||||
|
|
||||||
|
#ifdef USE_BINARY_SENSOR
|
||||||
|
if (this->vibration_binary_sensor_ != nullptr) {
|
||||||
|
this->vibration_binary_sensor_->publish_state(data[1]);
|
||||||
|
}
|
||||||
|
#endif // USE_BINARY_SENSOR
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool GDK101Component::read_fw_version_(uint8_t *data) {
|
||||||
|
#ifdef USE_SENSOR
|
||||||
|
if (this->fw_version_sensor_ != nullptr) {
|
||||||
|
if (!this->read_bytes(GDK101_REG_READ_FIRMWARE, data, 2)) {
|
||||||
|
ESP_LOGE(TAG, "Updating GDK101 failed!");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const float fw_version = data[0] + (data[1] / 10.0f);
|
||||||
|
|
||||||
|
this->fw_version_sensor_->publish_state(fw_version);
|
||||||
|
}
|
||||||
|
#endif // USE_SENSOR
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool GDK101Component::read_measurement_duration_(uint8_t *data) {
|
||||||
|
#ifdef USE_SENSOR
|
||||||
|
if (this->measurement_duration_sensor_ != nullptr) {
|
||||||
|
if (!this->read_bytes(GDK101_REG_READ_MEASURING_TIME, data, 2)) {
|
||||||
|
ESP_LOGE(TAG, "Updating GDK101 failed!");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const float meas_time = (data[0] * 60) + data[1];
|
||||||
|
|
||||||
|
this->measurement_duration_sensor_->publish_state(meas_time);
|
||||||
|
}
|
||||||
|
#endif // USE_SENSOR
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace gdk101
|
||||||
|
} // namespace esphome
|
52
esphome/components/gdk101/gdk101.h
Normal file
52
esphome/components/gdk101/gdk101.h
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "esphome/core/component.h"
|
||||||
|
#include "esphome/core/defines.h"
|
||||||
|
#ifdef USE_SENSOR
|
||||||
|
#include "esphome/components/sensor/sensor.h"
|
||||||
|
#endif // USE_SENSOR
|
||||||
|
#ifdef USE_BINARY_SENSOR
|
||||||
|
#include "esphome/components/binary_sensor/binary_sensor.h"
|
||||||
|
#endif // USE_BINARY_SENSOR
|
||||||
|
#include "esphome/components/i2c/i2c.h"
|
||||||
|
|
||||||
|
namespace esphome {
|
||||||
|
namespace gdk101 {
|
||||||
|
|
||||||
|
static const uint8_t GDK101_REG_READ_FIRMWARE = 0xB4; // Firmware version
|
||||||
|
static const uint8_t GDK101_REG_RESET = 0xA0; // Reset register - reading its value triggers reset
|
||||||
|
static const uint8_t GDK101_REG_READ_STATUS = 0xB0; // Status register
|
||||||
|
static const uint8_t GDK101_REG_READ_MEASURING_TIME = 0xB1; // Mesuring time
|
||||||
|
static const uint8_t GDK101_REG_READ_10MIN_AVG = 0xB2; // Average radiation dose per 10 min
|
||||||
|
static const uint8_t GDK101_REG_READ_1MIN_AVG = 0xB3; // Average radiation dose per 1 min
|
||||||
|
|
||||||
|
class GDK101Component : public PollingComponent, public i2c::I2CDevice {
|
||||||
|
#ifdef USE_SENSOR
|
||||||
|
SUB_SENSOR(rad_1m)
|
||||||
|
SUB_SENSOR(rad_10m)
|
||||||
|
SUB_SENSOR(status)
|
||||||
|
SUB_SENSOR(fw_version)
|
||||||
|
SUB_SENSOR(measurement_duration)
|
||||||
|
#endif // USE_SENSOR
|
||||||
|
#ifdef USE_BINARY_SENSOR
|
||||||
|
SUB_BINARY_SENSOR(vibration)
|
||||||
|
#endif // USE_BINARY_SENSOR
|
||||||
|
|
||||||
|
public:
|
||||||
|
void setup() override;
|
||||||
|
void dump_config() override;
|
||||||
|
float get_setup_priority() const override;
|
||||||
|
void update() override;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
bool read_bytes_with_retry_(uint8_t a_register, uint8_t *data, uint8_t len);
|
||||||
|
bool reset_sensor_(uint8_t *data);
|
||||||
|
bool read_dose_1m_(uint8_t *data);
|
||||||
|
bool read_dose_10m_(uint8_t *data);
|
||||||
|
bool read_status_(uint8_t *data);
|
||||||
|
bool read_fw_version_(uint8_t *data);
|
||||||
|
bool read_measurement_duration_(uint8_t *data);
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace gdk101
|
||||||
|
} // namespace esphome
|
83
esphome/components/gdk101/sensor.py
Normal file
83
esphome/components/gdk101/sensor.py
Normal file
@ -0,0 +1,83 @@
|
|||||||
|
import esphome.codegen as cg
|
||||||
|
import esphome.config_validation as cv
|
||||||
|
from esphome.components import sensor
|
||||||
|
from esphome.const import (
|
||||||
|
DEVICE_CLASS_DURATION,
|
||||||
|
DEVICE_CLASS_EMPTY,
|
||||||
|
ENTITY_CATEGORY_DIAGNOSTIC,
|
||||||
|
CONF_MEASUREMENT_DURATION,
|
||||||
|
CONF_STATUS,
|
||||||
|
CONF_VERSION,
|
||||||
|
ICON_RADIOACTIVE,
|
||||||
|
ICON_TIMER,
|
||||||
|
STATE_CLASS_MEASUREMENT,
|
||||||
|
STATE_CLASS_TOTAL_INCREASING,
|
||||||
|
UNIT_MICROSILVERTS_PER_HOUR,
|
||||||
|
UNIT_SECOND,
|
||||||
|
)
|
||||||
|
from . import CONF_GDK101_ID, GDK101Component
|
||||||
|
|
||||||
|
CONF_RADIATION_DOSE_PER_1M = "radiation_dose_per_1m"
|
||||||
|
CONF_RADIATION_DOSE_PER_10M = "radiation_dose_per_10m"
|
||||||
|
|
||||||
|
DEPENDENCIES = ["gdk101"]
|
||||||
|
|
||||||
|
CONFIG_SCHEMA = cv.Schema(
|
||||||
|
{
|
||||||
|
cv.GenerateID(CONF_GDK101_ID): cv.use_id(GDK101Component),
|
||||||
|
cv.Optional(CONF_RADIATION_DOSE_PER_1M): sensor.sensor_schema(
|
||||||
|
icon=ICON_RADIOACTIVE,
|
||||||
|
unit_of_measurement=UNIT_MICROSILVERTS_PER_HOUR,
|
||||||
|
accuracy_decimals=2,
|
||||||
|
device_class=DEVICE_CLASS_EMPTY,
|
||||||
|
state_class=STATE_CLASS_MEASUREMENT,
|
||||||
|
),
|
||||||
|
cv.Optional(CONF_RADIATION_DOSE_PER_10M): sensor.sensor_schema(
|
||||||
|
icon=ICON_RADIOACTIVE,
|
||||||
|
unit_of_measurement=UNIT_MICROSILVERTS_PER_HOUR,
|
||||||
|
accuracy_decimals=2,
|
||||||
|
device_class=DEVICE_CLASS_EMPTY,
|
||||||
|
state_class=STATE_CLASS_MEASUREMENT,
|
||||||
|
),
|
||||||
|
cv.Optional(CONF_VERSION): sensor.sensor_schema(
|
||||||
|
entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
|
||||||
|
accuracy_decimals=1,
|
||||||
|
),
|
||||||
|
cv.Optional(CONF_STATUS): sensor.sensor_schema(
|
||||||
|
entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
|
||||||
|
accuracy_decimals=0,
|
||||||
|
),
|
||||||
|
cv.Optional(CONF_MEASUREMENT_DURATION): sensor.sensor_schema(
|
||||||
|
unit_of_measurement=UNIT_SECOND,
|
||||||
|
icon=ICON_TIMER,
|
||||||
|
accuracy_decimals=0,
|
||||||
|
state_class=STATE_CLASS_TOTAL_INCREASING,
|
||||||
|
device_class=DEVICE_CLASS_DURATION,
|
||||||
|
entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
|
||||||
|
),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
async def to_code(config):
|
||||||
|
hub = await cg.get_variable(config[CONF_GDK101_ID])
|
||||||
|
|
||||||
|
if radiation_dose_per_1m := config.get(CONF_RADIATION_DOSE_PER_1M):
|
||||||
|
sens = await sensor.new_sensor(radiation_dose_per_1m)
|
||||||
|
cg.add(hub.set_rad_1m_sensor(sens))
|
||||||
|
|
||||||
|
if radiation_dose_per_10m := config.get(CONF_RADIATION_DOSE_PER_10M):
|
||||||
|
sens = await sensor.new_sensor(radiation_dose_per_10m)
|
||||||
|
cg.add(hub.set_rad_10m_sensor(sens))
|
||||||
|
|
||||||
|
if version_config := config.get(CONF_VERSION):
|
||||||
|
sens = await sensor.new_sensor(version_config)
|
||||||
|
cg.add(hub.set_fw_version_sensor(sens))
|
||||||
|
|
||||||
|
if status_config := config.get(CONF_STATUS):
|
||||||
|
sens = await sensor.new_sensor(status_config)
|
||||||
|
cg.add(hub.set_status_sensor(sens))
|
||||||
|
|
||||||
|
if measurement_duration_config := config.get(CONF_MEASUREMENT_DURATION):
|
||||||
|
sens = await sensor.new_sensor(measurement_duration_config)
|
||||||
|
cg.add(hub.set_measurement_duration_sensor(sens))
|
@ -1,7 +1,7 @@
|
|||||||
import esphome.codegen as cg
|
import esphome.codegen as cg
|
||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
from esphome.components import display, font, color
|
from esphome.components import display, font, color
|
||||||
from esphome.const import CONF_ID, CONF_TRIGGER_ID
|
from esphome.const import CONF_DISPLAY, CONF_ID, CONF_TRIGGER_ID
|
||||||
from esphome import automation, core
|
from esphome import automation, core
|
||||||
|
|
||||||
from esphome.components.display_menu_base import (
|
from esphome.components.display_menu_base import (
|
||||||
@ -10,7 +10,6 @@ from esphome.components.display_menu_base import (
|
|||||||
display_menu_to_code,
|
display_menu_to_code,
|
||||||
)
|
)
|
||||||
|
|
||||||
CONF_DISPLAY = "display"
|
|
||||||
CONF_FONT = "font"
|
CONF_FONT = "font"
|
||||||
CONF_MENU_ITEM_VALUE = "menu_item_value"
|
CONF_MENU_ITEM_VALUE = "menu_item_value"
|
||||||
CONF_FOREGROUND_COLOR = "foreground_color"
|
CONF_FOREGROUND_COLOR = "foreground_color"
|
||||||
|
@ -6,12 +6,14 @@ from esphome.components import uart, climate, logger
|
|||||||
from esphome import automation
|
from esphome import automation
|
||||||
from esphome.const import (
|
from esphome.const import (
|
||||||
CONF_BEEPER,
|
CONF_BEEPER,
|
||||||
|
CONF_DISPLAY,
|
||||||
CONF_ID,
|
CONF_ID,
|
||||||
CONF_LEVEL,
|
CONF_LEVEL,
|
||||||
CONF_LOGGER,
|
CONF_LOGGER,
|
||||||
CONF_LOGS,
|
CONF_LOGS,
|
||||||
CONF_MAX_TEMPERATURE,
|
CONF_MAX_TEMPERATURE,
|
||||||
CONF_MIN_TEMPERATURE,
|
CONF_MIN_TEMPERATURE,
|
||||||
|
CONF_OUTDOOR_TEMPERATURE,
|
||||||
CONF_PROTOCOL,
|
CONF_PROTOCOL,
|
||||||
CONF_SUPPORTED_MODES,
|
CONF_SUPPORTED_MODES,
|
||||||
CONF_SUPPORTED_PRESETS,
|
CONF_SUPPORTED_PRESETS,
|
||||||
@ -43,11 +45,9 @@ CONF_ALTERNATIVE_SWING_CONTROL = "alternative_swing_control"
|
|||||||
CONF_ANSWER_TIMEOUT = "answer_timeout"
|
CONF_ANSWER_TIMEOUT = "answer_timeout"
|
||||||
CONF_CONTROL_METHOD = "control_method"
|
CONF_CONTROL_METHOD = "control_method"
|
||||||
CONF_CONTROL_PACKET_SIZE = "control_packet_size"
|
CONF_CONTROL_PACKET_SIZE = "control_packet_size"
|
||||||
CONF_DISPLAY = "display"
|
|
||||||
CONF_HORIZONTAL_AIRFLOW = "horizontal_airflow"
|
CONF_HORIZONTAL_AIRFLOW = "horizontal_airflow"
|
||||||
CONF_ON_ALARM_START = "on_alarm_start"
|
CONF_ON_ALARM_START = "on_alarm_start"
|
||||||
CONF_ON_ALARM_END = "on_alarm_end"
|
CONF_ON_ALARM_END = "on_alarm_end"
|
||||||
CONF_OUTDOOR_TEMPERATURE = "outdoor_temperature"
|
|
||||||
CONF_VERTICAL_AIRFLOW = "vertical_airflow"
|
CONF_VERTICAL_AIRFLOW = "vertical_airflow"
|
||||||
CONF_WIFI_SIGNAL = "wifi_signal"
|
CONF_WIFI_SIGNAL = "wifi_signal"
|
||||||
|
|
||||||
|
@ -2,6 +2,7 @@ import esphome.codegen as cg
|
|||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
from esphome.components import sensor
|
from esphome.components import sensor
|
||||||
from esphome.const import (
|
from esphome.const import (
|
||||||
|
CONF_OUTDOOR_TEMPERATURE,
|
||||||
CONF_POWER,
|
CONF_POWER,
|
||||||
CONF_HUMIDITY,
|
CONF_HUMIDITY,
|
||||||
DEVICE_CLASS_CURRENT,
|
DEVICE_CLASS_CURRENT,
|
||||||
@ -41,7 +42,6 @@ CONF_OUTDOOR_COIL_TEMPERATURE = "outdoor_coil_temperature"
|
|||||||
CONF_OUTDOOR_DEFROST_TEMPERATURE = "outdoor_defrost_temperature"
|
CONF_OUTDOOR_DEFROST_TEMPERATURE = "outdoor_defrost_temperature"
|
||||||
CONF_OUTDOOR_IN_AIR_TEMPERATURE = "outdoor_in_air_temperature"
|
CONF_OUTDOOR_IN_AIR_TEMPERATURE = "outdoor_in_air_temperature"
|
||||||
CONF_OUTDOOR_OUT_AIR_TEMPERATURE = "outdoor_out_air_temperature"
|
CONF_OUTDOOR_OUT_AIR_TEMPERATURE = "outdoor_out_air_temperature"
|
||||||
CONF_OUTDOOR_TEMPERATURE = "outdoor_temperature"
|
|
||||||
|
|
||||||
# Additional icons
|
# Additional icons
|
||||||
ICON_SNOWFLAKE_THERMOMETER = "mdi:snowflake-thermometer"
|
ICON_SNOWFLAKE_THERMOMETER = "mdi:snowflake-thermometer"
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#include "hmc5883l.h"
|
#include "hmc5883l.h"
|
||||||
#include "esphome/core/log.h"
|
#include "esphome/core/log.h"
|
||||||
|
#include "esphome/core/application.h"
|
||||||
|
|
||||||
namespace esphome {
|
namespace esphome {
|
||||||
namespace hmc5883l {
|
namespace hmc5883l {
|
||||||
@ -31,6 +32,10 @@ void HMC5883LComponent::setup() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (this->get_update_interval() < App.get_loop_interval()) {
|
||||||
|
high_freq_.start();
|
||||||
|
}
|
||||||
|
|
||||||
if (id[0] != 0x48 || id[1] != 0x34 || id[2] != 0x33) {
|
if (id[0] != 0x48 || id[1] != 0x34 || id[2] != 0x33) {
|
||||||
this->error_code_ = ID_REGISTERS;
|
this->error_code_ = ID_REGISTERS;
|
||||||
this->mark_failed();
|
this->mark_failed();
|
||||||
|
@ -63,6 +63,7 @@ class HMC5883LComponent : public PollingComponent, public i2c::I2CDevice {
|
|||||||
COMMUNICATION_FAILED,
|
COMMUNICATION_FAILED,
|
||||||
ID_REGISTERS,
|
ID_REGISTERS,
|
||||||
} error_code_;
|
} error_code_;
|
||||||
|
HighFrequencyLoopRequester high_freq_;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace hmc5883l
|
} // namespace hmc5883l
|
||||||
|
@ -6,6 +6,7 @@ from esphome.const import (
|
|||||||
CONF_FIELD_STRENGTH_X,
|
CONF_FIELD_STRENGTH_X,
|
||||||
CONF_FIELD_STRENGTH_Y,
|
CONF_FIELD_STRENGTH_Y,
|
||||||
CONF_FIELD_STRENGTH_Z,
|
CONF_FIELD_STRENGTH_Z,
|
||||||
|
CONF_HEADING,
|
||||||
CONF_ID,
|
CONF_ID,
|
||||||
CONF_OVERSAMPLING,
|
CONF_OVERSAMPLING,
|
||||||
CONF_RANGE,
|
CONF_RANGE,
|
||||||
@ -21,7 +22,6 @@ DEPENDENCIES = ["i2c"]
|
|||||||
|
|
||||||
hmc5883l_ns = cg.esphome_ns.namespace("hmc5883l")
|
hmc5883l_ns = cg.esphome_ns.namespace("hmc5883l")
|
||||||
|
|
||||||
CONF_HEADING = "heading"
|
|
||||||
|
|
||||||
HMC5883LComponent = hmc5883l_ns.class_(
|
HMC5883LComponent = hmc5883l_ns.class_(
|
||||||
"HMC5883LComponent", cg.PollingComponent, i2c.I2CDevice
|
"HMC5883LComponent", cg.PollingComponent, i2c.I2CDevice
|
||||||
|
@ -10,6 +10,11 @@ namespace i2s_audio {
|
|||||||
static const char *const TAG = "audio";
|
static const char *const TAG = "audio";
|
||||||
|
|
||||||
void I2SAudioMediaPlayer::control(const media_player::MediaPlayerCall &call) {
|
void I2SAudioMediaPlayer::control(const media_player::MediaPlayerCall &call) {
|
||||||
|
media_player::MediaPlayerState play_state = media_player::MEDIA_PLAYER_STATE_PLAYING;
|
||||||
|
if (call.get_announcement().has_value()) {
|
||||||
|
play_state = call.get_announcement().value() ? media_player::MEDIA_PLAYER_STATE_ANNOUNCING
|
||||||
|
: media_player::MEDIA_PLAYER_STATE_PLAYING;
|
||||||
|
}
|
||||||
if (call.get_media_url().has_value()) {
|
if (call.get_media_url().has_value()) {
|
||||||
this->current_url_ = call.get_media_url();
|
this->current_url_ = call.get_media_url();
|
||||||
if (this->i2s_state_ != I2S_STATE_STOPPED && this->audio_ != nullptr) {
|
if (this->i2s_state_ != I2S_STATE_STOPPED && this->audio_ != nullptr) {
|
||||||
@ -17,7 +22,7 @@ void I2SAudioMediaPlayer::control(const media_player::MediaPlayerCall &call) {
|
|||||||
this->audio_->stopSong();
|
this->audio_->stopSong();
|
||||||
}
|
}
|
||||||
this->audio_->connecttohost(this->current_url_.value().c_str());
|
this->audio_->connecttohost(this->current_url_.value().c_str());
|
||||||
this->state = media_player::MEDIA_PLAYER_STATE_PLAYING;
|
this->state = play_state;
|
||||||
} else {
|
} else {
|
||||||
this->start();
|
this->start();
|
||||||
}
|
}
|
||||||
@ -35,7 +40,7 @@ void I2SAudioMediaPlayer::control(const media_player::MediaPlayerCall &call) {
|
|||||||
case media_player::MEDIA_PLAYER_COMMAND_PLAY:
|
case media_player::MEDIA_PLAYER_COMMAND_PLAY:
|
||||||
if (!this->audio_->isRunning())
|
if (!this->audio_->isRunning())
|
||||||
this->audio_->pauseResume();
|
this->audio_->pauseResume();
|
||||||
this->state = media_player::MEDIA_PLAYER_STATE_PLAYING;
|
this->state = play_state;
|
||||||
break;
|
break;
|
||||||
case media_player::MEDIA_PLAYER_COMMAND_PAUSE:
|
case media_player::MEDIA_PLAYER_COMMAND_PAUSE:
|
||||||
if (this->audio_->isRunning())
|
if (this->audio_->isRunning())
|
||||||
@ -126,7 +131,9 @@ void I2SAudioMediaPlayer::loop() {
|
|||||||
|
|
||||||
void I2SAudioMediaPlayer::play_() {
|
void I2SAudioMediaPlayer::play_() {
|
||||||
this->audio_->loop();
|
this->audio_->loop();
|
||||||
if (this->state == media_player::MEDIA_PLAYER_STATE_PLAYING && !this->audio_->isRunning()) {
|
if ((this->state == media_player::MEDIA_PLAYER_STATE_PLAYING ||
|
||||||
|
this->state == media_player::MEDIA_PLAYER_STATE_ANNOUNCING) &&
|
||||||
|
!this->audio_->isRunning()) {
|
||||||
this->stop();
|
this->stop();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -164,6 +171,10 @@ void I2SAudioMediaPlayer::start_() {
|
|||||||
if (this->current_url_.has_value()) {
|
if (this->current_url_.has_value()) {
|
||||||
this->audio_->connecttohost(this->current_url_.value().c_str());
|
this->audio_->connecttohost(this->current_url_.value().c_str());
|
||||||
this->state = media_player::MEDIA_PLAYER_STATE_PLAYING;
|
this->state = media_player::MEDIA_PLAYER_STATE_PLAYING;
|
||||||
|
if (this->is_announcement_.has_value()) {
|
||||||
|
this->state = this->is_announcement_.value() ? media_player::MEDIA_PLAYER_STATE_ANNOUNCING
|
||||||
|
: media_player::MEDIA_PLAYER_STATE_PLAYING;
|
||||||
|
}
|
||||||
this->publish_state();
|
this->publish_state();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -78,6 +78,7 @@ class I2SAudioMediaPlayer : public Component, public media_player::MediaPlayer,
|
|||||||
HighFrequencyLoopRequester high_freq_;
|
HighFrequencyLoopRequester high_freq_;
|
||||||
|
|
||||||
optional<std::string> current_url_{};
|
optional<std::string> current_url_{};
|
||||||
|
optional<bool> is_announcement_{};
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace i2s_audio
|
} // namespace i2s_audio
|
||||||
|
@ -7,6 +7,7 @@ from esphome.const import (
|
|||||||
CONF_ID,
|
CONF_ID,
|
||||||
CONF_LAMBDA,
|
CONF_LAMBDA,
|
||||||
CONF_MODEL,
|
CONF_MODEL,
|
||||||
|
CONF_OE_PIN,
|
||||||
CONF_PAGES,
|
CONF_PAGES,
|
||||||
CONF_WAKEUP_PIN,
|
CONF_WAKEUP_PIN,
|
||||||
)
|
)
|
||||||
@ -29,7 +30,6 @@ CONF_GREYSCALE = "greyscale"
|
|||||||
CONF_GMOD_PIN = "gmod_pin"
|
CONF_GMOD_PIN = "gmod_pin"
|
||||||
CONF_GPIO0_ENABLE_PIN = "gpio0_enable_pin"
|
CONF_GPIO0_ENABLE_PIN = "gpio0_enable_pin"
|
||||||
CONF_LE_PIN = "le_pin"
|
CONF_LE_PIN = "le_pin"
|
||||||
CONF_OE_PIN = "oe_pin"
|
|
||||||
CONF_PARTIAL_UPDATING = "partial_updating"
|
CONF_PARTIAL_UPDATING = "partial_updating"
|
||||||
CONF_POWERUP_PIN = "powerup_pin"
|
CONF_POWERUP_PIN = "powerup_pin"
|
||||||
CONF_SPH_PIN = "sph_pin"
|
CONF_SPH_PIN = "sph_pin"
|
||||||
|
@ -3,6 +3,7 @@ import esphome.config_validation as cv
|
|||||||
from esphome.components import i2c, sensor
|
from esphome.components import i2c, sensor
|
||||||
from esphome.const import (
|
from esphome.const import (
|
||||||
CONF_ID,
|
CONF_ID,
|
||||||
|
CONF_INTERNAL_TEMPERATURE,
|
||||||
CONF_TEMPERATURE,
|
CONF_TEMPERATURE,
|
||||||
DEVICE_CLASS_TEMPERATURE,
|
DEVICE_CLASS_TEMPERATURE,
|
||||||
STATE_CLASS_MEASUREMENT,
|
STATE_CLASS_MEASUREMENT,
|
||||||
@ -10,7 +11,6 @@ from esphome.const import (
|
|||||||
ENTITY_CATEGORY_DIAGNOSTIC,
|
ENTITY_CATEGORY_DIAGNOSTIC,
|
||||||
)
|
)
|
||||||
|
|
||||||
CONF_INTERNAL_TEMPERATURE = "internal_temperature"
|
|
||||||
DEPENDENCIES = ["i2c"]
|
DEPENDENCIES = ["i2c"]
|
||||||
|
|
||||||
kmeteriso_ns = cg.esphome_ns.namespace("kmeteriso")
|
kmeteriso_ns = cg.esphome_ns.namespace("kmeteriso")
|
||||||
|
@ -3,6 +3,7 @@ import esphome.config_validation as cv
|
|||||||
from esphome.const import (
|
from esphome.const import (
|
||||||
CONF_ID,
|
CONF_ID,
|
||||||
CONF_DIMENSIONS,
|
CONF_DIMENSIONS,
|
||||||
|
CONF_DISPLAY_ID,
|
||||||
)
|
)
|
||||||
from esphome.core.entity_helpers import inherit_property_from
|
from esphome.core.entity_helpers import inherit_property_from
|
||||||
from esphome.components import lcd_base
|
from esphome.components import lcd_base
|
||||||
@ -18,8 +19,6 @@ AUTO_LOAD = ["display_menu_base"]
|
|||||||
|
|
||||||
lcd_menu_ns = cg.esphome_ns.namespace("lcd_menu")
|
lcd_menu_ns = cg.esphome_ns.namespace("lcd_menu")
|
||||||
|
|
||||||
CONF_DISPLAY_ID = "display_id"
|
|
||||||
|
|
||||||
CONF_MARK_SELECTED = "mark_selected"
|
CONF_MARK_SELECTED = "mark_selected"
|
||||||
CONF_MARK_EDITING = "mark_editing"
|
CONF_MARK_EDITING = "mark_editing"
|
||||||
CONF_MARK_SUBMENU = "mark_submenu"
|
CONF_MARK_SUBMENU = "mark_submenu"
|
||||||
|
@ -8,13 +8,13 @@ from esphome.const import (
|
|||||||
ENTITY_CATEGORY_DIAGNOSTIC,
|
ENTITY_CATEGORY_DIAGNOSTIC,
|
||||||
ICON_MOTION_SENSOR,
|
ICON_MOTION_SENSOR,
|
||||||
ICON_ACCOUNT,
|
ICON_ACCOUNT,
|
||||||
|
CONF_HAS_TARGET,
|
||||||
|
CONF_HAS_MOVING_TARGET,
|
||||||
|
CONF_HAS_STILL_TARGET,
|
||||||
)
|
)
|
||||||
from . import CONF_LD2410_ID, LD2410Component
|
from . import CONF_LD2410_ID, LD2410Component
|
||||||
|
|
||||||
DEPENDENCIES = ["ld2410"]
|
DEPENDENCIES = ["ld2410"]
|
||||||
CONF_HAS_TARGET = "has_target"
|
|
||||||
CONF_HAS_MOVING_TARGET = "has_moving_target"
|
|
||||||
CONF_HAS_STILL_TARGET = "has_still_target"
|
|
||||||
CONF_OUT_PIN_PRESENCE_STATUS = "out_pin_presence_status"
|
CONF_OUT_PIN_PRESENCE_STATUS = "out_pin_presence_status"
|
||||||
|
|
||||||
CONFIG_SCHEMA = {
|
CONFIG_SCHEMA = {
|
||||||
|
@ -2,6 +2,8 @@ import esphome.codegen as cg
|
|||||||
from esphome.components import button
|
from esphome.components import button
|
||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
from esphome.const import (
|
from esphome.const import (
|
||||||
|
CONF_FACTORY_RESET,
|
||||||
|
CONF_RESTART,
|
||||||
DEVICE_CLASS_RESTART,
|
DEVICE_CLASS_RESTART,
|
||||||
ENTITY_CATEGORY_DIAGNOSTIC,
|
ENTITY_CATEGORY_DIAGNOSTIC,
|
||||||
ENTITY_CATEGORY_CONFIG,
|
ENTITY_CATEGORY_CONFIG,
|
||||||
@ -15,8 +17,6 @@ QueryButton = ld2410_ns.class_("QueryButton", button.Button)
|
|||||||
ResetButton = ld2410_ns.class_("ResetButton", button.Button)
|
ResetButton = ld2410_ns.class_("ResetButton", button.Button)
|
||||||
RestartButton = ld2410_ns.class_("RestartButton", button.Button)
|
RestartButton = ld2410_ns.class_("RestartButton", button.Button)
|
||||||
|
|
||||||
CONF_FACTORY_RESET = "factory_reset"
|
|
||||||
CONF_RESTART = "restart"
|
|
||||||
CONF_QUERY_PARAMS = "query_params"
|
CONF_QUERY_PARAMS = "query_params"
|
||||||
|
|
||||||
CONFIG_SCHEMA = {
|
CONFIG_SCHEMA = {
|
||||||
|
@ -1,14 +1,13 @@
|
|||||||
import esphome.codegen as cg
|
import esphome.codegen as cg
|
||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
from esphome.components import binary_sensor
|
from esphome.components import binary_sensor
|
||||||
from esphome.const import CONF_ID, DEVICE_CLASS_OCCUPANCY
|
from esphome.const import CONF_ID, DEVICE_CLASS_OCCUPANCY, CONF_HAS_TARGET
|
||||||
from .. import ld2420_ns, LD2420Component, CONF_LD2420_ID
|
from .. import ld2420_ns, LD2420Component, CONF_LD2420_ID
|
||||||
|
|
||||||
LD2420BinarySensor = ld2420_ns.class_(
|
LD2420BinarySensor = ld2420_ns.class_(
|
||||||
"LD2420BinarySensor", binary_sensor.BinarySensor, cg.Component
|
"LD2420BinarySensor", binary_sensor.BinarySensor, cg.Component
|
||||||
)
|
)
|
||||||
|
|
||||||
CONF_HAS_TARGET = "has_target"
|
|
||||||
|
|
||||||
CONFIG_SCHEMA = cv.All(
|
CONFIG_SCHEMA = cv.All(
|
||||||
cv.COMPONENT_SCHEMA.extend(
|
cv.COMPONENT_SCHEMA.extend(
|
||||||
|
@ -2,6 +2,7 @@ import esphome.codegen as cg
|
|||||||
from esphome.components import button
|
from esphome.components import button
|
||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
from esphome.const import (
|
from esphome.const import (
|
||||||
|
CONF_FACTORY_RESET,
|
||||||
DEVICE_CLASS_RESTART,
|
DEVICE_CLASS_RESTART,
|
||||||
ENTITY_CATEGORY_DIAGNOSTIC,
|
ENTITY_CATEGORY_DIAGNOSTIC,
|
||||||
ENTITY_CATEGORY_CONFIG,
|
ENTITY_CATEGORY_CONFIG,
|
||||||
@ -19,7 +20,6 @@ LD2420FactoryResetButton = ld2420_ns.class_("LD2420FactoryResetButton", button.B
|
|||||||
CONF_APPLY_CONFIG = "apply_config"
|
CONF_APPLY_CONFIG = "apply_config"
|
||||||
CONF_REVERT_CONFIG = "revert_config"
|
CONF_REVERT_CONFIG = "revert_config"
|
||||||
CONF_RESTART_MODULE = "restart_module"
|
CONF_RESTART_MODULE = "restart_module"
|
||||||
CONF_FACTORY_RESET = "factory_reset"
|
|
||||||
|
|
||||||
|
|
||||||
CONFIG_SCHEMA = {
|
CONFIG_SCHEMA = {
|
||||||
|
@ -11,54 +11,54 @@ class ESPColorCorrection {
|
|||||||
void set_max_brightness(const Color &max_brightness) { this->max_brightness_ = max_brightness; }
|
void set_max_brightness(const Color &max_brightness) { this->max_brightness_ = max_brightness; }
|
||||||
void set_local_brightness(uint8_t local_brightness) { this->local_brightness_ = local_brightness; }
|
void set_local_brightness(uint8_t local_brightness) { this->local_brightness_ = local_brightness; }
|
||||||
void calculate_gamma_table(float gamma);
|
void calculate_gamma_table(float gamma);
|
||||||
inline Color color_correct(Color color) const ALWAYS_INLINE {
|
inline Color color_correct(Color color) const ESPHOME_ALWAYS_INLINE {
|
||||||
// corrected = (uncorrected * max_brightness * local_brightness) ^ gamma
|
// corrected = (uncorrected * max_brightness * local_brightness) ^ gamma
|
||||||
return Color(this->color_correct_red(color.red), this->color_correct_green(color.green),
|
return Color(this->color_correct_red(color.red), this->color_correct_green(color.green),
|
||||||
this->color_correct_blue(color.blue), this->color_correct_white(color.white));
|
this->color_correct_blue(color.blue), this->color_correct_white(color.white));
|
||||||
}
|
}
|
||||||
inline uint8_t color_correct_red(uint8_t red) const ALWAYS_INLINE {
|
inline uint8_t color_correct_red(uint8_t red) const ESPHOME_ALWAYS_INLINE {
|
||||||
uint8_t res = esp_scale8(esp_scale8(red, this->max_brightness_.red), this->local_brightness_);
|
uint8_t res = esp_scale8(esp_scale8(red, this->max_brightness_.red), this->local_brightness_);
|
||||||
return this->gamma_table_[res];
|
return this->gamma_table_[res];
|
||||||
}
|
}
|
||||||
inline uint8_t color_correct_green(uint8_t green) const ALWAYS_INLINE {
|
inline uint8_t color_correct_green(uint8_t green) const ESPHOME_ALWAYS_INLINE {
|
||||||
uint8_t res = esp_scale8(esp_scale8(green, this->max_brightness_.green), this->local_brightness_);
|
uint8_t res = esp_scale8(esp_scale8(green, this->max_brightness_.green), this->local_brightness_);
|
||||||
return this->gamma_table_[res];
|
return this->gamma_table_[res];
|
||||||
}
|
}
|
||||||
inline uint8_t color_correct_blue(uint8_t blue) const ALWAYS_INLINE {
|
inline uint8_t color_correct_blue(uint8_t blue) const ESPHOME_ALWAYS_INLINE {
|
||||||
uint8_t res = esp_scale8(esp_scale8(blue, this->max_brightness_.blue), this->local_brightness_);
|
uint8_t res = esp_scale8(esp_scale8(blue, this->max_brightness_.blue), this->local_brightness_);
|
||||||
return this->gamma_table_[res];
|
return this->gamma_table_[res];
|
||||||
}
|
}
|
||||||
inline uint8_t color_correct_white(uint8_t white) const ALWAYS_INLINE {
|
inline uint8_t color_correct_white(uint8_t white) const ESPHOME_ALWAYS_INLINE {
|
||||||
uint8_t res = esp_scale8(esp_scale8(white, this->max_brightness_.white), this->local_brightness_);
|
uint8_t res = esp_scale8(esp_scale8(white, this->max_brightness_.white), this->local_brightness_);
|
||||||
return this->gamma_table_[res];
|
return this->gamma_table_[res];
|
||||||
}
|
}
|
||||||
inline Color color_uncorrect(Color color) const ALWAYS_INLINE {
|
inline Color color_uncorrect(Color color) const ESPHOME_ALWAYS_INLINE {
|
||||||
// uncorrected = corrected^(1/gamma) / (max_brightness * local_brightness)
|
// uncorrected = corrected^(1/gamma) / (max_brightness * local_brightness)
|
||||||
return Color(this->color_uncorrect_red(color.red), this->color_uncorrect_green(color.green),
|
return Color(this->color_uncorrect_red(color.red), this->color_uncorrect_green(color.green),
|
||||||
this->color_uncorrect_blue(color.blue), this->color_uncorrect_white(color.white));
|
this->color_uncorrect_blue(color.blue), this->color_uncorrect_white(color.white));
|
||||||
}
|
}
|
||||||
inline uint8_t color_uncorrect_red(uint8_t red) const ALWAYS_INLINE {
|
inline uint8_t color_uncorrect_red(uint8_t red) const ESPHOME_ALWAYS_INLINE {
|
||||||
if (this->max_brightness_.red == 0 || this->local_brightness_ == 0)
|
if (this->max_brightness_.red == 0 || this->local_brightness_ == 0)
|
||||||
return 0;
|
return 0;
|
||||||
uint16_t uncorrected = this->gamma_reverse_table_[red] * 255UL;
|
uint16_t uncorrected = this->gamma_reverse_table_[red] * 255UL;
|
||||||
uint8_t res = ((uncorrected / this->max_brightness_.red) * 255UL) / this->local_brightness_;
|
uint8_t res = ((uncorrected / this->max_brightness_.red) * 255UL) / this->local_brightness_;
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
inline uint8_t color_uncorrect_green(uint8_t green) const ALWAYS_INLINE {
|
inline uint8_t color_uncorrect_green(uint8_t green) const ESPHOME_ALWAYS_INLINE {
|
||||||
if (this->max_brightness_.green == 0 || this->local_brightness_ == 0)
|
if (this->max_brightness_.green == 0 || this->local_brightness_ == 0)
|
||||||
return 0;
|
return 0;
|
||||||
uint16_t uncorrected = this->gamma_reverse_table_[green] * 255UL;
|
uint16_t uncorrected = this->gamma_reverse_table_[green] * 255UL;
|
||||||
uint8_t res = ((uncorrected / this->max_brightness_.green) * 255UL) / this->local_brightness_;
|
uint8_t res = ((uncorrected / this->max_brightness_.green) * 255UL) / this->local_brightness_;
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
inline uint8_t color_uncorrect_blue(uint8_t blue) const ALWAYS_INLINE {
|
inline uint8_t color_uncorrect_blue(uint8_t blue) const ESPHOME_ALWAYS_INLINE {
|
||||||
if (this->max_brightness_.blue == 0 || this->local_brightness_ == 0)
|
if (this->max_brightness_.blue == 0 || this->local_brightness_ == 0)
|
||||||
return 0;
|
return 0;
|
||||||
uint16_t uncorrected = this->gamma_reverse_table_[blue] * 255UL;
|
uint16_t uncorrected = this->gamma_reverse_table_[blue] * 255UL;
|
||||||
uint8_t res = ((uncorrected / this->max_brightness_.blue) * 255UL) / this->local_brightness_;
|
uint8_t res = ((uncorrected / this->max_brightness_.blue) * 255UL) / this->local_brightness_;
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
inline uint8_t color_uncorrect_white(uint8_t white) const ALWAYS_INLINE {
|
inline uint8_t color_uncorrect_white(uint8_t white) const ESPHOME_ALWAYS_INLINE {
|
||||||
if (this->max_brightness_.white == 0 || this->local_brightness_ == 0)
|
if (this->max_brightness_.white == 0 || this->local_brightness_ == 0)
|
||||||
return 0;
|
return 0;
|
||||||
uint16_t uncorrected = this->gamma_reverse_table_[white] * 255UL;
|
uint16_t uncorrected = this->gamma_reverse_table_[white] * 255UL;
|
||||||
|
@ -24,9 +24,9 @@ struct ESPHSVColor {
|
|||||||
};
|
};
|
||||||
uint8_t raw[3];
|
uint8_t raw[3];
|
||||||
};
|
};
|
||||||
inline ESPHSVColor() ALWAYS_INLINE : h(0), s(0), v(0) { // NOLINT
|
inline ESPHSVColor() ESPHOME_ALWAYS_INLINE : h(0), s(0), v(0) { // NOLINT
|
||||||
}
|
}
|
||||||
inline ESPHSVColor(uint8_t hue, uint8_t saturation, uint8_t value) ALWAYS_INLINE : hue(hue),
|
inline ESPHSVColor(uint8_t hue, uint8_t saturation, uint8_t value) ESPHOME_ALWAYS_INLINE : hue(hue),
|
||||||
saturation(saturation),
|
saturation(saturation),
|
||||||
value(value) {}
|
value(value) {}
|
||||||
Color to_rgb() const;
|
Color to_rgb() const;
|
||||||
|
@ -39,7 +39,23 @@ void Logger::write_header_(int level, const char *tag, int line) {
|
|||||||
|
|
||||||
const char *color = LOG_LEVEL_COLORS[level];
|
const char *color = LOG_LEVEL_COLORS[level];
|
||||||
const char *letter = LOG_LEVEL_LETTERS[level];
|
const char *letter = LOG_LEVEL_LETTERS[level];
|
||||||
|
#if defined(USE_ESP32) || defined(USE_LIBRETINY)
|
||||||
|
TaskHandle_t current_task = xTaskGetCurrentTaskHandle();
|
||||||
|
#else
|
||||||
|
void *current_task = nullptr;
|
||||||
|
#endif
|
||||||
|
if (current_task == main_task_) {
|
||||||
this->printf_to_buffer_("%s[%s][%s:%03u]: ", color, letter, tag, line);
|
this->printf_to_buffer_("%s[%s][%s:%03u]: ", color, letter, tag, line);
|
||||||
|
} else {
|
||||||
|
const char *thread_name = "";
|
||||||
|
#if defined(USE_ESP32)
|
||||||
|
thread_name = pcTaskGetName(current_task);
|
||||||
|
#elif defined(USE_LIBRETINY)
|
||||||
|
thread_name = pcTaskGetTaskName(current_task);
|
||||||
|
#endif
|
||||||
|
this->printf_to_buffer_("%s[%s][%s:%03u]%s[%s]%s: ", color, letter, tag, line,
|
||||||
|
ESPHOME_LOG_BOLD(ESPHOME_LOG_COLOR_RED), thread_name, color);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void HOT Logger::log_vprintf_(int level, const char *tag, int line, const char *format, va_list args) { // NOLINT
|
void HOT Logger::log_vprintf_(int level, const char *tag, int line, const char *format, va_list args) { // NOLINT
|
||||||
@ -127,6 +143,9 @@ void HOT Logger::log_message_(int level, const char *tag, int offset) {
|
|||||||
Logger::Logger(uint32_t baud_rate, size_t tx_buffer_size) : baud_rate_(baud_rate), tx_buffer_size_(tx_buffer_size) {
|
Logger::Logger(uint32_t baud_rate, size_t tx_buffer_size) : baud_rate_(baud_rate), tx_buffer_size_(tx_buffer_size) {
|
||||||
// add 1 to buffer size for null terminator
|
// add 1 to buffer size for null terminator
|
||||||
this->tx_buffer_ = new char[this->tx_buffer_size_ + 1]; // NOLINT
|
this->tx_buffer_ = new char[this->tx_buffer_size_ + 1]; // NOLINT
|
||||||
|
#if defined(USE_ESP32) || defined(USE_LIBRETINY)
|
||||||
|
this->main_task_ = xTaskGetCurrentTaskHandle();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef USE_LOGGER_USB_CDC
|
#ifdef USE_LOGGER_USB_CDC
|
||||||
|
@ -167,6 +167,7 @@ class Logger : public Component {
|
|||||||
CallbackManager<void(int, const char *, const char *)> log_callback_{};
|
CallbackManager<void(int, const char *, const char *)> log_callback_{};
|
||||||
/// Prevents recursive log calls, if true a log message is already being processed.
|
/// Prevents recursive log calls, if true a log message is already being processed.
|
||||||
bool recursion_guard_ = false;
|
bool recursion_guard_ = false;
|
||||||
|
void *main_task_ = nullptr;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern Logger *global_logger; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
|
extern Logger *global_logger; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
|
||||||
|
@ -8,6 +8,9 @@ namespace ltr390 {
|
|||||||
|
|
||||||
static const char *const TAG = "ltr390";
|
static const char *const TAG = "ltr390";
|
||||||
|
|
||||||
|
static const uint8_t LTR390_WAKEUP_TIME = 10;
|
||||||
|
static const uint8_t LTR390_SETTLE_TIME = 5;
|
||||||
|
|
||||||
static const uint8_t LTR390_MAIN_CTRL = 0x00;
|
static const uint8_t LTR390_MAIN_CTRL = 0x00;
|
||||||
static const uint8_t LTR390_MEAS_RATE = 0x04;
|
static const uint8_t LTR390_MEAS_RATE = 0x04;
|
||||||
static const uint8_t LTR390_GAIN = 0x05;
|
static const uint8_t LTR390_GAIN = 0x05;
|
||||||
@ -101,10 +104,12 @@ void LTR390Component::read_mode_(int mode_index) {
|
|||||||
|
|
||||||
std::bitset<8> ctrl = this->reg(LTR390_MAIN_CTRL).get();
|
std::bitset<8> ctrl = this->reg(LTR390_MAIN_CTRL).get();
|
||||||
ctrl[LTR390_CTRL_MODE] = mode;
|
ctrl[LTR390_CTRL_MODE] = mode;
|
||||||
|
ctrl[LTR390_CTRL_EN] = true;
|
||||||
this->reg(LTR390_MAIN_CTRL) = ctrl.to_ulong();
|
this->reg(LTR390_MAIN_CTRL) = ctrl.to_ulong();
|
||||||
|
|
||||||
// After the sensor integration time do the following
|
// After the sensor integration time do the following
|
||||||
this->set_timeout(((uint32_t) RESOLUTIONVALUE[this->res_]) * 100, [this, mode_index]() {
|
this->set_timeout(((uint32_t) RESOLUTIONVALUE[this->res_]) * 100 + LTR390_WAKEUP_TIME + LTR390_SETTLE_TIME,
|
||||||
|
[this, mode_index]() {
|
||||||
// Read from the sensor
|
// Read from the sensor
|
||||||
std::get<1>(this->mode_funcs_[mode_index])();
|
std::get<1>(this->mode_funcs_[mode_index])();
|
||||||
|
|
||||||
@ -113,6 +118,10 @@ void LTR390Component::read_mode_(int mode_index) {
|
|||||||
if (mode_index + 1 < (int) this->mode_funcs_.size()) {
|
if (mode_index + 1 < (int) this->mode_funcs_.size()) {
|
||||||
this->read_mode_(mode_index + 1);
|
this->read_mode_(mode_index + 1);
|
||||||
} else {
|
} else {
|
||||||
|
// put sensor in standby
|
||||||
|
std::bitset<8> ctrl = this->reg(LTR390_MAIN_CTRL).get();
|
||||||
|
ctrl[LTR390_CTRL_EN] = false;
|
||||||
|
this->reg(LTR390_MAIN_CTRL) = ctrl.to_ulong();
|
||||||
this->reading_ = false;
|
this->reading_ = false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -1,12 +1,9 @@
|
|||||||
import esphome.codegen as cg
|
import esphome.codegen as cg
|
||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
from esphome.components import binary_sensor
|
from esphome.components import binary_sensor
|
||||||
from esphome.const import CONF_ID, CONF_KEY
|
from esphome.const import CONF_ID, CONF_KEY, CONF_ROW, CONF_COL
|
||||||
from .. import MatrixKeypad, matrix_keypad_ns, CONF_KEYPAD_ID
|
from .. import MatrixKeypad, matrix_keypad_ns, CONF_KEYPAD_ID
|
||||||
|
|
||||||
CONF_ROW = "row"
|
|
||||||
CONF_COL = "col"
|
|
||||||
|
|
||||||
DEPENDENCIES = ["matrix_keypad"]
|
DEPENDENCIES = ["matrix_keypad"]
|
||||||
|
|
||||||
MatrixKeypadBinarySensor = matrix_keypad_ns.class_(
|
MatrixKeypadBinarySensor = matrix_keypad_ns.class_(
|
||||||
|
@ -4,6 +4,7 @@ from esphome.components import sensor, voltage_sampler
|
|||||||
from esphome.const import (
|
from esphome.const import (
|
||||||
CONF_ID,
|
CONF_ID,
|
||||||
CONF_NUMBER,
|
CONF_NUMBER,
|
||||||
|
CONF_REFERENCE_VOLTAGE,
|
||||||
UNIT_VOLT,
|
UNIT_VOLT,
|
||||||
STATE_CLASS_MEASUREMENT,
|
STATE_CLASS_MEASUREMENT,
|
||||||
DEVICE_CLASS_VOLTAGE,
|
DEVICE_CLASS_VOLTAGE,
|
||||||
@ -22,7 +23,6 @@ MCP3008Sensor = mcp3008_ns.class_(
|
|||||||
voltage_sampler.VoltageSampler,
|
voltage_sampler.VoltageSampler,
|
||||||
cg.Parented.template(MCP3008),
|
cg.Parented.template(MCP3008),
|
||||||
)
|
)
|
||||||
CONF_REFERENCE_VOLTAGE = "reference_voltage"
|
|
||||||
CONF_MCP3008_ID = "mcp3008_id"
|
CONF_MCP3008_ID = "mcp3008_id"
|
||||||
|
|
||||||
CONFIG_SCHEMA = (
|
CONFIG_SCHEMA = (
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import esphome.codegen as cg
|
import esphome.codegen as cg
|
||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
from esphome.components import spi
|
from esphome.components import spi
|
||||||
from esphome.const import CONF_ID
|
from esphome.const import CONF_ID, CONF_REFERENCE_VOLTAGE
|
||||||
|
|
||||||
DEPENDENCIES = ["spi"]
|
DEPENDENCIES = ["spi"]
|
||||||
MULTI_CONF = True
|
MULTI_CONF = True
|
||||||
@ -10,7 +10,6 @@ CODEOWNERS = ["@rsumner"]
|
|||||||
mcp3204_ns = cg.esphome_ns.namespace("mcp3204")
|
mcp3204_ns = cg.esphome_ns.namespace("mcp3204")
|
||||||
MCP3204 = mcp3204_ns.class_("MCP3204", cg.Component, spi.SPIDevice)
|
MCP3204 = mcp3204_ns.class_("MCP3204", cg.Component, spi.SPIDevice)
|
||||||
|
|
||||||
CONF_REFERENCE_VOLTAGE = "reference_voltage"
|
|
||||||
|
|
||||||
CONFIG_SCHEMA = cv.Schema(
|
CONFIG_SCHEMA = cv.Schema(
|
||||||
{
|
{
|
||||||
|
@ -3,7 +3,13 @@ import esphome.config_validation as cv
|
|||||||
import esphome.codegen as cg
|
import esphome.codegen as cg
|
||||||
|
|
||||||
from esphome.automation import maybe_simple_id
|
from esphome.automation import maybe_simple_id
|
||||||
from esphome.const import CONF_ID, CONF_ON_STATE, CONF_TRIGGER_ID, CONF_VOLUME
|
from esphome.const import (
|
||||||
|
CONF_ID,
|
||||||
|
CONF_ON_STATE,
|
||||||
|
CONF_TRIGGER_ID,
|
||||||
|
CONF_VOLUME,
|
||||||
|
CONF_ON_IDLE,
|
||||||
|
)
|
||||||
from esphome.core import CORE
|
from esphome.core import CORE
|
||||||
from esphome.coroutine import coroutine_with_priority
|
from esphome.coroutine import coroutine_with_priority
|
||||||
from esphome.cpp_helpers import setup_entity
|
from esphome.cpp_helpers import setup_entity
|
||||||
@ -43,15 +49,18 @@ VolumeSetAction = media_player_ns.class_(
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
CONF_ON_IDLE = "on_idle"
|
|
||||||
CONF_ON_PLAY = "on_play"
|
CONF_ON_PLAY = "on_play"
|
||||||
CONF_ON_PAUSE = "on_pause"
|
CONF_ON_PAUSE = "on_pause"
|
||||||
|
CONF_ON_ANNOUNCEMENT = "on_announcement"
|
||||||
CONF_MEDIA_URL = "media_url"
|
CONF_MEDIA_URL = "media_url"
|
||||||
|
|
||||||
StateTrigger = media_player_ns.class_("StateTrigger", automation.Trigger.template())
|
StateTrigger = media_player_ns.class_("StateTrigger", automation.Trigger.template())
|
||||||
IdleTrigger = media_player_ns.class_("IdleTrigger", automation.Trigger.template())
|
IdleTrigger = media_player_ns.class_("IdleTrigger", automation.Trigger.template())
|
||||||
PlayTrigger = media_player_ns.class_("PlayTrigger", automation.Trigger.template())
|
PlayTrigger = media_player_ns.class_("PlayTrigger", automation.Trigger.template())
|
||||||
PauseTrigger = media_player_ns.class_("PauseTrigger", automation.Trigger.template())
|
PauseTrigger = media_player_ns.class_("PauseTrigger", automation.Trigger.template())
|
||||||
|
AnnoucementTrigger = media_player_ns.class_(
|
||||||
|
"AnnouncementTrigger", automation.Trigger.template()
|
||||||
|
)
|
||||||
IsIdleCondition = media_player_ns.class_("IsIdleCondition", automation.Condition)
|
IsIdleCondition = media_player_ns.class_("IsIdleCondition", automation.Condition)
|
||||||
IsPlayingCondition = media_player_ns.class_("IsPlayingCondition", automation.Condition)
|
IsPlayingCondition = media_player_ns.class_("IsPlayingCondition", automation.Condition)
|
||||||
|
|
||||||
@ -70,6 +79,9 @@ async def setup_media_player_core_(var, config):
|
|||||||
for conf in config.get(CONF_ON_PAUSE, []):
|
for conf in config.get(CONF_ON_PAUSE, []):
|
||||||
trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
|
trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
|
||||||
await automation.build_automation(trigger, [], conf)
|
await automation.build_automation(trigger, [], conf)
|
||||||
|
for conf in config.get(CONF_ON_ANNOUNCEMENT, []):
|
||||||
|
trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
|
||||||
|
await automation.build_automation(trigger, [], conf)
|
||||||
|
|
||||||
|
|
||||||
async def register_media_player(var, config):
|
async def register_media_player(var, config):
|
||||||
@ -101,6 +113,11 @@ MEDIA_PLAYER_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(
|
|||||||
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(PauseTrigger),
|
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(PauseTrigger),
|
||||||
}
|
}
|
||||||
),
|
),
|
||||||
|
cv.Optional(CONF_ON_ANNOUNCEMENT): automation.validate_automation(
|
||||||
|
{
|
||||||
|
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(AnnoucementTrigger),
|
||||||
|
}
|
||||||
|
),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -52,6 +52,7 @@ class StateTrigger : public Trigger<> {
|
|||||||
MEDIA_PLAYER_SIMPLE_STATE_TRIGGER(IdleTrigger, IDLE)
|
MEDIA_PLAYER_SIMPLE_STATE_TRIGGER(IdleTrigger, IDLE)
|
||||||
MEDIA_PLAYER_SIMPLE_STATE_TRIGGER(PlayTrigger, PLAYING)
|
MEDIA_PLAYER_SIMPLE_STATE_TRIGGER(PlayTrigger, PLAYING)
|
||||||
MEDIA_PLAYER_SIMPLE_STATE_TRIGGER(PauseTrigger, PAUSED)
|
MEDIA_PLAYER_SIMPLE_STATE_TRIGGER(PauseTrigger, PAUSED)
|
||||||
|
MEDIA_PLAYER_SIMPLE_STATE_TRIGGER(AnnouncementTrigger, ANNOUNCING)
|
||||||
|
|
||||||
template<typename... Ts> class IsIdleCondition : public Condition<Ts...>, public Parented<MediaPlayer> {
|
template<typename... Ts> class IsIdleCondition : public Condition<Ts...>, public Parented<MediaPlayer> {
|
||||||
public:
|
public:
|
||||||
|
@ -15,6 +15,8 @@ const char *media_player_state_to_string(MediaPlayerState state) {
|
|||||||
return "PLAYING";
|
return "PLAYING";
|
||||||
case MEDIA_PLAYER_STATE_PAUSED:
|
case MEDIA_PLAYER_STATE_PAUSED:
|
||||||
return "PAUSED";
|
return "PAUSED";
|
||||||
|
case MEDIA_PLAYER_STATE_ANNOUNCING:
|
||||||
|
return "ANNOUNCING";
|
||||||
case MEDIA_PLAYER_STATE_NONE:
|
case MEDIA_PLAYER_STATE_NONE:
|
||||||
default:
|
default:
|
||||||
return "UNKNOWN";
|
return "UNKNOWN";
|
||||||
@ -68,6 +70,9 @@ void MediaPlayerCall::perform() {
|
|||||||
if (this->volume_.has_value()) {
|
if (this->volume_.has_value()) {
|
||||||
ESP_LOGD(TAG, " Volume: %.2f", this->volume_.value());
|
ESP_LOGD(TAG, " Volume: %.2f", this->volume_.value());
|
||||||
}
|
}
|
||||||
|
if (this->announcement_.has_value()) {
|
||||||
|
ESP_LOGD(TAG, " Announcement: %s", this->announcement_.value() ? "yes" : "no");
|
||||||
|
}
|
||||||
this->parent_->control(*this);
|
this->parent_->control(*this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -108,6 +113,11 @@ MediaPlayerCall &MediaPlayerCall::set_volume(float volume) {
|
|||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MediaPlayerCall &MediaPlayerCall::set_announcement(bool announce) {
|
||||||
|
this->announcement_ = announce;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
void MediaPlayer::add_on_state_callback(std::function<void()> &&callback) {
|
void MediaPlayer::add_on_state_callback(std::function<void()> &&callback) {
|
||||||
this->state_callback_.add(std::move(callback));
|
this->state_callback_.add(std::move(callback));
|
||||||
}
|
}
|
||||||
|
@ -10,7 +10,8 @@ enum MediaPlayerState : uint8_t {
|
|||||||
MEDIA_PLAYER_STATE_NONE = 0,
|
MEDIA_PLAYER_STATE_NONE = 0,
|
||||||
MEDIA_PLAYER_STATE_IDLE = 1,
|
MEDIA_PLAYER_STATE_IDLE = 1,
|
||||||
MEDIA_PLAYER_STATE_PLAYING = 2,
|
MEDIA_PLAYER_STATE_PLAYING = 2,
|
||||||
MEDIA_PLAYER_STATE_PAUSED = 3
|
MEDIA_PLAYER_STATE_PAUSED = 3,
|
||||||
|
MEDIA_PLAYER_STATE_ANNOUNCING = 4
|
||||||
};
|
};
|
||||||
const char *media_player_state_to_string(MediaPlayerState state);
|
const char *media_player_state_to_string(MediaPlayerState state);
|
||||||
|
|
||||||
@ -51,12 +52,14 @@ class MediaPlayerCall {
|
|||||||
MediaPlayerCall &set_media_url(const std::string &url);
|
MediaPlayerCall &set_media_url(const std::string &url);
|
||||||
|
|
||||||
MediaPlayerCall &set_volume(float volume);
|
MediaPlayerCall &set_volume(float volume);
|
||||||
|
MediaPlayerCall &set_announcement(bool announce);
|
||||||
|
|
||||||
void perform();
|
void perform();
|
||||||
|
|
||||||
const optional<MediaPlayerCommand> &get_command() const { return command_; }
|
const optional<MediaPlayerCommand> &get_command() const { return command_; }
|
||||||
const optional<std::string> &get_media_url() const { return media_url_; }
|
const optional<std::string> &get_media_url() const { return media_url_; }
|
||||||
const optional<float> &get_volume() const { return volume_; }
|
const optional<float> &get_volume() const { return volume_; }
|
||||||
|
const optional<bool> &get_announcement() const { return announcement_; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void validate_();
|
void validate_();
|
||||||
@ -64,6 +67,7 @@ class MediaPlayerCall {
|
|||||||
optional<MediaPlayerCommand> command_;
|
optional<MediaPlayerCommand> command_;
|
||||||
optional<std::string> media_url_;
|
optional<std::string> media_url_;
|
||||||
optional<float> volume_;
|
optional<float> volume_;
|
||||||
|
optional<bool> announcement_;
|
||||||
};
|
};
|
||||||
|
|
||||||
class MediaPlayer : public EntityBase {
|
class MediaPlayer : public EntityBase {
|
||||||
|
@ -11,6 +11,7 @@ from esphome.const import (
|
|||||||
CONF_CUSTOM_PRESETS,
|
CONF_CUSTOM_PRESETS,
|
||||||
CONF_ID,
|
CONF_ID,
|
||||||
CONF_NUM_ATTEMPTS,
|
CONF_NUM_ATTEMPTS,
|
||||||
|
CONF_OUTDOOR_TEMPERATURE,
|
||||||
CONF_PERIOD,
|
CONF_PERIOD,
|
||||||
CONF_SUPPORTED_MODES,
|
CONF_SUPPORTED_MODES,
|
||||||
CONF_SUPPORTED_PRESETS,
|
CONF_SUPPORTED_PRESETS,
|
||||||
@ -37,7 +38,6 @@ from esphome.components.climate import (
|
|||||||
CODEOWNERS = ["@dudanov"]
|
CODEOWNERS = ["@dudanov"]
|
||||||
DEPENDENCIES = ["climate", "uart"]
|
DEPENDENCIES = ["climate", "uart"]
|
||||||
AUTO_LOAD = ["sensor"]
|
AUTO_LOAD = ["sensor"]
|
||||||
CONF_OUTDOOR_TEMPERATURE = "outdoor_temperature"
|
|
||||||
CONF_POWER_USAGE = "power_usage"
|
CONF_POWER_USAGE = "power_usage"
|
||||||
CONF_HUMIDITY_SETPOINT = "humidity_setpoint"
|
CONF_HUMIDITY_SETPOINT = "humidity_setpoint"
|
||||||
midea_ac_ns = cg.esphome_ns.namespace("midea").namespace("ac")
|
midea_ac_ns = cg.esphome_ns.namespace("midea").namespace("ac")
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import esphome.codegen as cg
|
import esphome.codegen as cg
|
||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
from esphome.components import climate_ir
|
from esphome.components import climate_ir
|
||||||
from esphome.const import CONF_ID
|
from esphome.const import CONF_ID, CONF_USE_FAHRENHEIT
|
||||||
|
|
||||||
AUTO_LOAD = ["climate_ir", "coolix"]
|
AUTO_LOAD = ["climate_ir", "coolix"]
|
||||||
CODEOWNERS = ["@dudanov"]
|
CODEOWNERS = ["@dudanov"]
|
||||||
@ -9,7 +9,6 @@ CODEOWNERS = ["@dudanov"]
|
|||||||
midea_ir_ns = cg.esphome_ns.namespace("midea_ir")
|
midea_ir_ns = cg.esphome_ns.namespace("midea_ir")
|
||||||
MideaIR = midea_ir_ns.class_("MideaIR", climate_ir.ClimateIR)
|
MideaIR = midea_ir_ns.class_("MideaIR", climate_ir.ClimateIR)
|
||||||
|
|
||||||
CONF_USE_FAHRENHEIT = "use_fahrenheit"
|
|
||||||
|
|
||||||
CONFIG_SCHEMA = climate_ir.CLIMATE_IR_WITH_RECEIVER_SCHEMA.extend(
|
CONFIG_SCHEMA = climate_ir.CLIMATE_IR_WITH_RECEIVER_SCHEMA.extend(
|
||||||
{
|
{
|
||||||
|
@ -6,6 +6,7 @@ from esphome.const import (
|
|||||||
CONF_FIELD_STRENGTH_X,
|
CONF_FIELD_STRENGTH_X,
|
||||||
CONF_FIELD_STRENGTH_Y,
|
CONF_FIELD_STRENGTH_Y,
|
||||||
CONF_FIELD_STRENGTH_Z,
|
CONF_FIELD_STRENGTH_Z,
|
||||||
|
CONF_HEADING,
|
||||||
CONF_ID,
|
CONF_ID,
|
||||||
ICON_MAGNET,
|
ICON_MAGNET,
|
||||||
STATE_CLASS_MEASUREMENT,
|
STATE_CLASS_MEASUREMENT,
|
||||||
@ -19,8 +20,6 @@ DEPENDENCIES = ["i2c"]
|
|||||||
|
|
||||||
mmc5603_ns = cg.esphome_ns.namespace("mmc5603")
|
mmc5603_ns = cg.esphome_ns.namespace("mmc5603")
|
||||||
|
|
||||||
CONF_HEADING = "heading"
|
|
||||||
|
|
||||||
MMC5603Component = mmc5603_ns.class_(
|
MMC5603Component = mmc5603_ns.class_(
|
||||||
"MMC5603Component", cg.PollingComponent, i2c.I2CDevice
|
"MMC5603Component", cg.PollingComponent, i2c.I2CDevice
|
||||||
)
|
)
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
#include "esphome/components/display/display_color_utils.h"
|
#include "esphome/components/display/display_color_utils.h"
|
||||||
|
|
||||||
#ifdef USE_NEXTION_TFT_UPLOAD
|
#ifdef USE_NEXTION_TFT_UPLOAD
|
||||||
#ifdef ARDUINO
|
#ifdef USE_ARDUINO
|
||||||
#ifdef USE_ESP32
|
#ifdef USE_ESP32
|
||||||
#include <HTTPClient.h>
|
#include <HTTPClient.h>
|
||||||
#endif // USE_ESP32
|
#endif // USE_ESP32
|
||||||
@ -22,7 +22,7 @@
|
|||||||
#endif // USE_ESP8266
|
#endif // USE_ESP8266
|
||||||
#elif defined(USE_ESP_IDF)
|
#elif defined(USE_ESP_IDF)
|
||||||
#include <esp_http_client.h>
|
#include <esp_http_client.h>
|
||||||
#endif // ARDUINO vs ESP-IDF
|
#endif // ARDUINO vs USE_ESP_IDF
|
||||||
#endif // USE_NEXTION_TFT_UPLOAD
|
#endif // USE_NEXTION_TFT_UPLOAD
|
||||||
|
|
||||||
namespace esphome {
|
namespace esphome {
|
||||||
@ -987,7 +987,7 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
|
|||||||
|
|
||||||
#ifdef USE_NEXTION_TFT_UPLOAD
|
#ifdef USE_NEXTION_TFT_UPLOAD
|
||||||
/**
|
/**
|
||||||
* Set the tft file URL. https seems problematic with arduino..
|
* Set the tft file URL. https seems problematic with Arduino..
|
||||||
*/
|
*/
|
||||||
void set_tft_url(const std::string &tft_url) { this->tft_url_ = tft_url; }
|
void set_tft_url(const std::string &tft_url) { this->tft_url_ = tft_url; }
|
||||||
|
|
||||||
@ -1190,7 +1190,7 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
|
|||||||
uint32_t original_baud_rate_ = 0;
|
uint32_t original_baud_rate_ = 0;
|
||||||
bool upload_first_chunk_sent_ = false;
|
bool upload_first_chunk_sent_ = false;
|
||||||
|
|
||||||
#ifdef ARDUINO
|
#ifdef USE_ARDUINO
|
||||||
/**
|
/**
|
||||||
* will request chunk_size chunks from the web server
|
* will request chunk_size chunks from the web server
|
||||||
* and send each to the nextion
|
* and send each to the nextion
|
||||||
@ -1208,7 +1208,7 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
|
|||||||
* @return position of last byte transferred, -1 for failure.
|
* @return position of last byte transferred, -1 for failure.
|
||||||
*/
|
*/
|
||||||
int upload_by_chunks_(esp_http_client_handle_t http_client, uint32_t &range_start);
|
int upload_by_chunks_(esp_http_client_handle_t http_client, uint32_t &range_start);
|
||||||
#endif // ARDUINO vs USE_ESP_IDF
|
#endif // USE_ARDUINO vs USE_ESP_IDF
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Ends the upload process, restart Nextion and, if successful,
|
* Ends the upload process, restart Nextion and, if successful,
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#include "nextion.h"
|
#include "nextion.h"
|
||||||
|
|
||||||
#ifdef USE_NEXTION_TFT_UPLOAD
|
#ifdef USE_NEXTION_TFT_UPLOAD
|
||||||
#ifdef ARDUINO
|
#ifdef USE_ARDUINO
|
||||||
|
|
||||||
#include "esphome/core/application.h"
|
#include "esphome/core/application.h"
|
||||||
#include "esphome/core/defines.h"
|
#include "esphome/core/defines.h"
|
||||||
@ -383,5 +383,5 @@ WiFiClient *Nextion::get_wifi_client_() {
|
|||||||
} // namespace nextion
|
} // namespace nextion
|
||||||
} // namespace esphome
|
} // namespace esphome
|
||||||
|
|
||||||
#endif // ARDUINO
|
#endif // USE_ARDUINO
|
||||||
#endif // USE_NEXTION_TFT_UPLOAD
|
#endif // USE_NEXTION_TFT_UPLOAD
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user