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

Update ZAP to pull in more correct global attribute storage handling. #29704

Merged
merged 1 commit into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -1778,7 +1778,7 @@ endpoint 0 {
callback attribute accessControlEntriesPerFabric default = 4;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
callback attribute clusterRevision default = 1;
}

server cluster BasicInformation {
Expand Down Expand Up @@ -1863,7 +1863,7 @@ endpoint 0 {
callback attribute currentHeapFree default = 0x0000000000000000;
callback attribute currentHeapUsed default = 0x0000000000000000;
callback attribute currentHeapHighWatermark default = 0x0000000000000000;
ram attribute featureMap default = 1;
callback attribute featureMap default = 1;
ram attribute clusterRevision default = 1;
}

Expand Down Expand Up @@ -1994,8 +1994,8 @@ endpoint 0 {
callback attribute groupTable;
callback attribute maxGroupsPerFabric;
callback attribute maxGroupKeysPerFabric;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
callback attribute featureMap default = 0;
callback attribute clusterRevision default = 1;
}
}
endpoint 1 {
Expand All @@ -2019,7 +2019,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
}

Expand Down Expand Up @@ -2055,7 +2055,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
}

Expand All @@ -2067,7 +2067,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
}

Expand All @@ -2079,7 +2079,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
}

Expand All @@ -2091,7 +2091,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
}

Expand All @@ -2103,7 +2103,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
}

Expand All @@ -2115,7 +2115,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
}

Expand All @@ -2127,7 +2127,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
}

Expand All @@ -2139,7 +2139,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
}

Expand All @@ -2151,7 +2151,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
}

Expand All @@ -2163,7 +2163,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6365,7 +6365,7 @@ endpoint 0 {
callback attribute currentHeapFree default = 0x0000000000000000;
callback attribute currentHeapUsed default = 0x0000000000000000;
callback attribute currentHeapHighWatermark default = 0x0000000000000000;
ram attribute featureMap default = 1;
callback attribute featureMap default = 1;
ram attribute clusterRevision default = 1;
}

Expand Down Expand Up @@ -6533,8 +6533,8 @@ endpoint 0 {
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
callback attribute featureMap default = 0;
callback attribute clusterRevision default = 1;
}

server cluster FixedLabel {
Expand Down Expand Up @@ -6766,7 +6766,7 @@ endpoint 1 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
}

Expand All @@ -6778,7 +6778,7 @@ endpoint 1 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
}

Expand All @@ -6803,7 +6803,7 @@ endpoint 1 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
}

Expand All @@ -6815,7 +6815,7 @@ endpoint 1 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
}

Expand Down Expand Up @@ -6849,7 +6849,7 @@ endpoint 1 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
}

Expand All @@ -6858,7 +6858,7 @@ endpoint 1 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
}

Expand Down Expand Up @@ -6946,7 +6946,7 @@ endpoint 1 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 7;
callback attribute featureMap default = 7;
ram attribute clusterRevision default = 1;
}

Expand All @@ -6960,7 +6960,7 @@ endpoint 1 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 7;
callback attribute featureMap default = 7;
ram attribute clusterRevision default = 1;
}

Expand Down Expand Up @@ -7265,7 +7265,7 @@ endpoint 1 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
}

Expand All @@ -7284,7 +7284,7 @@ endpoint 1 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
}

Expand All @@ -7303,7 +7303,7 @@ endpoint 1 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
}

Expand All @@ -7322,7 +7322,7 @@ endpoint 1 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
}

Expand All @@ -7341,7 +7341,7 @@ endpoint 1 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
}

Expand All @@ -7360,7 +7360,7 @@ endpoint 1 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
}

Expand All @@ -7379,7 +7379,7 @@ endpoint 1 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
}

Expand All @@ -7398,7 +7398,7 @@ endpoint 1 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
}

Expand All @@ -7417,7 +7417,7 @@ endpoint 1 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
}

Expand All @@ -7436,7 +7436,7 @@ endpoint 1 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4153,7 +4153,7 @@ endpoint 0 {
}

server cluster SoftwareDiagnostics {
ram attribute featureMap default = 0;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
}

Expand Down Expand Up @@ -4239,8 +4239,8 @@ endpoint 0 {
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
callback attribute featureMap default = 0;
callback attribute clusterRevision default = 1;
}

server cluster FixedLabel {
Expand Down
10 changes: 5 additions & 5 deletions examples/bridge-app/bridge-common/bridge-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1644,7 +1644,7 @@ endpoint 0 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
callback attribute clusterRevision default = 1;
}

server cluster BasicInformation {
Expand Down Expand Up @@ -1765,7 +1765,7 @@ endpoint 0 {
callback attribute currentHeapFree default = 0x0000000000000000;
callback attribute currentHeapUsed default = 0x0000000000000000;
callback attribute currentHeapHighWatermark default = 0x0000000000000000;
ram attribute featureMap default = 1;
callback attribute featureMap default = 1;
ram attribute clusterRevision default = 1;
}

Expand Down Expand Up @@ -1905,8 +1905,8 @@ endpoint 0 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
callback attribute featureMap default = 0;
callback attribute clusterRevision default = 1;
}

server cluster UserLabel {
Expand Down Expand Up @@ -1939,7 +1939,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
callback attribute clusterRevision default = 1;
}

server cluster Actions {
Expand Down
Loading