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

Change OnOff revision to 5 (XML). Update all impacted .zap files. #26524

Merged
merged 19 commits into from
Jul 18, 2023
Merged

Change OnOff revision to 5 (XML). Update all impacted .zap files. #26524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c1ea768
Addresses Issue 26469
marktrayer May 11, 2023
6e2539a
Update cluster revision test for OnOff
marktrayer May 11, 2023
b7a2882
Regenerate generated code.
bzbarsky-apple May 12, 2023
527ead9
Add FeatureMap test step
marktrayer Jul 7, 2023
bc5e795
Merge branch 'master' into deadfrontonoff
marktrayer Jul 10, 2023
dd6d19d
Correct merge errors
marktrayer Jul 10, 2023
24a59ed
Merge Error correction
marktrayer Jul 10, 2023
a66a1e8
Updated zap regen files.
marktrayer Jul 10, 2023
141f33c
Merge branch 'deadfrontonoff' of https://github.com/marktrayer/connec…
marktrayer Jul 11, 2023
3277ff8
Add PICS value for the Dead Front feature
marktrayer Jul 11, 2023
9b68495
Add default PICS value for CI
marktrayer Jul 11, 2023
d41bee7
Set PICS value to 0
marktrayer Jul 12, 2023
bf4b9cc
Restyled by whitespace
restyled-commits Jul 12, 2023
0a3575a
Merge branch 'master' into deadfrontonoff
marktrayer Jul 12, 2023
9276e73
Cleanup merge errors
marktrayer Jul 13, 2023
2e5facf
Merge branch 'deadfrontonoff' of https://github.com/marktrayer/connec…
marktrayer Jul 13, 2023
686607e
Merge branch 'master' into deadfrontonoff
marktrayer Jul 13, 2023
3e05252
Update files from regen_all
marktrayer Jul 13, 2023
69a4a04
Merge branch 'master' into deadfrontonoff
marktrayer Jul 13, 2023
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
6 changes: 4 additions & 2 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ client cluster OnOff = 6 {

bitmap Feature : BITMAP32 {
kLighting = 0x1;
kDeadFront = 0x2;
}

bitmap OnOffControl : BITMAP8 {
Expand Down Expand Up @@ -361,6 +362,7 @@ server cluster OnOff = 6 {

bitmap Feature : BITMAP32 {
kLighting = 0x1;
kDeadFront = 0x2;
}

bitmap OnOffControl : BITMAP8 {
Expand Down Expand Up @@ -6529,7 +6531,7 @@ endpoint 1 {
ram attribute offWaitTime default = 0x0000;
persist attribute startUpOnOff default = 0xFF;
ram attribute featureMap default = 0x0001;
ram attribute clusterRevision default = 4;
ram attribute clusterRevision default = 5;
}

server cluster OnOffSwitchConfiguration {
Expand Down Expand Up @@ -7558,7 +7560,7 @@ endpoint 2 {
ram attribute offWaitTime default = 0;
ram attribute startUpOnOff;
ram attribute featureMap default = 0x0000;
ram attribute clusterRevision default = 4;
ram attribute clusterRevision default = 5;
}

server cluster Descriptor {
Expand Down
12 changes: 6 additions & 6 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "4",
"defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -650,7 +650,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "4",
"defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -10127,7 +10127,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "4",
"defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -10297,7 +10297,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "4",
"defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -29897,7 +29897,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "4",
"defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -30019,7 +30019,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "4",
"defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
5 changes: 3 additions & 2 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ server cluster OnOff = 6 {

bitmap Feature : BITMAP32 {
kLighting = 0x1;
kDeadFront = 0x2;
}

bitmap OnOffControl : BITMAP8 {
Expand Down Expand Up @@ -4209,7 +4210,7 @@ endpoint 1 {
server cluster OnOff {
persist attribute onOff default = 0x00;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 4;
ram attribute clusterRevision default = 5;
}

server cluster LevelControl {
Expand Down Expand Up @@ -4594,7 +4595,7 @@ endpoint 2 {
server cluster OnOff {
ram attribute onOff default = 0x00;
ram attribute featureMap default = 0x0000;
ram attribute clusterRevision default = 4;
ram attribute clusterRevision default = 5;
}

server cluster Descriptor {
Expand Down
12 changes: 6 additions & 6 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "4",
"defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -650,7 +650,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "4",
"defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -9153,7 +9153,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "4",
"defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -9323,7 +9323,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "4",
"defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -21564,7 +21564,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "4",
"defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -21686,7 +21686,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "4",
"defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
3 changes: 2 additions & 1 deletion examples/bridge-app/bridge-common/bridge-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ server cluster OnOff = 6 {

bitmap Feature : BITMAP32 {
kLighting = 0x1;
kDeadFront = 0x2;
}

bitmap OnOffControl : BITMAP8 {
Expand Down Expand Up @@ -1970,7 +1971,7 @@ endpoint 2 {
server cluster OnOff {
ram attribute onOff default = 0x00;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 4;
ram attribute clusterRevision default = 5;
}

server cluster LevelControl {
Expand Down
4 changes: 2 additions & 2 deletions examples/bridge-app/bridge-common/bridge-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6270,7 +6270,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "4",
"defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -6328,7 +6328,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "4",
"defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
3 changes: 2 additions & 1 deletion examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ server cluster OnOff = 6 {

bitmap Feature : BITMAP32 {
kLighting = 0x1;
kDeadFront = 0x2;
}

bitmap OnOffControl : BITMAP8 {
Expand Down Expand Up @@ -1843,7 +1844,7 @@ endpoint 1 {
callback attribute acceptedCommandList default = 0;
callback attribute attributeList default = 0;
ram attribute featureMap default = 0x1;
ram attribute clusterRevision default = 4;
ram attribute clusterRevision default = 5;
}

server cluster LevelControl {
Expand Down
8 changes: 4 additions & 4 deletions examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -610,7 +610,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -6224,7 +6224,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "4",
"defaultValue": "5",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -6394,7 +6394,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "4",
"defaultValue": "5",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
3 changes: 2 additions & 1 deletion examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ server cluster OnOff = 6 {

bitmap Feature : BITMAP32 {
kLighting = 0x1;
kDeadFront = 0x2;
}

bitmap OnOffControl : BITMAP8 {
Expand Down Expand Up @@ -1707,7 +1708,7 @@ endpoint 1 {
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 4;
ram attribute clusterRevision default = 5;
}

server cluster LevelControl {
Expand Down
8 changes: 4 additions & 4 deletions examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -610,7 +610,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -6313,7 +6313,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "4",
"defaultValue": "5",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -6499,7 +6499,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "4",
"defaultValue": "5",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -610,7 +610,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
3 changes: 2 additions & 1 deletion examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ server cluster OnOff = 6 {

bitmap Feature : BITMAP32 {
kLighting = 0x1;
kDeadFront = 0x2;
}

bitmap OnOffControl : BITMAP8 {
Expand Down Expand Up @@ -1619,7 +1620,7 @@ endpoint 1 {
callback attribute acceptedCommandList default = 0;
callback attribute attributeList default = 0;
ram attribute featureMap default = 0x1;
ram attribute clusterRevision default = 4;
ram attribute clusterRevision default = 5;
}

server cluster LevelControl {
Expand Down
8 changes: 4 additions & 4 deletions examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -610,7 +610,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -6249,7 +6249,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "4",
"defaultValue": "5",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -6419,7 +6419,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "4",
"defaultValue": "5",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
Loading