Deprecating chip_cluster_specific_structs and chip_shared_structs wit…

…h zcl_structs (#26016) Github: ZAP#682
project-chip · Aug 9, 2023 · 1317778 · 1317778
1 parent db5bf85
commit 1317778
Show file tree

Hide file tree

Showing 51 changed files with 2,633 additions and 1,718 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
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
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -1,6 +1,16 @@
 // This IDL was generated automatically by ZAP.
 // It is for view/code review purposes only.
 
+struct ApplicationStruct {
+ int16u catalogVendorID = 0;
+ char_string applicationID = 1;
+}
+
+struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+}
+
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
  enum IdentifyEffectIdentifier : ENUM8 {
@@ -335,6 +345,12 @@ server cluster AccessControl = 31 {
  kRemoved = 2;
  }
 
+ struct Target {
+ nullable cluster_id cluster = 0;
+ nullable endpoint_no endpoint = 1;
+ nullable devtype_id deviceType = 2;
+ }
+
  fabric_scoped struct AccessControlEntryStruct {
  fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
  fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
@@ -343,12 +359,6 @@ server cluster AccessControl = 31 {
  fabric_idx fabricIndex = 254;
  }
 
- struct Target {
- nullable cluster_id cluster = 0;
- nullable endpoint_no endpoint = 1;
- nullable devtype_id deviceType = 2;
- }
-
  fabric_scoped struct AccessControlExtensionStruct {
  fabric_sensitive octet_string<128> data = 1;
  fabric_idx fabricIndex = 254;
@@ -711,15 +721,6 @@ server cluster NetworkCommissioning = 49 {
  boolean connected = 1;
  }
 
- struct WiFiInterfaceScanResult {
- WiFiSecurity security = 0;
- octet_string<32> ssid = 1;
- octet_string<6> bssid = 2;
- int16u channel = 3;
- WiFiBand wiFiBand = 4;
- int8s rssi = 5;
- }
-
  struct ThreadInterfaceScanResult {
  int16u panId = 0;
  int64u extendedPanId = 1;
@@ -731,6 +732,15 @@ server cluster NetworkCommissioning = 49 {
  int8u lqi = 7;
  }
 
+ struct WiFiInterfaceScanResult {
+ WiFiSecurity security = 0;
+ octet_string<32> ssid = 1;
+ octet_string<6> bssid = 2;
+ int16u channel = 3;
+ WiFiBand wiFiBand = 4;
+ int8s rssi = 5;
+ }
+
  readonly attribute access(read: administer) int8u maxNetworks = 0;
  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
  readonly attribute int8u scanMaxTimeSeconds = 2;
@@ -1027,6 +1037,21 @@ server cluster ThreadNetworkDiagnostics = 53 {
  boolean isChild = 13;
  }
 
+ struct OperationalDatasetComponents {
+ boolean activeTimestampPresent = 0;
+ boolean pendingTimestampPresent = 1;
+ boolean masterKeyPresent = 2;
+ boolean networkNamePresent = 3;
+ boolean extendedPanIdPresent = 4;
+ boolean meshLocalPrefixPresent = 5;
+ boolean delayPresent = 6;
+ boolean panIdPresent = 7;
+ boolean channelPresent = 8;
+ boolean pskcPresent = 9;
+ boolean securityPolicyPresent = 10;
+ boolean channelMaskPresent = 11;
+ }
+
  struct RouteTable {
  int64u extAddress = 0;
  int16u rloc16 = 1;
@@ -1045,21 +1070,6 @@ server cluster ThreadNetworkDiagnostics = 53 {
  int16u flags = 1;
  }
 
- struct OperationalDatasetComponents {
- boolean activeTimestampPresent = 0;
- boolean pendingTimestampPresent = 1;
- boolean masterKeyPresent = 2;
- boolean networkNamePresent = 3;
- boolean extendedPanIdPresent = 4;
- boolean meshLocalPrefixPresent = 5;
- boolean delayPresent = 6;
- boolean panIdPresent = 7;
- boolean channelPresent = 8;
- boolean pskcPresent = 9;
- boolean securityPolicyPresent = 10;
- boolean channelMaskPresent = 11;
- }
-
  info event ConnectionStatus = 0 {
  ConnectionStatusEnum connectionStatus = 0;
  }
@@ -1364,12 +1374,6 @@ server cluster OperationalCredentials = 62 {
  kInvalidFabricIndex = 11;
  }
 
- fabric_scoped struct NOCStruct {
- fabric_sensitive octet_string noc = 1;
- nullable fabric_sensitive octet_string icac = 2;
- fabric_idx fabricIndex = 254;
- }
-
  fabric_scoped struct FabricDescriptorStruct {
  octet_string<65> rootPublicKey = 1;
  vendor_id vendorID = 2;
@@ -1379,6 +1383,12 @@ server cluster OperationalCredentials = 62 {
  fabric_idx fabricIndex = 254;
  }
 
+ fabric_scoped struct NOCStruct {
+ fabric_sensitive octet_string noc = 1;
+ nullable fabric_sensitive octet_string icac = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
  readonly attribute FabricDescriptorStruct fabrics[] = 1;
  readonly attribute int8u supportedFabrics = 2;
@@ -1467,16 +1477,16 @@ server cluster GroupKeyManagement = 63 {
  kCacheAndSync = 1;
  }
 
- fabric_scoped struct GroupKeyMapStruct {
+ fabric_scoped struct GroupInfoMapStruct {
  group_id groupId = 1;
- int16u groupKeySetID = 2;
+ endpoint_no endpoints[] = 2;
+ optional char_string<16> groupName = 3;
  fabric_idx fabricIndex = 254;
  }
 
- fabric_scoped struct GroupInfoMapStruct {
+ fabric_scoped struct GroupKeyMapStruct {
  group_id groupId = 1;
- endpoint_no endpoints[] = 2;
- optional char_string<16> groupName = 3;
+ int16u groupKeySetID = 2;
  fabric_idx fabricIndex = 254;
  }
 

diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -1,6 +1,16 @@
 // This IDL was generated automatically by ZAP.
 // It is for view/code review purposes only.
 
+struct ApplicationStruct {
+ int16u catalogVendorID = 0;
+ char_string applicationID = 1;
+}
+
+struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+}
+
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
  enum IdentifyEffectIdentifier : ENUM8 {
@@ -318,6 +328,12 @@ server cluster AccessControl = 31 {
  kRemoved = 2;
  }
 
+ struct Target {
+ nullable cluster_id cluster = 0;
+ nullable endpoint_no endpoint = 1;
+ nullable devtype_id deviceType = 2;
+ }
+
  fabric_scoped struct AccessControlEntryStruct {
  fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
  fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
@@ -326,12 +342,6 @@ server cluster AccessControl = 31 {
  fabric_idx fabricIndex = 254;
  }
 
- struct Target {
- nullable cluster_id cluster = 0;
- nullable endpoint_no endpoint = 1;
- nullable devtype_id deviceType = 2;
- }
-
  fabric_scoped struct AccessControlExtensionStruct {
  fabric_sensitive octet_string<128> data = 1;
  fabric_idx fabricIndex = 254;
@@ -367,6 +377,11 @@ server cluster AccessControl = 31 {
  Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
  which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
+ struct CapabilityMinimaStruct {
+ int16u caseSessionsPerFabric = 0;
+ int16u subscriptionsPerFabric = 1;
+ }
+
  critical event StartUp = 0 {
  INT32U softwareVersion = 0;
  }
@@ -895,6 +910,21 @@ server cluster ThreadNetworkDiagnostics = 53 {
  boolean isChild = 13;
  }
 
+ struct OperationalDatasetComponents {
+ boolean activeTimestampPresent = 0;
+ boolean pendingTimestampPresent = 1;
+ boolean masterKeyPresent = 2;
+ boolean networkNamePresent = 3;
+ boolean extendedPanIdPresent = 4;
+ boolean meshLocalPrefixPresent = 5;
+ boolean delayPresent = 6;
+ boolean panIdPresent = 7;
+ boolean channelPresent = 8;
+ boolean pskcPresent = 9;
+ boolean securityPolicyPresent = 10;
+ boolean channelMaskPresent = 11;
+ }
+
  struct RouteTable {
  int64u extAddress = 0;
  int16u rloc16 = 1;
@@ -913,21 +943,6 @@ server cluster ThreadNetworkDiagnostics = 53 {
  int16u flags = 1;
  }
 
- struct OperationalDatasetComponents {
- boolean activeTimestampPresent = 0;
- boolean pendingTimestampPresent = 1;
- boolean masterKeyPresent = 2;
- boolean networkNamePresent = 3;
- boolean extendedPanIdPresent = 4;
- boolean meshLocalPrefixPresent = 5;
- boolean delayPresent = 6;
- boolean panIdPresent = 7;
- boolean channelPresent = 8;
- boolean pskcPresent = 9;
- boolean securityPolicyPresent = 10;
- boolean channelMaskPresent = 11;
- }
-
  info event ConnectionStatus = 0 {
  ConnectionStatusEnum connectionStatus = 0;
  }
@@ -1233,12 +1248,6 @@ server cluster OperationalCredentials = 62 {
  kInvalidFabricIndex = 11;
  }
 
- fabric_scoped struct NOCStruct {
- fabric_sensitive octet_string noc = 1;
- nullable fabric_sensitive octet_string icac = 2;
- fabric_idx fabricIndex = 254;
- }
-
  fabric_scoped struct FabricDescriptorStruct {
  octet_string<65> rootPublicKey = 1;
  vendor_id vendorID = 2;
@@ -1248,6 +1257,12 @@ server cluster OperationalCredentials = 62 {
  fabric_idx fabricIndex = 254;
  }
 
+ fabric_scoped struct NOCStruct {
+ fabric_sensitive octet_string noc = 1;
+ nullable fabric_sensitive octet_string icac = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
  readonly attribute FabricDescriptorStruct fabrics[] = 1;
  readonly attribute int8u supportedFabrics = 2;
@@ -1336,16 +1351,16 @@ server cluster GroupKeyManagement = 63 {
  kCacheAndSync = 1;
  }
 
- fabric_scoped struct GroupKeyMapStruct {
+ fabric_scoped struct GroupInfoMapStruct {
  group_id groupId = 1;
- int16u groupKeySetID = 2;
+ endpoint_no endpoints[] = 2;
+ optional char_string<16> groupName = 3;
  fabric_idx fabricIndex = 254;
  }
 
- fabric_scoped struct GroupInfoMapStruct {
+ fabric_scoped struct GroupKeyMapStruct {
  group_id groupId = 1;
- endpoint_no endpoints[] = 2;
- optional char_string<16> groupName = 3;
+ int16u groupKeySetID = 2;
  fabric_idx fabricIndex = 254;
  }