Matter Switch: update subscribe logic#2667
Merged
hcarter-775 merged 1 commit intomainfrom Jan 12, 2026
Merged
Conversation
hcarter-775
requested review from
ctowns,
gharveymn,
greens and
nickolas-deboom
|
Channel deleted. |
hcarter-775
changed the title
Test Results 71 files 480 suites 0s ⏱️ Results for commit 3de35fd. ♻️ This comment has been updated with latest results. |
|
Minimum allowed coverage is Generated by 🐒 cobertura-action against 3de35fd |
cjswedes
reviewed
Dec 29, 2025
Contributor
cjswedes
left a comment
cjswedes
left a comment
There was a problem hiding this comment.
Some of the test changes need a bit of explanation, but otherwise LGTM.
| -- @param matter_elements_seen table a list of attribute and event ids that have been added already | ||
| --- @param subscribed_attributes table key-value pairs mapping capability ids to subscribed attributes | ||
| --- @param subscribed_events table key-value pairs mapping capability ids to subscribed events | ||
| function utils.populate_subscribe_request_for_device(checked_device, subscribe_request, capabilities_seen, attributes_seen, events_seen, subscribed_attributes, subscribed_events) |
drivers/SmartThings/matter-switch/src/test/test_matter_multi_button_switch_mcd.lua
Outdated
Show resolved
Hide resolved
| test.socket.device_lifecycle:__queue_receive(unsup_mock_device:generate_info_changed({ profile = updated_device_profile })) | ||
|
|
||
| local cluster_subscribe_list = { | ||
| -- clusters.OnOff.attributes.OnOff, |
Contributor
There was a problem hiding this comment.
Why is this no longer expected?
Contributor
Author
There was a problem hiding this comment.
This is no longer expected because now, the subscription is based on the capability->attribute/event maps for devices that currently exist.
Before, we were doing a device type check on all endpoints, which was catching that this device would need to subscribe to onOff eventually, when its child device was created. Now that logic has been pushed to when the child device is actually created (which is not now). Thus the attribute is no longer subscribed to at this point
Contributor
Author
There was a problem hiding this comment.
Also, I reworked this file a bit to get the structure tested more thoroughly by only initializing the mock_child in the tests where it's directly needed. This way, I showed that before the device is created, only some of the subscriptions are handled, but after the device is initialized, the more complete subscribe table is used.
drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_utils/utils.lua
Show resolved
Hide resolved
hcarter-775
force-pushed
the
update/matter-switch-subscribe-logic-no-fields
branch
from
ddaf944 to
1972787
Compare
hcarter-775
force-pushed
the
update/matter-switch-subscribe-logic-no-fields
branch
3 times, most recently
from
8f71143 to
79cea27
Compare
hcarter-775
force-pushed
the
update/matter-switch-subscribe-logic-no-fields
branch
from
79cea27 to
3de35fd
Compare
drivers/SmartThings/matter-switch/src/test/test_matter_multi_button_switch_mcd.lua
Show resolved
Hide resolved
drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_utils/utils.lua
Show resolved
Hide resolved
hcarter-775
deleted the
update/matter-switch-subscribe-logic-no-fields
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of Change
Override generic matter switch handling of device:subscribe() to more properly and generically handle child devices.
Summary of Completed Tests
Tested multiple parent/child devices where the children had unique subscriptions from the parent device.