Skip to content

Add Doorbell device type to discovery schemas in Matter event entities - #175802

Merged
joostlek merged 4 commits into
home-assistant:devfrom
lboue:doorbell
Jul 7, 2026
Merged

Add Doorbell device type to discovery schemas in Matter event entities#175802
joostlek merged 4 commits into
home-assistant:devfrom
lboue:doorbell

Conversation

@lboue

@lboue lboue commented Jul 6, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Proposed change

Add Doorbell device type to discovery schemas in Matter event entities

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:
  • Link to developer documentation pull request:
  • Link to frontend pull request:

Checklist

  • I understand the code I am submitting and can explain how it works.
  • 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.
  • Any generated code has been carefully reviewed for correctness and compliance with project standards.

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 diff between library versions and ideally a link to the changelog/release notes is added to the PR description.

To help with the load of incoming pull requests:

Copilot AI review requested due to automatic review settings July 6, 2026 19:05
@home-assistant home-assistant Bot added cla-signed integration: matter small-pr PRs with less than 30 lines. Top 100 Integration is ranked within the top 100 by usage Top 200 Integration is ranked within the top 200 by usage Top 50 Integration is ranked within the top 50 by usage by-code-owner Quality Scale: No score labels Jul 6, 2026
@home-assistant

home-assistant Bot commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

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 mark-draft Mark the pull request as draft.
  • @home-assistant ready-for-review Remove the draft status from 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 update-branch Update the pull request branch with the base branch.
  • @home-assistant add-label needs-more-information Add a label (needs-more-information, problem in dependency, problem in custom component, problem in config, problem in device, feature-request) to the pull request.
  • @home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component, problem in config, problem in device, feature-request) on the pull request.

@lboue

lboue commented Jul 6, 2026

Copy link
Copy Markdown
Contributor Author

Testing with Matterbridge

image

Copilot AI reviewed Jul 6, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR adds the Matter Doorbell device type to the event platform's discovery schema so that doorbell devices exposing a Switch cluster are surfaced as event entities (button press events), alongside the existing GenericSwitch device type. In Home Assistant's Matter discovery, device_type acts as an additional filter combined with the required Switch attributes (CurrentPosition, FeatureMap), so previously a Doorbell endpoint with a Switch cluster would be excluded because its device type wasn't GenericSwitch.

Changes:

  • Extended the single event MatterDiscoverySchema's device_type tuple from (GenericSwitch,) to (Doorbell, GenericSwitch).

Comment thread homeassistant/components/matter/event.py
Comment on lines +151 to +154
device_type=(
device_types.Doorbell,
device_types.GenericSwitch,
),

@lboue lboue Jul 6, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

b0d1970

Copilot AI review requested due to automatic review settings July 6, 2026 19:31
Copilot AI reviewed Jul 6, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.

@lboue
lboue marked this pull request as ready for review July 6, 2026 19:57
@lboue
lboue requested a review from a team as a code owner July 6, 2026 19:57
Copilot AI review requested due to automatic review settings July 6, 2026 19:57
Copilot AI reviewed Jul 6, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.

@joostlek
joostlek merged commit b47413b into home-assistant:dev Jul 7, 2026
33 checks passed
joostlek
joostlek reviewed Jul 7, 2026
View reviewed changes
Comment thread tests/components/matter/snapshots/test_event.ambr
# name: test_events[mock_doorbell][event.mock_doorbell_button-state]
StateSnapshot({
'attributes': ReadOnlyDict({
<EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'button',

@joostlek joostlek Jul 7, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh one thing to note, we now have a doorbell device class as well, but it requires a ring event type. Would maybe be cool to add, but I am not sure how that maps well with the event types you have right here

@lboue lboue Jul 7, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here: #175875

@github-actions github-actions Bot locked and limited conversation to collaborators Jul 8, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@joostlek joostlek joostlek approved these changes
Copilot code review Copilot Copilot left review comments

Assignees

No one assigned

Labels

by-code-owner cla-signed integration: matter new-feature Quality Scale: No score small-pr PRs with less than 30 lines. Top 50 Integration is ranked within the top 50 by usage Top 100 Integration is ranked within the top 100 by usage Top 200 Integration is ranked within the top 200 by usage

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@lboue @joostlek