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.

Sign up for GitHub

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

[nrfconnect] Include GenericSwitch in light-switch example #19848

Merged
merged 16 commits into from
Jun 24, 2022
Merged

[nrfconnect] Include GenericSwitch in light-switch example #19848

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6b9aee7
[nrfconnect] Include GenericSwitch in light-switch example
markus-becker-tridonic-com Jun 22, 2022
fb8b31a
Restyled by whitespace
restyled-commits Jun 22, 2022
97cf124
Restyled by clang-format
restyled-commits Jun 22, 2022
8f684b7
Restyled by prettier-markdown
restyled-commits Jun 22, 2022
a7a07ae
Add missed generated file.
markus-becker-tridonic-com Jun 22, 2022
f34b912
Restyled by prettier-markdown
restyled-commits Jun 22, 2022
5fb8316
Adress review comments
markus-becker-tridonic-com Jun 22, 2022
aa3b6ee
Update zap
markus-becker-tridonic-com Jun 23, 2022
07b5884
Correct previousPosition and newPosition.
markus-becker-tridonic-com Jun 23, 2022
cd1b9e1
Apply suggestions from code review
markus-becker-tridonic-com Jun 23, 2022
13c067c
Restyled by clang-format
restyled-commits Jun 23, 2022
e039af7
Restyled by prettier-markdown
restyled-commits Jun 23, 2022
c4b4ca0
Correct second subscription command in README
markus-becker-tridonic-com Jun 23, 2022
ef59cdd
Remove leading >>> in commands
markus-becker-tridonic-com Jun 24, 2022
0227f31
Use backticks for commands
markus-becker-tridonic-com Jun 24, 2022
a5c6bb1
Merge branch 'master' into upstream-nrf-generic-switch
markus-becker-tridonic-com Jun 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 46 additions & 5 deletions examples/light-switch-app/light-switch-common/light-switch-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ client cluster Identify = 3 {

attribute int16u identifyTime = 0;
readonly attribute enum8 identifyType = 1;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
Expand Down Expand Up @@ -61,6 +63,8 @@ server cluster Identify = 3 {

attribute int16u identifyTime = 0;
readonly attribute enum8 identifyType = 1;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
Expand Down Expand Up @@ -300,6 +304,8 @@ server cluster Descriptor = 29 {
readonly attribute CLUSTER_ID serverList[] = 1;
readonly attribute CLUSTER_ID clientList[] = 2;
readonly attribute ENDPOINT_NO partsList[] = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
Expand Down Expand Up @@ -1227,6 +1233,11 @@ server cluster Switch = 59 {
INT8U totalNumberOfPressesCounted = 1;
}

readonly attribute int8u numberOfPositions = 0;
readonly attribute int8u currentPosition = 1;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
}
Expand Down Expand Up @@ -1918,11 +1929,6 @@ endpoint 0 {
ram attribute clusterRevision default = 1;
}

server cluster Switch {
ram attribute featureMap;
ram attribute clusterRevision default = 1;
}

server cluster AdministratorCommissioning {
callback attribute windowStatus;
callback attribute adminFabricIndex default = 1;
Expand Down Expand Up @@ -2000,5 +2006,40 @@ endpoint 1 {
ram attribute clusterRevision default = 1;
}
}
endpoint 2 {
device type genericswitch = 15;

server cluster Identify {
ram attribute identifyTime;
ram attribute identifyType;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap;
ram attribute clusterRevision default = 2;
}

server cluster Descriptor {
callback attribute deviceList;
callback attribute serverList;
callback attribute clientList;
callback attribute partsList;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap;
ram attribute clusterRevision default = 1;
}

server cluster Switch {
ram attribute numberOfPositions default = 2;
ram attribute currentPosition;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 2;
ram attribute clusterRevision default = 1;
}
}


Loading