From a40963d7d571c18f4da18205b918e0c1b4e788f5 Mon Sep 17 00:00:00 2001 From: mpbreton-silabs <107145920+mpbreton-silabs@users.noreply.github.com> Date: Thu, 17 Aug 2023 17:10:22 -0400 Subject: [PATCH] Add missing flags for (#28706) Explicit, TableSize FabricScenes --- .../all-clusters-common/all-clusters-app.matter | 3 +++ .../all-clusters-common/all-clusters-minimal-app.matter | 3 +++ .../devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter | 3 +++ .../light-switch-common/light-switch-app.matter | 3 +++ examples/lighting-app/lighting-common/lighting-app.matter | 3 +++ .../silabs/data_model/lighting-thread-app.matter | 3 +++ .../lighting-app/silabs/data_model/lighting-wifi-app.matter | 3 +++ examples/placeholder/linux/apps/app1/config.matter | 3 +++ examples/placeholder/linux/apps/app2/config.matter | 3 +++ examples/thermostat/thermostat-common/thermostat.matter | 3 +++ .../virtual-device-common/virtual-device-app.matter | 3 +++ examples/window-app/common/window-app.matter | 3 +++ src/app/zap-templates/zcl/data-model/chip/scene.xml | 3 +++ src/controller/data_model/controller-clusters.matter | 3 +++ src/controller/python/chip/clusters/Objects.py | 3 +++ src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h | 3 +++ .../app-common/app-common/zap-generated/cluster-enums.h | 5 ++++- 17 files changed, 52 insertions(+), 1 deletion(-) 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 451331ead17cee..b30257ec7d9875 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 @@ -152,6 +152,9 @@ server cluster Groups = 4 { server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; + kExplicit = 0x2; + kTableSize = 0x4; + kFabricScenes = 0x8; } bitmap ScenesCopyMode : BITMAP8 { 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 31bc69602a190d..aab1d712857433 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 @@ -152,6 +152,9 @@ server cluster Groups = 4 { server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; + kExplicit = 0x2; + kTableSize = 0x4; + kFabricScenes = 0x8; } bitmap ScenesCopyMode : BITMAP8 { diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter index 218c2fc6bab3ef..be757b542b1c20 100644 --- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter +++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter @@ -152,6 +152,9 @@ server cluster Groups = 4 { server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; + kExplicit = 0x2; + kTableSize = 0x4; + kFabricScenes = 0x8; } bitmap ScenesCopyMode : BITMAP8 { 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 3116ac889fa3b8..9fb88932872ca7 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 @@ -200,6 +200,9 @@ server cluster Groups = 4 { client cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; + kExplicit = 0x2; + kTableSize = 0x4; + kFabricScenes = 0x8; } bitmap ScenesCopyMode : BITMAP8 { diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 9b144faeb35e15..4040f58eeebb28 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -152,6 +152,9 @@ server cluster Groups = 4 { server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; + kExplicit = 0x2; + kTableSize = 0x4; + kFabricScenes = 0x8; } bitmap ScenesCopyMode : BITMAP8 { 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 cf95cd3ce0fda9..eacdd781199450 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -152,6 +152,9 @@ server cluster Groups = 4 { server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; + kExplicit = 0x2; + kTableSize = 0x4; + kFabricScenes = 0x8; } bitmap ScenesCopyMode : BITMAP8 { 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 ed1d97d62b92e4..645ffbcdfad5ac 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter @@ -152,6 +152,9 @@ server cluster Groups = 4 { server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; + kExplicit = 0x2; + kTableSize = 0x4; + kFabricScenes = 0x8; } bitmap ScenesCopyMode : BITMAP8 { diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index e12c42d6b45a19..669139b21d6f08 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -200,6 +200,9 @@ server cluster Groups = 4 { server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; + kExplicit = 0x2; + kTableSize = 0x4; + kFabricScenes = 0x8; } bitmap ScenesCopyMode : BITMAP8 { diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 39e7e3ad5b932d..6a953a3570edf7 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -200,6 +200,9 @@ server cluster Groups = 4 { server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; + kExplicit = 0x2; + kTableSize = 0x4; + kFabricScenes = 0x8; } bitmap ScenesCopyMode : BITMAP8 { diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 4e25532cf041d0..da47469f7ed0f6 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -200,6 +200,9 @@ server cluster Groups = 4 { server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; + kExplicit = 0x2; + kTableSize = 0x4; + kFabricScenes = 0x8; } bitmap ScenesCopyMode : BITMAP8 { 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 95fcd28b05d0ef..ef48a5d536bafa 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 @@ -152,6 +152,9 @@ server cluster Groups = 4 { server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; + kExplicit = 0x2; + kTableSize = 0x4; + kFabricScenes = 0x8; } bitmap ScenesCopyMode : BITMAP8 { diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index cffa1be10e3529..ad3d71767dbb50 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -152,6 +152,9 @@ server cluster Groups = 4 { server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; + kExplicit = 0x2; + kTableSize = 0x4; + kFabricScenes = 0x8; } bitmap ScenesCopyMode : BITMAP8 { diff --git a/src/app/zap-templates/zcl/data-model/chip/scene.xml b/src/app/zap-templates/zcl/data-model/chip/scene.xml index 313d921a93e41b..903d07b3a1670b 100644 --- a/src/app/zap-templates/zcl/data-model/chip/scene.xml +++ b/src/app/zap-templates/zcl/data-model/chip/scene.xml @@ -232,5 +232,8 @@ limitations under the License. + + + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index e8efe0990b4c29..1824759d5c876d 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -160,6 +160,9 @@ client cluster Groups = 4 { client cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; + kExplicit = 0x2; + kTableSize = 0x4; + kFabricScenes = 0x8; } bitmap ScenesCopyMode : BITMAP8 { diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 9f92a614c5f301..879742b2bb0270 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -624,6 +624,9 @@ def descriptor(cls) -> ClusterObjectDescriptor: class Bitmaps: class Feature(IntFlag): kSceneNames = 0x1 + kExplicit = 0x2 + kTableSize = 0x4 + kFabricScenes = 0x8 class ScenesCopyMode(IntFlag): kCopyAllScenes = 0x1 diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 05d64c0e3f2d04..ca0ab33a448ede 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -25105,6 +25105,9 @@ typedef NS_OPTIONS(uint8_t, MTRGroupsNameSupportBitmap) { typedef NS_OPTIONS(uint32_t, MTRScenesFeature) { MTRScenesFeatureSceneNames API_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0)) = 0x1, + MTRScenesFeatureExplicit MTR_NEWLY_AVAILABLE = 0x2, + MTRScenesFeatureTableSize MTR_NEWLY_AVAILABLE = 0x4, + MTRScenesFeatureFabricScenes MTR_NEWLY_AVAILABLE = 0x8, } API_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0)); typedef NS_OPTIONS(uint8_t, MTRScenesCopyMode) { 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 a964311bddd446..8bad422096320b 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 @@ -93,7 +93,10 @@ namespace Scenes { // Bitmap for Feature enum class Feature : uint32_t { - kSceneNames = 0x1, + kSceneNames = 0x1, + kExplicit = 0x2, + kTableSize = 0x4, + kFabricScenes = 0x8, }; // Bitmap for ScenesCopyMode