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

[spec] Update field ids of existing FabricIndex fields to 0xFE #16208

Merged
merged 6 commits into from
Mar 17, 2022
Merged

[spec] Update field ids of existing FabricIndex fields to 0xFE #16208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cbfe9ea
[spec] Update field ids of existing FabricIndex fields to 0xFE
erjiaqing Mar 15, 2022
4443dd6
Run Codegen
erjiaqing Mar 15, 2022
0eb2f2c
Misc: Adjust field order
erjiaqing Mar 15, 2022
1892c84
Fix missing structs
erjiaqing Mar 16, 2022
9afbb53
Run Codegen
erjiaqing Mar 16, 2022
10322ca
Fix Code
erjiaqing Mar 16, 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
22 changes: 11 additions & 11 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 @@ -28,11 +28,11 @@ server cluster AccessControl = 31 {
}

struct AccessControlEntry {
fabric_idx fabricIndex = 0;
Privilege privilege = 1;
AuthMode authMode = 2;
nullable INT64U subjects[] = 3;
nullable Target targets[] = 4;
fabric_idx fabricIndex = 254;
}

struct Target {
Expand All @@ -42,24 +42,24 @@ server cluster AccessControl = 31 {
}

struct ExtensionEntry {
fabric_idx fabricIndex = 0;
OCTET_STRING<254> data = 1;
fabric_idx fabricIndex = 254;
}

info event AccessControlEntryChanged = 0 {
fabric_idx adminFabricIndex = 0;
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
}

info event AccessControlExtensionChanged = 1 {
fabric_idx adminFabricIndex = 0;
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
}

attribute AccessControlEntry acl[] = 0;
Expand Down Expand Up @@ -230,11 +230,11 @@ server cluster BinaryInputBasic = 15 {

server cluster Binding = 30 {
struct TargetStruct {
FABRIC_IDX fabricIndex = 0;
optional NODE_ID node = 1;
optional GROUP_ID group = 2;
optional ENDPOINT_NO endpoint = 3;
optional CLUSTER_ID cluster = 4;
FABRIC_IDX fabricIndex = 254;
}

attribute TargetStruct binding[] = 0;
Expand Down Expand Up @@ -1462,16 +1462,16 @@ server cluster GroupKeyManagement = 63 {
}

struct GroupKeyMapStruct {
fabric_idx fabricIndex = 0;
group_id groupId = 1;
INT16U groupKeySetID = 2;
fabric_idx fabricIndex = 254;
}

struct GroupInfoMapStruct {
fabric_idx fabricIndex = 0;
group_id groupId = 1;
endpoint_no endpoints[] = 2;
optional CHAR_STRING<16> groupName = 3;
fabric_idx fabricIndex = 254;
}

struct GroupKeySetStruct {
Expand Down Expand Up @@ -2312,18 +2312,18 @@ server cluster OperationalCredentials = 62 {
}

struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
nullable OCTET_STRING icac = 2;
fabric_idx fabricIndex = 254;
}

struct FabricDescriptor {
fabric_idx fabricIndex = 0;
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
fabric_idx fabricIndex = 254;
}

readonly attribute NOCStruct NOCs[] = 0;
bzbarsky-apple marked this conversation as resolved.
Show resolved Hide resolved
Expand Down Expand Up @@ -2881,14 +2881,14 @@ server cluster TestCluster = 1295 {
}

struct TestFabricScoped {
fabric_idx fabricIndex = 0;
INT8U fabricSensitiveInt8u = 1;
optional INT8U optionalFabricSensitiveInt8u = 2;
nullable INT8U nullableFabricSensitiveInt8u = 3;
optional nullable INT8U nullableOptionalFabricSensitiveInt8u = 4;
CHAR_STRING fabricSensitiveCharString = 5;
SimpleStruct fabricSensitiveStruct = 6;
INT8U fabricSensitiveInt8uList[] = 7;
fabric_idx fabricIndex = 254;
}

struct NestedStructList {
Expand Down Expand Up @@ -2917,7 +2917,7 @@ server cluster TestCluster = 1295 {
}

info event TestFabricScopedEvent = 2 {
fabric_idx arg1 = 1;
fabric_idx arg1 = 254;
}

attribute boolean boolean = 0;
Expand Down
20 changes: 10 additions & 10 deletions 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 @@ -28,11 +28,11 @@ client cluster AccessControl = 31 {
}

struct AccessControlEntry {
fabric_idx fabricIndex = 0;
Privilege privilege = 1;
AuthMode authMode = 2;
nullable INT64U subjects[] = 3;
nullable Target targets[] = 4;
fabric_idx fabricIndex = 254;
}

struct Target {
Expand All @@ -42,24 +42,24 @@ client cluster AccessControl = 31 {
}

struct ExtensionEntry {
fabric_idx fabricIndex = 0;
OCTET_STRING<254> data = 1;
fabric_idx fabricIndex = 254;
}

info event AccessControlEntryChanged = 0 {
fabric_idx adminFabricIndex = 0;
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
}

info event AccessControlExtensionChanged = 1 {
fabric_idx adminFabricIndex = 0;
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
}

attribute AccessControlEntry acl[] = 0;
Expand Down Expand Up @@ -90,11 +90,11 @@ server cluster AccessControl = 31 {
}

struct AccessControlEntry {
fabric_idx fabricIndex = 0;
Privilege privilege = 1;
AuthMode authMode = 2;
nullable INT64U subjects[] = 3;
nullable Target targets[] = 4;
fabric_idx fabricIndex = 254;
}

struct Target {
Expand All @@ -104,24 +104,24 @@ server cluster AccessControl = 31 {
}

struct ExtensionEntry {
fabric_idx fabricIndex = 0;
OCTET_STRING<254> data = 1;
fabric_idx fabricIndex = 254;
}

info event AccessControlEntryChanged = 0 {
fabric_idx adminFabricIndex = 0;
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
}

info event AccessControlExtensionChanged = 1 {
fabric_idx adminFabricIndex = 0;
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
}

attribute AccessControlEntry acl[] = 0;
Expand Down Expand Up @@ -692,18 +692,18 @@ server cluster OperationalCredentials = 62 {
}

struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
nullable OCTET_STRING icac = 2;
fabric_idx fabricIndex = 254;
}

struct FabricDescriptor {
fabric_idx fabricIndex = 0;
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
fabric_idx fabricIndex = 254;
}

readonly attribute NOCStruct NOCs[] = 0;
Expand Down
12 changes: 6 additions & 6 deletions examples/door-lock-app/door-lock-common/door-lock-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ server cluster AccessControl = 31 {
}

struct AccessControlEntry {
fabric_idx fabricIndex = 0;
Privilege privilege = 1;
AuthMode authMode = 2;
nullable INT64U subjects[] = 3;
nullable Target targets[] = 4;
fabric_idx fabricIndex = 254;
}

struct Target {
Expand All @@ -42,24 +42,24 @@ server cluster AccessControl = 31 {
}

struct ExtensionEntry {
fabric_idx fabricIndex = 0;
OCTET_STRING<254> data = 1;
fabric_idx fabricIndex = 254;
}

info event AccessControlEntryChanged = 0 {
fabric_idx adminFabricIndex = 0;
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
}

info event AccessControlExtensionChanged = 1 {
fabric_idx adminFabricIndex = 0;
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
}

attribute AccessControlEntry acl[] = 0;
Expand Down Expand Up @@ -1051,18 +1051,18 @@ server cluster OperationalCredentials = 62 {
}

struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
nullable OCTET_STRING icac = 2;
fabric_idx fabricIndex = 254;
}

struct FabricDescriptor {
fabric_idx fabricIndex = 0;
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
fabric_idx fabricIndex = 254;
}

readonly attribute NOCStruct NOCs[] = 0;
Expand Down
18 changes: 9 additions & 9 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 @@ -28,11 +28,11 @@ server cluster AccessControl = 31 {
}

struct AccessControlEntry {
fabric_idx fabricIndex = 0;
Privilege privilege = 1;
AuthMode authMode = 2;
nullable INT64U subjects[] = 3;
nullable Target targets[] = 4;
fabric_idx fabricIndex = 254;
}

struct Target {
Expand All @@ -42,24 +42,24 @@ server cluster AccessControl = 31 {
}

struct ExtensionEntry {
fabric_idx fabricIndex = 0;
OCTET_STRING<254> data = 1;
fabric_idx fabricIndex = 254;
}

info event AccessControlEntryChanged = 0 {
fabric_idx adminFabricIndex = 0;
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
}

info event AccessControlExtensionChanged = 1 {
fabric_idx adminFabricIndex = 0;
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
}

attribute AccessControlEntry acl[] = 0;
Expand Down Expand Up @@ -142,11 +142,11 @@ server cluster Basic = 40 {

server cluster Binding = 30 {
struct TargetStruct {
FABRIC_IDX fabricIndex = 0;
optional NODE_ID node = 1;
optional GROUP_ID group = 2;
optional ENDPOINT_NO endpoint = 3;
optional CLUSTER_ID cluster = 4;
FABRIC_IDX fabricIndex = 254;
}

attribute TargetStruct binding[] = 0;
Expand Down Expand Up @@ -615,16 +615,16 @@ server cluster GroupKeyManagement = 63 {
}

struct GroupKeyMapStruct {
fabric_idx fabricIndex = 0;
group_id groupId = 1;
INT16U groupKeySetID = 2;
fabric_idx fabricIndex = 254;
}

struct GroupInfoMapStruct {
fabric_idx fabricIndex = 0;
group_id groupId = 1;
endpoint_no endpoints[] = 2;
optional CHAR_STRING<16> groupName = 3;
fabric_idx fabricIndex = 254;
}

struct GroupKeySetStruct {
Expand Down Expand Up @@ -1121,18 +1121,18 @@ server cluster OperationalCredentials = 62 {
}

struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
nullable OCTET_STRING icac = 2;
fabric_idx fabricIndex = 254;
}

struct FabricDescriptor {
fabric_idx fabricIndex = 0;
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
fabric_idx fabricIndex = 254;
}

readonly attribute NOCStruct NOCs[] = 0;
Expand Down
Loading