Deprecating chip_cluster_specific_structs and chip_shared_structs with zcl_structs (#26016)
Github: ZAP#682
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 44a9d73..7d5c990 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
@@ -1,6 +1,11 @@
// 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;
@@ -127,16 +132,16 @@
kSceneNames = 0x1;
}
- struct ExtensionFieldSet {
- cluster_id clusterID = 0;
- AttributeValuePair attributeValueList[] = 1;
- }
-
struct AttributeValuePair {
optional attrib_id attributeID = 0;
int8u attributeValue[] = 1;
}
+ struct ExtensionFieldSet {
+ cluster_id clusterID = 0;
+ AttributeValuePair attributeValueList[] = 1;
+ }
+
readonly attribute int8u sceneCount = 0;
readonly attribute int8u currentScene = 1;
readonly attribute group_id currentGroup = 2;
@@ -560,6 +565,12 @@
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;
@@ -568,12 +579,6 @@
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;
@@ -1167,6 +1172,21 @@
kReplaceable = 0x8;
}
+ struct BatChargeFaultChangeType {
+ BatChargeFaultEnum current[] = 0;
+ BatChargeFaultEnum previous[] = 1;
+ }
+
+ struct BatFaultChangeType {
+ BatFaultEnum current[] = 0;
+ BatFaultEnum previous[] = 1;
+ }
+
+ struct WiredFaultChangeType {
+ WiredFaultEnum current[] = 0;
+ WiredFaultEnum previous[] = 1;
+ }
+
info event WiredFaultChange = 0 {
WiredFaultEnum current[] = 0;
WiredFaultEnum previous[] = 1;
@@ -1305,15 +1325,6 @@
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;
@@ -1325,6 +1336,15 @@
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;
@@ -1623,6 +1643,21 @@
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;
@@ -1641,21 +1676,6 @@
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;
}
@@ -1964,12 +1984,6 @@
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;
@@ -1979,6 +1993,12 @@
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;
@@ -2067,12 +2087,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -2080,6 +2094,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
@@ -2135,6 +2155,11 @@
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
labels. */
server cluster FixedLabel = 64 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -2146,6 +2171,11 @@
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
server cluster UserLabel = 65 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
attribute access(write: manage) LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -2176,17 +2206,17 @@
kDeponoff = 0x1;
}
+ struct SemanticTagStruct {
+ vendor_id mfgCode = 0;
+ enum16 value = 1;
+ }
+
struct ModeOptionStruct {
char_string<64> label = 0;
int8u mode = 1;
SemanticTagStruct semanticTags[] = 2;
}
- struct SemanticTagStruct {
- vendor_id mfgCode = 0;
- enum16 value = 1;
- }
-
readonly attribute char_string<32> description = 0;
readonly attribute nullable enum16 standardNamespace = 1;
readonly attribute ModeOptionStruct supportedModes[] = 2;
@@ -3670,6 +3700,13 @@
optional char_string affiliateCallSign = 4;
}
+ struct LineupInfoStruct {
+ char_string operatorName = 0;
+ optional char_string lineupName = 1;
+ optional char_string postalCode = 2;
+ LineupInfoTypeEnum lineupInfoType = 3;
+ }
+
readonly attribute ChannelInfoStruct channelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -3737,6 +3774,11 @@
kVariableSpeed = 0x2;
}
+ struct PlaybackPositionStruct {
+ epoch_us updatedAt = 0;
+ nullable int64u position = 1;
+ }
+
readonly attribute PlaybackStateEnum currentState = 0;
readonly attribute nullable epoch_us startTime = 1;
readonly attribute nullable int64u duration = 2;
@@ -3976,8 +4018,15 @@
kHls = 0x2;
}
- struct ContentSearchStruct {
- ParameterStruct parameterList[] = 0;
+ struct DimensionStruct {
+ double width = 0;
+ double height = 1;
+ MetricTypeEnum metric = 2;
+ }
+
+ struct AdditionalInfoStruct {
+ char_string name = 0;
+ char_string value = 1;
}
struct ParameterStruct {
@@ -3986,9 +4035,14 @@
optional AdditionalInfoStruct externalIDList[] = 2;
}
- struct AdditionalInfoStruct {
- char_string name = 0;
- char_string value = 1;
+ struct ContentSearchStruct {
+ ParameterStruct parameterList[] = 0;
+ }
+
+ struct StyleInformationStruct {
+ optional char_string imageURL = 0;
+ optional char_string color = 1;
+ optional DimensionStruct size = 2;
}
struct BrandingInformationStruct {
@@ -4000,18 +4054,6 @@
optional StyleInformationStruct waterMark = 5;
}
- struct StyleInformationStruct {
- optional char_string imageURL = 0;
- optional char_string color = 1;
- optional DimensionStruct size = 2;
- }
-
- struct DimensionStruct {
- double width = 0;
- double height = 1;
- MetricTypeEnum metric = 2;
- }
-
readonly attribute CHAR_STRING acceptHeader[] = 0;
attribute bitmap32 supportedStreamingProtocols = 1;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -4070,6 +4112,11 @@
char_string applicationID = 1;
}
+ struct ApplicationEPStruct {
+ ApplicationStruct application = 0;
+ optional endpoint_no endpoint = 1;
+ }
+
readonly attribute INT16U catalogList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -4088,6 +4135,11 @@
kActiveVisibleNotFocus = 3;
}
+ struct ApplicationStruct {
+ int16u catalogVendorID = 0;
+ char_string applicationID = 1;
+ }
+
readonly attribute char_string<32> vendorName = 0;
readonly attribute vendor_id vendorID = 1;
readonly attribute char_string<32> applicationName = 2;
@@ -4210,26 +4262,6 @@
kValueC = 0x4;
}
- struct TestListStructOctet {
- int64u member1 = 0;
- octet_string<32> member2 = 1;
- }
-
- struct NullablesAndOptionalsStruct {
- nullable int16u nullableInt = 0;
- optional int16u optionalInt = 1;
- optional nullable int16u nullableOptionalInt = 2;
- nullable char_string nullableString = 3;
- optional char_string optionalString = 4;
- optional nullable char_string nullableOptionalString = 5;
- nullable SimpleStruct nullableStruct = 6;
- optional SimpleStruct optionalStruct = 7;
- optional nullable SimpleStruct nullableOptionalStruct = 8;
- nullable SimpleEnum nullableList[] = 9;
- optional SimpleEnum optionalList[] = 10;
- optional nullable SimpleEnum nullableOptionalList[] = 11;
- }
-
struct SimpleStruct {
int8u a = 0;
boolean b = 1;
@@ -4252,6 +4284,21 @@
fabric_idx fabricIndex = 254;
}
+ struct NullablesAndOptionalsStruct {
+ nullable int16u nullableInt = 0;
+ optional int16u optionalInt = 1;
+ optional nullable int16u nullableOptionalInt = 2;
+ nullable char_string nullableString = 3;
+ optional char_string optionalString = 4;
+ optional nullable char_string nullableOptionalString = 5;
+ nullable SimpleStruct nullableStruct = 6;
+ optional SimpleStruct optionalStruct = 7;
+ optional nullable SimpleStruct nullableOptionalStruct = 8;
+ nullable SimpleEnum nullableList[] = 9;
+ optional SimpleEnum optionalList[] = 10;
+ optional nullable SimpleEnum nullableOptionalList[] = 11;
+ }
+
struct NestedStruct {
int8u a = 0;
boolean b = 1;
@@ -4268,6 +4315,15 @@
int8u g[] = 6;
}
+ struct DoubleNestedStructList {
+ NestedStructList a[] = 0;
+ }
+
+ struct TestListStructOctet {
+ int64u member1 = 0;
+ octet_string<32> member2 = 1;
+ }
+
info event TestEvent = 1 {
INT8U arg1 = 1;
SimpleEnum arg2 = 2;
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 686a046..059bdea 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
@@ -1,16 +1,16 @@
// This IDL was generated automatically by ZAP.
// It is for view/code review purposes only.
-struct LabelStruct {
- char_string<16> label = 0;
- char_string<16> value = 1;
-}
-
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 {
@@ -126,16 +126,16 @@
kSceneNames = 0x1;
}
- struct ExtensionFieldSet {
- cluster_id clusterID = 0;
- AttributeValuePair attributeValueList[] = 1;
- }
-
struct AttributeValuePair {
optional attrib_id attributeID = 0;
int8u attributeValue[] = 1;
}
+ struct ExtensionFieldSet {
+ cluster_id clusterID = 0;
+ AttributeValuePair attributeValueList[] = 1;
+ }
+
readonly attribute int8u sceneCount = 0;
readonly attribute int8u currentScene = 1;
readonly attribute group_id currentGroup = 2;
@@ -437,6 +437,12 @@
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;
@@ -445,10 +451,9 @@
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;
}
fabric_sensitive info event access(read: administer) AccessControlEntryChanged = 0 {
@@ -1026,6 +1031,21 @@
kReplaceable = 0x8;
}
+ struct BatChargeFaultChangeType {
+ BatChargeFaultEnum current[] = 0;
+ BatChargeFaultEnum previous[] = 1;
+ }
+
+ struct BatFaultChangeType {
+ BatFaultEnum current[] = 0;
+ BatFaultEnum previous[] = 1;
+ }
+
+ struct WiredFaultChangeType {
+ WiredFaultEnum current[] = 0;
+ WiredFaultEnum previous[] = 1;
+ }
+
info event WiredFaultChange = 0 {
WiredFaultEnum current[] = 0;
WiredFaultEnum previous[] = 1;
@@ -1161,15 +1181,6 @@
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;
@@ -1181,6 +1192,15 @@
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;
@@ -1397,6 +1417,14 @@
kWaterMarks = 0x1;
}
+ struct ThreadMetricsStruct {
+ int64u id = 0;
+ optional char_string<8> name = 1;
+ optional int32u stackFreeCurrent = 2;
+ optional int32u stackFreeMinimum = 3;
+ optional int32u stackSize = 4;
+ }
+
info event SoftwareFault = 0 {
INT64U id = 0;
optional CHAR_STRING name = 1;
@@ -1459,6 +1487,21 @@
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;
@@ -1477,21 +1520,6 @@
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;
}
@@ -1736,12 +1764,6 @@
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;
@@ -1751,6 +1773,12 @@
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;
@@ -1839,12 +1867,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1852,6 +1874,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
@@ -1907,6 +1935,11 @@
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
labels. */
server cluster FixedLabel = 64 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1918,6 +1951,11 @@
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
server cluster UserLabel = 65 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
attribute access(write: manage) LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1948,17 +1986,17 @@
kDeponoff = 0x1;
}
+ struct SemanticTagStruct {
+ vendor_id mfgCode = 0;
+ enum16 value = 1;
+ }
+
struct ModeOptionStruct {
char_string<64> label = 0;
int8u mode = 1;
SemanticTagStruct semanticTags[] = 2;
}
- struct SemanticTagStruct {
- vendor_id mfgCode = 0;
- enum16 value = 1;
- }
-
readonly attribute char_string<32> description = 0;
readonly attribute nullable enum16 standardNamespace = 1;
readonly attribute ModeOptionStruct supportedModes[] = 2;
@@ -2975,6 +3013,21 @@
kLineupInfo = 0x2;
}
+ struct ChannelInfoStruct {
+ int16u majorNumber = 0;
+ int16u minorNumber = 1;
+ optional char_string name = 2;
+ optional char_string callSign = 3;
+ optional char_string affiliateCallSign = 4;
+ }
+
+ struct LineupInfoStruct {
+ char_string operatorName = 0;
+ optional char_string lineupName = 1;
+ optional char_string postalCode = 2;
+ LineupInfoTypeEnum lineupInfoType = 3;
+ }
+
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
@@ -3052,6 +3105,11 @@
kVariableSpeed = 0x2;
}
+ struct PlaybackPositionStruct {
+ epoch_us updatedAt = 0;
+ nullable int64u position = 1;
+ }
+
readonly attribute PlaybackStateEnum currentState = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -3289,8 +3347,15 @@
kHls = 0x2;
}
- struct ContentSearchStruct {
- ParameterStruct parameterList[] = 0;
+ struct DimensionStruct {
+ double width = 0;
+ double height = 1;
+ MetricTypeEnum metric = 2;
+ }
+
+ struct AdditionalInfoStruct {
+ char_string name = 0;
+ char_string value = 1;
}
struct ParameterStruct {
@@ -3299,9 +3364,14 @@
optional AdditionalInfoStruct externalIDList[] = 2;
}
- struct AdditionalInfoStruct {
- char_string name = 0;
- char_string value = 1;
+ struct ContentSearchStruct {
+ ParameterStruct parameterList[] = 0;
+ }
+
+ struct StyleInformationStruct {
+ optional char_string imageURL = 0;
+ optional char_string color = 1;
+ optional DimensionStruct size = 2;
}
struct BrandingInformationStruct {
@@ -3313,18 +3383,6 @@
optional StyleInformationStruct waterMark = 5;
}
- struct StyleInformationStruct {
- optional char_string imageURL = 0;
- optional char_string color = 1;
- optional DimensionStruct size = 2;
- }
-
- struct DimensionStruct {
- double width = 0;
- double height = 1;
- MetricTypeEnum metric = 2;
- }
-
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
@@ -3382,6 +3440,16 @@
kApplicationPlatform = 0x1;
}
+ struct ApplicationStruct {
+ int16u catalogVendorID = 0;
+ char_string applicationID = 1;
+ }
+
+ struct ApplicationEPStruct {
+ ApplicationStruct application = 0;
+ optional endpoint_no endpoint = 1;
+ }
+
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
@@ -3421,6 +3489,11 @@
kActiveVisibleNotFocus = 3;
}
+ struct ApplicationStruct {
+ int16u catalogVendorID = 0;
+ char_string applicationID = 1;
+ }
+
readonly attribute char_string<32> applicationName = 2;
readonly attribute ApplicationStruct application = 4;
readonly attribute ApplicationStatusEnum status = 5;
@@ -3504,26 +3577,6 @@
kValueC = 0x4;
}
- struct TestListStructOctet {
- int64u member1 = 0;
- octet_string<32> member2 = 1;
- }
-
- struct NullablesAndOptionalsStruct {
- nullable int16u nullableInt = 0;
- optional int16u optionalInt = 1;
- optional nullable int16u nullableOptionalInt = 2;
- nullable char_string nullableString = 3;
- optional char_string optionalString = 4;
- optional nullable char_string nullableOptionalString = 5;
- nullable SimpleStruct nullableStruct = 6;
- optional SimpleStruct optionalStruct = 7;
- optional nullable SimpleStruct nullableOptionalStruct = 8;
- nullable SimpleEnum nullableList[] = 9;
- optional SimpleEnum optionalList[] = 10;
- optional nullable SimpleEnum nullableOptionalList[] = 11;
- }
-
struct SimpleStruct {
int8u a = 0;
boolean b = 1;
@@ -3546,6 +3599,21 @@
fabric_idx fabricIndex = 254;
}
+ struct NullablesAndOptionalsStruct {
+ nullable int16u nullableInt = 0;
+ optional int16u optionalInt = 1;
+ optional nullable int16u nullableOptionalInt = 2;
+ nullable char_string nullableString = 3;
+ optional char_string optionalString = 4;
+ optional nullable char_string nullableOptionalString = 5;
+ nullable SimpleStruct nullableStruct = 6;
+ optional SimpleStruct optionalStruct = 7;
+ optional nullable SimpleStruct nullableOptionalStruct = 8;
+ nullable SimpleEnum nullableList[] = 9;
+ optional SimpleEnum optionalList[] = 10;
+ optional nullable SimpleEnum nullableOptionalList[] = 11;
+ }
+
struct NestedStruct {
int8u a = 0;
boolean b = 1;
@@ -3562,6 +3630,15 @@
int8u g[] = 6;
}
+ struct DoubleNestedStructList {
+ NestedStructList a[] = 0;
+ }
+
+ struct TestListStructOctet {
+ int64u member1 = 0;
+ octet_string<32> member2 = 1;
+ }
+
info event TestEvent = 1 {
INT8U arg1 = 1;
SimpleEnum arg2 = 2;
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
index c5f6f77..daba86d 100644
--- 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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,12 +1477,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1480,6 +1484,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
index 5305230..0123dcc 100644
--- 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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,12 +1351,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1349,6 +1358,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
index 4341051..91b0651 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.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 {
@@ -317,6 +327,12 @@
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;
@@ -325,12 +341,6 @@
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;
@@ -675,15 +685,6 @@
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;
@@ -695,6 +696,15 @@
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;
@@ -1006,12 +1016,6 @@
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;
@@ -1021,6 +1025,12 @@
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;
@@ -1109,12 +1119,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1122,6 +1126,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
index 8f8fd02..498da44 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.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 {
@@ -169,6 +179,12 @@
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;
@@ -177,12 +193,6 @@
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;
@@ -218,6 +228,11 @@
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;
}
@@ -567,15 +582,6 @@
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;
@@ -587,6 +593,15 @@
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;
@@ -948,12 +963,6 @@
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;
@@ -963,6 +972,12 @@
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;
@@ -1051,12 +1066,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1064,6 +1073,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
index 73d480c..d55d5d4 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/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 @@
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 @@
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 @@
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;
}
@@ -716,15 +731,6 @@
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;
@@ -736,6 +742,15 @@
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;
@@ -1097,12 +1112,6 @@
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;
@@ -1112,6 +1121,12 @@
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;
@@ -1200,12 +1215,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1213,6 +1222,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
index 73050c9..22dcc0b 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.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 {
@@ -169,6 +179,12 @@
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;
@@ -177,12 +193,6 @@
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;
@@ -218,6 +228,11 @@
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;
}
@@ -567,15 +582,6 @@
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;
@@ -587,6 +593,15 @@
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;
@@ -948,12 +963,6 @@
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;
@@ -963,6 +972,12 @@
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;
@@ -1051,12 +1066,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1064,6 +1073,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
index 83595c1..f2032ab 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.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 @@
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 @@
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 @@
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;
}
@@ -716,15 +731,6 @@
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;
@@ -736,6 +742,15 @@
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;
@@ -1097,12 +1112,6 @@
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;
@@ -1112,6 +1121,12 @@
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;
@@ -1200,12 +1215,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1213,6 +1222,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
index 7bdc745..4368aa7 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.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 {
@@ -156,6 +166,12 @@
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;
@@ -164,12 +180,6 @@
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;
@@ -565,15 +575,6 @@
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;
@@ -585,6 +586,15 @@
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;
@@ -948,12 +958,6 @@
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;
@@ -963,6 +967,12 @@
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;
@@ -1051,12 +1061,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1064,6 +1068,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
index 5cde9f8..2475835 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.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 {
@@ -240,6 +250,12 @@
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;
@@ -248,12 +264,6 @@
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;
@@ -289,6 +299,11 @@
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;
}
@@ -638,15 +653,6 @@
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;
@@ -658,6 +664,15 @@
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;
@@ -1019,12 +1034,6 @@
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;
@@ -1034,6 +1043,12 @@
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;
@@ -1122,12 +1137,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1135,6 +1144,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
index 4a768a2..e1fc1b0 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.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 {
@@ -311,6 +321,12 @@
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;
@@ -319,12 +335,6 @@
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;
@@ -360,6 +370,11 @@
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;
}
@@ -709,15 +724,6 @@
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;
@@ -729,6 +735,15 @@
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;
@@ -1090,12 +1105,6 @@
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;
@@ -1105,6 +1114,12 @@
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;
@@ -1193,12 +1208,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1206,6 +1215,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
index 7d6c35a..df55798 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.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 {
@@ -240,6 +250,12 @@
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;
@@ -248,12 +264,6 @@
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;
@@ -289,6 +299,11 @@
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;
}
@@ -638,15 +653,6 @@
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;
@@ -658,6 +664,15 @@
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;
@@ -1019,12 +1034,6 @@
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;
@@ -1034,6 +1043,12 @@
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;
@@ -1122,12 +1137,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1135,6 +1144,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
index 6f82766..e60751a 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.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 {
@@ -240,6 +250,12 @@
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;
@@ -248,12 +264,6 @@
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;
@@ -289,6 +299,11 @@
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;
}
@@ -638,15 +653,6 @@
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;
@@ -658,6 +664,15 @@
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;
@@ -1019,12 +1034,6 @@
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;
@@ -1034,6 +1043,12 @@
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;
@@ -1122,12 +1137,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1135,6 +1144,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
index 9e0c273..3f67b78 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.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 {
@@ -240,6 +250,12 @@
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;
@@ -248,12 +264,6 @@
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;
@@ -289,6 +299,11 @@
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;
}
@@ -638,15 +653,6 @@
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;
@@ -658,6 +664,15 @@
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;
@@ -1019,12 +1034,6 @@
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;
@@ -1034,6 +1043,12 @@
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;
@@ -1122,12 +1137,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1135,6 +1144,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
index 7d4091d..877a4c6 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.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 @@
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 @@
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 @@
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;
}
@@ -716,15 +731,6 @@
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;
@@ -736,6 +742,15 @@
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;
@@ -1097,12 +1112,6 @@
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;
@@ -1112,6 +1121,12 @@
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;
@@ -1200,12 +1215,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1213,6 +1222,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
index f863037..5e4c588 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.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 {
@@ -281,6 +291,12 @@
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;
@@ -289,12 +305,6 @@
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;
@@ -330,6 +340,11 @@
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;
}
@@ -679,15 +694,6 @@
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;
@@ -699,6 +705,15 @@
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;
@@ -1060,12 +1075,6 @@
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;
@@ -1075,6 +1084,12 @@
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;
@@ -1163,12 +1178,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1176,6 +1185,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
index 5e1449e..0ebc72e 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.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 {
@@ -217,6 +227,12 @@
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;
@@ -225,12 +241,6 @@
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;
@@ -266,6 +276,11 @@
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;
}
@@ -615,15 +630,6 @@
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;
@@ -635,6 +641,15 @@
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;
@@ -996,12 +1011,6 @@
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;
@@ -1011,6 +1020,12 @@
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;
@@ -1099,12 +1114,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1112,6 +1121,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
index a7bb095..039cd18 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
@@ -1,6 +1,11 @@
// 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;
@@ -245,6 +250,12 @@
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;
@@ -253,12 +264,6 @@
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;
@@ -294,6 +299,11 @@
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;
}
@@ -643,15 +653,6 @@
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;
@@ -663,6 +664,15 @@
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;
@@ -1024,12 +1034,6 @@
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;
@@ -1039,6 +1043,12 @@
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;
@@ -1127,12 +1137,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1140,6 +1144,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
@@ -1195,6 +1205,11 @@
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
labels. */
server cluster FixedLabel = 64 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1206,6 +1221,11 @@
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
server cluster UserLabel = 65 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
attribute access(write: manage) LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
index cdb7c6e..4e9566c 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.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 {
@@ -312,6 +322,12 @@
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;
@@ -320,12 +336,6 @@
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;
@@ -361,6 +371,11 @@
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;
}
@@ -710,15 +725,6 @@
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;
@@ -730,6 +736,15 @@
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;
@@ -1091,12 +1106,6 @@
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;
@@ -1106,6 +1115,12 @@
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;
@@ -1194,12 +1209,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1207,6 +1216,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
index 61bc4f6..938c70b 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.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 {
@@ -240,6 +250,12 @@
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;
@@ -248,12 +264,6 @@
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;
@@ -289,6 +299,11 @@
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;
}
@@ -638,15 +653,6 @@
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;
@@ -658,6 +664,15 @@
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;
@@ -1019,12 +1034,6 @@
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;
@@ -1034,6 +1043,12 @@
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;
@@ -1122,12 +1137,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1135,6 +1144,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
index ed59c72..bd7919c 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.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 {
@@ -169,6 +179,12 @@
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;
@@ -177,12 +193,6 @@
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;
@@ -218,6 +228,11 @@
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;
}
@@ -567,15 +582,6 @@
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;
@@ -587,6 +593,15 @@
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;
@@ -948,12 +963,6 @@
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;
@@ -963,6 +972,12 @@
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;
@@ -1051,12 +1066,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1064,6 +1073,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
@@ -1193,6 +1208,12 @@
kAutoMode = 0x20;
}
+ struct ThermostatScheduleTransition {
+ int16u transitionTime = 0;
+ nullable int16s heatSetpoint = 1;
+ nullable int16s coolSetpoint = 2;
+ }
+
readonly attribute nullable int16s localTemperature = 0;
readonly attribute nullable int16s outdoorTemperature = 1;
readonly attribute bitmap8 occupancy = 2;
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
index b67a221..6ff8434 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.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 {
@@ -169,6 +179,12 @@
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;
@@ -177,12 +193,6 @@
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;
@@ -218,6 +228,11 @@
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;
}
@@ -567,15 +582,6 @@
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;
@@ -587,6 +593,15 @@
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;
@@ -948,12 +963,6 @@
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;
@@ -963,6 +972,12 @@
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;
@@ -1051,12 +1066,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1064,6 +1073,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
index 7305336..f2a6f82 100644
--- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
+++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
@@ -1,6 +1,11 @@
// 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;
@@ -161,6 +166,12 @@
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;
@@ -169,12 +180,6 @@
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;
@@ -570,15 +575,6 @@
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;
@@ -590,6 +586,15 @@
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;
@@ -888,6 +893,21 @@
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;
@@ -906,21 +926,6 @@
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;
}
@@ -1176,12 +1181,6 @@
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;
@@ -1191,6 +1190,12 @@
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;
@@ -1279,12 +1284,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1292,6 +1291,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
@@ -1347,6 +1352,11 @@
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
labels. */
server cluster FixedLabel = 64 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1358,6 +1368,11 @@
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
server cluster UserLabel = 65 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
attribute access(write: manage) LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter
index 6413f0f..d553e94 100644
--- a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter
+++ b/examples/dynamic-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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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,12 +1477,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1480,6 +1484,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 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
index 2a8f9ee..cba838c 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
@@ -1,6 +1,11 @@
// 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;
@@ -469,6 +474,12 @@
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;
@@ -477,12 +488,6 @@
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;
@@ -878,15 +883,6 @@
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;
@@ -898,6 +894,15 @@
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;
@@ -1196,6 +1201,21 @@
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;
@@ -1214,21 +1234,6 @@
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;
}
@@ -1536,12 +1541,6 @@
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;
@@ -1551,6 +1550,12 @@
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;
@@ -1639,12 +1644,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1652,6 +1651,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
@@ -1707,6 +1712,11 @@
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
labels. */
server cluster FixedLabel = 64 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1718,6 +1728,11 @@
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
server cluster UserLabel = 65 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
attribute access(write: manage) LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
index f8c8295..b900049 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
@@ -1,6 +1,11 @@
// 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;
@@ -331,6 +336,12 @@
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;
@@ -339,12 +350,6 @@
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;
@@ -740,15 +745,6 @@
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;
@@ -760,6 +756,15 @@
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;
@@ -1058,6 +1063,21 @@
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;
@@ -1076,21 +1096,6 @@
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;
}
@@ -1284,12 +1289,6 @@
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;
@@ -1299,6 +1298,12 @@
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;
@@ -1387,12 +1392,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1400,6 +1399,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
@@ -1455,6 +1460,11 @@
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
labels. */
server cluster FixedLabel = 64 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1466,6 +1476,11 @@
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
server cluster UserLabel = 65 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
attribute access(write: manage) LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
index d06449e..ae2f889 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
@@ -1,6 +1,11 @@
// 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;
@@ -331,6 +336,12 @@
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;
@@ -339,12 +350,6 @@
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;
@@ -740,15 +745,6 @@
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;
@@ -760,6 +756,15 @@
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;
@@ -1185,12 +1190,6 @@
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;
@@ -1200,6 +1199,12 @@
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;
@@ -1288,12 +1293,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1301,6 +1300,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
@@ -1356,6 +1361,11 @@
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
labels. */
server cluster FixedLabel = 64 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1367,6 +1377,11 @@
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
server cluster UserLabel = 65 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
attribute access(write: manage) LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index 2bd058a..1bf9cb4 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -1,6 +1,11 @@
// 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;
@@ -331,6 +336,12 @@
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;
@@ -339,12 +350,6 @@
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;
@@ -740,15 +745,6 @@
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;
@@ -760,6 +756,15 @@
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;
@@ -1058,6 +1063,21 @@
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;
@@ -1076,21 +1096,6 @@
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;
}
@@ -1398,12 +1403,6 @@
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;
@@ -1413,6 +1412,12 @@
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;
@@ -1501,12 +1506,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1514,6 +1513,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
@@ -1569,6 +1574,11 @@
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
labels. */
server cluster FixedLabel = 64 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1580,6 +1590,11 @@
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
server cluster UserLabel = 65 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
attribute access(write: manage) LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter
index c6cec03..1b6e340 100644
--- a/examples/lighting-app/nxp/zap/lighting-on-off.matter
+++ b/examples/lighting-app/nxp/zap/lighting-on-off.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 {
@@ -319,6 +329,12 @@
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;
@@ -327,10 +343,9 @@
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;
}
fabric_sensitive info event access(read: administer) AccessControlEntryChanged = 0 {
@@ -663,15 +678,6 @@
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;
@@ -683,6 +689,15 @@
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;
@@ -931,6 +946,21 @@
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;
@@ -949,21 +979,6 @@
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;
}
@@ -1099,12 +1114,6 @@
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;
@@ -1114,6 +1123,12 @@
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;
@@ -1202,12 +1217,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1215,6 +1224,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter
index 62adc8a..3b70d0b 100644
--- a/examples/lighting-app/qpg/zap/light.matter
+++ b/examples/lighting-app/qpg/zap/light.matter
@@ -1,6 +1,11 @@
// 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;
@@ -327,6 +332,12 @@
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;
@@ -335,10 +346,9 @@
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;
}
fabric_sensitive info event access(read: administer) AccessControlEntryChanged = 0 {
@@ -679,15 +689,6 @@
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;
@@ -699,6 +700,15 @@
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;
@@ -997,6 +1007,21 @@
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;
@@ -1015,21 +1040,6 @@
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;
}
@@ -1170,12 +1180,6 @@
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;
@@ -1185,6 +1189,12 @@
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;
@@ -1273,12 +1283,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1286,6 +1290,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
@@ -1341,6 +1351,11 @@
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
labels. */
server cluster FixedLabel = 64 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1352,6 +1367,11 @@
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
server cluster UserLabel = 65 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
attribute access(write: manage) LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/examples/lighting-app/silabs/SiWx917/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/SiWx917/data_model/lighting-wifi-app.matter
index 00276ee..17ae50f 100644
--- a/examples/lighting-app/silabs/SiWx917/data_model/lighting-wifi-app.matter
+++ b/examples/lighting-app/silabs/SiWx917/data_model/lighting-wifi-app.matter
@@ -1,6 +1,11 @@
// 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;
@@ -331,6 +336,12 @@
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;
@@ -339,12 +350,6 @@
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;
@@ -740,15 +745,6 @@
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;
@@ -760,6 +756,15 @@
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;
@@ -1144,12 +1149,6 @@
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;
@@ -1159,6 +1158,12 @@
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;
@@ -1247,12 +1252,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1260,6 +1259,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
@@ -1315,6 +1320,11 @@
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
labels. */
server cluster FixedLabel = 64 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1326,6 +1336,11 @@
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
server cluster UserLabel = 65 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
attribute access(write: manage) LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter
index 0123d35..fa3b3fd 100644
--- a/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter
+++ b/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter
@@ -1,6 +1,11 @@
// 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;
@@ -331,6 +336,12 @@
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;
@@ -339,12 +350,6 @@
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;
@@ -740,15 +745,6 @@
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;
@@ -760,6 +756,15 @@
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;
@@ -1058,6 +1063,21 @@
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;
@@ -1076,21 +1096,6 @@
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;
}
@@ -1234,12 +1239,6 @@
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;
@@ -1249,6 +1248,12 @@
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;
@@ -1337,12 +1342,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1350,6 +1349,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
@@ -1405,6 +1410,11 @@
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
labels. */
server cluster FixedLabel = 64 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1416,6 +1426,11 @@
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
server cluster UserLabel = 65 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
attribute access(write: manage) LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter
index 00276ee..17ae50f 100644
--- a/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter
+++ b/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter
@@ -1,6 +1,11 @@
// 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;
@@ -331,6 +336,12 @@
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;
@@ -339,12 +350,6 @@
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;
@@ -740,15 +745,6 @@
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;
@@ -760,6 +756,15 @@
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;
@@ -1144,12 +1149,6 @@
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;
@@ -1159,6 +1158,12 @@
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;
@@ -1247,12 +1252,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1260,6 +1259,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
@@ -1315,6 +1320,11 @@
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
labels. */
server cluster FixedLabel = 64 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1326,6 +1336,11 @@
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
server cluster UserLabel = 65 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
attribute access(write: manage) LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
index 39c1394..81abd19 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -1,6 +1,11 @@
// 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;
@@ -138,6 +143,12 @@
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;
@@ -146,12 +157,6 @@
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;
@@ -636,6 +641,21 @@
kReplaceable = 0x8;
}
+ struct BatChargeFaultChangeType {
+ BatChargeFaultEnum current[] = 0;
+ BatChargeFaultEnum previous[] = 1;
+ }
+
+ struct BatFaultChangeType {
+ BatFaultEnum current[] = 0;
+ BatFaultEnum previous[] = 1;
+ }
+
+ struct WiredFaultChangeType {
+ WiredFaultEnum current[] = 0;
+ WiredFaultEnum previous[] = 1;
+ }
+
info event WiredFaultChange = 0 {
WiredFaultEnum current[] = 0;
WiredFaultEnum previous[] = 1;
@@ -776,15 +796,6 @@
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;
@@ -796,6 +807,15 @@
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;
@@ -1094,6 +1114,21 @@
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;
@@ -1112,21 +1147,6 @@
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;
}
@@ -1382,12 +1402,6 @@
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;
@@ -1397,6 +1411,12 @@
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;
@@ -1485,12 +1505,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1498,6 +1512,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
@@ -1553,6 +1573,11 @@
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
labels. */
server cluster FixedLabel = 64 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1564,6 +1589,11 @@
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
server cluster UserLabel = 65 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
attribute access(write: manage) LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter
index 208c594..b09e5a2 100644
--- a/examples/lock-app/nxp/zap/lock-app.matter
+++ b/examples/lock-app/nxp/zap/lock-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 {
@@ -91,6 +101,12 @@
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;
@@ -99,10 +115,9 @@
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;
}
fabric_sensitive info event access(read: administer) AccessControlEntryChanged = 0 {
@@ -286,15 +301,6 @@
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;
@@ -306,6 +312,15 @@
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;
@@ -554,6 +569,21 @@
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;
@@ -572,21 +602,6 @@
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;
}
@@ -722,12 +737,6 @@
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;
@@ -737,6 +746,12 @@
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;
@@ -825,12 +840,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -838,6 +847,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter
index e5372de..2d46c41 100644
--- a/examples/lock-app/qpg/zap/lock.matter
+++ b/examples/lock-app/qpg/zap/lock.matter
@@ -1,6 +1,11 @@
// 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;
@@ -161,6 +166,12 @@
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;
@@ -169,10 +180,9 @@
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;
}
fabric_sensitive info event access(read: administer) AccessControlEntryChanged = 0 {
@@ -513,15 +523,6 @@
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;
@@ -533,6 +534,15 @@
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;
@@ -831,6 +841,21 @@
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;
@@ -849,21 +874,6 @@
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;
}
@@ -1004,12 +1014,6 @@
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;
@@ -1019,6 +1023,12 @@
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;
@@ -1107,12 +1117,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1120,6 +1124,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
@@ -1175,6 +1185,11 @@
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
labels. */
server cluster FixedLabel = 64 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1186,6 +1201,11 @@
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
server cluster UserLabel = 65 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
attribute access(write: manage) LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/examples/log-source-app/log-source-common/log-source-app.matter b/examples/log-source-app/log-source-common/log-source-app.matter
index b25eac6..2ba2b4b 100644
--- a/examples/log-source-app/log-source-common/log-source-app.matter
+++ b/examples/log-source-app/log-source-common/log-source-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;
+}
+
/** The Access Control Cluster exposes a data model view of a
Node's Access Control List (ACL), which codifies the rules used to manage
and enforce Access Control for the Node's endpoints and their associated
@@ -26,6 +36,12 @@
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;
@@ -34,12 +50,6 @@
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;
@@ -176,13 +186,9 @@
kWpa3Personal = 0x10;
}
- 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 NetworkInfo {
+ octet_string<32> networkID = 0;
+ boolean connected = 1;
}
struct ThreadInterfaceScanResult {
@@ -196,6 +202,15 @@
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 command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
@@ -380,6 +395,12 @@
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 FabricDescriptorStruct fabrics[] = 1;
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
index 3edbdc3..1482f14 100644
--- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
+++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
@@ -1,6 +1,11 @@
// 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;
@@ -123,6 +128,12 @@
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;
@@ -131,12 +142,6 @@
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;
@@ -454,15 +459,6 @@
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;
@@ -474,6 +470,15 @@
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;
@@ -714,12 +719,6 @@
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;
@@ -729,6 +728,12 @@
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;
@@ -817,12 +822,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -830,6 +829,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
@@ -885,6 +890,11 @@
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
labels. */
server cluster FixedLabel = 64 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -896,6 +906,11 @@
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
server cluster UserLabel = 65 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
attribute access(write: manage) LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
index 6f62540..b806568 100644
--- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
+++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
@@ -1,6 +1,11 @@
// 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;
@@ -223,6 +228,12 @@
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;
@@ -231,12 +242,6 @@
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;
@@ -632,15 +637,6 @@
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;
@@ -652,6 +648,15 @@
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;
@@ -892,12 +897,6 @@
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;
@@ -907,6 +906,12 @@
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;
@@ -995,12 +1000,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1008,6 +1007,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
@@ -1063,6 +1068,11 @@
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
labels. */
server cluster FixedLabel = 64 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1074,6 +1084,11 @@
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
server cluster UserLabel = 65 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
attribute access(write: manage) LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index 4c382a4..1ed428f 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -1,6 +1,11 @@
// 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;
@@ -127,16 +132,16 @@
kSceneNames = 0x1;
}
- struct ExtensionFieldSet {
- cluster_id clusterID = 0;
- AttributeValuePair attributeValueList[] = 1;
- }
-
struct AttributeValuePair {
optional attrib_id attributeID = 0;
int8u attributeValue[] = 1;
}
+ struct ExtensionFieldSet {
+ cluster_id clusterID = 0;
+ AttributeValuePair attributeValueList[] = 1;
+ }
+
readonly attribute int8u sceneCount = 0;
readonly attribute int8u currentScene = 1;
readonly attribute group_id currentGroup = 2;
@@ -507,6 +512,12 @@
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;
@@ -515,10 +526,9 @@
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;
}
fabric_sensitive info event access(read: administer) AccessControlEntryChanged = 0 {
@@ -998,6 +1008,21 @@
kReplaceable = 0x8;
}
+ struct BatChargeFaultChangeType {
+ BatChargeFaultEnum current[] = 0;
+ BatChargeFaultEnum previous[] = 1;
+ }
+
+ struct BatFaultChangeType {
+ BatFaultEnum current[] = 0;
+ BatFaultEnum previous[] = 1;
+ }
+
+ struct WiredFaultChangeType {
+ WiredFaultEnum current[] = 0;
+ WiredFaultEnum previous[] = 1;
+ }
+
info event WiredFaultChange = 0 {
WiredFaultEnum current[] = 0;
WiredFaultEnum previous[] = 1;
@@ -1228,15 +1253,6 @@
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;
@@ -1248,6 +1264,15 @@
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;
@@ -1873,6 +1898,12 @@
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 FabricDescriptorStruct fabrics[] = 1;
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
@@ -1973,6 +2004,11 @@
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
labels. */
server cluster FixedLabel = 64 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1984,6 +2020,11 @@
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
server cluster UserLabel = 65 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
attribute access(write: manage) LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -2052,17 +2093,17 @@
kDeponoff = 0x1;
}
+ struct SemanticTagStruct {
+ vendor_id mfgCode = 0;
+ enum16 value = 1;
+ }
+
struct ModeOptionStruct {
char_string<64> label = 0;
int8u mode = 1;
SemanticTagStruct semanticTags[] = 2;
}
- struct SemanticTagStruct {
- vendor_id mfgCode = 0;
- enum16 value = 1;
- }
-
readonly attribute char_string<32> description = 0;
readonly attribute nullable enum16 standardNamespace = 1;
readonly attribute ModeOptionStruct supportedModes[] = 2;
@@ -3185,8 +3226,15 @@
kHls = 0x2;
}
- struct ContentSearchStruct {
- ParameterStruct parameterList[] = 0;
+ struct DimensionStruct {
+ double width = 0;
+ double height = 1;
+ MetricTypeEnum metric = 2;
+ }
+
+ struct AdditionalInfoStruct {
+ char_string name = 0;
+ char_string value = 1;
}
struct ParameterStruct {
@@ -3195,9 +3243,14 @@
optional AdditionalInfoStruct externalIDList[] = 2;
}
- struct AdditionalInfoStruct {
- char_string name = 0;
- char_string value = 1;
+ struct ContentSearchStruct {
+ ParameterStruct parameterList[] = 0;
+ }
+
+ struct StyleInformationStruct {
+ optional char_string imageURL = 0;
+ optional char_string color = 1;
+ optional DimensionStruct size = 2;
}
struct BrandingInformationStruct {
@@ -3209,18 +3262,6 @@
optional StyleInformationStruct waterMark = 5;
}
- struct StyleInformationStruct {
- optional char_string imageURL = 0;
- optional char_string color = 1;
- optional DimensionStruct size = 2;
- }
-
- struct DimensionStruct {
- double width = 0;
- double height = 1;
- MetricTypeEnum metric = 2;
- }
-
readonly attribute CHAR_STRING acceptHeader[] = 0;
attribute bitmap32 supportedStreamingProtocols = 1;
readonly attribute command_id generatedCommandList[] = 65528;
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index 2aa3e24..cb86762 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -1,6 +1,11 @@
// 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;
@@ -127,16 +132,16 @@
kSceneNames = 0x1;
}
- struct ExtensionFieldSet {
- cluster_id clusterID = 0;
- AttributeValuePair attributeValueList[] = 1;
- }
-
struct AttributeValuePair {
optional attrib_id attributeID = 0;
int8u attributeValue[] = 1;
}
+ struct ExtensionFieldSet {
+ cluster_id clusterID = 0;
+ AttributeValuePair attributeValueList[] = 1;
+ }
+
readonly attribute int8u sceneCount = 0;
readonly attribute int8u currentScene = 1;
readonly attribute group_id currentGroup = 2;
@@ -507,6 +512,12 @@
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;
@@ -515,10 +526,9 @@
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;
}
fabric_sensitive info event access(read: administer) AccessControlEntryChanged = 0 {
@@ -959,6 +969,21 @@
kReplaceable = 0x8;
}
+ struct BatChargeFaultChangeType {
+ BatChargeFaultEnum current[] = 0;
+ BatChargeFaultEnum previous[] = 1;
+ }
+
+ struct BatFaultChangeType {
+ BatFaultEnum current[] = 0;
+ BatFaultEnum previous[] = 1;
+ }
+
+ struct WiredFaultChangeType {
+ WiredFaultEnum current[] = 0;
+ WiredFaultEnum previous[] = 1;
+ }
+
info event WiredFaultChange = 0 {
WiredFaultEnum current[] = 0;
WiredFaultEnum previous[] = 1;
@@ -1189,15 +1214,6 @@
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;
@@ -1209,6 +1225,15 @@
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;
@@ -1834,6 +1859,12 @@
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 FabricDescriptorStruct fabrics[] = 1;
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
@@ -1934,6 +1965,11 @@
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
labels. */
server cluster FixedLabel = 64 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1945,6 +1981,11 @@
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
server cluster UserLabel = 65 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
attribute access(write: manage) LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -2013,17 +2054,17 @@
kDeponoff = 0x1;
}
+ struct SemanticTagStruct {
+ vendor_id mfgCode = 0;
+ enum16 value = 1;
+ }
+
struct ModeOptionStruct {
char_string<64> label = 0;
int8u mode = 1;
SemanticTagStruct semanticTags[] = 2;
}
- struct SemanticTagStruct {
- vendor_id mfgCode = 0;
- enum16 value = 1;
- }
-
readonly attribute char_string<32> description = 0;
readonly attribute nullable enum16 standardNamespace = 1;
readonly attribute ModeOptionStruct supportedModes[] = 2;
@@ -3146,8 +3187,15 @@
kHls = 0x2;
}
- struct ContentSearchStruct {
- ParameterStruct parameterList[] = 0;
+ struct DimensionStruct {
+ double width = 0;
+ double height = 1;
+ MetricTypeEnum metric = 2;
+ }
+
+ struct AdditionalInfoStruct {
+ char_string name = 0;
+ char_string value = 1;
}
struct ParameterStruct {
@@ -3156,9 +3204,14 @@
optional AdditionalInfoStruct externalIDList[] = 2;
}
- struct AdditionalInfoStruct {
- char_string name = 0;
- char_string value = 1;
+ struct ContentSearchStruct {
+ ParameterStruct parameterList[] = 0;
+ }
+
+ struct StyleInformationStruct {
+ optional char_string imageURL = 0;
+ optional char_string color = 1;
+ optional DimensionStruct size = 2;
}
struct BrandingInformationStruct {
@@ -3170,18 +3223,6 @@
optional StyleInformationStruct waterMark = 5;
}
- struct StyleInformationStruct {
- optional char_string imageURL = 0;
- optional char_string color = 1;
- optional DimensionStruct size = 2;
- }
-
- struct DimensionStruct {
- double width = 0;
- double height = 1;
- MetricTypeEnum metric = 2;
- }
-
readonly attribute CHAR_STRING acceptHeader[] = 0;
attribute bitmap32 supportedStreamingProtocols = 1;
readonly attribute command_id generatedCommandList[] = 65528;
diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter
index e45f116..68f06b0 100644
--- a/examples/pump-app/pump-common/pump-app.matter
+++ b/examples/pump-app/pump-common/pump-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 {
@@ -247,6 +257,12 @@
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;
@@ -255,12 +271,6 @@
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;
@@ -602,15 +612,6 @@
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;
@@ -622,6 +623,15 @@
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;
@@ -836,6 +846,21 @@
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;
@@ -854,21 +879,6 @@
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;
}
@@ -966,12 +976,6 @@
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;
@@ -981,6 +985,12 @@
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;
@@ -1069,12 +1079,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1082,6 +1086,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
index e41f06c..ec9f7cb 100644
--- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
+++ b/examples/pump-controller-app/pump-controller-common/pump-controller-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 {
@@ -172,6 +182,12 @@
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;
@@ -180,12 +196,6 @@
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;
@@ -527,15 +537,6 @@
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;
@@ -547,6 +548,15 @@
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;
@@ -761,6 +771,21 @@
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;
@@ -779,21 +804,6 @@
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;
}
@@ -891,12 +901,6 @@
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;
@@ -906,6 +910,12 @@
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;
@@ -994,12 +1004,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1007,6 +1011,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter
index b1c1f0d..f8bd756 100644
--- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter
+++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter
@@ -1,6 +1,11 @@
// 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;
@@ -50,6 +55,12 @@
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;
@@ -58,12 +69,6 @@
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;
@@ -334,15 +339,6 @@
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;
@@ -354,6 +350,15 @@
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;
@@ -570,6 +575,14 @@
kWaterMarks = 0x1;
}
+ struct ThreadMetricsStruct {
+ int64u id = 0;
+ optional char_string<8> name = 1;
+ optional int32u stackFreeCurrent = 2;
+ optional int32u stackFreeMinimum = 3;
+ optional int32u stackSize = 4;
+ }
+
info event SoftwareFault = 0 {
INT64U id = 0;
optional CHAR_STRING name = 1;
@@ -756,12 +769,6 @@
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;
@@ -771,6 +778,12 @@
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;
@@ -859,12 +872,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -872,6 +879,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
@@ -927,6 +940,11 @@
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
labels. */
server cluster FixedLabel = 64 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -938,6 +956,11 @@
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
server cluster UserLabel = 65 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
attribute access(write: manage) LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
index 77c0f2c..bba43c1 100644
--- a/examples/thermostat/thermostat-common/thermostat.matter
+++ b/examples/thermostat/thermostat-common/thermostat.matter
@@ -1,6 +1,11 @@
// 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;
@@ -175,16 +180,16 @@
kSceneNames = 0x1;
}
- struct ExtensionFieldSet {
- cluster_id clusterID = 0;
- AttributeValuePair attributeValueList[] = 1;
- }
-
struct AttributeValuePair {
optional attrib_id attributeID = 0;
int8u attributeValue[] = 1;
}
+ struct ExtensionFieldSet {
+ cluster_id clusterID = 0;
+ AttributeValuePair attributeValueList[] = 1;
+ }
+
readonly attribute int8u sceneCount = 0;
readonly attribute int8u currentScene = 1;
readonly attribute group_id currentGroup = 2;
@@ -345,6 +350,12 @@
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;
@@ -353,12 +364,6 @@
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;
@@ -778,15 +783,6 @@
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;
@@ -798,6 +794,15 @@
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;
@@ -1094,6 +1099,21 @@
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;
@@ -1112,21 +1132,6 @@
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;
}
@@ -1378,12 +1383,6 @@
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;
@@ -1393,6 +1392,12 @@
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;
@@ -1481,12 +1486,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1494,6 +1493,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
@@ -1549,6 +1554,11 @@
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
labels. */
server cluster FixedLabel = 64 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1560,6 +1570,11 @@
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
server cluster UserLabel = 65 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
attribute access(write: manage) LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
index 1e41a51..38684c4 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -1,16 +1,16 @@
// This IDL was generated automatically by ZAP.
// It is for view/code review purposes only.
-struct LabelStruct {
- char_string<16> label = 0;
- char_string<16> value = 1;
-}
-
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 switching devices between 'On' and 'Off' states. */
server cluster OnOff = 6 {
enum OnOffDelayedAllOffEffectVariant : ENUM8 {
@@ -245,6 +245,12 @@
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;
@@ -253,12 +259,6 @@
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;
@@ -812,15 +812,6 @@
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;
@@ -832,6 +823,15 @@
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;
@@ -1128,6 +1128,21 @@
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;
@@ -1146,21 +1161,6 @@
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;
}
@@ -1536,12 +1536,6 @@
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;
@@ -1551,6 +1545,12 @@
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;
@@ -1639,12 +1639,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1652,6 +1646,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
@@ -1707,6 +1707,11 @@
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
labels. */
server cluster FixedLabel = 64 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1718,6 +1723,11 @@
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
server cluster UserLabel = 65 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
attribute access(write: manage) LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -2148,8 +2158,15 @@
kHls = 0x2;
}
- struct ContentSearchStruct {
- ParameterStruct parameterList[] = 0;
+ struct DimensionStruct {
+ double width = 0;
+ double height = 1;
+ MetricTypeEnum metric = 2;
+ }
+
+ struct AdditionalInfoStruct {
+ char_string name = 0;
+ char_string value = 1;
}
struct ParameterStruct {
@@ -2158,9 +2175,14 @@
optional AdditionalInfoStruct externalIDList[] = 2;
}
- struct AdditionalInfoStruct {
- char_string name = 0;
- char_string value = 1;
+ struct ContentSearchStruct {
+ ParameterStruct parameterList[] = 0;
+ }
+
+ struct StyleInformationStruct {
+ optional char_string imageURL = 0;
+ optional char_string color = 1;
+ optional DimensionStruct size = 2;
}
struct BrandingInformationStruct {
@@ -2172,18 +2194,6 @@
optional StyleInformationStruct waterMark = 5;
}
- struct StyleInformationStruct {
- optional char_string imageURL = 0;
- optional char_string color = 1;
- optional DimensionStruct size = 2;
- }
-
- struct DimensionStruct {
- double width = 0;
- double height = 1;
- MetricTypeEnum metric = 2;
- }
-
readonly attribute CHAR_STRING acceptHeader[] = 0;
attribute bitmap32 supportedStreamingProtocols = 1;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -2269,6 +2279,11 @@
kApplicationPlatform = 0x1;
}
+ struct ApplicationStruct {
+ int16u catalogVendorID = 0;
+ char_string applicationID = 1;
+ }
+
struct ApplicationEPStruct {
ApplicationStruct application = 0;
optional endpoint_no endpoint = 1;
@@ -2315,6 +2330,11 @@
kActiveVisibleNotFocus = 3;
}
+ struct ApplicationStruct {
+ int16u catalogVendorID = 0;
+ char_string applicationID = 1;
+ }
+
readonly attribute char_string<32> vendorName = 0;
readonly attribute vendor_id vendorID = 1;
readonly attribute char_string<32> applicationName = 2;
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
index 17f0d76..a9a59ac 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -6,6 +6,11 @@
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 {
@@ -397,6 +402,12 @@
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;
@@ -405,12 +416,6 @@
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;
@@ -681,15 +686,6 @@
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;
@@ -701,6 +697,15 @@
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;
@@ -1083,12 +1088,6 @@
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;
@@ -1098,6 +1097,12 @@
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;
@@ -1186,12 +1191,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1199,6 +1198,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter
index 8042ca1..0ed782b 100644
--- a/examples/window-app/common/window-app.matter
+++ b/examples/window-app/common/window-app.matter
@@ -1,6 +1,11 @@
// 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;
@@ -127,16 +132,16 @@
kSceneNames = 0x1;
}
- struct ExtensionFieldSet {
- cluster_id clusterID = 0;
- AttributeValuePair attributeValueList[] = 1;
- }
-
struct AttributeValuePair {
optional attrib_id attributeID = 0;
int8u attributeValue[] = 1;
}
+ struct ExtensionFieldSet {
+ cluster_id clusterID = 0;
+ AttributeValuePair attributeValueList[] = 1;
+ }
+
readonly attribute int8u sceneCount = 0;
readonly attribute int8u currentScene = 1;
readonly attribute group_id currentGroup = 2;
@@ -278,6 +283,12 @@
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;
@@ -286,12 +297,6 @@
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;
@@ -788,6 +793,21 @@
kReplaceable = 0x8;
}
+ struct BatChargeFaultChangeType {
+ BatChargeFaultEnum current[] = 0;
+ BatChargeFaultEnum previous[] = 1;
+ }
+
+ struct BatFaultChangeType {
+ BatFaultEnum current[] = 0;
+ BatFaultEnum previous[] = 1;
+ }
+
+ struct WiredFaultChangeType {
+ WiredFaultEnum current[] = 0;
+ WiredFaultEnum previous[] = 1;
+ }
+
info event WiredFaultChange = 0 {
WiredFaultEnum current[] = 0;
WiredFaultEnum previous[] = 1;
@@ -929,15 +949,6 @@
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;
@@ -949,6 +960,15 @@
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;
@@ -1210,6 +1230,21 @@
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;
@@ -1228,21 +1263,6 @@
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;
}
@@ -1494,12 +1514,6 @@
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;
@@ -1509,6 +1523,12 @@
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;
@@ -1597,12 +1617,6 @@
kCacheAndSync = 1;
}
- fabric_scoped struct GroupKeyMapStruct {
- group_id groupId = 1;
- int16u groupKeySetID = 2;
- fabric_idx fabricIndex = 254;
- }
-
fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
@@ -1610,6 +1624,12 @@
fabric_idx fabricIndex = 254;
}
+ fabric_scoped struct GroupKeyMapStruct {
+ group_id groupId = 1;
+ int16u groupKeySetID = 2;
+ fabric_idx fabricIndex = 254;
+ }
+
struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
@@ -1665,6 +1685,11 @@
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
labels. */
server cluster FixedLabel = 64 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1676,6 +1701,11 @@
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
server cluster UserLabel = 65 {
+ struct LabelStruct {
+ char_string<16> label = 0;
+ char_string<16> value = 1;
+ }
+
attribute access(write: manage) LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/src/app/zap-templates/templates/app/MatterIDL.zapt b/src/app/zap-templates/templates/app/MatterIDL.zapt
index 7cb1d55..9802426 100644
--- a/src/app/zap-templates/templates/app/MatterIDL.zapt
+++ b/src/app/zap-templates/templates/app/MatterIDL.zapt
@@ -1,10 +1,12 @@
// This IDL was generated automatically by ZAP.
// It is for view/code review purposes only.
-{{#chip_shared_structs}}
+{{#zcl_structs}}
+{{#if has_more_than_one_cluster}}
{{>idl_structure_definition extraIndent=0}}
-{{/chip_shared_structs}}
+{{/if}}
+{{/zcl_structs}}
{{#all_user_clusters~}}
/** {{description}} */
{{side}} cluster {{asUpperCamelCase name}} = {{code}} {
@@ -24,17 +26,10 @@
}
{{/zcl_bitmaps}}
- {{#if (is_client side)~}}
- {{#zcl_structs}}
- {{~>idl_structure_definition extraIndent=1}}
+ {{#zcl_structs}}
+ {{~>idl_structure_definition extraIndent=1}}
- {{/zcl_structs}}
- {{~else~}}
- {{#chip_cluster_specific_structs}}
- {{~>idl_structure_definition extraIndent=1}}
-
- {{/chip_cluster_specific_structs}}
- {{/if}}
+ {{/zcl_structs}}
{{#zcl_events}}
{{#if isFabricSensitive}}fabric_sensitive {{/if~}} {{priority}} event {{!ensure space}}
{{~#chip_access_elements entity="event"~}}
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index a728b838..a77f666 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -1,16 +1,16 @@
// This IDL was generated automatically by ZAP.
// It is for view/code review purposes only.
-struct LabelStruct {
- char_string<16> label = 0;
- char_string<16> value = 1;
-}
-
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). */
client cluster Identify = 3 {
enum IdentifyEffectIdentifier : ENUM8 {
