Skip to content

Commit

Permalink
Update Groups cluster XML to match spec. (#26819)
Browse files Browse the repository at this point in the history
* Update Groups cluster XML to match spec.

Spec changes happened in CHIP-Specifications/connectedhomeip-spec#6429

Fixes #26209

* Auto-update ZAP files.

* Regenerate generated code.
  • Loading branch information
bzbarsky-apple authored May 25, 2023
1 parent 964a677 commit cb1955f
Show file tree
Hide file tree
Showing 108 changed files with 431 additions and 180 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,11 @@ server cluster Groups = 4 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
bitmap NameSupportBitmap : BITMAP8 {
kGroupNames = 0x80;
}

readonly attribute NameSupportBitmap nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -9265,7 +9265,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -21815,7 +21815,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ server cluster Groups = 4 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
bitmap NameSupportBitmap : BITMAP8 {
kGroupNames = 0x80;
}

readonly attribute NameSupportBitmap nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -8736,7 +8736,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -21187,7 +21187,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down
2 changes: 1 addition & 1 deletion examples/bridge-app/bridge-common/bridge-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -5957,7 +5957,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ server cluster Groups = 4 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
bitmap NameSupportBitmap : BITMAP8 {
kGroupNames = 0x80;
}

readonly attribute NameSupportBitmap nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -5735,7 +5735,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,11 @@ server cluster Groups = 4 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
bitmap NameSupportBitmap : BITMAP8 {
kGroupNames = 0x80;
}

readonly attribute NameSupportBitmap nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -5720,7 +5720,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ server cluster Groups = 4 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
bitmap NameSupportBitmap : BITMAP8 {
kGroupNames = 0x80;
}

readonly attribute NameSupportBitmap nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -5712,7 +5712,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ server cluster Groups = 4 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
bitmap NameSupportBitmap : BITMAP8 {
kGroupNames = 0x80;
}

readonly attribute NameSupportBitmap nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -5760,7 +5760,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down
6 changes: 5 additions & 1 deletion examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ server cluster Groups = 4 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
bitmap NameSupportBitmap : BITMAP8 {
kGroupNames = 0x80;
}

readonly attribute NameSupportBitmap nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -5712,7 +5712,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ server cluster Groups = 4 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
bitmap NameSupportBitmap : BITMAP8 {
kGroupNames = 0x80;
}

readonly attribute NameSupportBitmap nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -5712,7 +5712,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down
6 changes: 5 additions & 1 deletion examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,11 @@ server cluster Groups = 4 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
bitmap NameSupportBitmap : BITMAP8 {
kGroupNames = 0x80;
}

readonly attribute NameSupportBitmap nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -5768,7 +5768,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down
12 changes: 10 additions & 2 deletions examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ client cluster Groups = 4 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
bitmap NameSupportBitmap : BITMAP8 {
kGroupNames = 0x80;
}

readonly attribute NameSupportBitmap nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down Expand Up @@ -128,7 +132,11 @@ server cluster Groups = 4 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
bitmap NameSupportBitmap : BITMAP8 {
kGroupNames = 0x80;
}

readonly attribute NameSupportBitmap nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -5712,7 +5712,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ server cluster Groups = 4 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
bitmap NameSupportBitmap : BITMAP8 {
kGroupNames = 0x80;
}

readonly attribute NameSupportBitmap nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -5712,7 +5712,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down
Loading

0 comments on commit cb1955f

Please sign in to comment.