Skip to content

Commit daf73f4

Browse files
zaid-googlezaid-google
committed
Codegen
1 parent 8e2617e commit daf73f4

File tree

169 files changed

+3833
-1460
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+3833
-1460
lines changed

‎examples/air-purifier-app/air-purifier-common/air-purifier-app.matter‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -720,12 +720,12 @@ cluster BasicInformation = 40 {
720720
readonly attribute optional char_string<32> serialNumber = 15;
721721
attribute access(write: manage) optional boolean localConfigDisabled = 16;
722722
readonly attribute optional boolean reachable = 17;
723-
readonly attribute char_string<32> uniqueID = 18;
723+
readonly attribute optional char_string<32> uniqueID = 18;
724724
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
725725
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
726-
readonly attribute int32u specificationVersion = 21;
727-
readonly attribute int16u maxPathsPerInvoke = 22;
728-
readonly attribute int32u configurationVersion = 24;
726+
readonly attribute optional int32u specificationVersion = 21;
727+
readonly attribute optional int16u maxPathsPerInvoke = 22;
728+
readonly attribute optional int32u configurationVersion = 24;
729729
readonly attribute command_id generatedCommandList[] = 65528;
730730
readonly attribute command_id acceptedCommandList[] = 65529;
731731
readonly attribute attrib_id attributeList[] = 65531;
@@ -1215,7 +1215,7 @@ cluster DiagnosticLogs = 50 {
12151215

12161216
/** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
12171217
cluster GeneralDiagnostics = 51 {
1218-
revision 2;
1218+
revision 3;
12191219

12201220
enum BootReasonEnum : enum8 {
12211221
kUnspecified = 0;
@@ -1268,14 +1268,23 @@ cluster GeneralDiagnostics = 51 {
12681268

12691269
bitmap Feature : bitmap32 {
12701270
kDataModelTest = 0x1;
1271+
kDeviceLoad = 0x2;
1272+
}
1273+
1274+
struct DeviceLoadStruct {
1275+
int16u currentSubscriptions = 0;
1276+
int16u currentSubscriptionsForFabric = 1;
1277+
int32u totalSubscriptionsEstablished = 2;
1278+
int32u totalInteractionModelMessagesSent = 3;
1279+
int32u totalInteractionModelMessagesReceived = 4;
12711280
}
12721281

12731282
struct NetworkInterface {
12741283
char_string<32> name = 0;
12751284
boolean isOperational = 1;
12761285
nullable boolean offPremiseServicesReachableIPv4 = 2;
12771286
nullable boolean offPremiseServicesReachableIPv6 = 3;
1278-
octet_string<8> hardwareAddress = 4;
1287+
octet_string hardwareAddress = 4;
12791288
octet_string IPv4Addresses[] = 5;
12801289
octet_string IPv6Addresses[] = 6;
12811290
InterfaceTypeEnum type = 7;
@@ -1302,13 +1311,14 @@ cluster GeneralDiagnostics = 51 {
13021311

13031312
readonly attribute NetworkInterface networkInterfaces[] = 0;
13041313
readonly attribute int16u rebootCount = 1;
1305-
readonly attribute optional int64u upTime = 2;
1314+
readonly attribute int64u upTime = 2;
13061315
readonly attribute optional int32u totalOperationalHours = 3;
13071316
readonly attribute optional BootReasonEnum bootReason = 4;
13081317
readonly attribute optional HardwareFaultEnum activeHardwareFaults[] = 5;
13091318
readonly attribute optional RadioFaultEnum activeRadioFaults[] = 6;
13101319
readonly attribute optional NetworkFaultEnum activeNetworkFaults[] = 7;
13111320
readonly attribute boolean testEventTriggersEnabled = 8;
1321+
readonly attribute optional DeviceLoadStruct deviceLoadStatus = 10;
13121322
readonly attribute command_id generatedCommandList[] = 65528;
13131323
readonly attribute command_id acceptedCommandList[] = 65529;
13141324
readonly attribute attrib_id attributeList[] = 65531;
@@ -1332,14 +1342,14 @@ cluster GeneralDiagnostics = 51 {
13321342
}
13331343

13341344
response struct PayloadTestResponse = 4 {
1335-
octet_string payload = 0;
1345+
long_octet_string<2048> payload = 0;
13361346
}
13371347

1338-
/** Provide a means for certification tests to trigger some test-plan-specific events */
1348+
/** This command SHALL be supported to provide a means for certification tests to trigger some test-plan-specific events, necessary to assist in automation of device interactions for some certification test cases. */
13391349
command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
1340-
/** Take a snapshot of system time and epoch time. */
1350+
/** This command MAY be used by a client to obtain a correlated view of both System Time, and, if currently synchronized and supported, "wall clock time" of the server. */
13411351
command TimeSnapshot(): TimeSnapshotResponse = 1;
1342-
/** Request a variable length payload response. */
1352+
/** This command provides a means for certification tests or manufacturer's internal tests to validate particular command handling and encoding constraints by generating a response of a given size. */
13431353
command access(invoke: manage) PayloadTestRequest(PayloadTestRequestRequest): PayloadTestResponse = 3;
13441354
}
13451355

‎examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -649,12 +649,12 @@ cluster BasicInformation = 40 {
649649
readonly attribute optional char_string<32> serialNumber = 15;
650650
attribute access(write: manage) optional boolean localConfigDisabled = 16;
651651
readonly attribute optional boolean reachable = 17;
652-
readonly attribute char_string<32> uniqueID = 18;
652+
readonly attribute optional char_string<32> uniqueID = 18;
653653
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
654654
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
655-
readonly attribute int32u specificationVersion = 21;
656-
readonly attribute int16u maxPathsPerInvoke = 22;
657-
readonly attribute int32u configurationVersion = 24;
655+
readonly attribute optional int32u specificationVersion = 21;
656+
readonly attribute optional int16u maxPathsPerInvoke = 22;
657+
readonly attribute optional int32u configurationVersion = 24;
658658
readonly attribute command_id generatedCommandList[] = 65528;
659659
readonly attribute command_id acceptedCommandList[] = 65529;
660660
readonly attribute attrib_id attributeList[] = 65531;
@@ -1098,7 +1098,7 @@ cluster NetworkCommissioning = 49 {
10981098

10991099
/** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
11001100
cluster GeneralDiagnostics = 51 {
1101-
revision 2;
1101+
revision 3;
11021102

11031103
enum BootReasonEnum : enum8 {
11041104
kUnspecified = 0;
@@ -1151,14 +1151,23 @@ cluster GeneralDiagnostics = 51 {
11511151

11521152
bitmap Feature : bitmap32 {
11531153
kDataModelTest = 0x1;
1154+
kDeviceLoad = 0x2;
1155+
}
1156+
1157+
struct DeviceLoadStruct {
1158+
int16u currentSubscriptions = 0;
1159+
int16u currentSubscriptionsForFabric = 1;
1160+
int32u totalSubscriptionsEstablished = 2;
1161+
int32u totalInteractionModelMessagesSent = 3;
1162+
int32u totalInteractionModelMessagesReceived = 4;
11541163
}
11551164

11561165
struct NetworkInterface {
11571166
char_string<32> name = 0;
11581167
boolean isOperational = 1;
11591168
nullable boolean offPremiseServicesReachableIPv4 = 2;
11601169
nullable boolean offPremiseServicesReachableIPv6 = 3;
1161-
octet_string<8> hardwareAddress = 4;
1170+
octet_string hardwareAddress = 4;
11621171
octet_string IPv4Addresses[] = 5;
11631172
octet_string IPv6Addresses[] = 6;
11641173
InterfaceTypeEnum type = 7;
@@ -1185,13 +1194,14 @@ cluster GeneralDiagnostics = 51 {
11851194

11861195
readonly attribute NetworkInterface networkInterfaces[] = 0;
11871196
readonly attribute int16u rebootCount = 1;
1188-
readonly attribute optional int64u upTime = 2;
1197+
readonly attribute int64u upTime = 2;
11891198
readonly attribute optional int32u totalOperationalHours = 3;
11901199
readonly attribute optional BootReasonEnum bootReason = 4;
11911200
readonly attribute optional HardwareFaultEnum activeHardwareFaults[] = 5;
11921201
readonly attribute optional RadioFaultEnum activeRadioFaults[] = 6;
11931202
readonly attribute optional NetworkFaultEnum activeNetworkFaults[] = 7;
11941203
readonly attribute boolean testEventTriggersEnabled = 8;
1204+
readonly attribute optional DeviceLoadStruct deviceLoadStatus = 10;
11951205
readonly attribute command_id generatedCommandList[] = 65528;
11961206
readonly attribute command_id acceptedCommandList[] = 65529;
11971207
readonly attribute attrib_id attributeList[] = 65531;
@@ -1215,14 +1225,14 @@ cluster GeneralDiagnostics = 51 {
12151225
}
12161226

12171227
response struct PayloadTestResponse = 4 {
1218-
octet_string payload = 0;
1228+
long_octet_string<2048> payload = 0;
12191229
}
12201230

1221-
/** Provide a means for certification tests to trigger some test-plan-specific events */
1231+
/** This command SHALL be supported to provide a means for certification tests to trigger some test-plan-specific events, necessary to assist in automation of device interactions for some certification test cases. */
12221232
command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
1223-
/** Take a snapshot of system time and epoch time. */
1233+
/** This command MAY be used by a client to obtain a correlated view of both System Time, and, if currently synchronized and supported, "wall clock time" of the server. */
12241234
command TimeSnapshot(): TimeSnapshotResponse = 1;
1225-
/** Request a variable length payload response. */
1235+
/** This command provides a means for certification tests or manufacturer's internal tests to validate particular command handling and encoding constraints by generating a response of a given size. */
12261236
command access(invoke: manage) PayloadTestRequest(PayloadTestRequestRequest): PayloadTestResponse = 3;
12271237
}
12281238

‎examples/air-quality-sensor-app/air-quality-sensor-common/icd-lit-air-quality-sensor-app.matter‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -649,12 +649,12 @@ cluster BasicInformation = 40 {
649649
readonly attribute optional char_string<32> serialNumber = 15;
650650
attribute access(write: manage) optional boolean localConfigDisabled = 16;
651651
readonly attribute optional boolean reachable = 17;
652-
readonly attribute char_string<32> uniqueID = 18;
652+
readonly attribute optional char_string<32> uniqueID = 18;
653653
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
654654
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
655-
readonly attribute int32u specificationVersion = 21;
656-
readonly attribute int16u maxPathsPerInvoke = 22;
657-
readonly attribute int32u configurationVersion = 24;
655+
readonly attribute optional int32u specificationVersion = 21;
656+
readonly attribute optional int16u maxPathsPerInvoke = 22;
657+
readonly attribute optional int32u configurationVersion = 24;
658658
readonly attribute command_id generatedCommandList[] = 65528;
659659
readonly attribute command_id acceptedCommandList[] = 65529;
660660
readonly attribute attrib_id attributeList[] = 65531;
@@ -1098,7 +1098,7 @@ cluster NetworkCommissioning = 49 {
10981098

10991099
/** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
11001100
cluster GeneralDiagnostics = 51 {
1101-
revision 2;
1101+
revision 3;
11021102

11031103
enum BootReasonEnum : enum8 {
11041104
kUnspecified = 0;
@@ -1151,14 +1151,23 @@ cluster GeneralDiagnostics = 51 {
11511151

11521152
bitmap Feature : bitmap32 {
11531153
kDataModelTest = 0x1;
1154+
kDeviceLoad = 0x2;
1155+
}
1156+
1157+
struct DeviceLoadStruct {
1158+
int16u currentSubscriptions = 0;
1159+
int16u currentSubscriptionsForFabric = 1;
1160+
int32u totalSubscriptionsEstablished = 2;
1161+
int32u totalInteractionModelMessagesSent = 3;
1162+
int32u totalInteractionModelMessagesReceived = 4;
11541163
}
11551164

11561165
struct NetworkInterface {
11571166
char_string<32> name = 0;
11581167
boolean isOperational = 1;
11591168
nullable boolean offPremiseServicesReachableIPv4 = 2;
11601169
nullable boolean offPremiseServicesReachableIPv6 = 3;
1161-
octet_string<8> hardwareAddress = 4;
1170+
octet_string hardwareAddress = 4;
11621171
octet_string IPv4Addresses[] = 5;
11631172
octet_string IPv6Addresses[] = 6;
11641173
InterfaceTypeEnum type = 7;
@@ -1185,13 +1194,14 @@ cluster GeneralDiagnostics = 51 {
11851194

11861195
readonly attribute NetworkInterface networkInterfaces[] = 0;
11871196
readonly attribute int16u rebootCount = 1;
1188-
readonly attribute optional int64u upTime = 2;
1197+
readonly attribute int64u upTime = 2;
11891198
readonly attribute optional int32u totalOperationalHours = 3;
11901199
readonly attribute optional BootReasonEnum bootReason = 4;
11911200
readonly attribute optional HardwareFaultEnum activeHardwareFaults[] = 5;
11921201
readonly attribute optional RadioFaultEnum activeRadioFaults[] = 6;
11931202
readonly attribute optional NetworkFaultEnum activeNetworkFaults[] = 7;
11941203
readonly attribute boolean testEventTriggersEnabled = 8;
1204+
readonly attribute optional DeviceLoadStruct deviceLoadStatus = 10;
11951205
readonly attribute command_id generatedCommandList[] = 65528;
11961206
readonly attribute command_id acceptedCommandList[] = 65529;
11971207
readonly attribute attrib_id attributeList[] = 65531;
@@ -1215,14 +1225,14 @@ cluster GeneralDiagnostics = 51 {
12151225
}
12161226

12171227
response struct PayloadTestResponse = 4 {
1218-
octet_string payload = 0;
1228+
long_octet_string<2048> payload = 0;
12191229
}
12201230

1221-
/** Provide a means for certification tests to trigger some test-plan-specific events */
1231+
/** This command SHALL be supported to provide a means for certification tests to trigger some test-plan-specific events, necessary to assist in automation of device interactions for some certification test cases. */
12221232
command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
1223-
/** Take a snapshot of system time and epoch time. */
1233+
/** This command MAY be used by a client to obtain a correlated view of both System Time, and, if currently synchronized and supported, "wall clock time" of the server. */
12241234
command TimeSnapshot(): TimeSnapshotResponse = 1;
1225-
/** Request a variable length payload response. */
1235+
/** This command provides a means for certification tests or manufacturer's internal tests to validate particular command handling and encoding constraints by generating a response of a given size. */
12261236
command access(invoke: manage) PayloadTestRequest(PayloadTestRequestRequest): PayloadTestResponse = 3;
12271237
}
12281238

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,12 +1186,12 @@ cluster BasicInformation = 40 {
11861186
readonly attribute optional char_string<32> serialNumber = 15;
11871187
attribute access(write: manage) optional boolean localConfigDisabled = 16;
11881188
readonly attribute optional boolean reachable = 17;
1189-
readonly attribute char_string<32> uniqueID = 18;
1189+
readonly attribute optional char_string<32> uniqueID = 18;
11901190
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
11911191
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
1192-
readonly attribute int32u specificationVersion = 21;
1193-
readonly attribute int16u maxPathsPerInvoke = 22;
1194-
readonly attribute int32u configurationVersion = 24;
1192+
readonly attribute optional int32u specificationVersion = 21;
1193+
readonly attribute optional int16u maxPathsPerInvoke = 22;
1194+
readonly attribute optional int32u configurationVersion = 24;
11951195
readonly attribute command_id generatedCommandList[] = 65528;
11961196
readonly attribute command_id acceptedCommandList[] = 65529;
11971197
readonly attribute attrib_id attributeList[] = 65531;
@@ -2036,7 +2036,7 @@ cluster DiagnosticLogs = 50 {
20362036

20372037
/** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
20382038
cluster GeneralDiagnostics = 51 {
2039-
revision 2;
2039+
revision 3;
20402040

20412041
enum BootReasonEnum : enum8 {
20422042
kUnspecified = 0;
@@ -2089,14 +2089,23 @@ cluster GeneralDiagnostics = 51 {
20892089

20902090
bitmap Feature : bitmap32 {
20912091
kDataModelTest = 0x1;
2092+
kDeviceLoad = 0x2;
2093+
}
2094+
2095+
struct DeviceLoadStruct {
2096+
int16u currentSubscriptions = 0;
2097+
int16u currentSubscriptionsForFabric = 1;
2098+
int32u totalSubscriptionsEstablished = 2;
2099+
int32u totalInteractionModelMessagesSent = 3;
2100+
int32u totalInteractionModelMessagesReceived = 4;
20922101
}
20932102

20942103
struct NetworkInterface {
20952104
char_string<32> name = 0;
20962105
boolean isOperational = 1;
20972106
nullable boolean offPremiseServicesReachableIPv4 = 2;
20982107
nullable boolean offPremiseServicesReachableIPv6 = 3;
2099-
octet_string<8> hardwareAddress = 4;
2108+
octet_string hardwareAddress = 4;
21002109
octet_string IPv4Addresses[] = 5;
21012110
octet_string IPv6Addresses[] = 6;
21022111
InterfaceTypeEnum type = 7;
@@ -2123,13 +2132,14 @@ cluster GeneralDiagnostics = 51 {
21232132

21242133
readonly attribute NetworkInterface networkInterfaces[] = 0;
21252134
readonly attribute int16u rebootCount = 1;
2126-
readonly attribute optional int64u upTime = 2;
2135+
readonly attribute int64u upTime = 2;
21272136
readonly attribute optional int32u totalOperationalHours = 3;
21282137
readonly attribute optional BootReasonEnum bootReason = 4;
21292138
readonly attribute optional HardwareFaultEnum activeHardwareFaults[] = 5;
21302139
readonly attribute optional RadioFaultEnum activeRadioFaults[] = 6;
21312140
readonly attribute optional NetworkFaultEnum activeNetworkFaults[] = 7;
21322141
readonly attribute boolean testEventTriggersEnabled = 8;
2142+
readonly attribute optional DeviceLoadStruct deviceLoadStatus = 10;
21332143
readonly attribute command_id generatedCommandList[] = 65528;
21342144
readonly attribute command_id acceptedCommandList[] = 65529;
21352145
readonly attribute attrib_id attributeList[] = 65531;
@@ -2153,14 +2163,14 @@ cluster GeneralDiagnostics = 51 {
21532163
}
21542164

21552165
response struct PayloadTestResponse = 4 {
2156-
octet_string payload = 0;
2166+
long_octet_string<2048> payload = 0;
21572167
}
21582168

2159-
/** Provide a means for certification tests to trigger some test-plan-specific events */
2169+
/** This command SHALL be supported to provide a means for certification tests to trigger some test-plan-specific events, necessary to assist in automation of device interactions for some certification test cases. */
21602170
command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
2161-
/** Take a snapshot of system time and epoch time. */
2171+
/** This command MAY be used by a client to obtain a correlated view of both System Time, and, if currently synchronized and supported, "wall clock time" of the server. */
21622172
command TimeSnapshot(): TimeSnapshotResponse = 1;
2163-
/** Request a variable length payload response. */
2173+
/** This command provides a means for certification tests or manufacturer's internal tests to validate particular command handling and encoding constraints by generating a response of a given size. */
21642174
command access(invoke: manage) PayloadTestRequest(PayloadTestRequestRequest): PayloadTestResponse = 3;
21652175
}
21662176

0 commit comments

Comments
 (0)