Added missing checks on feature map for name support attribute in init

project-chip · Oct 27, 2023 · 0264270 · 0264270
1 parent 41aaf74
commit 0264270
Show file tree

Hide file tree

Showing 21 changed files with 103 additions and 946 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
@@ -118,6 +118,10 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 server cluster Scenes = 5 {
+  bitmap CopyModeBitmap : BITMAP8 {
+    kCopyAllScenes = 0x1;
+  }
+
   bitmap Feature : BITMAP32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
@@ -129,10 +133,6 @@ server cluster Scenes = 5 {
     kSceneNames = 0x80;
   }
 
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
-  }
-
   struct AttributeValuePair {
     attrib_id attributeID = 0;
     int32u attributeValue = 1;
@@ -209,7 +209,7 @@ server cluster Scenes = 5 {
   }
 
   request struct CopySceneRequest {
-    ScenesCopyMode mode = 0;
+    CopyModeBitmap mode = 0;
     group_id groupIdentifierFrom = 1;
     INT8U sceneIdentifierFrom = 2;
     group_id groupIdentifierTo = 3;

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
@@ -118,6 +118,10 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 server cluster Scenes = 5 {
+  bitmap CopyModeBitmap : BITMAP8 {
+    kCopyAllScenes = 0x1;
+  }
+
   bitmap Feature : BITMAP32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
@@ -129,10 +133,6 @@ server cluster Scenes = 5 {
     kSceneNames = 0x80;
   }
 
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
-  }
-
   struct AttributeValuePair {
     attrib_id attributeID = 0;
     int32u attributeValue = 1;

diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
@@ -118,6 +118,10 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 server cluster Scenes = 5 {
+  bitmap CopyModeBitmap : BITMAP8 {
+    kCopyAllScenes = 0x1;
+  }
+
   bitmap Feature : BITMAP32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
@@ -129,10 +133,6 @@ server cluster Scenes = 5 {
     kSceneNames = 0x80;
   }
 
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
-  }
-
   struct AttributeValuePair {
     attrib_id attributeID = 0;
     int32u attributeValue = 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
@@ -166,6 +166,10 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 client cluster Scenes = 5 {
+  bitmap CopyModeBitmap : BITMAP8 {
+    kCopyAllScenes = 0x1;
+  }
+
   bitmap Feature : BITMAP32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
@@ -177,10 +181,6 @@ client cluster Scenes = 5 {
     kSceneNames = 0x80;
   }
 
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
-  }
-
   struct AttributeValuePair {
     attrib_id attributeID = 0;
     int32u attributeValue = 1;
@@ -311,7 +311,7 @@ client cluster Scenes = 5 {
   }
 
   request struct CopySceneRequest {
-    ScenesCopyMode mode = 0;
+    CopyModeBitmap mode = 0;
     group_id groupIdentifierFrom = 1;
     INT8U sceneIdentifierFrom = 2;
     group_id groupIdentifierTo = 3;

diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -118,6 +118,10 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 server cluster Scenes = 5 {
+  bitmap CopyModeBitmap : BITMAP8 {
+    kCopyAllScenes = 0x1;
+  }
+
   bitmap Feature : BITMAP32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
@@ -129,10 +133,6 @@ server cluster Scenes = 5 {
     kSceneNames = 0x80;
   }
 
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
-  }
-
   struct AttributeValuePair {
     attrib_id attributeID = 0;
     int32u attributeValue = 1;
@@ -209,7 +209,7 @@ server cluster Scenes = 5 {
   }
 
   request struct CopySceneRequest {
-    ScenesCopyMode mode = 0;
+    CopyModeBitmap mode = 0;
     group_id groupIdentifierFrom = 1;
     INT8U sceneIdentifierFrom = 2;
     group_id groupIdentifierTo = 3;

diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
@@ -118,6 +118,10 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 server cluster Scenes = 5 {
+  bitmap CopyModeBitmap : BITMAP8 {
+    kCopyAllScenes = 0x1;
+  }
+
   bitmap Feature : BITMAP32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
@@ -129,10 +133,6 @@ server cluster Scenes = 5 {
     kSceneNames = 0x80;
   }
 
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
-  }
-
   struct AttributeValuePair {
     attrib_id attributeID = 0;
     int32u attributeValue = 1;
@@ -209,7 +209,7 @@ server cluster Scenes = 5 {
   }
 
   request struct CopySceneRequest {
-    ScenesCopyMode mode = 0;
+    CopyModeBitmap mode = 0;
     group_id groupIdentifierFrom = 1;
     INT8U sceneIdentifierFrom = 2;
     group_id groupIdentifierTo = 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
@@ -118,6 +118,10 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 server cluster Scenes = 5 {
+  bitmap CopyModeBitmap : BITMAP8 {
+    kCopyAllScenes = 0x1;
+  }
+
   bitmap Feature : BITMAP32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
@@ -129,10 +133,6 @@ server cluster Scenes = 5 {
     kSceneNames = 0x80;
   }
 
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
-  }
-
   struct AttributeValuePair {
     attrib_id attributeID = 0;
     int32u attributeValue = 1;
@@ -209,7 +209,7 @@ server cluster Scenes = 5 {
   }
 
   request struct CopySceneRequest {
-    ScenesCopyMode mode = 0;
+    CopyModeBitmap mode = 0;
     group_id groupIdentifierFrom = 1;
     INT8U sceneIdentifierFrom = 2;
     group_id groupIdentifierTo = 3;

diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
@@ -166,6 +166,10 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 server cluster Scenes = 5 {
+  bitmap CopyModeBitmap : BITMAP8 {
+    kCopyAllScenes = 0x1;
+  }
+
   bitmap Feature : BITMAP32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
@@ -177,10 +181,6 @@ server cluster Scenes = 5 {
     kSceneNames = 0x80;
   }
 
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
-  }
-
   struct AttributeValuePair {
     attrib_id attributeID = 0;
     int32u attributeValue = 1;

diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
@@ -166,6 +166,10 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 server cluster Scenes = 5 {
+  bitmap CopyModeBitmap : BITMAP8 {
+    kCopyAllScenes = 0x1;
+  }
+
   bitmap Feature : BITMAP32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
@@ -177,10 +181,6 @@ server cluster Scenes = 5 {
     kSceneNames = 0x80;
   }
 
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
-  }
-
   struct AttributeValuePair {
     attrib_id attributeID = 0;
     int32u attributeValue = 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
@@ -118,6 +118,10 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 server cluster Scenes = 5 {
+  bitmap CopyModeBitmap : BITMAP8 {
+    kCopyAllScenes = 0x1;
+  }
+
   bitmap Feature : BITMAP32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
@@ -129,10 +133,6 @@ server cluster Scenes = 5 {
     kSceneNames = 0x80;
   }
 
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
-  }
-
   struct AttributeValuePair {
     attrib_id attributeID = 0;
     int32u attributeValue = 1;

diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
@@ -3058,9 +3058,9 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 // Array of device types
 #define FIXED_DEVICE_TYPES                                                                                                         \
     {                                                                                                                              \
-        { 0x0011, 1 }, { 0x0016, 1 }, { 0x0100, 1 }, { 0x0011, 1 }, { 0x0100, 1 }, { 0x0011, 1 },                                  \
+        { 0x00000011, 1 }, { 0x00000016, 1 }, { 0x00000100, 1 }, { 0x00000011, 1 }, { 0x00000100, 1 }, { 0x00000011, 1 },          \
         {                                                                                                                          \
-            0xF002, 1                                                                                                              \
+            0x0000F002, 1                                                                                                          \
         }                                                                                                                          \
     }
 

diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h
@@ -1186,9 +1186,9 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 // Array of device types
 #define FIXED_DEVICE_TYPES                                                                                                         \
     {                                                                                                                              \
-        { 0x0016, 1 },                                                                                                             \
+        { 0x00000016, 1 },                                                                                                         \
         {                                                                                                                          \
-            0x0101, 1                                                                                                              \
+            0x00000101, 1                                                                                                          \
         }                                                                                                                          \
     }
 

diff --git a/src/app/clusters/scenes-server/scenes-server.cpp b/src/app/clusters/scenes-server/scenes-server.cpp
@@ -120,7 +120,10 @@ CHIP_ERROR ScenesServer::Init()
         if (EMBER_ZCL_STATUS_SUCCESS == status)
         {
             // According to spec, bit 7 MUST match feature bit 0 (SceneNames)
-            status = Attributes::NameSupport::Set(endpoint, NameSupportBitmap::kSceneNames);
+            BitMask<NameSupportBitmap> nameSupport = (featureMap & to_underlying(Feature::kSceneNames))
+                ? BitMask<NameSupportBitmap>(NameSupportBitmap::kSceneNames)
+                : BitMask<NameSupportBitmap>();
+            status                                 = Attributes::NameSupport::Set(endpoint, nameSupport);
             if (EMBER_ZCL_STATUS_SUCCESS != status)
             {
                 ChipLogDetail(Zcl, "ERR: setting NameSupport on Endpoint %hu Status: %x", endpoint, status);
@@ -846,7 +849,7 @@ void ScenesServer::HandleCopyScene(HandlerContext & ctx, const Commands::CopySce
                                        sceneTable->GetRemainingCapacity(ctx.mCommandHandler.GetAccessingFabricIndex(), capacity)));
 
     // Checks if we copy a single scene or all of them
-    if (req.mode.GetField(app::Clusters::Scenes::ScenesCopyMode::kCopyAllScenes))
+    if (req.mode.GetField(app::Clusters::Scenes::CopyModeBitmap::kCopyAllScenes))
     {
         // Scene Table interface data
         SceneId scenesInGroup[scenes::kMaxScenesPerFabric];

diff --git a/src/app/zap-templates/zcl/data-model/chip/scene.xml b/src/app/zap-templates/zcl/data-model/chip/scene.xml
@@ -20,7 +20,7 @@ limitations under the License.
       <field name="SceneNames" mask="0x80"/>
   </bitmap>
 
-  <bitmap name="ScenesCopyMode" type="BITMAP8">
+  <bitmap name="CopyModeBitmap" type="BITMAP8">
     <cluster code="0x0005"/>
     <field name="CopyAllScenes" mask="0x01"/>
   </bitmap>
@@ -139,7 +139,7 @@ limitations under the License.
       <description>
         Allows a client to efficiently copy scenes from one group/scene identifier pair to another group/scene identifier pair.
       </description>
-      <arg name="Mode" type="ScenesCopyMode"/>
+      <arg name="Mode" type="CopyModeBitmap"/>
       <arg name="GroupIdentifierFrom" type="group_id"/>
       <arg name="SceneIdentifierFrom" type="INT8U"/>
       <arg name="GroupIdentifierTo" type="group_id"/>

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -126,6 +126,10 @@ client cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 client cluster Scenes = 5 {
+  bitmap CopyModeBitmap : BITMAP8 {
+    kCopyAllScenes = 0x1;
+  }
+
   bitmap Feature : BITMAP32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
@@ -137,10 +141,6 @@ client cluster Scenes = 5 {
     kSceneNames = 0x80;
   }
 
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
-  }
-
   struct AttributeValuePair {
     attrib_id attributeID = 0;
     int32u attributeValue = 1;
@@ -271,7 +271,7 @@ client cluster Scenes = 5 {
   }
 
   request struct CopySceneRequest {
-    ScenesCopyMode mode = 0;
+    CopyModeBitmap mode = 0;
     group_id groupIdentifierFrom = 1;
     INT8U sceneIdentifierFrom = 2;
     group_id groupIdentifierTo = 3;

diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py