From f241dd26921bd4180b28ead16651f7936227b03c Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Sat, 9 Jul 2022 08:35:09 -0400 Subject: [PATCH] Add group feature map support (#20458) --- .../all-clusters-common/all-clusters-app.matter | 4 ++++ .../all-clusters-minimal-app.matter | 4 ++++ .../rootnode_contactsensor_lFAGG1bfRO.matter | 4 ++++ .../rootnode_dimmablelight_bCwGYSDpoe.matter | 4 ++++ .../devices/rootnode_flowsensor_1zVxHedlaV.matter | 8 ++++++++ .../rootnode_heatingcoolingunit_ncdGai1E5a.matter | 4 ++++ .../rootnode_humiditysensor_Xyj4gda6Hb.matter | 8 ++++++++ .../rootnode_occupancysensor_iHyVgifZuo.matter | 8 ++++++++ .../rootnode_onofflightswitch_FsPlMr090Q.matter | 4 ++++ .../rootnode_onoffpluginunit_Wtf8ss5EBY.matter | 4 ++++ .../rootnode_pressuresensor_s0qC9wLH4k.matter | 8 ++++++++ .../chef/devices/rootnode_speaker_RpzeXdimqA.matter | 4 ++++ .../rootnode_temperaturesensor_Qy1zkNW7c3.matter | 8 ++++++++ .../devices/rootnode_thermostat_bm3fb8dhYi.matter | 4 ++++ .../rootnode_windowcovering_RLCxaGi9Yx.matter | 4 ++++ .../light-switch-common/light-switch-app.matter | 4 ++++ .../lighting-common/lighting-app.matter | 4 ++++ examples/lock-app/lock-common/lock-app.matter | 4 ++++ examples/placeholder/linux/apps/app1/config.matter | 4 ++++ examples/placeholder/linux/apps/app2/config.matter | 4 ++++ .../thermostat/thermostat-common/thermostat.matter | 4 ++++ .../tv-casting-common/tv-casting-app.matter | 4 ++++ examples/window-app/common/window-app.matter | 4 ++++ src/app/clusters/groups-server/groups-server.cpp | 13 +++++++++++-- .../zap-templates/zcl/data-model/silabs/general.xml | 6 +++++- .../data_model/controller-clusters.matter | 4 ++++ .../Framework/CHIP/zap-generated/MTRBaseClusters.h | 4 ++++ .../app-common/zap-generated/cluster-enums.h | 6 ++++++ .../app-common/app-common/zap-generated/enums.h | 2 ++ 29 files changed, 144 insertions(+), 3 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 bd143842f348c6..03cc40d944ee34 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 @@ -48,6 +48,10 @@ server cluster Identify = 3 { } server cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; 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 0943510a9b81d6..370f71ee8a4d3a 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 @@ -42,6 +42,10 @@ server cluster Identify = 3 { } server cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index 0c58d7735885bb..2f553f5d092407 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -45,6 +45,10 @@ server cluster Identify = 3 { } server cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index d070ed93fc1abc..c418e260b39905 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -45,6 +45,10 @@ server cluster Identify = 3 { } server cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index 20103614458376..91db20992abfe3 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -45,6 +45,10 @@ server cluster Identify = 3 { } client cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -54,6 +58,10 @@ client cluster Groups = 4 { } server cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index fc220f4cb9b7dd..16d8c8f83fae22 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -45,6 +45,10 @@ server cluster Identify = 3 { } server cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index 539668f0475025..1f8dd74275efa6 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -45,6 +45,10 @@ server cluster Identify = 3 { } client cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -54,6 +58,10 @@ client cluster Groups = 4 { } server cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index 3b78448864f4d8..44c2d10c6975bc 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -45,6 +45,10 @@ server cluster Identify = 3 { } client cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -54,6 +58,10 @@ client cluster Groups = 4 { } server cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index c2b7b30949de15..76f87b241a18c5 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -45,6 +45,10 @@ server cluster Identify = 3 { } server cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index cd3cd0c89ec7be..e6b811977e2e30 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -45,6 +45,10 @@ server cluster Identify = 3 { } server cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index 3f933195346c1c..572eb08ca369b8 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -45,6 +45,10 @@ server cluster Identify = 3 { } client cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -54,6 +58,10 @@ client cluster Groups = 4 { } server cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index 3546b0e09fa806..66cc663bc4def9 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -45,6 +45,10 @@ server cluster Identify = 3 { } server cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index 94aa19a747e47d..91a5ef6e428cb0 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -45,6 +45,10 @@ server cluster Identify = 3 { } client cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -54,6 +58,10 @@ client cluster Groups = 4 { } server cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index 901adc16bf2427..282bc79e226418 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -45,6 +45,10 @@ server cluster Identify = 3 { } server cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index 2215c28b3acc42..26b531774f3304 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -45,6 +45,10 @@ server cluster Identify = 3 { } server cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; 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 2fd22feee58276..ae8c31908036ca 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 @@ -83,6 +83,10 @@ server cluster Identify = 3 { } server cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 2f92c3f0d1d8f6..67b8e0386adecb 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -48,6 +48,10 @@ server cluster Identify = 3 { } server cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 8068d529281045..6f73f7dc96d337 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -42,6 +42,10 @@ server cluster Identify = 3 { } server cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 3c58323e2df60d..fee787bd531ac9 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -37,6 +37,10 @@ server cluster Identify = 3 { } server cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 3c58323e2df60d..fee787bd531ac9 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -37,6 +37,10 @@ server cluster Identify = 3 { } server cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 3d73fcb846aa86..da69099d90f4d1 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -77,6 +77,10 @@ server cluster Identify = 3 { } server cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; 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 747e411838c834..ebf643296e65f0 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 @@ -42,6 +42,10 @@ server cluster Identify = 3 { } server cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index f39ee1a95c9252..9b67464b74c07f 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -51,6 +51,10 @@ server cluster Identify = 3 { } server cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/src/app/clusters/groups-server/groups-server.cpp b/src/app/clusters/groups-server/groups-server.cpp index 71d565f8e02bb1..e1eb32eb04c994 100644 --- a/src/app/clusters/groups-server/groups-server.cpp +++ b/src/app/clusters/groups-server/groups-server.cpp @@ -120,12 +120,21 @@ static EmberAfStatus GroupRemove(FabricIndex fabricIndex, EndpointId endpointId, void emberAfGroupsClusterServerInitCallback(EndpointId endpointId) { // The most significant bit of the NameSupport attribute indicates whether or not group names are supported - static constexpr uint8_t nameSupport = 0x80; - EmberAfStatus status = Attributes::NameSupport::Set(endpointId, nameSupport); + // + // According to spec, highest bit (Group Names supported) MUST match feature bit 0 (Group Names supported) + static constexpr uint8_t kNameSuppportFlagGroupNamesSupported = 0x80; + + EmberAfStatus status = Attributes::NameSupport::Set(endpointId, kNameSuppportFlagGroupNamesSupported); if (status != EMBER_ZCL_STATUS_SUCCESS) { ChipLogDetail(Zcl, "ERR: writing name support %x", status); } + + status = Attributes::FeatureMap::Set(endpointId, static_cast(GroupClusterFeature::kGroupNames)); + if (status != EMBER_ZCL_STATUS_SUCCESS) + { + ChipLogDetail(Zcl, "ERR: writing group feature map %x", status); + } } bool emberAfGroupsClusterAddGroupCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, 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 2429329895617a..a44c64a6debc8d 100644 --- a/src/app/zap-templates/zcl/data-model/silabs/general.xml +++ b/src/app/zap-templates/zcl/data-model/silabs/general.xml @@ -456,5 +456,9 @@ limitations under the License. - + + + + + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index d7f54134bfb4e2..57018d8c0aae30 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -51,6 +51,10 @@ client cluster Identify = 3 { } client cluster Groups = 4 { + bitmap GroupClusterFeature : BITMAP32 { + kGroupNames = 0x1; + } + readonly attribute bitmap8 nameSupport = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 43ed2183d0a4f6..d8cda4d2079949 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -21627,6 +21627,10 @@ typedef NS_ENUM(uint8_t, MTRIdentifyType) { MTRIdentifyTypeActuator = 0x05, }; +typedef NS_OPTIONS(uint32_t, MTRGroupsGroupClusterFeature) { + MTRGroupsGroupClusterFeatureGroupNames = 0x1, +}; + typedef NS_OPTIONS(uint8_t, MTRScenesCopyMode) { MTRScenesCopyModeCopyAllScenes = 0x1, }; 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 58324cc4291e1e..c56c9fcda8a98c 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 @@ -83,6 +83,12 @@ using IdentifyIdentifyType = EmberAfIdentifyIdentifyType; } // namespace Identify namespace Groups { + +// Bitmap for GroupClusterFeature +enum class GroupClusterFeature : uint32_t +{ + kGroupNames = 0x1, +}; } // namespace Groups namespace Scenes { diff --git a/zzz_generated/app-common/app-common/zap-generated/enums.h b/zzz_generated/app-common/app-common/zap-generated/enums.h index 0f24c3f20417cd..252127c9185fd8 100644 --- a/zzz_generated/app-common/app-common/zap-generated/enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/enums.h @@ -711,6 +711,8 @@ enum EmberAfWiFiVersionType : uint8_t #define EMBER_AF_FEATURE_ABSOLUTE_POSITION_OFFSET (3) #define EMBER_AF_FEATURE_POSITION_AWARE_TILT (16) #define EMBER_AF_FEATURE_POSITION_AWARE_TILT_OFFSET (4) +#define EMBER_AF_GROUP_CLUSTER_FEATURE_GROUP_NAMES (1) +#define EMBER_AF_GROUP_CLUSTER_FEATURE_GROUP_NAMES_OFFSET (0) #define EMBER_AF_IAS_ZONE_STATUS_ALARM1 (1) #define EMBER_AF_IAS_ZONE_STATUS_ALARM1_OFFSET (0) #define EMBER_AF_IAS_ZONE_STATUS_ALARM2 (2)