Skip to content

Commit

Permalink
Align naming in Groups cluster XML with the spec. (#24236)
Browse files Browse the repository at this point in the history
* Align naming in Groups cluster XML with the spec.

Also fixes the incorrect ClusterRevision value in the XML.

* Regenerate generated files
  • Loading branch information
bzbarsky-apple authored and pull[bot] committed Jan 25, 2024
1 parent 7e4f51f commit 6fb2f12
Show file tree
Hide file tree
Showing 63 changed files with 996 additions and 816 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -57,35 +57,35 @@ server cluster Groups = 4 {
readonly attribute int16u clusterRevision = 65533;

request struct AddGroupRequest {
group_id groupId = 0;
group_id groupID = 0;
CHAR_STRING groupName = 1;
}

request struct ViewGroupRequest {
group_id groupId = 0;
group_id groupID = 0;
}

request struct GetGroupMembershipRequest {
group_id groupList[] = 0;
}

request struct RemoveGroupRequest {
group_id groupId = 0;
group_id groupID = 0;
}

request struct AddGroupIfIdentifyingRequest {
group_id groupId = 0;
group_id groupID = 0;
CHAR_STRING groupName = 1;
}

response struct AddGroupResponse = 0 {
ENUM8 status = 0;
group_id groupId = 1;
group_id groupID = 1;
}

response struct ViewGroupResponse = 1 {
ENUM8 status = 0;
group_id groupId = 1;
group_id groupID = 1;
CHAR_STRING groupName = 2;
}

Expand All @@ -96,7 +96,7 @@ server cluster Groups = 4 {

response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
group_id groupId = 1;
group_id groupID = 1;
}

fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,35 +51,35 @@ server cluster Groups = 4 {
readonly attribute int16u clusterRevision = 65533;

request struct AddGroupRequest {
group_id groupId = 0;
group_id groupID = 0;
CHAR_STRING groupName = 1;
}

request struct ViewGroupRequest {
group_id groupId = 0;
group_id groupID = 0;
}

request struct GetGroupMembershipRequest {
group_id groupList[] = 0;
}

request struct RemoveGroupRequest {
group_id groupId = 0;
group_id groupID = 0;
}

request struct AddGroupIfIdentifyingRequest {
group_id groupId = 0;
group_id groupID = 0;
CHAR_STRING groupName = 1;
}

response struct AddGroupResponse = 0 {
ENUM8 status = 0;
group_id groupId = 1;
group_id groupID = 1;
}

response struct ViewGroupResponse = 1 {
ENUM8 status = 0;
group_id groupId = 1;
group_id groupID = 1;
CHAR_STRING groupName = 2;
}

Expand All @@ -90,7 +90,7 @@ server cluster Groups = 4 {

response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
group_id groupId = 1;
group_id groupID = 1;
}

fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,35 +52,35 @@ server cluster Groups = 4 {
readonly attribute int16u clusterRevision = 65533;

request struct AddGroupRequest {
group_id groupId = 0;
group_id groupID = 0;
CHAR_STRING groupName = 1;
}

request struct ViewGroupRequest {
group_id groupId = 0;
group_id groupID = 0;
}

request struct GetGroupMembershipRequest {
group_id groupList[] = 0;
}

request struct RemoveGroupRequest {
group_id groupId = 0;
group_id groupID = 0;
}

request struct AddGroupIfIdentifyingRequest {
group_id groupId = 0;
group_id groupID = 0;
CHAR_STRING groupName = 1;
}

response struct AddGroupResponse = 0 {
ENUM8 status = 0;
group_id groupId = 1;
group_id groupID = 1;
}

response struct ViewGroupResponse = 1 {
ENUM8 status = 0;
group_id groupId = 1;
group_id groupID = 1;
CHAR_STRING groupName = 2;
}

Expand All @@ -91,7 +91,7 @@ server cluster Groups = 4 {

response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
group_id groupId = 1;
group_id groupID = 1;
}

fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,35 +58,35 @@ server cluster Groups = 4 {
readonly attribute int16u clusterRevision = 65533;

request struct AddGroupRequest {
group_id groupId = 0;
group_id groupID = 0;
CHAR_STRING groupName = 1;
}

request struct ViewGroupRequest {
group_id groupId = 0;
group_id groupID = 0;
}

request struct GetGroupMembershipRequest {
group_id groupList[] = 0;
}

request struct RemoveGroupRequest {
group_id groupId = 0;
group_id groupID = 0;
}

request struct AddGroupIfIdentifyingRequest {
group_id groupId = 0;
group_id groupID = 0;
CHAR_STRING groupName = 1;
}

response struct AddGroupResponse = 0 {
ENUM8 status = 0;
group_id groupId = 1;
group_id groupID = 1;
}

response struct ViewGroupResponse = 1 {
ENUM8 status = 0;
group_id groupId = 1;
group_id groupID = 1;
CHAR_STRING groupName = 2;
}

Expand All @@ -97,7 +97,7 @@ server cluster Groups = 4 {

response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
group_id groupId = 1;
group_id groupID = 1;
}

fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
Expand Down
14 changes: 7 additions & 7 deletions examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
Original file line number Diff line number Diff line change
Expand Up @@ -52,35 +52,35 @@ server cluster Groups = 4 {
readonly attribute int16u clusterRevision = 65533;

request struct AddGroupRequest {
group_id groupId = 0;
group_id groupID = 0;
CHAR_STRING groupName = 1;
}

request struct ViewGroupRequest {
group_id groupId = 0;
group_id groupID = 0;
}

request struct GetGroupMembershipRequest {
group_id groupList[] = 0;
}

request struct RemoveGroupRequest {
group_id groupId = 0;
group_id groupID = 0;
}

request struct AddGroupIfIdentifyingRequest {
group_id groupId = 0;
group_id groupID = 0;
CHAR_STRING groupName = 1;
}

response struct AddGroupResponse = 0 {
ENUM8 status = 0;
group_id groupId = 1;
group_id groupID = 1;
}

response struct ViewGroupResponse = 1 {
ENUM8 status = 0;
group_id groupId = 1;
group_id groupID = 1;
CHAR_STRING groupName = 2;
}

Expand All @@ -91,7 +91,7 @@ server cluster Groups = 4 {

response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
group_id groupId = 1;
group_id groupID = 1;
}

fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
Expand Down
14 changes: 7 additions & 7 deletions examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
Original file line number Diff line number Diff line change
Expand Up @@ -52,35 +52,35 @@ server cluster Groups = 4 {
readonly attribute int16u clusterRevision = 65533;

request struct AddGroupRequest {
group_id groupId = 0;
group_id groupID = 0;
CHAR_STRING groupName = 1;
}

request struct ViewGroupRequest {
group_id groupId = 0;
group_id groupID = 0;
}

request struct GetGroupMembershipRequest {
group_id groupList[] = 0;
}

request struct RemoveGroupRequest {
group_id groupId = 0;
group_id groupID = 0;
}

request struct AddGroupIfIdentifyingRequest {
group_id groupId = 0;
group_id groupID = 0;
CHAR_STRING groupName = 1;
}

response struct AddGroupResponse = 0 {
ENUM8 status = 0;
group_id groupId = 1;
group_id groupID = 1;
}

response struct ViewGroupResponse = 1 {
ENUM8 status = 0;
group_id groupId = 1;
group_id groupID = 1;
CHAR_STRING groupName = 2;
}

Expand All @@ -91,7 +91,7 @@ server cluster Groups = 4 {

response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
group_id groupId = 1;
group_id groupID = 1;
}

fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
Expand Down
14 changes: 7 additions & 7 deletions examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
Original file line number Diff line number Diff line change
Expand Up @@ -52,35 +52,35 @@ server cluster Groups = 4 {
readonly attribute int16u clusterRevision = 65533;

request struct AddGroupRequest {
group_id groupId = 0;
group_id groupID = 0;
CHAR_STRING groupName = 1;
}

request struct ViewGroupRequest {
group_id groupId = 0;
group_id groupID = 0;
}

request struct GetGroupMembershipRequest {
group_id groupList[] = 0;
}

request struct RemoveGroupRequest {
group_id groupId = 0;
group_id groupID = 0;
}

request struct AddGroupIfIdentifyingRequest {
group_id groupId = 0;
group_id groupID = 0;
CHAR_STRING groupName = 1;
}

response struct AddGroupResponse = 0 {
ENUM8 status = 0;
group_id groupId = 1;
group_id groupID = 1;
}

response struct ViewGroupResponse = 1 {
ENUM8 status = 0;
group_id groupId = 1;
group_id groupID = 1;
CHAR_STRING groupName = 2;
}

Expand All @@ -91,7 +91,7 @@ server cluster Groups = 4 {

response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
group_id groupId = 1;
group_id groupID = 1;
}

fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
Expand Down
Loading

0 comments on commit 6fb2f12

Please sign in to comment.