Skip to content

Commit

Permalink
[spec] Update field ids of existing FabricIndex fields to 0xFE (#16208)
Browse files Browse the repository at this point in the history 
* [spec] Update field ids of existing FabricIndex fields to 0xFE

* Run Codegen

* Misc: Adjust field order

* Fix missing structs

* Run Codegen

* Fix Code
  • Loading branch information
@erjiaqing
erjiaqing authored Mar 17, 2022
1 parent 2428cc5 commit cd08938
Show file tree
Hide file tree
Showing 49 changed files with 943 additions and 941 deletions.
22 changes: 11 additions & 11 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
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 @@ -1468,16 +1468,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 @@ -2318,18 +2318,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 Expand Up @@ -2887,14 +2887,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 @@ -2923,7 +2923,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
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
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 @@ -1057,18 +1057,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
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

0 comments on commit cd08938

Please sign in to comment.