From 53036099c0d58108c360e34756c9309e43fd0d19 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 11 Aug 2023 08:04:15 -0400 Subject: [PATCH] Add Feature bitmap to Descriptor XML. (#28636) Fixes https://github.com/project-chip/connectedhomeip/issues/28605 --- .../air-quality-sensor-app.matter | 4 ++++ .../all-clusters-common/all-clusters-app.matter | 4 ++++ .../all-clusters-common/all-clusters-minimal-app.matter | 4 ++++ examples/bridge-app/bridge-common/bridge-app.matter | 4 ++++ .../noip_rootnode_dimmablelight_bCwGYSDpoe.matter | 4 ++++ ...uresensor_humiditysensor_thermostat_56de3d5f45.matter | 4 ++++ .../devices/rootnode_basicvideoplayer_0ff86e943b.matter | 4 ++++ .../rootnode_colortemperaturelight_hbUnzYVeyn.matter | 4 ++++ .../devices/rootnode_contactsensor_lFAGG1bfRO.matter | 4 ++++ .../devices/rootnode_dimmablelight_bCwGYSDpoe.matter | 4 ++++ .../chef/devices/rootnode_doorlock_aNKYAreMXE.matter | 4 ++++ .../rootnode_extendedcolorlight_8lcaaYJVAa.matter | 4 ++++ examples/chef/devices/rootnode_fan_7N2TobIlOX.matter | 4 ++++ .../chef/devices/rootnode_flowsensor_1zVxHedlaV.matter | 4 ++++ .../rootnode_heatingcoolingunit_ncdGai1E5a.matter | 4 ++++ .../devices/rootnode_humiditysensor_Xyj4gda6Hb.matter | 4 ++++ .../chef/devices/rootnode_lightsensor_lZQycTFcJK.matter | 4 ++++ .../devices/rootnode_occupancysensor_iHyVgifZuo.matter | 4 ++++ .../chef/devices/rootnode_onofflight_bbs1b7IaOV.matter | 4 ++++ .../devices/rootnode_onofflightswitch_FsPlMr090Q.matter | 4 ++++ .../devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter | 4 ++++ .../devices/rootnode_pressuresensor_s0qC9wLH4k.matter | 4 ++++ examples/chef/devices/rootnode_pump_a811bb33a0.matter | 4 ++++ .../rootnode_roboticvacuumcleaner_1807ff0c49.matter | 4 ++++ .../rootnode_roomairconditioner_9cf3607804.matter | 4 ++++ examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter | 4 ++++ .../devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter | 4 ++++ .../chef/devices/rootnode_thermostat_bm3fb8dhYi.matter | 4 ++++ .../devices/rootnode_windowcovering_RLCxaGi9Yx.matter | 4 ++++ .../contact-sensor-common/contact-sensor-app.matter | 4 ++++ .../dishwasher-common/dishwasher-app.matter | 4 ++++ .../light-switch-common/light-switch-app.matter | 4 ++++ .../bouffalolab/data_model/lighting-app-thread.matter | 4 ++++ .../bouffalolab/data_model/lighting-app-wifi.matter | 4 ++++ .../lighting-app/lighting-common/lighting-app.matter | 4 ++++ examples/lighting-app/nxp/zap/lighting-on-off.matter | 4 ++++ examples/lighting-app/qpg/zap/light.matter | 4 ++++ .../silabs/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-common/ota-requestor-app.matter | 4 ++++ examples/placeholder/linux/apps/app1/config.matter | 4 ++++ examples/placeholder/linux/apps/app2/config.matter | 4 ++++ examples/pump-app/pump-common/pump-app.matter | 4 ++++ .../pump-app/silabs/data_model/pump-thread-app.matter | 4 ++++ examples/pump-app/silabs/data_model/pump-wifi-app.matter | 4 ++++ .../pump-controller-common/pump-controller-app.matter | 4 ++++ .../resource-monitoring-app.matter | 4 ++++ .../smoke-co-alarm-common/smoke-co-alarm-app.matter | 4 ++++ .../temperature-measurement.matter | 4 ++++ examples/thermostat/thermostat-common/thermostat.matter | 4 ++++ examples/tv-app/tv-common/tv-app.matter | 4 ++++ .../tv-casting-common/tv-casting-app.matter | 8 ++++++++ .../virtual-device-common/virtual-device-app.matter | 4 ++++ examples/window-app/common/window-app.matter | 4 ++++ .../zcl/data-model/chip/descriptor-cluster.xml | 5 +++++ src/controller/data_model/controller-clusters.matter | 4 ++++ src/controller/python/chip/clusters/Objects.py | 4 ++++ src/darwin/Framework/CHIP/templates/availability.yaml | 5 +++++ .../Framework/CHIP/zap-generated/MTRBaseClusters.h | 4 ++++ .../app-common/app-common/zap-generated/cluster-enums.h | 9 ++++++++- 64 files changed, 266 insertions(+), 1 deletion(-) diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter index 795a76f7eed3ec..bfe7a2737aac8c 100644 --- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter +++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter @@ -75,6 +75,10 @@ server cluster Identify = 3 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; 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 5f5f6a077b93f6..4510215cc4fa80 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 @@ -535,6 +535,10 @@ server cluster BinaryInputBasic = 15 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; 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 f374904547521a..c6bbe5a98c0885 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 @@ -406,6 +406,10 @@ server cluster LevelControl = 8 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index bc4fba293eaf2a..8cf1d134b7be21 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -234,6 +234,10 @@ server cluster LevelControl = 8 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index dd753ef6604bc4..891f96176d527e 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -294,6 +294,10 @@ server cluster LevelControl = 8 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; 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 d80bf1b8090fee..ad28e8f41c59f0 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 @@ -150,6 +150,10 @@ server cluster Groups = 4 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter index a900377942ee7f..d50e27780e1de7 100644 --- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter +++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter @@ -80,6 +80,10 @@ server cluster OnOff = 6 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index ba3a30fa140bbd..090d743914a027 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -312,6 +312,10 @@ server cluster LevelControl = 8 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index f3effbc359d308..38a729369ab873 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -144,6 +144,10 @@ server cluster Groups = 4 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index 94dc30652fdf9b..31c8ed8fadb13b 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -294,6 +294,10 @@ server cluster LevelControl = 8 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index 3782ad74a986f0..ecb2f15691a1b2 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -144,6 +144,10 @@ server cluster Groups = 4 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index 787b30ac3cb1e8..3be0f99db70da3 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -294,6 +294,10 @@ server cluster LevelControl = 8 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index 1d3baf23f19183..0d3b63c8e90a22 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -150,6 +150,10 @@ server cluster Groups = 4 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index 213acb75ed9eae..67cd7c819ab8a4 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -150,6 +150,10 @@ client cluster Groups = 4 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index 16e9d0ef0411b6..ca297f3e948261 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -288,6 +288,10 @@ server cluster LevelControl = 8 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index 5c702d2cffa763..f3c032b7c90efd 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -150,6 +150,10 @@ client cluster Groups = 4 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index c5f60575c8c1ce..513b1f85bfd062 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -150,6 +150,10 @@ client cluster Groups = 4 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index 13dcbe89df64a9..418acf12b07120 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -150,6 +150,10 @@ client cluster Groups = 4 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index d94e6fe626812f..140440c3a61cd9 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -294,6 +294,10 @@ server cluster LevelControl = 8 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index 3c0073cdabffc7..e5acc9d6dad51d 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -258,6 +258,10 @@ server cluster OnOff = 6 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index b8b71c9270d45d..3819767f7a7042 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -193,6 +193,10 @@ server cluster OnOff = 6 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index 2168705b33d12d..54961c08b6486d 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -150,6 +150,10 @@ client cluster Groups = 4 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.matter b/examples/chef/devices/rootnode_pump_a811bb33a0.matter index ed7e8711b41d46..2271e3dbc6864f 100644 --- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter +++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter @@ -126,6 +126,10 @@ server cluster OnOff = 6 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter index d88a83846a46cb..218c2fc6bab3ef 100644 --- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter +++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter @@ -269,6 +269,10 @@ server cluster Scenes = 5 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter index f61a30fbe1f489..c93e4888147843 100644 --- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter +++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter @@ -195,6 +195,10 @@ server cluster OnOff = 6 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index 7a3e29e9178450..03460d57e573e6 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -219,6 +219,10 @@ server cluster LevelControl = 8 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index 91bc0f44a6922b..d2f5ead381e993 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -150,6 +150,10 @@ client cluster Groups = 4 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index b0274c116fe950..be7bf99502b438 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -144,6 +144,10 @@ server cluster Groups = 4 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index c3f077d00068cc..9f4e498ddf302b 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -144,6 +144,10 @@ server cluster Groups = 4 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; 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 31e22b6cf28454..8f908c719181c5 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 @@ -150,6 +150,10 @@ server cluster Groups = 4 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter index 4cbf4631a76715..23c25471bd3ade 100644 --- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter +++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter @@ -150,6 +150,10 @@ server cluster Groups = 4 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; 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 5984488b8c4032..3116ac889fa3b8 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 @@ -442,6 +442,10 @@ client cluster OnOff = 6 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; 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 ad1494ae56c863..ec1312d88f8fa3 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter @@ -321,6 +321,10 @@ server cluster LevelControl = 8 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; 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 733e2fb6e74322..a50b84604e9318 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter @@ -321,6 +321,10 @@ server cluster LevelControl = 8 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 2fd62d83a02e66..9b144faeb35e15 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -465,6 +465,10 @@ server cluster LevelControl = 8 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index ddccf7bbfa4b53..dbbfeb0fe01026 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -314,6 +314,10 @@ server cluster LevelControl = 8 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter index 2e80c048f973f3..b68a8362a48349 100644 --- a/examples/lighting-app/qpg/zap/light.matter +++ b/examples/lighting-app/qpg/zap/light.matter @@ -317,6 +317,10 @@ server cluster LevelControl = 8 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; 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 80580508259579..6bbca623601cb3 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -486,6 +486,10 @@ server cluster LevelControl = 8 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; 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 57d28ea2dc19c4..f8801c434b8abb 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter @@ -465,6 +465,10 @@ server cluster LevelControl = 8 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 5480cb9c3d9283..eab7bfde875760 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -124,6 +124,10 @@ server cluster OnOff = 6 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter index 79c2b7e6929920..ab94389c823e9a 100644 --- a/examples/lock-app/nxp/zap/lock-app.matter +++ b/examples/lock-app/nxp/zap/lock-app.matter @@ -81,6 +81,10 @@ server cluster Identify = 3 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter index 451f4ff3b11be0..66432c88ff824a 100644 --- a/examples/lock-app/qpg/zap/lock.matter +++ b/examples/lock-app/qpg/zap/lock.matter @@ -150,6 +150,10 @@ server cluster Groups = 4 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; 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 57350d99fe60e5..737506fc7254cf 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 @@ -35,6 +35,10 @@ struct OperationalStateStruct { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; 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 d5a48bc61e79dd..50618909a052bb 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 @@ -213,6 +213,10 @@ server cluster OnOff = 6 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 4e52f3dc9ccb1b..bd7bc72410108a 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -678,6 +678,10 @@ server cluster LevelControl = 8 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 9630cd749e11e7..49180243b4c613 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -676,6 +676,10 @@ server cluster LevelControl = 8 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index c65c77bce28ef6..426fbbc2912bc4 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -219,6 +219,10 @@ server cluster LevelControl = 8 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; 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 ce290aa780c9f6..8e8a10858ea042 100644 --- a/examples/pump-app/silabs/data_model/pump-thread-app.matter +++ b/examples/pump-app/silabs/data_model/pump-thread-app.matter @@ -219,6 +219,10 @@ server cluster LevelControl = 8 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; 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 ce290aa780c9f6..8e8a10858ea042 100644 --- a/examples/pump-app/silabs/data_model/pump-wifi-app.matter +++ b/examples/pump-app/silabs/data_model/pump-wifi-app.matter @@ -219,6 +219,10 @@ server cluster LevelControl = 8 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; 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 51a97051592256..594dabd32d0368 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 @@ -144,6 +144,10 @@ client cluster OnOff = 6 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; 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 c9a11288ef8505..bfe7bb19434d2f 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 @@ -150,6 +150,10 @@ server cluster Groups = 4 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; 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 cdeaf613e099d4..8be3507811530d 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 @@ -150,6 +150,10 @@ server cluster Groups = 4 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; 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 094a376a635f92..72ebcefe90b4d9 100644 --- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter +++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter @@ -35,6 +35,10 @@ struct OperationalStateStruct { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index aff57f8b0d64c7..4e25532cf041d0 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -315,6 +315,10 @@ server cluster Scenes = 5 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 4500b8cdd9cdef..3d58227417d70a 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -188,6 +188,10 @@ server cluster LevelControl = 8 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; 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 d85942d769a352..cd0c6116e9f907 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 @@ -349,6 +349,10 @@ server cluster BinaryInputBasic = 15 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ client cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; @@ -376,6 +380,10 @@ client cluster Descriptor = 29 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; 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 19524943e6df09..13c09f66a40190 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 @@ -332,6 +332,10 @@ server cluster OnOff = 6 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 8a7ef763ef0eed..f4f4dfda8bd6a5 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -267,6 +267,10 @@ server cluster Scenes = 5 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml index e27710d26f8c8f..8ef8ba9279e646 100644 --- a/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml @@ -31,6 +31,11 @@ limitations under the License. + + + + + General Descriptor diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index f024e626d4ed2a..e8efe0990b4c29 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -566,6 +566,10 @@ client cluster PulseWidthModulation = 28 { /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ client cluster Descriptor = 29 { + bitmap Feature : BITMAP32 { + kTagList = 0x1; + } + struct DeviceTypeStruct { devtype_id deviceType = 0; int16u revision = 1; diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index d63180139714cf..9f92a614c5f301 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -2803,6 +2803,10 @@ def descriptor(cls) -> ClusterObjectDescriptor: featureMap: 'uint' = None clusterRevision: 'uint' = None + class Bitmaps: + class Feature(IntFlag): + kTagList = 0x1 + class Structs: @dataclass class DeviceTypeStruct(ClusterObject): diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index d49841e22c3d97..55e262b09189af 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -7636,6 +7636,8 @@ bitmaps: GroupKeyManagement: - Feature + Descriptor: + - Feature bitmap values: OnOff: Feature: @@ -7643,6 +7645,9 @@ GroupKeyManagement: Feature: - CacheAndSync + Descriptor: + Feature: + - TagList removed: clusters: # Clusters that really should just not be exposed, even if they're in our XML. diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 573551ffbe636f..05d64c0e3f2d04 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -25166,6 +25166,10 @@ typedef NS_OPTIONS(uint8_t, MTRLevelControlOptions) { MTRLevelControlOptionsCoupleColorTempToLevel API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x2, } API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); +typedef NS_OPTIONS(uint32_t, MTRDescriptorFeature) { + MTRDescriptorFeatureTagList MTR_NEWLY_AVAILABLE = 0x1, +} MTR_NEWLY_AVAILABLE; + typedef NS_ENUM(uint8_t, MTRAccessControlEntryAuthMode) { MTRAccessControlEntryAuthModePASE API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x01, MTRAccessControlEntryAuthModeCASE API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x02, 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 2e07f6be4d9132..a964311bddd446 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 @@ -230,7 +230,14 @@ namespace BinaryInputBasic {} // namespace BinaryInputBasic namespace PulseWidthModulation {} // namespace PulseWidthModulation -namespace Descriptor {} // namespace Descriptor +namespace Descriptor { + +// Bitmap for Feature +enum class Feature : uint32_t +{ + kTagList = 0x1, +}; +} // namespace Descriptor namespace Binding {} // namespace Binding