samples: matter: Fix manufacturer-specific sample clusters

Fixed wrong configuration in clusters:
- removed client Basic Information cluster.
- removed client NordicDevKit cluster.

Signed-off-by: Arkadiusz Balys <[email protected]>
(cherry picked from commit af14898)

Author: ArekBalysNordic

samples/matter/manufacturer_specific/src/default_zap/NordicDevKitCluster.xml

@@ -41,7 +41,7 @@
     <class>Simple</class>
     <scope>Endpoint</scope>
     <clusters lockOthers="true">
-      <include cluster="NordicDevKit" client="true" server="true" clientLocked="false" serverLocked="false"/>
+      <include cluster="NordicDevKit" client="false" server="true" clientLocked="false" serverLocked="false"/>
     </clusters>
   </deviceType>
 </configurator>

samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.zap

@@ -425,24 +425,6 @@
             }
           ]
         },
-        {
-          "name": "Basic Information",
-          "code": 40,
-          "mfgCode": null,
-          "define": "BASIC_INFORMATION_CLUSTER",
-          "side": "client",
-          "enabled": 1,
-          "commands": [
-            {
-              "name": "GenerateRandom",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 0,
-              "isEnabled": 1
-            }
-          ]
-        },
         {
           "name": "Basic Information",
           "code": 40,
@@ -2679,24 +2661,6 @@
       "deviceTypeCode": 1,
       "deviceTypeProfileId": 4095,
       "clusters": [
-        {
-          "name": "NordicDevKit",
-          "code": 4294048769,
-          "mfgCode": null,
-          "define": "NORDIC_DEV_KIT_CLUSTER",
-          "side": "client",
-          "enabled": 1,
-          "commands": [
-            {
-              "name": "SetLED",
-              "code": 4293984256,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 0,
-              "isEnabled": 1
-            }
-          ]
-        },
         {
           "name": "NordicDevKit",
           "code": 4294048769,

samples/matter/manufacturer_specific/src/default_zap/zap-generated/endpoint_config.h

@@ -430,7 +430,7 @@
 // clang-format on
 
 // This is an array of EmberAfCluster structures.
-#define GENERATED_CLUSTER_COUNT 14
+#define GENERATED_CLUSTER_COUNT 12
 // clang-format off
 #define GENERATED_CLUSTERS { \
   { \
@@ -459,19 +459,6 @@
       .eventList = nullptr, \
       .eventCount = 0, \
     },\
-  { \
-      /* Endpoint: 0, Cluster: Basic Information (client) */ \
-      .clusterId = 0x00000028, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(13), \
-      .attributeCount = 0, \
-      .clusterSize = 0, \
-      .mask = ZAP_CLUSTER_MASK(CLIENT), \
-      .functions = NULL, \
-      .acceptedCommandList = nullptr, \
-      .generatedCommandList = nullptr, \
-      .eventList = nullptr, \
-      .eventCount = 0, \
-    },\
   { \
       /* Endpoint: 0, Cluster: Basic Information (server) */ \
       .clusterId = 0x00000028, \
@@ -589,19 +576,6 @@
       .eventList = nullptr, \
       .eventCount = 0, \
     },\
-  { \
-      /* Endpoint: 1, Cluster: NordicDevKit (client) */ \
-      .clusterId = 0xFFF1FC01, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(86), \
-      .attributeCount = 0, \
-      .clusterSize = 0, \
-      .mask = ZAP_CLUSTER_MASK(CLIENT), \
-      .functions = NULL, \
-      .acceptedCommandList = nullptr, \
-      .generatedCommandList = nullptr, \
-      .eventList = nullptr, \
-      .eventCount = 0, \
-    },\
   { \
       /* Endpoint: 1, Cluster: NordicDevKit (server) */ \
       .clusterId = 0xFFF1FC01, \
@@ -624,8 +598,8 @@
 // This is an array of EmberAfEndpointType structures.
 #define GENERATED_ENDPOINT_TYPES                                                                                       \
 	{                                                                                                              \
-		{ ZAP_CLUSTER_INDEX(0), 12, 86 },                                                                      \
-		{ ZAP_CLUSTER_INDEX(12), 2, 263 },                                                                     \
+		{ ZAP_CLUSTER_INDEX(0), 11, 86 },                                                                      \
+		{ ZAP_CLUSTER_INDEX(11), 1, 263 },                                                                     \
 	}
 
 // Largest attribute size is needed for various buffers
@@ -651,13 +625,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 #define FIXED_PROFILE_IDS { 0x0103, 0x0FFF }
 
 // Array of device types
-#define FIXED_DEVICE_TYPES                                                                                             \
-	{                                                                                                              \
-		{ 0x00000012, 1 }, { 0x00000016, 3 },                                                                  \
-		{                                                                                                      \
-			0x00000001, 1                                                                                  \
-		}                                                                                                      \
-	}
+#define FIXED_DEVICE_TYPES { { 0x00000012, 1 }, { 0x00000016, 3 }, { 0x00000001, 1 } }
 
 // Array of device type offsets
 #define FIXED_DEVICE_TYPE_OFFSETS { 0, 2 }

samples/matter/manufacturer_specific/src/default_zap/zap-generated/gen_config.h

@@ -23,7 +23,6 @@
 /**** Cluster endpoint counts ****/
 #define MATTER_DM_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define MATTER_DM_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define MATTER_DM_BASIC_INFORMATION_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define MATTER_DM_BASIC_INFORMATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define MATTER_DM_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define MATTER_DM_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
@@ -33,7 +32,6 @@
 #define MATTER_DM_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define MATTER_DM_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define MATTER_DM_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define MATTER_DM_NORDIC_DEV_KIT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define MATTER_DM_NORDIC_DEV_KIT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
@@ -48,10 +46,6 @@
 #define MATTER_DM_PLUGIN_ACCESS_CONTROL_SERVER
 #define MATTER_DM_PLUGIN_ACCESS_CONTROL
 
-// Use this macro to check if the client side of the Basic Information cluster is included
-#define ZCL_USING_BASIC_INFORMATION_CLUSTER_CLIENT
-#define MATTER_DM_PLUGIN_BASIC_INFORMATION_CLIENT
-
 // Use this macro to check if the server side of the Basic Information cluster is included
 #define ZCL_USING_BASIC_INFORMATION_CLUSTER_SERVER
 #define MATTER_DM_PLUGIN_BASIC_INFORMATION_SERVER
@@ -96,10 +90,6 @@
 #define MATTER_DM_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
 #define MATTER_DM_PLUGIN_GROUP_KEY_MANAGEMENT
 
-// Use this macro to check if the client side of the NordicDevKit cluster is included
-#define ZCL_USING_NORDIC_DEV_KIT_CLUSTER_CLIENT
-#define MATTER_DM_PLUGIN_NORDIC_DEV_KIT_CLIENT
-
 // Use this macro to check if the server side of the NordicDevKit cluster is included
 #define ZCL_USING_NORDIC_DEV_KIT_CLUSTER_SERVER
 #define MATTER_DM_PLUGIN_NORDIC_DEV_KIT_SERVER