Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add discovery schemas for Matter 1.3 power/energy sensors #125403

Merged
merged 4 commits into from
Sep 7, 2024

Conversation

marcelveldt
Copy link
Member

@marcelveldt marcelveldt commented Sep 6, 2024

Proposed change

Matter 1.3 introduced native support for electrical/power measurements.
We now see the first devices in the market (or existing ones updated) that includes these clusters.

This PR adds discovery schemas for these new measurements.
Also added a bit of logic to prevent duplicate discovery if the custom cluster is also present (in case of e.g. Eve).

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New integration (thank you!)
  • New feature (which adds functionality to an existing integration)
  • Deprecation (breaking change to happen in the future)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Additional information

  • This PR fixes or closes issue: fixes #
  • This PR is related to issue:
  • Link to documentation pull request:

Checklist

  • The code change is tested and works locally.
  • Local tests pass. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • I have followed the development checklist
  • I have followed the perfect PR recommendations
  • The code has been formatted using Ruff (ruff format homeassistant tests)
  • Tests have been added to verify that the new code works.

If user exposed functionality or configuration variables are added/changed:

If the code communicates with devices, web services, or third-party tools:

  • The manifest file has all fields filled out correctly.
    Updated and included derived files by running: python3 -m script.hassfest.
  • New or updated dependencies have been added to requirements_all.txt.
    Updated by running python3 -m script.gen_requirements_all.
  • For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.

To help with the load of incoming pull requests:

@home-assistant
Copy link

home-assistant bot commented Sep 6, 2024

Hey there @home-assistant/matter, mind taking a look at this pull request as it has been labeled with an integration (matter) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of matter can trigger bot actions by commenting:

  • @home-assistant close Closes the pull request.
  • @home-assistant rename Awesome new title Renames the pull request.
  • @home-assistant reopen Reopen the pull request.
  • @home-assistant unassign matter Removes the current integration label and assignees on the pull request, add the integration domain after the command.
  • @home-assistant add-label needs-more-information Add a label (needs-more-information, problem in dependency, problem in custom component) to the pull request.
  • @home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component) on the pull request.

@lboue
Copy link
Contributor

lboue commented Sep 6, 2024

Thanks Marcel. It works well with the dishwasher example from SiLabs:

image

tests/components/matter/test_sensor.py Outdated Show resolved Hide resolved
tests/components/matter/test_sensor.py Outdated Show resolved Hide resolved
tests/components/matter/test_sensor.py Outdated Show resolved Hide resolved
tests/components/matter/test_sensor.py Outdated Show resolved Hide resolved
@MartinHjelmare MartinHjelmare merged commit cbd884d into dev Sep 7, 2024
28 checks passed
@MartinHjelmare MartinHjelmare deleted the matter-energy-sensors branch September 7, 2024 05:55
Gigatrappeur pushed a commit to Gigatrappeur/ha-core that referenced this pull request Sep 7, 2024
…tant#125403)

* Add missing discovery schemas for (Matter 1.3) Power/Energy measurements

* Prevent discovery of custom cluster if 1.3 cluster present

* add tests

* Use f-strings

---------

Co-authored-by: Martin Hjelmare <[email protected]>
@github-actions github-actions bot locked and limited conversation to collaborators Sep 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants