From f71a48feb5434c5356570b97f7c004a0d6bde682 Mon Sep 17 00:00:00 2001 From: Tennessee Carmel-Veilleux Date: Mon, 31 Jul 2023 15:58:40 -0400 Subject: [PATCH] Add missing enums in Group Key Management cluster (#28413) * Update group-key-mgmt-cluster.xml * Re-gen ZAP --------- Co-authored-by: tennessee.carmelveilleux@gmail.com --- .../all-clusters-common/all-clusters-app.matter | 4 ++++ .../all-clusters-minimal-app.matter | 4 ++++ .../bridge-app/bridge-common/bridge-app.matter | 4 ++++ ...oip_rootnode_dimmablelight_bCwGYSDpoe.matter | 4 ++++ ..._humiditysensor_thermostat_56de3d5f45.matter | 4 ++++ .../rootnode_basicvideoplayer_0ff86e943b.matter | 4 ++++ ...node_colortemperaturelight_hbUnzYVeyn.matter | 4 ++++ .../rootnode_contactsensor_lFAGG1bfRO.matter | 4 ++++ .../rootnode_dimmablelight_bCwGYSDpoe.matter | 4 ++++ .../devices/rootnode_doorlock_aNKYAreMXE.matter | 4 ++++ ...ootnode_extendedcolorlight_8lcaaYJVAa.matter | 4 ++++ .../chef/devices/rootnode_fan_7N2TobIlOX.matter | 4 ++++ .../rootnode_flowsensor_1zVxHedlaV.matter | 4 ++++ ...ootnode_heatingcoolingunit_ncdGai1E5a.matter | 4 ++++ .../rootnode_humiditysensor_Xyj4gda6Hb.matter | 4 ++++ .../rootnode_lightsensor_lZQycTFcJK.matter | 4 ++++ .../rootnode_occupancysensor_iHyVgifZuo.matter | 4 ++++ .../rootnode_onofflight_bbs1b7IaOV.matter | 4 ++++ .../rootnode_onofflightswitch_FsPlMr090Q.matter | 4 ++++ .../rootnode_onoffpluginunit_Wtf8ss5EBY.matter | 4 ++++ .../rootnode_pressuresensor_s0qC9wLH4k.matter | 4 ++++ .../devices/rootnode_pump_a811bb33a0.matter | 4 ++++ .../devices/rootnode_speaker_RpzeXdimqA.matter | 4 ++++ ...rootnode_temperaturesensor_Qy1zkNW7c3.matter | 4 ++++ .../rootnode_thermostat_bm3fb8dhYi.matter | 4 ++++ .../rootnode_windowcovering_RLCxaGi9Yx.matter | 4 ++++ .../contact-sensor-app.matter | 4 ++++ .../dishwasher-common/dishwasher-app.matter | 4 ++++ .../light-switch-common/light-switch-app.matter | 4 ++++ .../data_model/lighting-app-thread.matter | 4 ++++ .../data_model/lighting-app-wifi.matter | 4 ++++ .../lighting-common/lighting-app.matter | 4 ++++ .../lighting-app/nxp/zap/lighting-on-off.matter | 4 ++++ examples/lighting-app/qpg/zap/light.matter | 4 ++++ .../data_model/lighting-thread-app.matter | 4 ++++ .../silabs/data_model/lighting-wifi-app.matter | 4 ++++ examples/lock-app/lock-common/lock-app.matter | 4 ++++ examples/lock-app/nxp/zap/lock-app.matter | 4 ++++ examples/lock-app/qpg/zap/lock.matter | 4 ++++ .../ota-provider-common/ota-provider-app.matter | 4 ++++ .../ota-requestor-app.matter | 4 ++++ examples/pump-app/pump-common/pump-app.matter | 4 ++++ .../silabs/data_model/pump-thread-app.matter | 4 ++++ .../silabs/data_model/pump-wifi-app.matter | 4 ++++ .../pump-controller-app.matter | 4 ++++ .../resource-monitoring-app.matter | 4 ++++ .../smoke-co-alarm-app.matter | 4 ++++ .../temperature-measurement.matter | 4 ++++ .../thermostat-common/thermostat.matter | 4 ++++ examples/tv-app/tv-common/tv-app.matter | 4 ++++ .../tv-casting-common/tv-casting-app.matter | 4 ++++ .../virtual-device-app.matter | 4 ++++ examples/window-app/common/window-app.matter | 4 ++++ .../data-model/chip/group-key-mgmt-cluster.xml | 17 +++++++++++------ .../data_model/controller-clusters.matter | 4 ++++ src/controller/python/chip/clusters/Objects.py | 4 ++++ .../CHIP/zap-generated/MTRBaseClusters.h | 4 ++++ .../app-common/zap-generated/cluster-enums.h | 6 ++++++ 58 files changed, 241 insertions(+), 6 deletions(-) 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 c22343aef01b93..44a852efa8d887 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 @@ -2295,6 +2295,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; 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 5bc8ec3ab4475a..1f31c58a314f35 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 @@ -1934,6 +1934,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 54b3350c3a3805..9ef1be662e38d9 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -1546,6 +1546,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index 4bff8df11f908b..3fa94f796969e9 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -1431,6 +1431,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter index 95b99f4913654e..a10059b8f5d77d 100644 --- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter +++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter @@ -898,6 +898,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter index 46a8708f546889..169129dd542a12 100644 --- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter +++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter @@ -1131,6 +1131,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index 01e315b2a165f5..d4ed8ae7833f32 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -1191,6 +1191,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index 8d3d9e60304b56..e757bfca40c244 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -1145,6 +1145,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index b8afaea3572f59..ecddba32229e2a 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -1295,6 +1295,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index aeb594c5de3e2e..cb7af5398cb2d9 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -1145,6 +1145,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index 076ebe9ded9b6b..cd0309d8576232 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -1295,6 +1295,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index d851670914addd..5253394dac1473 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -1132,6 +1132,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index e2d092aadc74da..5f7dc401654574 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -1220,6 +1220,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index 95067271e9bdbf..5c16ff4316165a 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -1289,6 +1289,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index 51539608f77c93..282e57cb787065 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -1220,6 +1220,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index 046c96f788b42c..60663594687e76 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -1220,6 +1220,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index 5f4df720ab7645..159d6df5d0c559 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -1220,6 +1220,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index cdc5ce1f05fc1f..82a253ba91ab62 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -1295,6 +1295,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index aad75b19c1c549..3e3de2c710e365 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -1259,6 +1259,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 062beadb18923b..0f341394b711b3 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -1194,6 +1194,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index 348af0da8d066d..eadffeffcfd559 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -1220,6 +1220,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.matter b/examples/chef/devices/rootnode_pump_a811bb33a0.matter index 81c38d03d7d445..f461f2e7c49151 100644 --- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter +++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter @@ -844,6 +844,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index 707711726b0578..d452974aac5c8e 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -1289,6 +1289,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index 11c8f04ded349e..b4eb0ec4c22094 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -1220,6 +1220,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index 6d8d1131ec69b0..57f3f09d4a4963 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -1145,6 +1145,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index 445dc383e2fc42..a5e2ad2299635d 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -1145,6 +1145,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; 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 15ebf07c2d6673..965124f01f4518 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 @@ -1356,6 +1356,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter index 51446e3cdc8f96..cabe702de3ad44 100644 --- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter +++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter @@ -976,6 +976,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; 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 55bf0e75db0511..5faea0c1c4648e 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 @@ -1859,6 +1859,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter index 7c7332cc0306b2..f68eff373f0a5d 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter @@ -1464,6 +1464,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter index 67de97758bf6d0..27a1971fb2239d 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter @@ -1374,6 +1374,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index cc83b244b78f10..90c4d57386023d 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1723,6 +1723,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index 6e3048786bdbc4..b2781f7c7efc0e 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -1290,6 +1290,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter index c568ff0c5d7ee0..6b1ccd4ce982ce 100644 --- a/examples/lighting-app/qpg/zap/light.matter +++ b/examples/lighting-app/qpg/zap/light.matter @@ -1356,6 +1356,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter index 1f9f2105f81af7..89681a67ce9e42 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -1816,6 +1816,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter index 1bc4ca085ac095..f199cdf557122a 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter @@ -1705,6 +1705,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 0e9be617da8907..1fda0929962ee8 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1564,6 +1564,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter index 397452eb07fa79..8bf3d16ee20939 100644 --- a/examples/lock-app/nxp/zap/lock-app.matter +++ b/examples/lock-app/nxp/zap/lock-app.matter @@ -908,6 +908,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter index cb7ce687d9a89b..04faba95ce4713 100644 --- a/examples/lock-app/qpg/zap/lock.matter +++ b/examples/lock-app/qpg/zap/lock.matter @@ -1189,6 +1189,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter index 18b9e1e99e5ed3..7adf53eed5a933 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter @@ -889,6 +889,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; 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 fe4652795026ba..23bd852d592ed9 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 @@ -1072,6 +1072,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index 5636ad24e581b8..91fbb9ebdff027 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -1148,6 +1148,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.matter b/examples/pump-app/silabs/data_model/pump-thread-app.matter index dae3db394fcbd9..6642cb7c237657 100644 --- a/examples/pump-app/silabs/data_model/pump-thread-app.matter +++ b/examples/pump-app/silabs/data_model/pump-thread-app.matter @@ -1148,6 +1148,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.matter b/examples/pump-app/silabs/data_model/pump-wifi-app.matter index dae3db394fcbd9..6642cb7c237657 100644 --- a/examples/pump-app/silabs/data_model/pump-wifi-app.matter +++ b/examples/pump-app/silabs/data_model/pump-wifi-app.matter @@ -1148,6 +1148,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index 16c72d7d0341bd..1f69469501cb44 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -1073,6 +1073,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter index 51dadb42c36cbe..297294cf44bfb7 100644 --- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter +++ b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter @@ -1408,6 +1408,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter index 1956af2af19e1c..a16b80d49cd1a9 100644 --- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter +++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter @@ -1475,6 +1475,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter index 70f93bcd68ec64..07b170ea8325d6 100644 --- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter +++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter @@ -940,6 +940,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 49776bcef7069d..88d23fdbcc46e4 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -1560,6 +1560,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 38a9224dabe38f..bd3b6687d4b694 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1709,6 +1709,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; 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 3c03e7fb70df31..cdbf91567fd29b 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 @@ -1272,6 +1272,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter index 280eac184ac8c5..ceb3526d73d508 100644 --- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter +++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter @@ -1498,6 +1498,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index b6a03dc6d91d13..7b2840b18cf469 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -1692,6 +1692,10 @@ server cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml index 9c4fe41cd058d9..6dcf1b0eaa33a0 100644 --- a/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml @@ -30,6 +30,17 @@ limitations under the License. + + + + + + + + + + + @@ -42,12 +53,6 @@ limitations under the License. - - - - - - General Group Key Management diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index f5434d4cd08ced..f024e626d4ed2a 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -2577,6 +2577,10 @@ client cluster GroupKeyManagement = 63 { kCacheAndSync = 1; } + bitmap Feature : BITMAP32 { + kCacheAndSync = 0x1; + } + fabric_scoped struct GroupInfoMapStruct { group_id groupId = 1; endpoint_no endpoints[] = 2; diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 9d5670c8e8d930..d63180139714cf 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -13451,6 +13451,10 @@ class GroupKeySecurityPolicyEnum(MatterIntEnum): # enum value. This specific should never be transmitted. kUnknownEnumValue = 2, + class Bitmaps: + class Feature(IntFlag): + kCacheAndSync = 0x1 + class Structs: @dataclass class GroupInfoMapStruct(ClusterObject): diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index ded2a0be84a606..573551ffbe636f 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -26432,6 +26432,10 @@ typedef NS_ENUM(uint8_t, MTRGroupKeyManagementGroupKeySecurityPolicy) { MTRGroupKeyManagementGroupKeySecurityPolicyCacheAndSync API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +typedef NS_OPTIONS(uint32_t, MTRGroupKeyManagementFeature) { + MTRGroupKeyManagementFeatureCacheAndSync MTR_NEWLY_AVAILABLE = 0x1, +} MTR_NEWLY_AVAILABLE; + typedef NS_OPTIONS(uint32_t, MTRICDManagementFeature) { MTRICDManagementFeatureCheckInProtocolSupport MTR_PROVISIONALLY_AVAILABLE = 0x1, } MTR_PROVISIONALLY_AVAILABLE; diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index 6cef8dce3faef4..2e07f6be4d9132 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -1444,6 +1444,12 @@ enum class GroupKeySecurityPolicyEnum : uint8_t // enum value. This specific should never be transmitted. kUnknownEnumValue = 2, }; + +// Bitmap for Feature +enum class Feature : uint32_t +{ + kCacheAndSync = 0x1, +}; } // namespace GroupKeyManagement namespace FixedLabel {} // namespace FixedLabel