Align naming in Groups cluster XML with the spec. (#24236)
* Align naming in Groups cluster XML with the spec.
Also fixes the incorrect ClusterRevision value in the XML.
* Regenerate generated files
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
index e5781c2..975a959 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -57,12 +57,12 @@
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 {
@@ -70,22 +70,22 @@
}
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;
}
@@ -96,7 +96,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
index 288a32d..9d6d7c6 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -51,12 +51,12 @@
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 {
@@ -64,22 +64,22 @@
}
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;
}
@@ -90,7 +90,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
index 4dd2570..edee44e 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -52,12 +52,12 @@
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 {
@@ -65,22 +65,22 @@
}
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;
}
@@ -91,7 +91,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
index 8ea6225..f1a81e0 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -58,12 +58,12 @@
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 {
@@ -71,22 +71,22 @@
}
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;
}
@@ -97,7 +97,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
index 7515f90..41e311c 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
@@ -52,12 +52,12 @@
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 {
@@ -65,22 +65,22 @@
}
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;
}
@@ -91,7 +91,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
index 220c349..2511541 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -52,12 +52,12 @@
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 {
@@ -65,22 +65,22 @@
}
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;
}
@@ -91,7 +91,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
index fc1f5da..c05ca3e 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
@@ -52,12 +52,12 @@
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 {
@@ -65,22 +65,22 @@
}
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;
}
@@ -91,7 +91,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
index 774e706..3af0753 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -52,12 +52,12 @@
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 {
@@ -65,22 +65,22 @@
}
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;
}
@@ -91,7 +91,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
index 59b42de..f6e0a95 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
@@ -58,12 +58,12 @@
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 {
@@ -71,22 +71,22 @@
}
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;
}
@@ -97,7 +97,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
index 665d072..e107ec6 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
@@ -65,12 +65,12 @@
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 {
@@ -78,22 +78,22 @@
}
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;
}
@@ -104,7 +104,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
index eee4e47..1d8f5c6 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
@@ -52,12 +52,12 @@
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 {
@@ -65,22 +65,22 @@
}
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;
}
@@ -91,7 +91,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
index 4f0c7c0..3e5528e 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
@@ -65,12 +65,12 @@
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 {
@@ -78,22 +78,22 @@
}
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;
}
@@ -104,7 +104,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
index 993e09d..cece2d6 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
@@ -65,12 +65,12 @@
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 {
@@ -78,22 +78,22 @@
}
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;
}
@@ -104,7 +104,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
index aecd711..1c2b9cd 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
@@ -65,12 +65,12 @@
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 {
@@ -78,22 +78,22 @@
}
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;
}
@@ -104,7 +104,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
index 45a58c4..055ed78 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
@@ -52,12 +52,12 @@
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 {
@@ -65,22 +65,22 @@
}
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;
}
@@ -91,7 +91,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
index d6420b0..3f1a304 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
@@ -52,12 +52,12 @@
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 {
@@ -65,22 +65,22 @@
}
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;
}
@@ -91,7 +91,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
index 5558267..5dabec9 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
@@ -52,12 +52,12 @@
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 {
@@ -65,22 +65,22 @@
}
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;
}
@@ -91,7 +91,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
index c6ebe07..6de593c 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
@@ -70,12 +70,12 @@
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 {
@@ -83,22 +83,22 @@
}
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;
}
@@ -109,7 +109,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
index 218f76f..d995492 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
@@ -49,12 +49,12 @@
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 {
@@ -62,22 +62,22 @@
}
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;
}
@@ -88,7 +88,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
index 614cce0..f938b65 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
@@ -65,12 +65,12 @@
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 {
@@ -78,22 +78,22 @@
}
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;
}
@@ -104,7 +104,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
index 99cef50..6eb009f 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
@@ -52,12 +52,12 @@
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 {
@@ -65,22 +65,22 @@
}
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;
}
@@ -91,7 +91,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
index 637104a..1d6273f 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
@@ -52,12 +52,12 @@
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 {
@@ -65,22 +65,22 @@
}
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;
}
@@ -91,7 +91,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
index 07f78d8..a180508 100644
--- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
+++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
@@ -60,12 +60,12 @@
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 {
@@ -73,22 +73,22 @@
}
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;
}
@@ -99,7 +99,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter
index f6d8f6b..4603a8c 100644
--- a/examples/light-switch-app/light-switch-common/light-switch-app.matter
+++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -92,12 +92,12 @@
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 {
@@ -105,22 +105,22 @@
}
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;
}
@@ -131,7 +131,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index 2c2635d..ebd11bb 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -57,12 +57,12 @@
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 {
@@ -70,22 +70,22 @@
}
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;
}
@@ -96,7 +96,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter
index af2b51c..9546b1e 100644
--- a/examples/lighting-app/nxp/zap/lighting-on-off.matter
+++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter
@@ -58,12 +58,12 @@
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 {
@@ -71,22 +71,22 @@
}
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;
}
@@ -97,7 +97,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
index 5e7c219..2acb30b 100644
--- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
+++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
@@ -57,12 +57,12 @@
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 {
@@ -70,22 +70,22 @@
}
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;
}
@@ -96,7 +96,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index 7f0d172..8c8d610 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -46,12 +46,12 @@
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 {
@@ -59,22 +59,22 @@
}
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;
}
@@ -85,7 +85,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index 7f0d172..8c8d610 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -46,12 +46,12 @@
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 {
@@ -59,22 +59,22 @@
}
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;
}
@@ -85,7 +85,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
index 60a9c70..f590bee 100644
--- a/examples/thermostat/thermostat-common/thermostat.matter
+++ b/examples/thermostat/thermostat-common/thermostat.matter
@@ -86,12 +86,12 @@
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 {
@@ -99,22 +99,22 @@
}
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;
}
@@ -125,7 +125,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
index 90e17e0..7bdb068 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -51,12 +51,12 @@
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 {
@@ -64,22 +64,22 @@
}
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;
}
@@ -90,7 +90,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter
index 8f21770..72947fd 100644
--- a/examples/window-app/common/window-app.matter
+++ b/examples/window-app/common/window-app.matter
@@ -63,12 +63,12 @@
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 {
@@ -76,22 +76,22 @@
}
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;
}
@@ -102,7 +102,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/src/app/clusters/groups-server/groups-server.cpp b/src/app/clusters/groups-server/groups-server.cpp
index 588220e..8156876 100644
--- a/src/app/clusters/groups-server/groups-server.cpp
+++ b/src/app/clusters/groups-server/groups-server.cpp
@@ -143,8 +143,8 @@
auto fabricIndex = commandObj->GetAccessingFabricIndex();
Groups::Commands::AddGroupResponse::Type response;
- response.groupId = commandData.groupId;
- response.status = GroupAdd(fabricIndex, commandPath.mEndpointId, commandData.groupId, commandData.groupName);
+ response.groupID = commandData.groupID;
+ response.status = GroupAdd(fabricIndex, commandPath.mEndpointId, commandData.groupID, commandData.groupName);
commandObj->AddResponse(commandPath, response);
return true;
}
@@ -153,7 +153,7 @@
const Commands::ViewGroup::DecodableType & commandData)
{
auto fabricIndex = commandObj->GetAccessingFabricIndex();
- auto groupId = commandData.groupId;
+ auto groupId = commandData.groupID;
GroupDataProvider * provider = GetGroupDataProvider();
GroupDataProvider::GroupInfo info;
Groups::Commands::ViewGroupResponse::Type response;
@@ -170,7 +170,7 @@
response.groupName = CharSpan(info.name, strnlen(info.name, GroupDataProvider::GroupInfo::kGroupNameMax));
status = EMBER_ZCL_STATUS_SUCCESS;
exit:
- response.groupId = groupId;
+ response.groupID = groupId;
response.status = status;
commandObj->AddResponse(commandPath, response);
return true;
@@ -289,10 +289,10 @@
#ifdef EMBER_AF_PLUGIN_SCENES
// If a group is, removed the scenes associated with that group SHOULD be removed.
- emberAfScenesClusterRemoveScenesInGroupCallback(commandPath.mEndpointId, commandData.groupId);
+ emberAfScenesClusterRemoveScenesInGroupCallback(commandPath.mEndpointId, commandData.groupID);
#endif
- response.groupId = commandData.groupId;
- response.status = GroupRemove(fabricIndex, commandPath.mEndpointId, commandData.groupId);
+ response.groupID = commandData.groupID;
+ response.status = GroupRemove(fabricIndex, commandPath.mEndpointId, commandData.groupID);
commandObj->AddResponse(commandPath, response);
return true;
@@ -342,7 +342,7 @@
const Commands::AddGroupIfIdentifying::DecodableType & commandData)
{
auto fabricIndex = commandObj->GetAccessingFabricIndex();
- auto groupId = commandData.groupId;
+ auto groupId = commandData.groupID;
auto groupName = commandData.groupName;
auto endpointId = commandPath.mEndpointId;
diff --git a/src/app/tests/suites/TestGroupDemoConfig.yaml b/src/app/tests/suites/TestGroupDemoConfig.yaml
index 97277f1..284eb16 100644
--- a/src/app/tests/suites/TestGroupDemoConfig.yaml
+++ b/src/app/tests/suites/TestGroupDemoConfig.yaml
@@ -71,15 +71,15 @@
endpoint: 1
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x0101
- - name: "groupName"
+ - name: "GroupName"
value: "Group #1"
response:
values:
- - name: "status"
+ - name: "Status"
value: 0
- - name: "groupId"
+ - name: "GroupID"
value: 0x0101
- label: "Install ACLs"
diff --git a/src/app/tests/suites/TestGroupKeyManagementCluster.yaml b/src/app/tests/suites/TestGroupKeyManagementCluster.yaml
index d7e9d95..f388434 100644
--- a/src/app/tests/suites/TestGroupKeyManagementCluster.yaml
+++ b/src/app/tests/suites/TestGroupKeyManagementCluster.yaml
@@ -155,15 +155,15 @@
command: "AddGroup"
arguments:
values:
- - name: "GroupId"
+ - name: "GroupID"
value: 0x0101
- name: "GroupName"
value: "Group #1"
response:
values:
- - name: "status"
+ - name: "Status"
value: 0
- - name: "GroupId"
+ - name: "GroupID"
value: 0x0101
- label: "Add Group 2"
@@ -172,15 +172,15 @@
command: "AddGroup"
arguments:
values:
- - name: "GroupId"
+ - name: "GroupID"
value: 0x0102
- name: "GroupName"
value: "Group #2"
response:
values:
- - name: "status"
+ - name: "Status"
value: 0
- - name: "GroupId"
+ - name: "GroupID"
value: 0x0102
- label: "Read GroupTable"
@@ -246,13 +246,13 @@
command: "RemoveGroup"
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x0101
response:
values:
- - name: "status"
+ - name: "Status"
value: 0
- - name: "groupId"
+ - name: "GroupID"
value: 0x0101
- label: "Read GroupTable 2"
diff --git a/src/app/tests/suites/TestGroupMessaging.yaml b/src/app/tests/suites/TestGroupMessaging.yaml
index 1cd3fc9..f13d2d0 100644
--- a/src/app/tests/suites/TestGroupMessaging.yaml
+++ b/src/app/tests/suites/TestGroupMessaging.yaml
@@ -94,15 +94,15 @@
endpoint: 1
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x0101
- - name: "groupName"
+ - name: "GroupName"
value: "Group #1"
response:
values:
- - name: "status"
+ - name: "Status"
value: 0
- - name: "groupId"
+ - name: "GroupID"
value: 0x0101
- label: "Add Group 2 (endpoint 0)"
@@ -111,15 +111,15 @@
endpoint: 0
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x0102
- - name: "groupName"
+ - name: "GroupName"
value: "Group #2"
response:
values:
- - name: "status"
+ - name: "Status"
value: 0
- - name: "groupId"
+ - name: "GroupID"
value: 0x0102
- label: "Install ACLs"
@@ -347,15 +347,15 @@
endpoint: 1
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x0101
- - name: "groupName"
+ - name: "GroupName"
value: "Group #1"
response:
values:
- - name: "status"
+ - name: "Status"
value: 0
- - name: "groupId"
+ - name: "GroupID"
value: 0x0101
- label: "Add Group 2 (endpoint 0) for gamma"
@@ -365,15 +365,15 @@
endpoint: 0
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x0102
- - name: "groupName"
+ - name: "GroupName"
value: "Group #2"
response:
values:
- - name: "status"
+ - name: "Status"
value: 0
- - name: "groupId"
+ - name: "GroupID"
value: 0x0102
- label: "Install ACLs for gamma"
diff --git a/src/app/tests/suites/TestGroupsCluster.yaml b/src/app/tests/suites/TestGroupsCluster.yaml
index 326dcbb..f584899 100644
--- a/src/app/tests/suites/TestGroupsCluster.yaml
+++ b/src/app/tests/suites/TestGroupsCluster.yaml
@@ -32,41 +32,41 @@
command: "ViewGroup"
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0
response:
values:
- - name: "status"
+ - name: "Status"
value: 0x87
- - name: "groupId"
+ - name: "GroupID"
value: 0
- label: "View First Group (not found)"
command: "ViewGroup"
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x0101
response:
values:
- - name: "status"
+ - name: "Status"
value: 0x8B
- - name: "groupId"
+ - name: "GroupID"
value: 0x0101
- label: "Add First Group (no keys)"
command: "AddGroup"
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x0101
- - name: "groupName"
+ - name: "GroupName"
value: "Group #1"
response:
values:
- - name: "status"
+ - name: "Status"
value: 0x7e
- - name: "groupId"
+ - name: "GroupId"
value: 0x0101
- label: "Add KeySet"
@@ -104,99 +104,99 @@
command: "AddGroup"
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x0101
- - name: "groupName"
+ - name: "GroupName"
value: "Group #1"
response:
values:
- - name: "status"
+ - name: "Status"
value: 0
- - name: "groupId"
+ - name: "GroupID"
value: 0x0101
- label: "View First Group (new)"
command: "ViewGroup"
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x0101
response:
values:
- - name: "status"
+ - name: "Status"
value: 0
- - name: "groupId"
+ - name: "GroupID"
value: 0x0101
- - name: "groupName"
+ - name: "GroupName"
value: "Group #1"
- label: "View Second Group (not found)"
command: "ViewGroup"
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x0102
response:
values:
- - name: "status"
+ - name: "Status"
value: 0x8B
- - name: "groupId"
+ - name: "GroupID"
value: 0x0102
- label: "Get Group Membership 1 (all)"
command: "GetGroupMembership"
arguments:
values:
- - name: "groupList"
+ - name: "GroupList"
value: []
response:
values:
- - name: "capacity"
+ - name: "Capacity"
value: null
- - name: "groupList"
+ - name: "GroupList"
value: [0x0101]
- label: "Add Second Group (new)"
command: "AddGroup"
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x0102
- - name: "groupName"
+ - name: "GroupName"
value: "Group #2"
response:
values:
- - name: "status"
+ - name: "Status"
value: 0
- - name: "groupId"
+ - name: "GroupID"
value: 0x0102
- label: "View Second Group (new)"
command: "ViewGroup"
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x0102
response:
values:
- - name: "status"
+ - name: "Status"
value: 0
- - name: "groupId"
+ - name: "GroupID"
value: 0x0102
- - name: "groupName"
+ - name: "GroupName"
value: "Group #2"
- label: "View Group 3 (not found)"
command: "ViewGroup"
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x7fff
response:
values:
- - name: "status"
+ - name: "Status"
value: 0x8B
- - name: "groupId"
+ - name: "GroupID"
value: 0x7fff
- label: "Add Group 3 (new)"
@@ -205,58 +205,58 @@
command: "AddGroup"
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x7fff
- - name: "groupName"
+ - name: "GroupName"
value: "Group #3"
response:
values:
- - name: "status"
+ - name: "Status"
value: 0
- - name: "groupId"
+ - name: "GroupID"
value: 0x7fff
- label: "View First Group (existing)"
command: "ViewGroup"
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x0101
response:
values:
- - name: "status"
+ - name: "Status"
value: 0
- - name: "groupId"
+ - name: "GroupID"
value: 0x0101
- - name: "groupName"
+ - name: "GroupName"
value: "Group #1"
- label: "View Second Group (existing)"
command: "ViewGroup"
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x0102
response:
values:
- - name: "status"
+ - name: "Status"
value: 0
- - name: "groupId"
+ - name: "GroupID"
value: 0x0102
- - name: "groupName"
+ - name: "GroupName"
value: "Group #2"
- label: "Get Group Membership 2"
command: "GetGroupMembership"
arguments:
values:
- - name: "groupList"
+ - name: "GroupList"
value: [0x0102, 0x0103, 0x7fff]
response:
values:
- - name: "capacity"
+ - name: "Capacity"
value: null
- - name: "groupList"
+ - name: "GroupList"
value: [0x0102]
- label: "View Group 3 (new)"
@@ -265,82 +265,82 @@
command: "ViewGroup"
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x7fff
response:
values:
- - name: "status"
+ - name: "Status"
value: 0
- - name: "groupId"
+ - name: "GroupID"
value: 0x7fff
- - name: "groupName"
+ - name: "GroupName"
value: "Group #3"
- label: "Remove Group 0 (invalid)"
command: "RemoveGroup"
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0
response:
values:
- - name: "status"
+ - name: "Status"
value: 0x87
- - name: "groupId"
+ - name: "GroupID"
value: 0
- label: "Remove Group 4 (not found)"
command: "RemoveGroup"
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x0104
response:
values:
- - name: "status"
+ - name: "Status"
value: 0x8B
- - name: "groupId"
+ - name: "GroupID"
value: 0x0104
- label: "Remove Second Group (existing)"
command: "RemoveGroup"
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x0102
response:
values:
- - name: "status"
+ - name: "Status"
value: 0
- - name: "groupId"
+ - name: "GroupID"
value: 0x0102
- label: "View First Group (not removed)"
command: "ViewGroup"
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x0101
response:
values:
- - name: "status"
+ - name: "Status"
value: 0
- - name: "groupId"
+ - name: "GroupID"
value: 0x0101
- - name: "groupName"
+ - name: "GroupName"
value: "Group #1"
- label: "View Second Group (removed)"
command: "ViewGroup"
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x0102
response:
values:
- - name: "status"
+ - name: "Status"
value: 0x8B
- - name: "groupId"
+ - name: "GroupID"
value: 0x0102
- label: "View Group 3 (not removed)"
@@ -349,28 +349,28 @@
command: "ViewGroup"
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x7fff
response:
values:
- - name: "status"
+ - name: "Status"
value: 0
- - name: "groupId"
+ - name: "GroupID"
value: 0x7fff
- - name: "groupName"
+ - name: "GroupName"
value: "Group #3"
- label: "Get Group Membership 3"
command: "GetGroupMembership"
arguments:
values:
- - name: "groupList"
+ - name: "GroupList"
value: [0x01, 0x0101, 0x0102, 0x03]
response:
values:
- - name: "capacity"
+ - name: "Capacity"
value: null
- - name: "groupList"
+ - name: "GroupList"
value: [0x0101]
- label: "Remove All"
@@ -380,50 +380,50 @@
command: "ViewGroup"
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x0101
response:
values:
- - name: "status"
+ - name: "Status"
value: 0x8B
- - name: "groupId"
+ - name: "GroupID"
value: 0x0101
- label: "View Second Group (still removed)"
command: "ViewGroup"
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x0102
response:
values:
- - name: "status"
+ - name: "Status"
value: 0x8B
- - name: "groupId"
+ - name: "GroupID"
value: 0x0102
- label: "View Group 3 (removed)"
command: "ViewGroup"
arguments:
values:
- - name: "groupId"
+ - name: "GroupID"
value: 0x7fff
response:
values:
- - name: "status"
+ - name: "Status"
value: 0x8B
- - name: "groupId"
+ - name: "GroupID"
value: 0x7fff
- label: "Get Group Membership 4"
command: "GetGroupMembership"
arguments:
values:
- - name: "groupList"
+ - name: "GroupList"
value: [0x01, 0x0101, 0x0102, 0x03, 0x7fff]
response:
values:
- - name: "capacity"
+ - name: "Capacity"
value: null
- - name: "groupList"
+ - name: "GroupList"
value: []
diff --git a/src/app/tests/suites/certification/Test_TC_BIND_2_2.yaml b/src/app/tests/suites/certification/Test_TC_BIND_2_2.yaml
index 07db427..9108749 100644
--- a/src/app/tests/suites/certification/Test_TC_BIND_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BIND_2_2.yaml
@@ -218,8 +218,8 @@
[1657719097.788236][4548:4554] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0004 Command 0x0000_0000
[1657719097.788325][4548:4554] CHIP:TOO: AddGroupResponse: {
- [1657719097.788366][4548:4554] CHIP:TOO: status: 0
- [1657719097.788393][4548:4554] CHIP:TOO: groupId: 1
+ [1657719097.788366][4548:4554] CHIP:TOO: Status: 0
+ [1657719097.788393][4548:4554] CHIP:TOO: GroupID: 1
[1657719097.788418][4548:4554] CHIP:TOO: }
@@ -231,8 +231,8 @@
[1657717342.599740][3368:3373] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0004 Command 0x0000_0000
[1657717342.599891][3368:3373] CHIP:TOO: AddGroupResponse: {
- [1657717342.599959][3368:3373] CHIP:TOO: status: 0
- [1657717342.600007][3368:3373] CHIP:TOO: groupId: 1
+ [1657717342.599959][3368:3373] CHIP:TOO: Status: 0
+ [1657717342.600007][3368:3373] CHIP:TOO: GroupID: 1
[1657717342.600054][3368:3373] CHIP:TOO: }
[1657717342.600130][3368:3373] CHIP:DMG: ICR moving
diff --git a/src/app/tests/suites/certification/Test_TC_BIND_2_3.yaml b/src/app/tests/suites/certification/Test_TC_BIND_2_3.yaml
index c6b9bd6..b069dd8 100644
--- a/src/app/tests/suites/certification/Test_TC_BIND_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BIND_2_3.yaml
@@ -184,8 +184,8 @@
[1657719097.788236][4548:4554] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0004 Command 0x0000_0000
[1657719097.788325][4548:4554] CHIP:TOO: AddGroupResponse: {
- [1657719097.788366][4548:4554] CHIP:TOO: status: 0
- [1657719097.788393][4548:4554] CHIP:TOO: groupId: 1
+ [1657719097.788366][4548:4554] CHIP:TOO: Status: 0
+ [1657719097.788393][4548:4554] CHIP:TOO: GroupID: 1
[1657719097.788418][4548:4554] CHIP:TOO: }
@@ -197,8 +197,8 @@
[1657719097.788236][4548:4554] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0004 Command 0x0000_0000
[1657719097.788325][4548:4554] CHIP:TOO: AddGroupResponse: {
- [1657719097.788366][4548:4554] CHIP:TOO: status: 0
- [1657719097.788393][4548:4554] CHIP:TOO: groupId: 1
+ [1657719097.788366][4548:4554] CHIP:TOO: Status: 0
+ [1657719097.788393][4548:4554] CHIP:TOO: GroupID: 1
[1657719097.788418][4548:4554] CHIP:TOO: }
diff --git a/src/app/tests/suites/certification/Test_TC_G_2_2.yaml b/src/app/tests/suites/certification/Test_TC_G_2_2.yaml
index 1ff8701..c2022b9 100644
--- a/src/app/tests/suites/certification/Test_TC_G_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_G_2_2.yaml
@@ -186,8 +186,8 @@
[1651218084.427102][2526:2531] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0000
[1651218084.427203][2526:2531] CHIP:TOO: AddGroupResponse: {
- [1651218084.427241][2526:2531] CHIP:TOO: status: 0
- [1651218084.427264][2526:2531] CHIP:TOO: groupId: 1
+ [1651218084.427241][2526:2531] CHIP:TOO: Status: 0
+ [1651218084.427264][2526:2531] CHIP:TOO: GroupID: 1
[1651218084.427314][2526:2531] CHIP:TOO: }
disabled: true
@@ -222,8 +222,8 @@
[1653484028.897698][11275:11280] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0000
[1653484028.897804][11275:11280] CHIP:TOO: AddGroupResponse: {
- [1653484028.897851][11275:11280] CHIP:TOO: status: 0
- [1653484028.897884][11275:11280] CHIP:TOO: groupId: 2
+ [1653484028.897851][11275:11280] CHIP:TOO: Status: 0
+ [1653484028.897884][11275:11280] CHIP:TOO: GroupID: 2
[1653484028.897917][11275:11280] CHIP:TOO: }
disabled: true
@@ -265,8 +265,8 @@
[1653484116.857523][11289:11294] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0000
[1653484116.857675][11289:11294] CHIP:TOO: AddGroupResponse: {
- [1653484116.857739][11289:11294] CHIP:TOO: status: 0
- [1653484116.857787][11289:11294] CHIP:TOO: groupId: 3
+ [1653484116.857739][11289:11294] CHIP:TOO: Status: 0
+ [1653484116.857787][11289:11294] CHIP:TOO: GroupID: 3
[1653484116.857834][11289:11294] CHIP:TOO: }
disabled: true
@@ -315,8 +315,8 @@
[1653484187.170553][11306:11311] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0000
[1653484187.170637][11306:11311] CHIP:TOO: AddGroupResponse: {
- [1653484187.170677][11306:11311] CHIP:TOO: status: 137
- [1653484187.170702][11306:11311] CHIP:TOO: groupId: 4
+ [1653484187.170677][11306:11311] CHIP:TOO: Status: 137
+ [1653484187.170702][11306:11311] CHIP:TOO: GroupID: 4
[1653484187.170727][11306:11311] CHIP:TOO: }
disabled: true
@@ -365,8 +365,8 @@
[1653484439.884144][11341:11346] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0000
[1653484439.884258][11341:11346] CHIP:TOO: AddGroupResponse: {
- [1653484439.884310][11341:11346] CHIP:TOO: status: 135
- [1653484439.884346][11341:11346] CHIP:TOO: groupId: 0
+ [1653484439.884310][11341:11346] CHIP:TOO: Status: 135
+ [1653484439.884346][11341:11346] CHIP:TOO: GroupID: 0
[1653484439.884383][11341:11346] CHIP:TOO: }
disabled: true
@@ -381,8 +381,8 @@
[1658302176.951047][2747:2752] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0004 Command 0x0000_0000
[1658302176.951103][2747:2752] CHIP:TOO: AddGroupResponse: {
- [1658302176.951140][2747:2752] CHIP:TOO: status: 126
- [1658302176.951166][2747:2752] CHIP:TOO: groupId: 5
+ [1658302176.951140][2747:2752] CHIP:TOO: Status: 126
+ [1658302176.951166][2747:2752] CHIP:TOO: GroupID: 5
[1658302176.951189][2747:2752] CHIP:TOO: }
disabled: true
@@ -397,9 +397,9 @@
1653484504.667714][11349:11354] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0001
[1653484504.667841][11349:11354] CHIP:TOO: ViewGroupResponse: {
- [1653484504.667927][11349:11354] CHIP:TOO: status: 0
- [1653484504.667974][11349:11354] CHIP:TOO: groupId: 1
- [1653484504.668018][11349:11354] CHIP:TOO: groupName: grp1
+ [1653484504.667927][11349:11354] CHIP:TOO: Status: 0
+ [1653484504.667974][11349:11354] CHIP:TOO: GroupID: 1
+ [1653484504.668018][11349:11354] CHIP:TOO: GroupName: grp1
[1653484504.668064][11349:11354] CHIP:TOO: }
disabled: true
@@ -414,9 +414,9 @@
[1653484611.595344][11412:11417] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0001
[1653484611.595454][11412:11417] CHIP:TOO: ViewGroupResponse: {
- [1653484611.595501][11412:11417] CHIP:TOO: status: 135
- [1653484611.595534][11412:11417] CHIP:TOO: groupId: 0
- [1653484611.595565][11412:11417] CHIP:TOO: groupName:
+ [1653484611.595501][11412:11417] CHIP:TOO: Status: 135
+ [1653484611.595534][11412:11417] CHIP:TOO: GroupID: 0
+ [1653484611.595565][11412:11417] CHIP:TOO: GroupName:
[1653484611.595599][11412:11417] CHIP:TOO: }
disabled: true
@@ -431,8 +431,8 @@
[1653484876.432744][11451:11456] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0003
[1653484876.432915][11451:11456] CHIP:TOO: RemoveGroupResponse: {
- [1653484876.432989][11451:11456] CHIP:TOO: status: 0
- [1653484876.433044][11451:11456] CHIP:TOO: groupId: 1
+ [1653484876.432989][11451:11456] CHIP:TOO: Status: 0
+ [1653484876.433044][11451:11456] CHIP:TOO: GroupID: 1
[1653484876.433098][11451:11456] CHIP:TOO: }
disabled: true
@@ -447,9 +447,9 @@
[1653484952.142387][11458:11463] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0001
[1653484952.142476][11458:11463] CHIP:TOO: ViewGroupResponse: {
- [1653484952.142516][11458:11463] CHIP:TOO: status: 139
- [1653484952.142541][11458:11463] CHIP:TOO: groupId: 1
- [1653484952.142566][11458:11463] CHIP:TOO: groupName:
+ [1653484952.142516][11458:11463] CHIP:TOO: Status: 139
+ [1653484952.142541][11458:11463] CHIP:TOO: GroupID: 1
+ [1653484952.142566][11458:11463] CHIP:TOO: GroupName:
[1653484952.142592][11458:11463] CHIP:TOO: }
disabled: true
@@ -489,8 +489,8 @@
[1653485045.328766][11473:11478] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0003
[1653485045.328896][11473:11478] CHIP:TOO: RemoveGroupResponse: {
- [1653485045.328954][11473:11478] CHIP:TOO: status: 135
- [1653485045.328994][11473:11478] CHIP:TOO: groupId: 0
+ [1653485045.328954][11473:11478] CHIP:TOO: Status: 135
+ [1653485045.328994][11473:11478] CHIP:TOO: GroupID: 0
[1653485045.329036][11473:11478] CHIP:TOO: }
disabled: true
@@ -505,8 +505,8 @@
[1653485126.672869][11483:11488] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0003
[1653485126.672969][11483:11488] CHIP:TOO: RemoveGroupResponse: {
- [1653485126.673015][11483:11488] CHIP:TOO: status: 139
- [1653485126.673045][11483:11488] CHIP:TOO: groupId: 52
+ [1653485126.673015][11483:11488] CHIP:TOO: Status: 139
+ [1653485126.673045][11483:11488] CHIP:TOO: GroupID: 52
[1653485126.673075][11483:11488] CHIP:TOO: }
disabled: true
@@ -559,9 +559,9 @@
[1653559917.259920][3227:3232] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0001
[1653559917.259993][3227:3232] CHIP:TOO: ViewGroupResponse: {
- [1653559917.260040][3227:3232] CHIP:TOO: status: 139
- [1653559917.260075][3227:3232] CHIP:TOO: groupId: 1
- [1653559917.260107][3227:3232] CHIP:TOO: groupName:
+ [1653559917.260040][3227:3232] CHIP:TOO: Status: 139
+ [1653559917.260075][3227:3232] CHIP:TOO: GroupID: 1
+ [1653559917.260107][3227:3232] CHIP:TOO: GroupName:
[1653559917.260138][3227:3232] CHIP:TOO: }
disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_G_2_3.yaml b/src/app/tests/suites/certification/Test_TC_G_2_3.yaml
index 899cf13..5b4fb88 100644
--- a/src/app/tests/suites/certification/Test_TC_G_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_G_2_3.yaml
@@ -235,8 +235,8 @@
[1653552285.195099][2464:2469] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0000
[1653552285.197783][2464:2469] CHIP:TOO: AddGroupResponse: {
- [1653552285.197849][2464:2469] CHIP:TOO: status: 0
- [1653552285.197877][2464:2469] CHIP:TOO: groupId: 2
+ [1653552285.197849][2464:2469] CHIP:TOO: Status: 0
+ [1653552285.197877][2464:2469] CHIP:TOO: GroupID: 2
[1653552285.197933][2464:2469] CHIP:TOO: }
disabled: true
@@ -269,8 +269,8 @@
[1653552417.870291][2482:2487] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0000
[1653552417.870407][2482:2487] CHIP:TOO: AddGroupResponse: {
- [1653552417.870462][2482:2487] CHIP:TOO: status: 0
- [1653552417.870500][2482:2487] CHIP:TOO: groupId: 3
+ [1653552417.870462][2482:2487] CHIP:TOO: Status: 0
+ [1653552417.870500][2482:2487] CHIP:TOO: GroupID: 3
[1653552417.870539][2482:2487] CHIP:TOO: }
disabled: true
@@ -312,8 +312,8 @@
[1653552493.052711][2501:2506] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0002
[1653552493.052792][2501:2506] CHIP:TOO: GetGroupMembershipResponse: {
- [1653552493.052819][2501:2506] CHIP:TOO: capacity: null
- [1653552493.052870][2501:2506] CHIP:TOO: groupList: 2 entries
+ [1653552493.052819][2501:2506] CHIP:TOO: Capacity: null
+ [1653552493.052870][2501:2506] CHIP:TOO: GroupList: 2 entries
[1653552493.052922][2501:2506] CHIP:TOO: [1]: 2
[1653552493.052950][2501:2506] CHIP:TOO: [2]: 3
[1653552493.052978][2501:2506] CHIP:TOO: }
@@ -330,8 +330,8 @@
[1653294426.515523][3638:3643] CHIP:TOO: GetGroupMembershipResponse: {
- [1653294426.515571][3638:3643] CHIP:TOO: capacity: null
- [1653294426.515649][3638:3643] CHIP:TOO: groupList: 1 entries
+ [1653294426.515571][3638:3643] CHIP:TOO: Capacity: null
+ [1653294426.515649][3638:3643] CHIP:TOO: GroupList: 1 entries
[1653294426.515737][3638:3643] CHIP:TOO: [1]: 2
[1653294426.515916][3638:3643] CHIP:TOO: }
disabled: true
@@ -348,8 +348,8 @@
Verify "grouplist entries" on the TH(Chip-tool) Log:
[1653294490.030740][3646:3651] CHIP:TOO: GetGroupMembershipResponse: {
- [1653294490.030775][3646:3651] CHIP:TOO: capacity: null
- [1653294490.030838][3646:3651] CHIP:TOO: groupList: 2 entries
+ [1653294490.030775][3646:3651] CHIP:TOO: Capacity: null
+ [1653294490.030838][3646:3651] CHIP:TOO: GroupList: 2 entries
[1653294490.030907][3646:3651] CHIP:TOO: [1]: 2
[1653294490.030943][3646:3651] CHIP:TOO: [2]: 3
[1653294490.030979][3646:3651] CHIP:TOO: }
diff --git a/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml b/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml
index 91fcdcf..ab5035d 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml
@@ -126,8 +126,8 @@
[1651218084.427102][2526:2531] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0000
[1651218084.427203][2526:2531] CHIP:TOO: AddGroupResponse: {
- [1651218084.427241][2526:2531] CHIP:TOO: status: 0
- [1651218084.427264][2526:2531] CHIP:TOO: groupId: 1
+ [1651218084.427241][2526:2531] CHIP:TOO: Status: 0
+ [1651218084.427264][2526:2531] CHIP:TOO: GroupID: 1
[1651218084.427314][2526:2531] CHIP:TOO: }
disabled: true
@@ -141,8 +141,8 @@
[1651218576.149152][2635:2640] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0001
[1651218576.149231][2635:2640] CHIP:TOO: ViewGroupResponse: {
- [1651218576.149265][2635:2640] CHIP:TOO: status: 0
- [1651218576.149289][2635:2640] CHIP:TOO: groupId: 1
+ [1651218576.149265][2635:2640] CHIP:TOO: Status: 0
+ [1651218576.149289][2635:2640] CHIP:TOO: GroupID: 1
[1651218576.149311][2635:2640] CHIP:TOO: groupName: grp1
[1651218576.149335][2635:2640] CHIP:TOO: }
disabled: true
@@ -158,8 +158,8 @@
[1651218576.149152][2635:2640] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0001
[1651218576.149231][2635:2640] CHIP:TOO: ViewGroupResponse: {
- [1651218576.149265][2635:2640] CHIP:TOO: status: 0
- [1651218576.149289][2635:2640] CHIP:TOO: groupId: 1
+ [1651218576.149265][2635:2640] CHIP:TOO: Status: 0
+ [1651218576.149289][2635:2640] CHIP:TOO: GroupID: 1
[1651218576.149311][2635:2640] CHIP:TOO: groupName: grp1
[1651218576.149335][2635:2640] CHIP:TOO: }
disabled: true
diff --git a/src/app/zap-templates/zcl/data-model/silabs/general.xml b/src/app/zap-templates/zcl/data-model/silabs/general.xml
index 4265943..9878cb3 100644
--- a/src/app/zap-templates/zcl/data-model/silabs/general.xml
+++ b/src/app/zap-templates/zcl/data-model/silabs/general.xml
@@ -97,34 +97,34 @@
<define>GROUPS_CLUSTER</define>
<client init="false" tick="false">true</client>
<server init="false" tick="false">true</server>
- <globalAttribute side="either" code="0xFFFD" value="3"/>
+ <globalAttribute side="either" code="0xFFFD" value="4"/>
<attribute side="server" code="0x0000" define="GROUP_NAME_SUPPORT" type="BITMAP8" min="0x00" max="0x80" writable="false" optional="false">NameSupport</attribute>
<!-- NAME_SUPPORT -->
<command source="client" code="0x00" name="AddGroup" response="AddGroupResponse" isFabricScoped="true" optional="false" cli="zcl groups add">
<description>
Command description for AddGroup
</description>
- <arg name="groupId" type="group_id"/>
- <arg name="groupName" type="CHAR_STRING"/>
+ <arg name="GroupID" type="group_id"/>
+ <arg name="GroupName" type="CHAR_STRING"/>
<access op="invoke" role="manage"/>
</command>
<command source="client" code="0x01" name="ViewGroup" response="ViewGroupResponse" isFabricScoped="true" optional="false" cli="zcl groups view">
<description>
Command description for ViewGroup
</description>
- <arg name="groupId" type="group_id"/>
+ <arg name="GroupID" type="group_id"/>
</command>
<command source="client" code="0x02" name="GetGroupMembership" response="GetGroupMembershipResponse" cliFunctionName="zclGroupsGetCommand" isFabricScoped="true" optional="false" cli="zcl groups get">
<description>
Command description for GetGroupMembership
</description>
- <arg name="groupList" type="group_id" array="true"/>
+ <arg name="GroupList" type="group_id" array="true"/>
</command>
<command source="client" code="0x03" name="RemoveGroup" response="RemoveGroupResponse" isFabricScoped="true" optional="false" cli="zcl groups remove">
<description>
Command description for RemoveGroup
</description>
- <arg name="groupId" type="group_id"/>
+ <arg name="GroupID" type="group_id"/>
<access op="invoke" role="manage"/>
</command>
<command source="client" code="0x04" name="RemoveAllGroups" isFabricScoped="true" optional="false" cli="zcl groups rmall">
@@ -137,38 +137,38 @@
<description>
Command description for AddGroupIfIdentifying
</description>
- <arg name="groupId" type="group_id"/>
- <arg name="groupName" type="CHAR_STRING"/>
+ <arg name="GroupID" type="group_id"/>
+ <arg name="GroupName" type="CHAR_STRING"/>
<access op="invoke" role="manage"/>
</command>
<command source="server" code="0x00" name="AddGroupResponse" optional="false" disableDefaultResponse="true">
<description>
Command description for AddGroupResponse
</description>
- <arg name="status" type="ENUM8"/>
- <arg name="groupId" type="group_id"/>
+ <arg name="Status" type="ENUM8"/>
+ <arg name="GroupID" type="group_id"/>
</command>
<command source="server" code="0x01" name="ViewGroupResponse" optional="false" disableDefaultResponse="true">
<description>
Command description for ViewGroupResponse
</description>
- <arg name="status" type="ENUM8"/>
- <arg name="groupId" type="group_id"/>
- <arg name="groupName" type="CHAR_STRING"/>
+ <arg name="Status" type="ENUM8"/>
+ <arg name="GroupID" type="group_id"/>
+ <arg name="GroupName" type="CHAR_STRING"/>
</command>
<command source="server" code="0x02" name="GetGroupMembershipResponse" optional="false" disableDefaultResponse="true">
<description>
Command description for GetGroupMembershipResponse
</description>
- <arg name="capacity" type="INT8U" isNullable="true"/>
- <arg name="groupList" type="group_id" array="true"/>
+ <arg name="Capacity" type="INT8U" isNullable="true"/>
+ <arg name="GroupList" type="group_id" array="true"/>
</command>
<command source="server" code="0x03" name="RemoveGroupResponse" optional="false" disableDefaultResponse="true">
<description>
Command description for RemoveGroupResponse
</description>
- <arg name="status" type="ENUM8"/>
- <arg name="groupId" type="group_id"/>
+ <arg name="Status" type="ENUM8"/>
+ <arg name="GroupID" type="group_id"/>
</command>
</cluster>
<cluster>
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index 2b37fb7..dc56fe0 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -63,12 +63,12 @@
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 {
@@ -76,22 +76,22 @@
}
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;
}
@@ -102,7 +102,7 @@
response struct RemoveGroupResponse = 3 {
ENUM8 status = 0;
- group_id groupId = 1;
+ group_id groupID = 1;
}
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
index 08eaadc..86fbdfe 100644
--- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
+++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
@@ -81,18 +81,18 @@
&javaMethod);
VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
- jobject status;
- std::string statusClassName = "java/lang/Integer";
- std::string statusCtorSignature = "(I)V";
- chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
- dataResponse.status, status);
- jobject groupId;
- std::string groupIdClassName = "java/lang/Integer";
- std::string groupIdCtorSignature = "(I)V";
- chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(groupIdClassName.c_str(), groupIdCtorSignature.c_str(),
- dataResponse.groupId, groupId);
+ jobject Status;
+ std::string StatusClassName = "java/lang/Integer";
+ std::string StatusCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StatusClassName.c_str(), StatusCtorSignature.c_str(),
+ dataResponse.status, Status);
+ jobject GroupID;
+ std::string GroupIDClassName = "java/lang/Integer";
+ std::string GroupIDCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(GroupIDClassName.c_str(), GroupIDCtorSignature.c_str(),
+ dataResponse.groupID, GroupID);
- env->CallVoidMethod(javaCallbackRef, javaMethod, status, groupId);
+ env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupID);
}
CHIPGroupsClusterViewGroupResponseCallback::CHIPGroupsClusterViewGroupResponseCallback(jobject javaCallback) :
Callback::Callback<CHIPGroupsClusterViewGroupResponseCallbackType>(CallbackFn, this)
@@ -146,20 +146,20 @@
"(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;)V", &javaMethod);
VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
- jobject status;
- std::string statusClassName = "java/lang/Integer";
- std::string statusCtorSignature = "(I)V";
- chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
- dataResponse.status, status);
- jobject groupId;
- std::string groupIdClassName = "java/lang/Integer";
- std::string groupIdCtorSignature = "(I)V";
- chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(groupIdClassName.c_str(), groupIdCtorSignature.c_str(),
- dataResponse.groupId, groupId);
- jobject groupName;
- groupName = env->NewStringUTF(std::string(dataResponse.groupName.data(), dataResponse.groupName.size()).c_str());
+ jobject Status;
+ std::string StatusClassName = "java/lang/Integer";
+ std::string StatusCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StatusClassName.c_str(), StatusCtorSignature.c_str(),
+ dataResponse.status, Status);
+ jobject GroupID;
+ std::string GroupIDClassName = "java/lang/Integer";
+ std::string GroupIDCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(GroupIDClassName.c_str(), GroupIDCtorSignature.c_str(),
+ dataResponse.groupID, GroupID);
+ jobject GroupName;
+ GroupName = env->NewStringUTF(std::string(dataResponse.groupName.data(), dataResponse.groupName.size()).c_str());
- env->CallVoidMethod(javaCallbackRef, javaMethod, status, groupId, groupName);
+ env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupID, GroupName);
}
CHIPGroupsClusterGetGroupMembershipResponseCallback::CHIPGroupsClusterGetGroupMembershipResponseCallback(jobject javaCallback) :
Callback::Callback<CHIPGroupsClusterGetGroupMembershipResponseCallbackType>(CallbackFn, this)
@@ -214,34 +214,34 @@
&javaMethod);
VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
- jobject capacity;
+ jobject Capacity;
if (dataResponse.capacity.IsNull())
{
- capacity = nullptr;
+ Capacity = nullptr;
}
else
{
- std::string capacityClassName = "java/lang/Integer";
- std::string capacityCtorSignature = "(I)V";
- chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(capacityClassName.c_str(), capacityCtorSignature.c_str(),
- dataResponse.capacity.Value(), capacity);
+ std::string CapacityClassName = "java/lang/Integer";
+ std::string CapacityCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(CapacityClassName.c_str(), CapacityCtorSignature.c_str(),
+ dataResponse.capacity.Value(), Capacity);
}
- jobject groupList;
- chip::JniReferences::GetInstance().CreateArrayList(groupList);
+ jobject GroupList;
+ chip::JniReferences::GetInstance().CreateArrayList(GroupList);
- auto iter_groupList_0 = dataResponse.groupList.begin();
- while (iter_groupList_0.Next())
+ auto iter_GroupList_0 = dataResponse.groupList.begin();
+ while (iter_GroupList_0.Next())
{
- auto & entry_0 = iter_groupList_0.GetValue();
+ auto & entry_0 = iter_GroupList_0.GetValue();
jobject newElement_0;
std::string newElement_0ClassName = "java/lang/Integer";
std::string newElement_0CtorSignature = "(I)V";
chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0ClassName.c_str(),
newElement_0CtorSignature.c_str(), entry_0, newElement_0);
- chip::JniReferences::GetInstance().AddToList(groupList, newElement_0);
+ chip::JniReferences::GetInstance().AddToList(GroupList, newElement_0);
}
- env->CallVoidMethod(javaCallbackRef, javaMethod, capacity, groupList);
+ env->CallVoidMethod(javaCallbackRef, javaMethod, Capacity, GroupList);
}
CHIPGroupsClusterRemoveGroupResponseCallback::CHIPGroupsClusterRemoveGroupResponseCallback(jobject javaCallback) :
Callback::Callback<CHIPGroupsClusterRemoveGroupResponseCallbackType>(CallbackFn, this)
@@ -295,18 +295,18 @@
&javaMethod);
VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
- jobject status;
- std::string statusClassName = "java/lang/Integer";
- std::string statusCtorSignature = "(I)V";
- chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
- dataResponse.status, status);
- jobject groupId;
- std::string groupIdClassName = "java/lang/Integer";
- std::string groupIdCtorSignature = "(I)V";
- chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(groupIdClassName.c_str(), groupIdCtorSignature.c_str(),
- dataResponse.groupId, groupId);
+ jobject Status;
+ std::string StatusClassName = "java/lang/Integer";
+ std::string StatusCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StatusClassName.c_str(), StatusCtorSignature.c_str(),
+ dataResponse.status, Status);
+ jobject GroupID;
+ std::string GroupIDClassName = "java/lang/Integer";
+ std::string GroupIDCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(GroupIDClassName.c_str(), GroupIDCtorSignature.c_str(),
+ dataResponse.groupID, GroupID);
- env->CallVoidMethod(javaCallbackRef, javaMethod, status, groupId);
+ env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupID);
}
CHIPScenesClusterAddSceneResponseCallback::CHIPScenesClusterAddSceneResponseCallback(jobject javaCallback) :
Callback::Callback<CHIPScenesClusterAddSceneResponseCallbackType>(CallbackFn, this)
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
index 817a5ba..c09468e 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
@@ -341,25 +341,25 @@
@Override
public native long initWithDevice(long devicePtr, int endpointId);
- public void addGroup(AddGroupResponseCallback callback, Integer groupId, String groupName) {
- addGroup(chipClusterPtr, callback, groupId, groupName, null);
+ public void addGroup(AddGroupResponseCallback callback, Integer groupID, String groupName) {
+ addGroup(chipClusterPtr, callback, groupID, groupName, null);
}
public void addGroup(
AddGroupResponseCallback callback,
- Integer groupId,
+ Integer groupID,
String groupName,
int timedInvokeTimeoutMs) {
- addGroup(chipClusterPtr, callback, groupId, groupName, timedInvokeTimeoutMs);
+ addGroup(chipClusterPtr, callback, groupID, groupName, timedInvokeTimeoutMs);
}
- public void viewGroup(ViewGroupResponseCallback callback, Integer groupId) {
- viewGroup(chipClusterPtr, callback, groupId, null);
+ public void viewGroup(ViewGroupResponseCallback callback, Integer groupID) {
+ viewGroup(chipClusterPtr, callback, groupID, null);
}
public void viewGroup(
- ViewGroupResponseCallback callback, Integer groupId, int timedInvokeTimeoutMs) {
- viewGroup(chipClusterPtr, callback, groupId, timedInvokeTimeoutMs);
+ ViewGroupResponseCallback callback, Integer groupID, int timedInvokeTimeoutMs) {
+ viewGroup(chipClusterPtr, callback, groupID, timedInvokeTimeoutMs);
}
public void getGroupMembership(
@@ -374,13 +374,13 @@
getGroupMembership(chipClusterPtr, callback, groupList, timedInvokeTimeoutMs);
}
- public void removeGroup(RemoveGroupResponseCallback callback, Integer groupId) {
- removeGroup(chipClusterPtr, callback, groupId, null);
+ public void removeGroup(RemoveGroupResponseCallback callback, Integer groupID) {
+ removeGroup(chipClusterPtr, callback, groupID, null);
}
public void removeGroup(
- RemoveGroupResponseCallback callback, Integer groupId, int timedInvokeTimeoutMs) {
- removeGroup(chipClusterPtr, callback, groupId, timedInvokeTimeoutMs);
+ RemoveGroupResponseCallback callback, Integer groupID, int timedInvokeTimeoutMs) {
+ removeGroup(chipClusterPtr, callback, groupID, timedInvokeTimeoutMs);
}
public void removeAllGroups(DefaultClusterCallback callback) {
@@ -393,29 +393,29 @@
}
public void addGroupIfIdentifying(
- DefaultClusterCallback callback, Integer groupId, String groupName) {
- addGroupIfIdentifying(chipClusterPtr, callback, groupId, groupName, null);
+ DefaultClusterCallback callback, Integer groupID, String groupName) {
+ addGroupIfIdentifying(chipClusterPtr, callback, groupID, groupName, null);
}
public void addGroupIfIdentifying(
DefaultClusterCallback callback,
- Integer groupId,
+ Integer groupID,
String groupName,
int timedInvokeTimeoutMs) {
- addGroupIfIdentifying(chipClusterPtr, callback, groupId, groupName, timedInvokeTimeoutMs);
+ addGroupIfIdentifying(chipClusterPtr, callback, groupID, groupName, timedInvokeTimeoutMs);
}
private native void addGroup(
long chipClusterPtr,
AddGroupResponseCallback Callback,
- Integer groupId,
+ Integer groupID,
String groupName,
@Nullable Integer timedInvokeTimeoutMs);
private native void viewGroup(
long chipClusterPtr,
ViewGroupResponseCallback Callback,
- Integer groupId,
+ Integer groupID,
@Nullable Integer timedInvokeTimeoutMs);
private native void getGroupMembership(
@@ -427,7 +427,7 @@
private native void removeGroup(
long chipClusterPtr,
RemoveGroupResponseCallback Callback,
- Integer groupId,
+ Integer groupID,
@Nullable Integer timedInvokeTimeoutMs);
private native void removeAllGroups(
@@ -438,18 +438,18 @@
private native void addGroupIfIdentifying(
long chipClusterPtr,
DefaultClusterCallback Callback,
- Integer groupId,
+ Integer groupID,
String groupName,
@Nullable Integer timedInvokeTimeoutMs);
public interface AddGroupResponseCallback {
- void onSuccess(Integer status, Integer groupId);
+ void onSuccess(Integer status, Integer groupID);
void onError(Exception error);
}
public interface ViewGroupResponseCallback {
- void onSuccess(Integer status, Integer groupId, String groupName);
+ void onSuccess(Integer status, Integer groupID, String groupName);
void onError(Exception error);
}
@@ -461,7 +461,7 @@
}
public interface RemoveGroupResponseCallback {
- void onSuccess(Integer status, Integer groupId);
+ void onSuccess(Integer status, Integer groupID);
void onError(Exception error);
}
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index c3a06e9..d132846 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -304,12 +304,12 @@
}
@Override
- public void onSuccess(Integer status, Integer groupId) {
+ public void onSuccess(Integer Status, Integer GroupID) {
Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
- CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
- responseValues.put(statusResponseValue, status);
- CommandResponseInfo groupIdResponseValue = new CommandResponseInfo("groupId", "Integer");
- responseValues.put(groupIdResponseValue, groupId);
+ CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
+ responseValues.put(StatusResponseValue, Status);
+ CommandResponseInfo GroupIDResponseValue = new CommandResponseInfo("GroupID", "Integer");
+ responseValues.put(GroupIDResponseValue, GroupID);
callback.onSuccess(responseValues);
}
@@ -329,14 +329,14 @@
}
@Override
- public void onSuccess(Integer status, Integer groupId, String groupName) {
+ public void onSuccess(Integer Status, Integer GroupID, String GroupName) {
Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
- CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
- responseValues.put(statusResponseValue, status);
- CommandResponseInfo groupIdResponseValue = new CommandResponseInfo("groupId", "Integer");
- responseValues.put(groupIdResponseValue, groupId);
- CommandResponseInfo groupNameResponseValue = new CommandResponseInfo("groupName", "String");
- responseValues.put(groupNameResponseValue, groupName);
+ CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
+ responseValues.put(StatusResponseValue, Status);
+ CommandResponseInfo GroupIDResponseValue = new CommandResponseInfo("GroupID", "Integer");
+ responseValues.put(GroupIDResponseValue, GroupID);
+ CommandResponseInfo GroupNameResponseValue = new CommandResponseInfo("GroupName", "String");
+ responseValues.put(GroupNameResponseValue, GroupName);
callback.onSuccess(responseValues);
}
@@ -357,11 +357,11 @@
}
@Override
- public void onSuccess(@Nullable Integer capacity, ArrayList<Integer> groupList) {
+ public void onSuccess(@Nullable Integer Capacity, ArrayList<Integer> GroupList) {
Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
- CommandResponseInfo capacityResponseValue = new CommandResponseInfo("capacity", "Integer");
- responseValues.put(capacityResponseValue, capacity);
- // groupList: /* TYPE WARNING: array array defaults to */ uint8_t *
+ CommandResponseInfo CapacityResponseValue = new CommandResponseInfo("Capacity", "Integer");
+ responseValues.put(CapacityResponseValue, Capacity);
+ // GroupList: /* TYPE WARNING: array array defaults to */ uint8_t *
// Conversion from this type to Java is not properly implemented yet
callback.onSuccess(responseValues);
}
@@ -382,12 +382,12 @@
}
@Override
- public void onSuccess(Integer status, Integer groupId) {
+ public void onSuccess(Integer Status, Integer GroupID) {
Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
- CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
- responseValues.put(statusResponseValue, status);
- CommandResponseInfo groupIdResponseValue = new CommandResponseInfo("groupId", "Integer");
- responseValues.put(groupIdResponseValue, groupId);
+ CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
+ responseValues.put(StatusResponseValue, Status);
+ CommandResponseInfo GroupIDResponseValue = new CommandResponseInfo("GroupID", "Integer");
+ responseValues.put(GroupIDResponseValue, GroupID);
callback.onSuccess(responseValues);
}
@@ -7616,9 +7616,9 @@
Map<String, InteractionInfo> groupsClusterInteractionInfoMap = new LinkedHashMap<>();
Map<String, CommandParameterInfo> groupsaddGroupCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- CommandParameterInfo groupsaddGroupgroupIdCommandParameterInfo =
- new CommandParameterInfo("groupId", Integer.class, Integer.class);
- groupsaddGroupCommandParams.put("groupId", groupsaddGroupgroupIdCommandParameterInfo);
+ CommandParameterInfo groupsaddGroupgroupIDCommandParameterInfo =
+ new CommandParameterInfo("groupID", Integer.class, Integer.class);
+ groupsaddGroupCommandParams.put("groupID", groupsaddGroupgroupIDCommandParameterInfo);
CommandParameterInfo groupsaddGroupgroupNameCommandParameterInfo =
new CommandParameterInfo("groupName", String.class, String.class);
@@ -7630,7 +7630,7 @@
((ChipClusters.GroupsCluster) cluster)
.addGroup(
(ChipClusters.GroupsCluster.AddGroupResponseCallback) callback,
- (Integer) commandArguments.get("groupId"),
+ (Integer) commandArguments.get("groupID"),
(String) commandArguments.get("groupName"));
},
() -> new DelegatedAddGroupResponseCallback(),
@@ -7638,9 +7638,9 @@
groupsClusterInteractionInfoMap.put("addGroup", groupsaddGroupInteractionInfo);
Map<String, CommandParameterInfo> groupsviewGroupCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- CommandParameterInfo groupsviewGroupgroupIdCommandParameterInfo =
- new CommandParameterInfo("groupId", Integer.class, Integer.class);
- groupsviewGroupCommandParams.put("groupId", groupsviewGroupgroupIdCommandParameterInfo);
+ CommandParameterInfo groupsviewGroupgroupIDCommandParameterInfo =
+ new CommandParameterInfo("groupID", Integer.class, Integer.class);
+ groupsviewGroupCommandParams.put("groupID", groupsviewGroupgroupIDCommandParameterInfo);
InteractionInfo groupsviewGroupInteractionInfo =
new InteractionInfo(
@@ -7648,7 +7648,7 @@
((ChipClusters.GroupsCluster) cluster)
.viewGroup(
(ChipClusters.GroupsCluster.ViewGroupResponseCallback) callback,
- (Integer) commandArguments.get("groupId"));
+ (Integer) commandArguments.get("groupID"));
},
() -> new DelegatedViewGroupResponseCallback(),
groupsviewGroupCommandParams);
@@ -7674,9 +7674,9 @@
"getGroupMembership", groupsgetGroupMembershipInteractionInfo);
Map<String, CommandParameterInfo> groupsremoveGroupCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- CommandParameterInfo groupsremoveGroupgroupIdCommandParameterInfo =
- new CommandParameterInfo("groupId", Integer.class, Integer.class);
- groupsremoveGroupCommandParams.put("groupId", groupsremoveGroupgroupIdCommandParameterInfo);
+ CommandParameterInfo groupsremoveGroupgroupIDCommandParameterInfo =
+ new CommandParameterInfo("groupID", Integer.class, Integer.class);
+ groupsremoveGroupCommandParams.put("groupID", groupsremoveGroupgroupIDCommandParameterInfo);
InteractionInfo groupsremoveGroupInteractionInfo =
new InteractionInfo(
@@ -7684,7 +7684,7 @@
((ChipClusters.GroupsCluster) cluster)
.removeGroup(
(ChipClusters.GroupsCluster.RemoveGroupResponseCallback) callback,
- (Integer) commandArguments.get("groupId"));
+ (Integer) commandArguments.get("groupID"));
},
() -> new DelegatedRemoveGroupResponseCallback(),
groupsremoveGroupCommandParams);
@@ -7702,10 +7702,10 @@
groupsClusterInteractionInfoMap.put("removeAllGroups", groupsremoveAllGroupsInteractionInfo);
Map<String, CommandParameterInfo> groupsaddGroupIfIdentifyingCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- CommandParameterInfo groupsaddGroupIfIdentifyinggroupIdCommandParameterInfo =
- new CommandParameterInfo("groupId", Integer.class, Integer.class);
+ CommandParameterInfo groupsaddGroupIfIdentifyinggroupIDCommandParameterInfo =
+ new CommandParameterInfo("groupID", Integer.class, Integer.class);
groupsaddGroupIfIdentifyingCommandParams.put(
- "groupId", groupsaddGroupIfIdentifyinggroupIdCommandParameterInfo);
+ "groupID", groupsaddGroupIfIdentifyinggroupIDCommandParameterInfo);
CommandParameterInfo groupsaddGroupIfIdentifyinggroupNameCommandParameterInfo =
new CommandParameterInfo("groupName", String.class, String.class);
@@ -7718,7 +7718,7 @@
((ChipClusters.GroupsCluster) cluster)
.addGroupIfIdentifying(
(DefaultClusterCallback) callback,
- (Integer) commandArguments.get("groupId"),
+ (Integer) commandArguments.get("groupID"),
(String) commandArguments.get("groupName"));
},
() -> new DelegatedDefaultClusterCallback(),
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
index 0254147..f1724a9 100644
--- a/src/controller/python/chip/clusters/CHIPClusters.py
+++ b/src/controller/python/chip/clusters/CHIPClusters.py
@@ -101,7 +101,7 @@
"commandId": 0x00000000,
"commandName": "AddGroup",
"args": {
- "groupId": "int",
+ "groupID": "int",
"groupName": "str",
},
},
@@ -109,7 +109,7 @@
"commandId": 0x00000001,
"commandName": "ViewGroup",
"args": {
- "groupId": "int",
+ "groupID": "int",
},
},
0x00000002: {
@@ -123,7 +123,7 @@
"commandId": 0x00000003,
"commandName": "RemoveGroup",
"args": {
- "groupId": "int",
+ "groupID": "int",
},
},
0x00000004: {
@@ -136,7 +136,7 @@
"commandId": 0x00000005,
"commandName": "AddGroupIfIdentifying",
"args": {
- "groupId": "int",
+ "groupID": "int",
"groupName": "str",
},
},
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index b349d73..c96dadb 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -267,11 +267,11 @@
def descriptor(cls) -> ClusterObjectDescriptor:
return ClusterObjectDescriptor(
Fields = [
- ClusterObjectFieldDescriptor(Label="groupId", Tag=0, Type=uint),
+ ClusterObjectFieldDescriptor(Label="groupID", Tag=0, Type=uint),
ClusterObjectFieldDescriptor(Label="groupName", Tag=1, Type=str),
])
- groupId: 'uint' = 0
+ groupID: 'uint' = 0
groupName: 'str' = ""
@dataclass
@@ -286,11 +286,11 @@
return ClusterObjectDescriptor(
Fields = [
ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=uint),
- ClusterObjectFieldDescriptor(Label="groupId", Tag=1, Type=uint),
+ ClusterObjectFieldDescriptor(Label="groupID", Tag=1, Type=uint),
])
status: 'uint' = 0
- groupId: 'uint' = 0
+ groupID: 'uint' = 0
@dataclass
class ViewGroup(ClusterCommand):
@@ -303,10 +303,10 @@
def descriptor(cls) -> ClusterObjectDescriptor:
return ClusterObjectDescriptor(
Fields = [
- ClusterObjectFieldDescriptor(Label="groupId", Tag=0, Type=uint),
+ ClusterObjectFieldDescriptor(Label="groupID", Tag=0, Type=uint),
])
- groupId: 'uint' = 0
+ groupID: 'uint' = 0
@dataclass
class ViewGroupResponse(ClusterCommand):
@@ -320,12 +320,12 @@
return ClusterObjectDescriptor(
Fields = [
ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=uint),
- ClusterObjectFieldDescriptor(Label="groupId", Tag=1, Type=uint),
+ ClusterObjectFieldDescriptor(Label="groupID", Tag=1, Type=uint),
ClusterObjectFieldDescriptor(Label="groupName", Tag=2, Type=str),
])
status: 'uint' = 0
- groupId: 'uint' = 0
+ groupID: 'uint' = 0
groupName: 'str' = ""
@dataclass
@@ -373,10 +373,10 @@
def descriptor(cls) -> ClusterObjectDescriptor:
return ClusterObjectDescriptor(
Fields = [
- ClusterObjectFieldDescriptor(Label="groupId", Tag=0, Type=uint),
+ ClusterObjectFieldDescriptor(Label="groupID", Tag=0, Type=uint),
])
- groupId: 'uint' = 0
+ groupID: 'uint' = 0
@dataclass
class RemoveGroupResponse(ClusterCommand):
@@ -390,11 +390,11 @@
return ClusterObjectDescriptor(
Fields = [
ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=uint),
- ClusterObjectFieldDescriptor(Label="groupId", Tag=1, Type=uint),
+ ClusterObjectFieldDescriptor(Label="groupID", Tag=1, Type=uint),
])
status: 'uint' = 0
- groupId: 'uint' = 0
+ groupID: 'uint' = 0
@dataclass
class RemoveAllGroups(ClusterCommand):
@@ -421,11 +421,11 @@
def descriptor(cls) -> ClusterObjectDescriptor:
return ClusterObjectDescriptor(
Fields = [
- ClusterObjectFieldDescriptor(Label="groupId", Tag=0, Type=uint),
+ ClusterObjectFieldDescriptor(Label="groupID", Tag=0, Type=uint),
ClusterObjectFieldDescriptor(Label="groupName", Tag=1, Type=str),
])
- groupId: 'uint' = 0
+ groupID: 'uint' = 0
groupName: 'str' = ""
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
index e424fcc..7cc6281 100644
--- a/src/darwin/Framework/CHIP/templates/availability.yaml
+++ b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -4917,6 +4917,21 @@
RegisterClientMonitoring:
- clientNodeId
- iCid
+ Groups:
+ AddGroup:
+ - groupID
+ AddGroupIfIdentifying:
+ - groupID
+ AddGroupResponse:
+ - groupID
+ RemoveGroup:
+ - groupID
+ RemoveGroupResponse:
+ - groupID
+ ViewGroup:
+ - groupID
+ ViewGroupResponse:
+ - groupID
structs:
OTASoftwareUpdateRequestor:
- ProviderLocation
@@ -5153,6 +5168,22 @@
- PirOccupiedToUnoccupiedDelay
- PirUnoccupiedToOccupiedDelay
- PirUnoccupiedToOccupiedThreshold
+ command fields:
+ Groups:
+ AddGroup:
+ - groupId
+ AddGroupIfIdentifying:
+ - groupId
+ AddGroupResponse:
+ - groupId
+ RemoveGroup:
+ - groupId
+ RemoveGroupResponse:
+ - groupId
+ ViewGroup:
+ - groupId
+ ViewGroupResponse:
+ - groupId
structs:
Descriptor:
- DeviceType
@@ -5187,3 +5218,19 @@
Switch:
MultiPressComplete:
previousPosition: newPosition
+ command fields:
+ Groups:
+ AddGroup:
+ groupID: groupId
+ AddGroupIfIdentifying:
+ groupID: groupId
+ AddGroupResponse:
+ groupID: groupId
+ RemoveGroup:
+ groupID: groupId
+ RemoveGroupResponse:
+ groupID: groupId
+ ViewGroup:
+ groupID: groupId
+ ViewGroupResponse:
+ groupID: groupId
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
index e71dfa0..02e7cde 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
@@ -822,7 +822,7 @@
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
}
}
- request.groupId = params.groupId.unsignedShortValue;
+ request.groupID = params.groupID.unsignedShortValue;
request.groupName = [self asCharSpan:params.groupName];
return MTRStartInvokeInteraction(
@@ -849,7 +849,7 @@
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
}
}
- request.groupId = params.groupId.unsignedShortValue;
+ request.groupID = params.groupID.unsignedShortValue;
return MTRStartInvokeInteraction(
typedBridge, request, exchangeManager, session, successCb, failureCb, self->_endpoint, timedInvokeTimeoutMs);
@@ -923,7 +923,7 @@
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
}
}
- request.groupId = params.groupId.unsignedShortValue;
+ request.groupID = params.groupID.unsignedShortValue;
return MTRStartInvokeInteraction(
typedBridge, request, exchangeManager, session, successCb, failureCb, self->_endpoint, timedInvokeTimeoutMs);
@@ -984,7 +984,7 @@
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
}
}
- request.groupId = params.groupId.unsignedShortValue;
+ request.groupID = params.groupID.unsignedShortValue;
request.groupName = [self asCharSpan:params.groupName];
return MTRStartInvokeInteraction(
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
index 0007d45..47aafa9 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
@@ -11262,7 +11262,7 @@
response.status = [NSNumber numberWithUnsignedChar:data.status];
}
{
- response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
+ response.groupID = [NSNumber numberWithUnsignedShort:data.groupID];
}
DispatchSuccess(context, response);
};
@@ -11275,7 +11275,7 @@
response.status = [NSNumber numberWithUnsignedChar:data.status];
}
{
- response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
+ response.groupID = [NSNumber numberWithUnsignedShort:data.groupID];
}
{
response.groupName = [[NSString alloc] initWithBytes:data.groupName.data()
@@ -11325,7 +11325,7 @@
response.status = [NSNumber numberWithUnsignedChar:data.status];
}
{
- response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
+ response.groupID = [NSNumber numberWithUnsignedShort:data.groupID];
}
DispatchSuccess(context, response);
};
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
index 5db9b7b..ae80c57 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
@@ -343,7 +343,7 @@
if (timedInvokeTimeoutMsParam != nil) {
timedInvokeTimeoutMs.SetValue(timedInvokeTimeoutMsParam.unsignedShortValue);
}
- request.groupId = params.groupId.unsignedShortValue;
+ request.groupID = params.groupID.unsignedShortValue;
request.groupName = [self asCharSpan:params.groupName];
chip::Controller::GroupsCluster cppCluster(exchangeManager, session, self->_endpoint);
@@ -402,7 +402,7 @@
if (timedInvokeTimeoutMsParam != nil) {
timedInvokeTimeoutMs.SetValue(timedInvokeTimeoutMsParam.unsignedShortValue);
}
- request.groupId = params.groupId.unsignedShortValue;
+ request.groupID = params.groupID.unsignedShortValue;
chip::Controller::GroupsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(request, bridge, successCb, failureCb, timedInvokeTimeoutMs);
@@ -541,7 +541,7 @@
if (timedInvokeTimeoutMsParam != nil) {
timedInvokeTimeoutMs.SetValue(timedInvokeTimeoutMsParam.unsignedShortValue);
}
- request.groupId = params.groupId.unsignedShortValue;
+ request.groupID = params.groupID.unsignedShortValue;
chip::Controller::GroupsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(request, bridge, successCb, failureCb, timedInvokeTimeoutMs);
@@ -663,7 +663,7 @@
if (timedInvokeTimeoutMsParam != nil) {
timedInvokeTimeoutMs.SetValue(timedInvokeTimeoutMsParam.unsignedShortValue);
}
- request.groupId = params.groupId.unsignedShortValue;
+ request.groupID = params.groupID.unsignedShortValue;
request.groupName = [self asCharSpan:params.groupName];
chip::Controller::GroupsCluster cppCluster(exchangeManager, session, self->_endpoint);
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
index 60c09f8..23b869e 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
@@ -67,7 +67,7 @@
API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
@interface MTRGroupsClusterAddGroupParams : NSObject <NSCopying>
-@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE;
@property (nonatomic, copy) NSString * _Nonnull groupName API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
/**
@@ -87,12 +87,18 @@
@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
@end
+@interface MTRGroupsClusterAddGroupParams (Deprecated)
+
+@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+ MTR_NEWLY_DEPRECATED("Please use groupID");
+@end
+
API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
@interface MTRGroupsClusterAddGroupResponseParams : NSObject <NSCopying>
@property (nonatomic, copy) NSNumber * _Nonnull status API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE;
/**
* Controls whether the command is a timed command (using Timed Invoke).
*
@@ -111,10 +117,16 @@
tvos(16.1)) MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands");
@end
+@interface MTRGroupsClusterAddGroupResponseParams (Deprecated)
+
+@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+ MTR_NEWLY_DEPRECATED("Please use groupID");
+@end
+
API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
@interface MTRGroupsClusterViewGroupParams : NSObject <NSCopying>
-@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE;
/**
* Controls whether the command is a timed command (using Timed Invoke).
*
@@ -132,12 +144,18 @@
@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
@end
+@interface MTRGroupsClusterViewGroupParams (Deprecated)
+
+@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+ MTR_NEWLY_DEPRECATED("Please use groupID");
+@end
+
API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
@interface MTRGroupsClusterViewGroupResponseParams : NSObject <NSCopying>
@property (nonatomic, copy) NSNumber * _Nonnull status API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE;
@property (nonatomic, copy) NSString * _Nonnull groupName API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
/**
@@ -158,6 +176,12 @@
tvos(16.1)) MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands");
@end
+@interface MTRGroupsClusterViewGroupResponseParams (Deprecated)
+
+@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+ MTR_NEWLY_DEPRECATED("Please use groupID");
+@end
+
API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
@interface MTRGroupsClusterGetGroupMembershipParams : NSObject <NSCopying>
@@ -206,7 +230,7 @@
API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
@interface MTRGroupsClusterRemoveGroupParams : NSObject <NSCopying>
-@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE;
/**
* Controls whether the command is a timed command (using Timed Invoke).
*
@@ -224,12 +248,18 @@
@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
@end
+@interface MTRGroupsClusterRemoveGroupParams (Deprecated)
+
+@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+ MTR_NEWLY_DEPRECATED("Please use groupID");
+@end
+
API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
@interface MTRGroupsClusterRemoveGroupResponseParams : NSObject <NSCopying>
@property (nonatomic, copy) NSNumber * _Nonnull status API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE;
/**
* Controls whether the command is a timed command (using Timed Invoke).
*
@@ -248,6 +278,12 @@
tvos(16.1)) MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands");
@end
+@interface MTRGroupsClusterRemoveGroupResponseParams (Deprecated)
+
+@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+ MTR_NEWLY_DEPRECATED("Please use groupID");
+@end
+
API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
@interface MTRGroupsClusterRemoveAllGroupsParams : NSObject <NSCopying>
/**
@@ -270,7 +306,7 @@
API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
@interface MTRGroupsClusterAddGroupIfIdentifyingParams : NSObject <NSCopying>
-@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE;
@property (nonatomic, copy) NSString * _Nonnull groupName API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
/**
@@ -290,6 +326,12 @@
@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
@end
+@interface MTRGroupsClusterAddGroupIfIdentifyingParams (Deprecated)
+
+@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+ MTR_NEWLY_DEPRECATED("Please use groupID");
+@end
+
API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
@interface MTRScenesClusterAddSceneParams : NSObject <NSCopying>
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
index 0f925b1..59e991e 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
@@ -85,7 +85,7 @@
{
if (self = [super init]) {
- _groupId = @(0);
+ _groupID = @(0);
_groupName = @"";
_timedInvokeTimeoutMs = nil;
@@ -97,7 +97,7 @@
{
auto other = [[MTRGroupsClusterAddGroupParams alloc] init];
- other.groupId = self.groupId;
+ other.groupID = self.groupID;
other.groupName = self.groupName;
other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
@@ -107,11 +107,24 @@
- (NSString *)description
{
NSString * descriptionString =
- [NSString stringWithFormat:@"<%@: groupId:%@; groupName:%@; >", NSStringFromClass([self class]), _groupId, _groupName];
+ [NSString stringWithFormat:@"<%@: groupID:%@; groupName:%@; >", NSStringFromClass([self class]), _groupID, _groupName];
return descriptionString;
}
@end
+
+@implementation MTRGroupsClusterAddGroupParams (Deprecated)
+
+- (void)setGroupId:(NSNumber * _Nonnull)groupId
+{
+ self.groupID = groupId;
+}
+
+- (NSNumber * _Nonnull)groupId
+{
+ return self.groupID;
+}
+@end
@implementation MTRGroupsClusterAddGroupResponseParams
- (instancetype)init
{
@@ -119,7 +132,7 @@
_status = @(0);
- _groupId = @(0);
+ _groupID = @(0);
_timedInvokeTimeoutMs = nil;
}
return self;
@@ -130,7 +143,7 @@
auto other = [[MTRGroupsClusterAddGroupResponseParams alloc] init];
other.status = self.status;
- other.groupId = self.groupId;
+ other.groupID = self.groupID;
other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
return other;
@@ -139,17 +152,30 @@
- (NSString *)description
{
NSString * descriptionString =
- [NSString stringWithFormat:@"<%@: status:%@; groupId:%@; >", NSStringFromClass([self class]), _status, _groupId];
+ [NSString stringWithFormat:@"<%@: status:%@; groupID:%@; >", NSStringFromClass([self class]), _status, _groupID];
return descriptionString;
}
@end
+
+@implementation MTRGroupsClusterAddGroupResponseParams (Deprecated)
+
+- (void)setGroupId:(NSNumber * _Nonnull)groupId
+{
+ self.groupID = groupId;
+}
+
+- (NSNumber * _Nonnull)groupId
+{
+ return self.groupID;
+}
+@end
@implementation MTRGroupsClusterViewGroupParams
- (instancetype)init
{
if (self = [super init]) {
- _groupId = @(0);
+ _groupID = @(0);
_timedInvokeTimeoutMs = nil;
}
return self;
@@ -159,7 +185,7 @@
{
auto other = [[MTRGroupsClusterViewGroupParams alloc] init];
- other.groupId = self.groupId;
+ other.groupID = self.groupID;
other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
return other;
@@ -167,11 +193,24 @@
- (NSString *)description
{
- NSString * descriptionString = [NSString stringWithFormat:@"<%@: groupId:%@; >", NSStringFromClass([self class]), _groupId];
+ NSString * descriptionString = [NSString stringWithFormat:@"<%@: groupID:%@; >", NSStringFromClass([self class]), _groupID];
return descriptionString;
}
@end
+
+@implementation MTRGroupsClusterViewGroupParams (Deprecated)
+
+- (void)setGroupId:(NSNumber * _Nonnull)groupId
+{
+ self.groupID = groupId;
+}
+
+- (NSNumber * _Nonnull)groupId
+{
+ return self.groupID;
+}
+@end
@implementation MTRGroupsClusterViewGroupResponseParams
- (instancetype)init
{
@@ -179,7 +218,7 @@
_status = @(0);
- _groupId = @(0);
+ _groupID = @(0);
_groupName = @"";
_timedInvokeTimeoutMs = nil;
@@ -192,7 +231,7 @@
auto other = [[MTRGroupsClusterViewGroupResponseParams alloc] init];
other.status = self.status;
- other.groupId = self.groupId;
+ other.groupID = self.groupID;
other.groupName = self.groupName;
other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
@@ -201,12 +240,25 @@
- (NSString *)description
{
- NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; groupId:%@; groupName:%@; >",
- NSStringFromClass([self class]), _status, _groupId, _groupName];
+ NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; groupID:%@; groupName:%@; >",
+ NSStringFromClass([self class]), _status, _groupID, _groupName];
return descriptionString;
}
@end
+
+@implementation MTRGroupsClusterViewGroupResponseParams (Deprecated)
+
+- (void)setGroupId:(NSNumber * _Nonnull)groupId
+{
+ self.groupID = groupId;
+}
+
+- (NSNumber * _Nonnull)groupId
+{
+ return self.groupID;
+}
+@end
@implementation MTRGroupsClusterGetGroupMembershipParams
- (instancetype)init
{
@@ -272,7 +324,7 @@
{
if (self = [super init]) {
- _groupId = @(0);
+ _groupID = @(0);
_timedInvokeTimeoutMs = nil;
}
return self;
@@ -282,7 +334,7 @@
{
auto other = [[MTRGroupsClusterRemoveGroupParams alloc] init];
- other.groupId = self.groupId;
+ other.groupID = self.groupID;
other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
return other;
@@ -290,11 +342,24 @@
- (NSString *)description
{
- NSString * descriptionString = [NSString stringWithFormat:@"<%@: groupId:%@; >", NSStringFromClass([self class]), _groupId];
+ NSString * descriptionString = [NSString stringWithFormat:@"<%@: groupID:%@; >", NSStringFromClass([self class]), _groupID];
return descriptionString;
}
@end
+
+@implementation MTRGroupsClusterRemoveGroupParams (Deprecated)
+
+- (void)setGroupId:(NSNumber * _Nonnull)groupId
+{
+ self.groupID = groupId;
+}
+
+- (NSNumber * _Nonnull)groupId
+{
+ return self.groupID;
+}
+@end
@implementation MTRGroupsClusterRemoveGroupResponseParams
- (instancetype)init
{
@@ -302,7 +367,7 @@
_status = @(0);
- _groupId = @(0);
+ _groupID = @(0);
_timedInvokeTimeoutMs = nil;
}
return self;
@@ -313,7 +378,7 @@
auto other = [[MTRGroupsClusterRemoveGroupResponseParams alloc] init];
other.status = self.status;
- other.groupId = self.groupId;
+ other.groupID = self.groupID;
other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
return other;
@@ -322,11 +387,24 @@
- (NSString *)description
{
NSString * descriptionString =
- [NSString stringWithFormat:@"<%@: status:%@; groupId:%@; >", NSStringFromClass([self class]), _status, _groupId];
+ [NSString stringWithFormat:@"<%@: status:%@; groupID:%@; >", NSStringFromClass([self class]), _status, _groupID];
return descriptionString;
}
@end
+
+@implementation MTRGroupsClusterRemoveGroupResponseParams (Deprecated)
+
+- (void)setGroupId:(NSNumber * _Nonnull)groupId
+{
+ self.groupID = groupId;
+}
+
+- (NSNumber * _Nonnull)groupId
+{
+ return self.groupID;
+}
+@end
@implementation MTRGroupsClusterRemoveAllGroupsParams
- (instancetype)init
{
@@ -357,7 +435,7 @@
{
if (self = [super init]) {
- _groupId = @(0);
+ _groupID = @(0);
_groupName = @"";
_timedInvokeTimeoutMs = nil;
@@ -369,7 +447,7 @@
{
auto other = [[MTRGroupsClusterAddGroupIfIdentifyingParams alloc] init];
- other.groupId = self.groupId;
+ other.groupID = self.groupID;
other.groupName = self.groupName;
other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
@@ -379,11 +457,24 @@
- (NSString *)description
{
NSString * descriptionString =
- [NSString stringWithFormat:@"<%@: groupId:%@; groupName:%@; >", NSStringFromClass([self class]), _groupId, _groupName];
+ [NSString stringWithFormat:@"<%@: groupID:%@; groupName:%@; >", NSStringFromClass([self class]), _groupID, _groupName];
return descriptionString;
}
@end
+
+@implementation MTRGroupsClusterAddGroupIfIdentifyingParams (Deprecated)
+
+- (void)setGroupId:(NSNumber * _Nonnull)groupId
+{
+ self.groupID = groupId;
+}
+
+- (NSNumber * _Nonnull)groupId
+{
+ return self.groupID;
+}
+@end
@implementation MTRScenesClusterAddSceneParams
- (instancetype)init
{
diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h
index 9de9f23..64a3621 100644
--- a/zzz_generated/app-common/app-common/zap-generated/callback.h
+++ b/zzz_generated/app-common/app-common/zap-generated/callback.h
@@ -7580,8 +7580,8 @@
/**
* @brief Groups Cluster AddGroupResponse Command callback (from server)
*/
-bool emberAfGroupsClusterAddGroupResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t status,
- chip::GroupId groupId);
+bool emberAfGroupsClusterAddGroupResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t Status,
+ chip::GroupId GroupID);
/**
* @brief Groups Cluster ViewGroup Command callback (from client)
*/
@@ -7591,8 +7591,8 @@
/**
* @brief Groups Cluster ViewGroupResponse Command callback (from server)
*/
-bool emberAfGroupsClusterViewGroupResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t status,
- chip::GroupId groupId, chip::CharSpan groupName);
+bool emberAfGroupsClusterViewGroupResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t Status,
+ chip::GroupId GroupID, chip::CharSpan GroupName);
/**
* @brief Groups Cluster GetGroupMembership Command callback (from client)
*/
@@ -7603,8 +7603,8 @@
* @brief Groups Cluster GetGroupMembershipResponse Command callback (from server)
*/
bool emberAfGroupsClusterGetGroupMembershipResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
- uint8_t capacity,
- /* TYPE WARNING: array array defaults to */ uint8_t * groupList);
+ uint8_t Capacity,
+ /* TYPE WARNING: array array defaults to */ uint8_t * GroupList);
/**
* @brief Groups Cluster RemoveGroup Command callback (from client)
*/
@@ -7615,7 +7615,7 @@
* @brief Groups Cluster RemoveGroupResponse Command callback (from server)
*/
bool emberAfGroupsClusterRemoveGroupResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
- uint8_t status, chip::GroupId groupId);
+ uint8_t Status, chip::GroupId GroupID);
/**
* @brief Groups Cluster RemoveAllGroups Command callback (from client)
*/
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
index c1c9377..9114d0a 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
@@ -202,7 +202,7 @@
{
TLV::TLVType outer;
ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
- ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID));
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupName)), groupName));
ReturnErrorOnFailure(writer.EndContainer(outer));
return CHIP_NO_ERROR;
@@ -222,8 +222,8 @@
}
switch (TLV::TagNumFromTag(reader.GetTag()))
{
- case to_underlying(Fields::kGroupId):
- ReturnErrorOnFailure(DataModel::Decode(reader, groupId));
+ case to_underlying(Fields::kGroupID):
+ ReturnErrorOnFailure(DataModel::Decode(reader, groupID));
break;
case to_underlying(Fields::kGroupName):
ReturnErrorOnFailure(DataModel::Decode(reader, groupName));
@@ -244,7 +244,7 @@
TLV::TLVType outer;
ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
- ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID));
ReturnErrorOnFailure(writer.EndContainer(outer));
return CHIP_NO_ERROR;
}
@@ -266,8 +266,8 @@
case to_underlying(Fields::kStatus):
ReturnErrorOnFailure(DataModel::Decode(reader, status));
break;
- case to_underlying(Fields::kGroupId):
- ReturnErrorOnFailure(DataModel::Decode(reader, groupId));
+ case to_underlying(Fields::kGroupID):
+ ReturnErrorOnFailure(DataModel::Decode(reader, groupID));
break;
default:
break;
@@ -284,7 +284,7 @@
{
TLV::TLVType outer;
ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
- ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID));
ReturnErrorOnFailure(writer.EndContainer(outer));
return CHIP_NO_ERROR;
}
@@ -303,8 +303,8 @@
}
switch (TLV::TagNumFromTag(reader.GetTag()))
{
- case to_underlying(Fields::kGroupId):
- ReturnErrorOnFailure(DataModel::Decode(reader, groupId));
+ case to_underlying(Fields::kGroupID):
+ ReturnErrorOnFailure(DataModel::Decode(reader, groupID));
break;
default:
break;
@@ -322,7 +322,7 @@
TLV::TLVType outer;
ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
- ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID));
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupName)), groupName));
ReturnErrorOnFailure(writer.EndContainer(outer));
return CHIP_NO_ERROR;
@@ -345,8 +345,8 @@
case to_underlying(Fields::kStatus):
ReturnErrorOnFailure(DataModel::Decode(reader, status));
break;
- case to_underlying(Fields::kGroupId):
- ReturnErrorOnFailure(DataModel::Decode(reader, groupId));
+ case to_underlying(Fields::kGroupID):
+ ReturnErrorOnFailure(DataModel::Decode(reader, groupID));
break;
case to_underlying(Fields::kGroupName):
ReturnErrorOnFailure(DataModel::Decode(reader, groupName));
@@ -444,7 +444,7 @@
{
TLV::TLVType outer;
ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
- ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID));
ReturnErrorOnFailure(writer.EndContainer(outer));
return CHIP_NO_ERROR;
}
@@ -463,8 +463,8 @@
}
switch (TLV::TagNumFromTag(reader.GetTag()))
{
- case to_underlying(Fields::kGroupId):
- ReturnErrorOnFailure(DataModel::Decode(reader, groupId));
+ case to_underlying(Fields::kGroupID):
+ ReturnErrorOnFailure(DataModel::Decode(reader, groupID));
break;
default:
break;
@@ -482,7 +482,7 @@
TLV::TLVType outer;
ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
- ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID));
ReturnErrorOnFailure(writer.EndContainer(outer));
return CHIP_NO_ERROR;
}
@@ -504,8 +504,8 @@
case to_underlying(Fields::kStatus):
ReturnErrorOnFailure(DataModel::Decode(reader, status));
break;
- case to_underlying(Fields::kGroupId):
- ReturnErrorOnFailure(DataModel::Decode(reader, groupId));
+ case to_underlying(Fields::kGroupID):
+ ReturnErrorOnFailure(DataModel::Decode(reader, groupID));
break;
default:
break;
@@ -555,7 +555,7 @@
{
TLV::TLVType outer;
ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
- ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID));
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupName)), groupName));
ReturnErrorOnFailure(writer.EndContainer(outer));
return CHIP_NO_ERROR;
@@ -575,8 +575,8 @@
}
switch (TLV::TagNumFromTag(reader.GetTag()))
{
- case to_underlying(Fields::kGroupId):
- ReturnErrorOnFailure(DataModel::Decode(reader, groupId));
+ case to_underlying(Fields::kGroupID):
+ ReturnErrorOnFailure(DataModel::Decode(reader, groupID));
break;
case to_underlying(Fields::kGroupName):
ReturnErrorOnFailure(DataModel::Decode(reader, groupName));
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
index d4f3f90..3108ce6 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
@@ -358,7 +358,7 @@
namespace AddGroup {
enum class Fields
{
- kGroupId = 0,
+ kGroupID = 0,
kGroupName = 1,
};
@@ -369,7 +369,7 @@
static constexpr CommandId GetCommandId() { return Commands::AddGroup::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::Groups::Id; }
- chip::GroupId groupId = static_cast<chip::GroupId>(0);
+ chip::GroupId groupID = static_cast<chip::GroupId>(0);
chip::CharSpan groupName;
CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -385,7 +385,7 @@
static constexpr CommandId GetCommandId() { return Commands::AddGroup::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::Groups::Id; }
- chip::GroupId groupId = static_cast<chip::GroupId>(0);
+ chip::GroupId groupID = static_cast<chip::GroupId>(0);
chip::CharSpan groupName;
CHIP_ERROR Decode(TLV::TLVReader & reader);
};
@@ -394,7 +394,7 @@
enum class Fields
{
kStatus = 0,
- kGroupId = 1,
+ kGroupID = 1,
};
struct Type
@@ -405,7 +405,7 @@
static constexpr ClusterId GetClusterId() { return Clusters::Groups::Id; }
uint8_t status = static_cast<uint8_t>(0);
- chip::GroupId groupId = static_cast<chip::GroupId>(0);
+ chip::GroupId groupID = static_cast<chip::GroupId>(0);
CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -421,14 +421,14 @@
static constexpr ClusterId GetClusterId() { return Clusters::Groups::Id; }
uint8_t status = static_cast<uint8_t>(0);
- chip::GroupId groupId = static_cast<chip::GroupId>(0);
+ chip::GroupId groupID = static_cast<chip::GroupId>(0);
CHIP_ERROR Decode(TLV::TLVReader & reader);
};
}; // namespace AddGroupResponse
namespace ViewGroup {
enum class Fields
{
- kGroupId = 0,
+ kGroupID = 0,
};
struct Type
@@ -438,7 +438,7 @@
static constexpr CommandId GetCommandId() { return Commands::ViewGroup::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::Groups::Id; }
- chip::GroupId groupId = static_cast<chip::GroupId>(0);
+ chip::GroupId groupID = static_cast<chip::GroupId>(0);
CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -453,7 +453,7 @@
static constexpr CommandId GetCommandId() { return Commands::ViewGroup::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::Groups::Id; }
- chip::GroupId groupId = static_cast<chip::GroupId>(0);
+ chip::GroupId groupID = static_cast<chip::GroupId>(0);
CHIP_ERROR Decode(TLV::TLVReader & reader);
};
}; // namespace ViewGroup
@@ -461,7 +461,7 @@
enum class Fields
{
kStatus = 0,
- kGroupId = 1,
+ kGroupID = 1,
kGroupName = 2,
};
@@ -473,7 +473,7 @@
static constexpr ClusterId GetClusterId() { return Clusters::Groups::Id; }
uint8_t status = static_cast<uint8_t>(0);
- chip::GroupId groupId = static_cast<chip::GroupId>(0);
+ chip::GroupId groupID = static_cast<chip::GroupId>(0);
chip::CharSpan groupName;
CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -490,7 +490,7 @@
static constexpr ClusterId GetClusterId() { return Clusters::Groups::Id; }
uint8_t status = static_cast<uint8_t>(0);
- chip::GroupId groupId = static_cast<chip::GroupId>(0);
+ chip::GroupId groupID = static_cast<chip::GroupId>(0);
chip::CharSpan groupName;
CHIP_ERROR Decode(TLV::TLVReader & reader);
};
@@ -565,7 +565,7 @@
namespace RemoveGroup {
enum class Fields
{
- kGroupId = 0,
+ kGroupID = 0,
};
struct Type
@@ -575,7 +575,7 @@
static constexpr CommandId GetCommandId() { return Commands::RemoveGroup::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::Groups::Id; }
- chip::GroupId groupId = static_cast<chip::GroupId>(0);
+ chip::GroupId groupID = static_cast<chip::GroupId>(0);
CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -590,7 +590,7 @@
static constexpr CommandId GetCommandId() { return Commands::RemoveGroup::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::Groups::Id; }
- chip::GroupId groupId = static_cast<chip::GroupId>(0);
+ chip::GroupId groupID = static_cast<chip::GroupId>(0);
CHIP_ERROR Decode(TLV::TLVReader & reader);
};
}; // namespace RemoveGroup
@@ -598,7 +598,7 @@
enum class Fields
{
kStatus = 0,
- kGroupId = 1,
+ kGroupID = 1,
};
struct Type
@@ -609,7 +609,7 @@
static constexpr ClusterId GetClusterId() { return Clusters::Groups::Id; }
uint8_t status = static_cast<uint8_t>(0);
- chip::GroupId groupId = static_cast<chip::GroupId>(0);
+ chip::GroupId groupID = static_cast<chip::GroupId>(0);
CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -625,7 +625,7 @@
static constexpr ClusterId GetClusterId() { return Clusters::Groups::Id; }
uint8_t status = static_cast<uint8_t>(0);
- chip::GroupId groupId = static_cast<chip::GroupId>(0);
+ chip::GroupId groupID = static_cast<chip::GroupId>(0);
CHIP_ERROR Decode(TLV::TLVReader & reader);
};
}; // namespace RemoveGroupResponse
@@ -660,7 +660,7 @@
namespace AddGroupIfIdentifying {
enum class Fields
{
- kGroupId = 0,
+ kGroupID = 0,
kGroupName = 1,
};
@@ -671,7 +671,7 @@
static constexpr CommandId GetCommandId() { return Commands::AddGroupIfIdentifying::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::Groups::Id; }
- chip::GroupId groupId = static_cast<chip::GroupId>(0);
+ chip::GroupId groupID = static_cast<chip::GroupId>(0);
chip::CharSpan groupName;
CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -687,7 +687,7 @@
static constexpr CommandId GetCommandId() { return Commands::AddGroupIfIdentifying::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::Groups::Id; }
- chip::GroupId groupId = static_cast<chip::GroupId>(0);
+ chip::GroupId groupID = static_cast<chip::GroupId>(0);
chip::CharSpan groupName;
CHIP_ERROR Decode(TLV::TLVReader & reader);
};
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
index fb94745..eb8a22c 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
@@ -217,7 +217,7 @@
public:
GroupsAddGroup(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("add-group", credsIssuerConfig)
{
- AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
+ AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID);
AddArgument("GroupName", &mRequest.groupName);
ClusterCommand::AddArguments();
}
@@ -248,7 +248,7 @@
public:
GroupsViewGroup(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("view-group", credsIssuerConfig)
{
- AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
+ AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID);
ClusterCommand::AddArguments();
}
@@ -310,7 +310,7 @@
public:
GroupsRemoveGroup(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("remove-group", credsIssuerConfig)
{
- AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
+ AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID);
ClusterCommand::AddArguments();
}
@@ -370,7 +370,7 @@
GroupsAddGroupIfIdentifying(CredentialIssuerCommands * credsIssuerConfig) :
ClusterCommand("add-group-if-identifying", credsIssuerConfig)
{
- AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
+ AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID);
AddArgument("GroupName", &mRequest.groupName);
ClusterCommand::AddArguments();
}
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
index 4010f1b..b5a1e10 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
@@ -3602,7 +3602,7 @@
{
DataModelLogger::LogString(label, indent, "{");
ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
- ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
+ ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
DataModelLogger::LogString(indent, "}");
return CHIP_NO_ERROR;
}
@@ -3611,7 +3611,7 @@
{
DataModelLogger::LogString(label, indent, "{");
ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
- ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
+ ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
ReturnErrorOnFailure(DataModelLogger::LogValue("groupName", indent + 1, value.groupName));
DataModelLogger::LogString(indent, "}");
return CHIP_NO_ERROR;
@@ -3630,7 +3630,7 @@
{
DataModelLogger::LogString(label, indent, "{");
ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
- ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
+ ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID));
DataModelLogger::LogString(indent, "}");
return CHIP_NO_ERROR;
}
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index fcd53df..70e6c7c 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -77206,7 +77206,7 @@
chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 0U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 257U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 257U));
}
break;
case 5:
@@ -77215,7 +77215,7 @@
chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 0U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 258U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 258U));
}
break;
case 6:
@@ -77314,7 +77314,7 @@
chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 0U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 257U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 257U));
}
break;
case 27:
@@ -77323,7 +77323,7 @@
chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 0U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 258U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 258U));
}
break;
case 28:
@@ -77512,7 +77512,7 @@
LogStep(4, "Add Group 1 (endpoint 1)");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::AddGroup::Type value;
- value.groupId = 257U;
+ value.groupID = 257U;
value.groupName = chip::Span<const char>("Group #1garbage: not in length on purpose", 8);
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::AddGroup::Id, value, chip::NullOptional
@@ -77522,7 +77522,7 @@
LogStep(5, "Add Group 2 (endpoint 0)");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::AddGroup::Type value;
- value.groupId = 258U;
+ value.groupID = 258U;
value.groupName = chip::Span<const char>("Group #2garbage: not in length on purpose", 8);
return SendCommand(kIdentityAlpha, GetEndpoint(0), Groups::Id, Groups::Commands::AddGroup::Id, value, chip::NullOptional
@@ -77773,7 +77773,7 @@
LogStep(26, "Add Group 1 (endpoint 1) for gamma");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::AddGroup::Type value;
- value.groupId = 257U;
+ value.groupID = 257U;
value.groupName = chip::Span<const char>("Group #1garbage: not in length on purpose", 8);
return SendCommand(kIdentityGamma, GetEndpoint(1), Groups::Id, Groups::Commands::AddGroup::Id, value, chip::NullOptional
@@ -77783,7 +77783,7 @@
LogStep(27, "Add Group 2 (endpoint 0) for gamma");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::AddGroup::Type value;
- value.groupId = 258U;
+ value.groupID = 258U;
value.groupName = chip::Span<const char>("Group #2garbage: not in length on purpose", 8);
return SendCommand(kIdentityGamma, GetEndpoint(0), Groups::Id, Groups::Commands::AddGroup::Id, value, chip::NullOptional
@@ -77954,7 +77954,7 @@
chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 135U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 0U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 0U));
}
break;
case 2:
@@ -77963,7 +77963,7 @@
chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 139U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 257U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 257U));
}
break;
case 3:
@@ -77972,7 +77972,7 @@
chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 126U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 257U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 257U));
}
break;
case 4:
@@ -77987,7 +77987,7 @@
chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 0U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 257U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 257U));
}
break;
case 7:
@@ -77996,7 +77996,7 @@
chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 0U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 257U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 257U));
VerifyOrReturn(CheckValueAsString("groupName", value.groupName, chip::CharSpan("Group #1", 8)));
}
break;
@@ -78006,7 +78006,7 @@
chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 139U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 258U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 258U));
}
break;
case 9:
@@ -78029,7 +78029,7 @@
chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 0U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 258U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 258U));
}
break;
case 11:
@@ -78038,7 +78038,7 @@
chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 0U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 258U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 258U));
VerifyOrReturn(CheckValueAsString("groupName", value.groupName, chip::CharSpan("Group #2", 8)));
}
break;
@@ -78048,7 +78048,7 @@
chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 139U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 32767U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 32767U));
}
break;
case 13:
@@ -78057,7 +78057,7 @@
chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 0U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 257U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 257U));
VerifyOrReturn(CheckValueAsString("groupName", value.groupName, chip::CharSpan("Group #1", 8)));
}
break;
@@ -78067,7 +78067,7 @@
chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 0U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 258U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 258U));
VerifyOrReturn(CheckValueAsString("groupName", value.groupName, chip::CharSpan("Group #2", 8)));
}
break;
@@ -78091,7 +78091,7 @@
chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 135U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 0U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 0U));
}
break;
case 17:
@@ -78100,7 +78100,7 @@
chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 139U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 260U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 260U));
}
break;
case 18:
@@ -78109,7 +78109,7 @@
chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 0U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 258U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 258U));
}
break;
case 19:
@@ -78118,7 +78118,7 @@
chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 0U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 257U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 257U));
VerifyOrReturn(CheckValueAsString("groupName", value.groupName, chip::CharSpan("Group #1", 8)));
}
break;
@@ -78128,7 +78128,7 @@
chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 139U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 258U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 258U));
}
break;
case 21:
@@ -78154,7 +78154,7 @@
chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 139U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 257U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 257U));
}
break;
case 24:
@@ -78163,7 +78163,7 @@
chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 139U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 258U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 258U));
}
break;
case 25:
@@ -78172,7 +78172,7 @@
chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 139U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 32767U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 32767U));
}
break;
case 26:
@@ -78213,7 +78213,7 @@
LogStep(1, "View Group 0 (invalid)");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
- value.groupId = 0U;
+ value.groupID = 0U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
chip::NullOptional
@@ -78223,7 +78223,7 @@
LogStep(2, "View First Group (not found)");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
- value.groupId = 257U;
+ value.groupID = 257U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
chip::NullOptional
@@ -78233,7 +78233,7 @@
LogStep(3, "Add First Group (no keys)");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::AddGroup::Type value;
- value.groupId = 257U;
+ value.groupID = 257U;
value.groupName = chip::Span<const char>("Group #1garbage: not in length on purpose", 8);
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::AddGroup::Id, value, chip::NullOptional
@@ -78301,7 +78301,7 @@
LogStep(6, "Add First Group (new)");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::AddGroup::Type value;
- value.groupId = 257U;
+ value.groupID = 257U;
value.groupName = chip::Span<const char>("Group #1garbage: not in length on purpose", 8);
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::AddGroup::Id, value, chip::NullOptional
@@ -78311,7 +78311,7 @@
LogStep(7, "View First Group (new)");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
- value.groupId = 257U;
+ value.groupID = 257U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
chip::NullOptional
@@ -78321,7 +78321,7 @@
LogStep(8, "View Second Group (not found)");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
- value.groupId = 258U;
+ value.groupID = 258U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
chip::NullOptional
@@ -78342,7 +78342,7 @@
LogStep(10, "Add Second Group (new)");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::AddGroup::Type value;
- value.groupId = 258U;
+ value.groupID = 258U;
value.groupName = chip::Span<const char>("Group #2garbage: not in length on purpose", 8);
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::AddGroup::Id, value, chip::NullOptional
@@ -78352,7 +78352,7 @@
LogStep(11, "View Second Group (new)");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
- value.groupId = 258U;
+ value.groupID = 258U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
chip::NullOptional
@@ -78362,7 +78362,7 @@
LogStep(12, "View Group 3 (not found)");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
- value.groupId = 32767U;
+ value.groupID = 32767U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
chip::NullOptional
@@ -78372,7 +78372,7 @@
LogStep(13, "View First Group (existing)");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
- value.groupId = 257U;
+ value.groupID = 257U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
chip::NullOptional
@@ -78382,7 +78382,7 @@
LogStep(14, "View Second Group (existing)");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
- value.groupId = 258U;
+ value.groupID = 258U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
chip::NullOptional
@@ -78410,7 +78410,7 @@
LogStep(16, "Remove Group 0 (invalid)");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::RemoveGroup::Type value;
- value.groupId = 0U;
+ value.groupID = 0U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveGroup::Id, value,
chip::NullOptional
@@ -78420,7 +78420,7 @@
LogStep(17, "Remove Group 4 (not found)");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::RemoveGroup::Type value;
- value.groupId = 260U;
+ value.groupID = 260U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveGroup::Id, value,
chip::NullOptional
@@ -78430,7 +78430,7 @@
LogStep(18, "Remove Second Group (existing)");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::RemoveGroup::Type value;
- value.groupId = 258U;
+ value.groupID = 258U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveGroup::Id, value,
chip::NullOptional
@@ -78440,7 +78440,7 @@
LogStep(19, "View First Group (not removed)");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
- value.groupId = 257U;
+ value.groupID = 257U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
chip::NullOptional
@@ -78450,7 +78450,7 @@
LogStep(20, "View Second Group (removed)");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
- value.groupId = 258U;
+ value.groupID = 258U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
chip::NullOptional
@@ -78488,7 +78488,7 @@
LogStep(23, "View First Group (removed)");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
- value.groupId = 257U;
+ value.groupID = 257U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
chip::NullOptional
@@ -78498,7 +78498,7 @@
LogStep(24, "View Second Group (still removed)");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
- value.groupId = 258U;
+ value.groupID = 258U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
chip::NullOptional
@@ -78508,7 +78508,7 @@
LogStep(25, "View Group 3 (removed)");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
- value.groupId = 32767U;
+ value.groupID = 32767U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
chip::NullOptional
@@ -78663,7 +78663,7 @@
chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 0U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 257U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 257U));
}
break;
case 11:
@@ -78672,7 +78672,7 @@
chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 0U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 258U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 258U));
}
break;
case 12:
@@ -78733,7 +78733,7 @@
chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 0U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 257U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 257U));
}
break;
case 17:
@@ -78975,7 +78975,7 @@
LogStep(10, "Add Group 1");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::AddGroup::Type value;
- value.groupId = 257U;
+ value.groupID = 257U;
value.groupName = chip::Span<const char>("Group #1garbage: not in length on purpose", 8);
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::AddGroup::Id, value, chip::NullOptional
@@ -78985,7 +78985,7 @@
LogStep(11, "Add Group 2");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::AddGroup::Type value;
- value.groupId = 258U;
+ value.groupID = 258U;
value.groupName = chip::Span<const char>("Group #2garbage: not in length on purpose", 8);
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::AddGroup::Id, value, chip::NullOptional
@@ -79030,7 +79030,7 @@
LogStep(16, "Remove Group 1");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::RemoveGroup::Type value;
- value.groupId = 257U;
+ value.groupID = 257U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveGroup::Id, value,
chip::NullOptional
@@ -81611,7 +81611,7 @@
chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckValue("status", value.status, 0U));
- VerifyOrReturn(CheckValue("groupId", value.groupId, 257U));
+ VerifyOrReturn(CheckValue("groupID", value.groupID, 257U));
}
break;
case 4:
@@ -81697,7 +81697,7 @@
LogStep(3, "Add Group 1 (endpoint 1)");
ListFreer listFreer;
chip::app::Clusters::Groups::Commands::AddGroup::Type value;
- value.groupId = 257U;
+ value.groupID = 257U;
value.groupName = chip::Span<const char>("Group #1garbage: not in length on purpose", 8);
return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::AddGroup::Id, value, chip::NullOptional
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
index 9342937..6b05272 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
@@ -748,7 +748,7 @@
GroupsAddGroup()
: ClusterCommand("add-group")
{
- AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
+ AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID);
AddArgument("GroupName", &mRequest.groupName);
ClusterCommand::AddArguments();
}
@@ -762,7 +762,7 @@
__auto_type * params = [[MTRGroupsClusterAddGroupParams alloc] init];
params.timedInvokeTimeoutMs
= mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
- params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
+ params.groupID = [NSNumber numberWithUnsignedShort:mRequest.groupID];
params.groupName = [[NSString alloc] initWithBytes:mRequest.groupName.data()
length:mRequest.groupName.size()
encoding:NSUTF8StringEncoding];
@@ -797,7 +797,7 @@
GroupsViewGroup()
: ClusterCommand("view-group")
{
- AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
+ AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID);
ClusterCommand::AddArguments();
}
@@ -810,7 +810,7 @@
__auto_type * params = [[MTRGroupsClusterViewGroupParams alloc] init];
params.timedInvokeTimeoutMs
= mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
- params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
+ params.groupID = [NSNumber numberWithUnsignedShort:mRequest.groupID];
uint16_t repeatCount = mRepeatCount.ValueOr(1);
uint16_t __block responsesNeeded = repeatCount;
while (repeatCount--) {
@@ -898,7 +898,7 @@
GroupsRemoveGroup()
: ClusterCommand("remove-group")
{
- AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
+ AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID);
ClusterCommand::AddArguments();
}
@@ -911,7 +911,7 @@
__auto_type * params = [[MTRGroupsClusterRemoveGroupParams alloc] init];
params.timedInvokeTimeoutMs
= mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
- params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
+ params.groupID = [NSNumber numberWithUnsignedShort:mRequest.groupID];
uint16_t repeatCount = mRepeatCount.ValueOr(1);
uint16_t __block responsesNeeded = repeatCount;
while (repeatCount--) {
@@ -985,7 +985,7 @@
GroupsAddGroupIfIdentifying()
: ClusterCommand("add-group-if-identifying")
{
- AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
+ AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID);
AddArgument("GroupName", &mRequest.groupName);
ClusterCommand::AddArguments();
}
@@ -999,7 +999,7 @@
__auto_type * params = [[MTRGroupsClusterAddGroupIfIdentifyingParams alloc] init];
params.timedInvokeTimeoutMs
= mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
- params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
+ params.groupID = [NSNumber numberWithUnsignedShort:mRequest.groupID];
params.groupName = [[NSString alloc] initWithBytes:mRequest.groupName.data()
length:mRequest.groupName.size()
encoding:NSUTF8StringEncoding];
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
index 11e60b3..8c3e978 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -126772,7 +126772,7 @@
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
__auto_type * params = [[MTRGroupsClusterViewGroupParams alloc] init];
- params.groupId = [NSNumber numberWithUnsignedShort:0U];
+ params.groupID = [NSNumber numberWithUnsignedShort:0U];
[cluster viewGroupWithParams:params
completion:^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
NSLog(@"View Group 0 (invalid) Error: %@", err);
@@ -126781,12 +126781,12 @@
{
id actualValue = values.status;
- VerifyOrReturn(CheckValue("status", actualValue, 135U));
+ VerifyOrReturn(CheckValue("Status", actualValue, 135U));
}
{
- id actualValue = values.groupId;
- VerifyOrReturn(CheckValue("groupId", actualValue, 0U));
+ id actualValue = values.groupID;
+ VerifyOrReturn(CheckValue("GroupID", actualValue, 0U));
}
NextTest();
@@ -126803,7 +126803,7 @@
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
__auto_type * params = [[MTRGroupsClusterViewGroupParams alloc] init];
- params.groupId = [NSNumber numberWithUnsignedShort:257U];
+ params.groupID = [NSNumber numberWithUnsignedShort:257U];
[cluster viewGroupWithParams:params
completion:^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
NSLog(@"View First Group (not found) Error: %@", err);
@@ -126812,12 +126812,12 @@
{
id actualValue = values.status;
- VerifyOrReturn(CheckValue("status", actualValue, 139U));
+ VerifyOrReturn(CheckValue("Status", actualValue, 139U));
}
{
- id actualValue = values.groupId;
- VerifyOrReturn(CheckValue("groupId", actualValue, 257U));
+ id actualValue = values.groupID;
+ VerifyOrReturn(CheckValue("GroupID", actualValue, 257U));
}
NextTest();
@@ -126834,7 +126834,7 @@
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
__auto_type * params = [[MTRGroupsClusterAddGroupParams alloc] init];
- params.groupId = [NSNumber numberWithUnsignedShort:257U];
+ params.groupID = [NSNumber numberWithUnsignedShort:257U];
params.groupName = @"Group #1";
[cluster addGroupWithParams:params
completion:^(MTRGroupsClusterAddGroupResponseParams * _Nullable values, NSError * _Nullable err) {
@@ -126844,12 +126844,12 @@
{
id actualValue = values.status;
- VerifyOrReturn(CheckValue("status", actualValue, 126U));
+ VerifyOrReturn(CheckValue("Status", actualValue, 126U));
}
{
- id actualValue = values.groupId;
- VerifyOrReturn(CheckValue("groupId", actualValue, 257U));
+ id actualValue = values.groupID;
+ VerifyOrReturn(CheckValue("GroupID", actualValue, 257U));
}
NextTest();
@@ -126942,7 +126942,7 @@
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
__auto_type * params = [[MTRGroupsClusterAddGroupParams alloc] init];
- params.groupId = [NSNumber numberWithUnsignedShort:257U];
+ params.groupID = [NSNumber numberWithUnsignedShort:257U];
params.groupName = @"Group #1";
[cluster addGroupWithParams:params
completion:^(MTRGroupsClusterAddGroupResponseParams * _Nullable values, NSError * _Nullable err) {
@@ -126952,12 +126952,12 @@
{
id actualValue = values.status;
- VerifyOrReturn(CheckValue("status", actualValue, 0U));
+ VerifyOrReturn(CheckValue("Status", actualValue, 0U));
}
{
- id actualValue = values.groupId;
- VerifyOrReturn(CheckValue("groupId", actualValue, 257U));
+ id actualValue = values.groupID;
+ VerifyOrReturn(CheckValue("GroupID", actualValue, 257U));
}
NextTest();
@@ -126974,7 +126974,7 @@
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
__auto_type * params = [[MTRGroupsClusterViewGroupParams alloc] init];
- params.groupId = [NSNumber numberWithUnsignedShort:257U];
+ params.groupID = [NSNumber numberWithUnsignedShort:257U];
[cluster viewGroupWithParams:params
completion:^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
NSLog(@"View First Group (new) Error: %@", err);
@@ -126983,17 +126983,17 @@
{
id actualValue = values.status;
- VerifyOrReturn(CheckValue("status", actualValue, 0U));
+ VerifyOrReturn(CheckValue("Status", actualValue, 0U));
}
{
- id actualValue = values.groupId;
- VerifyOrReturn(CheckValue("groupId", actualValue, 257U));
+ id actualValue = values.groupID;
+ VerifyOrReturn(CheckValue("GroupID", actualValue, 257U));
}
{
id actualValue = values.groupName;
- VerifyOrReturn(CheckValueAsString("groupName", actualValue, @"Group #1"));
+ VerifyOrReturn(CheckValueAsString("GroupName", actualValue, @"Group #1"));
}
NextTest();
@@ -127010,7 +127010,7 @@
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
__auto_type * params = [[MTRGroupsClusterViewGroupParams alloc] init];
- params.groupId = [NSNumber numberWithUnsignedShort:258U];
+ params.groupID = [NSNumber numberWithUnsignedShort:258U];
[cluster viewGroupWithParams:params
completion:^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
NSLog(@"View Second Group (not found) Error: %@", err);
@@ -127019,12 +127019,12 @@
{
id actualValue = values.status;
- VerifyOrReturn(CheckValue("status", actualValue, 139U));
+ VerifyOrReturn(CheckValue("Status", actualValue, 139U));
}
{
- id actualValue = values.groupId;
- VerifyOrReturn(CheckValue("groupId", actualValue, 258U));
+ id actualValue = values.groupID;
+ VerifyOrReturn(CheckValue("GroupID", actualValue, 258U));
}
NextTest();
@@ -127054,12 +127054,12 @@
{
id actualValue = values.capacity;
- VerifyOrReturn(CheckValueNull("capacity", actualValue));
+ VerifyOrReturn(CheckValueNull("Capacity", actualValue));
}
{
id actualValue = values.groupList;
- VerifyOrReturn(CheckValue("groupList", [actualValue count], static_cast<uint32_t>(1)));
+ VerifyOrReturn(CheckValue("GroupList", [actualValue count], static_cast<uint32_t>(1)));
VerifyOrReturn(CheckValue("", actualValue[0], 257U));
}
@@ -127077,7 +127077,7 @@
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
__auto_type * params = [[MTRGroupsClusterAddGroupParams alloc] init];
- params.groupId = [NSNumber numberWithUnsignedShort:258U];
+ params.groupID = [NSNumber numberWithUnsignedShort:258U];
params.groupName = @"Group #2";
[cluster addGroupWithParams:params
completion:^(MTRGroupsClusterAddGroupResponseParams * _Nullable values, NSError * _Nullable err) {
@@ -127087,12 +127087,12 @@
{
id actualValue = values.status;
- VerifyOrReturn(CheckValue("status", actualValue, 0U));
+ VerifyOrReturn(CheckValue("Status", actualValue, 0U));
}
{
- id actualValue = values.groupId;
- VerifyOrReturn(CheckValue("groupId", actualValue, 258U));
+ id actualValue = values.groupID;
+ VerifyOrReturn(CheckValue("GroupID", actualValue, 258U));
}
NextTest();
@@ -127109,7 +127109,7 @@
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
__auto_type * params = [[MTRGroupsClusterViewGroupParams alloc] init];
- params.groupId = [NSNumber numberWithUnsignedShort:258U];
+ params.groupID = [NSNumber numberWithUnsignedShort:258U];
[cluster viewGroupWithParams:params
completion:^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
NSLog(@"View Second Group (new) Error: %@", err);
@@ -127118,17 +127118,17 @@
{
id actualValue = values.status;
- VerifyOrReturn(CheckValue("status", actualValue, 0U));
+ VerifyOrReturn(CheckValue("Status", actualValue, 0U));
}
{
- id actualValue = values.groupId;
- VerifyOrReturn(CheckValue("groupId", actualValue, 258U));
+ id actualValue = values.groupID;
+ VerifyOrReturn(CheckValue("GroupID", actualValue, 258U));
}
{
id actualValue = values.groupName;
- VerifyOrReturn(CheckValueAsString("groupName", actualValue, @"Group #2"));
+ VerifyOrReturn(CheckValueAsString("GroupName", actualValue, @"Group #2"));
}
NextTest();
@@ -127145,7 +127145,7 @@
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
__auto_type * params = [[MTRGroupsClusterViewGroupParams alloc] init];
- params.groupId = [NSNumber numberWithUnsignedShort:32767U];
+ params.groupID = [NSNumber numberWithUnsignedShort:32767U];
[cluster viewGroupWithParams:params
completion:^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
NSLog(@"View Group 3 (not found) Error: %@", err);
@@ -127154,12 +127154,12 @@
{
id actualValue = values.status;
- VerifyOrReturn(CheckValue("status", actualValue, 139U));
+ VerifyOrReturn(CheckValue("Status", actualValue, 139U));
}
{
- id actualValue = values.groupId;
- VerifyOrReturn(CheckValue("groupId", actualValue, 32767U));
+ id actualValue = values.groupID;
+ VerifyOrReturn(CheckValue("GroupID", actualValue, 32767U));
}
NextTest();
@@ -127176,7 +127176,7 @@
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
__auto_type * params = [[MTRGroupsClusterViewGroupParams alloc] init];
- params.groupId = [NSNumber numberWithUnsignedShort:257U];
+ params.groupID = [NSNumber numberWithUnsignedShort:257U];
[cluster viewGroupWithParams:params
completion:^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
NSLog(@"View First Group (existing) Error: %@", err);
@@ -127185,17 +127185,17 @@
{
id actualValue = values.status;
- VerifyOrReturn(CheckValue("status", actualValue, 0U));
+ VerifyOrReturn(CheckValue("Status", actualValue, 0U));
}
{
- id actualValue = values.groupId;
- VerifyOrReturn(CheckValue("groupId", actualValue, 257U));
+ id actualValue = values.groupID;
+ VerifyOrReturn(CheckValue("GroupID", actualValue, 257U));
}
{
id actualValue = values.groupName;
- VerifyOrReturn(CheckValueAsString("groupName", actualValue, @"Group #1"));
+ VerifyOrReturn(CheckValueAsString("GroupName", actualValue, @"Group #1"));
}
NextTest();
@@ -127212,7 +127212,7 @@
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
__auto_type * params = [[MTRGroupsClusterViewGroupParams alloc] init];
- params.groupId = [NSNumber numberWithUnsignedShort:258U];
+ params.groupID = [NSNumber numberWithUnsignedShort:258U];
[cluster viewGroupWithParams:params
completion:^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
NSLog(@"View Second Group (existing) Error: %@", err);
@@ -127221,17 +127221,17 @@
{
id actualValue = values.status;
- VerifyOrReturn(CheckValue("status", actualValue, 0U));
+ VerifyOrReturn(CheckValue("Status", actualValue, 0U));
}
{
- id actualValue = values.groupId;
- VerifyOrReturn(CheckValue("groupId", actualValue, 258U));
+ id actualValue = values.groupID;
+ VerifyOrReturn(CheckValue("GroupID", actualValue, 258U));
}
{
id actualValue = values.groupName;
- VerifyOrReturn(CheckValueAsString("groupName", actualValue, @"Group #2"));
+ VerifyOrReturn(CheckValueAsString("GroupName", actualValue, @"Group #2"));
}
NextTest();
@@ -127264,12 +127264,12 @@
{
id actualValue = values.capacity;
- VerifyOrReturn(CheckValueNull("capacity", actualValue));
+ VerifyOrReturn(CheckValueNull("Capacity", actualValue));
}
{
id actualValue = values.groupList;
- VerifyOrReturn(CheckValue("groupList", [actualValue count], static_cast<uint32_t>(1)));
+ VerifyOrReturn(CheckValue("GroupList", [actualValue count], static_cast<uint32_t>(1)));
VerifyOrReturn(CheckValue("", actualValue[0], 258U));
}
@@ -127287,7 +127287,7 @@
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
__auto_type * params = [[MTRGroupsClusterRemoveGroupParams alloc] init];
- params.groupId = [NSNumber numberWithUnsignedShort:0U];
+ params.groupID = [NSNumber numberWithUnsignedShort:0U];
[cluster removeGroupWithParams:params
completion:^(MTRGroupsClusterRemoveGroupResponseParams * _Nullable values, NSError * _Nullable err) {
NSLog(@"Remove Group 0 (invalid) Error: %@", err);
@@ -127296,12 +127296,12 @@
{
id actualValue = values.status;
- VerifyOrReturn(CheckValue("status", actualValue, 135U));
+ VerifyOrReturn(CheckValue("Status", actualValue, 135U));
}
{
- id actualValue = values.groupId;
- VerifyOrReturn(CheckValue("groupId", actualValue, 0U));
+ id actualValue = values.groupID;
+ VerifyOrReturn(CheckValue("GroupID", actualValue, 0U));
}
NextTest();
@@ -127318,7 +127318,7 @@
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
__auto_type * params = [[MTRGroupsClusterRemoveGroupParams alloc] init];
- params.groupId = [NSNumber numberWithUnsignedShort:260U];
+ params.groupID = [NSNumber numberWithUnsignedShort:260U];
[cluster removeGroupWithParams:params
completion:^(MTRGroupsClusterRemoveGroupResponseParams * _Nullable values, NSError * _Nullable err) {
NSLog(@"Remove Group 4 (not found) Error: %@", err);
@@ -127327,12 +127327,12 @@
{
id actualValue = values.status;
- VerifyOrReturn(CheckValue("status", actualValue, 139U));
+ VerifyOrReturn(CheckValue("Status", actualValue, 139U));
}
{
- id actualValue = values.groupId;
- VerifyOrReturn(CheckValue("groupId", actualValue, 260U));
+ id actualValue = values.groupID;
+ VerifyOrReturn(CheckValue("GroupID", actualValue, 260U));
}
NextTest();
@@ -127349,7 +127349,7 @@
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
__auto_type * params = [[MTRGroupsClusterRemoveGroupParams alloc] init];
- params.groupId = [NSNumber numberWithUnsignedShort:258U];
+ params.groupID = [NSNumber numberWithUnsignedShort:258U];
[cluster removeGroupWithParams:params
completion:^(MTRGroupsClusterRemoveGroupResponseParams * _Nullable values, NSError * _Nullable err) {
NSLog(@"Remove Second Group (existing) Error: %@", err);
@@ -127358,12 +127358,12 @@
{
id actualValue = values.status;
- VerifyOrReturn(CheckValue("status", actualValue, 0U));
+ VerifyOrReturn(CheckValue("Status", actualValue, 0U));
}
{
- id actualValue = values.groupId;
- VerifyOrReturn(CheckValue("groupId", actualValue, 258U));
+ id actualValue = values.groupID;
+ VerifyOrReturn(CheckValue("GroupID", actualValue, 258U));
}
NextTest();
@@ -127380,7 +127380,7 @@
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
__auto_type * params = [[MTRGroupsClusterViewGroupParams alloc] init];
- params.groupId = [NSNumber numberWithUnsignedShort:257U];
+ params.groupID = [NSNumber numberWithUnsignedShort:257U];
[cluster viewGroupWithParams:params
completion:^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
NSLog(@"View First Group (not removed) Error: %@", err);
@@ -127389,17 +127389,17 @@
{
id actualValue = values.status;
- VerifyOrReturn(CheckValue("status", actualValue, 0U));
+ VerifyOrReturn(CheckValue("Status", actualValue, 0U));
}
{
- id actualValue = values.groupId;
- VerifyOrReturn(CheckValue("groupId", actualValue, 257U));
+ id actualValue = values.groupID;
+ VerifyOrReturn(CheckValue("GroupID", actualValue, 257U));
}
{
id actualValue = values.groupName;
- VerifyOrReturn(CheckValueAsString("groupName", actualValue, @"Group #1"));
+ VerifyOrReturn(CheckValueAsString("GroupName", actualValue, @"Group #1"));
}
NextTest();
@@ -127416,7 +127416,7 @@
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
__auto_type * params = [[MTRGroupsClusterViewGroupParams alloc] init];
- params.groupId = [NSNumber numberWithUnsignedShort:258U];
+ params.groupID = [NSNumber numberWithUnsignedShort:258U];
[cluster viewGroupWithParams:params
completion:^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
NSLog(@"View Second Group (removed) Error: %@", err);
@@ -127425,12 +127425,12 @@
{
id actualValue = values.status;
- VerifyOrReturn(CheckValue("status", actualValue, 139U));
+ VerifyOrReturn(CheckValue("Status", actualValue, 139U));
}
{
- id actualValue = values.groupId;
- VerifyOrReturn(CheckValue("groupId", actualValue, 258U));
+ id actualValue = values.groupID;
+ VerifyOrReturn(CheckValue("GroupID", actualValue, 258U));
}
NextTest();
@@ -127464,12 +127464,12 @@
{
id actualValue = values.capacity;
- VerifyOrReturn(CheckValueNull("capacity", actualValue));
+ VerifyOrReturn(CheckValueNull("Capacity", actualValue));
}
{
id actualValue = values.groupList;
- VerifyOrReturn(CheckValue("groupList", [actualValue count], static_cast<uint32_t>(1)));
+ VerifyOrReturn(CheckValue("GroupList", [actualValue count], static_cast<uint32_t>(1)));
VerifyOrReturn(CheckValue("", actualValue[0], 257U));
}
@@ -127505,7 +127505,7 @@
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
__auto_type * params = [[MTRGroupsClusterViewGroupParams alloc] init];
- params.groupId = [NSNumber numberWithUnsignedShort:257U];
+ params.groupID = [NSNumber numberWithUnsignedShort:257U];
[cluster viewGroupWithParams:params
completion:^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
NSLog(@"View First Group (removed) Error: %@", err);
@@ -127514,12 +127514,12 @@
{
id actualValue = values.status;
- VerifyOrReturn(CheckValue("status", actualValue, 139U));
+ VerifyOrReturn(CheckValue("Status", actualValue, 139U));
}
{
- id actualValue = values.groupId;
- VerifyOrReturn(CheckValue("groupId", actualValue, 257U));
+ id actualValue = values.groupID;
+ VerifyOrReturn(CheckValue("GroupID", actualValue, 257U));
}
NextTest();
@@ -127536,7 +127536,7 @@
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
__auto_type * params = [[MTRGroupsClusterViewGroupParams alloc] init];
- params.groupId = [NSNumber numberWithUnsignedShort:258U];
+ params.groupID = [NSNumber numberWithUnsignedShort:258U];
[cluster viewGroupWithParams:params
completion:^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
NSLog(@"View Second Group (still removed) Error: %@", err);
@@ -127545,12 +127545,12 @@
{
id actualValue = values.status;
- VerifyOrReturn(CheckValue("status", actualValue, 139U));
+ VerifyOrReturn(CheckValue("Status", actualValue, 139U));
}
{
- id actualValue = values.groupId;
- VerifyOrReturn(CheckValue("groupId", actualValue, 258U));
+ id actualValue = values.groupID;
+ VerifyOrReturn(CheckValue("GroupID", actualValue, 258U));
}
NextTest();
@@ -127567,7 +127567,7 @@
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
__auto_type * params = [[MTRGroupsClusterViewGroupParams alloc] init];
- params.groupId = [NSNumber numberWithUnsignedShort:32767U];
+ params.groupID = [NSNumber numberWithUnsignedShort:32767U];
[cluster viewGroupWithParams:params
completion:^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
NSLog(@"View Group 3 (removed) Error: %@", err);
@@ -127576,12 +127576,12 @@
{
id actualValue = values.status;
- VerifyOrReturn(CheckValue("status", actualValue, 139U));
+ VerifyOrReturn(CheckValue("Status", actualValue, 139U));
}
{
- id actualValue = values.groupId;
- VerifyOrReturn(CheckValue("groupId", actualValue, 32767U));
+ id actualValue = values.groupID;
+ VerifyOrReturn(CheckValue("GroupID", actualValue, 32767U));
}
NextTest();
@@ -127616,12 +127616,12 @@
{
id actualValue = values.capacity;
- VerifyOrReturn(CheckValueNull("capacity", actualValue));
+ VerifyOrReturn(CheckValueNull("Capacity", actualValue));
}
{
id actualValue = values.groupList;
- VerifyOrReturn(CheckValue("groupList", [actualValue count], static_cast<uint32_t>(0)));
+ VerifyOrReturn(CheckValue("GroupList", [actualValue count], static_cast<uint32_t>(0)));
}
NextTest();
@@ -128225,7 +128225,7 @@
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
__auto_type * params = [[MTRGroupsClusterAddGroupParams alloc] init];
- params.groupId = [NSNumber numberWithUnsignedShort:257U];
+ params.groupID = [NSNumber numberWithUnsignedShort:257U];
params.groupName = @"Group #1";
[cluster addGroupWithParams:params
completion:^(MTRGroupsClusterAddGroupResponseParams * _Nullable values, NSError * _Nullable err) {
@@ -128235,12 +128235,12 @@
{
id actualValue = values.status;
- VerifyOrReturn(CheckValue("status", actualValue, 0U));
+ VerifyOrReturn(CheckValue("Status", actualValue, 0U));
}
{
- id actualValue = values.groupId;
- VerifyOrReturn(CheckValue("groupId", actualValue, 257U));
+ id actualValue = values.groupID;
+ VerifyOrReturn(CheckValue("GroupID", actualValue, 257U));
}
NextTest();
@@ -128257,7 +128257,7 @@
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
__auto_type * params = [[MTRGroupsClusterAddGroupParams alloc] init];
- params.groupId = [NSNumber numberWithUnsignedShort:258U];
+ params.groupID = [NSNumber numberWithUnsignedShort:258U];
params.groupName = @"Group #2";
[cluster addGroupWithParams:params
completion:^(MTRGroupsClusterAddGroupResponseParams * _Nullable values, NSError * _Nullable err) {
@@ -128267,12 +128267,12 @@
{
id actualValue = values.status;
- VerifyOrReturn(CheckValue("status", actualValue, 0U));
+ VerifyOrReturn(CheckValue("Status", actualValue, 0U));
}
{
- id actualValue = values.groupId;
- VerifyOrReturn(CheckValue("groupId", actualValue, 258U));
+ id actualValue = values.groupID;
+ VerifyOrReturn(CheckValue("GroupID", actualValue, 258U));
}
NextTest();
@@ -128435,7 +128435,7 @@
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
__auto_type * params = [[MTRGroupsClusterRemoveGroupParams alloc] init];
- params.groupId = [NSNumber numberWithUnsignedShort:257U];
+ params.groupID = [NSNumber numberWithUnsignedShort:257U];
[cluster removeGroupWithParams:params
completion:^(MTRGroupsClusterRemoveGroupResponseParams * _Nullable values, NSError * _Nullable err) {
NSLog(@"Remove Group 1 Error: %@", err);
@@ -128444,12 +128444,12 @@
{
id actualValue = values.status;
- VerifyOrReturn(CheckValue("status", actualValue, 0U));
+ VerifyOrReturn(CheckValue("Status", actualValue, 0U));
}
{
- id actualValue = values.groupId;
- VerifyOrReturn(CheckValue("groupId", actualValue, 257U));
+ id actualValue = values.groupID;
+ VerifyOrReturn(CheckValue("GroupID", actualValue, 257U));
}
NextTest();
