Skip to content

XML Changes for Improved Capabilities in General Diagnostics and Basic Info #41834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

XML Changes for Improved Capabilities in General Diagnostics and Basic Info #41834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df65e20
Update XML from master
zaid-google Nov 6, 2025
8e2617e
XML changes cluster revision conformance
zaid-google Nov 6, 2025
daf73f4
Codegen
zaid-google Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions examples/air-purifier-app/air-purifier-common/air-purifier-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,12 +720,12 @@ cluster BasicInformation = 40 {
readonly attribute optional char_string<32> serialNumber = 15;
attribute access(write: manage) optional boolean localConfigDisabled = 16;
readonly attribute optional boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute optional char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
readonly attribute int32u specificationVersion = 21;
readonly attribute int16u maxPathsPerInvoke = 22;
readonly attribute int32u configurationVersion = 24;
readonly attribute optional int32u specificationVersion = 21;
readonly attribute optional int16u maxPathsPerInvoke = 22;
readonly attribute optional int32u configurationVersion = 24;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
Expand Down Expand Up @@ -1215,7 +1215,7 @@ cluster DiagnosticLogs = 50 {

/** 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. */
cluster GeneralDiagnostics = 51 {
revision 2;
revision 3;

enum BootReasonEnum : enum8 {
kUnspecified = 0;
Expand Down Expand Up @@ -1268,14 +1268,23 @@ cluster GeneralDiagnostics = 51 {

bitmap Feature : bitmap32 {
kDataModelTest = 0x1;
kDeviceLoad = 0x2;
}

struct DeviceLoadStruct {
int16u currentSubscriptions = 0;
int16u currentSubscriptionsForFabric = 1;
int32u totalSubscriptionsEstablished = 2;
int32u totalInteractionModelMessagesSent = 3;
int32u totalInteractionModelMessagesReceived = 4;
}

struct NetworkInterface {
char_string<32> name = 0;
boolean isOperational = 1;
nullable boolean offPremiseServicesReachableIPv4 = 2;
nullable boolean offPremiseServicesReachableIPv6 = 3;
octet_string<8> hardwareAddress = 4;
octet_string hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
InterfaceTypeEnum type = 7;
Expand All @@ -1302,13 +1311,14 @@ cluster GeneralDiagnostics = 51 {

readonly attribute NetworkInterface networkInterfaces[] = 0;
readonly attribute int16u rebootCount = 1;
readonly attribute optional int64u upTime = 2;
readonly attribute int64u upTime = 2;
readonly attribute optional int32u totalOperationalHours = 3;
readonly attribute optional BootReasonEnum bootReason = 4;
readonly attribute optional HardwareFaultEnum activeHardwareFaults[] = 5;
readonly attribute optional RadioFaultEnum activeRadioFaults[] = 6;
readonly attribute optional NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute optional DeviceLoadStruct deviceLoadStatus = 10;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
Expand All @@ -1332,14 +1342,14 @@ cluster GeneralDiagnostics = 51 {
}

response struct PayloadTestResponse = 4 {
octet_string payload = 0;
long_octet_string<2048> payload = 0;
}

/** Provide a means for certification tests to trigger some test-plan-specific events */
/** 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. */
command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
/** Take a snapshot of system time and epoch time. */
/** 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. */
command TimeSnapshot(): TimeSnapshotResponse = 1;
/** Request a variable length payload response. */
/** 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. */
command access(invoke: manage) PayloadTestRequest(PayloadTestRequestRequest): PayloadTestResponse = 3;
}

Expand Down
32 changes: 21 additions & 11 deletions examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,12 +649,12 @@ cluster BasicInformation = 40 {
readonly attribute optional char_string<32> serialNumber = 15;
attribute access(write: manage) optional boolean localConfigDisabled = 16;
readonly attribute optional boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute optional char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
readonly attribute int32u specificationVersion = 21;
readonly attribute int16u maxPathsPerInvoke = 22;
readonly attribute int32u configurationVersion = 24;
readonly attribute optional int32u specificationVersion = 21;
readonly attribute optional int16u maxPathsPerInvoke = 22;
readonly attribute optional int32u configurationVersion = 24;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
Expand Down Expand Up @@ -1098,7 +1098,7 @@ cluster NetworkCommissioning = 49 {

/** 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. */
cluster GeneralDiagnostics = 51 {
revision 2;
revision 3;

enum BootReasonEnum : enum8 {
kUnspecified = 0;
Expand Down Expand Up @@ -1151,14 +1151,23 @@ cluster GeneralDiagnostics = 51 {

bitmap Feature : bitmap32 {
kDataModelTest = 0x1;
kDeviceLoad = 0x2;
}

struct DeviceLoadStruct {
int16u currentSubscriptions = 0;
int16u currentSubscriptionsForFabric = 1;
int32u totalSubscriptionsEstablished = 2;
int32u totalInteractionModelMessagesSent = 3;
int32u totalInteractionModelMessagesReceived = 4;
}

struct NetworkInterface {
char_string<32> name = 0;
boolean isOperational = 1;
nullable boolean offPremiseServicesReachableIPv4 = 2;
nullable boolean offPremiseServicesReachableIPv6 = 3;
octet_string<8> hardwareAddress = 4;
octet_string hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
InterfaceTypeEnum type = 7;
Expand All @@ -1185,13 +1194,14 @@ cluster GeneralDiagnostics = 51 {

readonly attribute NetworkInterface networkInterfaces[] = 0;
readonly attribute int16u rebootCount = 1;
readonly attribute optional int64u upTime = 2;
readonly attribute int64u upTime = 2;
readonly attribute optional int32u totalOperationalHours = 3;
readonly attribute optional BootReasonEnum bootReason = 4;
readonly attribute optional HardwareFaultEnum activeHardwareFaults[] = 5;
readonly attribute optional RadioFaultEnum activeRadioFaults[] = 6;
readonly attribute optional NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute optional DeviceLoadStruct deviceLoadStatus = 10;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
Expand All @@ -1215,14 +1225,14 @@ cluster GeneralDiagnostics = 51 {
}

response struct PayloadTestResponse = 4 {
octet_string payload = 0;
long_octet_string<2048> payload = 0;
}

/** Provide a means for certification tests to trigger some test-plan-specific events */
/** 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. */
command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
/** Take a snapshot of system time and epoch time. */
/** 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. */
command TimeSnapshot(): TimeSnapshotResponse = 1;
/** Request a variable length payload response. */
/** 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. */
command access(invoke: manage) PayloadTestRequest(PayloadTestRequestRequest): PayloadTestResponse = 3;
}

Expand Down
32 changes: 21 additions & 11 deletions ...es/air-quality-sensor-app/air-quality-sensor-common/icd-lit-air-quality-sensor-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,12 +649,12 @@ cluster BasicInformation = 40 {
readonly attribute optional char_string<32> serialNumber = 15;
attribute access(write: manage) optional boolean localConfigDisabled = 16;
readonly attribute optional boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute optional char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
readonly attribute int32u specificationVersion = 21;
readonly attribute int16u maxPathsPerInvoke = 22;
readonly attribute int32u configurationVersion = 24;
readonly attribute optional int32u specificationVersion = 21;
readonly attribute optional int16u maxPathsPerInvoke = 22;
readonly attribute optional int32u configurationVersion = 24;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
Expand Down Expand Up @@ -1098,7 +1098,7 @@ cluster NetworkCommissioning = 49 {

/** 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. */
cluster GeneralDiagnostics = 51 {
revision 2;
revision 3;

enum BootReasonEnum : enum8 {
kUnspecified = 0;
Expand Down Expand Up @@ -1151,14 +1151,23 @@ cluster GeneralDiagnostics = 51 {

bitmap Feature : bitmap32 {
kDataModelTest = 0x1;
kDeviceLoad = 0x2;
}

struct DeviceLoadStruct {
int16u currentSubscriptions = 0;
int16u currentSubscriptionsForFabric = 1;
int32u totalSubscriptionsEstablished = 2;
int32u totalInteractionModelMessagesSent = 3;
int32u totalInteractionModelMessagesReceived = 4;
}

struct NetworkInterface {
char_string<32> name = 0;
boolean isOperational = 1;
nullable boolean offPremiseServicesReachableIPv4 = 2;
nullable boolean offPremiseServicesReachableIPv6 = 3;
octet_string<8> hardwareAddress = 4;
octet_string hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
InterfaceTypeEnum type = 7;
Expand All @@ -1185,13 +1194,14 @@ cluster GeneralDiagnostics = 51 {

readonly attribute NetworkInterface networkInterfaces[] = 0;
readonly attribute int16u rebootCount = 1;
readonly attribute optional int64u upTime = 2;
readonly attribute int64u upTime = 2;
readonly attribute optional int32u totalOperationalHours = 3;
readonly attribute optional BootReasonEnum bootReason = 4;
readonly attribute optional HardwareFaultEnum activeHardwareFaults[] = 5;
readonly attribute optional RadioFaultEnum activeRadioFaults[] = 6;
readonly attribute optional NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute optional DeviceLoadStruct deviceLoadStatus = 10;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
Expand All @@ -1215,14 +1225,14 @@ cluster GeneralDiagnostics = 51 {
}

response struct PayloadTestResponse = 4 {
octet_string payload = 0;
long_octet_string<2048> payload = 0;
}

/** Provide a means for certification tests to trigger some test-plan-specific events */
/** 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. */
command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
/** Take a snapshot of system time and epoch time. */
/** 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. */
command TimeSnapshot(): TimeSnapshotResponse = 1;
/** Request a variable length payload response. */
/** 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. */
command access(invoke: manage) PayloadTestRequest(PayloadTestRequestRequest): PayloadTestResponse = 3;
}

Expand Down
32 changes: 21 additions & 11 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1186,12 +1186,12 @@ cluster BasicInformation = 40 {
readonly attribute optional char_string<32> serialNumber = 15;
attribute access(write: manage) optional boolean localConfigDisabled = 16;
readonly attribute optional boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute optional char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
readonly attribute int32u specificationVersion = 21;
readonly attribute int16u maxPathsPerInvoke = 22;
readonly attribute int32u configurationVersion = 24;
readonly attribute optional int32u specificationVersion = 21;
readonly attribute optional int16u maxPathsPerInvoke = 22;
readonly attribute optional int32u configurationVersion = 24;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
Expand Down Expand Up @@ -2036,7 +2036,7 @@ cluster DiagnosticLogs = 50 {

/** 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. */
cluster GeneralDiagnostics = 51 {
revision 2;
revision 3;

enum BootReasonEnum : enum8 {
kUnspecified = 0;
Expand Down Expand Up @@ -2089,14 +2089,23 @@ cluster GeneralDiagnostics = 51 {

bitmap Feature : bitmap32 {
kDataModelTest = 0x1;
kDeviceLoad = 0x2;
}

struct DeviceLoadStruct {
int16u currentSubscriptions = 0;
int16u currentSubscriptionsForFabric = 1;
int32u totalSubscriptionsEstablished = 2;
int32u totalInteractionModelMessagesSent = 3;
int32u totalInteractionModelMessagesReceived = 4;
}

struct NetworkInterface {
char_string<32> name = 0;
boolean isOperational = 1;
nullable boolean offPremiseServicesReachableIPv4 = 2;
nullable boolean offPremiseServicesReachableIPv6 = 3;
octet_string<8> hardwareAddress = 4;
octet_string hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
InterfaceTypeEnum type = 7;
Expand All @@ -2123,13 +2132,14 @@ cluster GeneralDiagnostics = 51 {

readonly attribute NetworkInterface networkInterfaces[] = 0;
readonly attribute int16u rebootCount = 1;
readonly attribute optional int64u upTime = 2;
readonly attribute int64u upTime = 2;
readonly attribute optional int32u totalOperationalHours = 3;
readonly attribute optional BootReasonEnum bootReason = 4;
readonly attribute optional HardwareFaultEnum activeHardwareFaults[] = 5;
readonly attribute optional RadioFaultEnum activeRadioFaults[] = 6;
readonly attribute optional NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute optional DeviceLoadStruct deviceLoadStatus = 10;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
Expand All @@ -2153,14 +2163,14 @@ cluster GeneralDiagnostics = 51 {
}

response struct PayloadTestResponse = 4 {
octet_string payload = 0;
long_octet_string<2048> payload = 0;
}

/** Provide a means for certification tests to trigger some test-plan-specific events */
/** 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. */
command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
/** Take a snapshot of system time and epoch time. */
/** 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. */
command TimeSnapshot(): TimeSnapshotResponse = 1;
/** Request a variable length payload response. */
/** 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. */
command access(invoke: manage) PayloadTestRequest(PayloadTestRequestRequest): PayloadTestResponse = 3;
}

Expand Down
Loading
Loading