Modified Attribute 7 from scene cluster to SceneInfoStruct and added …

…support in scenes-server
lpbeliveau-silabs · Oct 17, 2023 · 547ebfd · 547ebfd
1 parent 553b32b
commit 547ebfd
Show file tree

Hide file tree

Showing 55 changed files with 1,073 additions and 238 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
@@ -139,14 +139,22 @@ server cluster Scenes = 5 {
     AttributeValuePair attributeValueList[] = 1;
   }
 
+  struct SceneInfoStruct {
+    int8u sceneCount = 0;
+    int8u currentScene = 1;
+    group_id currentGroup = 2;
+    boolean sceneValid = 3;
+    int8u remainingCapacity = 4;
+  }
+
   readonly attribute int8u sceneCount = 0;
   readonly attribute int8u currentScene = 1;
   readonly attribute group_id currentGroup = 2;
   readonly attribute boolean sceneValid = 3;
   readonly attribute bitmap8 nameSupport = 4;
   readonly attribute nullable node_id lastConfiguredBy = 5;
   readonly attribute int16u sceneTableSize = 6;
-  readonly attribute int8u remainingCapacity = 7;
+  readonly attribute SceneInfoStruct fabricSceneInfo[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6710,7 +6718,7 @@ endpoint 1 {
     ram      attribute nameSupport default = 0x80;
     ram      attribute lastConfiguredBy;
     ram      attribute sceneTableSize default = 16;
-    callback attribute remainingCapacity default = 8;
+    callback attribute fabricSceneInfo default = 8;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
@@ -7938,7 +7946,7 @@ endpoint 2 {
     ram      attribute nameSupport default = 0x80;
     ram      attribute lastConfiguredBy;
     ram      attribute sceneTableSize default = 16;
-    callback attribute remainingCapacity default = 8;
+    callback attribute fabricSceneInfo default = 8;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;

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
@@ -139,14 +139,22 @@ server cluster Scenes = 5 {
     AttributeValuePair attributeValueList[] = 1;
   }
 
+  struct SceneInfoStruct {
+    int8u sceneCount = 0;
+    int8u currentScene = 1;
+    group_id currentGroup = 2;
+    boolean sceneValid = 3;
+    int8u remainingCapacity = 4;
+  }
+
   readonly attribute int8u sceneCount = 0;
   readonly attribute int8u currentScene = 1;
   readonly attribute group_id currentGroup = 2;
   readonly attribute boolean sceneValid = 3;
   readonly attribute bitmap8 nameSupport = 4;
   readonly attribute nullable node_id lastConfiguredBy = 5;
   readonly attribute int16u sceneTableSize = 6;
-  readonly attribute int8u remainingCapacity = 7;
+  readonly attribute SceneInfoStruct fabricSceneInfo[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -4372,7 +4380,7 @@ endpoint 1 {
     ram      attribute nameSupport default = 0x80;
     ram      attribute lastConfiguredBy;
     ram      attribute sceneTableSize default = 16;
-    callback attribute remainingCapacity default = 8;
+    callback attribute fabricSceneInfo default = 8;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
@@ -4935,7 +4943,7 @@ endpoint 2 {
     ram      attribute sceneValid default = 0x00;
     ram      attribute nameSupport default = 0x80;
     ram      attribute sceneTableSize default = 16;
-    callback attribute remainingCapacity default = 8;
+    callback attribute fabricSceneInfo default = 8;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;

diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
@@ -139,13 +139,21 @@ server cluster Scenes = 5 {
     AttributeValuePair attributeValueList[] = 1;
   }
 
+  struct SceneInfoStruct {
+    int8u sceneCount = 0;
+    int8u currentScene = 1;
+    group_id currentGroup = 2;
+    boolean sceneValid = 3;
+    int8u remainingCapacity = 4;
+  }
+
   readonly attribute int8u sceneCount = 0;
   readonly attribute int8u currentScene = 1;
   readonly attribute group_id currentGroup = 2;
   readonly attribute boolean sceneValid = 3;
   readonly attribute bitmap8 nameSupport = 4;
   readonly attribute int16u sceneTableSize = 6;
-  readonly attribute int8u remainingCapacity = 7;
+  readonly attribute SceneInfoStruct fabricSceneInfo[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1387,7 +1395,7 @@ endpoint 1 {
     ram      attribute sceneValid default = 0x00;
     ram      attribute nameSupport default = 0x00;
     ram      attribute sceneTableSize;
-    callback attribute remainingCapacity;
+    callback attribute fabricSceneInfo;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;

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
@@ -187,14 +187,22 @@ client cluster Scenes = 5 {
     AttributeValuePair attributeValueList[] = 1;
   }
 
+  struct SceneInfoStruct {
+    int8u sceneCount = 0;
+    int8u currentScene = 1;
+    group_id currentGroup = 2;
+    boolean sceneValid = 3;
+    int8u remainingCapacity = 4;
+  }
+
   readonly attribute int8u sceneCount = 0;
   readonly attribute int8u currentScene = 1;
   readonly attribute group_id currentGroup = 2;
   readonly attribute boolean sceneValid = 3;
   readonly attribute bitmap8 nameSupport = 4;
   readonly attribute optional nullable node_id lastConfiguredBy = 5;
   readonly attribute int16u sceneTableSize = 6;
-  readonly attribute int8u remainingCapacity = 7;
+  readonly attribute SceneInfoStruct fabricSceneInfo[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;

diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -139,14 +139,22 @@ server cluster Scenes = 5 {
     AttributeValuePair attributeValueList[] = 1;
   }
 
+  struct SceneInfoStruct {
+    int8u sceneCount = 0;
+    int8u currentScene = 1;
+    group_id currentGroup = 2;
+    boolean sceneValid = 3;
+    int8u remainingCapacity = 4;
+  }
+
   readonly attribute int8u sceneCount = 0;
   readonly attribute int8u currentScene = 1;
   readonly attribute group_id currentGroup = 2;
   readonly attribute boolean sceneValid = 3;
   readonly attribute bitmap8 nameSupport = 4;
   readonly attribute nullable node_id lastConfiguredBy = 5;
   readonly attribute int16u sceneTableSize = 6;
-  readonly attribute int8u remainingCapacity = 7;
+  readonly attribute SceneInfoStruct fabricSceneInfo[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2479,7 +2487,7 @@ endpoint 1 {
     ram      attribute nameSupport default = 0x80;
     ram      attribute lastConfiguredBy;
     ram      attribute sceneTableSize default = 16;
-    callback attribute remainingCapacity default = 8;
+    callback attribute fabricSceneInfo default = 8;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;

diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
@@ -139,14 +139,22 @@ server cluster Scenes = 5 {
     AttributeValuePair attributeValueList[] = 1;
   }
 
+  struct SceneInfoStruct {
+    int8u sceneCount = 0;
+    int8u currentScene = 1;
+    group_id currentGroup = 2;
+    boolean sceneValid = 3;
+    int8u remainingCapacity = 4;
+  }
+
   readonly attribute int8u sceneCount = 0;
   readonly attribute int8u currentScene = 1;
   readonly attribute group_id currentGroup = 2;
   readonly attribute boolean sceneValid = 3;
   readonly attribute bitmap8 nameSupport = 4;
   readonly attribute nullable node_id lastConfiguredBy = 5;
   readonly attribute int16u sceneTableSize = 6;
-  readonly attribute int8u remainingCapacity = 7;
+  readonly attribute SceneInfoStruct fabricSceneInfo[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2489,18 +2497,18 @@ endpoint 1 {
 
   server cluster Scenes {
     callback attribute sceneCount default = 0x00;
-    ram      attribute currentScene default = 0x00;
-    ram      attribute currentGroup default = 0x0000;
-    ram      attribute sceneValid default = 0x00;
-    ram      attribute nameSupport default = 0x80;
-    ram      attribute lastConfiguredBy;
-    ram      attribute sceneTableSize default = 16;
-    callback attribute remainingCapacity default = 8;
+    callback attribute currentScene default = 0x00;
+    callback attribute currentGroup default = 0x0000;
+    callback attribute sceneValid default = 0x00;
+    callback attribute nameSupport default = 0x80;
+    callback attribute lastConfiguredBy;
+    callback attribute sceneTableSize default = 16;
+    callback attribute fabricSceneInfo;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 3;
+    callback attribute featureMap default = 3;
     ram      attribute clusterRevision default = 5;
 
     handle command AddScene;

diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap
@@ -4078,7 +4078,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x00",
@@ -4094,7 +4094,7 @@
               "side": "server",
               "type": "group_id",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4110,7 +4110,7 @@
               "side": "server",
               "type": "boolean",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x00",
@@ -4126,7 +4126,7 @@
               "side": "server",
               "type": "bitmap8",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x80",
@@ -4142,7 +4142,7 @@
               "side": "server",
               "type": "node_id",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -4158,7 +4158,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "16",
@@ -4168,16 +4168,16 @@
               "reportableChange": 0
             },
             {
-              "name": "RemainingCapacity",
+              "name": "FabricSceneInfo",
               "code": 7,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "array",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "8",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4254,7 +4254,7 @@
               "side": "server",
               "type": "bitmap32",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "3",

diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
@@ -139,14 +139,22 @@ server cluster Scenes = 5 {
     AttributeValuePair attributeValueList[] = 1;
   }
 
+  struct SceneInfoStruct {
+    int8u sceneCount = 0;
+    int8u currentScene = 1;
+    group_id currentGroup = 2;
+    boolean sceneValid = 3;
+    int8u remainingCapacity = 4;
+  }
+
   readonly attribute int8u sceneCount = 0;
   readonly attribute int8u currentScene = 1;
   readonly attribute group_id currentGroup = 2;
   readonly attribute boolean sceneValid = 3;
   readonly attribute bitmap8 nameSupport = 4;
   readonly attribute nullable node_id lastConfiguredBy = 5;
   readonly attribute int16u sceneTableSize = 6;
-  readonly attribute int8u remainingCapacity = 7;
+  readonly attribute SceneInfoStruct fabricSceneInfo[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2335,7 +2343,7 @@ endpoint 1 {
     ram      attribute nameSupport default = 0x80;
     ram      attribute lastConfiguredBy;
     ram      attribute sceneTableSize default = 16;
-    callback attribute remainingCapacity default = 8;
+    callback attribute fabricSceneInfo default = 8;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;

diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
@@ -187,6 +187,14 @@ server cluster Scenes = 5 {
     AttributeValuePair attributeValueList[] = 1;
   }
 
+  struct SceneInfoStruct {
+    int8u sceneCount = 0;
+    int8u currentScene = 1;
+    group_id currentGroup = 2;
+    boolean sceneValid = 3;
+    int8u remainingCapacity = 4;
+  }
+
   readonly attribute int8u sceneCount = 0;
   readonly attribute int8u currentScene = 1;
   readonly attribute group_id currentGroup = 2;

diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
@@ -187,6 +187,14 @@ server cluster Scenes = 5 {
     AttributeValuePair attributeValueList[] = 1;
   }
 
+  struct SceneInfoStruct {
+    int8u sceneCount = 0;
+    int8u currentScene = 1;
+    group_id currentGroup = 2;
+    boolean sceneValid = 3;
+    int8u remainingCapacity = 4;
+  }
+
   readonly attribute int8u sceneCount = 0;
   readonly attribute int8u currentScene = 1;
   readonly attribute group_id currentGroup = 2;